diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-01 08:02:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-01 08:02:27 -0700 |
| commit | 3bdccd8a461217ac6d0094c2081f50612d60c19a (patch) | |
| tree | 8816c905cec898421f857c57628e5036a5de66a1 /docs | |
| parent | df978a264d7944351e7cded0a9506cab8a7bb0db (diff) | |
| parent | 249a51a2fc40e8aace6cc3e3b6deb594e7c93d33 (diff) | |
| download | podman-3bdccd8a461217ac6d0094c2081f50612d60c19a.tar.gz podman-3bdccd8a461217ac6d0094c2081f50612d60c19a.tar.bz2 podman-3bdccd8a461217ac6d0094c2081f50612d60c19a.zip | |
Merge pull request #1568 from rhatdan/kill
Add --all flag to podman kill
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/podman-kill.1.md | 6 | ||||
| -rw-r--r-- | docs/podman-stop.1.md | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/docs/podman-kill.1.md b/docs/podman-kill.1.md index 79449fc57..14066d151 100644 --- a/docs/podman-kill.1.md +++ b/docs/podman-kill.1.md @@ -10,6 +10,10 @@ podman\-kill - Kills one or more containers with a signal The main process inside each container specified will be sent SIGKILL, or any signal specified with option --signal. ## OPTIONS +**--all, -a** + +Signal all running containers. This does not include paused containers. + **--latest, -l** Instead of providing the container name or ID, use the last created container. If you use methods other than Podman @@ -30,6 +34,8 @@ podman kill --signal TERM 860a4b23 podman kill --latest +podman kill --signal KILL -a + ## SEE ALSO podman(1), podman-stop(1) diff --git a/docs/podman-stop.1.md b/docs/podman-stop.1.md index 98f74f269..813f0ef9e 100644 --- a/docs/podman-stop.1.md +++ b/docs/podman-stop.1.md @@ -15,10 +15,6 @@ container and also via command line when creating the container. ## OPTIONS -**--timeout, --time, t** - -Timeout to wait before forcibly stopping the container - **--all, -a** Stop all running containers. This does not include paused containers. @@ -28,6 +24,10 @@ Stop all running containers. This does not include paused containers. Instead of providing the container name or ID, use the last created container. If you use methods other than Podman to run containers such as CRI-O, the last started container could be from either of those methods. +**--timeout, --time, t** + +Timeout to wait before forcibly stopping the container + ## EXAMPLE podman stop mywebserver |