@@ -27,6 +27,8 @@ Options:

       --sig-proxy            Proxy all received signals to the process (default true)

 ```

+## Description

+

 Use `docker attach` to attach to a running container using the container's ID

 or name, either to view its ongoing output or to control it interactively.

 You can attach to the same contained process multiple times simultaneously,

@@ -55,8 +57,7 @@ performance critical applications that generate a lot of output in the

 foreground over a slow client connection. Instead, users should use the

 `docker logs` command to get access to the logs.

-

-## Override the detach sequence

+### Override the detach sequence

 If you want, you can configure an override the Docker key sequence for detach.

 This is useful if the Docker default sequence conflicts with key sequence you

@@ -80,52 +81,72 @@ These `a`, `ctrl-a`, `X`, or `ctrl-\\` values are all examples of valid key

 sequences. To configure a different configuration default key sequence for all

 containers, see [**Configuration file** section](cli.md#configuration-files).

-#### Examples

+## Examples

-    $ docker run -d --name topdemo ubuntu /usr/bin/top -b

-    $ docker attach topdemo

-    top - 02:05:52 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05

-    Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie

-    Cpu(s):  0.1%us,  0.2%sy,  0.0%ni, 99.7%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st

-    Mem:    373572k total,   355560k used,    18012k free,    27872k buffers

-    Swap:   786428k total,        0k used,   786428k free,   221740k cached

+### Attach to and detach from a running container

-    PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND

-     1 root      20   0 17200 1116  912 R    0  0.3   0:00.03 top

+```bash

+$ docker run -d --name topdemo ubuntu /usr/bin/top -b

-     top - 02:05:55 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05

-     Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie

-     Cpu(s):  0.0%us,  0.2%sy,  0.0%ni, 99.8%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st

-     Mem:    373572k total,   355244k used,    18328k free,    27872k buffers

-     Swap:   786428k total,        0k used,   786428k free,   221776k cached

+$ docker attach topdemo

-       PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND

-           1 root      20   0 17208 1144  932 R    0  0.3   0:00.03 top

+top - 02:05:52 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05

+Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie

+Cpu(s):  0.1%us,  0.2%sy,  0.0%ni, 99.7%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st

+Mem:    373572k total,   355560k used,    18012k free,    27872k buffers

+Swap:   786428k total,        0k used,   786428k free,   221740k cached

+PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND

+ 1 root      20   0 17200 1116  912 R    0  0.3   0:00.03 top

-     top - 02:05:58 up  3:06,  0 users,  load average: 0.01, 0.02, 0.05

-     Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie

-     Cpu(s):  0.2%us,  0.3%sy,  0.0%ni, 99.5%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st

-     Mem:    373572k total,   355780k used,    17792k free,    27880k buffers

-     Swap:   786428k total,        0k used,   786428k free,   221776k cached

+ top - 02:05:55 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05

+ Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie

+ Cpu(s):  0.0%us,  0.2%sy,  0.0%ni, 99.8%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st

+ Mem:    373572k total,   355244k used,    18328k free,    27872k buffers

+ Swap:   786428k total,        0k used,   786428k free,   221776k cached

-     PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND

-          1 root      20   0 17208 1144  932 R    0  0.3   0:00.03 top

-    ^C$

-    $ echo $?

-    0

-    $ docker ps -a | grep topdemo

-    7998ac8581f9        ubuntu:14.04        "/usr/bin/top -b"   38 seconds ago      Exited (0) 21 seconds ago                          topdemo

+   PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND

+       1 root      20   0 17208 1144  932 R    0  0.3   0:00.03 top

+

+

+ top - 02:05:58 up  3:06,  0 users,  load average: 0.01, 0.02, 0.05

+ Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie

+ Cpu(s):  0.2%us,  0.3%sy,  0.0%ni, 99.5%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st

+ Mem:    373572k total,   355780k used,    17792k free,    27880k buffers

+ Swap:   786428k total,        0k used,   786428k free,   221776k cached

+

+ PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND

+      1 root      20   0 17208 1144  932 R    0  0.3   0:00.03 top

+^C$

+

+$ echo $?

+0

+$ docker ps -a | grep topdemo

+

+7998ac8581f9        ubuntu:14.04        "/usr/bin/top -b"   38 seconds ago      Exited (0) 21 seconds ago                          topdemo

+```

+

+### Get the exit code of the container's command

 And in this second example, you can see the exit code returned by the `bash`

 process is returned by the `docker attach` command to its caller too:

+```bash

     $ docker run --name test -d -it debian

+

     275c44472aebd77c926d4527885bb09f2f6db21d878c75f0a1c212c03d3bcfab

+

     $ docker attach test

+

     root@f38c87f2a42d:/# exit 13

+

     exit

+

     $ echo $?

+

     13

+

     $ docker ps -a | grep test

+

     275c44472aeb        debian:7            "/bin/bash"         26 seconds ago      Exited (13) 17 seconds ago                         test

+```

@@ -58,6 +58,8 @@ Options:

       --ulimit value            Ulimit options (default [])

 ```

+## Description

+

 Builds Docker images from a Dockerfile and a "context". A build's context is

 the files located in the specified `PATH` or `URL`. The build process can refer

 to any of the files in the context. For example, your build can use an

@@ -285,7 +287,7 @@ $ docker build - < context.tar.gz

 This will build an image for a compressed context read from `STDIN`.  Supported

 formats are: bzip2, gzip and xz.

-### Usage of .dockerignore

+### Use a .dockerignore file

 ```bash

 $ docker build .

@@ -315,7 +317,7 @@ directory from the context. Its effect can be seen in the changed size of the

 uploaded context. The builder reference contains detailed information on

 [creating a .dockerignore file](../builder.md#dockerignore-file)

-### Tag image (-t)

+### Tag an image (-t)

 ```bash

 $ docker build -t vieux/apache:2.0 .

@@ -334,7 +336,7 @@ For example, to tag an image both as `whenry/fedora-jboss:latest` and

 ```bash

 $ docker build -t whenry/fedora-jboss:latest -t whenry/fedora-jboss:v2.1 .

 ```

-### Specify Dockerfile (-f)

+### Specify a Dockerfile (-f)

 ```bash

 $ docker build -f Dockerfile.debug .

@@ -373,7 +375,7 @@ the command line.

 > repeatable builds on remote Docker hosts. This is also the reason why

 > `ADD ../file` will not work.

-### Optional parent cgroup (--cgroup-parent)

+### Use a custom parent cgroup (--cgroup-parent)

 When `docker build` is run with the `--cgroup-parent` option the containers

 used in the build will be run with the [corresponding `docker run`

@@ -13,7 +13,7 @@ keywords: "Docker, Docker documentation, CLI, command line"

      will be rejected.

 -->

-# Use the Docker command line

+# docker

 To list available commands, either run `docker` with no parameters

 or execute `docker help`:

@@ -43,6 +43,8 @@ Commands:

     # […]

 ```

+## Description

+

 Depending on your Docker system configuration, you may be required to preface

 each `docker` command with `sudo`. To avoid having to use `sudo` with the

 `docker` command, your system administrator can create a Unix group called

@@ -51,7 +53,7 @@ each `docker` command with `sudo`. To avoid having to use `sudo` with the

 For more information about installing Docker or `sudo` configuration, refer to

 the [installation](https://docs.docker.com/engine/installation/) instructions for your operating system.

-## Environment variables

+### Environment variables

 For easy reference, the following list of environment variables are supported

 by the `docker` command line:

@@ -69,7 +71,7 @@ by the `docker` command line:

   Equates to `--disable-content-trust=false` for build, create, pull, push, run.

 * `DOCKER_CONTENT_TRUST_SERVER` The URL of the Notary server to use. This defaults

   to the same URL as the registry.

-* `DOCKER_HIDE_LEGACY_COMMANDS` When set, Docker hides "legacy" top-level commands (such as `docker rm`, and 

+* `DOCKER_HIDE_LEGACY_COMMANDS` When set, Docker hides "legacy" top-level commands (such as `docker rm`, and

   `docker pull`) in `docker help` output, and only `Management commands` per object-type (e.g., `docker container`) are

   printed. This may become the default in a future release, at which point this environment-variable is removed.

 * `DOCKER_TMPDIR` Location for temporary Docker files.

@@ -85,7 +87,7 @@ These Go environment variables are case-insensitive. See the

 [Go specification](http://golang.org/pkg/net/http/) for details on these

 variables.

-## Configuration files

+### Configuration files

 By default, the Docker command line stores its configuration files in a

 directory called `.docker` within your `$HOME` directory. However, you can

@@ -165,18 +167,25 @@ attach`, `docker exec`, `docker run` or `docker start` command.

 Following is a sample `config.json` file:

-    {% raw %}

-    {

-      "HttpHeaders": {

-        "MyHeader": "MyValue"

-      },

-      "psFormat": "table {{.ID}}\\t{{.Image}}\\t{{.Command}}\\t{{.Labels}}",

-      "imagesFormat": "table {{.ID}}\\t{{.Repository}}\\t{{.Tag}}\\t{{.CreatedAt}}",

-      "statsFormat": "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}",

-      "serviceInspectFormat": "pretty",

-      "detachKeys": "ctrl-e,e"

-    }

-    {% endraw %}

+```json

+{% raw %}

+{

+  "HttpHeaders": {

+    "MyHeader": "MyValue"

+  },

+  "psFormat": "table {{.ID}}\\t{{.Image}}\\t{{.Command}}\\t{{.Labels}}",

+  "imagesFormat": "table {{.ID}}\\t{{.Repository}}\\t{{.Tag}}\\t{{.CreatedAt}}",

+  "statsFormat": "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}",

+  "serviceInspectFormat": "pretty",

+  "detachKeys": "ctrl-e,e",

+  "credsStore": "secretservice",

+  "credHelpers": {

+    "awesomereg.example.org": "hip-star",

+    "unicorn.example.com": "vcbait"

+  }

+}

+{% endraw %}

+```

 ### Notary

@@ -187,7 +196,9 @@ Certificate Authority, you need to place the certificate at

 Alternatively you can trust the certificate globally by adding it to your system's

 list of root Certificate Authorities.

-## Help

+## Examples

+

+### Display help text

 To list the help on any command just execute the command, followed by the

 `--help` option.

@@ -203,13 +214,13 @@ To list the help on any command just execute the command, followed by the

       -a, --attach value               Attach to STDIN, STDOUT or STDERR (default [])

     ...

-## Option types

+### Option types

 Single character command line options can be combined, so rather than

 typing `docker run -i -t --name test busybox sh`,

 you can write `docker run -it --name test busybox sh`.

-### Boolean

+#### Boolean

 Boolean options take the form `-d=false`. The value you see in the help text is

 the default value which is set if you do **not** specify that flag. If you

@@ -222,27 +233,33 @@ container **will** run in "detached" mode, in the background.

 Options which default to `true` (e.g., `docker build --rm=true`) can only be

 set to the non-default value by explicitly setting them to `false`:

-    $ docker build --rm=false .

+```bash

+$ docker build --rm=false .

+```

-### Multi

+#### Multi

 You can specify options like `-a=[]` multiple times in a single command line,

 for example in these commands:

-    $ docker run -a stdin -a stdout -i -t ubuntu /bin/bash

-    $ docker run -a stdin -a stdout -a stderr ubuntu /bin/ls

+```bash

+$ docker run -a stdin -a stdout -i -t ubuntu /bin/bash

+

+$ docker run -a stdin -a stdout -a stderr ubuntu /bin/ls

+```

 Sometimes, multiple options can call for a more complex value string as for

 `-v`:

-    $ docker run -v /host:/container example/mysql

+```bash

+$ docker run -v /host:/container example/mysql

+```

-> **Note:**

-> Do not use the `-t` and `-a stderr` options together due to

+> **Note**: Do not use the `-t` and `-a stderr` options together due to

 > limitations in the `pty` implementation. All `stderr` in `pty` mode

 > simply goes to `stdout`.

-### Strings and Integers

+#### Strings and Integers

 Options like `--name=""` expect a string, and they

 can only be specified once. Options like `-c=0`

@@ -28,6 +28,8 @@ Options:

   -p, --pause            Pause container during commit (default true)

 ```

+## Description

+

 It can be useful to commit a container's file changes or settings into a new

 image. This allows you debug a container by running an interactive shell, or to

 export a working dataset to another server. Generally, it is better to use

@@ -46,48 +48,72 @@ The `--change` option will apply `Dockerfile` instructions to the image that is

 created.  Supported `Dockerfile` instructions:

 `CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`LABEL`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`

-## Commit a container

-

-    $ docker ps

-    CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES

-    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky

-    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton

-    $ docker commit c3f279d17e0a  svendowideit/testimage:version3

-    f5283438590d

-    $ docker images

-    REPOSITORY                        TAG                 ID                  CREATED             SIZE

-    svendowideit/testimage            version3            f5283438590d        16 seconds ago      335.7 MB

-

-## Commit a container with new configurations

-

-    {% raw %}

-    $ docker ps

-    ICONTAINER ID       IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES

-    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky

-    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton

-    $ docker inspect -f "{{ .Config.Env }}" c3f279d17e0a

-    [HOME=/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin]

-    $ docker commit --change "ENV DEBUG true" c3f279d17e0a  svendowideit/testimage:version3

-    f5283438590d

-    $ docker inspect -f "{{ .Config.Env }}" f5283438590d

-    [HOME=/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin DEBUG=true]

-    {% endraw %}

-

-## Commit a container with new `CMD` and `EXPOSE` instructions

-

-    $ docker ps

-    CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES

-    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky

-    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton

-

-    $ docker commit --change='CMD ["apachectl", "-DFOREGROUND"]' -c "EXPOSE 80" c3f279d17e0a  svendowideit/testimage:version4

-    f5283438590d

-

-    $ docker run -d svendowideit/testimage:version4

-    89373736e2e7f00bc149bd783073ac43d0507da250e999f3f1036e0db60817c0

-

-    $ docker ps

-    CONTAINER ID        IMAGE               COMMAND                 CREATED             STATUS              PORTS              NAMES

-    89373736e2e7        testimage:version4  "apachectl -DFOREGROU"  3 seconds ago       Up 2 seconds        80/tcp             distracted_fermat

-    c3f279d17e0a        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours                            desperate_dubinsky

-    197387f1b436        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours                            focused_hamilton

+## Examples

+

+### Commit a container

+

+```bash

+$ docker ps

+

+CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES

+c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky

+197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton

+

+$ docker commit c3f279d17e0a  svendowideit/testimage:version3

+

+f5283438590d

+

+$ docker images

+

+REPOSITORY                        TAG                 ID                  CREATED             SIZE

+svendowideit/testimage            version3            f5283438590d        16 seconds ago      335.7 MB

+```

+

+### Commit a container with new configurations

+

+```bash

+{% raw %}

+$ docker ps

+

+ICONTAINER ID       IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES

+c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky

+197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton

+

+$ docker inspect -f "{{ .Config.Env }}" c3f279d17e0a

+

+[HOME=/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin]

+

+$ docker commit --change "ENV DEBUG true" c3f279d17e0a  svendowideit/testimage:version3

+

+f5283438590d

+

+$ docker inspect -f "{{ .Config.Env }}" f5283438590d

+

+[HOME=/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin DEBUG=true]

+{% endraw %}

+```

+

+### Commit a container with new `CMD` and `EXPOSE` instructions

+

+```bash

+$ docker ps

+

+CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS              NAMES

+c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            desperate_dubinsky

+197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours                            focused_hamilton

+

+$ docker commit --change='CMD ["apachectl", "-DFOREGROUND"]' -c "EXPOSE 80" c3f279d17e0a  svendowideit/testimage:version4

+

+f5283438590d

+

+$ docker run -d svendowideit/testimage:version4

+

+89373736e2e7f00bc149bd783073ac43d0507da250e999f3f1036e0db60817c0

+

+$ docker ps

+

+CONTAINER ID        IMAGE               COMMAND                 CREATED             STATUS              PORTS              NAMES

+89373736e2e7        testimage:version4  "apachectl -DFOREGROU"  3 seconds ago       Up 2 seconds        80/tcp             distracted_fermat

+c3f279d17e0a        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours                            desperate_dubinsky

+197387f1b436        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours                            focused_hamilton

+```

@@ -25,8 +25,14 @@ Options:

       --help    Print usage

 ```

+## Description

+

+Removes all stopped containers.

+

 ## Examples

+### Prune containers

+

 ```bash

 $ docker container prune

 WARNING! This will remove all stopped containers.

@@ -38,7 +44,76 @@ f98f9c2aa1eaf727e4ec9c0283bc7d4aa4762fbdba7f26191f26c97f64090360

 Total reclaimed space: 212 B

 ```

-## Related information

+### Filtering

+

+The filtering flag (`-f` or `--filter`) format is of "key=value". If there is more

+than one filter, then pass multiple flags (e.g., `--filter "foo=bar" --filter "bif=baz"`)

+

+The currently supported filters are:

+

+* until (`<timestamp>`) - only remove containers created before given timestamp

+

+The `until` filter can be Unix timestamps, date formatted

+timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed

+relative to the daemon machine’s time. Supported formats for date

+formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`,

+`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local

+timezone on the daemon will be used if you do not provide either a `Z` or a

+`+-00:00` timezone offset at the end of the timestamp.  When providing Unix

+timestamps enter seconds[.nanoseconds], where seconds is the number of seconds

+that have elapsed since January 1, 1970 (midnight UTC/GMT), not counting leap

+seconds (aka Unix epoch or Unix time), and the optional .nanoseconds field is a

+fraction of a second no more than nine digits long.

+

+The following removes containers created more than 5 minutes ago:

+

+```bash

+{% raw %}

+$ docker ps -a --format 'table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.CreatedAt}}\t{{.Status}}'

+

+CONTAINER ID        IMAGE               COMMAND             CREATED AT                      STATUS

+61b9efa71024        busybox             "sh"                2017-01-04 13:23:33 -0800 PST   Exited (0) 41 seconds ago

+53a9bc23a516        busybox             "sh"                2017-01-04 13:11:59 -0800 PST   Exited (0) 12 minutes ago

+

+$ docker container prune --force --filter "until=5m"

+

+Deleted Containers:

+53a9bc23a5168b6caa2bfbefddf1b30f93c7ad57f3dec271fd32707497cb9369

+

+Total reclaimed space: 25 B

+

+$ docker ps -a --format 'table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.CreatedAt}}\t{{.Status}}'

+

+CONTAINER ID        IMAGE               COMMAND             CREATED AT                      STATUS

+61b9efa71024        busybox             "sh"                2017-01-04 13:23:33 -0800 PST   Exited (0) 44 seconds ago

+{% endraw %}

+```

+

+The following removes containers created before `2017-01-04T13:10:00`:

+

+```bash

+{% raw %}

+$ docker ps -a --format 'table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.CreatedAt}}\t{{.Status}}'

+

+CONTAINER ID        IMAGE               COMMAND             CREATED AT                      STATUS

+53a9bc23a516        busybox             "sh"                2017-01-04 13:11:59 -0800 PST   Exited (0) 7 minutes ago

+4a75091a6d61        busybox             "sh"                2017-01-04 13:09:53 -0800 PST   Exited (0) 9 minutes ago

+

+$ docker container prune --force --filter "until=2017-01-04T13:10:00"

+

+Deleted Containers:

+4a75091a6d618526fcd8b33ccd6e5928ca2a64415466f768a6180004b0c72c6c

+

+Total reclaimed space: 27 B

+

+$ docker ps -a --format 'table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.CreatedAt}}\t{{.Status}}'

+

+CONTAINER ID        IMAGE               COMMAND             CREATED AT                      STATUS

+53a9bc23a516        busybox             "sh"                2017-01-04 13:11:59 -0800 PST   Exited (0) 9 minutes ago

+{% endraw %}

+```

+

+## Related commands

 * [system df](system_df.md)

 * [volume prune](volume_prune.md)

@@ -31,6 +31,8 @@ Options:

       --help          Print usage

 ```

+## Description

+

 The `docker cp` utility copies the contents of `SRC_PATH` to the `DEST_PATH`.

 You can copy from the container's file system to the local machine or the

 reverse, from the local filesystem to the container. If `-` is specified for

@@ -96,15 +98,16 @@ you must be explicit with a relative or absolute path, for example:

 It is not possible to copy certain system files such as resources under

 `/proc`, `/sys`, `/dev`, [tmpfs](run.md#mount-tmpfs-tmpfs), and mounts created by

 the user in the container. However, you can still copy such files by manually

-running `tar` in `docker exec`. For example (consider `SRC_PATH` and `DEST_PATH`

-are directories):

-

-    $ docker exec foo tar Ccf $(dirname SRC_PATH) - $(basename SRC_PATH) | tar Cxf DEST_PATH -

-

-or

+running `tar` in `docker exec`. Both of the following examples do the same thing

+in different ways (consider `SRC_PATH` and `DEST_PATH` are directories):

-    $ tar Ccf $(dirname SRC_PATH) - $(basename SRC_PATH) | docker exec -i foo tar Cxf DEST_PATH -

+```bash

+$ docker exec foo tar Ccf $(dirname SRC_PATH) - $(basename SRC_PATH) | tar Cxf DEST_PATH -

+```

+```bash

+$ tar Ccf $(dirname SRC_PATH) - $(basename SRC_PATH) | docker exec -i foo tar Cxf DEST_PATH -

+```

 Using `-` as the `SRC_PATH` streams the contents of `STDIN` as a tar archive.

 The command extracts the content of the tar to the `DEST_PATH` in container's

@@ -132,6 +132,7 @@ Options:

       --volumes-from value          Mount volumes from the specified container(s) (default [])

   -w, --workdir string              Working directory inside the container

 ```

+## Description

 The `docker create` command creates a writeable container layer over the

 specified image and prepares it for running the specified command.  The

@@ -147,42 +148,64 @@ Please see the [run command](run.md) section and the [Docker run reference](../r

 ## Examples

-    $ docker create -t -i fedora bash

-    6d8af538ec541dd581ebc2a24153a28329acb5268abe5ef868c1f1a261221752

-    $ docker start -a -i 6d8af538ec5

-    bash-4.2#

+### Create and start a container

+

+```bash

+$ docker create -t -i fedora bash

+

+6d8af538ec541dd581ebc2a24153a28329acb5268abe5ef868c1f1a261221752

+

+$ docker start -a -i 6d8af538ec5

+

+bash-4.2#

+```

+

+### Initialize volumes

 As of v1.4.0 container volumes are initialized during the `docker create` phase

 (i.e., `docker run` too). For example, this allows you to `create` the `data`

 volume container, and then use it from another container:

-    $ docker create -v /data --name data ubuntu

-    240633dfbb98128fa77473d3d9018f6123b99c454b3251427ae190a7d951ad57

-    $ docker run --rm --volumes-from data ubuntu ls -la /data

-    total 8

-    drwxr-xr-x  2 root root 4096 Dec  5 04:10 .

-    drwxr-xr-x 48 root root 4096 Dec  5 04:11 ..

+```bash

+$ docker create -v /data --name data ubuntu

+

+240633dfbb98128fa77473d3d9018f6123b99c454b3251427ae190a7d951ad57

+

+$ docker run --rm --volumes-from data ubuntu ls -la /data

+

+total 8

+drwxr-xr-x  2 root root 4096 Dec  5 04:10 .

+drwxr-xr-x 48 root root 4096 Dec  5 04:11 ..

+```

 Similarly, `create` a host directory bind mounted volume container, which can

 then be used from the subsequent container:

-    $ docker create -v /home/docker:/docker --name docker ubuntu

-    9aa88c08f319cd1e4515c3c46b0de7cc9aa75e878357b1e96f91e2c773029f03

-    $ docker run --rm --volumes-from docker ubuntu ls -la /docker

-    total 20

-    drwxr-sr-x  5 1000 staff  180 Dec  5 04:00 .

-    drwxr-xr-x 48 root root  4096 Dec  5 04:13 ..

-    -rw-rw-r--  1 1000 staff 3833 Dec  5 04:01 .ash_history

-    -rw-r--r--  1 1000 staff  446 Nov 28 11:51 .ashrc

-    -rw-r--r--  1 1000 staff   25 Dec  5 04:00 .gitconfig

-    drwxr-sr-x  3 1000 staff   60 Dec  1 03:28 .local

-    -rw-r--r--  1 1000 staff  920 Nov 28 11:51 .profile

-    drwx--S---  2 1000 staff  460 Dec  5 00:51 .ssh

-    drwxr-xr-x 32 1000 staff 1140 Dec  5 04:01 docker

+```bash

+$ docker create -v /home/docker:/docker --name docker ubuntu

+

+9aa88c08f319cd1e4515c3c46b0de7cc9aa75e878357b1e96f91e2c773029f03

+

+$ docker run --rm --volumes-from docker ubuntu ls -la /docker

+

+total 20

+drwxr-sr-x  5 1000 staff  180 Dec  5 04:00 .

+drwxr-xr-x 48 root root  4096 Dec  5 04:13 ..

+-rw-rw-r--  1 1000 staff 3833 Dec  5 04:01 .ash_history

+-rw-r--r--  1 1000 staff  446 Nov 28 11:51 .ashrc

+-rw-r--r--  1 1000 staff   25 Dec  5 04:00 .gitconfig

+drwxr-sr-x  3 1000 staff   60 Dec  1 03:28 .local

+-rw-r--r--  1 1000 staff  920 Nov 28 11:51 .profile

+drwx--S---  2 1000 staff  460 Dec  5 00:51 .ssh

+drwxr-xr-x 32 1000 staff 1140 Dec  5 04:01 docker

+```

+

 Set storage driver options per container.

-    $ docker create -it --storage-opt size=120G fedora /bin/bash

+```bash

+$ docker create -it --storage-opt size=120G fedora /bin/bash

+```

 This (size) will allow to set the container rootfs size to 120G at creation time.

 This option is only available for the `devicemapper`, `btrfs`, `overlay2`,

@@ -14,7 +14,9 @@ advisory: "experimental"

      will be rejected.

 -->

-# deploy (alias for stack deploy) (experimental)

+# deploy (experimental)

+

+An alias for `stack deploy`.

 ```markdown

 Usage:  docker deploy [OPTIONS] STACK

@@ -31,15 +33,20 @@ Options:

       --with-registry-auth    Send registry authentication details to Swarm agents

 ```

+## Description

+

 Create and update a stack from a `compose` or a `dab` file on the swarm. This command

 has to be run targeting a manager node.

-## Compose file

+## Examples

+

+### Compose file

 The `deploy` command supports compose file version `3.0` and above.

 ```bash

 $ docker stack deploy --compose-file docker-compose.yml vossibility

+

 Ignoring unsupported options: links

 Creating network vossibility_vossibility

@@ -54,8 +61,9 @@ Creating service vossibility_lookupd

 You can verify that the services were correctly created

-```

+```bash

 $ docker service ls

+

 ID            NAME                               MODE        REPLICAS  IMAGE

 29bv0vnlm903  vossibility_lookupd                replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662

 4awt47624qwh  vossibility_nsqd                   replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662

@@ -65,10 +73,11 @@ ID            NAME                               MODE        REPLICAS  IMAGE

 axqh55ipl40h  vossibility_vossibility-collector  replicated  1/1       icecrime/vossibility-collector@sha256:f03f2977203ba6253988c18d04061c5ec7aab46bca9dfd89a9a1fa4500989fba

 ```

-## DAB file

+### DAB file

 ```bash

 $ docker stack deploy --bundle-file vossibility-stack.dab vossibility

+

 Loading bundle from vossibility-stack.dab

 Creating service vossibility_elasticsearch

 Creating service vossibility_kibana

@@ -82,6 +91,7 @@ You can verify that the services were correctly created:

 ```bash

 $ docker service ls

+

 ID            NAME                               MODE        REPLICAS  IMAGE

 29bv0vnlm903  vossibility_lookupd                replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662

 4awt47624qwh  vossibility_nsqd                   replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662

@@ -91,7 +101,7 @@ ID            NAME                               MODE        REPLICAS  IMAGE

 axqh55ipl40h  vossibility_vossibility-collector  replicated  1/1       icecrime/vossibility-collector@sha256:f03f2977203ba6253988c18d04061c5ec7aab46bca9dfd89a9a1fa4500989fba

 ```

-## Related information

+## Related commands

 * [stack config](stack_config.md)

 * [stack deploy](stack_deploy.md)

@@ -13,7 +13,7 @@ keywords: "list, changed, files, container"

      will be rejected.

 -->

-## diff

+# diff

 ```markdown

 Usage:  docker diff CONTAINER

@@ -24,6 +24,8 @@ Options:

       --help   Print usage

 ```

+## Description

+

 List the changed files and directories in a container᾿s filesystem since the

 container was created. Three different types of change are tracked:

deleted file mode 100644

Binary files a/docs/reference/commandline/docker_images.gif and /dev/null differ

@@ -92,13 +92,17 @@ Options:

 Options with [] may be specified multiple times.

-dockerd is the persistent process that manages containers. Docker

+## Description

+

+`dockerd` is the persistent process that manages containers. Docker

 uses different binaries for the daemon and client. To run the daemon you

 type `dockerd`.

 To run the daemon with debug output, use `dockerd -D`.

-## Daemon socket option

+## Examples

+

+### Daemon socket option

 The Docker daemon can listen for [Docker Engine API](../api/)

 requests via three different types of Socket: `unix`, `tcp`, and `fd`.

@@ -117,8 +121,7 @@ interface using its IP address: `-H tcp://192.168.59.103:2375`. It is

 conventional to use port `2375` for un-encrypted, and port `2376` for encrypted

 communication with the daemon.

-> **Note:**

-> If you're using an HTTPS encrypted socket, keep in mind that only

+> **Note**: If you're using an HTTPS encrypted socket, keep in mind that only

 > TLS1.0 and greater are supported. Protocols SSLv3 and under are not

 > supported anymore for security reasons.

@@ -135,18 +138,21 @@ time using multiple `-H` options:

 ```bash

 # listen using the default unix socket, and on 2 specific IP addresses on this host.

+

 $ sudo dockerd -H unix:///var/run/docker.sock -H tcp://192.168.59.106 -H tcp://10.10.10.2

 ```

 The Docker client will honor the `DOCKER_HOST` environment variable to set the

-`-H` flag for the client.

+`-H` flag for the client. Use **one** of the following commands:

 ```bash

 $ docker -H tcp://0.0.0.0:2375 ps

-# or

+```

+

+```bash

 $ export DOCKER_HOST="tcp://0.0.0.0:2375"

+

 $ docker ps

-# both are equal

 ```

 Setting the `DOCKER_TLS_VERIFY` environment variable to any value other than

@@ -164,7 +170,7 @@ The Docker client will honor the `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY`

 environment variables (or the lowercase versions thereof). `HTTPS_PROXY` takes

 precedence over `HTTP_PROXY`.

-### Bind Docker to another host/port or a Unix socket

+#### Bind Docker to another host/port or a Unix socket

 > **Warning**:

 > Changing the default `docker` daemon binding to a

@@ -230,7 +236,7 @@ $ docker pull ubuntu

 $ docker -H tcp://127.0.0.1:2375 pull ubuntu

 ```

-### Daemon storage-driver option

+### Daemon storage-driver

 The Docker daemon has support for several different image layer storage

 drivers: `aufs`, `devicemapper`, `btrfs`, `zfs`, `overlay` and `overlay2`.

@@ -267,22 +273,20 @@ the same file can share a single page cache entry (or entries), it makes

 `overlay` as efficient with memory as `aufs` driver. Call

 `dockerd -s overlay` to use it.