Merge branch '4.4.20'

Shorewall/Perl/Shorewall/Chains.pm

@@ -2920,7 +2920,9 @@ sub record_runtime_address( $ ) {
 
 #
 # If the passed address is a run-time address variable for an optional interface, then
-# begin a conditional rule block that tests the address for nil.
+# begin a conditional rule block that tests the address for nil. Returns 1 if a conditional
+# block was opened. The caller stores the result, and if the result is true the caller 
+# invokes conditional_rule_end() when the conditional block is complete.
 #
 sub conditional_rule( $$ ) {
     my ( $chainref, $address ) = @_;
@@ -2941,7 +2943,8 @@ sub conditional_rule( $$ ) {
 }
 
 #
-# If end a conditional in a chain
+# End a conditional in a chain begun by conditional_rule(). Should only be called
+# if conditional_rule() returned true.
 #
 
 sub conditional_rule_end( $ ) {

Shorewall/install.sh

@@ -106,7 +106,6 @@ if [ -z "$INIT" ] ; then
 	INIT="shorewall"
 fi
 
-PLAIN=
 SPARSE=
 MANDIR=${MANDIR:-"/usr/share/man"}
 [ -n "${LIBEXEC:=/usr/share}" ]

Shorewall6/install.sh

@@ -104,7 +104,6 @@ if [ -z "$INIT" ] ; then
 	INIT="shorewall6"
 fi
 
-PLAIN=
 DEBIAN=
 CYGWIN=
 MAC=

docs/Install.xml

@@ -174,6 +174,19 @@
       </listitem>
     </orderedlist>
 
+    <para>Beginning with shorewall 4.4.20, the installer also supports a
+    <option>-p</option> (plain) option. Beginning with that release, the
+    standard configuration files (including samples) are annotated with the
+    contents of the associated manpage. The <option>-p</option> option
+    suppresses that behavior such that the configuration files do not include
+    documentation.</para>
+
+    <note>
+      <para>Setting the <emphasis role="bold">PLAIN</emphasis> environmental
+      variable to a non-empty value is equivalent to specifying
+      <option>-p</option>.</para>
+    </note>
+
     <section>
       <title>Executables in /usr and Perl Modules</title>
 
@@ -267,7 +280,7 @@
 
       <para><quote>For more information about Shorewall usage on Debian system
       please look at /usr/share/doc/shorewall-common/README.Debian provided by
-      [the] shorewall-common Debian package.</quote></para>
+      [the] shorewall Debian package.</quote></para>
     </important>
 
     <para>The easiest way to install Shorewall on Debian, is to use