From a16927dee2d2f66ae1a7b6166fdf7ada441887d8 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 16 Nov 2005 22:00:15 +0000
Subject: [PATCH] Clarify masq file vs multi-ISP

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3010 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-docs2/Shorewall_and_Routing.xml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/Shorewall-docs2/Shorewall_and_Routing.xml b/Shorewall-docs2/Shorewall_and_Routing.xml
index 7a155e969..61dda4229 100644
--- a/Shorewall-docs2/Shorewall_and_Routing.xml
+++ b/Shorewall-docs2/Shorewall_and_Routing.xml
@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>2005-09-25</pubdate>
+    <pubdate>2005-11-16</pubdate>
 
     <copyright>
       <year>2005</year>
@@ -244,11 +244,11 @@
       <para>Entries in <filename>/etc/shorewall/providers</filename> can
       specify that outgoing connections are to be load-balanced between the
       two ISPs. Entries in <filename>/etc/shorewall/tcrules</filename> can be
-      used to direct particular outgoing connections to one ISP or the
-      other. Use of <filename>/etc/shorewall/tcrules</filename> is not
-      required for <filename>/etc/shorewall/providers</filename> to work, but
-      you must select a unique MARK value for each provider so Shorewall can
-      set up the correct marking rules for you.</para>
+      used to direct particular outgoing connections to one ISP or the other.
+      Use of <filename>/etc/shorewall/tcrules</filename> is not required for
+      <filename>/etc/shorewall/providers</filename> to work, but you must
+      select a unique MARK value for each provider so Shorewall can set up the
+      correct marking rules for you.</para>
 
       <para>When using <filename>/etc/shorewall/providers</filename>,
       connections from the internet are automatically routed back out of the
@@ -563,6 +563,13 @@ net        net            DROP</programlisting>
 eth0             eth2              206.124.146.176
 eth1             eth2              130.252.99.27</programlisting>
 
+      <warning>
+        <para>Entries in <filename>/etc/shorewall/masq</filename> have no
+        effect on which ISP a particular connection will be sent through. That
+        is rather the purpuse of entries in
+        <filename>/etc/shorewall/tcrules</filename>.</para>
+      </warning>
+
       <para>Now suppose that you want to route all outgoing SMTP traffic from
       your local network through ISP 2. You would make this entry in <ulink
       url="traffic_shaping.htm">/etc/shorewall/tcrules</ulink> (and you would
@@ -574,4 +581,4 @@ eth1             eth2              130.252.99.27</programlisting>
 2:P             &lt;local network&gt; 0.0.0.0/0       tcp     25</programlisting>
     </section>
   </section>
-</article>
+</article>
\ No newline at end of file