Merge branch '5.2.5'

This commit is contained in:
Tom Eastep 2020-06-20 10:02:53 -07:00
commit c234a1a0ec
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10

View File

@ -79,13 +79,13 @@
<listitem> <listitem>
<para>A FWMARK <emphasis>value</emphasis> used in your <ulink <para>A FWMARK <emphasis>value</emphasis> used in your <ulink
url="shorewall-mangle.html">shorewall-mangle(5)</ulink> url="shorewall-mangle.html">shorewall-mangle(5)</ulink> file to
file to direct packets to this provider.</para> direct packets to this provider.</para>
<para>If PROVIDER_OFFSET is non-zero in <ulink <para>If PROVIDER_OFFSET is non-zero in <ulink
url="shorewall.conf.html">shorewall.conf(5)</ulink>, then url="shorewall.conf.html">shorewall.conf(5)</ulink>, then the value
the value must be a multiple of 2^^PROVIDER_OFFSET. In all cases, must be a multiple of 2^^PROVIDER_OFFSET. In all cases, the number
the number of significant bits may not exceed PROVIDER_OFFSET + of significant bits may not exceed PROVIDER_OFFSET +
PROVIDER_BITS.</para> PROVIDER_BITS.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -111,8 +111,8 @@
<listitem> <listitem>
<para>The name of the network interface to the provider. Must be <para>The name of the network interface to the provider. Must be
listed in <ulink listed in <ulink
url="shorewall-interfaces.html">shorewall-interfaces(5)</ulink>. url="shorewall-interfaces.html">shorewall-interfaces(5)</ulink>. In
In general, that interface should not have the general, that interface should not have the
<option>proxyarp</option> or <option>proxyndp</option> option <option>proxyarp</option> or <option>proxyndp</option> option
specified unless <option>loose</option> is given in the OPTIONS specified unless <option>loose</option> is given in the OPTIONS
column of this entry.</para> column of this entry.</para>
@ -190,9 +190,8 @@
<para>Beginning with Shorewall 4.4.3, <option>track</option> <para>Beginning with Shorewall 4.4.3, <option>track</option>
defaults to the setting of the TRACK_PROVIDERS option in defaults to the setting of the TRACK_PROVIDERS option in
<ulink <ulink url="shorewall.conf.html">shorewall.conf</ulink> (5).
url="shorewall.conf.html">shorewall.conf</ulink> If you set TRACK_PROVIDERS=Yes and want to override that
(5). If you set TRACK_PROVIDERS=Yes and want to override that
setting for an individual provider, then specify setting for an individual provider, then specify
<option>notrack</option> (see below).</para> <option>notrack</option> (see below).</para>
</listitem> </listitem>
@ -343,7 +342,7 @@
<replaceable>weight</replaceable> is given, a balanced route <replaceable>weight</replaceable> is given, a balanced route
is added with the weight of this provider equal to the is added with the weight of this provider equal to the
specified <replaceable>weight</replaceable>. If the option is specified <replaceable>weight</replaceable>. If the option is
given without a <replaceable>weight</replaceable>, an separate given without a <replaceable>weight</replaceable>, a separate
default route is added through the provider's gateway; the default route is added through the provider's gateway; the
route has a metric equal to the provider's NUMBER.</para> route has a metric equal to the provider's NUMBER.</para>