diff --git a/docs/README.md b/docs/README.md
index f22ae49efa..b8d50c8d91 100755
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,3 +1,9 @@
+<!--[metadata]>
++++
+draft = true
++++
+<![end-metadata]-->
+
 # Docker Documentation
 
 The source for Docker documentation is in this directory under `sources/`. Our
diff --git a/docs/sources/reference/builder.md b/docs/reference/builder.md
similarity index 99%
rename from docs/sources/reference/builder.md
rename to docs/reference/builder.md
index 16f918d26a..89b7602656 100644
--- a/docs/sources/reference/builder.md
+++ b/docs/reference/builder.md
@@ -1,6 +1,12 @@
-page_title: Dockerfile reference
-page_description: Dockerfiles use a simple DSL which allows you to automate the steps you would normally manually take to create an image.
-page_keywords: builder, docker, Dockerfile, automation, image creation
+<!--[metadata]>
++++
+title = "Dockerfile reference"
+description = "Dockerfiles use a simple DSL which allows you to automate the steps you would normally manually take to create an image."
+keywords = ["builder, docker, Dockerfile, automation,  image creation"]
+[menu.main]
+parent = "mn_reference"
++++
+<![end-metadata]-->
 
 # Dockerfile reference
 
diff --git a/docs/sources/reference/commandline/cli.md b/docs/reference/commandline/cli.md
similarity index 99%
rename from docs/sources/reference/commandline/cli.md
rename to docs/reference/commandline/cli.md
index 7f632e149a..89d0c90a99 100644
--- a/docs/sources/reference/commandline/cli.md
+++ b/docs/reference/commandline/cli.md
@@ -1,6 +1,12 @@
-page_title: Command Line Interface
-page_description: Docker's CLI command description and usage
-page_keywords: Docker, Docker documentation, CLI, command line
+<!--[metadata]>
++++
+title = "Command Line Interface"
+description = "Docker's CLI command description and usage"
+keywords = ["Docker, Docker documentation, CLI,  command line"]
+[menu.main]
+parent = "mn_reference"
++++
+<![end-metadata]-->
 
 # Docker Command Line
 
diff --git a/docs/sources/reference/commandline/docker_images.gif b/docs/reference/commandline/docker_images.gif
similarity index 100%
rename from docs/sources/reference/commandline/docker_images.gif
rename to docs/reference/commandline/docker_images.gif
diff --git a/docs/sources/reference/glossary.md b/docs/reference/glossary.md
similarity index 96%
rename from docs/sources/reference/glossary.md
rename to docs/reference/glossary.md
index c04f27d548..1e2f2884b5 100644
--- a/docs/sources/reference/glossary.md
+++ b/docs/reference/glossary.md
@@ -1,6 +1,13 @@
-page_title: Docker Glossary
-page_description: Glossary of terms used around Docker
-page_keywords: glossary, docker, terms, definitions
+<!--[metadata]>
++++
+title = "Docker Glossary"
+description = "Glossary of terms used around Docker"
+keywords = ["glossary, docker, terms,  definitions"]
+[menu.main]
+parent = "mn_about"
+weight = "50"
++++
+<![end-metadata]-->
 
 # Glossary
 
diff --git a/docs/sources/reference/run.md b/docs/reference/run.md
similarity index 99%
rename from docs/sources/reference/run.md
rename to docs/reference/run.md
index 084af75c02..6b0b568dfd 100644
--- a/docs/sources/reference/run.md
+++ b/docs/reference/run.md
@@ -1,6 +1,12 @@
-page_title: Docker run reference
-page_description: Configure containers at runtime
-page_keywords: docker, run, configure, runtime
+<!--[metadata]>
++++
+title = "Docker run reference"
+description = "Configure containers at runtime"
+keywords = ["docker, run, configure,  runtime"]
+[menu.main]
+parent = "mn_reference"
++++
+<![end-metadata]-->
 
 <!-- TODO (@thaJeztah) define more flexible table/td classes -->
 <style>
diff --git a/man/README.md b/man/README.md
index 9a5ed7eb55..e25a925adb 100644
--- a/man/README.md
+++ b/man/README.md
@@ -11,34 +11,23 @@ The recommended approach for generating the man pages is via a Docker
 container using the supplied `Dockerfile` to create an image with the correct
 environment. This uses `go-md2man`, a pure Go Markdown to man page generator.
 
-### Generate the man pages 
+## Building the md2man image
 
-On Linux installations, Docker includes a set of man pages you can access by typing `man command-name` on the command line. For example, `man docker` displays the `docker` man page. When using Docker on Mac OSX the man pages are not automatically included. 
+There is a `Dockerfile` provided in the `docker/docs/man` directory.
 
-You can generate and install the `man` pages yourself by following these steps:
+Using this `Dockerfile`, create a Docker image tagged `docker/md2man`:
 
-1. Checkout the `docker` source. 
+    docker build -t docker/md2man .
 
-        $ git clone https://github.com/docker/docker.git
-        
-  If you are using Boot2Docker, you must clone into your `/Users` directory
-  because Boot2Docker can only share this path with the docker containers.
-		
-2. Build the docker image.
-   
-        $ cd docker/man
-        $ docker build -t docker/md2man .
-
-3. Build the man pages.
-
-        $ docker run -v <path-to-git-dir>/docker/man:/man:rw -w /man -i docker/md2man /man/md2man-all.sh
-        
-  The `md2man` Docker container processes the Markdown files and generates
- a `man1` and `man5` subdirectories in the `docker/man` directory. 
-
-4. Copy the generated man pages to `/usr/share/man`
-
-        $ cp -R man* /usr/share/man/
+## Utilizing the image
 
+Once the image is built, run a container using the image with *volumes*:
 
+    docker run -v /<path-to-git-dir>/docker/docs/man:/docs:rw \
+    -w /docs -i docker/md2man /docs/md2man-all.sh
 
+The `md2man` Docker container will process the Markdown files and generate
+the man pages inside the `docker/docs/man/man1` directory using
+Docker volumes. For more information on Docker volumes see the man page for
+`docker run` and also look at the article [Sharing Directories via Volumes]
+(https://docs.docker.com/use/working_with_volumes/).