From 7b5f00297658e0c387442590e972a0327a273bcc Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 20 Mar 2006 19:01:05 +0000
Subject: [PATCH] More doc updates

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3707 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 docs/XenMyWay.xml | 11 ++++++++++-
 docs/bridge.xml   |  9 ++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/XenMyWay.xml b/docs/XenMyWay.xml
index b82429c58..c76ce1b2b 100644
--- a/docs/XenMyWay.xml
+++ b/docs/XenMyWay.xml
@@ -360,6 +360,11 @@ SECTION NEW
 
       <graphic align="center" fileref="images/network4.png" />
 
+      <para>The two laptops can be directly attached to the LAN as shown above
+      or they can be attached wirelessly through the <link
+      linkend="Wireless">wireless gateway</link> -- their IP addresses are the
+      same in either case.</para>
+
       <para>The Shorewall configuration files are shown below. All routing and
       secondary IP addresses are handled in the SuSE network
       configuration.</para>
@@ -699,7 +704,11 @@ DROP            net:82.96.96.3                          all
       connection. This configuration illustrates that you can use any Linux
       system on your internal LAN as a wireless gateway -- it doesn't have to
       be your main firewall (and it doesn't have to run in a Xen domain
-      either).</para>
+      either). The wireless gateway runs a DHCP server that assigns wireless
+      hosts an IP address in 192.168.3.0/24 -- The OpenVPN server running on
+      the gateway assigns its clients an IP address in 192.168.1.0/24 so,
+      thanks to bridging, these clients appear to be physically attached to
+      the LAN).</para>
 
       <graphic align="center" fileref="images/Xen6.png" />
 
diff --git a/docs/bridge.xml b/docs/bridge.xml
index 98d44f83e..430b654de 100644
--- a/docs/bridge.xml
+++ b/docs/bridge.xml
@@ -15,13 +15,15 @@
       </author>
     </authorgroup>
 
-    <pubdate>2005-10-21</pubdate>
+    <pubdate>2006-03-20</pubdate>
 
     <copyright>
       <year>2004</year>
 
       <year>2005</year>
 
+      <year>2006</year>
+
       <holder>Thomas M. Eastep</holder>
     </copyright>
 
@@ -96,6 +98,11 @@
         CONFIG_BRIDGE=y).</para>
       </listitem>
 
+      <listitem>
+        <para>Your kernel must contain bridge/netfilter integration
+        (CONFIG_BRIDGE_NETFILTER=y).</para>
+      </listitem>
+
       <listitem>
         <para>Your kernel must contain Netfilter physdev match support
         (CONFIG_IP_NF_MATCH_PHYSDEV=m or CONFIG_IP_NF_MATCH_PHYSDEV=y).