@@ -44,71 +44,6 @@ f98f9c2aa1eaf727e4ec9c0283bc7d4aa4762fbdba7f26191f26c97f64090360

 Total reclaimed space: 212 B

 ```

-### 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

-$ 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

-```

-

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

-

-```bash

-$ 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

-```

-

 ## Related commands

 * [system df](system_df.md)

@@ -67,94 +67,6 @@ deleted: sha256:2c675ee9ed53425e31a13e3390bf3f539bf8637000e4bcfbb85ee03ef4d910a1

 Total reclaimed space: 16.43 MB

 ```

-### 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 images 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 images created before `2017-01-04T00:00:00`:

-

-```bash

-$ docker images --format 'table {{.Repository}}\t{{.Tag}}\t{{.ID}}\t{{.CreatedAt}}\t{{.Size}}'

-REPOSITORY          TAG                 IMAGE ID            CREATED AT                      SIZE

-foo                 latest              2f287ac753da        2017-01-04 13:42:23 -0800 PST   3.98 MB

-alpine              latest              88e169ea8f46        2016-12-27 10:17:25 -0800 PST   3.98 MB

-busybox             latest              e02e811dd08f        2016-10-07 14:03:58 -0700 PDT   1.09 MB

-

-$ docker image prune -a --force --filter "until=2017-01-04T00:00:00"

-

-Deleted Images:

-untagged: alpine:latest

-untagged: alpine@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8

-untagged: busybox:latest

-untagged: busybox@sha256:29f5d56d12684887bdfa50dcd29fc31eea4aaf4ad3bec43daf19026a7ce69912

-deleted: sha256:e02e811dd08fd49e7f6032625495118e63f597eb150403d02e3238af1df240ba

-deleted: sha256:e88b3f82283bc59d5e0df427c824e9f95557e661fcb0ea15fb0fb6f97760f9d9

-

-Total reclaimed space: 1.093 MB

-

-$ docker images --format 'table {{.Repository}}\t{{.Tag}}\t{{.ID}}\t{{.CreatedAt}}\t{{.Size}}'

-

-REPOSITORY          TAG                 IMAGE ID            CREATED AT                      SIZE

-foo                 latest              2f287ac753da        2017-01-04 13:42:23 -0800 PST   3.98 MB

-```

-

-The following removes images created more than 10 days (`240h`) ago:

-

-```bash

-$ docker images

-

-REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE

-foo                 latest              2f287ac753da        14 seconds ago      3.98 MB

-alpine              latest              88e169ea8f46        8 days ago          3.98 MB

-debian              jessie              7b0a06c805e8        2 months ago        123 MB

-busybox             latest              e02e811dd08f        2 months ago        1.09 MB

-golang              1.7.0               138c2e655421        4 months ago        670 MB

-

-$ docker image prune -a --force --filter "until=240h"

-

-Deleted Images:

-untagged: golang:1.7.0

-untagged: golang@sha256:6765038c2b8f407fd6e3ecea043b44580c229ccfa2a13f6d85866cf2b4a9628e

-deleted: sha256:138c2e6554219de65614d88c15521bfb2da674cbb0bf840de161f89ff4264b96

-deleted: sha256:ec353c2e1a673f456c4b78906d0d77f9d9456cfb5229b78c6a960bfb7496b76a

-deleted: sha256:fe22765feaf3907526b4921c73ea6643ff9e334497c9b7e177972cf22f68ee93

-deleted: sha256:ff845959c80148421a5c3ae11cc0e6c115f950c89bc949646be55ed18d6a2912

-deleted: sha256:a4320831346648c03db64149eafc83092e2b34ab50ca6e8c13112388f25899a7

-deleted: sha256:4c76020202ee1d9709e703b7c6de367b325139e74eebd6b55b30a63c196abaf3

-deleted: sha256:d7afd92fb07236c8a2045715a86b7d5f0066cef025018cd3ca9a45498c51d1d6

-deleted: sha256:9e63c5bce4585dd7038d830a1f1f4e44cb1a1515b00e620ac718e934b484c938

-untagged: debian:jessie

-untagged: debian@sha256:c1af755d300d0c65bb1194d24bce561d70c98a54fb5ce5b1693beb4f7988272f

-deleted: sha256:7b0a06c805e8f23807fb8856621c60851727e85c7bcb751012c813f122734c8d

-deleted: sha256:f96222d75c5563900bc4dd852179b720a0885de8f7a0619ba0ac76e92542bbc8

-

-Total reclaimed space: 792.6 MB

-

-$ docker images

-

-REPOSITORY          TAG                 IMAGE ID            CREATED              SIZE

-foo                 latest              2f287ac753da        About a minute ago   3.98 MB

-alpine              latest              88e169ea8f46        8 days ago           3.98 MB

-busybox             latest              e02e811dd08f        2 months ago         1.09 MB

-```

-

 ## Related commands

 * [system df](system_df.md)

@@ -33,54 +33,6 @@ n1

 n2

 ```

-### 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 networks 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 networks created more than 5 minutes ago. Note that

-system networks such as `bridge`, `host`, and `none` will never be pruned:

-

-```none

-$ docker network ls

-

-NETWORK ID          NAME                DRIVER              SCOPE

-7430df902d7a        bridge              bridge              local

-ea92373fd499        foo-1-day-ago       bridge              local

-ab53663ed3c7        foo-1-min-ago       bridge              local

-97b91972bc3b        host                host                local

-f949d337b1f5        none                null                local

-

-$ docker network prune --force --filter until=5m

-

-Deleted Networks:

-foo-1-day-ago

-

-$ docker network ls

-

-NETWORK ID          NAME                DRIVER              SCOPE

-7430df902d7a        bridge              bridge              local

-ab53663ed3c7        foo-1-min-ago       bridge              local

-97b91972bc3b        host                host                local

-f949d337b1f5        none                null                local

-```

-

 ## Related commands

 * [network disconnect ](network_disconnect.md)

@@ -42,66 +42,6 @@ ID                  NAME                             TAG                 DESCRIP

 69553ca1d123        tiborvass/sample-volume-plugin   latest              A test plugin for Docker   true

 ```

-### 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:

-

-* enabled (boolean - true or false, 0 or 1)

-* capability (string - currently `volumedriver`, `networkdriver`, `ipamdriver`, or `authz`)

-

-#### enabled

-

-The `enabled` filter matches on plugins enabled or disabled.

-

-#### capability

-

-The `capability` filter matches on plugin capabilities. One plugin

-might have multiple capabilities. Currently `volumedriver`, `networkdriver`,

-`ipamdriver`, and `authz` are supported capabilities.

-

-```bash

-$ docker plugin install --disable tiborvass/no-remove

-

-tiborvass/no-remove

-

-$ docker plugin ls --filter enabled=true

-

-NAME                  TAG                 DESCRIPTION                ENABLED

-```

-

-

-### Formatting

-

-The formatting options (`--format`) pretty-prints plugins output

-using a Go template.

-

-Valid placeholders for the Go template are listed below:

-

-Placeholder    | Description

-`.ID`              | Plugin ID

-`.Name`            | Plugin name

-`.Description`     | Plugin description

-`.Enabled`         | Whether plugin is enabled or not

-`.PluginReference` | The reference used to push/pull from a registry

-

-When using the `--format` option, the `plugin ls` command will either

-output the data exactly as the template declares or, when using the

-`table` directive, includes column headers as well.

-

-The following example uses a template without headers and outputs the

-`ID` and `Name` entries separated by a colon for all plugins:

-

-```bash

-$ docker plugin ls --format "{{.ID}}: {{.Name}}"

-

-4be01827a72e: tiborvass/no-remove

-```

-

-

 ## Related commands

 * [plugin create](plugin_create.md)

@@ -338,44 +338,6 @@ CONTAINER ID        IMAGE       COMMAND       CREATED             STATUS

 9d4893ed80fe        ubuntu      "top"         10 minutes ago      Up 10 minutes                           test1

 ```

-#### publish and expose

-

-The `publish` and `expose` filters show only containers that have published or exposed port with a given port

-number, port range, and/or protocol. The default protocol is `tcp` when not specified.

-

-The following filter matches all containers that have published port of 80:

-

-```bash

-$ docker run -d --publish=80 busybox top

-$ docker run -d --expose=8080 busybox top

-

-$ docker ps -a

-

-CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS                   NAMES

-9833437217a5        busybox             "top"               5 seconds ago       Up 4 seconds        8080/tcp                dreamy_mccarthy

-fc7e477723b7        busybox             "top"               50 seconds ago      Up 50 seconds       0.0.0.0:32768->80/tcp   admiring_roentgen

-

-$ docker ps --filter publish=80

-

-CONTAINER ID        IMAGE               COMMAND             CREATED              STATUS              PORTS                   NAMES

-fc7e477723b7        busybox             "top"               About a minute ago   Up About a minute   0.0.0.0:32768->80/tcp   admiring_roentgen

-```

-

-The following filter matches all containers that have exposed TCP port in the range of `8000-8080`:

-```bash

-$ docker ps --filter expose=8000-8080/tcp

-

-CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES

-9833437217a5        busybox             "top"               21 seconds ago      Up 19 seconds       8080/tcp            dreamy_mccarthy

-```

-

-The following filter matches all containers that have exposed UDP port `80`:

-```bash

-$ docker ps --filter publish=80/udp

-

-CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES

-```

-

 ### Formatting

 The formatting option (`--format`) pretty-prints container output using a Go

@@ -144,7 +144,7 @@ Options:

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

 ```

-## Descriptino

+## Description

 The `docker run` command first `creates` a writeable container layer over the

 specified image, and then `starts` it using the specified command. That is,

@@ -109,40 +109,7 @@ ID            NAME   MODE        REPLICAS  IMAGE

 0bcjwfh8ychr  redis  replicated  1/1       redis:3.0.6

 ```

-<<<<<<< HEAD

-## Related information

-=======

-### Formatting

-

-The formatting options (`--format`) pretty-prints services output

-using a Go template.

-

-Valid placeholders for the Go template are listed below:

-

-Placeholder | Description

-`.ID`       | Service ID

-`.Name`     | Service name

-`.Mode`     | Service mode (replicated, global)

-`.Replicas` | Service replicas

-`.Image`    | Service image

-

-When using the `--format` option, the `service ls` command will either

-output the data exactly as the template declares or, when using the

-`table` directive, includes column headers as well.

-

-The following example uses a template without headers and outputs the

-`ID`, `Mode`, and `Replicas` entries separated by a colon for all services:

-

-```bash

-$ docker service ls --format "{{.ID}}: {{.Mode}} {{.Replicas}}"

-

-0zmvwuiu3vue: replicated 10/10

-fm6uf97exkul: global 5/5

-```

-

 ## Related commands

->>>>>>> 40dbbd3... Merge pull request #30804 from mstanleyjones/cli_fixups

 * [service create](service_create.md)

 * [service inspect](service_inspect.md)

@@ -66,36 +66,6 @@ The currently supported filters are:

 * name (`--filter name=myapp_web`)

 * label (`--filter label=key=value`)

-### Formatting

-

-The formatting options (`--format`) pretty-prints services output

-using a Go template.

-

-Valid placeholders for the Go template are listed below:

-

-Placeholder | Description

-`.ID`       | Service ID

-`.Name`     | Service name

-`.Mode`     | Service mode (replicated, global)

-`.Replicas` | Service replicas

-`.Image`    | Service image

-

-When using the `--format` option, the `stack services` command will either

-output the data exactly as the template declares or, when using the

-`table` directive, includes column headers as well.

-

-The following example uses a template without headers and outputs the

-`ID`, `Mode`, and `Replicas` entries separated by a colon for all services:

-

-```bash

-$ docker stack services --format "{{.ID}}: {{.Mode}} {{.Replicas}}"

-

-0zmvwuiu3vue: replicated 10/10

-fm6uf97exkul: global 5/5

-```

-

-

 ## Related commands

 * [stack deploy](stack_deploy.md)

@@ -136,16 +136,6 @@ Snapshots compact the Raft log and allow for more efficient transfer of the

 state to new managers. However, there is a performance cost to taking snapshots

 frequently.

-### `--availability`

-

-This flag specifies the availability of the node at the time the node joins a master.

-Possible availability values are `active`, `pause`, or `drain`.

-

-This flag is useful in certain situations. For example, a cluster may want to have

-dedicated manager nodes that are not served as worker nodes. This could be achieved

-by passing `--availability=drain` to `docker swarm init`.

-

-

 ## Related commands

 * [swarm join](swarm_join.md)

@@ -67,27 +67,6 @@ deleted: sha256:3a88a5c81eb5c283e72db2dbc6d65cbfd8e80b6c89bb6e714cfaaa0eed99c548

 Total reclaimed space: 13.5 MB

 ```

-### 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, images, and networks 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.

-

 ## Related commands

 * [volume create](volume_create.md)