From 8d63e04926d22a0ad3e563e1fe017a77e0223819 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 6 Sep 2010 20:37:34 -0700
Subject: [PATCH] Yet more docunentation updates

---
 docs/configuration_file_basics.xml |  4 ++++
 manpages/shorewall-accounting.xml  |  3 ++-
 manpages/shorewall-secmarks.xml    | 15 ++++++++++++++-
 manpages6/shorewall6-secmarks.xml  | 15 ++++++++++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml
index 7fbd23239..58427c5ef 100644
--- a/docs/configuration_file_basics.xml
+++ b/docs/configuration_file_basics.xml
@@ -349,6 +349,10 @@ ACCEPT  net     $FW      tcp     www     #This is an end-of-line comment</progra
         <para><filename>/etc/shorewall/rules</filename></para>
       </listitem>
 
+      <listitem>
+        <para><filename>/etc/shorewall/secmarks</filename></para>
+      </listitem>
+
       <listitem>
         <para><filename>/etc/shorewall/tcrules</filename></para>
       </listitem>
diff --git a/manpages/shorewall-accounting.xml b/manpages/shorewall-accounting.xml
index 598a306f5..afc636866 100644
--- a/manpages/shorewall-accounting.xml
+++ b/manpages/shorewall-accounting.xml
@@ -35,7 +35,8 @@
         <term><emphasis role="bold">ACTION</emphasis> - {<emphasis
         role="bold">COUNT</emphasis>|<emphasis
         role="bold">DONE</emphasis>|<emphasis>chain</emphasis>[:<emphasis
-        role="bold">COUNT</emphasis>]}</term>
+        role="bold">COUNT</emphasis>]|COUNT
+        <emphasis>comment</emphasis>}</term>
 
         <listitem>
           <para>What to do when a matching packet is found.</para>
diff --git a/manpages/shorewall-secmarks.xml b/manpages/shorewall-secmarks.xml
index 40c5d7451..11dcd6cd6 100644
--- a/manpages/shorewall-secmarks.xml
+++ b/manpages/shorewall-secmarks.xml
@@ -31,7 +31,8 @@
     <variablelist>
       <varlistentry>
         <term><emphasis role="bold">SECMARK -
-        {SAVE|RESTORE|<replaceable>context</replaceable>}</emphasis></term>
+        {SAVE|RESTORE|<replaceable>context</replaceable>|COMMENT
+        <replaceable>comment</replaceable>}</emphasis></term>
 
         <listitem>
           <variablelist>
@@ -61,6 +62,18 @@
                 <para>An SELinux context.</para>
               </listitem>
             </varlistentry>
+
+            <varlistentry>
+              <term>COMMENT</term>
+
+              <listitem>
+                <para>The remainder of the line is treated as a comment which
+                is attached to subsequent rules until another COMMENT line is
+                found or until the end of the file is reached. To stop adding
+                comments to rules, use a line with only the word
+                COMMENT.</para>
+              </listitem>
+            </varlistentry>
           </variablelist>
         </listitem>
       </varlistentry>
diff --git a/manpages6/shorewall6-secmarks.xml b/manpages6/shorewall6-secmarks.xml
index 5835329b5..de16b5cac 100644
--- a/manpages6/shorewall6-secmarks.xml
+++ b/manpages6/shorewall6-secmarks.xml
@@ -31,7 +31,8 @@
     <variablelist>
       <varlistentry>
         <term><emphasis role="bold">SECMARK -
-        {SAVE|RESTORE|<replaceable>context</replaceable>}</emphasis></term>
+        {SAVE|RESTORE|<replaceable>context</replaceable>|COMMENT
+        <replaceable>comment</replaceable>}</emphasis></term>
 
         <listitem>
           <variablelist>
@@ -61,6 +62,18 @@
                 <para>An SELinux context.</para>
               </listitem>
             </varlistentry>
+
+            <varlistentry>
+              <term>COMMENT</term>
+
+              <listitem>
+                <para>The remainder of the line is treated as a comment which
+                is attached to subsequent rules until another COMMENT line is
+                found or until the end of the file is reached. To stop adding
+                comments to rules, use a line with only the word
+                COMMENT.</para>
+              </listitem>
+            </varlistentry>
           </variablelist>
         </listitem>
       </varlistentry>