diff --git a/docs/source/locale/ja/LC_MESSAGES/markdown.po b/docs/source/locale/ja/LC_MESSAGES/markdown.po index 76b1fbeb96..649857577d 100644 --- a/docs/source/locale/ja/LC_MESSAGES/markdown.po +++ b/docs/source/locale/ja/LC_MESSAGES/markdown.po @@ -2661,7 +2661,7 @@ msgstr "" msgid "" "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 is used without changes." +"file in the image is then used without changes." msgstr "" #: ../../source/markdown/podman-build.1.md:454 @@ -25046,7 +25046,7 @@ msgid "" "Several files will be automatically created within the container. These " "include _/etc/hosts_, _/etc/hostname_, and _/etc/resolv.conf_ to manage " "networking. These will be based on the host's version of the files, " -"though they can be customized with options (for example, **--dns** will " +"though they can be customized with options (for example, **--dns** may " "override the host's DNS servers in the created _resolv.conf_). " "Additionally, a container environment file is created in each container " "to indicate to programs they are running in a container. This file is " diff --git a/docs/source/markdown/options/dns.md b/docs/source/markdown/options/dns.md index ece952fc87..a02a18e6e5 100644 --- a/docs/source/markdown/options/dns.md +++ b/docs/source/markdown/options/dns.md @@ -12,4 +12,7 @@ host DNS configuration is invalid for the container (e.g., **127.0.0.1**). When is the case the **--dns** flag is necessary for every run. 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 is used without changes. +The _/etc/resolv.conf_ file in the image is then used without changes. + +Note that **ipaddr** may be added directly to the container's _/etc/resolv.conf_. +This is not guaranteed though. For example, passing a custom network whose *dns_enabled* is set to *true* to **--network** will result in _/etc/resolv.conf_ only referring to the aardvark-dns server. aardvark-dns then forwards to the supplied **ipaddr** for all non-container name queries. diff --git a/docs/source/markdown/podman-run.1.md.in b/docs/source/markdown/podman-run.1.md.in index ab48b0d08a..41c5a1237a 100644 --- a/docs/source/markdown/podman-run.1.md.in +++ b/docs/source/markdown/podman-run.1.md.in @@ -25,7 +25,7 @@ pull** _image_, before it starts the container from that image. Several files will be automatically created within the container. These include _/etc/hosts_, _/etc/hostname_, and _/etc/resolv.conf_ to manage networking. These will be based on the host's version of the files, though they can be -customized with options (for example, **--dns** will override the host's DNS +customized with options (for example, **--dns** may override the host's DNS servers in the created _resolv.conf_). Additionally, a container environment file is created in each container to indicate to programs they are running in a container. This file is located at _/run/.containerenv_ (or