Browse code

docker restarts running OR stopped containers, docs edit rm "running"

Signed-off-by: Sally O'Malley <somalley@redhat.com>

Sally O'Malley authored on 2015/09/09 19:27:41
Showing 6 changed files
... ...
@@ -9,11 +9,11 @@ import (
9 9
 	flag "github.com/docker/docker/pkg/mflag"
10 10
 )
11 11
 
12
-// CmdRestart restarts one or more running containers.
12
+// CmdRestart restarts one or more containers.
13 13
 //
14 14
 // Usage: docker restart [OPTIONS] CONTAINER [CONTAINER...]
15 15
 func (cli *DockerCli) CmdRestart(args ...string) error {
16
-	cmd := Cli.Subcmd("restart", []string{"CONTAINER [CONTAINER...]"}, "Restart a running container", true)
16
+	cmd := Cli.Subcmd("restart", []string{"CONTAINER [CONTAINER...]"}, "Restart a container", true)
17 17
 	nSeconds := cmd.Int([]string{"t", "-time"}, 10, "Seconds to wait for stop before killing the container")
18 18
 	cmd.Require(flag.Min, 1)
19 19
 
... ...
@@ -279,7 +279,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from push' -a '(__fish_print
279 279
 complete -c docker -f -n '__fish_docker_no_subcommand' -a rename -d 'Rename an existing container'
280 280
 
281 281
 # restart
282
-complete -c docker -f -n '__fish_docker_no_subcommand' -a restart -d 'Restart a running container'
282
+complete -c docker -f -n '__fish_docker_no_subcommand' -a restart -d 'Restart a container'
283 283
 complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -l help -d 'Print usage'
284 284
 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.'
285 285
 complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -a '(__fish_print_docker_containers running)' -d "Container"
... ...
@@ -46,7 +46,7 @@ var dockerCommands = []command{
46 46
 	{"pull", "Pull an image or a repository from a registry"},
47 47
 	{"push", "Push an image or a repository to a registry"},
48 48
 	{"rename", "Rename a container"},
49
-	{"restart", "Restart a running container"},
49
+	{"restart", "Restart a container"},
50 50
 	{"rm", "Remove one or more containers"},
51 51
 	{"rmi", "Remove one or more images"},
52 52
 	{"run", "Run a command in a new container"},
... ...
@@ -13,7 +13,7 @@ weight=1
13 13
 
14 14
     Usage: docker restart [OPTIONS] CONTAINER [CONTAINER...]
15 15
 
16
-    Restart a running container
16
+    Restart a container
17 17
 
18 18
       -t, --time=10      Seconds to wait for stop before killing the container
19 19
 
... ...
@@ -2,7 +2,7 @@
2 2
 % Docker Community
3 3
 % JUNE 2014
4 4
 # NAME
5
-docker-restart - Restart a running container
5
+docker-restart - Restart a container
6 6
 
7 7
 # SYNOPSIS
8 8
 **docker restart**
... ...
@@ -273,7 +273,7 @@ inside it)
273 273
   See **docker-rename(1)** for full documentation on the **rename** command.
274 274
 
275 275
 **restart**
276
-  Restart a running container
276
+  Restart a container
277 277
   See **docker-restart(1)** for full documentation on the **restart** command.
278 278
 
279 279
 **rm**