From 0cd92eae65b31cdbaa19e3cccb0e3234196a6d17 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 26 Mar 2019 13:55:19 -0400 Subject: Resolve review comments Signed-off-by: Matthew Heon --- docs/podman-create.1.md | 4 ++-- docs/podman-run.1.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 289bb71a3..f61deebd2 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -204,7 +204,7 @@ configuration passed to the container. Typically this is necessary when the host DNS configuration is invalid for the container (e.g., 127.0.0.1). When this is the case the **--dns** flags is necessary for every run. -The special sigil **none** can be specified to disable creation of **/etc/resolv.conf** in the container by Podman. +The special value **none** can be specified to disable creation of **/etc/resolv.conf** in the container by Podman. The **/etc/resolv.conf** file in the image will be used without changes. **--dns-option**=[] @@ -465,7 +465,7 @@ Not implemented Do not create /etc/hosts for the container. By default, Podman will manage /etc/hosts, adding the container's own IP address and any hosts from **--add-host**. **--no-hosts** disables this, and the image's **/etc/host** will be preserved unmodified. -This conflicts with **--add-host**. +This option conflicts with **--add-host**. **--oom-kill-disable**=*true*|*false* diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index e045d033c..5a311980f 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -210,7 +210,7 @@ configuration passed to the container. Typically this is necessary when the host DNS configuration is invalid for the container (e.g., 127.0.0.1). When this is the case the **--dns** flags is necessary for every run. -The special sigil **none** can be specified to disable creation of **/etc/resolv.conf** in the container by Podman. +The special value **none** can be specified to disable creation of **/etc/resolv.conf** in the container by Podman. The **/etc/resolv.conf** file in the image will be used without changes. **--dns-option**=[] @@ -449,7 +449,7 @@ Not implemented Do not create /etc/hosts for the container. By default, Podman will manage /etc/hosts, adding the container's own IP address and any hosts from **--add-host**. **--no-hosts** disables this, and the image's **/etc/host** will be preserved unmodified. -This conflicts with **--add-host**. +This option conflicts with **--add-host**. **--oom-kill-disable**=*true*|*false* -- cgit v1.2.3-54-g00ecf