diff --git a/api/client/restart.go b/api/client/restart.go index 2101ab91da..8d050ff71e 100644 --- a/api/client/restart.go +++ b/api/client/restart.go @@ -9,11 +9,11 @@ import ( flag "github.com/docker/docker/pkg/mflag" ) -// CmdRestart restarts one or more running containers. +// CmdRestart restarts one or more containers. // // Usage: docker restart [OPTIONS] CONTAINER [CONTAINER...] func (cli *DockerCli) CmdRestart(args ...string) error { - cmd := Cli.Subcmd("restart", []string{"CONTAINER [CONTAINER...]"}, "Restart a running container", true) + cmd := Cli.Subcmd("restart", []string{"CONTAINER [CONTAINER...]"}, "Restart a container", true) nSeconds := cmd.Int([]string{"t", "-time"}, 10, "Seconds to wait for stop before killing the container") cmd.Require(flag.Min, 1) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index ad76de3ce6..798f1ec3b4 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -279,7 +279,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from push' -a '(__fish_print complete -c docker -f -n '__fish_docker_no_subcommand' -a rename -d 'Rename an existing container' # restart -complete -c docker -f -n '__fish_docker_no_subcommand' -a restart -d 'Restart a running container' +complete -c docker -f -n '__fish_docker_no_subcommand' -a restart -d 'Restart a container' complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -l help -d 'Print usage' complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -s t -l time -d 'Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default is 10 seconds.' complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -a '(__fish_print_docker_containers running)' -d "Container" diff --git a/docker/flags.go b/docker/flags.go index 1e234a28ea..f45da10fda 100644 --- a/docker/flags.go +++ b/docker/flags.go @@ -46,7 +46,7 @@ var dockerCommands = []command{ {"pull", "Pull an image or a repository from a registry"}, {"push", "Push an image or a repository to a registry"}, {"rename", "Rename a container"}, - {"restart", "Restart a running container"}, + {"restart", "Restart a container"}, {"rm", "Remove one or more containers"}, {"rmi", "Remove one or more images"}, {"run", "Run a command in a new container"}, diff --git a/docs/reference/commandline/restart.md b/docs/reference/commandline/restart.md index 0b668eecf4..339f796044 100644 --- a/docs/reference/commandline/restart.md +++ b/docs/reference/commandline/restart.md @@ -13,7 +13,7 @@ weight=1 Usage: docker restart [OPTIONS] CONTAINER [CONTAINER...] - Restart a running container + Restart a container -t, --time=10 Seconds to wait for stop before killing the container diff --git a/man/docker-restart.1.md b/man/docker-restart.1.md index 77f99d51a6..9f60bc5434 100644 --- a/man/docker-restart.1.md +++ b/man/docker-restart.1.md @@ -2,7 +2,7 @@ % Docker Community % JUNE 2014 # NAME -docker-restart - Restart a running container +docker-restart - Restart a container # SYNOPSIS **docker restart** diff --git a/man/docker.1.md b/man/docker.1.md index 17b92849bf..bee12512aa 100644 --- a/man/docker.1.md +++ b/man/docker.1.md @@ -273,7 +273,7 @@ inside it) See **docker-rename(1)** for full documentation on the **rename** command. **restart** - Restart a running container + Restart a container See **docker-restart(1)** for full documentation on the **restart** command. **rm**