change flag name to better follow the other flags that start with disable;

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
This commit is contained in:
Jessica Frazelle
2015-10-07 10:50:50 -07:00
parent 668a1758bd
commit 1321794dc1
7 changed files with 22 additions and 19 deletions
+3 -3
View File
@@ -18,7 +18,7 @@ The following list of features are deprecated.
**Target For Removal In Release: v1.10**
The built-in LXC execution driver is deprecated for an external implementation.
The lxc-conf flag and API fields will also be removed.
The lxc-conf flag and API fields will also be removed.
### Old Command Line Options
**Deprecated In Release: [v1.8.0](/release-notes/#docker-engine-1-8-0)**
@@ -29,7 +29,7 @@ The flags `-d` and `--daemon` are deprecated in favor of the `daemon` subcommand
docker daemon -H ...
The following single-dash (`-opt`) variant of certain command line options
The following single-dash (`-opt`) variant of certain command line options
are deprecated and replaced with double-dash options (`--opt`):
docker attach -nostdin
@@ -71,4 +71,4 @@ The following double-dash options are deprecated and have no replacement:
### Interacting with V1 registries
Version 1.8.3 adds a flag (`--no-legacy-registry=false`) which prevents the docker daemon from `pull`, `push`, and `login` operations against v1 registries. Though disabled by default, this signals the intent to deprecate the v1 protocol.
Version 1.8.3 adds a flag (`--disable-legacy-registry=false`) which prevents the docker daemon from `pull`, `push`, and `login` operations against v1 registries. Though disabled by default, this signals the intent to deprecate the v1 protocol.
+5 -5
View File
@@ -45,7 +45,7 @@ parent = "smn_cli"
--log-driver="json-file" Default driver for container logs
--log-opt=[] Log driver specific options
--mtu=0 Set the containers network MTU
--no-legacy-registry=false Do not contact legacy registries
--disable-legacy-registry=false Do not contact legacy registries
-p, --pidfile="/var/run/docker.pid" Path to use for daemon PID file
--registry-mirror=[] Preferred Docker registry mirror
-s, --storage-driver="" Storage driver to use
@@ -183,7 +183,7 @@ options for `zfs` start with `zfs`.
If using a block device for device mapper storage, it is best to use `lvm`
to create and manage the thin-pool volume. This volume is then handed to Docker
to exclusively create snapshot volumes needed for images and containers.
to exclusively create snapshot volumes needed for images and containers.
Managing the thin-pool outside of Docker makes for the most feature-rich
method of having Docker utilize device mapper thin provisioning as the
@@ -219,7 +219,7 @@ options for `zfs` start with `zfs`.
* `dm.loopdatasize`
>**Note**: This option configures devicemapper loopback, which should not be used in production.
Specifies the size to use when creating the loopback file for the
"data" device which is used for the thin pool. The default size is
100G. The file is sparse, so it will not initially take up this
@@ -447,7 +447,7 @@ rely on this, as it may change in the future.
## Legacy Registries
Enabling `--no-legacy-registry` forces a docker daemon to only interact with
Enabling `--disable-legacy-registry` forces a docker daemon to only interact with
registries which support the V2 protocol. Specifically, the daemon will not
attempt `push`, `pull` and `login` to v1 registries. The exception to this
is `search` which can still be performed on v1 registries.
@@ -474,7 +474,7 @@ use the proxy
`--default-ulimit` allows you to set the default `ulimit` options to use for
all containers. It takes the same options as `--ulimit` for `docker run`. If
these defaults are not set, `ulimit` settings will be inherited, if not set on
`docker run`, from the Docker daemon. Any `--ulimit` options passed to
`docker run`, from the Docker daemon. Any `--ulimit` options passed to
`docker run` will overwrite these defaults.
Be careful setting `nproc` with the `ulimit` flag as `nproc` is designed by Linux to