From 9a2ab381ddd5338728f2cdae5b35f98e9f16875c Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 12 Nov 2007 18:54:20 +0000
Subject: [PATCH] Fix typo in Routing-on-one-interface doc

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7646 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 docs/Multiple_Zones.xml | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/docs/Multiple_Zones.xml b/docs/Multiple_Zones.xml
index 04bb9e964..7d30dba84 100644
--- a/docs/Multiple_Zones.xml
+++ b/docs/Multiple_Zones.xml
@@ -239,10 +239,6 @@ loc1                loc                  NONE</programlisting>
 loc1        ipv4
 loc2        ipv4</programlisting>
 
-        <note>
-          <para>Here it doesn't matter which zone is defined first.</para>
-        </note>
-
         <para><filename>/etc/shorewall/interfaces</filename></para>
 
         <programlisting>#ZONE               INTERFACE           BROADCAST
@@ -279,12 +275,8 @@ loc2                loc1                 NONE</programlisting>
     <para><filename>/etc/shorewall/zones</filename></para>
 
     <programlisting>#ZONE       TYPE      OPTIONS
-loc1        ipv4
-loc         ipv4</programlisting>
-
-    <note>
-      <para>the sub-zone (loc1) is defined first!</para>
-    </note>
+loc         ipv4
+loc1:loc    ipv4</programlisting>
 
     <para><filename>/etc/shorewall/interfaces</filename></para>
 
@@ -324,12 +316,8 @@ loc1                loc                  NONE</programlisting>
     <para><filename>/etc/shorewall/zones</filename></para>
 
     <programlisting>#ZONE       TYPE      OPTIONS
-loc1        ipv4
-net         ipv4</programlisting>
-
-    <note>
-      <para>the sub-zone (loc) is defined first!</para>
-    </note>
+net         ipv4
+loc:net     ipv4</programlisting>
 
     <para><filename>/etc/shorewall/interfaces</filename></para>
 
@@ -343,13 +331,14 @@ loc                 eth0:192.168.1.0/24                maclist</programlisting>
 
     <para><filename><filename>/etc/shorewall/masq</filename></filename></para>
 
-    <programlisting>#INTERFACE              SUBNET          ADDRESS
+    <programlisting>#INTERFACE              SOURCE          ADDRESS
 eth0:!192.168.1.0/24    192.168.1.0/24</programlisting>
 
-    <para>Note that the maclist option is specified in
-    <filename>/etc/shorewall/interfaces</filename>. This is to help protect
-    your router from unauthorized access by your friends and neighbors. Start
-    without maclist then add it and configure your <ulink
+    <para>Note that the <emphasis role="bold">maclist</emphasis> option is
+    specified in <filename>/etc/shorewall/interfaces</filename>. This is to
+    help protect your router from unauthorized access by your friends and
+    neighbors. Start without <emphasis role="bold">maclist</emphasis> then add
+    it and configure your <ulink
     url="MAC_Validation.html"><filename>/etc/shorewall/maclist</filename></ulink>
     file when everything else is working.</para>
   </section>