opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-19 12:56:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve documentation wording

Browse Source 
Relax _will_ to _may_ and add a clarifying _then_.

Furthermore, we add a paragraph describing the behavior of the `--dns`
command line option.  This references #26812.

Signed-off-by: Christoph Weiss <weiss@wsoptics.de>
This commit is contained in:
Christoph Weiss
2025-08-13 11:48:44 +02:00
parent acb75ca6c1
commit 249fa21e8a
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/locale/ja/LC_MESSAGES/markdown.po
View File

@ -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 "

5
docs/source/markdown/options/dns.md
View File

@ -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.

2
docs/source/markdown/podman-run.1.md.in
View File

@ -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