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

diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml
index cd73cb73c..89ec5f8b1 100644
--- a/man/systemd-resolved.service.xml
+++ b/man/systemd-resolved.service.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -23,63 +23,68 @@
 
 <refentry id="systemd-resolved.service" conditional='ENABLE_RESOLVED'>
 
-        <refentryinfo>
-                <title>systemd-resolved.service</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Tom</firstname>
-                                <surname>Gundersen</surname>
-                                <email>teg@jklm.no</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>systemd-resolved.service</refentrytitle>
-                <manvolnum>8</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>systemd-resolved.service</refname>
-                <refname>systemd-resolved</refname>
-                <refpurpose>Network Name Resolution manager</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <para><filename>systemd-resolved.service</filename></para>
-                <para><filename>/usr/lib/systemd/systemd-resolved</filename></para>
-        </refsynopsisdiv>
-
-        <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
-                <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
-                <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-		for more details.</para>
-
-                <para>Note that <filename>/run/systemd/network/resolv.conf</filename>
-                should not be used directly, but only through a symlink from
-		<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>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-                </para>
-        </refsect1>
+  <refentryinfo>
+    <title>systemd-resolved.service</title>
+    <productname>systemd</productname>
+
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Tom</firstname>
+        <surname>Gundersen</surname>
+        <email>teg@jklm.no</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>systemd-resolved.service</refentrytitle>
+    <manvolnum>8</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>systemd-resolved.service</refname>
+    <refname>systemd-resolved</refname>
+    <refpurpose>Network Name Resolution manager</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <para><filename>systemd-resolved.service</filename></para>
+    <para><filename>/usr/lib/systemd/systemd-resolved</filename></para>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <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
+    <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+    for more details.</para>
+
+    <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>
+  </refsect1>
+
+  <refsect1>
+    <title>See Also</title>
+    <para>
+      <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>
+  </refsect1>
 
 </refentry>