some manpage updates

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9054 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

manpages/shorewall-policy.xml

@@ -206,7 +206,7 @@
       <varlistentry>
         <term><emphasis role="bold">LOG LEVEL</emphasis> (Optional) -
         [<emphasis>log-level</emphasis>|<emphasis
-        role="bold">ULOG</emphasis>]</term>
+        role="bold">ULOG|NFLOG</emphasis>]</term>
 
         <listitem>
           <para>If supplied, each connection handled under the default POLICY
@@ -214,9 +214,9 @@
           generated. See syslog.conf(5) for a description of log
           levels.</para>
 
-          <para>You may also specify ULOG (must be in upper case). This will
+          <para>You may also specify ULOG or NFLOG (must be in upper case).
-          log to the ULOG target and will send to a separate log through use
+          This will log to the ULOG or NFLOG target and will send to a
-          of ulogd (<ulink
+          separate log through use of ulogd (<ulink
           url="http://www.netfilter.org/projects/ulogd/index.html">http://www.netfilter.org/projects/ulogd/index.html</ulink>).</para>
 
           <para>If you don't want to log but need to specify the following

manpages/shorewall-rules.xml

@@ -475,8 +475,9 @@
             </itemizedlist>
 
             <para>You may also specify <emphasis role="bold">ULOG</emphasis>
-            (must be in upper case) as a log level.This will log to the ULOG
+            or <emphasis role="bold">NFLOG</emphasis> (must be in upper case)
-            target for routing to a separate log through use of ulogd (<ulink
+            as a log level.This will log to the ULOG or NFLOG target for
+            routing to a separate log through use of ulogd (<ulink
             url="http://www.netfilter.org/projects/ulogd/index.html">http://www.netfilter.org/projects/ulogd/index.html</ulink>).</para>
 
             <para>Actions specifying logging may be followed by a log tag (a

manpages/shorewall.conf.xml

@@ -60,12 +60,13 @@
     level to choose, 6 (info) is a safe bet. You may specify levels by name or
     by number.</para>
 
-    <para>If you have built your kernel with ULOG target support, you may also
+    <para>If you have built your kernel with ULOG and/or NFLOG target support,
-    specify a log level of ULOG (must be all caps). Rather than log its
+    you may also specify a log level of ULOG and/or NFLOG (must be all caps).
-    messages to syslogd, Shorewall will direct netfilter to log the messages
+    Rather than log its messages to syslogd, Shorewall will direct netfilter
-    via the ULOG target which will send them to a process called 'ulogd'.
+    to log the messages via the ULOG or NFLOG target which will send them to a
-    ulogd is available with most Linux distributions (although it probably
+    process called 'ulogd'. ulogd is available with most Linux distributions
-    isn't installed by default). Ulogd is also available from <ulink
+    (although it probably isn't installed by default). Ulogd is also available
+    from <ulink
     url="http://www.netfilter.org/projects/ulogd/index.html">http://www.netfilter.org/projects/ulogd/index.html</ulink>
     and can be configured to log all Shorewall message to their own log
     file</para>