diff --git a/docs/installation.md b/docs/installation.md
index 9bd6f9bef..69de1376e 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -14,7 +14,7 @@ Pilosa is currently available for [MacOS](#installing-on-macos) and [Linux](#ins
 
 ### Installing on MacOS
 
-There are four ways to install Pilosa on MacOS: Use [Homebrew](https://brew.sh/) (recommended), download the binary, build from source, or use Docker.
+There are four ways to install Pilosa on MacOS: Use [Homebrew](https://brew.sh/) (recommended), download the binary, build from source, or use [Docker](#docker).
 
 #### Use Homebrew
 
@@ -188,27 +188,6 @@ There are four ways to install Pilosa on MacOS: Use [Homebrew](https://brew.sh/)
 
     You're good to go!
 
-#### Use Docker
-
-1. Install Docker for Mac.
-
-2. Confirm that the Docker daemon is running in the background:
-    ```
-    docker version
-    ```
-
-    If you don't see the server listed, start the Docker application.
-
-3. Pull the official Pilosa image from Docker Hub:
-    ```
-    docker pull pilosa/pilosa:latest
-    ```
-
-4. Make sure Pilosa is installed successfully:
-    ```
-    docker run --rm pilosa/pilosa:latest help
-    ```
-
 #### What's next?
 
 Head over to the [Getting Started](../getting-started/) guide to create your first Pilosa index.
@@ -216,7 +195,7 @@ Head over to the [Getting Started](../getting-started/) guide to create your fir
 
 ### Installing on Linux
 
-There are three ways to install Pilosa on Linux: download the binary (recommended), build from source, or use Docker.
+There are three ways to install Pilosa on Linux: download the binary (recommended), build from source, or use [Docker](#docker).
 
 #### Download the Binary
 
@@ -339,43 +318,22 @@ There are three ways to install Pilosa on Linux: download the binary (recommende
 
     You're good to go!
 
-
-#### Use Docker
-
-1. Install Docker.
-
-2. Confirm that the Docker daemon is running in the background:
-    ```
-    docker version
-    ```
-
-    If you don't see the server listed, start the Docker application.
-
-3. Pull the official Pilosa image from Docker Hub:
-    ```
-    docker pull pilosa/pilosa:latest
-    ```
-
-4. Make sure Pilosa is installed successfully:
-    ```
-    docker run --rm pilosa/pilosa:latest help
-    ```
-
 #### What's next?
 
 Head over to the [Getting Started](../getting-started/) guide to create your first Pilosa index.
 
 
-<!--
 ### Windows
 
-Windows is currently not supported as a target deployment platform for Pilosa, but developing and running Pilosa is made possible by Windows Subsystem for Linux and Docker. See the [Docker](#docker) documentation for using Docker for Windows and Docker Toolbox. You can find documentation about installing Windows Subsystem for Linux at https://msdn.microsoft.com/en-us/commandline/wsl/install_guide. From there, use the instructions in the [Linux Install](#installing-on-linux) section in the this document.
+Windows is currently not supported as a target deployment platform for Pilosa, but developing and running Pilosa is made possible by Docker. See the [Docker](#docker) documentation for using Docker for Windows and Docker Toolbox.
+
+Windows Subsystem for Linux is currently not supported.
 
 ### Docker
 
 1. Install Docker for your platform. On Linux, Docker is available via your package manager. On MacOS, you can use Docker for Mac or Docker Toolbox. On Windows, you can use Docker for Windows or Docker Toolbox.
 
-2. **This step is necessary only if you are using Docker Toolbox**:
+2. **This step is necessary only if you are using Docker Toolbox**, otherwise skip to step 3:
 
     a. Start the Docker support using `docker-machine start` in a terminal. The environment variables of the terminal should be updated accordingly, run `docker-machine env` to display the necessary commands.
 
@@ -386,12 +344,12 @@ Windows is currently not supported as a target deployment platform for Pilosa, b
     ```
 
 3. Confirm that the Docker daemon is running in the background:
-
     ```
     docker version
     ```
 
-    If you don't see the server listed, start the Docker application.
+    If you are getting a "command not found" or similar, check that `docker` command is in your path. If you don't see the server listed, start the Docker application.
+
 
 4. Pull the official Pilosa image from Docker Hub:
 
@@ -399,9 +357,26 @@ Windows is currently not supported as a target deployment platform for Pilosa, b
     docker pull pilosa/pilosa:latest
     ```
 
-5. Make sure Pilosa is installed successfully:
+5. Make sure Pilosa is installed successfully, and make it accessible:
 
     ```
-    docker run --rm pilosa/pilosa:latest version
+    docker run -d --rm --name pilosa -p 10101:10101 pilosa/pilosa:latest server --bind 0.0.0.0:10101
     ```
--->
+
+6. Check that it is accessible from outside the container.
+
+    Run the following in a separate terminal:
+    ```
+    curl localhost:10101/schema
+    ```
+
+    If that returns `{"indexes":null}` or similar, then Pilosa is accessible from outside the container. Otherwise check that you have correctly typed `-p 10101:10101` when running the Pilosa container and the port mappings in VirtualBox is correct (Docker Toolbox only).
+
+7. When you want to terminate the Pilosa container, you can run the following:
+    ```
+    docker stop pilosa
+    ```
+
+#### What's next?
+
+Head over to the [Getting Started](../getting-started/) guide to create your first Pilosa index.