Merge pull request #26707 from thaJeztah/revert-26320

[1.12.x] Revert "Merge pull request #26320 from yongtang/09052016-man-docker-c…
This commit is contained in:
Sebastiaan van Stijn 2016-09-19 17:16:17 +02:00 committed by Sebastiaan van Stijn
commit e646e927ee

View file

@ -64,7 +64,6 @@ docker-create - Create a new container
[**--privileged**]
[**--read-only**]
[**--restart**[=*RESTART*]]
[**--rm**]
[**--security-opt**[=*[]*]]
[**--storage-opt**[=*[]*]]
[**--stop-signal**[=*SIGNAL*]]
@ -318,9 +317,6 @@ unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
**--restart**="*no*"
Restart policy to apply when a container exits (no, on-failure[:max-retry], always, unless-stopped).
**--rm**=*true*|*false*
Automatically remove the container when it exits. The default is *false*.
**--shm-size**=""
Size of `/dev/shm`. The format is `<number><unit>`. `number` must be greater than `0`.
Unit is optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you omit the unit, the system uses bytes.