From eac128b5e261c8a418557fbd1db5ccd93f7bca19 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sat, 20 Nov 2010 13:51:16 -0800
Subject: [PATCH] Add routes file to manpage indexes; modify links in the
 features page

---
 docs/Manpages.xml           |  6 ++++++
 docs/Manpages6.xml          |  6 ++++++
 docs/shorewall_features.xml | 10 +++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/Manpages.xml b/docs/Manpages.xml
index 2e1dda1d8..c76b1fa10 100644
--- a/docs/Manpages.xml
+++ b/docs/Manpages.xml
@@ -24,6 +24,8 @@
 
       <year>2009</year>
 
+      <year>2010</year>
+
       <holder>Thomas M. Eastep</holder>
     </copyright>
 
@@ -125,6 +127,10 @@
         url="manpages/shorewall-route_rules.html">route_rules</ulink> - Define
         routing rules.</member>
 
+        <member><ulink url="manpages/shorewall-routes.html">routes</ulink> -
+        (Added in Shorewall 4.4.15) Add additional routes to provider routing
+        tables.</member>
+
         <member><ulink
         url="manpages/shorewall-routestopped.html">routestopped</ulink> -
         Specify connections to be permitted when Shorewall is in the stopped
diff --git a/docs/Manpages6.xml b/docs/Manpages6.xml
index 1ec2e329f..7ca286513 100644
--- a/docs/Manpages6.xml
+++ b/docs/Manpages6.xml
@@ -24,6 +24,8 @@
 
       <year>2009</year>
 
+      <year>2010</year>
+
       <holder>Thomas M. Eastep</holder>
     </copyright>
 
@@ -106,6 +108,10 @@
         url="manpages6/shorewall6-route_rules.html">route_rules</ulink> -
         Define routing rules.</member>
 
+        <member><ulink url="manpages6/shorewall6-routes.html">routes</ulink> -
+        (Added in Shorewall 4.4.15) Add additional routes to provider routing
+        tables.</member>
+
         <member><ulink
         url="manpages6/shorewall6-routestopped.html">routestopped</ulink> -
         Specify connections to be permitted when Shorewall6 is in the stopped
diff --git a/docs/shorewall_features.xml b/docs/shorewall_features.xml
index ab2237d66..82cb9d86a 100644
--- a/docs/shorewall_features.xml
+++ b/docs/shorewall_features.xml
@@ -5,7 +5,7 @@
   <!--$Id$-->
 
   <articleinfo>
-    <title>Shorewall Features</title>
+    <title>Shorewall 4.4 Features</title>
 
     <author>
       <firstname>Tom</firstname>
@@ -142,13 +142,13 @@
           </listitem>
 
           <listitem>
-            <para><ulink url="netmap.html">NETMAP</ulink> (requires a 2.6
-            kernel or a patched 2.4 kernel).</para>
+            <para><ulink url="netmap.html">NETMAP</ulink>.</para>
           </listitem>
 
           <listitem>
             <para><ulink url="Shorewall_and_Routing.html">Multiple ISP
-            support</ulink></para>
+            support</ulink> (Multiple Internet Links from the same
+            firewall/gateway)</para>
           </listitem>
         </itemizedlist>
       </listitem>
@@ -196,7 +196,7 @@
       </listitem>
 
       <listitem>
-        <para>Support for <ulink url="traffic_shaping.htm"><emphasis
+        <para>Support for <ulink url="simple_traffic_shaping.html"><emphasis
         role="bold">Traffic</emphasis> Control/<emphasis
         role="bold">Shaping</emphasis></ulink>.</para>
       </listitem>