From 26987cd1216eb2cf4eda05ce3c9516d64a23b259 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 22 Dec 2006 16:22:10 +0000
Subject: [PATCH] More 3.4 documentation changes

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5151 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 docs/Documentation_Index.xml       | 14 +++++++++++---
 docs/configuration_file_basics.xml |  2 +-
 docs/standalone.xml                | 13 +++++++++++--
 docs/three-interface.xml           | 13 +++++++++++--
 docs/two-interface.xml             | 17 ++++++++++++++---
 5 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/docs/Documentation_Index.xml b/docs/Documentation_Index.xml
index 7d561fba5..d1fee9ddd 100644
--- a/docs/Documentation_Index.xml
+++ b/docs/Documentation_Index.xml
@@ -72,6 +72,16 @@
             <para><informaltable frame="none">
                 <tgroup cols="2">
                   <tbody valign="middle">
+                    <row>
+                      <entry><ulink
+                      url="Documentation_Index.html#Manpages">Man
+                      Pages</ulink></entry>
+
+                      <entry><ulink
+                      url="configuration_file_basics.htm#MAC">Using MAC
+                      Addresses in Shorewall</ulink></entry>
+                    </row>
+
                     <row>
                       <entry><ulink
                       url="configuration_file_basics.htm#Comments">Comments in
@@ -128,9 +138,7 @@
                       url="configuration_file_basics.htm#Ranges">Port
                       Ranges</ulink></entry>
 
-                      <entry><ulink
-                      url="configuration_file_basics.htm#MAC">Using MAC
-                      Addresses in Shorewall</ulink></entry>
+                      <entry></entry>
                     </row>
                   </tbody>
                 </tgroup>
diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml
index 4226d5500..d026feaa2 100644
--- a/docs/configuration_file_basics.xml
+++ b/docs/configuration_file_basics.xml
@@ -215,7 +215,7 @@
       </itemizedlist></para>
   </section>
 
-  <section>
+  <section id="Manpages">
     <title>Man Pages</title>
 
     <para>Beginning with Shorewall version 3.4, man pages are provided in
diff --git a/docs/standalone.xml b/docs/standalone.xml
index 78dba37db..8aba62886 100644
--- a/docs/standalone.xml
+++ b/docs/standalone.xml
@@ -204,8 +204,17 @@
       not modify those files.</para>
     </warning>
 
-    <para>As each file is introduced, I suggest that you look through the
-    actual file on your system -- each file contains detailed configuration
+    <para>If you are installing Shorewall version 3.4.0 or later then as each
+    file is introduced, I suggest that you look at the actual file on your
+    system and that you look at the <ulink
+    url="configuration_file_basics.html#Manpages">man page</ulink> for that
+    file. For example, to look at the man page for the
+    <filename>/etc/shorewall/zones</filename> file, type <command>man
+    shorewall-zones</command> at a shell prompt.</para>
+
+    <para>If you are installing a Shorewall version earlier than 3.4.0, then
+    as each file is introduced, I suggest that you look through the actual
+    file on your system -- each file contains detailed configuration
     instructions and default entries.</para>
 
     <para>Shorewall views the network where it is running as being composed of
diff --git a/docs/three-interface.xml b/docs/three-interface.xml
index 53ae73a48..edb6c3a1f 100644
--- a/docs/three-interface.xml
+++ b/docs/three-interface.xml
@@ -230,8 +230,17 @@
       </listitem>
     </orderedlist>
 
-    <para>As each file is introduced, I suggest that you look through the
-    actual file on your system -- each file contains detailed configuration
+    <para>If you are installing Shorewall version 3.4.0 or later then as each
+    file is introduced, I suggest that you look at the actual file on your
+    system and that you look at the <ulink
+    url="configuration_file_basics.html#Manpages">man page</ulink> for that
+    file. For example, to look at the man page for the
+    <filename>/etc/shorewall/zones</filename> file, type <command>man
+    shorewall-zones</command> at a shell prompt.</para>
+
+    <para>If you are installing a Shorewall version earlier than 3.4.0, then
+    as each file is introduced, I suggest that you look through the actual
+    file on your system -- each file contains detailed configuration
     instructions and default entries.</para>
 
     <para>Shorewall views the network where it is running as being composed of
diff --git a/docs/two-interface.xml b/docs/two-interface.xml
index 914909364..b90256b0a 100644
--- a/docs/two-interface.xml
+++ b/docs/two-interface.xml
@@ -209,9 +209,20 @@
             /usr/share/doc/shorewall/examples/two-interfaces.</para>
           </listitem>
         </orderedlist>
-      </important> As each file is introduced, I suggest that you look through
-    the actual file on your system -- each file contains detailed
-    configuration instructions and default entries.</para>
+      </important></para>
+
+    <para>If you are installing Shorewall version 3.4.0 or later then as each
+    file is introduced, I suggest that you look at the actual file on your
+    system and that you look at the <ulink
+    url="configuration_file_basics.html#Manpages">man page</ulink> for that
+    file. For example, to look at the man page for the
+    <filename>/etc/shorewall/zones</filename> file, type <command>man
+    shorewall-zones</command> at a shell prompt.</para>
+
+    <para>If you are installing a Shorewall version earlier than 3.4.0, then
+    as each file is introduced, I suggest that you look through the actual
+    file on your system -- each file contains detailed configuration
+    instructions and default entries.</para>
 
     <para>Shorewall views the network where it is running as being composed of
     a set of zones. In the two-interface sample configuration, the following