From 0e49b9ced8657c9ee9b55aa56ea2fe543caf2d59 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 31 Jan 2009 17:27:24 +0000
Subject: [PATCH] Fix typo in the 6to4 doc; document use of dhcpcd interface

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9380 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 docs/6to4.xml               |  2 +-
 docs/MultiISP.xml           | 18 +++++++++++-------
 manpages/shorewall.conf.xml |  8 +++++++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/docs/6to4.xml b/docs/6to4.xml
index 467e6a815..9c40edc4f 100644
--- a/docs/6to4.xml
+++ b/docs/6to4.xml
@@ -119,7 +119,7 @@ INTERFACES="eth2 eth4"
 SLA=1
 GATEWAY=::192.88.99.1</programlisting>
 
-      <para>eth3 is the interface to my local network (both wired and
+      <para>eth2 is the interface to my local network (both wired and
       wireless). eth4 goes to my DMZ which holds a single server. Here is a
       diagram of the IPv4 network:</para>
 
diff --git a/docs/MultiISP.xml b/docs/MultiISP.xml
index 2b2fad4b8..ece88b7c9 100644
--- a/docs/MultiISP.xml
+++ b/docs/MultiISP.xml
@@ -1040,7 +1040,12 @@ gateway:~ #</programlisting>Note that because we used a priority of 1000, the
         <listitem>
           <para>All provider gateways must be specified explicitly in the
           GATEWAY column. 'detect' may not be specified. Note that for ppp
-          interfaces, the GATEWAY may remain unspecified ("-").</para>
+          interfaces, the GATEWAY may remain unspecified ("-").<note>
+              <para>Beginning with Shorewall 4.2.6, 'detect' may be specified
+              for interfaces whose configuration is managed by dhcpcd.
+              Shorewall will use dhcpcd's database to determine the gateway IP
+              address.</para>
+            </note></para>
         </listitem>
 
         <listitem>
@@ -1114,7 +1119,9 @@ COMMANDB="ip -$FAMILY route ls"
 IF1=eth0
 IF2=eth1
 #
-# Sites to Ping. Must not depend on the associated interface having a default route through it.
+# Sites to Ping. Must depend only on routes in the 'main' routing table. If not specified,
+# the interface is assumed to be managed by dhcpcd and the script uses the gateway address
+# from /var/lib/dhcpcd/dhcpcd-${IFx}.info
 #
 TARGET1=
 TARGET2=
@@ -1519,11 +1526,8 @@ Comcast     2 0x200 main      eth3      detect          track,balance
     <para>The <emphasis role="bold">loose</emphasis> option on Avvanta results
     in fewer routing rules. The first two routing rules below insure that all
     traffic from Avvanta-assigned IP addresses is sent via the Avvanta
-    provider. Note that because the Comcast line has a dynamic IP address, I
-    am not able to use USE_DEFAULT_RT=Yes in
-    <filename>/etc/shorewall/shorewall.conf</filename>. The 'tun*' included in
-    the COPY column is there because I run a routed OpenVPN server on the
-    firewall.</para>
+    provider. The 'tun*' included in the COPY column is there because I run a
+    routed OpenVPN server on the firewall.</para>
 
     <para><filename>/etc/shorewall/route_rules</filename>:</para>
 
diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml
index 56c25160f..7526a3384 100644
--- a/manpages/shorewall.conf.xml
+++ b/manpages/shorewall.conf.xml
@@ -1614,7 +1614,13 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
             <listitem>
               <para>All provider gateways must be specified explicitly in the
               GATEWAY column. <emphasis role="bold">detect</emphasis> may not
-              be specified.</para>
+              be specified.<note>
+                  <para>Beginning with Shorewall 4.2.6, <emphasis
+                  role="bold">detect</emphasis> may be specified for
+                  interfaces whose configuration is managed by dhcpcd.
+                  Shorewall will use dhcpcd's database to find the
+                  interfaces's gateway.</para>
+                </note></para>
             </listitem>
 
             <listitem>