From 2a498b440312e2ef48911d3dc3cf3e96a3532eb9 Mon Sep 17 00:00:00 2001
From: judas_iscariote <judas_iscariote@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 27 May 2005 05:23:56 +0000
Subject: [PATCH] Adds multiple ISP feature

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2181 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-docs2/shorewall_features.xml | 46 +++++++++++++++++---------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/Shorewall-docs2/shorewall_features.xml b/Shorewall-docs2/shorewall_features.xml
index 1c54f7816..82bb6e828 100644
--- a/Shorewall-docs2/shorewall_features.xml
+++ b/Shorewall-docs2/shorewall_features.xml
@@ -13,7 +13,7 @@
       <surname>Eastep</surname>
     </author>
 
-    <pubdate>2004-06-08</pubdate>
+    <pubdate>2005-05-27</pubdate>
 
     <copyright>
       <year>2001-2004</year>
@@ -27,7 +27,8 @@
       1.2 or any later version published by the Free Software Foundation; with
       no Invariant Sections, with no Front-Cover, and with no Back-Cover
       Texts. A copy of the license is included in the section entitled
-      <quote><ulink url="GnuCopyright.htm">GNU Free Documentation License</ulink></quote>.</para>
+      <quote><ulink url="GnuCopyright.htm">GNU Free Documentation
+      License</ulink></quote>.</para>
     </legalnotice>
   </articleinfo>
 
@@ -36,7 +37,7 @@
 
     <itemizedlist>
       <listitem>
-        <para>Uses Netfilter&#39;s connection tracking facilities for stateful
+        <para>Uses Netfilter's connection tracking facilities for stateful
         packet filtering.</para>
       </listitem>
 
@@ -56,7 +57,8 @@
           <listitem>
             <para>Allows you to partition the network into <ulink
             url="Documentation.htm#Zones">zones</ulink> and gives you complete
-            control over the connections permitted between each pair of zones.</para>
+            control over the connections permitted between each pair of
+            zones.</para>
           </listitem>
 
           <listitem>
@@ -78,7 +80,8 @@
 
       <listitem>
         <para>A <emphasis role="bold">GUI</emphasis> is available via Webmin
-        1.060 and later (<ulink url="http://www.webmin.com">http://www.webmin.com</ulink>)</para>
+        1.060 and later (<ulink
+        url="http://www.webmin.com">http://www.webmin.com</ulink>)</para>
       </listitem>
 
       <listitem>
@@ -89,15 +92,18 @@
 
       <listitem>
         <para><emphasis role="bold">Flexible address management/routing
-        support</emphasis> (and you can use all types in the same firewall):</para>
+        support</emphasis> (and you can use all types in the same
+        firewall):</para>
 
         <itemizedlist>
           <listitem>
-            <para><ulink url="Documentation.htm#Masq">Masquerading/SNAT</ulink>.</para>
+            <para><ulink
+            url="Documentation.htm#Masq">Masquerading/SNAT</ulink>.</para>
           </listitem>
 
           <listitem>
-            <para><ulink url="FAQ.htm#faq1">Port Forwarding (DNAT)</ulink>.</para>
+            <para><ulink url="FAQ.htm#faq1">Port Forwarding
+            (DNAT)</ulink>.</para>
           </listitem>
 
           <listitem>
@@ -112,6 +118,11 @@
             <para><ulink url="netmap.html">NETMAP</ulink> (requires a 2.6
             kernel or a patched 2.4 kernel).</para>
           </listitem>
+
+          <listitem>
+            <para><ulink url="Shorewall_and_Routing.html">Multiple ISP
+            support</ulink></para>
+          </listitem>
         </itemizedlist>
       </listitem>
 
@@ -151,16 +162,17 @@
           </listitem>
 
           <listitem>
-            <para><ulink url="PPTP.htm">PPTP</ulink> clients and Servers.</para>
+            <para><ulink url="PPTP.htm">PPTP</ulink> clients and
+            Servers.</para>
           </listitem>
         </itemizedlist>
       </listitem>
 
       <listitem>
         <para>Support for <ulink url="traffic_shaping.htm"><emphasis
-        role="bold">Traffic</emphasis> Control/<emphasis role="bold">Shaping</emphasis></ulink>
-        integration (although Shorewall itself contains no Traffic/Bandwidth
-        control facilities).</para>
+        role="bold">Traffic</emphasis> Control/<emphasis
+        role="bold">Shaping</emphasis></ulink> integration (although Shorewall
+        itself contains no Traffic/Bandwidth control facilities).</para>
       </listitem>
 
       <listitem>
@@ -177,7 +189,7 @@
           <listitem>
             <para>Includes automated <ulink url="Install.htm">install,
             upgrade, fallback and uninstall facilities</ulink> for users who
-            can&#39;t use or choose not to use the RPM or Debian packages.</para>
+            can't use or choose not to use the RPM or Debian packages.</para>
           </listitem>
 
           <listitem>
@@ -190,7 +202,8 @@
 
       <listitem>
         <para><ulink url="MAC_Validation.html">Media Access Control (<emphasis
-        role="bold">MAC</emphasis>) Address <emphasis role="bold">Verification</emphasis></ulink>.</para>
+        role="bold">MAC</emphasis>) Address <emphasis
+        role="bold">Verification</emphasis></ulink>.</para>
       </listitem>
 
       <listitem>
@@ -199,8 +212,9 @@
       </listitem>
 
       <listitem>
-        <para><ulink url="bridge.html"><emphasis role="bold">Bridge</emphasis>/Firewall
-        support</ulink> (requires a 2.6 kernel or a patched 2.4 kernel).</para>
+        <para><ulink url="bridge.html"><emphasis
+        role="bold">Bridge</emphasis>/Firewall support</ulink> (requires a 2.6
+        kernel or a patched 2.4 kernel).</para>
       </listitem>
     </itemizedlist>
   </section>