From 8c2db407837940bc945f3f4c894db29330fecc68 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 25 Nov 2012 08:52:51 -0800
Subject: [PATCH] Correct errors in the conntrack manpages.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/manpages/shorewall-conntrack.xml   | 14 +++++++-------
 Shorewall6/manpages/shorewall6-conntrack.xml | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Shorewall/manpages/shorewall-conntrack.xml b/Shorewall/manpages/shorewall-conntrack.xml
index e2e6ae233..67eb8cfd2 100644
--- a/Shorewall/manpages/shorewall-conntrack.xml
+++ b/Shorewall/manpages/shorewall-conntrack.xml
@@ -81,12 +81,12 @@
         role="bold">NOTRACK</emphasis>|<emphasis
         role="bold">CT</emphasis>:<emphasis
         role="bold">helper</emphasis>:<replaceable>name</replaceable>[(<replaceable>arg</replaceable>=<replaceable>val</replaceable>[,...])|<emphasis
-        role="bold">CT:notrack</emphasis>}[:<replaceable>chain-designator</replaceable>]</term>
+        role="bold">CT:notrack</emphasis>|DROP}[:<replaceable>chain-designator</replaceable>]</term>
 
         <listitem>
-          <para>This column is only present when FORMAT = 2. Values other than
-          NOTRACK or DROP require <firstterm>CT Target </firstterm>support in
-          your iptables and kernel.</para>
+          <para>This column is only present when FORMAT &gt;= 2. Values other
+          than NOTRACK or DROP require <firstterm>CT Target
+          </firstterm>support in your iptables and kernel.</para>
 
           <itemizedlist>
             <listitem>
@@ -169,10 +169,10 @@
                 </varlistentry>
 
                 <varlistentry>
-                  <term/>
+                  <term></term>
 
                   <listitem>
-                    <para/>
+                    <para></para>
                   </listitem>
                 </varlistentry>
 
@@ -251,7 +251,7 @@
           <para>When FORMAT = 1, this column is not present and the rule is
           processed as if NOTRACK had been entered in this column.</para>
 
-          <para>Beginning with Shoreall 4.5.10, when FORMAT = 3, this column
+          <para>Beginning with Shorewall 4.5.10, when FORMAT = 3, this column
           can end with a colon followed by a
           <replaceable>chain-designator</replaceable>. The
           <replaceable>chain-designator</replaceable> can be one of the
diff --git a/Shorewall6/manpages/shorewall6-conntrack.xml b/Shorewall6/manpages/shorewall6-conntrack.xml
index 2869d8b92..df5cb4d4c 100644
--- a/Shorewall6/manpages/shorewall6-conntrack.xml
+++ b/Shorewall6/manpages/shorewall6-conntrack.xml
@@ -81,12 +81,12 @@
         role="bold">NOTRACK</emphasis>|<emphasis
         role="bold">CT</emphasis>:<emphasis
         role="bold">helper</emphasis>:<replaceable>name</replaceable>[(<replaceable>arg</replaceable>=<replaceable>val</replaceable>[,...])|<emphasis
-        role="bold">CT:notrack</emphasis>}[:<replaceable>chain-designator</replaceable>]</term>
+        role="bold">CT:notrack</emphasis>|drop}[:<replaceable>chain-designator</replaceable>]</term>
 
         <listitem>
-          <para>This column is only present when FORMAT = 2. Values other than
-          NOTRACK require <firstterm>CT Target </firstterm>support in your
-          iptables and kernel.</para>
+          <para>This column is only present when FORMAT &gt;= 2. Values other
+          than NOTRACK require <firstterm>CT Target </firstterm>support in
+          your iptables and kernel.</para>
 
           <itemizedlist>
             <listitem>
@@ -97,7 +97,7 @@
             </listitem>
 
             <listitem>
-              <para>DROP</para>
+              <para><option>DROP</option></para>
 
               <para>Added in Shorewall 4.5.10. Silently discard the
               packet.</para>
@@ -147,7 +147,7 @@
           <para>When FORMAT = 1, this column is not present and the rule is
           processed as if NOTRACK had been entered in this column.</para>
 
-          <para>Beginning with Shoreall 4.5.10, when FORMAT = 3, this column
+          <para>Beginning with Shorewall 4.5.10, when FORMAT = 3, this column
           can end with a colon followed by a
           <replaceable>chain-designator</replaceable>. The
           <replaceable>chain-designator</replaceable> can be one of the