Merge pull request #26145 from allencloud/update-command-description

update command description
Upstream-commit: 19aee549269ab7e7a025aaf7b820577f52dc4443
Component: engine
This commit is contained in:
Vincent Demeester
2016-08-30 22:16:57 +02:00
committed by GitHub
6 changed files with 7 additions and 7 deletions
@@ -24,7 +24,7 @@ func NewRestartCommand(dockerCli *client.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "restart [OPTIONS] CONTAINER [CONTAINER...]",
Short: "Restart a container",
Short: "Restart one or more containers",
Args: cli.RequiresMinArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
opts.containers = args
@@ -21,7 +21,7 @@ func NewWaitCommand(dockerCli *client.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "wait CONTAINER [CONTAINER...]",
Short: "Block until a container stops, then print its exit code",
Short: "Block until one or more containers stop, then print their exit codes",
Args: cli.RequiresMinArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
opts.containers = args
@@ -22,8 +22,8 @@ func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command {
var opts inspectOptions
cmd := &cobra.Command{
Use: "inspect PLUGIN",
Short: "Inspect a plugin",
Use: "inspect [OPTIONS] PLUGIN [PLUGIN...]",
Short: "Display detailed information on one or more plugins",
Args: cli.RequiresMinArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
opts.pluginNames = args
@@ -20,7 +20,7 @@ func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
var opts removeOptions
cmd := &cobra.Command{
Use: "rm [OPTIONS] VOLUME [VOLUME]...",
Use: "rm [OPTIONS] VOLUME [VOLUME...]",
Aliases: []string{"remove"},
Short: "Remove one or more volumes",
Long: removeDescription,
@@ -13,7 +13,7 @@ parent = "smn_cli"
```markdown
Usage: docker restart [OPTIONS] CONTAINER [CONTAINER...]
Restart a container
Restart one or more containers
Options:
--help Print usage
@@ -13,7 +13,7 @@ parent = "smn_cli"
```markdown
Usage: docker wait CONTAINER [CONTAINER...]
Block until a container stops, then print its exit code
Block until one or more containers stop, then print their exit codes
Options:
--help Print usage