Merge pull request #18007 from fw-strlen/ipv6_masq_and_dnat

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

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 606a2dd5dbbf637f9b3a7af9e13616c25fffdfda..74ec6a29f189496cd0eada22354ebefac97c4a31 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -744,9 +744,14 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para>
           <listitem><para>Configures IP masquerading for the network
           interface. If enabled, packets forwarded from the network
           interface will be appear as coming from the local host.
-          Takes a boolean argument. Implies
-          <varname>IPForward=ipv4</varname>. Defaults to
-          <literal>no</literal>.</para></listitem>
+          Takes one of <literal>ipv4</literal>, <literal>ipv6</literal>,
+          <literal>both</literal>, <literal>no</literal>.
+          The setting <literal>yes</literal> is the same as <literal>ipv4</literal> and not as
+          <literal>both</literal>!
+          Defaults to <literal>no</literal>.
+          If enabled, this automatically sets <varname>IPForward</varname> to one of
+          <literal>ipv4</literal>, <literal>ipv6</literal> or <literal>both</literal>.
+          </para></listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>IPv6PrivacyExtensions=</varname></term>
@@ -1344,16 +1349,15 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para>
             set, then the gateway address provided by DHCPv4 or IPv6 RA is used.</para>
           </listitem>
         </varlistentry>
-         <varlistentry>
-           <term><varname>GatewayOnLink=</varname></term>
-           <listitem>
-             <para>Takes a boolean. If set to true, the kernel does not have
-             to check if the gateway is reachable directly by the current machine (i.e., the kernel does
-             not need to check if the gateway is attached to the local network), so that we can insert the
-             route in the kernel table without it being complained about. Defaults to <literal>no</literal>.
-             </para>
-           </listitem>
-         </varlistentry>
+        <varlistentry>
+          <term><varname>GatewayOnLink=</varname></term>
+          <listitem>
+            <para>Takes a boolean. If set to true, the kernel does not have to check if the gateway is
+            reachable directly by the current machine (i.e., the kernel does not need to check if the
+            gateway is attached to the local network), so that we can insert the route in the kernel
+            table without it being complained about. Defaults to <literal>no</literal>.</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term><varname>Destination=</varname></term>
           <listitem>
@@ -1926,6 +1930,13 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para>
           </listitem>
         </varlistentry>
 
+        <varlistentry>
+          <term><varname>UseFQDN=</varname></term>
+          <listitem>
+            <para>Equivalent of <varname>UseHostname=</varname> in the [DHCPv4] section.</para>
+          </listitem>
+        </varlistentry>
+
         <varlistentry>
           <term><varname>RouteMetric=</varname></term>
           <listitem>