From 8d220e4fe23436c0094b1f0d421501a2e1456817 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 31 Aug 2007 15:24:45 +0000
Subject: [PATCH] Stress that /etc/shorewall/shorewall.conf is expected to
 exist

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7260 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 docs/PortKnocking.xml                    |  3 +--
 docs/configuration_file_basics.xml       |  8 +++++++-
 docs/starting_and_stopping_shorewall.xml | 11 ++++++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/PortKnocking.xml b/docs/PortKnocking.xml
index 73bd5c6ee..a07284317 100644
--- a/docs/PortKnocking.xml
+++ b/docs/PortKnocking.xml
@@ -58,8 +58,7 @@
 
     <para>In order to implement this solution, your iptables and kernel must
     support the 'recent match' extension (see <ulink url="FAQ.htm#faq42">FAQ
-    42</ulink>). These instructions also assume Shorewall version 2.2.0 or
-    later.</para>
+    42</ulink>).</para>
 
     <para>In this example:</para>
 
diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml
index fc71bbefe..233d5f9be 100644
--- a/docs/configuration_file_basics.xml
+++ b/docs/configuration_file_basics.xml
@@ -842,7 +842,13 @@ DNAT       net        loc:192.168.1.3 tcp       4000:4100</programlisting>
     directory rather than the corresponding files in /etc/shorewall. The
     alternate directory need not contain a complete configuration; those files
     not in the alternate directory will be read from <filename
-    class="directory">/etc/shorewall</filename>.</para>
+    class="directory">/etc/shorewall</filename>.<important>
+        <para>Shorewall requires that the file
+        <filename>/etc/shorewall/shorewall.conf</filename> to always exist.
+        Certain global settings are always obtained from that file. If you
+        create alternative configuration directories, do not remove
+        /etc/shorewall/shorewall.conf.</para>
+      </important></para>
 
     <para>This facility permits you to easily create a test or temporary
     configuration by</para>
diff --git a/docs/starting_and_stopping_shorewall.xml b/docs/starting_and_stopping_shorewall.xml
index e8a5abf14..5e1b7e851 100644
--- a/docs/starting_and_stopping_shorewall.xml
+++ b/docs/starting_and_stopping_shorewall.xml
@@ -429,6 +429,14 @@
         <para><command>shorewall save</command></para>
       </listitem>
     </itemizedlist>
+
+    <important>
+      <para>Shorewall requires that the file
+      <filename>/etc/shorewall/shorewall.conf</filename> to always exist.
+      Certain global settings are always obtained from that file. If you
+      create alternative configuration directories, do not remove
+      /etc/shorewall/shorewall.conf.</para>
+    </important>
   </section>
 
   <section id="Commands">
@@ -448,7 +456,8 @@
 
           <listitem>
             <para>Specifies an <link linkend="AltConfig">alternate
-            configuration directory</link>.</para>
+            configuration directory</link>. Use of this option is
+            deprecated.</para>
           </listitem>
         </varlistentry>