From dd1e172adb3a8b373fae3e825ee4425626c27bd1 Mon Sep 17 00:00:00 2001 From: yuexiao-wang Date: Thu, 15 Dec 2016 18:47:57 +0800 Subject: [PATCH] Fix inconsistency for pause and unpause Signed-off-by: yuexiao-wang --- docs/reference/commandline/pause.md | 10 +++++++--- docs/reference/commandline/unpause.md | 6 +++++- man/docker-pause.1.md | 13 +++++++------ man/docker-unpause.1.md | 9 +++++---- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/docs/reference/commandline/pause.md b/docs/reference/commandline/pause.md index cc4794920d..e2dd800d5f 100644 --- a/docs/reference/commandline/pause.md +++ b/docs/reference/commandline/pause.md @@ -24,9 +24,9 @@ Options: --help Print usage ``` -The `docker pause` command suspends all processes in a container. On Linux, -this uses the cgroups freezer. Traditionally, when suspending a process the -`SIGSTOP` signal is used, which is observable by the process being suspended. +The `docker pause` command suspends all processes in the specified containers. +On Linux, this uses the cgroups freezer. Traditionally, when suspending a process +the `SIGSTOP` signal is used, which is observable by the process being suspended. With the cgroups freezer the process is unaware, and unable to capture, that it is being suspended, and subsequently resumed. On Windows, only Hyper-V containers can be paused. @@ -34,3 +34,7 @@ containers can be paused. See the [cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt) for further details. + +## Related information + +* [unpause](unpause.md) diff --git a/docs/reference/commandline/unpause.md b/docs/reference/commandline/unpause.md index 17cc57e409..aa2326fefc 100644 --- a/docs/reference/commandline/unpause.md +++ b/docs/reference/commandline/unpause.md @@ -24,9 +24,13 @@ Options: --help Print usage ``` -The `docker unpause` command un-suspends all processes in a container. +The `docker unpause` command un-suspends all processes in the specified containers. On Linux, it does this using the cgroups freezer. See the [cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt) for further details. + +## Related information + +* [pause](pause.md) diff --git a/man/docker-pause.1.md b/man/docker-pause.1.md index 1f7d81e749..11eef5321f 100644 --- a/man/docker-pause.1.md +++ b/man/docker-pause.1.md @@ -2,7 +2,7 @@ % Docker Community % JUNE 2014 # NAME -docker-pause - Pause all processes within a container +docker-pause - Pause all processes within one or more containers # SYNOPSIS **docker pause** @@ -10,9 +10,9 @@ CONTAINER [CONTAINER...] # DESCRIPTION -The `docker pause` command suspends all processes in a container. On Linux, -this uses the cgroups freezer. Traditionally, when suspending a process the -`SIGSTOP` signal is used, which is observable by the process being suspended. +The `docker pause` command suspends all processes in the specified containers. +On Linux, this uses the cgroups freezer. Traditionally, when suspending a process +the `SIGSTOP` signal is used, which is observable by the process being suspended. With the cgroups freezer the process is unaware, and unable to capture, that it is being suspended, and subsequently resumed. On Windows, only Hyper-V containers can be paused. @@ -22,10 +22,11 @@ See the [cgroups freezer documentation] further details. # OPTIONS -There are no available options. +**--help** + Print usage statement # See also -**docker-unpause(1)** to unpause all processes within a container. +**docker-unpause(1)** to unpause all processes within one or more containers. # HISTORY June 2014, updated by Sven Dowideit diff --git a/man/docker-unpause.1.md b/man/docker-unpause.1.md index f1ea14bbe2..e6fd3c4e01 100644 --- a/man/docker-unpause.1.md +++ b/man/docker-unpause.1.md @@ -2,7 +2,7 @@ % Docker Community % JUNE 2014 # NAME -docker-unpause - Unpause all processes within a container +docker-unpause - Unpause all processes within one or more containers # SYNOPSIS **docker unpause** @@ -10,7 +10,7 @@ CONTAINER [CONTAINER...] # DESCRIPTION -The `docker unpause` command un-suspends all processes in a container. +The `docker unpause` command un-suspends all processes in the specified containers. On Linux, it does this using the cgroups freezer. See the [cgroups freezer documentation] @@ -18,10 +18,11 @@ See the [cgroups freezer documentation] further details. # OPTIONS -There are no available options. +**--help** + Print usage statement # See also -**docker-pause(1)** to pause all processes within a container. +**docker-pause(1)** to pause all processes within one or more containers. # HISTORY June 2014, updated by Sven Dowideit