From 71f1205269494430116e7a564ee76bfa0bfccc63 Mon Sep 17 00:00:00 2001 From: Yanqiang Miao Date: Tue, 29 Nov 2016 11:09:28 +0800 Subject: [PATCH] Fix some format errors Signed-off-by: Yanqiang Miao update Signed-off-by: Yanqiang Miao --- docs/reference/run.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/reference/run.md b/docs/reference/run.md index 64725e8f26..909e58e2f9 100644 --- a/docs/reference/run.md +++ b/docs/reference/run.md @@ -345,13 +345,13 @@ Supported networks : container:<name|id> Use the network stack of another container, specified via - its *name* or *id*. + its name or id. NETWORK - Connects the container to a user created network (using `docker network create` command) + Connects the container to a user created network (using docker network create command) @@ -624,15 +624,15 @@ but the volume for `/bar` will not. Volumes inherited via `--volumes-from` will with the same logic -- if the original volume was specified with a name it will **not** be removed. ## Security configuration - --security-opt="label=user:USER" : Set the label user for the container - --security-opt="label=role:ROLE" : Set the label role for the container - --security-opt="label=type:TYPE" : Set the label type for the container - --security-opt="label=level:LEVEL" : Set the label level for the container - --security-opt="label=disable" : Turn off label confinement for the container - --security-opt="apparmor=PROFILE" : Set the apparmor profile to be applied to the container - --security-opt="no-new-privileges" : Disable container processes from gaining new privileges - --security-opt="seccomp=unconfined": Turn off seccomp confinement for the container - --security-opt="seccomp=profile.json: White listed syscalls seccomp Json file to be used as a seccomp filter + --security-opt="label=user:USER" : Set the label user for the container + --security-opt="label=role:ROLE" : Set the label role for the container + --security-opt="label=type:TYPE" : Set the label type for the container + --security-opt="label=level:LEVEL" : Set the label level for the container + --security-opt="label=disable" : Turn off label confinement for the container + --security-opt="apparmor=PROFILE" : Set the apparmor profile to be applied to the container + --security-opt="no-new-privileges" : Disable container processes from gaining new privileges + --security-opt="seccomp=unconfined" : Turn off seccomp confinement for the container + --security-opt="seccomp=profile.json": White listed syscalls seccomp Json file to be used as a seccomp filter You can override the default labeling scheme for each container by specifying @@ -737,7 +737,7 @@ We have four ways to set user memory usage: memory=L<inf, memory-swap=2*L (specify memory without memory-swap) The container is not allowed to - use more than L bytes of memory, swap *plus* memory usage is double + use more than L bytes of memory, swap plus memory usage is double of that. @@ -747,7 +747,7 @@ We have four ways to set user memory usage: (specify both memory and memory-swap) The container is not allowed to - use more than L bytes of memory, swap *plus* memory usage is limited + use more than L bytes of memory, swap plus memory usage is limited by S.