Reverse 4.4.25 Deprecations

Signed-off-by: Tom Eastep <teastep@shorewall.net>

manpages/shorewall-hosts.xml

@@ -148,12 +148,6 @@
               <term><emphasis role="bold">blacklist</emphasis></term>
 
               <listitem>
-                <para>This option is deprecated in Shorewall 4.4.25 in favor
-                of entries in <ulink
-                url="shorewall-blrules.html">shorewall-blrules</ulink> (5) or
-                in the BLACKLIST section of <ulink
-                url="shorewall-rules.html">shorewall-rules </ulink>(5).</para>
-
                 <para>Check packets arriving on this port against the <ulink
                 url="shorewall-blacklist.html">shorewall-blacklist</ulink>(5)
                 file.</para>

manpages/shorewall-interfaces.xml

@@ -228,11 +228,7 @@ loc     eth2            -</programlisting>
               <term><emphasis role="bold">blacklist</emphasis></term>
 
               <listitem>
-                <para>Deprecated in Shorewall 4.4.25 and later in favor of
+                <para>Checks packets arriving on this interface against the
-                rules in the BLACKLIST section of <ulink
-                url="shorewall-rules.html">shorewall-rules</ulink> (5) or in
-                <ulink url="shorewall-blrules.html">shorewall-blrules</ulink>
-                (5). Checks packets arriving on this interface against the
                 <ulink
                 url="shorewall-blacklist.html">shorewall-blacklist</ulink>(5)
                 file.</para>
@@ -379,11 +375,8 @@ loc     eth2            -</programlisting>
               <term><emphasis role="bold">maclist</emphasis></term>
 
               <listitem>
-                <para>Deprecated in Shorewall 4.4.25 and later in favor of
+                <para>Connection requests from this interface are compared
-                rules in the BLACKLIST section of <ulink
+                against the contents of <ulink
-                url="shorewall-blacklist.html">shorewall-rules</ulink> (5).
-                Connection requests from this interface are compared against
-                the contents of <ulink
                 url="shorewall-maclist.html">shorewall-maclist</ulink>(5). If
                 this option is specified, the interface must be an ethernet
                 NIC and must be up before Shorewall is started.</para>
@@ -432,9 +425,8 @@ loc     eth2            -</programlisting>
               <term>nosmurfs</term>
 
               <listitem>
-                <para>Deprecated in Shorewall 4.4.25 and later in favor of the
+                <para>Filter packets for smurfs (packets with a broadcast
-                DropSmurfs standard action. Filter packets for smurfs (packets
+                address as the source).</para>
-                with a broadcast address as the source).</para>
 
                 <para>Smurfs will be optionally logged based on the setting of
                 SMURF_LOG_LEVEL in <ulink
@@ -651,13 +643,11 @@ loc     eth2            -</programlisting>
               <term><emphasis role="bold">tcpflags</emphasis></term>
 
               <listitem>
-                <para>Deprecated in Shorewall 4.4.25 and later in favor of the
+                <para>Packets arriving on this interface are checked for
-                TCPFlags standard action. Packets arriving on this interface
+                certain illegal combinations of TCP flags. Packets found to
-                are checked for certain illegal combinations of TCP flags.
+                have such a combination of flags are handled according to the
-                Packets found to have such a combination of flags are handled
+                setting of TCP_FLAGS_DISPOSITION after having been logged
-                according to the setting of TCP_FLAGS_DISPOSITION after having
+                according to the setting of TCP_FLAGS_LOG_LEVEL.</para>
-                been logged according to the setting of
-                TCP_FLAGS_LOG_LEVEL.</para>
               </listitem>
             </varlistentry>
 

manpages/shorewall-zones.xml

@@ -207,13 +207,8 @@ c:a,b     ipv4</programlisting>
               <term><emphasis role="bold">blacklist</emphasis></term>
 
               <listitem>
-                <para>Added in Shorewall 4.4.13. Deprecated in Shorewall
+                <para>Added in Shorewall 4.4.13. May not be specified for
-                4.4.25 and later in favor of rules in the BLACKLIST section of
+                <emphasis role="bold">firewall</emphasis> or <emphasis
-                <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
-                role="bold">firewall</emphasis> or <emphasis
                 role="bold">vserver</emphasis> zones.</para>
 
                 <para>When specified in the IN_OPTIONS column, causes all

manpages6/shorewall6-hosts.xml

@@ -137,13 +137,6 @@
               <term><emphasis role="bold">blacklist</emphasis></term>
 
               <listitem>
-                <para>This option is deprecated in Shorewall 4.4.25 in favor
-                of entries in <ulink
-                url="shorewall6-blrules.html">shorewall6-blrules</ulink> (5)
-                or in the BLACKLIST section of <ulink
-                url="shorewall6-rules.html">shorewall6-rules
-                </ulink>(5).</para>
-
                 <para>Check packets arriving on this port against the <ulink
                 url="shorewall-blacklist.html">shorewall6-blacklist</ulink>(5)
                 file.</para>

manpages6/shorewall6-interfaces.xml

@@ -120,12 +120,8 @@ loc     eth2            -</programlisting>
               <term><emphasis role="bold">blacklist</emphasis></term>
 
               <listitem>
-                <para>Deprecated in Shorewall 4.4.25 and later in favor of
+                <para>Check packets arriving on this interface against the
-                rules in the BLACKLIST section of <ulink
+                <ulink
-                url="shorewall6-rules.html">shorewall6-rules</ulink> (5) or
-                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)
                 file.</para>
 
@@ -385,14 +381,11 @@ loc     eth2            -</programlisting>
               <term><emphasis role="bold">tcpflags</emphasis></term>
 
               <listitem>
-                <para>Deprecated in Shorewall 4.4.25 and later in favor of
+                <para>Packets arriving on this interface are checked for
-                invoking the TCPFlags standard action in <ulink
+                certain illegal combinations of TCP flags. Packets found to
-                url="shorewall6-rules.html">shorewall6-rules</ulink> (5).
+                have such a combination of flags are handled according to the
-                Packets arriving on this interface are checked for certain
+                setting of TCP_FLAGS_DISPOSITION after having been logged
-                illegal combinations of TCP flags. Packets found to have such
+                according to the setting of TCP_FLAGS_LOG_LEVEL.</para>
-                a combination of flags are handled according to the setting of
-                TCP_FLAGS_DISPOSITION after having been logged according to
-                the setting of TCP_FLAGS_LOG_LEVEL.</para>
               </listitem>
             </varlistentry>
 

manpages6/shorewall6-zones.xml

@@ -205,13 +205,8 @@ c:a,b     ipv6</programlisting>
               <term><emphasis role="bold">blacklist</emphasis></term>
 
               <listitem>
-                <para>Added in Shorewall 4.4.13. Deprecated in Shorewall
+                <para>Added in Shorewall 4.4.13. May not be specified for
-                4.4.25 and later in favor of rules in the BLACKLIST section of
+                <emphasis role="bold">firewall</emphasis> or <emphasis
-                <ulink url="shorewall6-rules.html">shorewall6-rules</ulink>
-                (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">vserver</emphasis> zones.</para>
 
                 <para>When specified in the IN_OPTIONS column, causes all