summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2018-02-06 13:40:52 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-06 19:03:57 +0000
commit69d75a82515b6b4270cd6b72617cff1531f9ceca (patch)
tree7b3d382284df96300285266bf88e71674ebe948c
parentd20c1a9911b2614640ef3c417a5b7af7254f52b5 (diff)
downloadpodman-69d75a82515b6b4270cd6b72617cff1531f9ceca.tar.gz
podman-69d75a82515b6b4270cd6b72617cff1531f9ceca.tar.bz2
podman-69d75a82515b6b4270cd6b72617cff1531f9ceca.zip
Touchup podman kill manpage
Signed-off-by: Matthew Heon <mheon@redhat.com> Closes: #299 Approved by: rhatdan
-rw-r--r--docs/podman-stop.1.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/podman-stop.1.md b/docs/podman-stop.1.md
index f4372be5f..58cb2c39c 100644
--- a/docs/podman-stop.1.md
+++ b/docs/podman-stop.1.md
@@ -11,7 +11,9 @@ podman stop - Stop one or more containers
## DESCRIPTION
Stops one or more containers. You may use container IDs or names as input. The **--timeout** switch
allows you to specify the number of seconds to wait before forcibly stopping the container after the stop command
-is issued to the container. The default is 10 seconds.
+is issued to the container. The default is 10 seconds. By default, containers are stopped with SIGTERM
+and then SIGKILL after the timeout. The SIGTERM default can be overridden by the image used to create the
+container and also via command line when creating the container.
## OPTIONS