From 37434f4d344dd708277e1dcb90195abd527ded6d Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 20 Nov 2005 23:50:43 +0000
Subject: [PATCH] Corrections suggested by Guy

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3042 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-docs2/standalone.xml    | 20 +++++++++++++-------
 Shorewall-docs2/standalone_fr.xml | 10 ++++++++++
 Shorewall-docs2/two-interface.xml |  8 ++++----
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Shorewall-docs2/standalone.xml b/Shorewall-docs2/standalone.xml
index 71f297cdd..4b67f313d 100644
--- a/Shorewall-docs2/standalone.xml
+++ b/Shorewall-docs2/standalone.xml
@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>2005-11-02</pubdate>
+    <pubdate>2005-11-20</pubdate>
 
     <copyright>
       <year>2002-2005</year>
@@ -34,6 +34,13 @@
     </legalnotice>
   </articleinfo>
 
+  <caution>
+    <para><emphasis role="bold">This article applies to Shorewall 3.0 and
+    later. If you are running a version of Shorewall earlier than Shorewall
+    3.0.0 then please see the documentation for that
+    release.</emphasis></para>
+  </caution>
+
   <section>
     <title>Introduction</title>
 
@@ -400,12 +407,11 @@ SSH/ACCEPT  net       $FW           </programlisting>
     <para><inlinegraphic fileref="images/BD21298_.gif" format="GIF" /></para>
 
     <para>The <ulink url="Install.htm">installation procedure</ulink>
-    configures your system to start Shorewall at system boot but beginning
-    with Shorewall version 1.3.9 startup is disabled so that your system won't
-    try to start Shorewall before configuration is complete. Once you have
-    completed configuration of your firewall, you can enable Shorewall startup
-    by removing the file
-    <filename>/etc/shorewall/startup_disabled</filename>.</para>
+    configures your system to start Shorewall at system boot but startup is
+    disabled so that your system won't try to start Shorewall before
+    configuration is complete. Once you have completed configuration of your
+    firewall, you must edit /etc/shorewall/shorewall.conf and set
+    STARTUP_ENABLED=Yes.</para>
 
     <important>
       <para><emphasis role="bold">Users of the .deb package must edit
diff --git a/Shorewall-docs2/standalone_fr.xml b/Shorewall-docs2/standalone_fr.xml
index b899ade7f..0ed21dea8 100644
--- a/Shorewall-docs2/standalone_fr.xml
+++ b/Shorewall-docs2/standalone_fr.xml
@@ -531,6 +531,16 @@ SSH/ACCEPT  net       $FW           </programlisting>
     <title>Revision History</title>
 
     <para><revhistory>
+        <revision>
+          <revnumber>1.8</revnumber>
+
+          <date>2005-11-20</date>
+
+          <authorinitials>GM</authorinitials>
+
+          <revremark>Update for Shorewall 3.0</revremark>
+        </revision>
+
         <revision>
           <revnumber>1.7</revnumber>
 
diff --git a/Shorewall-docs2/two-interface.xml b/Shorewall-docs2/two-interface.xml
index f0c6dd97b..070722a4f 100644
--- a/Shorewall-docs2/two-interface.xml
+++ b/Shorewall-docs2/two-interface.xml
@@ -12,7 +12,7 @@
       <surname>Eastep</surname>
     </author>
 
-    <pubdate>2005-11-10</pubdate>
+    <pubdate>2005-11-20</pubdate>
 
     <copyright>
       <year>2002-</year>
@@ -604,7 +604,7 @@ DNAT      net       loc:<emphasis>&lt;server local ip address&gt;</emphasis>[:<e
         <para>You run a Web Server on computer 2 and you want to forward
         incoming <acronym>TCP</acronym> port 80 to that system:
         <programlisting>#ACTION   SOURCE    DEST             PROTO     DEST PORT(S)
-Web/DNAT  net       loc:192.168.1.5</programlisting></para>
+Web/DNAT  net       loc:10.10.10.2</programlisting></para>
       </example> <example label="2">
         <title>FTP Server</title>
 
@@ -748,8 +748,8 @@ ACCEPT     $FW       <emphasis>&lt;destination zone&gt; &lt;protocol&gt; &lt;por
         <para>You want to run a Web Server on your firewall system:
         <programlisting>#ACTION     SOURCE    DEST               PROTO     DEST PORT(S)
 Web/ACCEPT  net       $FW
-Web/ACCEPT  loc       </programlisting>$FWThose two rules would of course be
-        in addition to the rules listed above under <quote><link
+Web/ACCEPT  loc       $FW       </programlisting>Those two rules would of
+        course be in addition to the rules listed above under <quote><link
         linkend="cachingdns">You can configure a Caching Name Server on your
         firewall</link></quote>.</para>
       </example> If you don't know what port and protocol a particular