clarify how to use Windows containers and Windows Server 2016

Victoria Bialas · Victoria Bialas · commit c92d0f337006 · 2016-11-02T10:15:54.000-07:00
Signed-off-by: Victoria Bialas &lt;victoria.bialas@docker.com&gt;
diff --git a/docker-for-windows/faqs.md b/docker-for-windows/faqs.md
@@ -157,6 +157,15 @@ cycles. Exit and start Docker to restore connectivity.
 Unfortunately, VirtualBox (and other hypervisors like VMWare) cannot run when
 Hyper-V is enabled on Windows.
 
+### How do I run Windows containers on Docker on Windows Server 2016?
+
+See [About Windows containers and Windows Server
+2016](index.md#about-windows-containers-and-windows-server-2016).
+
+A full tutorial is available in [docker/labs](https://github.com/docker/labs) at
+[Getting Started with Windows
+Containers](https://github.com/docker/labs/tree/master/windows/windows-containers).
+
 ### Why is Windows 10 Home not supported?
 
 Docker for Windows requires the Hyper-V Windows feature which is not
diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md
@@ -66,33 +66,46 @@ If you have not already done so, please install Docker for Windows. You can down
 
 ##  What to know before you install
 
-* **README FIRST for Docker Toolbox and Docker Machine users**: Docker for Windows requires Microsoft Hyper-V to run. After Hyper-V is enabled, VirtualBox will no longer work, but any VirtualBox VM images will remain. VirtualBox VMs created with `docker-machine` (including the `default` one typically created during Toolbox install) will no longer start. These VMs cannot be used side-by-side with Docker for Windows. However, you can still use `docker-machine` to manage remote VMs.
+* **README FIRST for Docker Toolbox and Docker Machine users**: Docker for Windows requires Microsoft Hyper-V to run. After Hyper-V is enabled,
+VirtualBox will no longer work, but any VirtualBox VM images will remain.
+VirtualBox VMs created with `docker-machine` (including the `default` one
+typically created during Toolbox install) will no longer start. These VMs cannot
+be used side-by-side with Docker for Windows. However, you can still use
+`docker-machine` to manage remote VMs.
 <p />
 * The current version of Docker for Windows runs on 64bit Windows 10 Pro, Enterprise and Education (1511 November update, Build 10586 or later). In the future we will support more versions of Windows 10.
 <p />
-* Containers and images created with Docker for Windows are shared between all user accounts on machines where it is installed. This is because all Windows accounts will use the same VM to build and run containers. In the future, Docker for Windows will better isolate user content.
+* Containers and images created with Docker for Windows are shared between all user accounts on machines where it is installed. This is because all
+Windows accounts will use the same VM to build and run containers. In the
+future, Docker for Windows will better isolate user content.
 <p />
-* The Hyper-V package must be enabled for Docker for Windows to work. The Docker for Windows installer will enable it for you, if needed. (This requires a reboot). If your system does not satisfy these requirements, you can install [Docker Toolbox](/toolbox/overview.md), which uses Oracle Virtual Box instead of Hyper-V.
+* The Hyper-V package must be enabled for Docker for Windows to work. The Docker for Windows installer will enable it for you, if needed. (This requires a
+reboot). If your system does not satisfy these requirements, you can install
+[Docker Toolbox](/toolbox/overview.md), which uses Oracle Virtual Box instead of
+Hyper-V.
 <p />
-* Virtualization must be enabled. Typically, virtualization is enabled by default. (Note that this is different from having Hyper-V enabled.) For more detail see [Virtualization must be enabled](troubleshoot.md#virtualization-must-be-enabled) in Troubleshooting.
-<br><br>
-* **What the Docker for Windows install includes**: The installation provides [Docker Engine](/engine/userguide/intro/), Docker CLI client, [Docker Compose](/compose/overview/), and [Docker Machine](/machine/overview/).
+* Virtualization must be enabled. Typically, virtualization is enabled by default. (Note that this is different from having Hyper-V enabled.) For more
+detail see [Virtualization must be
+enabled](troubleshoot.md#virtualization-must-be-enabled) in Troubleshooting.
 <p />
-* You can run **Docker on Windows Server 16 and Windows 10** in two different ways:
+* **What the Docker for Windows install includes**: The installation provides [Docker Engine](https://docs.docker.com/engine/userguide/intro/), Docker CLI client, [Docker Compose](https://docs.docker.com/compose/overview/), and [Docker Machine](https://docs.docker.com/machine/overview/).
 
-  * You can [install a native Docker  binary](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10)
-  which allows you to develop and run Windows containers natively. However, if you
-  install Docker this way, you cannot develop or run Linux containers.  If you try to run a Linux container on the native Docker daemon, an error occurs:
+### About Windows containers and Windows Server 2016
 
-    ```no-highlight
-    C:\Program Files\Docker\docker.exe:
-     image operating system "linux" cannot be used on this platform.
-     See 'C:\Program Files\Docker\docker.exe run --help'.
-     ```
+Looking for information on using Windows containers?
 
-  * You can [install Docker for Windows](#step-1-install-docker-for-windows),
-    which allows you to develop and run Windows containers natively, or develop
-    and run Linux containers using Hyper-V. This is the best of both worlds.
+* [Getting Started with Windows Containers (Lab)](https://github.com/docker/labs/tree/master/windows/windows-containers)
+provides a tutorial on how to set up and run Windows containers on Windows 10 or
+with Windows Server 2016. It shows you how to use a MusicStore application with
+Windows containers.
+<p />
+* [Setup - Windows Server 2016 (Lab)](https://github.com/docker/labs/blob/master/windows/windows-containers/Setup-Server2016.md) specifically describes environment setup.
+<p />
+* [Switch
+between Windows and Linux containers (Beta
+feature)](index.md#switch-between-windows-and-linux-containers-beta-feature) describes the Linux / Windows containers toggle in Docker for Windows and points you to the tutorial mentioned above.
+<p />
+* Docker Container Platform for Windows Server 2016 [articles and blog posts](https://www.docker.com/microsoft) on the Docker website
 
 ## Step 1. Install Docker for Windows
 
diff --git a/docker-for-windows/troubleshoot.md b/docker-for-windows/troubleshoot.md
@@ -161,9 +161,17 @@ To fix existing containers, follow these steps.
 
 ### 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 will enable it for you.
-
-See [these instructions](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/quick_start/walkthrough_install) to install Hyper-V manually. A reboot is *required*. If you install Hyper-V without the reboot, Docker for Windows will not work correctly. On some systems, Virtualization needs to be enabled in the BIOS. The steps to do so are Vendor specific, but typically the BIOS option is called `Virtualization Technology (VTx)` or similar.
+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 will
+enable it for you.
+
+See [these
+instructions](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/quick_start/walkthrough_install)
+to install Hyper-V manually. A reboot is *required*. If you install Hyper-V
+without the reboot, Docker for Windows will not work correctly. On some systems,
+Virtualization needs to be enabled in the BIOS. The steps to do so are Vendor
+specific, but typically the BIOS option is called `Virtualization Technology
+(VTx)` or similar.
 
 ### Virtualization must be enabled
 
@@ -175,7 +183,29 @@ Verify that virtualization is enabled on Task Manager.
 
 ![Task Manager](images/win-virtualization-enabled.png)
 
-See also, the user reported issue [Unable to run Docker for Windows on Windows 10 Enterprise](https://github.com/docker/for-win/issues/74)
+See also, the user reported issue [Unable to run Docker for Windows on Windows
+10 Enterprise](https://github.com/docker/for-win/issues/74)
+
+### Windows containers and Windows Server 2016
+
+If you have questions about how to set up and run Windows containers on Windows
+Server 2016 or Windows 10, see [About Windows containers and Windows Server
+2016](index.md#about-windows-containers-and-windows-server-2016).
+
+A full tutorial is available in [docker/labs](https://github.com/docker/labs) at
+[Getting Started with Windows
+Containers](https://github.com/docker/labs/tree/master/windows/windows-containers).
+
+You can install a native Windows binary which allows you to develop and run
+Windows containers without Docker for Windows. However, if you install Docker
+this way, you cannot develop or run Linux containers.  If you try to run a Linux
+container on the native Docker daemon, an error occurs:
+
+  ```no-highlight
+  C:\Program Files\Docker\docker.exe:
+   image operating system "linux" cannot be used on this platform.
+   See 'C:\Program Files\Docker\docker.exe run --help'.
+   ```
 
 ### Networking issues
 
