From c9035e02343f27e45d70dc380bfb7f654d13b2f9 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 17 Dec 2003 18:56:56 +0000
Subject: [PATCH] Move FAQ abstract to the document body

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@877 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-docs/FAQ.xml                     | 35 ++++++++++++++++++----
 Shorewall-docs/shorewall_prerequisites.xml |  2 +-
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/Shorewall-docs/FAQ.xml b/Shorewall-docs/FAQ.xml
index 38ae2398a..5d2ec41aa 100644
--- a/Shorewall-docs/FAQ.xml
+++ b/Shorewall-docs/FAQ.xml
@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>2003-12-13</pubdate>
+    <pubdate>2003-12-16</pubdate>
 
     <copyright>
       <year>2001</year>
@@ -37,6 +37,18 @@
     </legalnotice>
 
     <revhistory>
+      <revision>
+        <revnumber>1.5</revnumber>
+
+        <date>2003-12-16</date>
+
+        <authorinitials>TE</authorinitials>
+
+        <revremark>Added a link to a Sys Admin article about multiple internet
+        interfaces. Added Legal Notice. Moved &#34;abstract&#34; to the body
+        of the document.</revremark>
+      </revision>
+
       <revision>
         <revnumber>1.4</revnumber>
 
@@ -87,13 +99,20 @@
         <revremark>Initial revision</revremark>
       </revision>
     </revhistory>
-
-    <abstract>
-      <para>Looking for Step by Step Configuration Instructions? Check out the
-      <ulink url="shorewall_quickstart_guide.htm">QuickStart Guides</ulink>.</para>
-    </abstract>
   </articleinfo>
 
+  <section>
+    <title>Installing Shorewall</title>
+
+    <section>
+      <title>Where do I find Step by Step Installation and Configuration
+      Instructions?</title>
+
+      <para><emphasis role="bold">Answer:</emphasis> Check out the <ulink
+      url="shorewall_quickstart_guide.htm">QuickStart Guides</ulink>.</para>
+    </section>
+  </section>
+
   <section>
     <title>Port Forwarding</title>
 
@@ -1351,6 +1370,10 @@ run_iptables -A common -p udp --sport 53 -mstate --state NEW -j DROP</programlis
         </tgroup>
       </informaltable>
 
+      <para><citetitle>There was an article in SysAdmin covering this topic.
+      It may be found at <ulink
+      url="http://www.samag.com/documents/s=1824/sam0201h/">http://www.samag.com/documents/s=1824/sam0201h/</ulink></citetitle></para>
+
       <para><citetitle>The following information regarding setting up routing
       for this configuration is reproduced from the <ulink
       url="http://www.lartc.org">LARTC HOWTO</ulink> and has not been verified
diff --git a/Shorewall-docs/shorewall_prerequisites.xml b/Shorewall-docs/shorewall_prerequisites.xml
index d77ef61a2..07d7a9fce 100755
--- a/Shorewall-docs/shorewall_prerequisites.xml
+++ b/Shorewall-docs/shorewall_prerequisites.xml
@@ -55,7 +55,7 @@
       <listitem>
         <para>Iproute (&#34;ip&#34; utility). The iproute package is included
         with most distributions but may not be installed by default. The
-        official download site is <ulink target="_top" type=""
+        official download site is <ulink type="remote"
         url="ftp://ftp.inr.ac.ru/ip-routing">ftp://ftp.inr.ac.ru/ip-routing</ulink>.</para>
       </listitem>