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 @@ In order to implement this solution, your iptables and kernel must support the 'recent match' extension (see FAQ - 42). These instructions also assume Shorewall version 2.2.0 or - later. + 42). In this example: 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 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 /etc/shorewall. + class="directory">/etc/shorewall. + Shorewall requires that the file + /etc/shorewall/shorewall.conf 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. + This facility permits you to easily create a test or temporary configuration by 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 @@ shorewall save + + + Shorewall requires that the file + /etc/shorewall/shorewall.conf 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. +
@@ -448,7 +456,8 @@ Specifies an alternate - configuration directory. + configuration directory. Use of this option is + deprecated.