man: file-hierarchy - minor fixes

[elogind.git] / man / systemd.network.xml

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 349ccc5dc91a8537291289c6e9114a9c0d433082..f80212944df3e1d86640eb64c500659288c0b95e 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -78,6 +78,11 @@
                 <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
                 disables the configuration file entirely.</para>
 
                 <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
                 disables the configuration file entirely.</para>
 

+        </refsect1>
+
+        <refsect1>
+                <title>[Match] Section Options</title>
+

                         <para>The network file contains a <literal>[Match]</literal> section,
                         which determines if a given network file may be applied to a given device;
                         and a <literal>[Network]</literal> section specifying how the device should
                         <para>The network file contains a <literal>[Match]</literal> section,
                         which determines if a given network file may be applied to a given device;
                         and a <literal>[Network]</literal> section specifying how the device should


@@ -172,6 +177,11 @@
                                 </varlistentry>
                         </variablelist>
 
                                 </varlistentry>
                         </variablelist>
 

+        </refsect1>
+
+        <refsect1>
+                <title>[Network] Section Options</title>
+

                         <para>The <literal>[Network]</literal> section accepts the following keys:</para>
 
                         <variablelist class='network-directives'>
                         <para>The <literal>[Network]</literal> section accepts the following keys:</para>
 
                         <variablelist class='network-directives'>


@@ -185,7 +195,9 @@
                                 <varlistentry>
                                         <term><varname>DHCP=</varname></term>
                                         <listitem>
                                 <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>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>


@@ -214,7 +226,7 @@
                                                 <para>If the specified
                                                 address is 0.0.0.0
                                                 (for IPv4) or [::]
                                                 <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
                                                 address range of the
                                                 requested size is
                                                 automatically


@@ -227,14 +239,14 @@
                                                 interfaces and all
                                                 known network
                                                 configuration files to
                                                 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,
                                                 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
                                                 IPv6. This
                                                 functionality is
                                                 useful to manage a


@@ -294,6 +306,11 @@
                                 </varlistentry>
                         </variablelist>
 
                                 </varlistentry>
                         </variablelist>
 

+        </refsect1>
+
+        <refsect1>
+                <title>[Address] Section Options</title>
+

                         <para>An <literal>[Address]</literal> section accepts the following keys.
                         Specify several <literal>[Address]</literal> sections to configure several
                         addresses.</para>
                         <para>An <literal>[Address]</literal> section accepts the following keys.
                         Specify several <literal>[Address]</literal> sections to configure several
                         addresses.</para>


@@ -321,7 +338,10 @@
                                         </listitem>
                                 </varlistentry>
                         </variablelist>
                                         </listitem>
                                 </varlistentry>
                         </variablelist>

+        </refsect1>

 
 

+        <refsect1>
+                <title>[Route] Section Options</title>

                         <para>The <literal>[Route]</literal> section accepts the following keys. Specify
                         several <literal>[Route]</literal> sections to configure several routes.</para>
 
                         <para>The <literal>[Route]</literal> section accepts the following keys. Specify
                         several <literal>[Route]</literal> sections to configure several routes.</para>
 


@@ -340,8 +360,11 @@
                                         </listitem>
                                 </varlistentry>
                         </variablelist>
                                         </listitem>
                                 </varlistentry>
                         </variablelist>

+        </refsect1>

 
 

-                        <para>The <literal>[DHCPv4]</literal> section accepts the following keys:</para>
+        <refsect1>
+                <title>[DHCP] Section Options</title>
+                        <para>The <literal>[DHCP]</literal> section accepts the following keys:</para>

 
                         <variablelist class='network-directives'>
                                 <varlistentry>
 
                         <variablelist class='network-directives'>
                                 <varlistentry>


@@ -365,6 +388,13 @@
                                                 will be used as the transient hostname.</para>
                                         </listitem>
                                 </varlistentry>
                                                 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>
                                 <varlistentry>
                                         <term><varname>CriticalConnection=</varname></term>
                                         <listitem>