From 6323372ebd1eea1a8843acfcb6232f00cc6e97fc Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 19 Dec 2013 16:23:32 -0800
Subject: [PATCH] Fix issue in the shorewall-tcrules and shorewall6-tcrules
 manpages.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/manpages/shorewall-tcrules.xml   | 24 ++++++++++++----------
 Shorewall6/manpages/shorewall6-tcrules.xml | 24 ++++++++++++----------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/Shorewall/manpages/shorewall-tcrules.xml b/Shorewall/manpages/shorewall-tcrules.xml
index 003293ebe..1520dace9 100644
--- a/Shorewall/manpages/shorewall-tcrules.xml
+++ b/Shorewall/manpages/shorewall-tcrules.xml
@@ -664,17 +664,6 @@ SAME              $FW            0.0.0.0/0    tcp        80,443</programlisting>
               role="bold">:F</emphasis></para>
             </listitem>
 
-            <listitem>
-              <para><emphasis role="bold">STATE</emphasis> {<emphasis
-              role="bold">NEW</emphasis>|<emphasis
-              role="bold">RELATED</emphasis>|<emphasis
-              role="bold">ESTABLISHED</emphasis>|<emphasis
-              role="bold">INVALID</emphasis>} [,...]</para>
-
-              <para>Added in Shorewall 4.5.9. The rule will only match if the
-              packet's connection is in one of the listed states.</para>
-            </listitem>
-
             <listitem>
               <para><emphasis
               role="bold">TOS</emphasis>(<replaceable>tos</replaceable>[/<replaceable>mask</replaceable>])</para>
@@ -1243,6 +1232,19 @@ Normal-Service       =&gt; 0x00</programlisting>
     EF   =&gt; 0x2e</programlisting>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><emphasis role="bold">STATE</emphasis> -- {<emphasis
+        role="bold">NEW</emphasis>|<emphasis
+        role="bold">RELATED</emphasis>|<emphasis
+        role="bold">ESTABLISHED</emphasis>|<emphasis
+        role="bold">INVALID</emphasis>} [,...]</term>
+
+        <listitem>
+          <para>Added in Shorewall 4.5.9. The rule will only match if the
+          packet's connection is in one of the listed states.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 
diff --git a/Shorewall6/manpages/shorewall6-tcrules.xml b/Shorewall6/manpages/shorewall6-tcrules.xml
index e79a6ed53..b4c3d414f 100644
--- a/Shorewall6/manpages/shorewall6-tcrules.xml
+++ b/Shorewall6/manpages/shorewall6-tcrules.xml
@@ -593,17 +593,6 @@ SAME              $FW            0.0.0.0/0    tcp        80,443</programlisting>
               role="bold">:F</emphasis></para>
             </listitem>
 
-            <listitem>
-              <para><emphasis role="bold">STATE</emphasis> {<emphasis
-              role="bold">NEW</emphasis>|<emphasis
-              role="bold">RELATED</emphasis>|<emphasis
-              role="bold">ESTABLISHED</emphasis>|<emphasis
-              role="bold">INVALID</emphasis>} [,...]</para>
-
-              <para>Added in Shorewall 4.5.9. The rule will only match if the
-              packet's connection is in one of the listed states.</para>
-            </listitem>
-
             <listitem>
               <para><emphasis
               role="bold">TOS</emphasis>(<replaceable>tos</replaceable>[/<replaceable>mask</replaceable>])</para>
@@ -1163,6 +1152,19 @@ Normal-Service       =&gt; 0x00</programlisting>
           at up to 8 decimal points of precision.</para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><emphasis role="bold">STATE</emphasis> -- {<emphasis
+        role="bold">NEW</emphasis>|<emphasis
+        role="bold">RELATED</emphasis>|<emphasis
+        role="bold">ESTABLISHED</emphasis>|<emphasis
+        role="bold">INVALID</emphasis>} [,...]</term>
+
+        <listitem>
+          <para>Added in Shorewall 4.5.9. The rule will only match if the
+          packet's connection is in one of the listed states.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>