Merge branch 'master' of https://www.github.com/docker/docker.github.io

_config.yml

@@ -15,7 +15,6 @@ exclude:
 
 gems:
   - jekyll-redirect-from
-  - jekyll-sitemap
   - jekyll-gist
 
 defaults:

engine/admin/b2d_volume_resize.md

@@ -1,6 +1,6 @@
 ---
 description: Resizing a Boot2Docker volume in VirtualBox with GParted
-draft: "true"
+published: false
 keywords:
 - boot2docker, volume,  virtualbox
 menu:

engine/deprecated.md

@@ -23,7 +23,7 @@ see [Feature Deprecation Policy](index.md#feature-deprecation-policy).
 
 **Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
 
-The `docker import` command format 'file|URL|- [REPOSITORY [TAG]]' is deprecated since November 2013. It's no more supported.
+The `docker import` command format `file|URL|- [REPOSITORY [TAG]]` is deprecated since November 2013. It's no more supported.
 
 ### `-h` shorthand for `--help`
 

engine/reference/api/README.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 This directory holds the authoritative specifications of APIs defined and implemented by Docker. Currently this includes:

engine/reference/api/docker-io_api.md

@@ -1,6 +1,6 @@
 ---
 description: API Documentation for the Docker Hub API
-draft: true
+published: false
 keywords:
 - API, Docker, index, REST, documentation, Docker Hub,  registry
 menu:

engine/reference/api/docker_remote_api_v1.25.md

@@ -1,6 +1,6 @@
 ---
 description: API Documentation for Docker
-draft: true
+published: false
 keywords:
 - API, Docker, rcli, REST,  documentation
 menu:

engine/reference/api/hub_registry_spec.md

@@ -1,6 +1,6 @@
 ---
 description: Documentation for docker Registry and Registry API
-draft: true
+published: false
 keywords:
 - docker, registry, api,  hub
 menu:

engine/security/https/README.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 This is an initial attempt to make it easier to test the examples in the https.md

engine/static_files/README.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 Static files dir

engine/swarm/key-concepts.md

@@ -74,7 +74,9 @@ run on the assigned node or fail.
 The swarm manager uses **ingress load balancing** to expose the services you
 want to make available externally to the swarm. The swarm manager can
 automatically assign the service a **PublishedPort** or you can configure a
-PublishedPort for the service in the 30000-32767 range.
+PublishedPort for the service. You can specify any unused port. If you do not
+specify a port, the swarm manager assigns the service a port in the 30000-32767
+range.
 
 External components, such as cloud load balancers, can access the service on the
 PublishedPort of any node in the cluster whether or not the node is currently

engine/userguide/networking/default_network/container-communication.md

@@ -29,6 +29,7 @@ Docker will go set `ip_forward` to `1` for you when the server starts up. If you
 set `--ip-forward=false` and your system's kernel has it enabled, the
 `--ip-forward=false` option has no effect. To check the setting on your kernel
 or to turn it on manually:
+
 ```
   $ sysctl net.ipv4.conf.all.forwarding
 

engine/userguide/storagedriver/device-mapper-driver.md

@@ -314,10 +314,10 @@ assumes that the Docker daemon is in the `stopped` state.
 
 14. Configure the Docker daemon with specific devicemapper options.
 
-    There are two ways to do this. You can set options on the command line if you start the daemon there:
+    Now that your storage is configured, configure the Docker daemon to use it. There are two ways to do this. You can set options on the command line if you start the daemon there:
 
     ```bash
-    --storage-driver=devicemapper --storage-opt=dm.thinpooldev=/dev/mapper/docker-thinpool --storage-opt dm.use_deferred_removal=true
+    --storage-driver=devicemapper --storage-opt=dm.thinpooldev=/dev/mapper/docker-thinpool --storage-opt=dm.use_deferred_removal=true --storage-opt=dm.use_deferred_deletion=true
     ```
 
     You can also set them for startup in the `daemon.json` configuration, for example:
@@ -327,11 +327,14 @@ assumes that the Docker daemon is in the `stopped` state.
       "storage-driver": "devicemapper",
        "storage-opts": [
          "dm.thinpooldev=/dev/mapper/docker-thinpool",
-         "dm.use_deferred_removal=true"
+         "dm.use_deferred_removal=true",
+         "dm.use_deferred_deletion=true"
        ]
     }
     ```
 
+    >**Note**: Always set both `dm.use_deferred_removal=true` and `dm.use_deferred_deletion=true` to prevent unintentionally leaking mount points.
+
 15. If using systemd and modifying the daemon configuration via unit or drop-in file, reload systemd to scan for changes.
 
     ```bash

googlecbe7fee896be512c.html

@@ -0,0 +1 @@
+google-site-verification: googlecbe7fee896be512c.html

machine/DRIVER_SPEC.md

@@ -1,6 +1,6 @@
 ---
 description: machine
-draft: true
+published: false
 keywords:
 - machine, orchestration, install, installation, docker, documentation
 menu:

machine/RELEASE.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 # Docker Machine Release Process

opensource/code.md

@@ -28,36 +28,36 @@ If you are an experienced open source contributor you may be familiar with this
 workflow. If you are new or just need reminders, the steps below link to more
 detailed documentation in Docker's project contributors guide.
 
-1. <a href="http://docs.docker.com/project/software-required/"
+1. <a href="http://docs.docker.com/opensource/project/software-required/"
 target="_blank">Get the software</a> you need.
 
 	This explains how to install a couple of tools used in our development
 	environment.  What you need (or don't need) might surprise you.
 
-2. <a href="http://docs.docker.com/project/set-up-git/"
+2. <a href="http://docs.docker.com/opensource/project/set-up-git/"
 target="_blank">Configure Git and fork the repo</a>.
 
 	Your Git configuration can make it easier for you to contribute.
 	Configuration is especially key if are new to contributing or to Docker.
 
-3. <a href="http://docs.docker.com/project/set-up-dev-env/"
+3. <a href="http://docs.docker.com/opensource/project/set-up-dev-env/"
 target="_blank">Learn to work with the Docker development container</a>.
 
 	Docker developers run `docker` in `docker`.  If you are a geek,
 	this is a pretty cool experience.
-4. <a href="http://docs.docker.com/project/find-an-issue/"
+4. <a href="http://docs.docker.com/opensource/workflow/find-an-issue/"
 target="_blank">Claim an issue</a> to work on.
 
 	We created a filter listing <a href="http://goo.gl/Hsp2mk" target="_blank">all open
 	and unclaimed issues</a> for Docker.
 
 5. <a
-href="http://docs.docker.com/project/work-issue/" target="_blank">Work on the
+href="http://docs.docker.com/opensource/workflow/work-issue/" target="_blank">Work on the
 issue</a>.
 
 	If you change or add code or docs to a project, you should test your changes
 	as you work. This page explains <a
-	href="http://docs.docker.com/project/test-and-docs/" target="_blank">how to
+	href="http://docs.docker.com/opensource/project/test-and-docs/" target="_blank">how to
 	test in our development environment</a>.
 
 	Also, remember to always **sign your commits** as you work! To sign your
@@ -68,7 +68,7 @@ issue</a>.
 	If you don't sign <a href="https://twitter.com/gordontheturtle"
 	target="_blank">Gordon</a> will get you!
 
-6. <a href="http://docs.docker.com/project/create-pr/" target="_blank">Create a
+6. <a href="http://docs.docker.com/opensource/workflow/create-pr/" target="_blank">Create a
 pull request</a>.
 
 	If you make a change to fix an issue, add reference to the issue in the pull
@@ -81,6 +81,6 @@ pull request</a>.
 	needs](code.md#what-is-the-pre-pull-request-checklist).
 
 
-7. <a href="http://docs.docker.com/project/review-pr/"
+7. <a href="http://docs.docker.com/opensource/workflow/review-pr/"
 target="_blank">Participate in the pull request review</a> till a successful
 merge.

opensource/get-help.md

@@ -33,7 +33,7 @@ community members and developers.
     </td>
   </tr>
   <tr>
-    <td>Internet Relay Chat (IRC)</th>
+    <td>Internet Relay Chat (IRC)</td>
     <td>
       <p>
         IRC a direct line to our most knowledgeable Docker users.
@@ -108,7 +108,9 @@ register:
 4.  Register your nickname by entering the following command in the
 command line bar:
 
+    ```
     /msg NickServ REGISTER yourpassword youremail@example.com
+    ```
 
     ![Registering screen](images/register_nic.png)
 
@@ -124,10 +126,11 @@ command line bar:
 
     ![Login screen](images/register_email.png)
 
-6. Back in the browser, complete the registration according to the email
-by entering the following command into the webchat command line bar:
+6.  Back in the browser, complete the registration according to the email by entering the following command into the webchat command line bar:
 
+    ```
     /msg NickServ VERIFY REGISTER yournickname somecode
+    ```
 
     Your nickname is now registered to chat on freenode.net.
 
@@ -167,7 +170,9 @@ Client web page in your browser:
 5.  To register your nickname enter the following message into the command line bar
 at the bottom of the IRCCloud Client:
 
+    ```
     /msg NickServ REGISTER yourpassword youremail@example.com
+    ```
 
     This command line bar is for chatting and entering in IRC commands.
 
@@ -177,7 +182,9 @@ at the bottom of the IRCCloud Client:
 
 7.  Back in the browser, complete the registration according to the email.
 
+    ```
     /msg NickServ VERIFY REGISTER yournickname somecode
+    ```
 
 ## Tips
 

opensource/workflow/find-an-issue.md

@@ -110,7 +110,6 @@ The following table describes the kind labels.
 The following table describes the experience level guidelines.
 
 <table>
-<thead>
   <thead>
     <tr>
       <th>Exp Label</th>

registry/architecture.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 # Architecture

registry/glossary.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 # Glossary

registry/migration.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 # Migrating a 1.0 registry to 2.0

registry/spec/implementations.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 # Distribution API Implementations

registry/spec/json.md

@@ -1,6 +1,6 @@
 ---
 description: Explains registry JSON objects
-draft: true
+published: false
 keywords:
 - registry, service, images, repository,  json
 menu:

robots.txt

@@ -1,3 +0,0 @@
-
-User-agent: *
-Disallow: /

sitemap.xml

@@ -0,0 +1,19 @@
+---
+layout: null
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset
+      xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
+            http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+
+<url>
+  <loc>https://docs.docker.com/</loc>
+  <lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
+</url>
+{% for page in site.pages %}<url>
+  <loc>https://docs.docker.com{{ page.url }}</loc>
+  <lastmod>{% if page.date %}{{ page.date | date_to_xmlschema }}{% else %}{{ site.time | date_to_xmlschema }}{% endif %}</lastmod>
+</url>{% endfor %}
+</urlset>