node rm can be applied on not only active node

allencloud · allencloud · commit 002262d6f5d9 · 2016-11-02T17:22:04.000+08:00
Signed-off-by: allencloud &lt;allen.sun@daocloud.io&gt;
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
 ```
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func newRemoveCommand(dockerCli command.DockerCli) cobra.Command {`
`29`	`29`	`},`
`30`	`30`	`}`
`31`	`31`	`flags := cmd.Flags()`
`32`		`- flags.BoolVar(&opts.force, "force", false, "Force remove an active node")`
	`32`	`+ flags.BoolVar(&opts.force, "force", false, "Force remove a node from the swarm")`
`33`	`33`	`return cmd`
`34`	`34`	`}`
`35`	`35`