More documentation cleanup.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-11-10 06:52:14 -08:00
parent 7ebf5a4284
commit 83d373c0aa
6 changed files with 26 additions and 25 deletions

View File

@ -148,15 +148,11 @@
<term><emphasis role="bold">blacklist</emphasis></term> <term><emphasis role="bold">blacklist</emphasis></term>
<listitem> <listitem>
<para>This option only makes sense for ports on a bridge. As <para>This option is deprecated in Shorewall 4.4.25 in favor
of Shoreawall 4.4.13, the option is no longer supported and is of entries in <ulink
ignored with a warning:</para> url="shorewall-blrules.html">shorewall-blrules</ulink> (5) or
in the BLACKLIST section of <ulink
<blockquote> url="shorewall-rules.html">shorewall-rules </ulink>(5).</para>
<para><emphasis role="bold">WARNING: The "blacklist" host
option is no longer supported and will be
ignored.</emphasis></para>
</blockquote>
<para>Check packets arriving on this port against the <ulink <para>Check packets arriving on this port against the <ulink
url="shorewall-blacklist.html">shorewall-blacklist</ulink>(5) url="shorewall-blacklist.html">shorewall-blacklist</ulink>(5)

View File

@ -230,9 +230,11 @@ loc eth2 -</programlisting>
<listitem> <listitem>
<para>Deprecated in Shorewall 4.4.25 and later in favor of <para>Deprecated in Shorewall 4.4.25 and later in favor of
rules in the BLACKLIST section of <ulink rules in the BLACKLIST section of <ulink
url="shorewall-rules.html">shorewall-rules</ulink> (5). Checks url="shorewall-rules.html">shorewall-rules</ulink> (5) or in
packets arriving on this interface against the <ulink <ulink url="shorewall-blrules.html">shorewall-blrules</ulink>
url="shorewall6-blacklist.html">shorewall6-blacklist</ulink>(5) (5). Checks packets arriving on this interface against the
<ulink
url="shorewall-blacklist.html">shorewall-blacklist</ulink>(5)
file.</para> file.</para>
<para>Beginning with Shorewall 4.4.13:</para> <para>Beginning with Shorewall 4.4.13:</para>

View File

@ -209,7 +209,9 @@ c:a,b ipv4</programlisting>
<listitem> <listitem>
<para>Added in Shorewall 4.4.13. Deprecated in Shorewall <para>Added in Shorewall 4.4.13. Deprecated in Shorewall
4.4.25 and later in favor of rules in the BLACKLIST section of 4.4.25 and later in favor of rules in the BLACKLIST section of
<ulink url="shorewall-rules.html">shorewall-rules</ulink> (5). <ulink url="shorewall-rules.html">shorewall-rules</ulink> (5)
or in <ulink
url="shorewall-blrules.html">shorewall-blrules</ulink> (5).
May not be specified for <emphasis May not be specified for <emphasis
role="bold">firewall</emphasis> or <emphasis role="bold">firewall</emphasis> or <emphasis
role="bold">vserver</emphasis> zones.</para> role="bold">vserver</emphasis> zones.</para>

View File

@ -137,15 +137,12 @@
<term><emphasis role="bold">blacklist</emphasis></term> <term><emphasis role="bold">blacklist</emphasis></term>
<listitem> <listitem>
<para>This option only makes sense for ports on a bridge. As <para>This option is deprecated in Shorewall 4.4.25 in favor
of Shorewall 4.4.13, its is ignored with a warning of entries in <ulink
message:</para> url="shorewall6-blrules.html">shorewall6-blrules</ulink> (5)
or in the BLACKLIST section of <ulink
<blockquote> url="shorewall6-rules.html">shorewall6-rules
<para><emphasis role="bold">WARNING: The "blacklist" host </ulink>(5).</para>
option is no longer supported and will be
ignored.</emphasis></para>
</blockquote>
<para>Check packets arriving on this port against the <ulink <para>Check packets arriving on this port against the <ulink
url="shorewall-blacklist.html">shorewall6-blacklist</ulink>(5) url="shorewall-blacklist.html">shorewall6-blacklist</ulink>(5)

View File

@ -122,8 +122,10 @@ loc eth2 -</programlisting>
<listitem> <listitem>
<para>Deprecated in Shorewall 4.4.25 and later in favor of <para>Deprecated in Shorewall 4.4.25 and later in favor of
rules in the BLACKLIST section of <ulink rules in the BLACKLIST section of <ulink
url="shorewall6-rules.html">shorewall6-rules</ulink> (5). url="shorewall6-rules.html">shorewall6-rules</ulink> (5) or
Check packets arriving on this interface against the <ulink in<ulink url="shorewall6-blrules.html"> shorewall6-blrules
</ulink>(5). Check packets arriving on this interface against
the <ulink
url="shorewall6-blacklist.html">shorewall6-blacklist</ulink>(5) url="shorewall6-blacklist.html">shorewall6-blacklist</ulink>(5)
file.</para> file.</para>

View File

@ -208,7 +208,9 @@ c:a,b ipv6</programlisting>
<para>Added in Shorewall 4.4.13. Deprecated in Shorewall <para>Added in Shorewall 4.4.13. Deprecated in Shorewall
4.4.25 and later in favor of rules in the BLACKLIST section of 4.4.25 and later in favor of rules in the BLACKLIST section of
<ulink url="shorewall6-rules.html">shorewall6-rules</ulink> <ulink url="shorewall6-rules.html">shorewall6-rules</ulink>
(5). May not be specified for <emphasis (5) or in <ulink
url="shorewall6-blrules.html">shorewall6-blrules </ulink>(5).
May not be specified for <emphasis
role="bold">firewall</emphasis> or <emphasis role="bold">firewall</emphasis> or <emphasis
role="bold">vserver</emphasis> zones.</para> role="bold">vserver</emphasis> zones.</para>