From 9f2912db7887d82f95183d51f4af4db99454f6f4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 24 Nov 2015 16:44:02 +0100 Subject: 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. --- man/resolved.conf.xml | 9 +++++---- 1 file 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 systemd-networkd.service8. - For compatibility reasons, if set to the empty list, the DNS - servers listed in /etc/resolv.conf are - used, if any are configured there. This setting defaults to - the empty list. + For compatibility reasons, if this setting is not specified, , + the DNS servers listed in + /etc/resolv.conf are used instead, if + that file exists and any servers are configured in it. This + setting defaults to the empty list. -- cgit v1.2.3-54-g00ecf