From fac115815672039ea9ef5df442a6a1301f11d5f7 Mon Sep 17 00:00:00 2001 From: Sally O'Malley Date: Wed, 9 Sep 2015 06:27:41 -0400 Subject: [PATCH] docker restarts running OR stopped containers, docs edit rm "running" Signed-off-by: Sally O'Malley --- contrib/completion/fish/docker.fish | 2 +- docs/reference/commandline/restart.md | 2 +- man/docker-restart.1.md | 2 +- man/docker.1.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index ad76de3c..798f1ec3 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/docs/reference/commandline/restart.md b/docs/reference/commandline/restart.md index 0b668eec..339f7960 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 77f99d51..9f60bc54 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 17b92849..bee12512 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**