From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 24 Sep 2016 14:56:13 +0000 (-0400)
Subject: Merge pull request #4182 from jkoelker/routetable
X-Git-Tag: v232~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d11e656ace094a812e0f4bc30099e0dddf587164;p=thirdparty%2Fsystemd.git

Merge pull request #4182 from jkoelker/routetable
---

d11e656ace094a812e0f4bc30099e0dddf587164
diff --cc man/systemd.network.xml
index eb7d441842e,2e4d927470e..9c1b10fc5c7
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@@ -917,6 -917,15 +917,15 @@@
              DHCP server.</para>
            </listitem>
          </varlistentry>
+ 
+         <varlistentry>
+           <term><varname>RouteTable=<replaceable>num</replaceable></varname></term>
+           <listitem>
 -            <para>The table identifier for dhcp routes (a number between 1 and 4294967295, or 0 to unset).
++            <para>The table identifier for DHCP routes (a number between 1 and 4294967295, or 0 to unset).
+             The table can be retrieved using <command>ip route show table <replaceable>num</replaceable></command>.
+             </para>
+           </listitem>
+         </varlistentry>
        </variablelist>
      </refsect1>
  
@@@ -957,6 -966,15 +966,16 @@@
              project='man-pages'><refentrytitle>resolv.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
            </listitem>
          </varlistentry>
+ 
+         <varlistentry>
+           <term><varname>RouteTable=<replaceable>num</replaceable></varname></term>
+           <listitem>
 -            <para>The table identifier for dhcp routes (a number between 1 and 4294967295, or 0 to unset).
++            <para>The table identifier for the routes received in the Router Advertisement
++            (a number between 1 and 4294967295, or 0 to unset).
+             The table can be retrieved using <command>ip route show table <replaceable>num</replaceable></command>.
+             </para>
+           </listitem>
+         </varlistentry>
        </variablelist>
    </refsect1>