diff --git a/api/client/container/kill.go b/api/client/container/kill.go
index 319ef29628..b5de545d39 100644
--- a/api/client/container/kill.go
+++ b/api/client/container/kill.go
@@ -23,7 +23,7 @@ func NewKillCommand(dockerCli *client.DockerCli) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:   "kill [OPTIONS] CONTAINER [CONTAINER...]",
-		Short: "Kill one or more running container",
+		Short: "Kill one or more running containers",
 		Args:  cli.RequiresMinArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts.containers = args
diff --git a/api/client/container/ps.go b/api/client/container/ps.go
index cc4add938b..e4624b17d8 100644
--- a/api/client/container/ps.go
+++ b/api/client/container/ps.go
@@ -42,7 +42,7 @@ func NewPsCommand(dockerCli *client.DockerCli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "ps [OPTIONS]",
 		Short: "List containers",
-		Args:  cli.ExactArgs(0),
+		Args:  cli.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runPs(dockerCli, &opts)
 		},
diff --git a/api/client/network/remove.go b/api/client/network/remove.go
index f5b0196d97..0313cf0be8 100644
--- a/api/client/network/remove.go
+++ b/api/client/network/remove.go
@@ -12,9 +12,9 @@ import (
 
 func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return &cobra.Command{
-		Use:     "rm NETWORK [NETWORK]...",
+		Use:     "rm NETWORK [NETWORK...]",
 		Aliases: []string{"remove"},
-		Short:   "Remove a network",
+		Short:   "Remove one or more networks",
 		Args:    cli.RequiresMinArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runRemove(dockerCli, args)
diff --git a/api/client/node/demote.go b/api/client/node/demote.go
index 058471daaf..3819b1a399 100644
--- a/api/client/node/demote.go
+++ b/api/client/node/demote.go
@@ -12,7 +12,7 @@ import (
 func newDemoteCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return &cobra.Command{
 		Use:   "demote NODE [NODE...]",
-		Short: "Demote a node from manager in the swarm",
+		Short: "Demote one or more nodes from manager in the swarm",
 		Args:  cli.RequiresMinArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runDemote(dockerCli, args)
diff --git a/api/client/node/promote.go b/api/client/node/promote.go
index 760ec6f62b..39e284f937 100644
--- a/api/client/node/promote.go
+++ b/api/client/node/promote.go
@@ -12,7 +12,7 @@ import (
 func newPromoteCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return &cobra.Command{
 		Use:   "promote NODE [NODE...]",
-		Short: "Promote a node to a manager in the swarm",
+		Short: "Promote one or more nodes to manager in the swarm",
 		Args:  cli.RequiresMinArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runPromote(dockerCli, args)
diff --git a/api/client/node/remove.go b/api/client/node/remove.go
index 540194062d..4966f26675 100644
--- a/api/client/node/remove.go
+++ b/api/client/node/remove.go
@@ -14,7 +14,7 @@ func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return &cobra.Command{
 		Use:     "rm NODE [NODE...]",
 		Aliases: []string{"remove"},
-		Short:   "Remove a node from the swarm",
+		Short:   "Remove one or more nodes from the swarm",
 		Args:    cli.RequiresMinArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runRemove(dockerCli, args)
diff --git a/api/client/plugin/install.go b/api/client/plugin/install.go
index 10cafb3269..af8c5b5b0a 100644
--- a/api/client/plugin/install.go
+++ b/api/client/plugin/install.go
@@ -27,7 +27,7 @@ func newInstallCommand(dockerCli *client.DockerCli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "install [OPTIONS] PLUGIN",
 		Short: "Install a plugin",
-		Args:  cli.RequiresMinArgs(1), // TODO: allow for set args
+		Args:  cli.ExactArgs(1), // TODO: allow for set args
 		RunE: func(cmd *cobra.Command, args []string) error {
 			options.name = args[0]
 			return runInstall(dockerCli, options)
diff --git a/api/client/plugin/list.go b/api/client/plugin/list.go
index d6c788ca7c..9813a3ce4f 100644
--- a/api/client/plugin/list.go
+++ b/api/client/plugin/list.go
@@ -17,7 +17,7 @@ func newListCommand(dockerCli *client.DockerCli) *cobra.Command {
 		Use:     "ls",
 		Short:   "List plugins",
 		Aliases: []string{"list"},
-		Args:    cli.ExactArgs(0),
+		Args:    cli.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runList(dockerCli)
 		},
diff --git a/api/client/plugin/remove.go b/api/client/plugin/remove.go
index a8e52a4f26..5aba24415b 100644
--- a/api/client/plugin/remove.go
+++ b/api/client/plugin/remove.go
@@ -17,7 +17,7 @@ func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
 		Use:     "rm PLUGIN",
 		Short:   "Remove a plugin",
 		Aliases: []string{"remove"},
-		Args:    cli.RequiresMinArgs(1),
+		Args:    cli.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runRemove(dockerCli, args)
 		},
diff --git a/api/client/service/remove.go b/api/client/service/remove.go
index 0ee21bc57d..a304761d98 100644
--- a/api/client/service/remove.go
+++ b/api/client/service/remove.go
@@ -15,7 +15,7 @@ func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "rm [OPTIONS] SERVICE [SERVICE...]",
 		Aliases: []string{"remove"},
-		Short:   "Remove a service",
+		Short:   "Remove one or more services",
 		Args:    cli.RequiresMinArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runRemove(dockerCli, args)
diff --git a/api/client/system/info.go b/api/client/system/info.go
index ba52beabfa..acde8fd8fc 100644
--- a/api/client/system/info.go
+++ b/api/client/system/info.go
@@ -21,7 +21,7 @@ func NewInfoCommand(dockerCli *client.DockerCli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "info",
 		Short: "Display system-wide information",
-		Args:  cli.ExactArgs(0),
+		Args:  cli.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runInfo(dockerCli)
 		},
diff --git a/api/client/system/version.go b/api/client/system/version.go
index 6380e3af4e..cdfe1d466d 100644
--- a/api/client/system/version.go
+++ b/api/client/system/version.go
@@ -44,7 +44,7 @@ func NewVersionCommand(dockerCli *client.DockerCli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "version [OPTIONS]",
 		Short: "Show the Docker version information",
-		Args:  cli.ExactArgs(0),
+		Args:  cli.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runVersion(dockerCli, &opts)
 		},
diff --git a/api/client/volume/remove.go b/api/client/volume/remove.go
index f406a88bdd..0ed982572e 100644
--- a/api/client/volume/remove.go
+++ b/api/client/volume/remove.go
@@ -12,9 +12,9 @@ import (
 
 func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return &cobra.Command{
-		Use:     "rm VOLUME [VOLUME]...",
+		Use:     "rm VOLUME [VOLUME...]",
 		Aliases: []string{"remove"},
-		Short:   "Remove a volume",
+		Short:   "Remove one or more volumes",
 		Long:    removeDescription,
 		Example: removeExample,
 		Args:    cli.RequiresMinArgs(1),
@@ -45,7 +45,7 @@ func runRemove(dockerCli *client.DockerCli, volumes []string) error {
 }
 
 var removeDescription = `
-Removes one or more volumes. You cannot remove a volume that is in use by a container.
+Remove one or more volumes. You cannot remove a volume that is in use by a container.
 `
 
 var removeExample = `
diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker
index 1dbe1ad016..1eed282ba3 100644
--- a/contrib/completion/zsh/_docker
+++ b/contrib/completion/zsh/_docker
@@ -786,7 +786,7 @@ __docker_node_commands() {
         "inspect:Display detailed information on one or more nodes"
         "ls:List nodes in the swarm"
         "promote:Promote a node as manager in the swarm"
-        "rm:Remove a node from the swarm"
+        "rm:Remove one or more nodes from the swarm"
         "ps:List tasks running on a node"
         "update:Update a node"
     )
@@ -1058,7 +1058,7 @@ __docker_service_commands() {
         "create:Create a new service"
         "inspect:Display detailed information on one or more services"
         "ls:List services"
-        "rm:Remove a service"
+        "rm:Remove one or more services"
         "scale:Scale one or multiple services"
         "ps:List the tasks of a service"
         "update:Update a service"
@@ -1314,7 +1314,7 @@ __docker_volume_commands() {
         "create:Create a volume"
         "inspect:Display detailed information on one or more volumes"
         "ls:List volumes"
-        "rm:Remove a volume"
+        "rm:Remove one or more volumes"
     )
     _describe -t docker-volume-commands "docker volume command" _docker_volume_subcommands
 }
diff --git a/docs/reference/commandline/index.md b/docs/reference/commandline/index.md
index e83c756136..9cd3679aa4 100644
--- a/docs/reference/commandline/index.md
+++ b/docs/reference/commandline/index.md
@@ -117,7 +117,7 @@ read the [`dockerd`](dockerd.md) reference page.
 | [node update](node_update.md) | Update attributes for a node                 |
 | [node ps](node_ps.md) | List tasks running on a node                   |
 | [node ls](node_ls.md) | List nodes in the swarm                              |
-| [node rm](node_rm.md) | Remove a node from the swarm                         |
+| [node rm](node_rm.md) | Remove one or more nodes from the swarm                         |
 
 ### Swarm swarm commands
 
diff --git a/docs/reference/commandline/kill.md b/docs/reference/commandline/kill.md
index e85ba61657..55b11efad2 100644
--- a/docs/reference/commandline/kill.md
+++ b/docs/reference/commandline/kill.md
@@ -13,7 +13,7 @@ parent = "smn_cli"
 ```markdown
 Usage:  docker kill [OPTIONS] CONTAINER [CONTAINER...]
 
-Kill one or more running container
+Kill one or more running containers
 
 Options:
       --help            Print usage
diff --git a/docs/reference/commandline/network_rm.md b/docs/reference/commandline/network_rm.md
index ce213b47fe..949d9b56b9 100644
--- a/docs/reference/commandline/network_rm.md
+++ b/docs/reference/commandline/network_rm.md
@@ -11,9 +11,9 @@ parent = "smn_cli"
 # network rm
 
 ```markdown
-Usage:  docker network rm NETWORK [NETWORK]...
+Usage:  docker network rm NETWORK [NETWORK...]
 
-Remove a network
+Remove one or more networks
 
 Aliases:
   rm, remove
diff --git a/docs/reference/commandline/node_demote.md b/docs/reference/commandline/node_demote.md
index 78acbfdf40..2cec22ac3b 100644
--- a/docs/reference/commandline/node_demote.md
+++ b/docs/reference/commandline/node_demote.md
@@ -13,7 +13,7 @@ parent = "smn_cli"
 ```markdown
 Usage:  docker node demote NODE [NODE...]
 
-Demote a node from manager in the swarm
+Demote one or more nodes from manager in the swarm
 
 Options:
       --help   Print usage
diff --git a/docs/reference/commandline/node_promote.md b/docs/reference/commandline/node_promote.md
index de0bb9a0aa..7f5830d92a 100644
--- a/docs/reference/commandline/node_promote.md
+++ b/docs/reference/commandline/node_promote.md
@@ -13,7 +13,7 @@ parent = "smn_cli"
 ```markdown
 Usage:  docker node promote NODE [NODE...]
 
-Promote a node to a manager in the swarm
+Promote one or more nodes to manager in the swarm
 
 Options:
       --help   Print usage
diff --git a/docs/reference/commandline/node_rm.md b/docs/reference/commandline/node_rm.md
index bb9fcadb32..e2f913e1a8 100644
--- a/docs/reference/commandline/node_rm.md
+++ b/docs/reference/commandline/node_rm.md
@@ -13,7 +13,7 @@ parent = "smn_cli"
 ```markdown
 Usage:  docker node rm NODE [NODE...]
 
-Remove a node from the swarm
+Remove one or more nodes from the swarm
 
 Aliases:
   rm, remove
diff --git a/docs/reference/commandline/service_rm.md b/docs/reference/commandline/service_rm.md
index d47dc5f82e..ca2e9aecb4 100644
--- a/docs/reference/commandline/service_rm.md
+++ b/docs/reference/commandline/service_rm.md
@@ -11,9 +11,9 @@ parent = "smn_cli"
 # service rm
 
 ```Markdown
-Usage:	docker service rm [OPTIONS] SERVICE
+Usage:	docker service rm [OPTIONS] SERVICE [SERVICE...]
 
-Remove a service
+Remove one or more services
 
 Aliases:
   rm, remove
diff --git a/docs/reference/commandline/volume_rm.md b/docs/reference/commandline/volume_rm.md
index 1760a5d905..52d7f067bf 100644
--- a/docs/reference/commandline/volume_rm.md
+++ b/docs/reference/commandline/volume_rm.md
@@ -11,9 +11,9 @@ parent = "smn_cli"
 # volume rm
 
 ```markdown
-Usage:  docker volume rm VOLUME [VOLUME]...
+Usage:  docker volume rm VOLUME [VOLUME...]
 
-Remove a volume
+Remove one or more volumes
 
 Aliases:
   rm, remove
@@ -22,7 +22,7 @@ Options:
       --help   Print usage
 ```
 
-Removes one or more volumes. You cannot remove a volume that is in use by a container.
+Remove one or more volumes. You cannot remove a volume that is in use by a container.
 
     $ docker volume rm hello
     hello