From 8d2408a8d6028bf9a20c11097e9ce3d365ddff32 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 30 Nov 2009 11:26:00 -0800
Subject: [PATCH] Partial update to manpage

---
 manpages/shorewall.conf.xml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml
index 55927100d..e92256fff 100644
--- a/manpages/shorewall.conf.xml
+++ b/manpages/shorewall.conf.xml
@@ -558,6 +558,11 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
           in to effectively divide the packet mark and connection mark into
           two mark fields.</para>
 
+          <note>
+            <para>This option is deprecated in Shorewall 4.5 and later in
+            favor of the PROVIDER_OFFSET option.</para>
+          </note>
+
           <para>The width of the fields are determined by the setting of
           WIDE_TC_MARKS. If WIDE_TC_MARKS=No (the default):</para>
 
@@ -1044,6 +1049,15 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><emphasis role="bold">MASK_BITS</emphasis>=<emphasis
+        role="bold">bits</emphasis></term>
+
+        <listitem>
+          <para>Determines the number of bits </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><emphasis role="bold">MODULE_SUFFIX=</emphasis>[<emphasis
         role="bold">"</emphasis><emphasis>extension</emphasis> ...<emphasis
@@ -1403,6 +1417,24 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><emphasis
+        role="bold">TC_BITS</emphasis>=<emphasis>bits</emphasis></term>
+
+        <listitem>
+          <para>Added in Shorewall 4.5.0. Determines the number of bits at the
+          low end of the packet/connection mark to use for traffic shaping
+          marks. The default is determined by the settings of WIDE_TC_MARKS as
+          follows:</para>
+
+          <simplelist>
+            <member>WIDE_TC_MARKS=No - 8</member>
+
+            <member>WIDE_TC_MARKS=Yes - 14</member>
+          </simplelist>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><emphasis role="bold">TC_ENABLED=</emphasis>[<emphasis
         role="bold">Yes</emphasis>|<emphasis
@@ -1572,6 +1604,11 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
           traffic shaping marks are 14 bytes wide (values 1-16383). The
           setting of WIDE_TC_MARKS also has an effect on the HIGH_ROUTE_MARKS
           option (see above).</para>
+
+          <note>
+            <para>This option is deprecated in Shorewall 4.5 and later in
+            favor of the TC_BITS option.</para>
+          </note>
         </listitem>
       </varlistentry>