From ac8c7ed7d4af08440c1b252c5120099671f86a21 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 3 Oct 2010 14:12:38 -0700
Subject: [PATCH] Updating bridge documents

---
 docs/Documentation_Index.xml   | 6 +++---
 docs/bridge-Shorewall-perl.xml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/Documentation_Index.xml b/docs/Documentation_Index.xml
index 5d7cf8ff9..97bfc4053 100644
--- a/docs/Documentation_Index.xml
+++ b/docs/Documentation_Index.xml
@@ -136,7 +136,7 @@
 
           <row>
             <entry>Bridge: <ulink
-            url="bridge-Shorewall-perl.html">Shorewall-perl</ulink></entry>
+            url="bridge-Shorewall-perl.html">Bridge/Firewall</ulink></entry>
 
             <entry><ulink url="MultiISP.html">Multiple Internet Connections
             from a Single Firewall</ulink> (<ulink
@@ -147,8 +147,8 @@
           </row>
 
           <row>
-            <entry>Bridge: <ulink url="SimpleBridge.html">No control of
-            traffic through the bridge</ulink></entry>
+            <entry>Bridge: <ulink url="SimpleBridge.html">No firewalling of
+            traffic between bridge port</ulink></entry>
 
             <entry><ulink url="Multiple_Zones.html">Multiple Zones Through One
             Interface</ulink></entry>
diff --git a/docs/bridge-Shorewall-perl.xml b/docs/bridge-Shorewall-perl.xml
index 5dc80f109..f544137c1 100644
--- a/docs/bridge-Shorewall-perl.xml
+++ b/docs/bridge-Shorewall-perl.xml
@@ -5,7 +5,7 @@
   <!--$Id$-->
 
   <articleinfo>
-    <title>Shorewall-perl and Bridged Firewalls</title>
+    <title>Bridged Firewalls</title>
 
     <authorgroup>
       <author>
@@ -37,7 +37,7 @@
   </articleinfo>
 
   <caution>
-    <para><emphasis role="bold">This article applies to Shorewall-perl 4.3 and
+    <para><emphasis role="bold">This article applies to Shorewall 4.4 and
     later.</emphasis></para>
   </caution>
 
@@ -533,7 +533,7 @@ rc-update add bridge boot
     source bridge port.</para>
 
     <para>To deal with the asymmetric nature of the new physdev match,
-    Shorewall-perl supports a new type of zone - a <firstterm>Bridge
+    Shorewall supports a new type of zone - a <firstterm>Bridge
     Port</firstterm> (BP) zone. Bridge port zones have a number of
     restrictions:</para>
 
@@ -559,7 +559,7 @@ rc-update add bridge boot
 
     <para>In /etc/shorewall/zones, BP zones are specified using the <emphasis
     role="bold">bport</emphasis> (or <emphasis role="bold">bport4</emphasis>)
-    keyword. Shorewall perl requires that BRIDGING=No in
+    keyword. Shorewall 4.4 or later requires that BRIDGING=No in
     <filename>shorewall.conf</filename>.</para>
 
     <para>In the scenario pictured above, there would probably be two BP zones