summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaja Melan <najamelan@autistici.org>2018-08-31 11:25:55 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-31 13:52:11 +0000
commitde414c4354633276bd1997359eb9d70130dbc57c (patch)
tree97c51f4b1d27e7cb83b3432a2609a7cdcd91df3c
parent357eff7235fba45a99c79f68d9d995b7aa9df8d4 (diff)
downloadpodman-de414c4354633276bd1997359eb9d70130dbc57c.tar.gz
podman-de414c4354633276bd1997359eb9d70130dbc57c.tar.bz2
podman-de414c4354633276bd1997359eb9d70130dbc57c.zip
fixup A few language changes and subuid(5)
Signed-off-by: Naja Melan <najamelan@autistici.org> Closes: #1380 Approved by: rhatdan
-rw-r--r--docs/podman-run.1.md16
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index 41d37ee17..7b23f356f 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -255,8 +255,8 @@ on the host system.
**--gidmap**=container_gid:host_gid:amount
**--gidmap**=0:30000:2000
-Run the container in a new user namespace with the supplied mapping. This option conflicts with the --userns and --subgidname flags.
-This option can be passed several times to map different ranges. If calling podman run as an unprivileged user, the user needs to have the right to use the mapping. See `man subuid`.
+Run the container in a new user namespace using the supplied mapping. This option conflicts with the --userns and --subgidname flags.
+This option can be passed several times to map different ranges. If calling podman run as an unprivileged user, the user needs to have the right to use the mapping. See `subuid(5)`.
The example maps gids 0-2000 in the container to the gids 30000-31999 on the host.
**--group-add**=[]
@@ -546,13 +546,13 @@ Signal to stop a container. Default is SIGTERM.
Timeout (in seconds) to stop a container. Default is 10.
**--subgidname**=name
-Run the container in a new user namespace from the map with 'name' in the `/etc/subgid` file.
-If calling podman run as an unprivileged user, the user needs to have the right to use the mapping. See `man subgid`.
+Run the container in a new user namespace using the map with 'name' in the `/etc/subgid` file.
+If calling podman run as an unprivileged user, the user needs to have the right to use the mapping. See `subgid(5)`.
This flag conflicts with `--userns` and `--gidmap`.
**--subuidname**=name
-Run the container in a new user namespace from the map with 'name' in the `/etc/subuid` file.
-If calling podman run as an unprivileged user, the user needs to have the right to use the mapping. See `man subuid`.
+Run the container in a new user namespace using the map with 'name' in the `/etc/subuid` file.
+If calling podman run as an unprivileged user, the user needs to have the right to use the mapping. See `subuid(5)`.
This flag conflicts with `--userns` and `--uidmap`.
**--sysctl**=SYSCTL
@@ -603,8 +603,8 @@ standard input.
**--uidmap**=container_uid:host_uid:amount
**--uidmap**=0:30000:2000
-Run the container in a new user namespace with the supplied mapping. This option conflicts with the --userns and --subuidname flags.
-This option can be passed several times to map different ranges. If calling podman run as an unprivileged user, the user needs to have the right to use the mapping. See `man subuid`.
+Run the container in a new user namespace using the supplied mapping. This option conflicts with the --userns and --subuidname flags.
+This option can be passed several times to map different ranges. If calling podman run as an unprivileged user, the user needs to have the right to use the mapping. See `subuid(5)`.
The example maps uids 0-2000 in the container to the uids 30000-31999 on the host.
**--ulimit**=[]