From 6c1369a5a879080be14e953b0aba577237c276ea Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sat, 22 Dec 2012 09:51:51 -0800
Subject: [PATCH] Minor tweaks to the documentation

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 docs/Documentation_Index.xml       |  5 +++
 docs/configuration_file_basics.xml | 52 +++++++++++++++---------------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/docs/Documentation_Index.xml b/docs/Documentation_Index.xml
index 265490003..734f87a8e 100644
--- a/docs/Documentation_Index.xml
+++ b/docs/Documentation_Index.xml
@@ -52,6 +52,11 @@
             <entry><ulink url="Manpages6.html">IPv6 Manpages</ulink></entry>
           </row>
 
+          <row>
+            <entry><ulink url="configuration_file_basics.htm">Configuration
+            File Basics</ulink></entry>
+          </row>
+
           <row>
             <entry><ulink url="GettingStarted.html">Beginner
             Documentation</ulink></entry>
diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml
index 7e1dd5b59..2cce8f05a 100644
--- a/docs/configuration_file_basics.xml
+++ b/docs/configuration_file_basics.xml
@@ -323,6 +323,28 @@ ACCEPT  net     $FW      tcp     www     #This is an end-of-line comment</progra
     'sit1".</para>
   </section>
 
+  <section>
+    <title>Zone and Chain Names</title>
+
+    <para>For a pair of zones, Shorewall creates two Netfilter chains; one for
+    connections in each direction. The names of these chains are formed by
+    separating the names of the two zones by either "2" or "-".</para>
+
+    <para>Example: Traffic from zone A to zone B would go through chain A2B
+    (think "A to B") or "A-B".</para>
+
+    <para>The default separator is "2" but you can override that by setting
+    ZONE_SEPARATOR="-" in <ulink
+    url="manpages/shorewall.conf.html">shorewall.conf</ulink> (5).</para>
+
+    <para>Zones themselves have names that begin with a letter and are
+    composed of letters, numerals, and "_". The maximum length of a name is
+    dependent on the setting of LOGFORMAT in <ulink
+    url="manpages/shorewall.conf.html">shorewall.conf</ulink> (5). See <ulink
+    url="manpages/shorewall-zones.html">shorewall-zones</ulink> (5) for
+    details.</para>
+  </section>
+
   <section id="COMMENT">
     <title>Attach Comment to Netfilter Rules</title>
 
@@ -1407,7 +1429,7 @@ SHELL cat /etc/shorewall/rules.d/*.rules 2&gt; /dev/null || true</programlisting
       </varlistentry>
     </variablelist>
 
-    <para>Action variables are read only and cannot be ?SET (although you can
+    <para>Action variables are read-only and cannot be ?SET (although you can
     change their values <ulink url="Actions.html#Embedded">using embedded
     Perl</ulink>).</para>
   </section>
@@ -1416,7 +1438,7 @@ SHELL cat /etc/shorewall/rules.d/*.rules 2&gt; /dev/null || true</programlisting
     <title>Address Variables</title>
 
     <para>Given that shell variables are expanded at compile time, there is no
-    way to cause such variables to be expended at run time. Prior to Shorewall
+    way to cause such variables to be expanded at run time. Prior to Shorewall
     4.4.17, this made it difficult (to impossible) to include dynamic IP
     addresses in a <ulink url="Shorewall-Lite.html">Shorewall-lite</ulink>
     configuration.</para>
@@ -1814,8 +1836,8 @@ SHELL cat /etc/shorewall/rules.d/*.rules 2&gt; /dev/null || true</programlisting
 
     <itemizedlist>
       <listitem>
-        <para>it begins with '__', then those leading characters are stripped
-        off.</para>
+        <para>if it begins with '__', then those leading characters are
+        stripped off.</para>
       </listitem>
 
       <listitem>
@@ -2609,28 +2631,6 @@ Comcast 2        0x20000 main       <emphasis role="bold">COM_IF</emphasis>
     class="devicefile">tun*</filename> in the COPY column.</para>
   </section>
 
-  <section>
-    <title>Zone and Chain Names</title>
-
-    <para>For a pair of zones, Shorewall creates two Netfilter chains; one for
-    connections in each direction. The names of these chains are formed by
-    separating the names of the two zones by either "2" or "-".</para>
-
-    <para>Example: Traffic from zone A to zone B would go through chain A2B
-    (think "A to B") or "A-B".</para>
-
-    <para>The default separator is "2" but you can override that by setting
-    ZONE_SEPARATOR="-" in <ulink
-    url="manpages/shorewall.conf.html">shorewall.conf</ulink> (5).</para>
-
-    <para>Zones themselves have names that begin with a letter and are
-    composed of letters, numerals, and "_". The maximum length of a name is
-    dependent on the setting of LOGFORMAT in <ulink
-    url="manpages/shorewall.conf.html">shorewall.conf</ulink> (5). See <ulink
-    url="manpages/shorewall-zones.html">shorewall-zones</ulink> (5) for
-    details.</para>
-  </section>
-
   <section>
     <title>Optional and Required Interfaces</title>