Update doc wording for ulimits.

and move tests to the correct module

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-11-10 13:37:07 -05:00
commit 7365a398b3
3 changed files with 45 additions and 33 deletions

View file

@ -335,8 +335,9 @@ Override the default labeling scheme for each container.
### ulimits
Override the default ulimits for a container. You can either use a number
to set the hard and soft limits, or specify them in a dictionary.
Override the default ulimits for a container. You can either specify a single
limit as an integer or soft/hard limits as a mapping.
ulimits:
nproc: 65535