From: Lennart Poettering Date: Tue, 12 Aug 2014 17:49:15 +0000 (+0200) Subject: man: minimal updates to resolved.conf man page X-Git-Tag: v216~170 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7964ca43478d8c69263dd8de244131c97bb4cedd;p=elogind.git man: minimal updates to resolved.conf man page --- diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index dc0e3b6e3..c44b10c47 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -62,8 +62,10 @@ resolver and responder. It also generates /run/systemd/resolve/resolv.conf for compatibility which may be symlinked from - /etc/resolv.conf. The DNS servers contacted - are determined from the global settings in + /etc/resolv.conf. + + The DNS servers contacted are determined from + the global settings in resolved.conf5, the per-link static settings in .network files, and the per-link @@ -79,8 +81,8 @@ See Also - resolved.conf5, systemd1, + resolved.conf5, systemd.network5, systemd-networkd.service8