瀏覽代碼

Merge pull request #29434 from yuexiao-wang/pause-and-unpause

Fix inconsistency for pause and unpause
Sebastiaan van Stijn 8 年之前
父節點
當前提交
ba76c9214d
共有 4 個文件被更改,包括 24 次插入14 次删除
  1. 7 3
      docs/reference/commandline/pause.md
  2. 5 1
      docs/reference/commandline/unpause.md
  3. 7 6
      man/docker-pause.1.md
  4. 5 4
      man/docker-unpause.1.md

+ 7 - 3
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)

+ 5 - 1
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)

+ 7 - 6
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 <SvenDowideit@home.org.au>

+ 5 - 4
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 <SvenDowideit@home.org.au>