From f5378e765277fc9a01187ea728f16c4a8df3aefa Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sat, 28 Nov 2009 07:18:46 -0800
Subject: [PATCH] Revert "More doc updates for virtual zones"

This reverts commit a37e56d823ea9959e362026836fa0541df9a6210.
---
 Shorewall/releasenotes.txt   |  4 ++--
 manpages/shorewall-zones.xml | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index baa61f92f..bbf58a8d2 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -245,7 +245,7 @@ None.
     derives from the fact that each virtual zone requires 2 bits in the
     packet mark).
 
-    Virtual zones are used as parent zones for other zones using the
+    Virtual zones are use as parent zones for other zones using the
     <zone>:<parent> syntax in /etc/shorewall/zones:
 
     Example:
@@ -254,7 +254,7 @@ None.
     	loc:virt		ipv4
     	vpn:virt		ipsec    
 
-    As shown in the example, a virtual zone may be a parent for
+    As shown in that example, a virtual zone may be a parent for
     multiple zone types.
     
     Virtual zones are intended to be used with
diff --git a/manpages/shorewall-zones.xml b/manpages/shorewall-zones.xml
index ac9057b06..dbbdc2e3a 100644
--- a/manpages/shorewall-zones.xml
+++ b/manpages/shorewall-zones.xml
@@ -169,17 +169,6 @@ c:a,b     ipv4</programlisting>
                 single bridge.</para>
               </listitem>
             </varlistentry>
-
-            <varlistentry>
-              <term><emphasis role="bold">virtual</emphasis></term>
-
-              <listitem>
-                <para>Added in Shorewall 4.4.5. Virtual zones are containers
-                for other zones. See <ulink
-                url="shorewall-nesting.html">shorewall-nesting (5)</ulink> for
-                details.</para>
-              </listitem>
-            </varlistentry>
           </variablelist>
         </listitem>
       </varlistentry>