Merge pull request #1174 from londoncalling/pinata-stable-1.13.0

WIP: first draft d4win, d4mac stable 1.13.0

docker-for-mac/index.md

@@ -20,8 +20,7 @@ Docker for Mac is the best way to get started with Docker on a Mac.
 >**Already have Docker for Mac?** If you already have Docker for Mac installed, and are ready to get started, skip down to [Step 2. Check versions of Docker
 Engine, Compose, and
 Machine](#step-2-check-versions-of-docker-engine-compose-and-machine) to work
-through the rest of the Docker for Mac tour, or jump over to the standard
+through the rest of the Docker for Mac tour, or jump over to getting started tutorials at [Learn Docker](/learn.md).
-[Getting Started with Docker](/engine/getstarted/index.md) tutorial.
 
 ## Download Docker for Mac
 
@@ -68,7 +67,7 @@ channels, see the [FAQs](faqs.md#stable-and-beta-channels).
 
 * **README FIRST for Docker Toolbox and Docker Machine users**: If you are already running Docker on your machine, first read [Docker for Mac vs. Docker Toolbox](docker-toolbox.md) to understand the impact of this installation on your existing setup, how to set your environment for Docker for Mac, and how the two products can coexist.
 <p />
-*  **Relationship to Docker Machine**: Installing Docker for Mac does not affect machines you created with Docker Machine. You'll get the option to copy containers and images from your local `default` machine (if one exists) to the new Docker for Mac <a href="https://github.com/docker/HyperKit/" target="_blank">HyperKit</a> VM. When you are running Docker for Mac, you do not need Docker Machine nodes running at all locally (or anywhere else). With Docker for Mac, you have a new, native virtualization system running (HyperKit) which takes the place of the VirtualBox system. To learn more, see [Docker for Mac vs. Docker Toolbox](docker-toolbox.md).
+*  **Relationship to Docker Machine**: Installing Docker for Mac does not affect machines you created with Docker Machine. You'll get the option to copy containers and images from your local `default` machine (if one exists) to the new Docker for Mac <a href="https://github.com/docker/HyperKit/">HyperKit</a> VM. When you are running Docker for Mac, you do not need Docker Machine nodes running at all locally (or anywhere else). With Docker for Mac, you have a new, native virtualization system running (HyperKit) which takes the place of the VirtualBox system. To learn more, see [Docker for Mac vs. Docker Toolbox](docker-toolbox.md).
 <p />
 * **System Requirements**: Docker for Mac will launch only if all of these requirements are met.
 
@@ -182,22 +181,64 @@ can set the following runtime options.
 
 ![Preferences](images/settings.png)
 
-#### Auto-start, update, and backups
+#### Auto-start, update, backups, usage data
 
-* Docker for Mac is set to **automatically start** when you log in. Uncheck the login autostart option if you don't want Docker to start when you open your
+*  Docker for Mac is set to automatically **start Docker when you log in**.
-session.
+Uncheck this option if you don't want Docker to start when you
+open your session.
 
-* Docker for Mac is set to **check for updates** automatically and notify you when an update is available. If an update is found, click **OK** to accept and
+* Docker for Mac is set to **automatically check for updates**  and notify
-install it (or cancel to keep the current version). If you disable the check for
+you when an update is available. If an update is found, click **OK** to
-updates, you can still find out about updates manually by choosing <img
+accept and install it (or cancel to keep the current version). If you
-src="images/whale-x.png"> -> **Check for Updates**
+disable the check for updates, you can still find out about updates manually
+by choosing <img src="images/whale-x.png"> -> **Check for Updates**
 
-* Check **Exclude VM from Time Machine backups** to prevent Time Machine from backing up the Docker for Mac virtual machine.
+* Check **Exclude VM from Time Machine backups** to prevent Time Machine
+from backing up the Docker for Mac virtual machine.
+
+* **Send usage statistics** &mdash; You can set Docker for Mac to auto-send diagnostics, crash reports, and usage data. This information can help Docker
+improve the application and get more context for troubleshooting problems.
+Uncheck this to opt out and prevent auto-send of data. Docker may prompt for
+more information in some cases, even with auto-send enabled. Also, you can
+enable or disable these auto-reporting settings with one click on the
+information popup when you first start Docker.
+
+  ![Startup information](images/mac-install-success-docker-wait.png)
+
+
+### File sharing
+
+You can decide which directories on your Mac to share with containers.
+
+* **Add a Directory** - Click `+` and navigate to the directory you
+want to add.
+
+	![File Sharing](images/settings-file-share.png)
+
+* Click **Apply & Restart** to make the directory available to
+  containers using Docker's bind mount (`-v`) feature.
+
+There are some limitations on the directories that can be shared:
+
+* They cannot be a subdirectory of an already shared directory.
+
+* They cannot already exist inside of Docker.
+
+See [Namespaces](osxfs.md#namespaces) in the topic on
+[osxfs file system sharing](osxfs.md) for more information.
+
+>**Tip:** File sharing is required for volume mounting if the project lives
+outside of the `/Users` directory. In that case, share the drive where the
+Dockerfile and volume are located. Otherwise, you will get file not found or
+cannot start service errors at runtime. (See also [Volume mounting requires file
+sharing for any project directories outside of
+`/Users`](troubleshoot.md#volume-mounting-requires-file-sharing-for-any-project-directories-outside-of-users).)
+
+
+### Advanced
+
+![Advanced Preference settings-advanced](images/settings-advanced.png)
 
-  >**Tip: Beta dialogs** &mdash;  Starting with Beta 31, an option to auto-send
-  usage data is also on the General dialog. In Stable releases, the option is
-  still on the Privacy tab. For now, both Stable and Beta users can read more
-  about usage data settings in the [Privacy](#Privacy) topic.
 
 #### CPUs
 
@@ -212,47 +253,37 @@ the total available memory on your Mac. You can increase the RAM on the app to
 get faster performance by setting this number higher (for example to `3`) or
 lower (to `1`) if you want Docker for Mac to use less memory.
 
->**Tip: Beta dialogs** &mdash; Starting with Beta 31, **CPUs** and **Memory** settings
+#### Storage location
-are on the Advanced dialog. Starting with Beta 33, you can specify the **storage location** of the Linux volume; i.e., where containers and images are stored. These settings are shown below.
->
->![CPUs and Memory settings UI
-starting at Beta 31](images/settings-advanced-beta.png)
 
-### Advanced
+You can specify the **storage location** of the Linux volume; i.e., where
+containers and images are stored.
 
-![Advanced Preference settings-advanced](images/settings-advanced.png)
 
-#### Custom registries
+### HTTP proxy settings
-
-As an alternative to using [Docker Hub](https://hub.docker.com/) to store your
-public or private images or [Docker Trusted
-Registry](/datacenter/dtr/2.1/guides/index.md), you can use Docker to set up your
-own insecure [registry](/registry/introduction/). Add URLs for insecure
-registries and registry mirrors on which to host your images. (See also, [How do
-I add custom CA certificates?](faqs.md#how-do-i-add-custom-ca-certificates) in
-the FAQs.)
-
->**Tip: Beta dialogs** &mdash;  Starting with Beta 31, options to set up your
-own registries are available as part of a new daemon tab. See [Docker
-daemon](#docker-daemon-beta-feature)).
-
-#### HTTP proxy settings
 
 Docker for Mac will detect HTTP/HTTPS Proxy Settings and automatically propagate
 these to Docker and to your containers. For example, if you set your proxy
 settings to `http://proxy.example.com`, Docker will use this proxy when pulling
 containers.
 
->**Tip: Beta dialogs** &mdash;  Starting with Beta 31, HTTP proxy settings are provided on a dedicated dialog, as shown below.
+![Proxies settings](images/settings-proxies.png)
->
->![Proxies settings](images/settings-proxies-beta.png)
 
-### Docker Daemon (Beta feature)
+### Docker Daemon
 
-Starting with Beta 31, configuration options on the Docker daemon move to their
+You can configure options on the Docker daemon that determine how your
-own **Daemon** tab, including basic and advanced options.
+containers will run. You can configure some **Basic** options on the daemon with interactive settings, or switch to **Advanced** to edit the JSON directly.
 
-#### Daemon Basic (experimental mode and registries)
+The settings offered on **Basic** dialog can be
+configured directly in the JSON as well. This version just surfaces
+some of the commmon settings to make it easier to configure them.
+
+* [Experimental mode](#experimental-mode)
+* [Custom registries](#custom-registries)
+* [Edit the daemon configuration file](#edit-the-daemon-configuration-file)
+
+![Daemon](images/settings-advanced-experimental-beta.png)
+
+#### Experimental mode
 
 By default, Docker for Mac Beta releases use the experimental version of Docker
 Engine, described in the [Docker Experimental Features README](https://github.com/docker/docker/tree/master/experimental) on GitHub. Starting with
@@ -285,19 +316,23 @@ Server:
  Experimental: true
 ```
 
-You can use Docker to set up your own
+#### Custom registries
-[registries](/registry/introduction/). For details on this, see [Custom
-Registries](#custom-registries).
 
-![Daemon](images/settings-advanced-experimental-beta.png)
+As an alternative to using [Docker Hub](https://hub.docker.com/) to store your
+public or private images or [Docker Trusted
+Registry](/datacenter/dtr/2.1/guides/index.md), you can use Docker to set up
+your own insecure [registry](/registry/introduction/). Add URLs for insecure
+registries and registry mirrors on which to host your images. (See also, [How do
+I add custom CA certificates?](faqs.md#how-do-i-add-custom-ca-certificates) in
+the FAQs.)
 
-#### Daemon Advanced (JSON configuration file)
+#### Edit the daemon configuration file
 
 On the **Daemon -> Advanced dialog**, you can directly configure the daemon from
 the JSON file, and determine entirely how your containers will run. For a full
 list of options on the Docker daemon, see <a
-href="/engine/reference/commandline/dockerd/"
+href="/engine/reference/commandline/dockerd/>daemon</a> in the Docker Engine
-target="_blank">daemon</a> in the Docker Engine command line reference.
+command line reference.
 
 After editing the daemon configuration , click **Apply & Restart** to save it
 and reboot Docker. Or, to cancel changes, click another preference tab, then
@@ -305,44 +340,6 @@ choose to discard or not apply changes when asked.
 
 ![Docker Daemon](images/settings-daemon-beta.png)
 
-### File sharing
-
-You can decide which directories on your Mac to share with containers.
-
-* **Add a Directory** - Click `+` and navigate to the directory you want to add.
-
-	![File Sharing](images/settings-file-share.png)
-
-* Click **Apply & Restart** to make the directory available to
-  containers using Docker's bind mount (`-v`) feature.
-
-There are some limitations on the directories that can be shared:
-
-* They cannot be a subdirectory of an already shared directory.
-
-* They cannot already exist inside of Docker.
-
-See [Namespaces](osxfs.md#namespaces) in the topic on [osxfs file system sharing](osxfs.md) for more information.
-
->**Tip:** File sharing is required for volume mounting if the project lives
-outside of the `/Users` directory. In that case, share the drive where the
-Dockerfile and volume are located. Otherwise, you will get file not found or
-cannot start service errors at runtime. (See also [Volume mounting requires file sharing for any project directories outside of `/Users`](troubleshoot.md#volume-mounting-requires-file-sharing-for-any-project-directories-outside-of-users).)
-
-### Privacy
-
-You can set Docker for Mac to auto-send diagnostics, crash reports, and usage data. This information can help Docker improve the application and get more context for troubleshooting problems.
-
-Uncheck any of the options to opt out and prevent auto-send of data. Docker may prompt for more information in some cases, even with auto-send enabled.
-
-![Privacy](images/privacy.png)
-
->**Tip: Beta dialogs** &mdash;  Starting with Beta 31, options to enable or disable auto-send of usage data are on the [General](#general) dialog.
-
-Also, you can enable or disable these auto-reporting settings with one click on the information popup when you first start Docker.
-
-![Startup information](images/mac-install-success-docker-wait.png)
-
 ## Uninstall or reset
 Choose <img src="images/whale-x.png"> --> **Preferences** from the menu bar, then click **Uninstall / Reset** on the Preferences dialog.
 
@@ -352,7 +349,9 @@ Choose <img src="images/whale-x.png"> --> **Preferences** from the menu bar, the
 
 * **Reset to factory defaults** - Choose this option to reset all options on Docker for Mac to its initial state, the same as when it was first installed.
 
-You can uninstall Docker for Mac from the command line with this command: `<DockerforMacPath> --uninstall`. If Docker is installed in the default location, the following command will provide a clean uninstall.
+You can uninstall Docker for Mac from the command line with this command:
+`<DockerforMacPath> --uninstall`. If Docker is installed in the default
+location, the following command will provide a clean uninstall.
 
 ```shell
 $ /Applications/Docker.app/Contents/MacOS/Docker --uninstall
@@ -370,8 +369,9 @@ If you are using [bash completion](https://www.debian-administration.org/article
 - docker-compose
 may be found inside Docker.app, in the Contents/Resources/etc folder.
 
-To activate bash completion, these files need to be copied or symlinked to
+To activate bash completion, these files need to be copied or symlinked to your
-your bash_completion.d directory. For example, if you use <a href="http://brew.sh/" target="_blank">Homebrew</a>:
+bash_completion.d directory. For example, if you use <a
+href="http://brew.sh/">Homebrew</a>:
 
 ```
 ln -s /Applications/Docker.app/Contents/Resources/etc/docker.bash-completion /usr/local/etc/bash_completion.d/docker
@@ -400,20 +400,13 @@ options at the bottom of each docs page.
 
 * Try out the [Getting Started with Docker](/engine/getstarted/index.md) tutorial.
 
-* Dig in deeper with [learn by example](/engine/tutorials/index.md) tutorials on
+* Follow up by working through the voting app example to learn how to [define and deploy a Docker stack](/engine/getstarted-voting-app/index.md) to a
-  building images, running containers, networking, managing data, and storing
+[swarm](/engine/swarm/index.md). This example shows how to deploy multiple
-  images on Docker Hub.
+containers as services and use new [Compose Version
+3](/compose/compose-file.md#version-3) features.
 
-* See [Example Applications](examples.md) for example applications that include setting up services and databases in Docker Compose.
+* Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example walkthroughs and source code.
-
-* Interested in trying out the new [swarm mode](/engine/swarm/index.md) on Docker Engine v1.12?
-
-    See [Get started with swarm mode](/engine/swarm/swarm-tutorial/index.md), a tutorial which includes specifics on how to leverage your Docker for Mac installation to run single and multi-node swarms.
-
-    Also, try out the Swarm examples in [docker labs](https://github.com/docker/labs/tree/master/swarm-mode/beginner-tutorial). Run the `bash script` and follow the accompanying [Docker Swarm Tutorial](https://github.com/docker/labs/blob/master/swarm-mode/beginner-tutorial/README.md). The script uses Docker Machine to create a multi-node swarm, then walks you through various Swarm tasks and commands.
 
 * For a summary of Docker command line interface (CLI) commands, see [Docker CLI Reference Guide](/engine/reference/index.md).
 
-* Check out the <a href="https://blog.docker.com/2016/06/docker-mac-windows-public-beta/">blog posts</a> on Docker for Mac and Docker for Windows public betas, and <a href="https://blog.docker.com/2016/03/docker-for-mac-windows-beta/">earlier posts</a> on the initial private beta.
+* Check out the blog post [Introducing Docker 1.13.0](https://blog.docker.com/2017/01/whats-new-in-docker-1-13/).
-
-* Please give feedback on your experience with the app and report bugs and problems by logging into our [Docker for Mac forum](https://forums.docker.com/c/docker-for-mac).

docker-for-mac/release-notes.md

@@ -6,17 +6,71 @@ redirect_from:
 title: Docker for Mac release notes
 ---
 
-Here are the main improvements and issues per release, starting with the current release. The documentation is always updated for each release.
+Here are the main improvements and issues per release, starting with the current
+release. The documentation is always updated for each release.
 
-For system requirements, please see the Getting Started topic on [What to know before you install](index.md#what-to-know-before-you-install).
+For system requirements, please see the Getting Started topic on [What to know
+before you install](index.md#what-to-know-before-you-install).
 
-Release notes for _stable_ and _beta_ releases are listed below. You can learn about both kinds of releases, and download stable and beta product installers at [Download Docker for Mac](index.md#download-docker-for-mac).
+Release notes for _stable_ and _beta_ releases are listed below. You can learn
+about both kinds of releases, and download stable and beta product installers at
+[Download Docker for Mac](index.md#download-docker-for-mac).
 
 * [Stable Release Notes](release-notes.md#stable-release-notes)
 * [Beta Release Notes](release-notes.md#beta-release-notes)
 
 ## Stable Release Notes
 
+### Docker for Mac 1.13.0, 2017-01-19 (stable)
+
+**Upgrades**
+
+- [Docker 1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)
+- [Docker Compose 1.10](https://github.com/docker/compose/releases/tag/1.10.0)
+- [Docker Machine 0.9.0](https://github.com/docker/machine/releases/tag/v0.9.0)
+- [Notary 0.4.3](https://github.com/docker/notary/releases/tag/v0.4.3)
+- Linux kernel 4.9.4
+- qcow-tool 0.7.2
+
+**New**
+
+- The storage location of the Linux volume can now be moved
+- Reclaim disk size on reboot
+- You can now edit filesharing paths
+- Memory can be allocated with 256 MiB steps
+- Proxy can now be completely disabled
+- Support for arm, aarch64, ppc64le architectures using qemu
+- Dedicated preference pane for advanced configuration of the
+docker daemon (edit `daemon.json`)
+- Docker Experimental mode can be toggled
+- Better support for Split DNS VPN configurations
+- Use more DNS servers, respect order
+
+**Bug fixes and minor changes**
+
+- You cannot edit settings while docker is restarting
+- Support Copy/Paste in About box
+- Auto update polling every 24h
+- Kernel boots with vsyscall=emulate arg and CONFIG_LEGACY_VSYSCALL is set to NONE in Moby
+- Fixed vsock deadlock under heavy write load
+- If you opt-out of analytics, you're prompted for approval before a bug report is sent
+- Fixed bug where search domain could be read as `DomainName`
+- Dedicated preference pane for HTTP proxy settings
+- Dedicated preference pane for CPU & Memory computing resources
+- Privacy settings moved to the general preference pane
+- Fixed an issue where the preference pane disappeared when the welcome whale menu was closed
+- HyperKit: code cleanup and minor fixes
+- Improvements to Logging and Diagnostics
+- osxfs: switch to libev/kqueue to improve latency
+- VPNKit: improvements to DNS handling
+- VPNKit: Improved diagnostics
+- VPNKit: Forwarded UDP datagrams should have correct source port numbers
+- VPNKit: add a local cache of DNS responses
+- VPNKit: If one request fails, allow other concurrent requests to succeed.
+  For example this allows IPv4 servers to work even if IPv6 is broken.
+- VPNKit: Fix bug that could cause the connection tracking to
+underestimate the number of active connections
+
 ### Docker for Mac 1.12.5, 2016-12-20 (stable)
 
 **Upgrades**
@@ -137,7 +191,8 @@ We did not distribute a 1.12.4 stable release
 * Entries from `/etc/hosts` should now resolve from within containers
 
 * Allow ports to be bound on host addresses other than `0.0.0.0` and `127.0.0.1`
-  Fixes issue reported in [https://github.com/docker/for-mac/issues/68](https://github.com/docker/for-mac/issues/68)
+  Fixes issue reported in
+  [https://github.com/docker/for-mac/issues/68](https://github.com/docker/for-mac/issues/68)
 
 * Use Mac System Configuration database to detect DNS
 
@@ -147,7 +202,8 @@ We did not distribute a 1.12.4 stable release
 
 * Fixed a malfunction of new directories that have the same name as an old directory that is still open
 
-* Rename events now trigger DELETE and/or MODIFY `inotify` events (saving with TextEdit works now)
+* Rename events now trigger DELETE and/or MODIFY `inotify` events
+(saving with TextEdit works now)
 
 * Fixed an issue that caused `inotify` failure and crashes
 

docker-for-windows/index.md

@@ -20,8 +20,7 @@ systems.
 >**Already have Docker for Windows?** If you already have Docker for Windows installed, and are ready to get started, skip down to [Step 3. Check versions of
 Docker Engine, Compose, and
 Machine](#step-3-check-versions-of-docker-engine-compose-and-machine) to work
-through the rest of the Docker for Windows tour, or jump over to the standard
+through the rest of the Docker for Windows tour, or jump over to getting started tutorials at [Learn Docker](/learn.md).
-[Getting Started with Docker](/engine/getstarted/index.md) tutorial.
 
 ## Download Docker for Windows
 
@@ -103,9 +102,7 @@ Windows containers.
 <p />
 * [Setup - Windows Server 2016 (Lab)](https://github.com/docker/labs/blob/master/windows/windows-containers/Setup-Server2016.md) specifically describes environment setup.
 <p />
-* [Switch
+* [Switch between Windows and Linux containers](#switch-between-windows-and-linux-containers) describes the Linux / Windows containers toggle in Docker for Windows and points you to the tutorial mentioned above.
-between Windows and Linux containers (Beta
-feature)](index.md#switch-between-windows-and-linux-containers-beta-feature) describes the Linux / Windows containers toggle in Docker for Windows and points you to the tutorial mentioned above.
 <p />
 * Docker Container Platform for Windows Server 2016 [articles and blog posts](https://www.docker.com/microsoft) on the Docker website
 
@@ -367,6 +364,7 @@ display options through taskbar settings for notifications.
 
 To get a popup menu with application options, right-click the whale:
 
+
 ![Docker for Windows popup menu](images/config-popup-menu-win.png)
 
 The **Settings** dialogs provide options to allow Docker auto-start,
@@ -374,13 +372,6 @@ automatically check for updates, share local drives with Docker containers,
 enable VPN compatibility, manage CPUs and memory Docker uses, restart Docker, or
 perform a factory reset.
 
-**Beta 26 and newer** include an option to switch between Windows and Linux
-**conatiners. See [Switch between Windows and Linux containers (Beta
-**feature)](index.md#switch-between-windows-and-linux-containers-beta-feature).
-**This is not yet available on stable builds.
-
-![Beta 26 popup with switch for Windows or Linux containers](images/config-popup-menu-win-switch-containers.png)
-
 ### General
 
 ![Settings](images/settings-general.png)
@@ -415,7 +406,7 @@ one used here to set up sharing, your containers will not have permissions to
 access the mounted volumes.
 
 >**Tip:** Shared drives are only required for volume mounting [Linux
-containers](#switch-between-windows-and-linux-containers-beta-feature), and not
+containers](#switch-between-windows-and-linux-containers), and not
 for Windows containers. For Linux containers, you need to share the drive where your project is located (i.e., where the Dockerfile and
 volume are located). Runtime errors such as file not found or cannot start
 service may indicate shared drives are needed. (See also [Volume mounting
@@ -495,30 +486,13 @@ When your proxy configuration changes, Docker restarts automatically to pick up
 If you have containers that you wish to keep running across restarts, you should consider using [restart policies](/engine/reference/run/#restart-policies-restart)
 
 ### Docker daemon
-You can configure options on the Docker daemon in the given JSON configuration file, and determine how your containers will run.
 
-![Docker Daemon](images/docker-daemon.png)
+You can configure options on the Docker daemon that determine how your
+containers will run. You can configure some **Basic** options on the daemon with interactive settings, or switch to **Advanced** to edit the JSON directly.
 
-For a full list of options on the Docker daemon, see [daemon](/engine/reference/commandline/dockerd/){:target="_blank"} in the Docker Engine command line reference.
+The settings offered on **Basic** dialog can be
-
+configured directly in the JSON as well. This version just surfaces
-In that topic, see also:
+some of the commmon settings to make it easier to configure them.
-
-* [Daemon configuration file](/engine/reference/commandline/dockerd/#/daemon-configuration-file)
-
-* [Linux configuration file](/engine/reference/commandline/dockerd/#/linux-configuration-file)
-
-* [Windows configuration file](/engine/reference/commandline/dockerd/#/windows-configuration-file)
-
-Note that updating these settings requires a reconfiguration and reboot of the Linux VM.
-
-#### Docker daemon basic and advanced (Beta features)
-
-Starting with Beta 34, you can configure some **Basic** options on the daemon
-with interactive settings, or switch to **Advanced** to edit the JSON directly.
-
-Note that the settings offered on **Basic** dialog can be configured directly in
-the JSON. This version just surfaces some of the commmon settings to make it
-easier to configure them.
 
 * [Experimental mode](#experimental-mode)
 * [Custom registries](#custom-registries)
@@ -526,15 +500,15 @@ easier to configure them.
 
 ![Docker Daemon](images/docker-daemon_basic.png)
 
-##### Experimental mode
+#### Experimental mode
 
 By default, Docker for Windows Beta releases use the experimental version of
 Docker Engine, described in the [Docker Experimental Features
 README](https://github.com/docker/docker/tree/master/experimental) on GitHub.
-Starting with Beta 34, you can toggle **experimental mode** on and off via the
+Starting with Beta 34 and Stable 1.13.0, you can toggle **experimental mode** on and off via the
 **Basic** Daemon settings. If you toggle it off, Docker for Windows Beta uses the
 current generally available release of Docker Engine, the same as Stable Docker
-for Windows versions uses.
+for Windows versions uses by default.
 
 You can check whether you are running experimental mode or not by typing `docker
 version` in a PowerShell. Experimental mode is listed under `Server` data.
@@ -561,9 +535,9 @@ Server:
  Experimental: true
 ```
 
-##### Custom registries
+#### Custom registries
 
-Also starting with with Beta 34, you can set up your own
+Also starting with with Beta 34 and Stable 1.13.0, you can set up your own
 [registries](/registry/introduction.md) on the **Basic** Daemon settings.
 
 As an alternative to using [Docker Hub](https://hub.docker.com/) to store your
@@ -574,21 +548,30 @@ registries and registry mirrors on which to host your images. (See also, [How do
 I add custom CA certificates?](faqs.md#how-do-i-add-custom-ca-certificates) in
 the FAQs.)
 
-##### Edit the daemon configuration file
+#### Edit the daemon configuration file
 
 The **Advanced** daemon settings provide the original option to directly edit
 the JSON configuration file for the <a
-href="/engine/reference/commandline/dockerd/"
+href="/engine/reference/commandline/dockerd/>daemon</a>.
-target="_blank">daemon</a>. (This is the only option currently available on stable releases, as described in [Docker daemon](#docker-daemon).)
 
 ![Docker Daemon](images/docker-daemon_advanced.png)
 
+For a full list of options on the Docker daemon, see [daemon](/engine/reference/commandline/dockerd/) in the Docker Engine command line reference.
+
+In that topic, see also:
+
+* [Daemon configuration file](/engine/reference/commandline/dockerd/#/daemon-configuration-file)
+
+* [Linux configuration file](/engine/reference/commandline/dockerd/#/linux-configuration-file)
+
+* [Windows configuration file](/engine/reference/commandline/dockerd/#/windows-configuration-file)
+
 Note that updating these settings requires a reconfiguration and reboot of the
 Linux VM.
 
-### Switch between Windows and Linux containers (Beta feature)
+### Switch between Windows and Linux containers
 
-Starting with Beta 26, you can select which daemon (Linux or Windows) the Docker
+Starting with Beta 26 and Stable 1.13.0, you can select which daemon (Linux or Windows) the Docker
 CLI talks to. Select **Switch to Windows containers** to toggle to Windows
 containers. Select **Switch to Linux containers**.
 
@@ -596,7 +579,15 @@ Microsoft Developer Network has preliminary/draft information on Windows
 containers
 [here](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/about/about_overview).
 
-This feature is not yet available on stable builds.
+For a full list of options on the Docker daemon, see [daemon](/engine/reference/commandline/dockerd/) in the Docker Engine command line reference.
+
+In that topic, see also:
+
+* [Daemon configuration file](/engine/reference/commandline/dockerd/#/daemon-configuration-file)
+
+* [Linux configuration file](/engine/reference/commandline/dockerd/#/linux-configuration-file)
+
+* [Windows configuration file](/engine/reference/commandline/dockerd/#/windows-configuration-file)
 
 #### Getting started with Windows containers
 
@@ -626,10 +617,6 @@ containers:
   * [Diagnose and Feedback](#diagnose-and-feedback)
   * [Reset](#reset)
 
-(Per the release notes, these dialogs are newly implemented for Windows
-containers mode in [Beta
-32](release-notes.md#beta-32-release-notes-2016-12-07-1130-rc3-beta32)).
-
 Keep in mind that if you set proxies or daemon configuration in Windows
 containers mode, these apply only on Windows containers. If you switch back to
 Linux containers, proxies and daemon configurations return to what you had set
@@ -643,7 +630,6 @@ because they do not apply to Windows containers:
   * [Network](#network)
   * [Advanced (CPU and Memory configuration)](#advanced)
 
-
 ### Giving feedback and getting help
 
 To get help from the community, review current user topics, join or start a
@@ -693,18 +679,13 @@ If you want to go back to using Docker Toolbox, you have to disable the Hyper-V
 
 * Try out the [Getting Started with Docker](/engine/getstarted/index.md) tutorial.
 
-* Dig in deeper with [learn by example](/engine/tutorials/index.md) tutorials on building images, running containers, networking, managing data, and storing images on Docker Hub.
+* Follow up by working through the voting app example to learn how to [define and deploy a Docker stack](/engine/getstarted-voting-app/index.md) to a
+[swarm](/engine/swarm/index.md). This example shows how to deploy multiple
+containers as services and use new [Compose Version
+3](/compose/compose-file.md#version-3) features.
 
-* See [Example Applications](examples.md) for example applications that include setting up services and databases in Docker Compose.
+* Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example walkthroughs and source code.
-
-* Interested in trying out the new [swarm mode](/engine/swarm/index.md) on Docker Engine v1.12?
-
-    See [Get started with swarm mode](/engine/swarm/swarm-tutorial/index.md), a tutorial which includes specifics on how to leverage your Docker for Windows installation to run single and multi-node swarms.
-
-    Also, try out the Swarm examples in [docker labs](https://github.com/docker/labs/tree/master/swarm-mode/beginner-tutorial). Run the `bash script` and follow the accompanying [Docker Swarm Tutorial](https://github.com/docker/labs/blob/master/swarm-mode/beginner-tutorial/README.md). The script uses Docker Machine to create a multi-node swarm, then walks you through various Swarm tasks and commands.
 
 * For a summary of Docker command line interface (CLI) commands, see [Docker CLI Reference Guide](/engine/reference/index.md).
 
-* Check out the <a href="https://blog.docker.com/2016/06/docker-mac-windows-public-beta/">blog posts</a> on Docker for Mac and Docker for Windows public betas, and <a href="https://blog.docker.com/2016/03/docker-for-mac-windows-beta/">earlier posts</a> on the initial private beta.
+* Check out the blog post [Introducing Docker 1.13.0](https://blog.docker.com/2017/01/whats-new-in-docker-1-13/).
-
-* Please give feedback on your experience with the app and report bugs and problems by logging into our [Docker for Windows forum](https://forums.docker.com/c/docker-for-windows).

docker-for-windows/release-notes.md

@@ -22,6 +22,45 @@ about both kinds of releases, and download stable and beta product installers at
 
 ## Stable Release Notes
 
+### Docker for Windows 1.13.0, 2017-01-19 (stable)
+
+**Upgrades**
+
+- [Docker 1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)
+- [Docker Compose 1.10](https://github.com/docker/compose/releases/tag/1.10.0)
+- [Docker Machine 0.9.0](https://github.com/docker/machine/releases/tag/v0.9.0)
+- [Notary 0.4.3](https://github.com/docker/notary/releases/tag/v0.4.3)
+- Linux kernel 4.9.4
+
+**New**
+
+- Windows containers
+- Improved UI for Daemon.json editing
+- VHDX file containing images and non-host mounted volumes can be moved
+  (using "advanced" tab in the UI)
+- Support for arm, aarch64, ppc64le architectures using qemu
+- TRIM support for disk (shrinks virtual disk)
+- VM's time synchronization is forced after the host wakes from sleep mode
+- Docker Experimental mode can be toggled
+
+**Bug fixes and minor changes**
+
+- Improved Proxy UI
+- Improvements to Logging and Diagnostics
+- About Box is now Copy/Paste enabled
+- Improvements in drive sharing code
+- Optimized boot process
+- Trend Micro Office Scan made the Api proxy think no drive was shared
+- Show a link to the virtualization documentation
+- Always remove the disk on factory reset
+- VPNKit: Improved diagnostics
+- VPNKit: Forwarded UDP datagrams should have correct source port numbers
+- VPNKit: If one request fails, allow other concurrent requests to succeed.
+  For example this allows IPv4 servers to work even if IPv6 is broken.
+- VPNKit: Fix bug which could cause the connection tracking to
+  underestimate the number of active connections
+- VPNKit: add a local cache of DNS responses
+
 ### Docker for Windows 1.12.5, 2016-12-20 (stable)
 
 **Upgrades**

docker-for-windows/troubleshoot.md

@@ -72,7 +72,7 @@ Drives** and share the drive that contains the Dockerfile and volume.
 ### Verify domain user has permissions for shared drives (volumes)
 
 >**Tip:** Shared drives are only required for volume mounting [Linux
-containers](index.md#switch-between-windows-and-linux-containers-beta-feature),
+containers](index.md#switch-between-windows-and-linux-containers),
 not Windows containers.
 
 Permissions to access shared drives are tied to the username and password you