From ae71fc3cc2c154f628248bb735cd7e6d9d2fa66d Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 17 Jan 2007 16:10:40 +0000
Subject: [PATCH] Update PPTP doc to use 3.x format for zones file

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5246 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 docs/PPTP.xml         | 33 +++++++++++++++++++++++----------
 docs/support.xml      | 16 +++++++++++++++-
 docs/troubleshoot.xml | 15 +++++++++++++--
 3 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/docs/PPTP.xml b/docs/PPTP.xml
index 31d5f043b..e9a2791bc 100644
--- a/docs/PPTP.xml
+++ b/docs/PPTP.xml
@@ -30,6 +30,8 @@
 
       <year>2006</year>
 
+      <year>2007</year>
+
       <holder>Thomas M. Eastep</holder>
     </copyright>
 
@@ -44,6 +46,16 @@
     </legalnotice>
 
     <revhistory>
+      <revision>
+        <revnumber>1.5</revnumber>
+
+        <date>2007-01-17</date>
+
+        <authorinitials>TE</authorinitials>
+
+        <revremark>Updated zones files to 3.x format</revremark>
+      </revision>
+
       <revision>
         <revnumber>1.4</revnumber>
 
@@ -512,12 +524,13 @@ pptpserver      net              0.0.0.0/0</programlisting>
 
         <para><filename>/etc/shorewall/zones</filename>:</para>
 
-        <programlisting>#ZONE           DISPLAY          COMMENTS
-net             Internet         The Internet
-loc             Local            Local Network
-vpn1            Remote1          Remote Network 1
-vpn2            Remote2          Remote Network 2
-vpn3            Remote3          Remote Network 3</programlisting>
+        <programlisting>#ZONE           TYPE
+fw              firewall
+net             ipv4
+loc             ipv4
+vpn1            ipv4
+vpn2            ipv4
+vpn3            ipv4</programlisting>
 
         <para><filename>/etc/shorewall/interfaces</filename>:</para>
 
@@ -636,8 +649,8 @@ loadmodule ip_nat_proto_gre</programlisting>
 
     <para><filename>/etc/shorewall/zones</filename>:</para>
 
-    <programlisting>#ZONE          DISPLAY          COMMENTS
-cpq            Compaq           Compaq Intranet</programlisting>
+    <programlisting>#ZONE          TYPE
+cpq            ipv4</programlisting>
 
     <para><filename>/etc/shorewall/interfaces</filename>:</para>
 
@@ -847,8 +860,8 @@ restart_pptp &gt; /dev/null 2&gt;&amp;1 &amp;</programlisting>
       <listitem>
         <para>Add this entry to /etc/shorewall/zones:</para>
 
-        <programlisting>#ZONE          DISPLAY          COMMENTS
-modem          Modem            ADSL Modem</programlisting>
+        <programlisting>#ZONE          TYPE
+modem          ipv4</programlisting>
 
         <para>That entry defines a new zone called <quote>modem</quote> which
         will contain only your ADSL modem.</para>
diff --git a/docs/support.xml b/docs/support.xml
index 6946f6956..506ff7cee 100644
--- a/docs/support.xml
+++ b/docs/support.xml
@@ -122,9 +122,23 @@
         <para>If your problem is that an <emphasis
         role="bold">error</emphasis> occurs when you try to
         <quote><command>shorewall start</command></quote> or if Shorewall is
-        otherwise failing to start properly, then please:</para>
+        otherwise failing to start properly, then please do the
+        following.</para>
 
         <blockquote>
+          <para>If your VERBOSITY setting in shorewall.conf is less than 2,
+          then try running with a higher verbosity level by using the "-vv"
+          option:</para>
+
+          <blockquote>
+            <programlisting><command>shorewall -vv [re]start</command></programlisting>
+          </blockquote>
+
+          <para>That will give you additional progress messages that may make
+          it clear which entry in which file is generating the error.</para>
+
+          <para>If that didn't solve your problem, then please</para>
+
           <programlisting><command>/sbin/shorewall trace start 2&gt; /tmp/trace</command></programlisting>
 
           <para>Forward the <filename>/tmp/trace</filename> file as an
diff --git a/docs/troubleshoot.xml b/docs/troubleshoot.xml
index 11f839d2d..91ccd5177 100644
--- a/docs/troubleshoot.xml
+++ b/docs/troubleshoot.xml
@@ -36,8 +36,19 @@
     <title><quote>shorewall start</quote> and <quote>shorewall restart</quote>
     Errors</title>
 
-    <para>If you receive an error message when starting or restarting the
-    firewall and you can't determine the cause, then do the following:</para>
+    <para>You receive an error message when starting or restarting the
+    firewall and you can't determine the cause. First, if your VERBOSITY
+    setting in shorewall.conf is less than 2, then try running with a higher
+    verbosity level by using the "-v" option:</para>
+
+    <blockquote>
+      <programlisting><command>shorewall -vv [re]start</command></programlisting>
+    </blockquote>
+
+    <para>That will give you additional progress messages that may make it
+    clear which entry in which file is generating the error.</para>
+
+    <para>If that didn't help, then do the following:</para>
 
     <itemizedlist>
       <listitem>