From 748d53217589aaf522cf115e62cda0966ba5ffd9 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sat, 24 Nov 2012 09:11:28 -0800
Subject: [PATCH] Correct the explaination of ULOG and NFLOG in the manpages.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/manpages/shorewall-rules.xml   | 23 ++++++++++-------------
 Shorewall6/manpages/shorewall6-rules.xml |  7 +++++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Shorewall/manpages/shorewall-rules.xml b/Shorewall/manpages/shorewall-rules.xml
index 156a18a80..3302dec49 100644
--- a/Shorewall/manpages/shorewall-rules.xml
+++ b/Shorewall/manpages/shorewall-rules.xml
@@ -433,8 +433,11 @@
                 the next rule. See <ulink
                 url="http://www.shorewall.net/shorewall.logging.html">http://www.shorewall.net/shorewall_logging.html</ulink>.</para>
 
-                <para>Equivalent to<emphasis role="bold">
-                LOG:NFLOG</emphasis>[(<replaceable>nflog-parameters</replaceable>)]</para>
+                <para>Similar to<emphasis role="bold">
+                LOG:NFLOG</emphasis>[(<replaceable>nflog-parameters</replaceable>)],
+                except that the log level is not changed when this ACTION is
+                used in an action or macro body and the invocation of that
+                action or macro specifies a log level.</para>
               </listitem>
             </varlistentry>
 
@@ -543,17 +546,11 @@
                 the next rule. See <ulink
                 url="http://www.shorewall.net/shorewall.logging.html">http://www.shorewall.net/shorewall_logging.html</ulink>.</para>
 
-                <para>Equivalent to<emphasis role="bold">
-                LOG:ULOG</emphasis>[(<replaceable>ulog-parameters</replaceable>)]</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><emphasis
-              role="bold">ULOG</emphasis>[(<replaceable>ulog-parameters</replaceable>)]</term>
-
-              <listitem>
-                <para></para>
+                <para>Similar to<emphasis role="bold">
+                LOG:ULOG</emphasis>[(<replaceable>ulog-parameters</replaceable>)],
+                except that the log level is not changed when this ACTION is
+                used in an action or macro body and the invocation of that
+                action or macro specifies a log level.</para>
               </listitem>
             </varlistentry>
           </variablelist>
diff --git a/Shorewall6/manpages/shorewall6-rules.xml b/Shorewall6/manpages/shorewall6-rules.xml
index 184e57057..cd381cb75 100644
--- a/Shorewall6/manpages/shorewall6-rules.xml
+++ b/Shorewall6/manpages/shorewall6-rules.xml
@@ -370,8 +370,11 @@
                 the next rule. See <ulink
                 url="http://www.shorewall.net/shorewall.logging.html">http://www.shorewall.net/shorewall_logging.html</ulink>.</para>
 
-                <para>Equivalent to<emphasis role="bold">
-                LOG:NFLOG</emphasis>[(<replaceable>nflog-parameters</replaceable>)]</para>
+                <para>Similar to<emphasis role="bold">
+                LOG:NFLOG</emphasis>[(<replaceable>nflog-parameters</replaceable>)],
+                except that the log level is not changed when this ACTION is
+                used in an action or macro and the invocation of that action
+                or macro specifies a log level.</para>
               </listitem>
             </varlistentry>