From 5c9c9d97fd75d23ff833d54de2dca2a532f58f8a Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 5 Jan 2004 15:50:12 +0000
Subject: [PATCH] More standards work

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1058 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-docs/FTP.xml                        |  6 +--
 .../starting_and_stopping_shorewall.xml       | 44 ++++++++++---------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/Shorewall-docs/FTP.xml b/Shorewall-docs/FTP.xml
index bc104ce82..40a09696b 100644
--- a/Shorewall-docs/FTP.xml
+++ b/Shorewall-docs/FTP.xml
@@ -49,7 +49,7 @@
 
         <para>and at a root shell prompt:</para>
 
-        <programlisting><emphasis role="bold">shorewall restart</emphasis></programlisting>
+        <programlisting><command>shorewall restart</command></programlisting>
       </listitem>
 
       <listitem>
@@ -207,7 +207,7 @@ ftp&#62;</programlisting>
     command. The &#60;<emphasis>kernel-version</emphasis>&#62; may be obtained
     by typing</para>
 
-    <programlisting>uname -r</programlisting>
+    <programlisting><command>uname -r</command></programlisting>
 
     <example>
       <title></title>
@@ -292,7 +292,7 @@ options ip_nat_ftp ports=21,49</programlisting>
 
       <para><important><para>Once you have made these changes to
       /etc/shorewall/modules and/or /etc/modules.conf, you must either:</para><orderedlist><listitem><para>Unload
-      the modules and restart shorewall:</para><programlisting>rmmod ip_nat_ftp; rmmod ip_conntrack_ftp; shorewall restart</programlisting></listitem><listitem><para>Reboot</para></listitem></orderedlist></important></para>
+      the modules and restart shorewall:</para><programlisting><command>rmmod ip_nat_ftp; rmmod ip_conntrack_ftp; shorewall restart</command></programlisting></listitem><listitem><para>Reboot</para></listitem></orderedlist></important></para>
     </example>
 
     <para>One problem that I see occasionally involves active mode and the FTP
diff --git a/Shorewall-docs/starting_and_stopping_shorewall.xml b/Shorewall-docs/starting_and_stopping_shorewall.xml
index bc4870d34..9ce640a6c 100755
--- a/Shorewall-docs/starting_and_stopping_shorewall.xml
+++ b/Shorewall-docs/starting_and_stopping_shorewall.xml
@@ -15,10 +15,10 @@
       </author>
     </authorgroup>
 
-    <pubdate>2003-12-29</pubdate>
+    <pubdate>2004-01-04</pubdate>
 
     <copyright>
-      <year>2001-2003</year>
+      <year>2001-2004</year>
 
       <holder>Thomas M. Eastep</holder>
     </copyright>
@@ -48,8 +48,9 @@
         <listitem>
           <para>Shorewall startup is disabled by default. Once you have
           configured your firewall, you can enable startup by removing the
-          file /etc/shorewall/startup_disabled. Note: Users of the .deb
-          package must edit /etc/default/shorewall and set <quote>startup=1</quote>.</para>
+          file <filename>/etc/shorewall/startup_disabled</filename>. Note:
+          Users of the .deb package must edit <filename>/etc/default/shorewall</filename>
+          and set <quote>startup=1</quote>.</para>
         </listitem>
 
         <listitem>
@@ -80,15 +81,16 @@
       <listitem>
         <para><command>shorewall stop</command> - stops the firewall; the only
         traffic permitted through the firewall is from systems listed in
-        /etc/shorewall/routestopped (Beginning with version 1.4.7, if
-        ADMINISABSENTMINDED=Yes in /etc/shorewall/shorewall.conf then in
-        addition, all existing connections are permitted and any new
+        <filename>/etc/shorewall/routestopped</filename> (Beginning with
+        version 1.4.7, if ADMINISABSENTMINDED=Yes in <filename>/etc/shorewall/shorewall.conf</filename>
+        then in addition, all existing connections are permitted and any new
         connections originating from the firewall itself are allowed).</para>
       </listitem>
 
       <listitem>
-        <para><command>shorewall restart </command>- stops the firewall (if
-        it&#39;s running) and then starts it again</para>
+        <para><command>shorewall restart </command>- stops the firewall (if it
+        is in the <emphasis role="bold">Started</emphasis> state) and then
+        starts it again</para>
       </listitem>
 
       <listitem>
@@ -127,20 +129,20 @@
 
       <listitem>
         <para><command>shorewall show &#60;chain1&#62; [ &#60;chain2&#62; ...
-        ]</command> - produce a verbose report about the listed chains
-        (iptables -L chain -n -v) Note: You may only list one chain in the
+        ]</command> - produce a verbose report about the listed chains (<command>iptables
+        -L chain -n -v</command>) Note: You may only list one chain in the
         show command when running Shorewall version 1.4.6 and earlier. Version
         1.4.7 and later allow you to list multiple chains in one command.</para>
       </listitem>
 
       <listitem>
         <para><command>shorewall show nat</command> - produce a verbose report
-        about the nat table (iptables -t nat -L -n -v)</para>
+        about the nat table (<command>iptables -t nat -L -n -v</command>)</para>
       </listitem>
 
       <listitem>
         <para><command>shorewall show tos</command> - produce a verbose report
-        about the mangle table (iptables -t mangle -L -n -v)</para>
+        about the mangle table (<command>iptables -t mangle -L -n -v</command>)</para>
       </listitem>
 
       <listitem>
@@ -168,8 +170,8 @@
 
       <listitem>
         <para><command>shorewall hits</command> - Produces several reports
-        about the Shorewall packet log messages in the current
-        /var/log/messages file.</para>
+        about the Shorewall packet log messages in the current log file named
+        in the LOGFILE variable in <filename>/etc/shorewall/shorewall.conf</filename>.</para>
       </listitem>
 
       <listitem>
@@ -289,12 +291,13 @@
      <command>shorewall try &#60;configuration-directory&#62;</command></programlisting>
 
     <para>If a <emphasis>&#60;configuration-directory</emphasis>&#62; is
-    specified, each time that Shorewall is going to use a file in
-    /etc/shorewall it will first look in the<emphasis>
+    specified, each time that Shorewall is going to use a file in <filename
+    class="directory">/etc/shorewall</filename> it will first look in the<emphasis>
     &#60;configuration-directory&#62;</emphasis> . If the file is present in
     the <emphasis>&#60;configuration-directory&#62;,</emphasis> that file will
-    be used; otherwise, the file in /etc/shorewall will be used. When changing
-    the configuration of a production firewall, I recommend the following:</para>
+    be used; otherwise, the file in <filename class="directory">/etc/shorewall</filename>
+    will be used. When changing the configuration of a production firewall, I
+    recommend the following:</para>
 
     <itemizedlist>
       <listitem>
@@ -461,7 +464,8 @@
   <appendix>
     <title>Revision History</title>
 
-    <para><revhistory><revision><revnumber>1.2</revnumber><date>2003-12-31</date><authorinitials>TE</authorinitials><revremark>Added
+    <para><revhistory><revision><revnumber>1.3-1.8</revnumber><date>2004-01-04</date><authorinitials>TE</authorinitials><revremark>Docbook
+    standards</revremark></revision><revision><revnumber>1.2</revnumber><date>2003-12-31</date><authorinitials>TE</authorinitials><revremark>Added
     clarification about &#34;Started State&#34;</revremark></revision><revision><revnumber>1.1</revnumber><date>2003-12-29</date><authorinitials>TE</authorinitials><revremark>Initial
     Docbook conversion</revremark></revision></revhistory></para>
   </appendix>