1. docker
  2. Commit 082f4919cac55f32674874d96d82a310f6b1522d
Browse code

Fix inconsistency for pause and unpause

Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>

yuexiao-wang authored on 2016/12/15 19:47:57
Showing 4 changed files
docs/reference/commandline/pause.md
History View file @ 082f491
... ... 
@@ -24,9 +24,9 @@ Options:
24 24 
       --help   Print usage
25 25 
 ```
26 26
27 
-The `docker pause` command suspends all processes in a container. On Linux,
28 
-this uses the cgroups freezer. Traditionally, when suspending a process the
29 
-`SIGSTOP` signal is used, which is observable by the process being suspended.
27 
+The `docker pause` command suspends all processes in the specified containers.
28 
+On Linux, this uses the cgroups freezer. Traditionally, when suspending a process
29 
+the `SIGSTOP` signal is used, which is observable by the process being suspended.
30 30 
 With the cgroups freezer the process is unaware, and unable to capture,
31 31 
 that it is being suspended, and subsequently resumed. On Windows, only Hyper-V
32 32 
 containers can be paused.
... ... 
@@ -34,3 +34,7 @@ containers can be paused.
34 34 
 See the
35 35 
 [cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt)
36 36 
 for further details.
37 
+
38 
+## Related information
39 
+
40 
+* [unpause](unpause.md)
docs/reference/commandline/unpause.md
History View file @ 082f491
... ... 
@@ -24,9 +24,13 @@ Options:
24 24 
       --help   Print usage
25 25 
 ```
26 26
27 
-The `docker unpause` command un-suspends all processes in a container.
27 
+The `docker unpause` command un-suspends all processes in the specified containers.
28 28 
 On Linux, it does this using the cgroups freezer.
29 29
30 30 
 See the
31 31 
 [cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt)
32 32 
 for further details.
33 
+
34 
+## Related information
35 
+
36 
+* [pause](pause.md)
man/docker-pause.1.md
History View file @ 082f491
... ... 
@@ -2,7 +2,7 @@
2 2 
 % Docker Community
3 3 
 % JUNE 2014
4 4 
 # NAME
5 
-docker-pause - Pause all processes within a container
5 
+docker-pause - Pause all processes within one or more containers
6 6
7 7 
 # SYNOPSIS
8 8 
 **docker pause**
... ... 
@@ -10,9 +10,9 @@ CONTAINER [CONTAINER...]
10 10
11 11 
 # DESCRIPTION
12 12
13 
-The `docker pause` command suspends all processes in a container. On Linux,
14 
-this uses the cgroups freezer. Traditionally, when suspending a process the
15 
-`SIGSTOP` signal is used, which is observable by the process being suspended.
13 
+The `docker pause` command suspends all processes in the specified containers.
14 
+On Linux, this uses the cgroups freezer. Traditionally, when suspending a process
15 
+the `SIGSTOP` signal is used, which is observable by the process being suspended.
16 16 
 With the cgroups freezer the process is unaware, and unable to capture,
17 17 
 that it is being suspended, and subsequently resumed. On Windows, only Hyper-V
18 18 
 containers can be paused.
... ... 
@@ -22,10 +22,11 @@ See the [cgroups freezer documentation]
22 22 
 further details.
23 23
24 24 
 # OPTIONS
25 
-There are no available options.
25 
+**--help**
26 
+  Print usage statement
26 27
27 28 
 # See also
28 
-**docker-unpause(1)** to unpause all processes within a container.
29 
+**docker-unpause(1)** to unpause all processes within one or more containers.
29 30
30 31 
 # HISTORY
31 32 
 June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
man/docker-unpause.1.md
History View file @ 082f491
... ... 
@@ -2,7 +2,7 @@
2 2 
 % Docker Community
3 3 
 % JUNE 2014
4 4 
 # NAME
5 
-docker-unpause - Unpause all processes within a container
5 
+docker-unpause - Unpause all processes within one or more containers
6 6
7 7 
 # SYNOPSIS
8 8 
 **docker unpause**
... ... 
@@ -10,7 +10,7 @@ CONTAINER [CONTAINER...]
10 10
11 11 
 # DESCRIPTION
12 12
13 
-The `docker unpause` command un-suspends all processes in a container.
13 
+The `docker unpause` command un-suspends all processes in the specified containers.
14 14 
 On Linux, it does this using the cgroups freezer.
15 15
16 16 
 See the [cgroups freezer documentation]
... ... 
@@ -18,10 +18,11 @@ See the [cgroups freezer documentation]
18 18 
 further details.
19 19
20 20 
 # OPTIONS
21 
-There are no available options.
21 
+**--help**
22 
+  Print usage statement
22 23
23 24 
 # See also
24 
-**docker-pause(1)** to pause all processes within a container.
25 
+**docker-pause(1)** to pause all processes within one or more containers.
25 26
26 27 
 # HISTORY
27 28 
 June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>