X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.network.xml;h=f80212944df3e1d86640eb64c500659288c0b95e;hb=b16665806a448186f432b47e944f1682284a0182;hp=8b2dd2f1de55180a05384592a38a818a93033ba8;hpb=102bd40e1ed71c7ab980a90435a1c23d4c786c63;p=elogind.git

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 8b2dd2f1d..f80212944 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -195,7 +195,9 @@
                                 <varlistentry>
                                         <term><varname>DHCP=</varname></term>
                                         <listitem>
-                                                <para>A boolean. When true, enables basic DHCPv4 support.</para>
+                                                <para>Enables DHCPv4 and/or DHCPv6 support. Accepts
+                                                <literal>both</literal>, <literal>none</literal>,
+                                                <literal>v4</literal> or <literal>v6</literal>.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>
@@ -224,7 +226,7 @@
                                                 <para>If the specified
                                                 address is 0.0.0.0
                                                 (for IPv4) or [::]
-                                                (for IPv6) a new
+                                                (for IPv6), a new
                                                 address range of the
                                                 requested size is
                                                 automatically
@@ -237,14 +239,14 @@
                                                 interfaces and all
                                                 known network
                                                 configuration files to
-                                                avoid IP range
+                                                avoid address range
                                                 conflicts. The default
                                                 system-wide pool
                                                 consists of
                                                 192.168.0.0/16,
                                                 172.16.0.0/12 and
                                                 10.0.0.0/8 for IPv4,
-                                                and [fc00::] for
+                                                and fc00::/7 for
                                                 IPv6. This
                                                 functionality is
                                                 useful to manage a
@@ -361,8 +363,8 @@
         </refsect1>
 
         <refsect1>
-                <title>[DHCPv4] Section Options</title>
-                        <para>The <literal>[DHCPv4]</literal> section accepts the following keys:</para>
+                <title>[DHCP] Section Options</title>
+                        <para>The <literal>[DHCP]</literal> section accepts the following keys:</para>
 
                         <variablelist class='network-directives'>
                                 <varlistentry>
@@ -386,6 +388,13 @@
                                                 will be used as the transient hostname.</para>
                                         </listitem>
                                 </varlistentry>
+                                <varlistentry>
+                                        <term><varname>UseRoutes=</varname></term>
+                                        <listitem>
+                                                <para>When true (the default), the static routes will be requested from the DHCP server
+                                                and added to the routing table with metric of 1024.</para>
+                                        </listitem>
+                                </varlistentry>
                                 <varlistentry>
                                         <term><varname>CriticalConnection=</varname></term>
                                         <listitem>