X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-networkd.service.xml;h=85fa2a4be4f2eae2348d175cd550b40fada69efa;hb=7ed0dd4be6ef4e73d7fb2fc1e80e6f9405c2f257;hp=c3fede8cf70e6e71699bd3f33a29ac1c29d0f870;hpb=e3ab0c0e19227efdf15237dd9136fc6fc7f3839d;p=elogind.git

diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index c3fede8cf..85fa2a4be 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -63,8 +63,7 @@
 
                 <para>To configure low-level link settings independently of
                 networks, see
-                <citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                .</para>
+                <citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
 
                 <para>Network configurations applied before networkd is started
                 are not removed, and static configuration applied by networkd
@@ -73,6 +72,11 @@
                 restarting networkd does not cut the network connection, and, in particular,
                 that it is safe to transition between the initrd and the real root,
                 and back.</para>
+
+                <para>Nameservers configured in networkd, or received over DHCP
+                are exposed in <filename>/run/systemd/network/resolv.conf</filename>.
+                This file should not be used directly, but only through a symlink
+                from <filename>/etc/resolv.conf</filename>.</para>
         </refsect1>
 
         <refsect1><title>Configuration Files</title>
@@ -96,6 +100,7 @@
                         <citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd-network-wait-online.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 </para>
         </refsect1>