From 20e9f3e8a26318766724add3d73406900480df45 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 1 Nov 2007 16:02:17 +0000
Subject: [PATCH] Try to clarify entries in the accounting file

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7604 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 docs/Accounting.xml               | 23 ++++++++++++-----------
 docs/Shorewall-perl.xml           | 11 +++++++++++
 manpages/shorewall-accounting.xml |  7 ++++---
 manpages/shorewall-tunnels.xml    |  2 +-
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/docs/Accounting.xml b/docs/Accounting.xml
index 07993ce19..daa02dbfa 100644
--- a/docs/Accounting.xml
+++ b/docs/Accounting.xml
@@ -74,16 +74,17 @@
           </listitem>
 
           <listitem>
-            <para><emphasis>&lt;chain&gt;</emphasis> - The name of a chain to
-            jump to. Shorewall will create the chain automatically. If the
-            name of the chain is followed by <quote>:COUNT</quote> then a
-            COUNT rule matching this rule will automatically be added to
-            &lt;chain&gt;. Chain names must start with a letter, must be
-            composed of letters and digits, and may contain underscores
-            (<quote>_</quote>) and periods (<quote>.</quote>). Beginning with
-            Shorewall version 1.4.8, chain names may also contain embedded
-            dashes (<quote>-</quote>) and are not required to start with a
-            letter.</para>
+            <para><emphasis>&lt;chain&gt;</emphasis> - The name of a chain;
+            Shorewall will create the chain automatically if it doesn't
+            already exist. Causes a jump to this chain will be generated from
+            the chain specified by the CHAIN column. If the name of the chain
+            is followed by <quote>:COUNT</quote> then a COUNT rule matching
+            this entry will automatically be added to &lt;chain&gt;. Chain
+            names must start with a letter, must be composed of letters and
+            digits, and may contain underscores (<quote>_</quote>) and periods
+            (<quote>.</quote>). Beginning with Shorewall version 1.4.8, chain
+            names may also contain embedded dashes (<quote>-</quote>) and are
+            not required to start with a letter.</para>
           </listitem>
 
           <listitem>
@@ -175,7 +176,7 @@
 
         <para>If you don’t want to define a test but need to specify anything
         in the following columns, place a "-" in this field.<simplelist>
-            <member> ! — Inverts the test (not equal)</member>
+            <member>! — Inverts the test (not equal)</member>
 
             <member>&lt;value&gt; — Value of the packet or connection
             mark.</member>
diff --git a/docs/Shorewall-perl.xml b/docs/Shorewall-perl.xml
index cb1d0b520..c1c476fc4 100644
--- a/docs/Shorewall-perl.xml
+++ b/docs/Shorewall-perl.xml
@@ -597,4 +597,15 @@ loc     net      ACCEPT</programlisting>
     compiler uses the current environmental variables to perform variable
     expansion within the other Shorewall configuration files.</para>
   </section>
+
+  <section>
+    <title>The Shorewall Perl Modules</title>
+
+    <para>Shorewall's Perl modules are installed in
+    /usr/share/shorewall-perl/Shorewall and the names of the packages are of
+    the form Shorewall::<firstterm>name</firstterm>. So by using this
+    directive<programlisting>use lib '/usr/share/shorewall-perl';</programlisting></para>
+
+    <para>You can then load the modules via normal Perl use statements.</para>
+  </section>
 </article>
\ No newline at end of file
diff --git a/manpages/shorewall-accounting.xml b/manpages/shorewall-accounting.xml
index 078531f9f..c713de662 100644
--- a/manpages/shorewall-accounting.xml
+++ b/manpages/shorewall-accounting.xml
@@ -66,11 +66,12 @@
               role="bold">COUNT</emphasis>]</term>
 
               <listitem>
-                <para>Where <emphasis>chain</emphasis> is the name of a chain.
+                <para>Where <emphasis>chain</emphasis> is the name of a chain;
                 Shorewall will create the chain automatically if it doesn't
-                already exist. Causes a jump to that chain. If <emphasis
+                already exist. Causes a jump to that chain to be added to the
+                chain specified in the CHAIN column. If <emphasis
                 role="bold">:COUNT</emphasis> is included, a counting rule
-                matching this record will be added to
+                matching this entry will be added to
                 <emphasis>chain</emphasis></para>
               </listitem>
             </varlistentry>
diff --git a/manpages/shorewall-tunnels.xml b/manpages/shorewall-tunnels.xml
index c92ac5501..805e713af 100644
--- a/manpages/shorewall-tunnels.xml
+++ b/manpages/shorewall-tunnels.xml
@@ -214,7 +214,7 @@
           <para>You run a PPTP server on your firewall.</para>
 
           <programlisting>        #TYPE           ZONE    GATEWAY         GATEWAY ZONES
-        pptpserver      net</programlisting>
+        pptpserver      net     0.0.0.0/0</programlisting>
         </listitem>
       </varlistentry>