Docker for Desktop updates (#6194)

docker-for-mac/index.md

@@ -16,24 +16,15 @@ toc_max: 4
 toc_min: 1
 ---
 
-Welcome to Docker for Mac!
+Welcome to Docker for Mac! Docker is a full development platform for creating
+containerized apps, and Docker for Mac is the best way to get started with
+Docker _on a Mac_.
 
-Docker is a full development platform for creating containerized apps, and
+> See [Install Docker for Mac](install.md){: target="_blank" class="_"} for information on system requirements and stable & edge channels.
-Docker for Mac is the best way to get started with Docker on a Mac.
 
-> **Got Docker for Mac?** If you have not yet installed Docker for Mac,
+## Check versions
-> see [Install Docker for Mac](install.md) for an explanation of stable and edge
-> channels, system requirements, and download/install information.
 
->**Looking for system requirements?** Check out
+Ensure your versions of `docker`, `docker-compose`, and `docker-machine` are up-to-date and compatible with `Docker.app`. Your output may differ if you are running different versions.
-> [What to know before you install](install.md#what-to-know-before-you-install),
-> which has moved to the new install topic.
-{: id="what-to-know-before-you-install" }
-
-## Check versions of Docker Engine, Compose, and Machine
-
-Run these commands to test if your versions of `docker`, `docker-compose`, and
-`docker-machine` are up-to-date and compatible with `Docker.app`.
 
 ```shell
 $ docker --version
@@ -46,262 +37,205 @@ $ docker-machine --version
 docker-machine version {{ site.machine_version }}, build 9ba6da9
 ```
 
-> **Note**: The above is an example. Your output may differ if you are running
+## Explore the application
-> different versions.
 
-## Explore the application and run examples
+1.  Open a command-line terminal and test that your installation works by
+    running the simple Docker image, [hello-world](https://hub.docker.com/_/hello-world/){: target="_blank" class="_"}:
 
-1.  Open a command-line terminal, and run some Docker commands to verify that
+    ```shell
-    Docker is working as expected.
+    $ docker run hello-world
 
-	  Some good commands to try are `docker version` to check that you have the
+    Unable to find image 'hello-world:latest' locally
-    latest release installed, and `docker ps` and `docker run hello-world` to
+    latest: Pulling from library/hello-world
-    verify that Docker is running.
+    ca4f61b1923c: Pull complete
+    Digest: sha256:ca0eeb6fb05351dfc8759c20733c91def84cb8007aa89a5bf606bc8b315b9fc7
+    Status: Downloaded newer image for hello-world:latest
 
-2.  For something more adventurous, start a Dockerized web server.
+    Hello from Docker!
-
+    This message shows that your installation appears to be working correctly.
-    ```bash
+    ...
-    docker run -d -p 80:80 --name webserver nginx
     ```
 
-    If the image is not found locally, Docker pulls it from Docker Hub.
+2.  Start a Dockerized web server. Like the hello-world image above, if the
+    image is not found locally, Docker pulls it from Docker Hub.
 
-    In a web browser, go to `http://localhost/` to bring up the home page.
+    ```bash
-    (Since you specified the default HTTP port, it isn't necessary to append
+    $ docker run -d -p 80:80 --name webserver nginx
-    `:80` at the end of the URL.)
+    ```
 
-    ![nginx home page](images/hello-world-nginx.png)
+3.  In a web browser, go to `http://localhost/` to view the nginx homepage. Because we specified the default HTTP port, it isn't necessary to append `:80` at the end of the URL.
 
-    > **Note**: Early beta releases used `docker` as the hostname to build the
+    ![nginx home page](images/hello-world-nginx.png){:width="500px"}
+
+    > Early beta releases used `docker` as the hostname to build the
     > URL. Now, ports are exposed on the private IP addresses of the VM and
-    > forwarded to `localhost` with no other host name set. See also,
+    > forwarded to `localhost` with no other host name set.
-    > [Release Notes](release-notes.md) for Beta 9.
 
-3.  Run `docker ps` while your web server is running to see details on the
+4.  View the details on the container while your web server is running (with `docker container ls` or `docker ps`):
-    webserver container.
 
     ```none
+    $ docker container ls
     CONTAINER ID   IMAGE   COMMAND                  CREATED              STATUS              PORTS                         NAMES
     56f433965490   nginx   "nginx -g 'daemon off"   About a minute ago   Up About a minute   0.0.0.0:80->80/tcp, 443/tcp   webserver
     ```
-4.  Stop or remove containers and images.
 
-    The `nginx` webserver continues to run in the container on that port
+5.  Stop and remove containers and images with the following commands. Use the "all" flag (`--all` or `-a`) to view stopped containers.
-    until you stop and/or remove the container. If you want to stop the
-    webserver, type: `docker container stop webserver` and start it again with `docker
-    start webserver`. A stopped container does not show up with `docker ps`; for
-    that, you need to run `docker ps -a`.
 
-    To stop and remove the running container with a single command, type:
+    ```shell
-    `docker container rm -f webserver`. This removes the container, but not the
+    $ docker container ls
-    `nginx` image. You can list local images with `docker image ls`. You might
+    $ docker container stop webserver
-    want to keep some images around so that you don't need to pull them again
+    $ docker container ls -a
-    from Docker Hub. To remove an image you no longer need, use `docker image rm` followed by an image ID or image name. For example, `docker image rm nginx`.
+    $ docker container rm webserver
+    $ docker image ls
+    $ docker image rm nginx
+    ```
 
-**Want more example applications?** [Get Started](/get-started/) and [Samples](/samples/) are great places to start.
+## Preferences menu
 
-## Preferences
+Choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} -> **Preferences** from the menu bar and configure the runtime options described below.
 
-Choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} ->
+![Docker context menu](images/menu/d4m-menu-prefs.png){:width="250px"}
-**Preferences** from the menu bar.
 
-![Docker context menu](images/menu-prefs-selected.png)
+### General tab
 
-You can set the following runtime options.
+![Preferences](/docker-for-mac/images/menu/d4m-menu-prefs-general.png){:width="400px"}
 
->**Note:** The above example shows a user signed in for integrated
+Gneral settings are:
-Docker Cloud access. To learn more about the feature,
-see [Docker Cloud](#docker-cloud).
 
-### General
+- **Start Docker when you log in**: Uncheck this option if you don't want Docker to start when you open your session.
 
-![Preferences](/docker-for-mac/images/settings.png)
+- **Automatically check for updates** notifies you when an update is available.
+  Click **OK** to accept and install updates (or cancel to keep the current
+  version). If you disable this option, you can still find out about updates
+  manually by choosing ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} -> **Check for Updates**.
 
-#### Auto-start, update, backups, usage data
+- **Include VM in Time Machine backups** backs up the Docker for Mac virtual machine. (Disabled by default.)
 
-* Docker for Mac is set to automatically **start Docker when you log in**.
+- **Securely store Docker logins in MacOS keychain** stores your Docker login credentials. (Enabled by default.)
-  Uncheck this option if you don't want Docker to start when you
-  open your session.
 
-* Docker for Mac is set to **automatically check for updates** and notify
+- **Send usage statistics** — Send diagnostics, crash reports, and usage data to Docker. This information helps Docker improve the application and get more context for troubleshooting problems. (Enabled by default.)
-  you when an update is available. If an update is found, click **OK** to accept
-and install it (or cancel to keep the current version). If you disable the check
-for updates, you can still find out about updates manually by choosing ![whale
-menu](/docker-for-mac/images/whale-x.png){: .inline} -> **Check for Updates**.
 
-* Check **Include VM in Time Machine backups** to back up the Docker for Mac virtual machine. (By default, this is unchecked.)
+### File sharing tab
 
-* You have the option to **Securely store Docker logins in MacOS keychain**,
+Choose which local directories to share with your containers. File sharing is
-  enabled by default. To "opt out" of storing your Docker login credentials,
+required for volume mounting if the project lives outside of the `/Users`
-  uncheck this option.
+directory. In that case, share the drive where the Dockerfile and volume are
+located. Otherwise, you get `file not found` or `cannot start service errors at
+runtime`.
 
-* **Send usage statistics** — You can set Docker for Mac to auto-send
+![File Sharing](images/menu/d4m-menu-prefs-fileshare.png){:width="400px"}
-  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.
 
-### File sharing
+File share settings are:
 
-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.
 
-* **Add a Directory** - Click `+` and navigate to the directory you
+- **Apply & Restart** makes the directory available to containers using Docker's bind mount (`-v`) feature.
-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 be a subdirectory of an already shared directory.
+  - They cannot already exist inside of Docker.
 
-  * They cannot already exist inside of Docker.
+For more information, see:
 
-See [Namespaces](osxfs.md#namespaces) in the topic on
+- [Namespaces](osxfs.md#namespaces){: target="_blank" class="_"} in the topic on [osxfs file system sharing](osxfs.md).
-[osxfs file system sharing](osxfs.md) for more information.
+- [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).)
 
-> **Tip**: File sharing is required for volume mounting if the project lives
+### Advanced tab
-> outside of the `/Users` directory. In that case, share the drive where the
-> Dockerfile and volume are located. Otherwise, you 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).)
 
+On the Advanced tab, you can limit resources available to Docker.
 
-### Advanced
+![Advanced Preference settings-advanced](images/menu/d4m-menu-prefs-advanced.png){:width="400px"}
 
-![Advanced Preference settings-advanced](images/settings-advanced.png)
+Advanced settings are:
 
+**CPUs**: By default, Docker for Mac is set to use half the number of processors available
+on the host machine. To increase processing power, set this to a higher number;
+to decrease, lower the number.
 
-#### CPUs
+**Memory**: By default, Docker for Mac is set to use `2` GB runtime memory, allocated from
+the total available memory on your Mac. To increase RAM, set this to a higher number;
+to decrease it, lower the number.
 
-By default, Docker for Mac is set to use half the number of processors available on the host machine. You can increase
+**Swap**: Configure swappiness as needed. The default is 1.
-processing power for the app by setting this to a higher number, or lower it to
-have Docker for Mac use fewer computing resources.
 
-#### Memory
+### Disk tab
 
-By default, Docker for Mac is set to use `2` GB runtime memory, allocated from
+Specify the **Disk image location** of the Linux volume, where containers and images are stored.
-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.
 
-#### Disk image location (storage)
+You can also move the disk image location. If you attempt to move the disk image
+to a location that already has one, you get a prompt asking if you want to use
+the existing image or replace it.
 
-You can specify the **Disk image location** of the Linux volume, which is where
+![Proxies settings](/docker-for-mac/images/menu/d4m-menu-prefs-disk.png){:width="400px"}
-containers and images are stored.
 
-You can move the disk image location.
+### Proxies tab
-
-If you attempt to move the disk image to a location that
-already has one, you get a prompt asking if you want to use the existing
-image or replace it.
-
-![Advanced settings](images/settings-advanced-beta.png)
-
-### HTTP proxy settings
 
 Docker for Mac detects 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 uses this proxy when pulling
 containers.
 
-![Proxies settings](/docker-for-mac/images/settings-proxies.png)
+![Proxies settings](/docker-for-mac/images/menu/d4m-menu-prefs-proxies.png){:width="400px"}
 
 <p id="daemon-experimental-mode" />
 
-### Docker Daemon
+### Daemon tab
 
-You can configure options on the Docker daemon that determine how your
+You can configure options on the Docker daemon that determine how your containers run.
-containers run. You can configure some **Basic** options on the daemon with
-interactive settings, or switch to **Advanced** to edit the JSON directly.
 
-The settings offered on **Basic** dialog can be
+Select **Basic** to configure the daemon with interactive settings, or select
-configured directly in the JSON as well. This version just surfaces
+**Advanced** to edit the JSON directly.
-some of the common settings to make it easier to configure them.
 
-* [Experimental mode](#experimental-mode)
+![Daemon](/docker-for-mac/images/menu/d4m-menu-prefs-daemon-basic.png){:width="400px"}
-* [Custom registries](#custom-registries)
-* [Edit the daemon configuration file](#edit-the-daemon-configuration-file)
 
-![Daemon](/docker-for-mac/images/settings-advanced-experimental-beta.png)
 
-#### Experimental mode
+#### Experimental features
 
 Both Docker for Mac Stable and Edge releases have experimental features enabled
-on Docker Engine, as described in the [Docker Experimental Features
+on Docker Engine, as described [Docker Experimental Features README](https://github.com/docker/docker-ce/blob/master/components/cli/experimental/README.md){: target="_blank" class="_"}. If you uncheck **experimental mode**, Docker for Mac uses the current generally available
-README](https://github.com/moby/moby/blob/master/experimental/README.md) on
-GitHub.
-
-Experimental features are not appropriate for production environments or
-workloads. They are meant to be sandbox experiments for new ideas. Some
-experimental features may become incorporated into upcoming stable releases, but
-others may be modified or pulled from subsequent Edge releases, and never
-released on Stable.
-
-On both Edge and Stable releases, you can toggle **experimental mode** on and
-off. If you toggle it off, Docker for Mac uses the current generally available
 release of Docker Engine.
 
-You can check whether you are running experimental mode or not by typing `docker
+> Don't enable experimental features in production
-version` on the command line. Experimental mode is listed under `Server` data.
+>
-If `Experimental` is `true`, then Docker is running in experimental mode, as
+> Experimental features are not appropriate for production environments or workloads. They are meant to be sandbox experiments for new ideas. Some experimental features may become incorporated into upcoming stable releases, but others may be modified or pulled from subsequent Edge releases, and never released on Stable.
-shown here. (If `false`, Experimental mode is off.)
+
+You can see whether you are running experimental mode at the command line. If
+`Experimental` is `true`, then Docker is running in experimental mode, as shown
+here. (If `false`, Experimental mode is off.)
 
 ```bash
-$ docker version
+{% raw %}$ docker version -f {{.Server.Experimental}}{% endraw %}
-Client:
+true
- Version:      1.13.0-rc3
- API version:  1.25
- Go version:   go1.7.3
- Git commit:   4d92237
- Built:        Tue Dec  6 01:15:44 2016
- OS/Arch:      darwin/amd64
-
-Server:
- Version:      1.13.0-rc3
- API version:  1.25 (minimum version 1.12)
- Go version:   go1.7.3
- Git commit:   4d92237
- Built:        Tue Dec  6 01:15:44 2016
- OS/Arch:      linux/amd64
- Experimental: true
 ```
 
-#### Custom registries
+#### Insecure registries
 
-As an alternative to using [Docker Hub](https://hub.docker.com/) to store your
+You can set up a custom and insecure [registry](/registry/introduction.md){: target="_blank" class="_"}
-public or private images or [Docker Trusted
+to store your public or private images (instead of using [Docker Hub](https://hub.docker.com/){:target="_blank" class="_"}
-Registry](/datacenter/dtr/2.1/guides/index.md), you can use Docker to set up
+or [Docker Trusted Registry](/datacenter/dtr/2.1/guides/index.md)).
-your own insecure [registry](/registry/introduction.md). Add URLs for insecure
+Add URLs for your insecure registries and registry mirrors on which to host your images.
-registries and registry mirrors on which to host your images.
 
-See also, [How do I add custom CA
+See also:
-certificates?](/docker-for-mac/faqs.md#how-do-i-add-custom-ca-certificates) and
+- [How do I add custom CA certificates?](/docker-for-mac/faqs.md#how-do-i-add-custom-ca-certificates){:target="_blank" class="_"}
-[How do I add client
+- [How do I add client certificates](/docker-for-mac/faqs.md#how-do-i-client-certificates){:target="_blank" class="_"}
-certificates](/docker-for-mac/faqs.md#how-do-i-client-certificates) in the FAQs.
 
-#### Edit the daemon configuration file
+#### Daemon configuration file
 
-On the **Daemon -> Advanced dialog**, you can directly configure the daemon from
+Click the **Advanced** tab to configure the daemon from the JSON file. For a full
-the JSON file, and determine entirely how your containers run. For a full
+list of options, see the Docker Engine [dockerd commandline reference](/engine/reference/commandline/dockerd.md){:target="_blank" class="_"}.
-list of options on the Docker daemon, see
-[daemon](/engine/reference/commandline/dockerd.md) in the Docker Engine
-command line reference.
 
-After editing the daemon configuration , click **Apply & Restart** to save it
+Click **Apply & Restart** to save your settings and reboot Docker. Or, to cancel
-and reboot Docker. Or, to cancel changes, click another preference tab, then
+changes, click another preference tab, then choose to discard or not apply changes when asked.
-choose to discard or not apply changes when asked.
 
-![Docker Daemon](/docker-for-mac/images/settings-daemon-beta.png)
+![Docker Daemon](/docker-for-mac/images/menu/d4m-menu-prefs-daemon-adv.png){:width="400px"}
 
-### Kubernetes
+### Kubernetes tab
 
-**Kubernetes is only available in Docker for Mac 17.12 CE and higher, on the Edge
+**Kubernetes is only available in Docker for Mac 17.12 CE and higher, on the Edge channel.**
-channel.** Kubernetes support is not included in Docker for Mac Stable releases.
+Kubernetes support is not included in Docker for Mac Stable releases. To find
-To find out more about Stable and Edge channels and how to switch between them,
+out more about Stable and Edge channels and how to switch between them, see
-see [General configuration](/docker-for-mac/#general).
+[General configuration](/docker-for-mac/#general){:target="_blank" class="_"}.
 
 Docker for Mac 17.12 CE (and higher) Edge includes a standalone Kubernetes server
 that runs on your Mac, so that you can test deploying your Docker workloads on
@@ -313,8 +247,8 @@ pointing to some other environment, such as `minikube` or a GKE cluster, be sure
 to change context so that `kubectl` is pointing to `docker-for-desktop`:
 
 ```bash
-kubectl config get-contexts
+$ kubectl config get-contexts
-kubectl config use-context docker-for-desktop
+$ kubectl config use-context docker-for-desktop
 ```
 
 If you installed `kubectl` with Homebrew, or by some other method, and
@@ -322,20 +256,23 @@ experience conflicts, remove `/usr/local/bin/kubectl`.
 
 - To enable Kubernetes support and install a standalone instance of Kubernetes
   running as a Docker container, select **Enable Kubernetes** and click the
-  **Apply and restart** button.
+  **Apply** button.
 
-  ![Enable Kubernetes](/docker-for-mac/images/kubernetes/kubernetes-enable.png)
+  ![Enable Kubernetes](/docker-for-mac/images/menu/d4m-menu-prefs-kubernetes.png){: .with-border width="400px"}
 
-  An internet connection is required. Images required to run the Kubernetes
+
+  An Internet connection is required. Images required to run the Kubernetes
   server are downloaded and instantiated as containers, and the
   `/usr/local/bin/kubectl` command is installed on your Mac.
 
-  ![Installation complete](/docker-for-mac/images/kubernetes/kubernetes-install-complete.png)
-
   When Kubernetes is enabled and running, an additional status bar item displays
   at the bottom right of the Docker for Mac Preferences dialog.
 
-  ![Kubernetes status](/docker-for-mac/images/kubernetes/kubernetes-status.png)
+  ![Installation complete](/docker-for-mac/images/kubernetes/kubernetes-install-complete.png){:width="400px"}
+
+  The status of Kubernetes shows in the Docker menu and the context points to `docker-for-desktop`.
+
+  ![Docker Menu with Kubernetes](/docker-for-mac/images/menu/d4m-menu-kube-context.png){: .with-border width="400px"}
 
 - By default, Kubernetes containers are hidden from commands like `docker
   service ls`, because managing them manually is not supported. To make them
@@ -347,38 +284,41 @@ experience conflicts, remove `/usr/local/bin/kubectl`.
   `/usr/local/bin/kubectl` command is removed.
 
   For more about using the Kubernetes integration with
-  Docker for Mac, see [Deploy to Kubernetes](/docker-for-mac/kubernetes.md).
+  Docker for Mac, see [Deploy to Kubernetes](/docker-for-mac/kubernetes.md){:target="_blank" class="_"}.
 
-## Uninstall or reset
+### Reset tab
-Choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} ->
-**Preferences** from the menu bar, then click **Uninstall / Reset** on the
-Preferences dialog.
 
-![Uninstall or reset Docker](images/settings-uninstall.png)
+Select ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} ->
+**Preferences** from the menu bar, then click **Reset** to reset factory
+defaults, restart the Docker daemon, or uninstall.
+
+![Uninstall or reset Docker](images/menu/d4m-menu-prefs-reset.png){:width="400px"}
+
+Reset settings are:
+
+* **Restart** - Select to restart the Docker daemon.
 
 * **Remove all data** - This option removes/resets all Docker data _without_
 a reset to factory defaults (which would cause you to lose settings).
 
-* **Uninstall** - Choose this option to remove Docker for Mac from your system.
-
 * **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.
 
+  * **Uninstall** - Choose this option to remove Docker for Mac from your system.
 
-### Uninstall from the command line
+> Uninstall Docker for Mac from the commandline
-
+>
-Alternatively, you can uninstall Docker for Mac from the command line with this
+> To uninstall Docker from Mac from a terminal, run: `<DockerforMacPath> --uninstall`.
-command: `<DockerforMacPath> --uninstall`. If Docker is installed in the default
+> If your instance is installed in the default location, this command provides a
-location, the following command provides a clean uninstall.
+> clean uninstall:
-
+>
-```shell
+> ```shell
-$ /Applications/Docker.app/Contents/MacOS/Docker --uninstall
+> $ /Applications/Docker.app/Contents/MacOS/Docker --uninstall
-Docker is running, exiting...
+> Docker is running, exiting...
-Docker uninstalled successfully. You can move the Docker application to the trash.
+> Docker uninstalled successfully. You can move the Docker application to the trash.
-```
+> ```
-
+> You might want to use the command-line uninstall if, for example, you find that
-You might want to use the command-line uninstall if, for example, you find that
+> the app is non-functional, and you cannot uninstall it from the menu.
-the app is non-functional, and you cannot uninstall it from the menu.
 
 ## Add TLS certificates
 
@@ -399,26 +339,24 @@ the certificate to the macOS keychain, which is picked up by Docker for
 Mac. Here is an example.
 
 ```bash
-sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain ca.crt
+$ sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain ca.crt
 ```
 
 Or, if you prefer to add the certificate to your own local keychain only (rather
 than for all users), run this command instead:
 
 ```
-security add-trusted-cert -d -r trustRoot -k ~/Library/Keychains/login.keychain ca.crt
+$ security add-trusted-cert -d -r trustRoot -k ~/Library/Keychains/login.keychain ca.crt
 ```
 
-See also, [Directory structures for
+See also, [Directory structures for certificates](#directory-structures-for-certificates).
-certificates](#directory-structures-for-certificates).
 
 > **Note:** You need to restart Docker for Mac after making any changes to
 the keychain or to the `~/.docker/certs.d` directory in order for
 the changes to take effect.
 
-For a complete explanation of how to do this, see the blog post [Adding
+For a complete explanation of how to do this, see the blog post
-Self-signed Registry Certs to Docker & Docker for
+[Adding Self-signed Registry Certs to Docker & Docker for Mac](http://container-solutions.com/adding-self-signed-registry-certs-docker-mac/){:target="_blank" class="_"}.
-Mac](http://container-solutions.com/adding-self-signed-registry-certs-docker-mac/).
 
 ### Add client certificates
 
@@ -430,16 +368,16 @@ When the Docker for Mac application starts up, it copies the `~/.docker/certs.d`
 folder on your Mac to the `/etc/docker/certs.d` directory on Moby (the Docker
 for Mac `xhyve` virtual machine).
 
-> * You need to restart Docker for Mac after making any changes to
+> * You need to restart Docker for Mac after making any changes to the keychain
- the keychain or to the `~/.docker/certs.d` directory in order for
+> or to the `~/.docker/certs.d` directory in order for the changes to take
- the changes to take effect.
+> effect.
 >
 > * The registry cannot be listed as an _insecure registry_ (see [Docker
-Daemon](/docker-for-mac/index.md#docker-daemon)). Docker for Mac ignores
+> Daemon](/docker-for-mac/index.md#docker-daemon)). Docker for Mac ignores
-certificates listed under insecure registries, and does not send client
+> certificates listed under insecure registries, and does not send client
-certificates. Commands like `docker run` that attempt to pull from
+> certificates. Commands like `docker run` that attempt to pull from the
-the registry produce error messages on the command line, as well as on the
+> registry produce error messages on the command line, as well as on the
-registry.
+> registry.
 
 ### Directory structures for certificates
 
@@ -490,43 +428,42 @@ installed both in Bash and Zsh.
 
 ### Bash
 
-Bash has [built-in support for completion](https://www.debian-administration.org/article/316/An_introduction_to_bash_completion_part_1)
+Bash has [built-in support for completion](https://www.debian-administration.org/article/316/An_introduction_to_bash_completion_part_1){:target="_blank" class="_"}
 To activate completion for Docker commands, these files need to be copied or
 symlinked to your `bash_completion.d/` directory. For example, if you installed
 bash via [Homebrew](http://brew.sh/):
 
 ```bash
-ln -s /Applications/Docker.app/Contents/Resources/etc/docker.bash-completion $(brew --prefix)/etc/bash_completion.d/docker
+etc=/Applications/Docker.app/Contents/Resources/etc
-ln -s /Applications/Docker.app/Contents/Resources/etc/docker-machine.bash-completion $(brew --prefix)/etc/bash_completion.d/docker-machine
+ln -s $etc/docker.bash-completion $(brew --prefix)/etc/bash_completion.d/docker
-ln -s /Applications/Docker.app/Contents/Resources/etc/docker-compose.bash-completion $(brew --prefix)/etc/bash_completion.d/docker-compose
+ln -s $etc/docker-machine.bash-completion $(brew --prefix)/etc/bash_completion.d/docker-machine
+ln -s $etc/docker-compose.bash-completion $(brew --prefix)/etc/bash_completion.d/docker-compose
 ```
 
 ### Zsh
 
-In Zsh, the [completion system](http://zsh.sourceforge.net/Doc/Release/Completion-System.html)
+In Zsh, the [completion system](http://zsh.sourceforge.net/Doc/Release/Completion-System.html){:target="_blank" class="_"}
 takes care of things. To activate completion for Docker commands, these files
 need to be copied or symlinked to your Zsh `site-functions/` directory. For
 example, if you installed Zsh via [Homebrew](http://brew.sh/):
 
 ```bash
-ln -s /Applications/Docker.app/Contents/Resources/etc/docker.zsh-completion /usr/local/share/zsh/site-functions/_docker
+etc=/Applications/Docker.app/Contents/Resources/etc
-ln -s /Applications/Docker.app/Contents/Resources/etc/docker-machine.zsh-completion /usr/local/share/zsh/site-functions/_docker-machine
+ln -s $etc/docker.zsh-completion /usr/local/share/zsh/site-functions/_docker
-ln -s /Applications/Docker.app/Contents/Resources/etc/docker-compose.zsh-completion /usr/local/share/zsh/site-functions/_docker-compose
+ln -s $etc/docker-machine.zsh-completion /usr/local/share/zsh/site-functions/_docker-machine
+ln -s $etc/docker-compose.zsh-completion /usr/local/share/zsh/site-functions/_docker-compose
 ```
 
 ## Give feedback and get help
 
 To get help from the community, review current user topics, join or start a
-discussion, log on to our [Docker for Mac
+discussion, log on to our [Docker for Mac forum](https://forums.docker.com/c/docker-for-mac){:target="_blank" class="_"}.
-forum](https://forums.docker.com/c/docker-for-mac).
 
-To report bugs or problems, log on to [Docker for Mac issues on
+To report bugs or problems, log on to [Docker for Mac issues on GitHub](https://github.com/docker/for-mac/issues){:target="_blank" class="_"}, where you can review
-GitHub](https://github.com/docker/for-mac/issues), where you can review
 community reported issues, and file new ones. See [Diagnose problems, send
 feedback, and create GitHub
-issues](troubleshoot.md#diagnose-problems-send-feedback-and-create-github-issues). As a part of reporting issues on GitHub, we can help you troubleshoot
+issues](troubleshoot.md#diagnose-problems-send-feedback-and-create-github-issues). As
-the log
+a part of reporting issues on GitHub, we can help you troubleshoot the log data.
-data.
 
 To give us feedback on the documentation or update it yourself, use the Feedback
 options at the bottom of each docs page.
@@ -534,45 +471,39 @@ options at the bottom of each docs page.
 ## Docker Store
 
 Choose **Docker Store** from the Docker for Mac menu to get to the Docker app
-downloads site. [Docker store](https://store.docker.com/) is a component of the
+downloads site. [Docker store](https://store.docker.com/){:target="_blank" class="_"} is a component of the
 next-generation Docker Hub, and the best place to find compliant, trusted
 commercial and free software distributed as Docker Images.
 
-![Docker Store](images/docker-store.png)
+![Docker Store](images/docker-store.png){:width="550px"}
 
 ## Docker Cloud
 
-You can access your [Docker Cloud](/docker-cloud/index.md) account from within
+You can access your [Docker Cloud](/docker-cloud/index.md){:target="_blank" class="_"}  account from within Docker for Mac.
-Docker for Mac.
 
-![Docker Cloud](images/docker-cloud.png)
+![Docker Cloud](images/docker-cloud.png){:width="550px"}
 
-From the Docker for Mac menu, sign in to Docker Cloud with your Docker ID, or
+From the Docker for Mac menu, sign in to Docker Cloud with your Docker ID, or create one.
-create one.
 
-![Docker Cloud sign-in](images/menu-cloud-sign-in.png)
+![Docker Cloud sign-in](images/menu/d4m-menu-sign-in.png){: .with-border width="250px"}
 
 Then use the Docker for Mac menu to create, view, or navigate directly to your
 Cloud resources, including **organizations**, **repositories**, and **swarms**.
 
-Check out these [Docker Cloud topics](/docker-cloud/index.md) to learn more:
+Check out these [Docker Cloud topics](/docker-cloud/index.md){:target="_blank" class="_"}  to learn more:
 
-* [Organizations and Teams in Docker Cloud](/docker-cloud/orgs/index.md)
+* [Organizations and Teams in Docker Cloud](/docker-cloud/orgs/index.md){:target="_blank" class="_"}
-* [Builds and Images](/docker-cloud/builds/index.md)
+* [Builds and Images](/docker-cloud/builds/index.md){:target="_blank" class="_"}
-* [Swarms in Docker Cloud](/docker-cloud/cloud-swarm/index.md)
+* [Swarms in Docker Cloud](/docker-cloud/cloud-swarm/index.md){:target="_blank" class="_"}
 
-Need a direct link to Cloud? [Take me to Docker
+Need a direct link to Cloud? [Take me to Docker Cloud](https://cloud.docker.com/){: target="_blank" class="_" }.
-Cloud](https://cloud.docker.com/){: target="_blank" class="_" }.
 
 ## Where to go next
 
-* Try out the walkthrough at [Get Started](/get-started/).
+* Try out the walkthrough at [Get Started](/get-started/){: target="_blank" class="_"}.
 
-* Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example
+* Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example walkthroughs and source code.
-  walkthroughs and source code.
 
-* For a summary of Docker command line interface (CLI) commands, see
+* For a summary of Docker command line interface (CLI) commands, see [Docker CLI Reference Guide](/engine/api.md){: target="_blank" class="_"}.
-  [Docker CLI Reference Guide](/engine/api.md).
 
-* Check out the blog post
+* Check out the blog post, [What’s New in Docker 17.06 Community Edition (CE)](https://blog.docker.com/2017/07/whats-new-docker-17-06-community-edition-ce/){: target="_blank" class="_"}.
-  [Introducing Docker 1.13.0](https://blog.docker.com/2017/01/whats-new-in-docker-1-13/).

docker-for-mac/install.md

@@ -157,7 +157,7 @@ for Docker for Mac, and how the two products can coexist.
 
 3.  Click the whale (![whale menu](/docker-for-mac/images/whale-x.png){: .inline}) to get Preferences and other options.
 
-	  ![Docker context menu](images/menu.png)
+	  ![Docker context menu](images/menu/menu.png)
 
 4.  Select **About Docker** to verify that you have the latest version.
 

docker-for-mac/troubleshoot.md

@@ -12,7 +12,9 @@ browse and log issues on GitHub, and find workarounds for known problems.
 
 ## Docker Knowledge Hub
 
-**Looking for help with Docker for Mac?** Check out the [Docker Knowledge Hub](http://success.docker.com/) for knowledge base articles, FAQs, and technical support for various subscription levels.
+**Looking for help with Docker for Mac?** Check out the [Docker Knowledge
+Hub](http://success.docker.com/) for knowledge base articles, FAQs, and
+technical support for various subscription levels.
 
 ## Diagnose problems, send feedback, and create GitHub issues
 
@@ -49,7 +51,8 @@ GitHub](https://github.com/docker/for-mac/issues/) in your web browser in a
 
 * System and version details
 
-* Sections where you can fill in a description of expected and actual behavior, and steps to reproduce the issue
+* Sections where you can fill in a description of expected and actual behavior,
+  and steps to reproduce the issue
 
 ![Create issue on GitHub](images/diagnose-issue.png)
 
@@ -125,13 +128,13 @@ does not send client certificates to them. Commands like `docker run` that
 attempt to pull from the registry produces error messages on the command
 line, like this:
 
-```bash
+```
 Error response from daemon: Get http://192.168.203.139:5858/v2/: malformed HTTP response "\x15\x03\x01\x00\x02\x02"
 ```
 
 As well as on the registry. For example:
 
-```config
+```
 2017/06/20 18:15:30 http: TLS handshake error from 192.168.203.139:52882: tls: client didn't provide a certificate
 2017/06/20 18:15:30 http: TLS handshake error from 192.168.203.139:52883: tls: first record does not look like a TLS handshake
 ```
@@ -146,7 +149,11 @@ If, after installing Docker for Mac, you [change the name of your macOS user
 account and home folder](https://support.apple.com/en-us/HT201548), Docker for
 Mac fails to start. To solve this problem, uninstall and reinstall Docker for Mac under the new user account.
 
-See also, the discussion on the issue [docker/for-mac#1209](https://github.com/docker/for-mac/issues/1209) and [Do I need to reinstall Docker for Mac if I change the name of my macOS account?](faqs.md#do-i-need-to-reinstall-docker-for-mac-if-i-change-the-name-of-my-macos-account) in the FAQs.
+See also, the discussion on the issue
+[docker/for-mac#1209](https://github.com/docker/for-mac/issues/1209) and [Do I
+need to reinstall Docker for Mac if I change the name of my macOS
+account?](faqs.md#do-i-need-to-reinstall-docker-for-mac-if-i-change-the-name-of-my-macos-account)
+in the FAQs.
 
 ### Volume mounting requires file sharing for any project directories outside of `/Users`
 
@@ -163,12 +170,15 @@ contains the Dockerfile and volume.
 ### Recreate or update your containers after Beta 18 upgrade
 
 Docker 1.12.0 RC3 release introduces a backward incompatible change from RC2 to
-RC3. (For more information, see (For more information, see [moby/moby#24343 (comment)](https://github.com/moby/moby/issues/24343#issuecomment-230623542).)
+RC3. (For more information, see (For more information, see [moby/moby#24343
+(comment)](https://github.com/moby/moby/issues/24343#issuecomment-230623542).)
 
 You may get the following error when you try to start a container created with
 pre-Beta 18 Docker for Mac applications.
 
+```
 Error response from daemon: Unknown runtime specified default
+```
 
 You can fix this by either
 [recreating](troubleshoot.md#recreate-your-containers) or
@@ -180,7 +190,9 @@ If you get the error message shown above, we recommend recreating them.
 
 To recreate your containers, use Docker Compose.
 
+```
 docker-compose down && docker-compose up
+```
 
 #### Update your containers
 
@@ -188,6 +200,7 @@ To fix existing containers, follow these steps.
 
 1. Run this command.
 
+```
 $ docker run --rm -v /var/lib/docker:/docker cpuguy83/docker112rc3-runtimefix:rc3
 
 Unable to find image 'cpuguy83/docker112rc3-runtimefix:rc3' locally
@@ -206,6 +219,7 @@ To fix existing containers, follow these steps.
 proccessed dea73dc21126434f14c58b83140bf6470aa67e622daa85603a13bc48af7f8b04
 proccessed dfa8f9278642ab0f3e82ee8e4ad029587aafef9571ff50190e83757c03b4216c
 proccessed ee5bf706b6600a46e5d26327b13c3c1c5f7b261313438d47318702ff6ed8b30b
+```
 
 2. Quit Docker.
 
@@ -215,8 +229,10 @@ To fix existing containers, follow these steps.
 
 4. Try to start the container again:
 
+```
 $ docker start old-container
 old-container
+```
 
 ### Incompatible CPU detected
 
@@ -249,41 +265,56 @@ know before you install](install.md#what-to-know-before-you-install).
 
 ### Workarounds for common problems
 
-* IPv6 workaround to auto-filter DNS addresses - IPv6 is not yet supported on Docker for Mac. If you try to use it, network timeouts occur when running `docker` commands that need access to external network servers, such as `docker pull` or `docker push`.
+* IPv6 workaround to auto-filter DNS addresses - IPv6 is not yet supported on
+  Docker for Mac. If you try to use it, network timeouts occur when running
+  `docker` commands that need access to external network servers, such as
+  `docker pull` or `docker push`.
 
+   ```
    $ docker pull busybox
    Using default tag: latest
    Pulling repository docker.io/library/busybox
    Network timed out while trying to connect to https://index.docker.io/v1/repositories/library/busybox/images. You may want to check your internet connection or if you are behind a proxy.
+   ```
 
-    Starting with v1.12.1, 2016-09016 on the stable channel, and Beta 24 on the beta channel, a workaround is provided that auto-filters out the IPv6 addresses in DNS server lists and enables successful network accesss. For example, `2001:4860:4860::8888` would become `8.8.8.8`. So, the only workaround action needed for users is to [upgrade to Docker for Mac stable v1.12.1 or newer, or Beta 24 or newer](/docker-for-mac/install.md#download-docker-for-mac).
+    Starting with v1.12.1, 2016-09016 on the stable channel, and Beta 24 on the
-
+    beta channel, a workaround is provided that auto-filters out the IPv6
-    On releases with the workaround included to filter out / truncate IPv6 addresses from the DNS list, the above command should run properly:
+    addresses in DNS server lists and enables successful network accesss. For
+    example, `2001:4860:4860::8888` would become `8.8.8.8`. So, the only
+    workaround action needed for users is to [upgrade to Docker for Mac stable
+    v1.12.1 or newer, or Beta 24 or
+    newer](/docker-for-mac/install.md#download-docker-for-mac).
 
+    On releases with the workaround included to filter out / truncate IPv6
+    addresses from the DNS list, the above command should run properly:
 
+    ```
     $ docker pull busybox
     Using default tag: latest
     latest: Pulling from library/busybox
     Digest: sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6
     Status: Image is up to date for busy box:latest
-
+    ```
 
     To learn more, see these issues on GitHub and Docker for Mac forums:
 
-  * [Network timeout when top two DNS servers in /etc/resolv.conf are IPv6 addresses](https://github.com/docker/for-mac/issues/9)
+  * [Network timeout when top two DNS servers in /etc/resolv.conf are IPv6
+    addresses](https://github.com/docker/for-mac/issues/9)
 
-  * [ERROR: Network timed out while trying to connect to index.docker.io](https://forums.docker.com/t/error-network-timed-out-while-trying-to-connect-to-index-docker-io/17206)
+  * [ERROR: Network timed out while trying to connect to
+    index.docker.io](https://forums.docker.com/t/error-network-timed-out-while-trying-to-connect-to-index-docker-io/17206)
 
   <p></p>
 
 * If Docker for Mac fails to install or start properly:
 
-  * Make sure you quit Docker for Mac before installing a new version
+  * Make sure you quit Docker for Mac before installing a new version of the
-  of the application ( ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} --> **Quit Docker**). Otherwise, you get an
+  application ( ![whale menu](/docker-for-mac/images/whale-x.png){: .inline} -->
-  "application in use" error when you try to copy the new app
+  **Quit Docker**). Otherwise, you get an "application in use" error when you
-  from the `.dmg` to `/Applications`.
+  try to copy the new app from the `.dmg` to `/Applications`.
 
-  * Restart your Mac to stop / discard any vestige of the daemon running from the previously installed version.
+  * Restart your Mac to stop / discard any vestige of the daemon running from
+    the previously installed version.
 
   * Run the uninstall commands from the menu.
 
@@ -295,23 +326,30 @@ know before you install](install.md#what-to-know-before-you-install).
 
   * If you use bash, use the following command: `unset ${!DOCKER_*}`
 
-  * For other shells, unset each environment variable individually as described in [Setting up to run Docker for Mac](docker-toolbox.md#setting-up-to-run-docker-for-mac) in [Docker for Mac vs. Docker Toolbox](docker-toolbox.md).
+  * For other shells, unset each environment variable individually as described
+    in [Setting up to run Docker for
+    Mac](docker-toolbox.md#setting-up-to-run-docker-for-mac) in [Docker for Mac
+    vs. Docker Toolbox](docker-toolbox.md).
 
 
-* Network connections fail if the macOS Firewall is set to
+* Network connections fail if the macOS Firewall is set to "Block all incoming
-"Block all incoming connections". You can enable the firewall, but `bootpd` must be allowed incoming connections so that the VM can get an IP address.
+  connections". You can enable the firewall, but `bootpd` must be allowed
+  incoming connections so that the VM can get an IP address.
 
 
-* For the `hello-world-nginx` example, Docker for Mac must be running to get to the webserver on `http://localhost/`. Make sure that the Docker whale
+* For the `hello-world-nginx` example, Docker for Mac must be running to get to
-is showing in the menu bar, and that you run the Docker commands in a shell that
+  the webserver on `http://localhost/`. Make sure that the Docker whale is
-is connected to the Docker for Mac Engine (not Engine from Toolbox). Otherwise,
+  showing in the menu bar, and that you run the Docker commands in a shell that
-you might start the webserver container but get a "web page not available" error
+  is connected to the Docker for Mac Engine (not Engine from
-when you go to `localhost`. For more on distinguishing between the two
+  Toolbox). Otherwise, you might start the webserver container but get a "web
-environments, see [Docker for Mac vs. Docker Toolbox](docker-toolbox.md).
+  page not available" error when you go to `localhost`. For more on
+  distinguishing between the two environments, see [Docker for Mac vs. Docker
+  Toolbox](docker-toolbox.md).
 
 <p></p>
 
-* If you see errors like `Bind for 0.0.0.0:8080 failed: port is already allocated` or `listen tcp:0.0.0.0:8080: bind: address is already in use`:
+* If you see errors like `Bind for 0.0.0.0:8080 failed: port is already
+  allocated` or `listen tcp:0.0.0.0:8080: bind: address is already in use`:
 
   * These errors are often caused by some other software on the Mac using those
     ports.
@@ -322,57 +360,73 @@ your docker app.
 
 ## Known issues
 
-* IPv6 is not yet supported on Docker for Mac. If you are using IPv6, and haven't upgraded to Beta 24 or v1.12.1 stable or newer, you see a network
+* IPv6 is not yet supported on Docker for Mac. If you are using IPv6, and
+  haven't upgraded to Beta 24 or v1.12.1 stable or newer, you see a network
   timeout when you run `docker` commands that need access to external network
   servers. The aforementioned releases include a workaround for this because
-Docker for Mac does not yet support IPv6. See "IPv6 workaround to auto-filter DNS addresses" in
+  Docker for Mac does not yet support IPv6. See "IPv6 workaround to auto-filter
-[Workarounds for common problems](troubleshoot.md#workarounds-for-common-problems).
+  DNS addresses" in [Workarounds for common
-
+  problems](troubleshoot.md#workarounds-for-common-problems).
-
-* You might encounter errors when using `docker-compose up` with Docker for Mac (`ValueError: Extra Data`). We've identified this is likely related to data and/or events being passed all at once rather than one by one, so sometimes the data comes back as 2+ objects concatenated and causes an error.
 
+* You might encounter errors when using `docker-compose up` with Docker for Mac
+  (`ValueError: Extra Data`). We've identified this is likely related to data
+  and/or events being passed all at once rather than one by one, so sometimes
+  the data comes back as 2+ objects concatenated and causes an error.
 
 * Force-ejecting the `.dmg` after running `Docker.app` from it can cause the
   whale icon to become unresponsive, Docker tasks to show as not responding in
   the Activity Monitor, and for some processes to consume a large amount of CPU
   resources. Reboot and restart Docker to resolve these issues.
 
-* Docker does not auto-start on login even when it is enabled in
+* Docker does not auto-start on login even when it is enabled in ![whale
-![whale menu](/docker-for-mac/images/whale-x.png){: .inline} --> **Preferences**. This is related to a set of issues with Docker
+  menu](/docker-for-mac/images/whale-x.png){: .inline} --> **Preferences**. This
-helper, registration, and versioning.
+  is related to a set of issues with Docker helper, registration, and
+  versioning.
 
 <p></p>
 
-* Docker for Mac uses the `HyperKit` hypervisor (https://github.com/docker/hyperkit) in macOS 10.10 Yosemite and higher. If you
+* Docker for Mac uses the `HyperKit` hypervisor
-are developing with tools that have conflicts with `HyperKit`, such as [Intel
+  (https://github.com/docker/hyperkit) in macOS 10.10 Yosemite and higher. If
-Hardware Accelerated Execution Manager
+  you are developing with tools that have conflicts with `HyperKit`, such as
+  [Intel Hardware Accelerated Execution Manager
   (HAXM)](https://software.intel.com/en-us/android/articles/intel-hardware-accelerated-execution-manager/),
   the current workaround is not to run them at the same time. You can pause
-`HyperKit` by quitting Docker for Mac temporarily while you work with HAXM. This
+  `HyperKit` by quitting Docker for Mac temporarily while you work with
-allows you to continue work with the other tools and prevent `HyperKit` from
+  HAXM. This allows you to continue work with the other tools and prevent
-interfering.
+  `HyperKit` from interfering.
 
 
-*  If you are working with applications like [Apache Maven](https://maven.apache.org/) that expect settings for `DOCKER_HOST` and `DOCKER_CERT_PATH` environment variables, specify these to connect to Docker instances through Unix sockets. For example:
+* If you are working with applications like [Apache
+  Maven](https://maven.apache.org/) that expect settings for `DOCKER_HOST` and
+  `DOCKER_CERT_PATH` environment variables, specify these to connect to Docker
+  instances through Unix sockets. For example:
 
+  ```bash
   export DOCKER_HOST=unix:///var/run/docker.sock
+  ```
 
-* `docker-compose` 1.7.1 performs DNS unnecessary lookups for `localunixsocket.local` which can take 5s to timeout on some networks. If `docker-compose` commands seem very slow but seem to speed up when the network is disabled, try appending `127.0.0.1 localunixsocket.local` to the file `/etc/hosts`.
+* `docker-compose` 1.7.1 performs DNS unnecessary lookups for
-Alternatively you could create a plain-text TCP proxy on localhost:1234 using:
+  `localunixsocket.local` which can take 5s to timeout on some networks. If
+  `docker-compose` commands seem very slow but seem to speed up when the network
+  is disabled, try appending `127.0.0.1 localunixsocket.local` to the file
+  `/etc/hosts`.  Alternatively you could create a plain-text TCP proxy on
+  localhost:1234 using:
 
+  ```
   docker run -d -v /var/run/docker.sock:/var/run/docker.sock -p 127.0.0.1:1234:1234 bobrik/socat TCP-LISTEN:1234,fork UNIX-CONNECT:/var/run/docker.sock
+  ```
 
   and then `export DOCKER_HOST=tcp://localhost:1234`.
 
 
 <a name="bind-mounted-dirs"></a>
 
-* There are a number of issues with the performance of directories
+* There are a number of issues with the performance of directories bind-mounted
-  bind-mounted with `osxfs`. In particular, writes of small blocks, and
+  with `osxfs`. In particular, writes of small blocks, and traversals of large
-  traversals of large directories are currently slow. Additionally,
+  directories are currently slow. Additionally, containers that perform large
-  containers that perform large numbers of directory operations, such as
+  numbers of directory operations, such as repeated scans of large directory
-  repeated scans of large directory trees, may suffer from poor
+  trees, may suffer from poor performance. Applications that behave in this way
-  performance. Applications that behave in this way include:
+  include:
 
   - `rake`
   - `ember build`
@@ -382,23 +436,32 @@ Alternatively you could create a plain-text TCP proxy on localhost:1234 using:
   - PHP applications that use [Composer](https://getcomposer.org) to install dependencies in a ```vendor``` folder<br><br>
 
   As a work-around for this behavior, you can put vendor or third-party library
-directories in Docker volumes, perform temporary file system operations outside
+  directories in Docker volumes, perform temporary file system operations
-of `osxfs` mounts, and use third-party tools like Unison or `rsync` to
+  outside of `osxfs` mounts, and use third-party tools like Unison or `rsync` to
   synchronize between container directories and bind-mounted directories. We are
-actively working on `osxfs` performance using a number of different techniques.
+  actively working on `osxfs` performance using a number of different
-To learn more, see the topic on [Performance issues, solutions, and
+  techniques.  To learn more, see the topic on [Performance issues, solutions,
-roadmap](osxfs.md#performance-issues-solutions-and-roadmap).
+  and roadmap](osxfs.md#performance-issues-solutions-and-roadmap).
 
-* If your system does not have access to an NTP server, then after a hibernate the time seen by Docker for Mac may be considerably out of sync with the host. Furthermore, the time may slowly drift out of sync during use. To manually reset the time after hibernation, run:
+* If your system does not have access to an NTP server, then after a hibernate
+  the time seen by Docker for Mac may be considerably out of sync with the
+  host. Furthermore, the time may slowly drift out of sync during use. To
+  manually reset the time after hibernation, run:
 
+  ```bash
   docker run --rm --privileged alpine hwclock -s
+  ```
 
   Or, to resolve both issues, you can add the local clock as a low-priority (high stratum) fallback NTP time source for the host. To do this, edit the host's `/etc/ntp-restrict.conf` to add:
 
+  ```
   server 127.127.1.1              # LCL, local clock
   fudge  127.127.1.1 stratum 12   # increase stratum
+  ```
 
   Then restart the NTP service with:
 
+  ```bash
   sudo launchctl unload /System/Library/LaunchDaemons/org.ntp.ntpd.plist
   sudo launchctl load /System/Library/LaunchDaemons/org.ntp.ntpd.plist
+  ```

docker-for-windows/faqs.md

@@ -11,16 +11,16 @@ technical support for various subscription levels, and more.
 
 ### Questions about Stable and Edge channels
 
-**Q: How do I get the Stable or Edge version of Docker for Windows?**
+#### How do I get the Stable or Edge version of Docker for Windows?
 
-A: Use the download links for the channels given in the topic
+Use the download links for the channels given in the topic [Download Docker for
-[Download Docker for Windows](/docker-for-windows/install.md#download-docker-for-windows).
+Windows](/docker-for-windows/install.md#download-docker-for-windows).
 
 This topic also has more information about the two channels.
 
-**Q: What is the difference between the Stable and Edge versions of Docker for Windows?**
+#### What is the difference between the Stable and Edge versions of Docker for Windows?
 
-A: Two different download channels are available for Docker for Windows:
+Two different download channels are available for Docker for Windows:
 
 * The **Stable channel** provides a general availability release-ready installer
   for a fully baked and tested, more reliable app. The Stable version of Docker
@@ -36,13 +36,13 @@ A: Two different download channels are available for Docker for Windows:
   Stable, often one or more per month. Usage statistics and crash reports are
   sent by default. You do not have the option to disable this on the Edge channel.
 
-**Q: Can I switch back and forth between Stable and Edge versions of Docker for Windows?**
+#### Can I switch back and forth between Stable and Edge versions of Docker for Windows?
 
-A: Yes, you can switch between versions to try out the Edge release to see
+Yes, you can switch between versions to try out the Edge release to see what's
-what's new, then go back to Stable for other work. However, **you can have only
+new, then go back to Stable for other work. However, **you can have only one app
-one app installed at a time**. Switching back and forth between Stable and Edge
+installed at a time**. Switching back and forth between Stable and Edge apps can
-apps can destabilize your development environment, particularly in cases where
+destabilize your development environment, particularly in cases where you switch
-you switch from a newer (Edge) channel to older (Stable).
+from a newer (Edge) channel to older (Stable).
 
 For example, containers created with a newer Edge version of Docker for Windows
 may not work after you switch back to Stable because they may have been created
@@ -69,7 +69,9 @@ Do the following each time:
 
 4.  Install a different version of the app (Stable or Edge).
 
-### What kind of feedback are we looking for?
+
+### Feeback
+#### What kind of feedback are we looking for?
 
 Everything is fair game. We'd like your impressions on the download-install
 process, startup, functionality available, the GUI, usefulness of the app,
@@ -80,7 +82,7 @@ We are especially interested in getting feedback on the new swarm mode described
 in [Docker Swarm](/engine/swarm/index.md). A good place to start is the
 [tutorial](/engine/swarm/swarm-tutorial/index.md).
 
-### What if I have problems or questions?
+#### What if I have problems or questions?
 
 You can find the list of frequent issues in
 [Logs and Troubleshooting](/docker-for-windows/troubleshoot.md).
@@ -96,20 +98,20 @@ provides discussion threads as well, and you can create discussion topics there,
 but we recommend using the GitHub issues over the forums for better tracking and
 response.
 
-### How can I opt out of sending my usage data?
+#### How can I opt out of sending my usage data?
 
 If you do not want auto-send of usage data, use the Stable channel. For more
 information, see [Stable and Edge channels](#questions-about-stable-and-edge-channels) ("What is the difference between the Stable and Edge versions of Docker for Windows?").
 
 ### Can I use Docker for Windows with new swarm mode?
 
-Yes! You can use Docker for Windows to test single-node features of
+Yes! You can use Docker for Windows to test single-node features of [swarm
-[swarm mode](/engine/swarm/index.md) introduced with Docker Engine 1.12, including
+mode](/engine/swarm/index.md) introduced with Docker Engine 1.12, including
 initializing a swarm with a single node, creating services, and scaling
-services. Docker “Moby” on Hyper-V serves as the single swarm node. You can
+services. Docker “Moby” on Hyper-V serves as the single swarm node. You can also
-also use Docker Machine, which comes with Docker for Windows, to create and
+use Docker Machine, which comes with Docker for Windows, to create and
-experiment with a multi-node swarm. Check out the tutorial at
+experiment with a multi-node swarm. Check out the tutorial at [Get started with
-[Get started with swarm mode](/engine/swarm/swarm-tutorial/index.md).
+swarm mode](/engine/swarm/swarm-tutorial/index.md).
 
 ### How do I connect to the remote Docker Engine API?
 
@@ -123,28 +125,29 @@ See also [Docker Engine API](/engine/api.md) and the Docker for Windows forums
 topic
 [How to find the remote API](https://forums.docker.com/t/how-to-find-the-remote-api/20988).
 
-### Can I change permissions on shared volumes for container-specific deployment requirements?
+### Volumes
+#### Can I change permissions on shared volumes for container-specific deployment requirements?
 
 No, at this point, Docker for Windows does not enable you to control (`chmod`)
 the Unix-style permissions on [shared
 volumes](/docker-for-windows/index.md#shared-drives) for deployed containers,
 but rather sets permissions to a default value of
-[0755](http://permissions-calculator.org/decode/0755/)
+[0755](http://permissions-calculator.org/decode/0755/) (`read`, `write`,
-(`read`, `write`, `execute` permissions for `user`, `read` and `execute`
+`execute` permissions for `user`, `read` and `execute` for `group`) which is not
-for `group`) which is not configurable.
+configurable.
 
-For workarounds and to learn more, see [Permissions errors on data
+For workarounds and to learn more, see [Permissions errors on data directories
-directories for shared
+for shared
 volumes](troubleshoot.md#permissions-errors-on-data-directories-for-shared-volumes).
 
-### Why doesn't `nodemon` pick up file changes in a container mounted on a shared drive?
+#### Why doesn't `nodemon` pick up file changes in a container mounted on a shared drive?
 
 Currently, `inotify` does not work on Docker for Windows. This is a known issue.
 For more information and a temporary workaround, see [inotify on shared drives
 does not work](troubleshoot.md#inotify-on-shared-drives-does-not-work) in
 [Troubleshooting](/docker-for-windows/troubleshoot.md).
 
-### Are symlinks supported?
+#### Are symlinks supported?
 
 Docker for Windows supports symbolic links (symlinks) created within containers.
 Symlinks resolve within and across containers.
@@ -158,7 +161,10 @@ To learn more about the reasons for this limitation, see the following discussio
 * Docker for Windows forums topic:
   [Symlinks on shared volumes not supported](https://forums.docker.com/t/symlinks-on-shared-volumes-not-supported/9288)
 
-### How do I add custom CA certificates?
+
+### Certificates
+
+#### How do I add custom CA certificates?
 
 Starting with Docker for Windows 1.12.1, 2016-09-16 (Stable) and Beta 26
 (2016-09-14 1.12.1-beta26), all trusted Certificate Authorities (CA) (root or
@@ -174,7 +180,7 @@ To learn more about how to install a CA root certificate for the registry, see
 [Verify repository client with certificates](/engine/security/certificates.md)
 in the Docker Engine topics.
 
-### How do I add client certificates?
+#### How do I add client certificates?
 
 Starting with Docker for Windows 17.06.0-ce, you do not need to push your
 certificates with `git` commands anymore. You can put your client certificates
@@ -185,16 +191,14 @@ When the Docker for Windows application starts up, it copies the
 `~/.docker/certs.d` folder on your Windows system to the `/etc/docker/certs.d`
 directory on Moby (the Docker for Windows virtual machine running on Hyper-V).
 
-> * You need to restart Docker for Windows after making any changes to
+You need to restart Docker for Windows after making any changes to the keychain
- the keychain or to the `~/.docker/certs.d` directory in order for
+or to the `~/.docker/certs.d` directory in order for the changes to take effect.
- the changes to take effect.
+
->
+The registry cannot be listed as an _insecure registry_ (see [Docker
-> * The registry cannot be listed as an _insecure registry_ (see [Docker
+Daemon](/docker-for-windows/index.md#docker-daemon)). Docker for Windows ignores
-Daemon](/docker-for-windows/index.md#docker-daemon)). Docker for Windows
+certificates listed under insecure registries, and does not send client
-ignores certificates listed under insecure registries, and does not send client
+certificates. Commands like `docker run` that attempt to pull from the registry
-certificates. Commands like `docker run` that attempt to pull from
+produce error messages on the command line, as well as on the registry.
-the registry produce error messages on the command line, as well as on the
-registry.
 
 To learn more about how to set the client TLS certificate for verification, see
 [Verify repository client with certificates](/engine/security/certificates.md)
@@ -202,7 +206,7 @@ in the Docker Engine topics.
 
 ### Why does Docker for Windows sometimes lose network connectivity, causing `push` or `pull` commands to fail?
 
-Networking is not yet fully Stable across network changes and system sleep
+Networking is not yet fully stable across network changes and system sleep
 cycles. Exit and start Docker to restore connectivity.
 
 ### Can I use VirtualBox alongside Docker 4 Windows?
@@ -221,11 +225,15 @@ For more about sharing local drives with containers using Docker for Windows,
 see [Shared Drives](/docker-for-windows/index.md#shared-drives) in the Getting
 Started topic.
 
-To learn more about using Docker for Windows and Docker Machine, see
+To learn more about using Docker for Windows and Docker Machine, see [What to
-[What to know before you install](install.md#what-to-know-before-you-install) in the Getting Started topic. For more about Docker Machine itself, see
+know before you install](install.md#what-to-know-before-you-install) in the
-[What is Docker Machine?](/machine/overview.md#what-is-docker-machine), and the [Hyper-V driver](/machine/drivers/hyper-v.md) for Docker Machine.
+Getting Started topic. For more about Docker Machine itself, see [What is Docker
+Machine?](/machine/overview.md#what-is-docker-machine), and the [Hyper-V
+driver](/machine/drivers/hyper-v.md) for Docker Machine.
 
-### How do I run Windows containers on Docker on Windows Server 2016?
+### Windows Requirements
+
+#### How do I run Windows containers on Docker on Windows Server 2016?
 
 See [About Windows containers and Windows Server
 2016](/docker-for-windows/index.md#about-windows-containers-and-windows-server-2016).
@@ -234,28 +242,30 @@ A full tutorial is available in [docker/labs](https://github.com/docker/labs) at
 [Getting Started with Windows
 Containers](https://github.com/docker/labs/blob/master/windows/windows-containers/README.md).
 
-### Why is Windows 10 Home not supported?
+#### Why is Windows 10 Home not supported?
 
 Docker for Windows requires the Hyper-V Windows feature which is not
 available on Home-edition.
 
-### Why is Windows 10 required?
+#### Why is Windows 10 required?
 
 Docker for Windows uses Windows Hyper-V. While older Windows versions have
 Hyper-V, their Hyper-V implementations lack features critical for Docker for
 Windows to work.
 
-### Why does Docker for Windows fail to start when firewalls or anti-virus software is installed?
+#### Why does Docker for Windows fail to start when firewalls or anti-virus software is installed?
 
 Some firewalls and anti-virus software might be incompatible with Hyper-V and
 some Windows 10 builds (possibly, the Anniversary Update), which impacts Docker
-for Windows. See details and workarounds in
+for Windows. See details and workarounds in [Docker fails to start when firewall
-[Docker fails to start when firewall or anti-virus software is installed](troubleshoot.md#docker-fails-to-start-when-firewall-or-anti-virus-software-is-installed)
+or anti-virus software is
+installed](troubleshoot.md#docker-fails-to-start-when-firewall-or-anti-virus-software-is-installed)
 in [Troubleshooting](/docker-for-windows/troubleshoot.md).
 
 ### How do I uninstall Docker Toolbox?
 
-You might decide that you do not need Toolbox now that you have Docker for Windows, and want to uninstall it. For
+You might decide that you do not need Toolbox now that you have Docker for
-details on how to perform a clean uninstall of Toolbox on Windows, see
+Windows, and want to uninstall it. For details on how to perform a clean
-[How to uninstall Toolbox](/toolbox/toolbox_install_windows.md#how-to-uninstall-toolbox)
+uninstall of Toolbox on Windows, see [How to uninstall
-in the Toolbox Windows topics.
+Toolbox](/toolbox/toolbox_install_windows.md#how-to-uninstall-toolbox) in the
+Toolbox Windows topics.

docker-for-windows/troubleshoot.md

@@ -23,12 +23,13 @@ documentation, on [Docker for Windows issues on
 GitHub](https://github.com/docker/for-win/issues), or the [Docker for Windows
 forum](https://forums.docker.com/c/docker-for-windows), we can help you
 troubleshoot the log data. See [Diagnose and
-Feedback](/docker-for-windows/index.md#diagnose-and-feedback) to learn about diagnostics and how to
+Feedback](/docker-for-windows/index.md#diagnose-and-feedback) to learn about
-create new issues on GitHub.
+diagnostics and how to create new issues on GitHub.
 
 ## Checking the Logs
 
-In addition to using the diagnose and feedback option to submit logs, you can browse the logs yourself.
+In addition to using the diagnose and feedback option to submit logs, you can
+browse the logs yourself.
 
 ### Use the systray menu to view logs
 
@@ -39,19 +40,19 @@ history of logs in your `AppData\Local` folder.
 ### Use the systray menu to report and issue
 
 If you encounter an issue and the suggested troubleshoot procedures outlined
-below don't fix it you can generate a diagnostics report. Click on the `Diagnose &
+below don't fix it you can generate a diagnostics report. Click on the `Diagnose
-Feedback` menu entry in the systray and then on the `Upload diagnostic...` link.
+& Feedback` menu entry in the systray and then on the `Upload diagnostic...`
-This uploads diagnostics to our server and provide you with a unique ID you
+link.  This uploads diagnostics to our server and provide you with a unique ID
-can use in email or the forum to reference the upload.
+you can use in email or the forum to reference the upload.
 
 ## Troubleshooting
 
 ### Make sure certificates are set up correctly
 
-Docker for Windows ignores certificates listed under insecure registries,
+Docker for Windows ignores certificates listed under insecure registries, and
-and does not send client certificates to them. Commands like `docker run` that
+does not send client certificates to them. Commands like `docker run` that
-attempt to pull from the registry produces error messages on the command
+attempt to pull from the registry produces error messages on the command line,
-line, like this:
+like this:
 
 ```
 Error response from daemon: Get http://192.168.203.139:5858/v2/: malformed HTTP response "\x15\x03\x01\x00\x02\x02"
@@ -70,7 +71,9 @@ certificates) and [How do I add client
 certificates?](/docker-for-windows/index.md#how-do-i-add-client-certificates) in
 the Getting Started topic.
 
-### Permissions errors on data directories for shared volumes
+### Volumes
+
+#### Permissions errors on data directories for shared volumes
 
 Docker for Windows sets permissions on [shared
 volumes](/docker-for-windows/index.md#shared-drives) to a default value of
@@ -101,42 +104,46 @@ in the FAQs, and for more of an explanation, the GitHub issue, [Controlling
 Unix-style perms on directories passed through from shared Windows
 drives](https://github.com/docker/docker.github.io/issues/3298).
 
-### inotify on shared drives does not work
+#### inotify on shared drives does not work
 
-Currently, `inotify` does not work on Docker for Windows. This becomes
+Currently, `inotify` does not work on Docker for Windows. This becomes evident,
-evident, for example, when an application needs to read/write to a
+for example, when an application needs to read/write to a container across a
-container across a mounted drive. Instead of relying on filesystem inotify, we recommend using polling features for your framework or programming language.
+mounted drive. Instead of relying on filesystem inotify, we recommend using
+polling features for your framework or programming language.
 
-* **Workaround for nodemon and Node.js** - If you are using [nodemon](https://github.com/remy/nodemon) with  `Node.js`, try the fallback
+* **Workaround for nodemon and Node.js** - If you are using
+  [nodemon](https://github.com/remy/nodemon) with `Node.js`, try the fallback
   polling mode described here: [nodemon isn't restarting node
   applications](https://github.com/remy/nodemon#application-isnt-restarting)
 
-* **Docker for Windows issue on GitHub** - See the issue [Inotify on shared drives does not work](https://github.com/docker/for-win/issues/56#issuecomment-242135705)
+* **Docker for Windows issue on GitHub** - See the issue [Inotify on shared
+  drives does not
+  work](https://github.com/docker/for-win/issues/56#issuecomment-242135705)
 
-### Volume mounting requires shared drives for Linux containers
+#### Volume mounting requires shared drives for Linux containers
 
 If you are using mounted volumes and get runtime errors indicating an
 application file is not found, access is denied to a volume mount, or a service
 cannot start, such as when using [Docker Compose](/compose/gettingstarted.md),
-you might need to enable [shared drives](/docker-for-windows/index.md#shared-drives).
+you might need to enable [shared
+drives](/docker-for-windows/index.md#shared-drives).
 
-Volume mounting requires shared drives for Linux containers
+Volume mounting requires shared drives for Linux containers (not for Windows
-(not for Windows containers). Go to
+containers). Go to ![whale menu](/docker-for-mac/images/whale-x.png){: .inline}
-![whale menu](/docker-for-mac/images/whale-x.png){: .inline} -->
+--> **Settings** --> **Shared Drives** and share the drive that contains the
-**Settings** --> **Shared Drives** and share the drive that
+Dockerfile and volume.
-contains the Dockerfile and volume.
 
-### Verify domain user has permissions for shared drives (volumes)
+#### Verify domain user has permissions for shared drives (volumes)
 
 > **Tip**: Shared drives are only required for volume mounting [Linux
-containers](/docker-for-windows/index.md#switch-between-windows-and-linux-containers),
+> containers](/docker-for-windows/index.md#switch-between-windows-and-linux-containers),
-not Windows containers.
+> not Windows containers.
 
 Permissions to access shared drives are tied to the username and password you
-use to set up [shared drives](/docker-for-windows/index.md#shared-drives). If you run `docker`
+use to set up [shared drives](/docker-for-windows/index.md#shared-drives). If
-commands and tasks under a different username than the one used to set up shared
+you run `docker` commands and tasks under a different username than the one used
-drives, your containers don't have permissions to access the mounted volumes.
+to set up shared drives, your containers don't have permissions to access the
-The volumes show as empty.
+mounted volumes.  The volumes show as empty.
 
 The solution to this is to switch to the domain user account and reset
 credentials on shared drives.
@@ -149,6 +156,7 @@ local user is `samstevens` and the domain user is `merlin`.
 
 2. Run `net share c` to view user permissions for `<host>\<username>, FULL`.
 
+   ```
    PS C:\Users\jdoe> net share c
    Share name        C
    Path              C:\
@@ -157,15 +165,21 @@ local user is `samstevens` and the domain user is `merlin`.
    Users             SAMSTEVENS
    Caching           Caching disabled
    Permission        windowsbox\samstevens, FULL
+   ```
 
 3. Run the following command to remove the share.
 
+   ```
    net share c /delete
+   ```
 
-4. Re-share the drive via the [Shared Drives dialog](/docker-for-windows/index.md#shared-drives), and provide the Windows domain user account credentials.
+4. Re-share the drive via the [Shared Drives
+   dialog](/docker-for-windows/index.md#shared-drives), and provide the Windows
+   domain user account credentials.
 
 5. Re-run `net share c`.
 
+   ```
    PS C:\Users\jdoe> net share c
    Share name        C
    Path              C:\
@@ -174,10 +188,12 @@ local user is `samstevens` and the domain user is `merlin`.
    Users             MERLIN
    Caching           Caching disabled
    Permission        windowsbox\merlin, FULL
+   ```
 
-See also, the related issue on GitHub, [Mounted volumes are empty in the container](https://github.com/docker/for-win/issues/25).
+See also, the related issue on GitHub, [Mounted volumes are empty in the
+container](https://github.com/docker/for-win/issues/25).
 
-### Volume mounts from host paths use a `nobrl` option to override database locking  
+#### Volume mounts from host paths use a `nobrl` option to override database locking
 
 You may encounter problems using volume mounts on the host, depending on the
 database software and which options are enabled. Docker for Windows uses
@@ -193,10 +209,9 @@ can interfere with other aspects of database functionality (for example,
 write-ahead logging (WAL) with SQLite, as described in
 [docker/for-win#1886](https://github.com/Sonarr/Sonarr/issues/1886)).
 
-If possible, avoid using shared drives for volume mounts on the host with network paths, and
+If possible, avoid using shared drives for volume mounts on the host with
-instead mount on the MobyVM, or create a [data
+network paths, and instead mount on the MobyVM, or create a [data
-volume](/engine/tutorials/dockervolumes.md#data-volumes)
+volume](/engine/tutorials/dockervolumes.md#data-volumes) (named volume) or [data
-(named volume) or [data
 container](/engine/tutorials/dockervolumes.md#creating-and-mounting-a-data-volume-container).
 See also, the [volumes key under service
 configuration](/compose/compose-file/index.md#volumes) and the [volume
@@ -204,14 +219,14 @@ configuration
 reference](/compose/compose-file/index.md#volume-configuration-reference) in the
 Compose file documentation.
 
-### Local security policies can block shared drives and cause login errors
+#### Local security policies can block shared drives and cause login errors
 
-You need permissions to mount shared drives to use the Docker for
+You need permissions to mount shared drives to use the Docker for Windows
-Windows [shared drives](/docker-for-windows/index.md#shared-drives) feature.
+[shared drives](/docker-for-windows/index.md#shared-drives) feature.
 
-If local policy prevents this, you get errors when you attempt to enable
+If local policy prevents this, you get errors when you attempt to enable shared
-shared drives on Docker. This is not something Docker can resolve, since you do
+drives on Docker. This is not something Docker can resolve, since you do need
-need these permissions to use the feature.
+these permissions to use the feature.
 
 Here are snip-its from example error messages:
 
@@ -226,11 +241,13 @@ mount: mounting //10.0.75.1/C on /c failed: Invalid argument
 
 See also, <a href="https://github.com/docker/for-win/issues/98">Docker for Windows issue #98</a>.
 
-### Understand symlinks limitations
+#### Understand symlinks limitations
 
-Symlinks work within and across containers. However, symlinks created outside of containers (for example, on the host) do not work. To learn more, see [Are symlinks supported?](faqs.md#are-symlinks-supported) in the FAQs.
+Symlinks work within and across containers. However, symlinks created outside of
+containers (for example, on the host) do not work. To learn more, see [Are
+symlinks supported?](faqs.md#are-symlinks-supported) in the FAQs.
 
-### Avoid unexpected syntax errors, use Unix style line endings for files in containers
+#### Avoid unexpected syntax errors, use Unix style line endings for files in containers
 
 Any file destined to run inside a container must use Unix style `\n` line
 endings. This includes files referenced at the command line for builds and in
@@ -248,69 +265,13 @@ For an example of this issue and the resolution, see this issue on GitHub:
 [Docker RUN fails to execute shell
 script](https://github.com/moby/moby/issues/24388).
 
-### Recreate or update your containers after Beta 18 upgrade
+### Virtualization
 
-Docker 1.12.0 RC3 release introduces a backward incompatible change from RC2 to RC3. (For more information, see https://github.com/moby/moby/issues/24343#issuecomment-230623542.)
+#### Hyper-V
-
-You may get the following error when you try to start a container created with pre-Beta 18 Docker for Windows applications.
-
-    Error response from daemon: Unknown runtime specified default
-
-You can fix this by either [recreating](troubleshoot.md#recreate-your-containers) or [updating](troubleshoot.md#update-your-containers) your containers.
-
-If you get the error message shown above, we recommend recreating them.
-
-#### Recreate your containers
-
-To recreate your containers, use Docker Compose.
-
-    docker-compose down && docker-compose up
-
-#### Update your containers
-
-To fix existing containers, follow these steps.
-
-1.  Run this command.
-
-    ```powershell
-    PS C:\Users\jdoe> docker run --rm -v /var/lib/docker:/docker cpuguy83/docker112rc3-runtimefix:rc3
-
-    Unable to find image 'cpuguy83/docker112rc3-runtimefix:rc3' locally
-    rc3: Pulling from cpuguy83/docker112rc3-runtimefix
-    91e7f9981d55: Pull complete
-    Digest: sha256:96abed3f7a7a574774400ff20c6808aac37d37d787d1164d332675392675005c
-    Status: Downloaded newer image for cpuguy83/docker112rc3-runtimefix:rc3
-    proccessed 1648f773f92e8a4aad508a45088ca9137c3103457b48be1afb3fd8b4369e5140
-    skipping container '433ba7ead89ba645efe9b5fff578e674aabba95d6dcb3910c9ad7f1a5c6b4538': already fixed
-    proccessed 43df7f2ac8fc912046dfc48cf5d599018af8f60fee50eb7b09c1e10147758f06
-    proccessed 65204cfa00b1b6679536c6ac72cdde1dbb43049af208973030b6d91356166958
-    proccessed 66a72622e306450fd07f2b3a833355379884b7a6165b7527c10390c36536d82d
-    proccessed 9d196e78390eeb44d3b354d24e25225d045f33f1666243466b3ed42fe670245c
-    proccessed b9a0ecfe2ed9d561463251aa90fd1442299bcd9ea191a17055b01c6a00533b05
-    proccessed c129a775c3fa3b6337e13b50aea84e4977c1774994be1f50ff13cbe60de9ac76
-    proccessed dea73dc21126434f14c58b83140bf6470aa67e622daa85603a13bc48af7f8b04
-    proccessed dfa8f9278642ab0f3e82ee8e4ad029587aafef9571ff50190e83757c03b4216c
-    proccessed ee5bf706b6600a46e5d26327b13c3c1c5f7b261313438d47318702ff6ed8b30b
-    ```
-
-2. Quit Docker.
-
-3. Start Docker.
-
-	> **Note**: Be sure to quit and then restart Docker for Windows before attempting to start containers.
-
-4.  Try to start the container again:
-
-    ```powershell
-    PS C:\Users\jdoe> docker start old-container
-    old-container
-    ```
-
-### Hyper-V
 
 Docker for Windows requires a Hyper-V as well as the Hyper-V Module for Windows
-Powershell to be installed and enabled. The Docker for Windows installer
+Powershell to be installed and enabled. The Docker for Windows installer enables
-enables it for you.
+it for you.
 
 See [these
 instructions](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/quick_start/walkthrough_install)
@@ -339,7 +300,7 @@ Hyper-V is enabled, an external network switch is active, and referenced in the
 flags for the `docker-machine create` command [as described in the Docker
 Machine driver example](/machine/drivers/hyper-v.md#example).
 
-### Virtualization must be enabled
+#### Virtualization must be enabled
 
 In addition to [Hyper-V](#hyper-v), virtualization must be enabled.
 
@@ -351,8 +312,9 @@ Task Manager.
 
 ![Task Manager](images/win-virtualization-enabled.png)
 
-Also, see the user-reported issue
+Also, see the user-reported issue [Unable to run Docker for Windows on Windows
-[Unable to run Docker for Windows on Windows 10 Enterprise](https://github.com/docker/for-win/issues/74).
+10 Enterprise](https://github.com/docker/for-win/issues/74).
+
 
 ### Networking and WiFi problems upon Docker for Windows install
 
@@ -374,8 +336,8 @@ troubleshooting topic](#virtualization-must-be-enabled).
 
 3. Check your network switches to see if `DockerNAT` is enabled.
 
-	Open the **Hyper-V Manager**. (On Windows 10, just search for the
+   Open the **Hyper-V Manager**. (On Windows 10, just search for the Hyper-V
-	Hyper-V Manager in the search field in the lower left search field.)
+   Manager in the search field in the lower left search field.)
 
    Select the Virtual Switch Manager on the left-side **Actions** panel.
 
@@ -384,19 +346,19 @@ troubleshooting topic](#virtualization-must-be-enabled).
 4. Set up an external network switch. If you plan at any point to use [Docker
    Machine](/machine/overview.md) to set up multiple local VMs, you need this
    anyway, as described in the topic on the [Hyper-V driver for [Docker
-Machine](/machine/drivers/hyper-v.md#example). You can replace `DockerNAT` with
+   Machine](/machine/drivers/hyper-v.md#example). You can replace `DockerNAT`
-this switch.
+   with this switch.
 
-5.	If previous steps fail to solve the problems, follow steps on the
+5. If previous steps fail to solve the problems, follow steps on the [Cleanup
-[Cleanup README](https://github.com/Microsoft/Virtualization-Documentation/blob/master/windows-server-container-tools/CleanupContainerHostNetworking/README.md).
+   README](https://github.com/Microsoft/Virtualization-Documentation/blob/master/windows-server-container-tools/CleanupContainerHostNetworking/README.md).
 
-	>Read full description of consequences before you run Windows cleanup script
+    > Read full description of consequences before you run Windows cleanup
+    > script
     >
-  >The cleanup command has a `-Cleanup` flag and a
+    > The cleanup command has a `-Cleanup` flag and a `-ForceDeleteAllSwitches`
-	 `-ForceDeleteAllSwitches` flag. Be sure to read the whole page
+    > flag. Be sure to read the whole page before running any scripts,
-	 before running any scripts, especially the warnings with regard
+    > especially the warnings with regard to the `-ForceDeleteAllSwitches`
-	 to the `-ForceDeleteAllSwitches` option.
+    > option.  {: .warning}
-	 {: .warning}
 
 ### Windows containers and Windows Server 2016
 
@@ -445,10 +407,11 @@ Linux containers).
 To reach a Windows container from the local host, you need to specify
 the IP address and port for the container that is running the service.
 
-You can get the container IP address by using [`docker inspect`](/engine/reference/commandline/inspect.md) with some
+You can get the container IP address by using [`docker
-`--format` options and the ID or name of the container. For the example above,
+inspect`](/engine/reference/commandline/inspect.md) with some `--format` options
-the command would look like this, using the name we gave to the container
+and the ID or name of the container. For the example above, the command would
-(`webserver`) instead of the container ID:
+look like this, using the name we gave to the container (`webserver`) instead of
+the container ID:
 
 {% raw %}
 ```bash
@@ -475,11 +438,14 @@ Now you can connect to the webserver by using `http://172.17.0.2:80` (or simply
 
 For more information, see:
 
-* Docker for Windows issue on GitHub: [Port binding does not work for locahost](https://github.com/docker/for-win/issues/458)
+* Docker for Windows issue on GitHub: [Port binding does not work for
+  locahost](https://github.com/docker/for-win/issues/458)
 
-* [Published Ports on Windows Containers Don't Do Loopback](https://blog.sixeyed.com/published-ports-on-windows-containers-dont-do-loopback/)
+* [Published Ports on Windows Containers Don't Do
+  Loopback](https://blog.sixeyed.com/published-ports-on-windows-containers-dont-do-loopback/)
 
-* [Windows NAT capabilities and limitations](https://blogs.technet.microsoft.com/virtualization/2016/05/25/windows-nat-winnat-capabilities-and-limitations/)
+* [Windows NAT capabilities and
+  limitations](https://blogs.technet.microsoft.com/virtualization/2016/05/25/windows-nat-winnat-capabilities-and-limitations/)
 
 
 ### Running Docker for Windows in nested virtualization scenarios
@@ -488,63 +454,73 @@ Docker for Windows can run inside a Windows 10 virtual machine (VM) running on
 apps like Parallels or VMware Fusion on a Mac provided that the VM is properly
 configured. However, problems and intermittent failures may still occur due to
 the way these apps virtualize the hardware. For these reasons, _**Docker for
-Windows is not supported for nested virtualization scenarios**_. It
+Windows is not supported for nested virtualization scenarios**_. It might work
-might work in some cases, and not in others.
+in some cases, and not in others.
 
 The better solution is to run Docker for Windows natively on a Windows system
-(to work with Windows or Linux containers), or Docker for Mac on Mac
+(to work with Windows or Linux containers), or Docker for Mac on Mac to work
-to work with Linux containers.
+with Linux containers.
 
 #### If you still want to use nested virtualization
 
 * Make sure nested virtualization support is enabled in VMWare or Parallels.
-Check the settings in
+Check the settings in **Hardware -> CPU & Memory -> Advanced Options -> Enable
-**Hardware -> CPU & Memory -> Advanced Options -> Enable nested virtualization**
+nested virtualization** (the exact menu sequence might vary slightly).
-(the exact menu sequence might vary slightly).
 
 * Configure your VM with at least 2 CPUs and sufficient memory to run your
   workloads.
 
 * Make sure your system is more or less idle.
 
-* Make sure your Windows OS is up-to-date. There have been several issues with some insider builds.
+* Make sure your Windows OS is up-to-date. There have been several issues with
+  some insider builds.
 
-* The processor you have may also be relevant. For example, Westmere based
+* The processor you have may also be relevant. For example, Westmere based Mac
-Mac Pros have some additional hardware virtualization features over
+  Pros have some additional hardware virtualization features over Nehalem based
-Nehalem based Mac Pros and so do newer generations of Intel processors.
+  Mac Pros and so do newer generations of Intel processors.
 
 #### Typical failures we see with nested virtualization
 
-* Slow boot time of the Linux VM. If you look in the logs and find
+* Slow boot time of the Linux VM. If you look in the logs and find some entries
-some entries prefixed with `Moby`. On real hardware, it takes 5-10 seconds to
+  prefixed with `Moby`. On real hardware, it takes 5-10 seconds to boot the
-boot the Linux VM; roughly the time between the `Connected` log entry and the `*
+  Linux VM; roughly the time between the `Connected` log entry and the `*
-Starting Docker ... [ ok ]` log entry. If you boot the Linux VM inside a Windows
+  Starting Docker ... [ ok ]` log entry. If you boot the Linux VM inside a
-VM, this may take considerably longer. We have a timeout of 60s or so. If the VM
+  Windows VM, this may take considerably longer. We have a timeout of 60s or
-hasn't started by that time, we retry. If the retry fails we print an error. You
+  so. If the VM hasn't started by that time, we retry. If the retry fails we
-can sometimes work around this by providing more resources to the Windows VM.
+  print an error. You can sometimes work around this by providing more resources
+  to the Windows VM.
 
-* Sometimes the VM fails to boot when Linux tries to calibrate the
+* Sometimes the VM fails to boot when Linux tries to calibrate the time stamp
-time stamp counter (TSC). This process is quite timing sensitive and may fail
+  counter (TSC). This process is quite timing sensitive and may fail when
-when executed inside a VM which itself runs inside a VM. CPU utilization is also
+  executed inside a VM which itself runs inside a VM. CPU utilization is also
   likely to be higher.
 
 #### Related issues
 
-Discussion thread on GitHub at [Docker for Windows issue 267](https://github.com/docker/for-win/issues/267)
+Discussion thread on GitHub at [Docker for Windows issue
+267](https://github.com/docker/for-win/issues/267)
 
 ### Networking issues
 
-Some users have reported problems connecting to Docker Hub on the Docker for Windows stable version. (See GitHub issue [22567](https://github.com/moby/moby/issues/22567).)
+Some users have reported problems connecting to Docker Hub on the Docker for
+Windows stable version. (See GitHub issue
+[22567](https://github.com/moby/moby/issues/22567).)
 
 Here is an example command and error message:
 
+```
 PS C:\Users\jdoe> docker run hello-world
 Unable to find image 'hello-world:latest' locally
 Pulling repository docker.io/library/hello-world
 C:\Program Files\Docker\Docker\Resources\bin\docker.exe: Error while pulling image: Get https://index.docker.io/v1/repositories/library/hello-world/images: dial tcp: lookup index.docker.io on 10.0.75.1:53: no such host.
 See 'C:\Program Files\Docker\Docker\Resources\bin\docker.exe run --help'.
+```
 
-As an immediate workaround to this problem, reset the DNS server to use the Google DNS fixed address: `8.8.8.8`. You can configure this via the **Settings** -> **Network** dialog, as described in the topic [Network](/docker-for-windows/index.md#network). Docker automatically restarts when you apply this setting, which could take some time.
+As an immediate workaround to this problem, reset the DNS server to use the
+Google DNS fixed address: `8.8.8.8`. You can configure this via the **Settings**
+-> **Network** dialog, as described in the topic
+[Network](/docker-for-windows/index.md#network). Docker automatically restarts
+when you apply this setting, which could take some time.
 
 We are currently investigating this issue.
 
@@ -571,11 +547,13 @@ remove them.
 
 ##### 3. Remove stale NAT configurations
 
-You might have stale NAT configurations on the system. You should remove them with `Remove-NetNat DockerNAT` on an elevated Powershell prompt.
+You might have stale NAT configurations on the system. You should remove them
+with `Remove-NetNat DockerNAT` on an elevated Powershell prompt.
 
 ##### 4. Remove stale network adapters
 
-You might have stale Network Adapters on the system. You should remove them with the following commands on an elevated Powershell prompt:
+You might have stale Network Adapters on the system. You should remove them with
+the following commands on an elevated Powershell prompt:
 
 ```
 PS C:\Users\jdoe> $vmNetAdapter = Get-VMNetworkAdapter -ManagementOS -SwitchName DockerNAT
@@ -618,13 +596,17 @@ To create a larger NAT prefix, do the following.
 
 1. Stop Docker for Windows and remove all NAT prefixes with `Remove-NetNAT`.
 
-2. Create a new shorter NAT prefix which covers the Docker for Windows NAT prefix but allows room for additional NAT prefixes. For example:
+2. Create a new shorter NAT prefix which covers the Docker for Windows NAT
+   prefix but allows room for additional NAT prefixes. For example:
 
+   ```
    New-NetNat -Name DockerNAT -InternalIPInterfaceAddressPrefix 10.0.0.0/16
+   ```
 
    The next time Docker for Windows starts, it uses the new, wider prefix.
 
-Alternatively, you can use a different NAT name and NAT prefix and adjust the NAT prefix Docker for Windows uses accordingly via the `Settings` panel.
+Alternatively, you can use a different NAT name and NAT prefix and adjust the
+NAT prefix Docker for Windows uses accordingly via the `Settings` panel.
 
 >**Note**: You also need to adjust your existing VMs to use IP addresses from within the new NAT prefix.
 
@@ -632,26 +614,36 @@ Alternatively, you can use a different NAT name and NAT prefix and adjust the NA
 
 ### `inotify` currently does not work on Docker for Windows
 
-If you are using `Node.js` with `nodemon`, a temporary workaround is to try the fallback polling mode described here: [nodemon isn't restarting node applications](https://github.com/remy/nodemon#application-isnt-restarting). See also this issue on GitHub [Inotify on shared drives does not work](https://github.com/docker/for-win/issues/56#issuecomment-242135705).
+If you are using `Node.js` with `nodemon`, a temporary workaround is to try the
+fallback polling mode described here: [nodemon isn't restarting node
+applications](https://github.com/remy/nodemon#application-isnt-restarting). See
+also this issue on GitHub [Inotify on shared drives does not
+work](https://github.com/docker/for-win/issues/56#issuecomment-242135705).
 
 ### Reboot
 
-Restart your PC to stop / discard any vestige of the daemon running from the previously installed version.
+Restart your PC to stop / discard any vestige of the daemon running from the
+previously installed version.
 
 ### Unset `DOCKER_HOST`
 
-The `DOCKER_HOST` environmental variable does not need to be set.
+The `DOCKER_HOST` environmental variable does not need to be set.  If you use
-If you use bash, use the command `unset ${!DOCKER_*}` to unset it.
+bash, use the command `unset ${!DOCKER_*}` to unset it.  For other shells,
-For other shells, consult the shell's documentation.
+consult the shell's documentation.
 
 ### Make sure Docker is running for webserver examples
 
-For the `hello-world-nginx` example and others, Docker for Windows must be running to get to the webserver on `http://localhost/`. Make sure that the Docker whale is showing in the menu bar, and that you run the Docker commands in a shell that is connected to the Docker for Windows Engine (not Engine from Toolbox). Otherwise, you might start the webserver container but get a "web page not available" error when you go to `docker`.
+For the `hello-world-nginx` example and others, Docker for Windows must be
+running to get to the webserver on `http://localhost/`. Make sure that the
+Docker whale is showing in the menu bar, and that you run the Docker commands in
+a shell that is connected to the Docker for Windows Engine (not Engine from
+Toolbox). Otherwise, you might start the webserver container but get a "web page
+not available" error when you go to `docker`.
 
 ### How to solve `port already allocated` errors
 
-If you see errors like `Bind for 0.0.0.0:8080 failed: port is already allocated` or
+If you see errors like `Bind for 0.0.0.0:8080 failed: port is already allocated`
- `listen tcp:0.0.0.0:8080: bind: address is already in use` ...
+or `listen tcp:0.0.0.0:8080: bind: address is already in use` ...
 
 These errors are often caused by some other software on Windows using those
 ports. To discover the identity of this software, either use the `resmon.exe`
@@ -666,10 +658,10 @@ docker app.
 **Some firewalls and anti-virus software might be incompatible with Microsoft
 **Windows 10 builds**, such as Windows 10 Anniversary Update. The conflict
 typically occurs after a Windows update or new install of the firewall, and
-manifests as an error response from the Docker daemon and a **Docker for
+manifests as an error response from the Docker daemon and a **Docker for Windows
-Windows start failure**. The Comodo Firewall was one example of this problem,
+start failure**. The Comodo Firewall was one example of this problem, but users
-but users report that software has since been updated to work with these
+report that software has since been updated to work with these Windows 10
-Windows 10 builds.
+builds.
 
 See the Comodo forums topics [Comodo Firewall conflict with
 Hyper-V](https://forums.comodo.com/bug-reports-cis/comodo-firewall-began-conflict-with-hyperv-t116351.0.html)
@@ -679,5 +671,5 @@ A Docker for Windows user-created issue describes the problem specifically as it
 relates to Docker: [Docker fails to start on Windows
 10](https://github.com/docker/for-win/issues/27).
 
-For a temporary workaround, uninstall the firewall or anti-virus software, or explore other
+For a temporary workaround, uninstall the firewall or anti-virus software, or
-workarounds suggested on the forum.
+explore other workarounds suggested on the forum.