Update man pages and .conf files for WORKAROUNDS

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

Shorewall/Samples/Universal/shorewall.conf

@@ -234,6 +234,8 @@ USE_RT_NAMES=No
 
 WARNOLDCAPVERSION=Yes
 
+WORKAROUNDS=No
+
 ZONE2ZONE=-
 
 ###############################################################################

Shorewall/Samples/one-interface/shorewall.conf

@@ -245,6 +245,8 @@ USE_RT_NAMES=No
 
 WARNOLDCAPVERSION=Yes
 
+WORKAROUNDS=No
+
 ZONE2ZONE=-
 
 ###############################################################################

Shorewall/Samples/three-interfaces/shorewall.conf

@@ -242,6 +242,8 @@ USE_RT_NAMES=No
 
 WARNOLDCAPVERSION=Yes
 
+WORKAROUNDS=No
+
 ZONE2ZONE=-
 
 ###############################################################################

Shorewall/Samples/two-interfaces/shorewall.conf

@@ -245,6 +245,8 @@ USE_RT_NAMES=No
 
 WARNOLDCAPVERSION=Yes
 
+WORKAROUNDS=No
+
 ZONE2ZONE=-
 
 ###############################################################################

Shorewall/configfiles/shorewall.conf

@@ -234,6 +234,8 @@ USE_RT_NAMES=No
 
 WARNOLDCAPVERSION=Yes
 
+WORKAROUNDS=Yes
+
 ZONE2ZONE=-
 
 ###############################################################################

Shorewall/manpages/shorewall.conf.xml

@@ -2973,8 +2973,8 @@ INLINE          -       -       -       ; -j REJECT
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">WIDE_TC_MARKS=</emphasis>{<emphasis
+        <term><emphasis role="bold">WIDE_TC_MARKS=</emphasis>[<emphasis
-        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
+        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
 
         <listitem>
           <para>Deprecated in Shorewall 4.4.26 in favor of TC_BITS and
@@ -2988,6 +2988,20 @@ INLINE          -       -       -       ; -j REJECT
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><emphasis role="bold">WORKAROUNDS=</emphasis>[<emphasis
+        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
+
+        <listitem>
+          <para>Added in Shorewall 4.6.11. Over time, there have been a number
+          of changes in Shorewall that work around defects in other products
+          such as iptables and ipset. When WORKAROUNDS=Yes, these workarounds
+          are enabled; when WORKAROUNDS=No, they are disabled. If not
+          specified or if specified as empty, WORKAROUNDS=Yes is
+          assumed.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><emphasis
         role="bold">ZONE_BITS</emphasis>=[<replaceable>number</replaceable>]</term>
@@ -3002,7 +3016,7 @@ INLINE          -       -       -       ; -j REJECT
 
       <varlistentry>
         <term><emphasis
-        role="bold">ZONE2ZONE</emphasis>={<option>2</option>|<option>-</option>}</term>
+        role="bold">ZONE2ZONE</emphasis>=[<option>2</option>|<option>-</option>]</term>
 
         <listitem>
           <para>Added in Shorewall 4.4.4. This option determines how Shorewall

Shorewall6/Samples6/Universal/shorewall6.conf

@@ -209,6 +209,8 @@ USE_RT_NAMES=No
 
 WARNOLDCAPVERSION=Yes
 
+WORKAROUNDS=No
+
 ZONE2ZONE=-
 
 ###############################################################################

Shorewall6/Samples6/one-interface/shorewall6.conf

@@ -209,6 +209,8 @@ USE_RT_NAMES=No
 
 WARNOLDCAPVERSION=Yes
 
+WORKAROUNDS=No
+
 ZONE2ZONE=-
 
 ###############################################################################

Shorewall6/Samples6/three-interfaces/shorewall6.conf

@@ -209,6 +209,8 @@ USE_RT_NAMES=No
 
 WARNOLDCAPVERSION=Yes
 
+WORKAROUNDS=No
+
 ZONE2ZONE=-
 
 ###############################################################################

Shorewall6/Samples6/two-interfaces/shorewall6.conf

@@ -209,6 +209,8 @@ USE_RT_NAMES=No
 
 WARNOLDCAPVERSION=Yes
 
+WORKAROUNDS=No
+
 ZONE2ZONE=-
 
 ###############################################################################

Shorewall6/configfiles/shorewall6.conf

@@ -209,6 +209,8 @@ USE_RT_NAMES=No
 
 WARNOLDCAPVERSION=Yes
 
+WORKAROUNDS=Yes
+
 ZONE2ZONE=-
 
 ###############################################################################

Shorewall6/manpages/shorewall6.conf.xml

@@ -2622,8 +2622,8 @@ INLINE          -       -       -       ; -j REJECT
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">WIDE_TC_MARKS=</emphasis>{<emphasis
+        <term><emphasis role="bold">WIDE_TC_MARKS=</emphasis>[<emphasis
-        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
+        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
 
         <listitem>
           <para>Deprecated in Shorewall 4.4.26 in favor of TC_BITS and
@@ -2637,6 +2637,20 @@ INLINE          -       -       -       ; -j REJECT
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><emphasis role="bold">WORKAROUNDS=</emphasis>[<emphasis
+        role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
+
+        <listitem>
+          <para>Added in Shorewall 4.6.11. Over time, there have been a number
+          of changes in Shorewall that work around defects in other products
+          such as iptables and ipset. When WORKAROUNDS=Yes, these workarounds
+          are enabled; when WORKAROUNDS=No, they are disabled. If not
+          specified or if specified as empty, WORKAROUNDS=Yes is
+          assumed.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><emphasis
         role="bold">ZONE_BITS</emphasis>=[<replaceable>number</replaceable>]</term>