From 5340386750c4860ca6ed54376eb73c125c7930d9 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 29 Nov 2005 21:19:48 +0000
Subject: [PATCH] Add bridge information to DHCP doc

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3094 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-docs2/dhcp.xml            | 19 ++++++++++++++++++-
 Shorewall-docs2/three-interface.xml | 13 +++++--------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/Shorewall-docs2/dhcp.xml b/Shorewall-docs2/dhcp.xml
index 00d6c719f..4fe2c96c7 100755
--- a/Shorewall-docs2/dhcp.xml
+++ b/Shorewall-docs2/dhcp.xml
@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>2004-05-24</pubdate>
+    <pubdate>2005-11-29</pubdate>
 
     <copyright>
       <year>2001</year>
@@ -24,6 +24,8 @@
 
       <year>2004</year>
 
+      <year>2005</year>
+
       <holder>Thomas M. Eastep</holder>
     </copyright>
 
@@ -105,4 +107,19 @@
       </listitem>
     </itemizedlist>
   </section>
+
+  <section>
+    <title>If you wish to pass DHCP requests and responses through a
+    bridge</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>Specify the <quote>dhcp</quote> option for the bridge interface
+        in the <ulink
+        url="Documentation.htm#Interfaces"><filename>/etc/shorewall/interfaces</filename></ulink>
+        file.&nbsp;This will generate rules that will allow DHCP to and from
+        your firewall system as well as through the bridge.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
 </article>
\ No newline at end of file
diff --git a/Shorewall-docs2/three-interface.xml b/Shorewall-docs2/three-interface.xml
index 23beb8104..6667863c2 100755
--- a/Shorewall-docs2/three-interface.xml
+++ b/Shorewall-docs2/three-interface.xml
@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>2005-11-22</pubdate>
+    <pubdate>2005-11-25</pubdate>
 
     <copyright>
       <year>2002-2005</year>
@@ -838,7 +838,7 @@ ACCEPT    <emphasis>&lt;source zone&gt; &lt;destination zone&gt;  &lt;protocol&g
       <programlisting>#ACTION     SOURCE    DEST                PROTO      DEST PORT(S)
 DNS/ACCEPT  net       $FW</programlisting>
 
-      <para>Not using defined actions:</para>
+      <para>Not using defined macros:</para>
 
       <programlisting>#ACTION   SOURCE    DEST                PROTO      DEST PORT(S)                      
 ACCEPT    net       $FW                 tcp        53
@@ -942,15 +942,12 @@ ACCEPT    net       $FW                 tcp        80       </programlisting><it
     configures your system to start Shorewall at system boot but startup is
     disabled so that your system won't try to start Shorewall before
     configuration is complete. Once you have completed configuration of your
-    firewall, you can enable Shorewall startup by removing the file
-    <filename>/etc/shorewall/startup_disabled</filename>. <important>
+    firewall, you can enable Shorewall startup by editing
+    <filename>/etc/shorewall/shorewall.conf</filename> and setting
+    STARTUP_ENABLED=Yes.<important>
         <para>Users of the <filename>.deb</filename> package must edit
         <filename>/etc/default/shorewall</filename> and set
         <varname>startup=1</varname>.</para>
-      </important><important>
-        <para>You should edit
-        <filename>/etc/shorewall/shorewall.conf</filename> and set
-        STARTUP_ENABLED=Yes.</para>
       </important>The firewall is started using the <command>shorewall
     start</command> command and stopped using <command>shorewall
     stop</command>. When the firewall is stopped, routing is enabled on those