From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 10 Aug 2014 21:40:18 +0000 (+0200)
Subject: man: update resolved man pages a bit
X-Git-Tag: v216~213
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=31a339fd7f0e87376bade9ebd7ae32c58d34cf85

man: update resolved man pages a bit
---

diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 6e0185bf4..c58236856 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -56,8 +56,8 @@
 
                 <para>When starting, systemd-resolved will read the
                 configuration file <filename>resolved.conf</filename>.
-                This configuration file controls local DNS name
-                resolving.</para>
+                This configuration file controls local DNS and LLMNR
+                name resolving.</para>
 
         </refsect1>
 
diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index 839f46a12..dc0e3b6e3 100644
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -57,13 +57,17 @@
                 <title>Description</title>
 
                 <para><command>systemd-resolved</command> is a system
-                service that manages network name resolution. It does so by
-                generating <filename>/run/systemd/resolve/resolv.conf</filename>,
-                which may be symlinked from <filename>/etc/resolv.conf</filename>.
-                The contents is generated from the global settings in
+                service that manages network name resolution. It
+                implements a caching DNS stub resolver and an LLMNR
+                resolver and responder. It also generates
+                <filename>/run/systemd/resolve/resolv.conf</filename>
+                for compatibility which may be symlinked from
+                <filename>/etc/resolv.conf</filename>.  The DNS servers contacted
+                are determined from the global settings in
                 <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-                the per-link static settings in <filename>.network</filename> files,
-                and the per-link dynamic settings received over DHCP. See
+                the per-link static settings in
+                <filename>.network</filename> files, and the per-link
+                dynamic settings received over DHCP. See
                 <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 for more details.</para>