From 0f70e7c95ef024356f8b6337d01b20b1efd4918a Mon Sep 17 00:00:00 2001
From: judas_iscariote <judas_iscariote@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 17 Sep 2005 07:33:49 +0000
Subject: [PATCH] UTSL :-)

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2699 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-docs2/Accounting.xml          |  9 +++++++-
 Shorewall-docs2/Documentation_Index.xml | 30 ++++++++++++++++++++-----
 Shorewall-docs2/html.css                |  4 ++++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/Shorewall-docs2/Accounting.xml b/Shorewall-docs2/Accounting.xml
index e63145bbd..65149afe6 100644
--- a/Shorewall-docs2/Accounting.xml
+++ b/Shorewall-docs2/Accounting.xml
@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>2005-08-28</pubdate>
+    <pubdate>2005-09-16</pubdate>
 
     <copyright>
       <year>2003-2005</year>
@@ -34,6 +34,13 @@
     </legalnotice>
   </articleinfo>
 
+  <caution>
+    <para><emphasis role="bold">This article applies to Shorewall 3.0 and
+    later. If you are running a version of Shorewall earlier than Shorewall
+    3.0.0 then please see the documentation for that
+    release</emphasis>.</para>
+  </caution>
+
   <para>Shorewall accounting rules are described in the file
   /etc/shorewall/accounting. By default, the accounting rules are placed in a
   chain called <quote>accounting</quote> and can thus be displayed using
diff --git a/Shorewall-docs2/Documentation_Index.xml b/Shorewall-docs2/Documentation_Index.xml
index 1a010ca93..2a34e7047 100644
--- a/Shorewall-docs2/Documentation_Index.xml
+++ b/Shorewall-docs2/Documentation_Index.xml
@@ -5,7 +5,7 @@
   <!--$Id$-->
 
   <articleinfo>
-    <title>Shorewall Documentation</title>
+    <title>Shorewall 3.x Documentation</title>
 
     <authorgroup>
       <author>
@@ -23,7 +23,7 @@
       <holder>Thomas M. Eastep</holder>
     </copyright>
 
-    <edition>2.3.0</edition>
+    <edition>2.4.0</edition>
 
     <legalnotice>
       <para>Permission is granted to copy, distribute and/or modify this
@@ -36,6 +36,13 @@
     </legalnotice>
   </articleinfo>
 
+  <caution>
+    <para><emphasis role="bold">This article applies to Shorewall 3.0 and
+    later. If you are running a version of Shorewall earlier than Shorewall
+    3.0.0 then please see the documentation for that
+    release.</emphasis></para>
+  </caution>
+
   <note>
     <para>The complete Shorewall Documentation is <ulink
     url="http://www.shorewall.net/download.htm">available for download</ulink>
@@ -211,6 +218,11 @@
             <para><ulink url="Documentation.htm#Policy">policy</ulink></para>
           </listitem>
 
+          <listitem>
+            <para><ulink
+            url="Shorewall_and_Routing.html">providers</ulink></para>
+          </listitem>
+
           <listitem>
             <para><ulink url="Documentation.htm#Rules">rules</ulink></para>
           </listitem>
@@ -238,6 +250,16 @@
             url="traffic_shaping.htm#tcrules">tcrules</ulink></para>
           </listitem>
 
+          <listitem>
+            <para><ulink
+            url="traffic_shaping.htm#tcclasses">tcclasses</ulink></para>
+          </listitem>
+
+          <listitem>
+            <para><ulink
+            url="traffic_shaping.htm#tcdevices">tcdevices</ulink></para>
+          </listitem>
+
           <listitem>
             <para><ulink
             url="Documentation.htm#Conf">shorewall.conf</ulink></para>
@@ -284,10 +306,6 @@
             action.template</ulink></para>
           </listitem>
 
-          <listitem>
-            <para><ulink url="Documentation.htm#Bogons">bogons</ulink></para>
-          </listitem>
-
           <listitem>
             <para><ulink url="Documentation.htm#Netmap">netmap</ulink></para>
           </listitem>
diff --git a/Shorewall-docs2/html.css b/Shorewall-docs2/html.css
index bac60c157..b42f2f9ea 100644
--- a/Shorewall-docs2/html.css
+++ b/Shorewall-docs2/html.css
@@ -42,3 +42,7 @@ div.informalexample pre    { whitespace: pre;
                              border-bottom-width: 0px;
                              padding: 0px;
                            }
+
+div.caution h3            { color:#CC3333; }
+
+div.note h3               { color:#000066; }
\ No newline at end of file