From 2f9e9bcbaa44ba94508a5891d220d0cad02104d1 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 22 Jul 2016 10:38:56 +0200 Subject: [PATCH] Append --registry-auth with with `--with-registry-auth` is more explicit. Signed-off-by: Vincent Demeester --- contrib/completion/bash/docker | 2 +- contrib/completion/zsh/_docker | 2 +- docs/reference/commandline/deploy.md | 6 +++--- docs/reference/commandline/service_create.md | 2 +- docs/reference/commandline/service_update.md | 2 +- experimental/docker-stacks-and-bundles.md | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index a2d606b437..f3f47b8042 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -1733,7 +1733,7 @@ _docker_service_update() { local boolean_options=" --help - --registry-auth + --with-registry-auth " __docker_complete_log_driver_options && return diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 4a947c6685..8ccf34b476 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -1085,7 +1085,6 @@ __docker_service_subcommand() { "($help)--name=[Service name]:name: " "($help)*--network=[Network attachments]:network: " "($help)*"{-p=,--publish=}"[Publish a port as a node port]:port: " - "($help)--registry-auth[Send registry authentication details to swarm agents]" "($help)--replicas=[Number of tasks]:replicas: " "($help)--reserve-cpu=[Reserve CPUs]:value: " "($help)--reserve-memory=[Reserve Memory]:value: " @@ -1097,6 +1096,7 @@ __docker_service_subcommand() { "($help)--update-delay=[Delay between updates]:delay: " "($help)--update-parallelism=[Maximum number of tasks updated simultaneously]:number: " "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" + "($help)--with-registry-auth[Send registry authentication details to swarm agents]" "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories" ) diff --git a/docs/reference/commandline/deploy.md b/docs/reference/commandline/deploy.md index c18a8f58bb..908131e4bb 100644 --- a/docs/reference/commandline/deploy.md +++ b/docs/reference/commandline/deploy.md @@ -17,9 +17,9 @@ Usage: docker deploy [OPTIONS] STACK Create and update a stack from a Distributed Application Bundle (DAB) Options: - --file string Path to a Distributed Application Bundle file (Default: STACK.dab) - --help Print usage - --registry-auth Send registry authentication details to swarm agents + --file string Path to a Distributed Application Bundle file (Default: STACK.dab) + --help Print usage + --with-registry-auth Send registry authentication details to swarm agents ``` Create and update a stack from a `dab` file. This command has to be diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md index 795ee395e8..c265205c09 100644 --- a/docs/reference/commandline/service_create.md +++ b/docs/reference/commandline/service_create.md @@ -31,7 +31,6 @@ Options: --name string Service name --network value Network attachments (default []) -p, --publish value Publish a port as a node port (default []) - --registry-auth Send registry authentication details to swarm agents --replicas value Number of tasks (default none) --reserve-cpu value Reserve CPUs (default 0.000) --reserve-memory value Reserve Memory (default 0 B) @@ -43,6 +42,7 @@ Options: --update-delay duration Delay between updates --update-parallelism uint Maximum number of tasks updated simultaneously -u, --user string Username or UID + --with-registry-auth Send registry authentication details to Swarm agents -w, --workdir string Working directory inside the container ``` diff --git a/docs/reference/commandline/service_update.md b/docs/reference/commandline/service_update.md index f834ac4b31..25817e115c 100644 --- a/docs/reference/commandline/service_update.md +++ b/docs/reference/commandline/service_update.md @@ -38,7 +38,6 @@ Options: --network-rm value Remove a network by name (default []) --publish-add value Add or update a published port (default []) --publish-rm value Remove a published port by its target port (default []) - --registry-auth Send registry authentication details to swarm agents --replicas value Number of tasks (default none) --reserve-cpu value Reserve CPUs (default 0.000) --reserve-memory value Reserve Memory (default 0 B) @@ -50,6 +49,7 @@ Options: --update-delay duration Delay between updates --update-parallelism uint Maximum number of tasks updated simultaneously -u, --user string Username or UID + --with-registry-auth Send registry authentication details to Swarm agents -w, --workdir string Working directory inside the container ``` diff --git a/experimental/docker-stacks-and-bundles.md b/experimental/docker-stacks-and-bundles.md index 5145362b09..6ca37a4934 100644 --- a/experimental/docker-stacks-and-bundles.md +++ b/experimental/docker-stacks-and-bundles.md @@ -44,9 +44,9 @@ Usage: docker deploy [OPTIONS] STACK Create and update a stack Options: - --file string Path to a Distributed Application Bundle file (Default: STACK.dab) - --help Print usage - --registry-auth Send registry authentication details to Swarm agents + --file string Path to a Distributed Application Bundle file (Default: STACK.dab) + --help Print usage + --with-registry-auth Send registry authentication details to Swarm agents ``` Let's deploy the stack created before: