X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-networkd.service.xml;h=2c1bbf7de5672b23b439487e15e67daf8b888dab;hp=13443257823aac02feb8549e9b242ff5b812ecea;hb=5be4d38e31281727b6f45ae869136bb01a1f7790;hpb=34a6dc7dcaa47a9efe083acc6f5fc6263414465e

diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 134432578..2c1bbf7de 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -64,8 +64,8 @@
                 <para>Network configurations applied before networkd is started
                 are not removed, and configuration applied by networkd are not
                 removed when networkd exits. This ensures restarting networkd
-                does not cut the network connection, and in particular that it
-                is safe to transition between the initrd and the real root,
+                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>
         </refsect1>
 
@@ -80,10 +80,10 @@
                 identical filenames replace each other. Files in
                 <filename>/etc</filename> have the highest priority, files in
                 <filename>/run</filename> take precedence over files with the same
-                name in <filename>/lib</filename>. This can be used to override a
+                name in <filename>/usr/lib</filename>. This can be used to override a
                 system-supplied configuration file with a local file if needed; a symlink in
                 <filename>/etc</filename> with the same name as a configuration file in
-                <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
+                <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
                 disables the configuration file entirely.</para>
 
                 <refsect2><title>Virtual Network Devices</title>
@@ -168,6 +168,12 @@
                                                 presentation purposes.</para>
                                         </listitem>
                                 </varlistentry>
+                                <varlistentry>
+                                        <term><varname>DHCP</varname></term>
+                                        <listitem>
+                                                <para>A boolean. When true enables basic DHCPv4 support.</para>
+                                        </listitem>
+                                </varlistentry>
                                 <varlistentry>
                                         <term><varname>Address</varname></term>
                                         <listitem>
@@ -175,7 +181,7 @@
                                                 separated by a '/' character. The format of the address must
                                                 be as described in
                                                 <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                                                .</para>
+                                                . This is a short-hand for an [Address] section only containing an Address key (see below).</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>
@@ -183,6 +189,14 @@
                                         <listitem>
                                                 <para>The gateway address, which must be in the format described in
                                                 <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+                                                . This is a short-hand for a [Route] section only containing a Gateway key.</para>
+                                        </listitem>
+                                </varlistentry>
+                                <varlistentry>
+                                        <term><varname>DNS</varname></term>
+                                        <listitem>
+                                                <para>A DNS server address, which must be in the format described in
+                                                <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
                                                 .</para>
                                         </listitem>
                                 </varlistentry>
@@ -200,7 +214,7 @@
                                 <varlistentry>
                                         <term><varname>Address</varname></term>
                                         <listitem>
-                                                <para>As in the <literal>[Network]</literal> section.</para>
+                                                <para>As in the <literal>[Network]</literal> section. This key is mandatory.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>
@@ -209,7 +223,38 @@
                                                 <para>An address label.</para>
                                         </listitem>
                                 </varlistentry>
+                        </variablelist>
+
+                        <para>The <literal>[Route]</literal> section accepts the following keys:</para>
+
+                        <variablelist class='network-directives'>
+                                <varlistentry>
+                                        <term><varname>Gateway</varname></term>
+                                        <listitem>
+                                                <para>As in the <literal>[Network]</literal> section. This key is mandatory.</para>
+                                        </listitem>
+                                </varlistentry>
+                                <varlistentry>
+                                        <term><varname>Destination</varname></term>
+                                        <listitem>
+                                                <para>The destination prefix of the route. Possibly followed by a slash and the
+                                                prefixlength, if ommitted a full-length host route is assumed.</para>
+                                        </listitem>
+                                </varlistentry>
+                        </variablelist>
+
+                        <para>The <literal>[DHCPv4]</literal> section accepts the following keys:</para>
+
+                        <variablelist class='network-directives'>
+                                <varlistentry>
+                                        <term><varname>UseDNS</varname></term>
+                                        <listitem>
+                                                <para>When true (the default) the DNS servers received from the DHCP server will
+                                                be used, and take precedence over any statically configured ones.</para>
+                                        </listitem>
+                                </varlistentry>
                        </variablelist>
+
                 </refsect2>
         </refsect1>