From 3cc17289373f8be9bd708c6a1e48a0a89e14775f Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 25 Jun 2007 17:02:46 +0000
Subject: [PATCH] Updates to bridging docs

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6668 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 docs/Anatomy.xml                         |  2 +-
 docs/bridge-Shorewall-perl.xml           |  3 ++-
 docs/starting_and_stopping_shorewall.xml |  4 ++++
 manpages/shorewall.xml                   | 14 +++-----------
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/docs/Anatomy.xml b/docs/Anatomy.xml
index 9c92bb091..a41f60a4a 100644
--- a/docs/Anatomy.xml
+++ b/docs/Anatomy.xml
@@ -5,7 +5,7 @@
   <!--$Id$-->
 
   <articleinfo>
-    <title>Anatomy of Shorewall</title>
+    <title>Anatomy of Shorewall 4.0</title>
 
     <authorgroup>
       <author>
diff --git a/docs/bridge-Shorewall-perl.xml b/docs/bridge-Shorewall-perl.xml
index 5e1ebe713..c6b1d3f11 100644
--- a/docs/bridge-Shorewall-perl.xml
+++ b/docs/bridge-Shorewall-perl.xml
@@ -551,7 +551,8 @@ 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.</para>
+    keyword. Shorewall perl requires that BRIDGING=No in
+    <filename>shorewall.conf</filename>.</para>
 
     <para>In the scenario pictured above, there would probably be two BP zones
     defined -- one for the internet and one for the local LAN so in
diff --git a/docs/starting_and_stopping_shorewall.xml b/docs/starting_and_stopping_shorewall.xml
index 5370e4700..c0b70493e 100644
--- a/docs/starting_and_stopping_shorewall.xml
+++ b/docs/starting_and_stopping_shorewall.xml
@@ -105,6 +105,10 @@
 
     <para>The program <emphasis role="bold">/sbin/shorewall-lite</emphasis>
     performs a similar role with Shorewall-lite.</para>
+
+    <para>For a more complete description of the files and directories
+    involved in Shorewall and Shorewall-lite, see the <ulink
+    url="Anatomy.html">Shorewall Anatomy article</ulink>.</para>
   </section>
 
   <section>
diff --git a/manpages/shorewall.xml b/manpages/shorewall.xml
index ea3e04b4c..5d62f3d09 100644
--- a/manpages/shorewall.xml
+++ b/manpages/shorewall.xml
@@ -507,11 +507,7 @@
           defined in the <ulink
           url="shorewall-interfaces.html">shorewall-interfaces</ulink>(5)
           file. A <emphasis>host-list</emphasis> is comma-separated list whose
-          elements are:</para>
-
-          <programlisting>        A host or network address
-        The name of a bridge port
-        The name of a bridge port followed by a colon (:) and a host or network address</programlisting>
+          elements are a host or network address.</para>
         </listitem>
       </varlistentry>
 
@@ -614,11 +610,7 @@
           defined in the <ulink
           url="shorewall-interfaces.html">shorewall-interfaces</ulink>(5)
           file. A <emphasis>host-list</emphasis> is comma-separated list whose
-          elements are:</para>
-
-          <programlisting>        A host or network address
-        The name of a bridge port
-        The name of a bridge port followed by a colon (:) and a host or network address</programlisting>
+          elements are a host or network address.</para>
         </listitem>
       </varlistentry>
 
@@ -1202,7 +1194,7 @@
         <listitem>
           <para>Displays Shorewall's version. If the <option>-a</option>
           option is included, the versions of Shorewall-shell and/or
-          Shorewall-perl will also be displayed. </para>
+          Shorewall-perl will also be displayed.</para>
         </listitem>
       </varlistentry>
     </variablelist>