From 7964ca43478d8c69263dd8de244131c97bb4cedd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 12 Aug 2014 19:49:15 +0200 Subject: [PATCH] man: minimal updates to resolved.conf man page --- man/systemd-resolved.service.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index dc0e3b6e3d..c44b10c472 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