X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-resolved.service.xml;h=c44b10c4722a69dff4578177c34907403e9973fc;hp=cd73cb73c7ee9edf6aa2b33967c7ec99231e3546;hb=9b15b7846d4de01bb5d9700a24077787e984e8ab;hpb=091a364c802e34a58f3260c9cb5db9b75c62215c

diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index cd73cb73c..c44b10c47 100644
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -56,27 +56,33 @@
         <refsect1>
                 <title>Description</title>
 
-                <para><command>systemd-networkd</command> is a system
-                service that manages network name resolution. It does so by
-		generating <filename>/run/systemd/network/resolv.conf</filename>,
-		which may be symlinked from <filename>/etc/resolv.conf</filename>.
-		The contents is generated from the global settings in
+                <para><command>systemd-resolved</command> is a system
+                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>.</para>
+
+                <para>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>
+                for more details.</para>
 
-                <para>Note that <filename>/run/systemd/network/resolv.conf</filename>
+                <para>Note that <filename>/run/systemd/resolve/resolv.conf</filename>
                 should not be used directly, but only through a symlink from
-		<filename>/etc/resolv.conf</filename>.</para>
+                <filename>/etc/resolv.conf</filename>.</para>
         </refsect1>
 
         <refsect1>
                 <title>See Also</title>
                 <para>
-			<citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 </para>