Tweaks to documents

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5192 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

docs/CompiledPrograms.xml

@@ -435,12 +435,20 @@ clean:
       </listitem>
     </orderedlist>
 
-    <para>There is a <filename>shorewall.conf</filename> file installed as
+    <para>There is a <filename>shorewall-lite.conf</filename> file installed
-    part of Shorewall Lite
+    as part of Shorewall Lite
-    (<filename>/etc/shorewall-lite/shorewall.conf</filename>). You can use
+    (<filename>/etc/shorewall-lite/shorewall-lite.conf</filename>). You can
-    that file on the firewall system to override some of the settings from the
+    use that file on the firewall system to override some of the settings from
-    shorewall.conf file in the export directory. Settings that you can
+    the shorewall.conf file in the export directory.</para>
-    override are:</para>
+
+    <important>
+      <para>In Shorewall 3.2.*, the name of the file was
+      <filename>/etc/shorewall-lite/shorewall.conf</filename> -- it was
+      changed to <filename>shorewall-lite.conf</filename> in version
+      3.4.0.</para>
+    </important>
+
+    <para>Settings that you can override are:</para>
 
     <blockquote>
       <simplelist>
@@ -463,7 +471,7 @@ clean:
     </blockquote>
 
     <para>You will normally not need to touch
-    <filename>/etc/shorewall-lite/shorewall.conf</filename>.</para>
+    <filename>/etc/shorewall-lite/shorewall-lite.conf</filename>.</para>
 
     <para>The <filename>/sbin/shorewall-lite</filename> program included with
     Shorewall Lite supports the same set of commands as the

docs/Documentation.xml

@@ -2869,7 +2869,7 @@ eth0                  eth1            206.124.146.176</programlisting>
     <title>/etc/shorewall/shorewall.conf</title>
 
     <para>See also the <ulink url="CompiledPrograms.html#Lite">description of
-    /etc/shorewall-lite/shorewall.conf</ulink>.</para>
+    /etc/shorewall-lite/shorewall-lite.conf</ulink>.</para>
 
     <para>This file is used to set the following firewall parameters:</para>
 

docs/ScalabilityAndPerformance.xml

@@ -107,14 +107,14 @@
     <para>Shorewall is written entirely in Bourne Shell. While this allows
     Shorewall to run on a wide range of distributions (included embedded
     ones), the shell programming environment is not ideal for writing the
-    compiler portion of Shorewall. As a consequency, the code must repeatedly
+    compiler portion of Shorewall. As a consequence, the code must repeatedly
     perform sequential searches of lists. If a list has <emphasis
-    role="bold">N</emphasis> elements (<emphasis role="bold">N</emphasis> &gt;
+    role="bold">N</emphasis> elements and a sequential search is made for each
-    1) and a sequential search is made for each of those elements, then the
+    of those elements, then the number of comparisons is 1 + 2 + 3 + .... +
-    number of comparisons is 1 + 2 + 3 + .... + <emphasis
+    <emphasis role="bold">N</emphasis> = <emphasis role="bold">N</emphasis> *
-    role="bold">N</emphasis> = <emphasis role="bold">N</emphasis> * (<emphasis
+    (<emphasis role="bold">N</emphasis> + 1 ) / 2. So again, we see order
-    role="bold">N</emphasis> - 1 ). So again, we see order <emphasis
+    <emphasis role="bold">N</emphasis><superscript>2</superscript>
-    role="bold">N</emphasis><superscript>2</superscript> scaling.</para>
+    scaling.</para>
   </section>
 
   <section>
@@ -145,11 +145,11 @@
     linearly with the number of rules whereas it scales geometrically with the
     number of zones.</para>
 
-    <para>Another tip worth noting has to do with the use of shell variables.
+    <para>Another tip worth noting has to do with the use of shell
-    </para>
+    variables.</para>
 
     <para>Suppose that the following appears in
-    <filename>/etc/shorewall/params</filename>: </para>
+    <filename>/etc/shorewall/params</filename>:</para>
 
     <programlisting>HOSTS=&lt;ip1&gt;,&lt;ip2&gt;,&lt;ip3&gt;,...&lt;ipN&gt;</programlisting>