summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-24 16:44:02 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-25 21:58:37 +0100
commit9f2912db7887d82f95183d51f4af4db99454f6f4 (patch)
tree11671a5735fa49bad6b87641732c8e9be5155233 /man
parent703e4f5e39c019da8c002ba10bd450ce378c0e91 (diff)
man: fix documentation how /etc/resolv.conf is read
/etc/resolv.conf is only read when the DNS= setting does not appear at all in resolved.conf, regardless if set to the empty list or anything else. Correct that in the man page.
Diffstat (limited to 'man')
-rw-r--r--man/resolved.conf.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 811e33f4fa..c9034a979f 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -77,10 +77,11 @@
sent to one of the listed DNS servers in parallel to any
per-interface DNS servers acquired from
<citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
- For compatibility reasons, if set to the empty list, the DNS
- servers listed in <filename>/etc/resolv.conf</filename> are
- used, if any are configured there. This setting defaults to
- the empty list.</para></listitem>
+ For compatibility reasons, if this setting is not specified, ,
+ the DNS servers listed in
+ <filename>/etc/resolv.conf</filename> are used instead, if
+ that file exists and any servers are configured in it. This
+ setting defaults to the empty list.</para></listitem>
</varlistentry>
<varlistentry>