Delete deprecated options from the .conf files

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

Samples/Universal/shorewall.conf

@@ -29,8 +29,6 @@ LOG_VERBOSITY=2
 
 LOGALLNEW=
 
-LOGBURST=
-
 LOGFILE=/var/log/messages
 
 LOGFORMAT="Shorewall:%s:%s:"
@@ -39,8 +37,6 @@ LOGTAGONLY=No
 
 LOGLIMIT=
 
-LOGRATE=
-
 MACLIST_LOG_LEVEL=info
 
 SFILTER_LOG_LEVEL=info
@@ -134,8 +130,6 @@ EXPAND_POLICIES=Yes
 
 EXPORTMODULES=Yes
 
-EXPORTPARAMS=No
-
 FASTACCEPT=Yes
 
 FORWARD_CLEAR_MARK=

Samples/one-interface/shorewall.conf

@@ -40,8 +40,6 @@ LOG_VERBOSITY=2
 
 LOGALLNEW=
 
-LOGBURST=
-
 LOGFILE=/var/log/messages
 
 LOGFORMAT="Shorewall:%s:%s:"
@@ -50,8 +48,6 @@ LOGTAGONLY=No
 
 LOGLIMIT=
 
-LOGRATE=
-
 MACLIST_LOG_LEVEL=info
 
 SFILTER_LOG_LEVEL=info
@@ -145,8 +141,6 @@ EXPAND_POLICIES=Yes
 
 EXPORTMODULES=Yes
 
-EXPORTPARAMS=No
-
 FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=

Samples/three-interfaces/shorewall.conf

@@ -38,8 +38,6 @@ LOG_VERBOSITY=2
 
 LOGALLNEW=
 
-LOGBURST=
-
 LOGFILE=/var/log/messages
 
 LOGFORMAT="Shorewall:%s:%s:"
@@ -48,8 +46,6 @@ LOGTAGONLY=No
 
 LOGLIMIT=
 
-LOGRATE=
-
 MACLIST_LOG_LEVEL=info
 
 SFILTER_LOG_LEVEL=info
@@ -143,8 +139,6 @@ EXPAND_POLICIES=Yes
 
 EXPORTMODULES=Yes
 
-EXPORTPARAMS=No
-
 FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=

Samples/two-interfaces/shorewall.conf

@@ -41,8 +41,6 @@ LOG_VERBOSITY=2
 
 LOGALLNEW=
 
-LOGBURST=
-
 LOGFILE=/var/log/messages
 
 LOGFORMAT="Shorewall:%s:%s:"
@@ -51,8 +49,6 @@ LOGTAGONLY=No
 
 LOGLIMIT=
 
-LOGRATE=
-
 MACLIST_LOG_LEVEL=info
 
 SFILTER_LOG_LEVEL=info
@@ -146,8 +142,6 @@ EXPAND_POLICIES=Yes
 
 EXPORTMODULES=Yes
 
-EXPORTPARAMS=No
-
 FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=

Samples6/Universal/shorewall6.conf

@@ -28,16 +28,12 @@ LOG_VERBOSITY=2
 
 LOGALLNEW=
 
-LOGBURST=
-
 LOGFILE=
 
 LOGFORMAT="Shorewall:%s:%s:"
 
 LOGLIMIT=
 
-LOGRATE=
-
 LOGTAGONLY=No
 
 MACLIST_LOG_LEVEL=info
@@ -125,8 +121,6 @@ EXPAND_POLICIES=Yes
 
 EXPORTMODULES=Yes
 
-EXPORTPARAMS=No
-
 FASTACCEPT=Yes
 
 FORWARD_CLEAR_MARK=

Samples6/one-interface/shorewall6.conf

@@ -28,16 +28,12 @@ LOG_VERBOSITY=2
 
 LOGALLNEW=
 
-LOGBURST=
-
 LOGFILE=
 
 LOGFORMAT="Shorewall:%s:%s:"
 
 LOGLIMIT=
 
-LOGRATE=
-
 LOGTAGONLY=No
 
 MACLIST_LOG_LEVEL=info
@@ -125,8 +121,6 @@ EXPAND_POLICIES=No
 
 EXPORTMODULES=Yes
 
-EXPORTPARAMS=No
-
 FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=

Samples6/three-interfaces/shorewall6.conf

@@ -28,16 +28,12 @@ LOG_VERBOSITY=2
 
 LOGALLNEW=
 
-LOGBURST=
-
 LOGFILE=/var/log/messages
 
 LOGFORMAT="Shorewall:%s:%s:"
 
 LOGLIMIT=
 
-LOGRATE=
-
 LOGTAGONLY=No
 
 MACLIST_LOG_LEVEL=info
@@ -125,8 +121,6 @@ EXPAND_POLICIES=Yes
 
 EXPORTMODULES=Yes
 
-EXPORTPARAMS=No
-
 FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=

Samples6/two-interfaces/shorewall6.conf

@@ -28,16 +28,12 @@ LOG_VERBOSITY=2
 
 LOGALLNEW=
 
-LOGBURST=
-
 LOGFILE=/var/log/messages
 
 LOGFORMAT="Shorewall:%s:%s:"
 
 LOGLIMIT=
 
-LOGRATE=
-
 LOGTAGONLY=No
 
 MACLIST_LOG_LEVEL=info
@@ -125,8 +121,6 @@ EXPAND_POLICIES=No
 
 EXPORTMODULES=Yes
 
-EXPORTPARAMS=No
-
 FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=

Shorewall/configfiles/shorewall.conf

@@ -29,14 +29,10 @@ LOG_VERBOSITY=2
 
 LOGALLNEW=
 
-LOGBURST=
-
 LOGFILE=/var/log/messages
 
 LOGFORMAT="Shorewall:%s:%s:"
 
-LOGRATE=
-
 LOGTAGONLY=No
 
 LOGLIMIT=
@@ -134,8 +130,6 @@ EXPAND_POLICIES=Yes
 
 EXPORTMODULES=Yes
 
-EXPORTPARAMS=No
-
 FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=

Shorewall6/configfiles/shorewall6.conf

@@ -28,16 +28,12 @@ LOG_VERBOSITY=2
 
 LOGALLNEW=
 
-LOGBURST=
-
 LOGFILE=/var/log/messages
 
 LOGFORMAT="Shorewall:%s:%s:"
 
 LOGLIMIT=
 
-LOGRATE=
-
 LOGTAGONLY=No
 
 MACLIST_LOG_LEVEL=info
@@ -125,8 +121,6 @@ EXPAND_POLICIES=Yes
 
 EXPORTMODULES=Yes
 
-EXPORTPARAMS=No
-
 FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=Yes

manpages/shorewall.conf.xml

@@ -576,10 +576,11 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
 
       <varlistentry>
         <term><emphasis role="bold">EXPORTPARAMS=</emphasis>{<emphasis
-        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}
+        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
-        (Deprecated beginning with Shorewall 4.4.17)</term>
 
         <listitem>
+          <para>Deprecated in Shorewall 4.4.17.</para>
+
           <para>Beginning with Shorewall 4.4.17, the variables set in the
           'params' file at compile time are available at run time with
           EXPORTPARAMS=No. As a consequence, beginning with that version the
@@ -1054,7 +1055,7 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
         role="bold">LOGBURST=</emphasis>[<emphasis>burst</emphasis>]</term>
 
         <listitem>
-          <para></para>
+          <para>Deprecated in Shorewall 4.4.12.</para>
         </listitem>
       </varlistentry>
 

manpages6/shorewall6.conf.xml

@@ -500,9 +500,11 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
       <varlistentry>
         <term><emphasis role="bold">EXPORTPARAMS=</emphasis>{<emphasis
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}
-        (Deprecated beginning with Shorewall 4.4.17)</term>
+        </term>
 
         <listitem>
+          <para>Deprecated beginning with Shorewall 4.4.17.</para>
+
           <para>Beginning with Shorewall 4.4.17, the variables set in the
           'params' file at compile time are available at run time with
           EXPORTPARAMS=No. As a consequence, beginning with that version the
@@ -930,7 +932,7 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
         role="bold">LOGBURST=</emphasis>[<emphasis>burst</emphasis>]</term>
 
         <listitem>
-          <para></para>
+          <para>Deprecated in Shorewall 4.4.12.</para>
         </listitem>
       </varlistentry>