man: fix documentation how /etc/resolv.conf is read
authorLennart Poettering <lennart@poettering.net>
Tue, 24 Nov 2015 15:44:02 +0000 (16:44 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 25 Nov 2015 20:58:37 +0000 (21:58 +0100)
/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.

man/resolved.conf.xml

index 811e33f..c9034a9 100644 (file)
         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>