Merge pull request moby#27980 from allencloud/change-description-in-n…

…ode-rm-force-flag node rm can be applied on not only active node
awhitcroft · Nov 2, 2016 · 5e5c7d5 · 5e5c7d5
2 parents 197befe + 002262d
commit 5e5c7d5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/api/swagger.yaml b/api/swagger.yaml
@@ -6176,7 +6176,7 @@ paths:
           required: true
         - name: "force"
           in: "query"
-          description: "Force remove an active node"
+          description: "Force remove a node from the swarm"
           default: false
           type: "boolean"
       tags:

diff --git a/cli/command/node/remove.go b/cli/command/node/remove.go
@@ -29,7 +29,7 @@ func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
 		},
 	}
 	flags := cmd.Flags()
-	flags.BoolVar(&opts.force, "force", false, "Force remove an active node")
+	flags.BoolVar(&opts.force, "force", false, "Force remove a node from the swarm")
 	return cmd
 }
 

diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker
@@ -818,7 +818,7 @@ __docker_node_subcommand() {
         (rm|remove)
              _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)--force[Force remove an active node]" \
+                "($help)--force[Force remove a node from the swarm]" \
                 "($help -)*:node:__docker_complete_pending_nodes" && ret=0
             ;;
         (demote)

diff --git a/docs/reference/api/docker_remote_api_v1.24.md b/docs/reference/api/docker_remote_api_v1.24.md
@@ -4064,7 +4064,7 @@ Remove a node [`id`] from the swarm.
 
 **Query parameters**:
 
--   **force** - 1/True/true or 0/False/false, Force remove an active node.
+-   **force** - 1/True/true or 0/False/false, Force remove a node from the swarm.
         Default `false`.
 
 **Status codes**:

diff --git a/docs/reference/api/docker_remote_api_v1.25.md b/docs/reference/api/docker_remote_api_v1.25.md
@@ -4589,7 +4589,7 @@ Remove a node [`id`] from the swarm.
 
 **Query parameters**:
 
--   **force** - 1/True/true or 0/False/false, Force remove an active node.
+-   **force** - 1/True/true or 0/False/false, Force remove a node from the swarm.
         Default `false`.
 
 **Status codes**:

diff --git a/docs/reference/commandline/node_rm.md b/docs/reference/commandline/node_rm.md
@@ -24,7 +24,7 @@ Aliases:
   rm, remove
 
 Options:
-      --force  Force remove an active node
+      --force  Force remove a node from the swarm
       --help   Print usage
 ```