Merge pull request #9962 from andi5/fix-doc-cmdline-port

Fix order of pause and port in command line documentation.
This commit is contained in:
Michael Crosby 2015-01-12 13:22:51 -08:00
commit 43a75f5b93
1 changed files with 16 additions and 16 deletions

View File

@ -1328,6 +1328,22 @@ timestamp, for example `2014-09-16T06:17:46.000000000Z`, to each
log entry. To ensure that the timestamps for are aligned the
nano-second part of the timestamp will be padded with zero when necessary.
## pause
Usage: docker pause CONTAINER
Pause all processes within a container
The `docker pause` command uses the cgroups freezer to suspend all processes in
a container. 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.
See the
[cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroups/freezer-subsystem.txt)
for further details.
## port
Usage: docker port CONTAINER [PRIVATE_PORT[/PROTO]]
@ -1350,22 +1366,6 @@ just a specific mapping:
$ sudo docker port test 7890
0.0.0.0:4321
## pause
Usage: docker pause CONTAINER
Pause all processes within a container
The `docker pause` command uses the cgroups freezer to suspend all processes in
a container. 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.
See the
[cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroups/freezer-subsystem.txt)
for further details.
## ps
Usage: docker ps [OPTIONS]