Update documentation for 'remote-' vs. 'remote_'

Signed-off-by: Tom Eastep <teastep@shorewall.net>
Correct "remote-" commands
2015-10-27 08:16:06 -07:00 · 2015-10-27 07:18:54 -07:00 · 2015-10-26 13:08:09 -07:00 · 2015-10-13 09:34:58 -07:00 · 2015-10-13 12:51:00 +03:00 · 2015-10-13 12:17:18 +03:00
48 changed files with 105 additions and 76 deletions
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -3879,6 +3879,13 @@ usage() # $1 = exit status
    ecko "   refresh [ -d ] [ -n ] [ -T ] [ -D <directory> ] [ <chain>... ]"
    echo "   reject <address> ..."
    ecko "   reload [ -s ] [ -c ] [ -r <root user> ] [ -T ] [ -i ] [ <directory> ] <system>"
+
+    if [ -z "$g_lite" ]; then
+	echo "   remote-reload [ -s ] [ -c ] [ -r <root-name> ] [ -T ] [ -i ] [ <directory> ] <system>"
+	echo "   remote-restart [ -s ] [ -c ] [ -r <root-name> ] [ -T ] [ -i ] [ <directory> ] <system>"
+	echo "   remote-start [ -s ] [ -c ] [ -r <root-name> ] [ -T ] [ -i ] [ <directory> ] <system>"
+    fi
+
    echo "   reset [ <chain> ... ]"

    if [ -n "$g_lite" ]; then
--- a/Shorewall/Perl/Shorewall/Providers.pm
+++ b/Shorewall/Perl/Shorewall/Providers.pm
@@ -60,7 +60,6 @@ our @routemarked_providers;
 our %routemarked_interfaces;
 our @routemarked_interfaces;
 our %provider_interfaces;
-our @load_providers;
 our @load_interfaces;

 our $balancing;
@@ -98,7 +97,6 @@ sub initialize( $ ) {
    %routemarked_interfaces = ();
    @routemarked_interfaces = ();
    %provider_interfaces    = ();
-    @load_providers         = ();
    @load_interfaces        = ();
    $balancing              = 0;
    $fallback               = 0;
@@ -697,7 +695,7 @@ sub process_a_provider( $ ) {
    if ( $track ) {
 	if ( $routemarked_interfaces{$interface} ) {
 	    fatal_error "Interface $interface is tracked through an earlier provider" if $routemarked_interfaces{$interface} == ROUTEMARKED_UNSHARED;
-	    fatal_error "Multiple providers through the same interface must their IP address specified in the INTERFACES" unless $shared;
+	    fatal_error "Multiple providers through the same interface must have their IP address specified in the INTERFACES column" unless $shared;
 	} else {
 	    $routemarked_interfaces{$interface} = $shared ? ROUTEMARKED_SHARED : ROUTEMARKED_UNSHARED;
 	    push @routemarked_interfaces, $interface;
@@ -1380,15 +1378,32 @@ sub finish_providers() {
 	emit(   'fi',
 		'' );
    } else {
+	if ( ( $fallback || @load_interfaces ) && $config{USE_DEFAULT_RT} ) {
+	    emit  ( q(#),
+		    q(# Delete any default routes in the 'main' table),
+		    q(#),
+		    "while qt \$IP -$family route del default table $main; do",
+		    '    true',
+		    'done',
+		    ''
+		  );
+	} else {
+	    emit ( q(#),
+		   q(# We don't have any 'balance'. 'load='  or 'fallback=' providers so we restore any default route that we've saved),
+		   q(#),
+		   qq(restore_default_route $config{USE_DEFAULT_RT}),
+		   ''
+		 );
+	}
+
 	emit ( '#',
-	       '# We don\'t have any \'balance\' providers so we restore any default route that we\'ve saved',
+	       '# Delete any routes in the \'balance\' table',
 	       '#',
-	       "restore_default_route $config{USE_DEFAULT_RT}" ,
-	       '#',
-	       '# And delete any routes in the \'balance\' table',
-	       '#',
-	       "qt \$IP -$family route del default table $balance",
-	       '' );
+	       "while qt \$IP -$family route del default table $balance; do",
+	       '    true',
+	       'done',
+	       ''
+	     );
    }

    if ( $fallback ) {
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@@ -1645,7 +1645,7 @@ compiler_command() {
 	    shift
 	    update_command $@
 	    ;;
-	remote-start|remote-reload-reload|remote-restart)
+	remote-start|remote-reload|remote-restart)
 	    shift
 	    remote_reload_command $@
 	    ;;
--- a/Shorewall/manpages/shorewall.xml
+++ b/Shorewall/manpages/shorewall.xml
@@ -424,7 +424,7 @@

      <arg>-<replaceable>options</replaceable></arg>

-      <arg choice="plain"><option>remote_start</option></arg>
+      <arg choice="plain"><option>remote-start</option></arg>

      <arg><option>-s</option></arg>

@@ -448,7 +448,7 @@

      <arg>-<replaceable>options</replaceable></arg>

-      <arg choice="plain"><option>remote_reload</option></arg>
+      <arg choice="plain"><option>remote-reload</option></arg>

      <arg><option>-s</option></arg>

@@ -472,7 +472,7 @@

      <arg>-<replaceable>options</replaceable></arg>

-      <arg choice="plain"><option>remote_restart</option></arg>
+      <arg choice="plain"><option>remote-restart</option></arg>

      <arg><option>-s</option></arg>

@@ -1522,7 +1522,7 @@
        <listitem>
          <para>This command was re-implemented in Shorewall 5.0.0. The
          pre-5.0.0 <command>reload</command> command is now called
-          <command>remote_restart</command> (see below).</para>
+          <command>remote-restart</command> (see below).</para>

          <para>Reload is similar to <emphasis role="bold">shorewall
          start</emphasis> except that it assumes that the firewall is already
@@ -1575,7 +1575,7 @@
      </varlistentry>

      <varlistentry>
-        <term><emphasis role="bold">remote_start</emphasis>
+        <term><emphasis role="bold">remote-start</emphasis>
        [-<option>s</option>] [-<option>c</option>] [-<option>r</option>
        <replaceable>root-user-name</replaceable>] [-<option>T</option>]
        [-<option>i</option>] [ <replaceable>directory</replaceable> ]
@@ -1637,7 +1637,7 @@
      </varlistentry>

      <varlistentry>
-        <term><emphasis role="bold">remote_reload
+        <term><emphasis role="bold">remote-reload
        </emphasis>[-<option>s</option>] [-<option>c</option>]
        [-<option>r</option> <replaceable>root-user-name</replaceable>]
        [-<option>T</option>] [-<option>i</option>] [
@@ -1699,7 +1699,7 @@
      </varlistentry>

      <varlistentry>
-        <term><emphasis role="bold">remote_restart
+        <term><emphasis role="bold">remote-restart
        </emphasis>[-<option>s</option>] [-<option>c</option>]
        [-<option>r</option> <replaceable>root-user-name</replaceable>]
        [-<option>T</option>] [-<option>i</option>] [
--- a/Shorewall6/Macros/macro.Ping
+++ b/Shorewall6/Macros/macro.Ping
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Ping Macro
+# Shorewall6 - Ping Macro
 #
 # /usr/share/shorewall6/macro.Ping
 #
--- a/Shorewall6/Macros/macro.Trcrt
+++ b/Shorewall6/Macros/macro.Trcrt
@@ -1,7 +1,7 @@
 #
-# Shorewall version 5 -Trcrt Macro
+# Shorewall6 - Trcrt Macro
 #
-# /usr/share/shorewall/macro.Trcrt
+# /usr/share/shorewall6/macro.Trcrt
 #
 #	This macro handles Traceroute (for up to 30 hops).
 #
--- a/Shorewall6/Macros/macro.mDNS
+++ b/Shorewall6/Macros/macro.mDNS
@@ -1,5 +1,5 @@
 #
-# Shorewall version 5 - Multicast DNS Macro
+# Shorewall6 - Multicast DNS Macro
 #
 # /usr/share/shorewall6/macro.mDNS
 #
--- a/Shorewall6/configfiles/accounting
+++ b/Shorewall6/configfiles/accounting
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Accounting File
+# Shorewall6 - Accounting File
 #
 # For information about entries in this file, type "man shorewall6-accounting"
 #
--- a/Shorewall6/configfiles/actions
+++ b/Shorewall6/configfiles/actions
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Actions File
+# Shorewall6 - Actions File
 #
 # /etc/shorewall6/actions
 #
--- a/Shorewall6/configfiles/blrules
+++ b/Shorewall6/configfiles/blrules
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Blacklist File
+# Shorewall6 - Blacklist File
 #
 # For information about entries in this file, type "man shorewall6-blrules"
 #
--- a/Shorewall6/configfiles/clear
+++ b/Shorewall6/configfiles/clear
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - clear File
+# Shorewall6 - clear File
 #
 # /etc/shorewall6/clear
 #
--- a/Shorewall6/configfiles/hosts
+++ b/Shorewall6/configfiles/hosts
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Hosts file
+# Shorewall6 - Hosts file
 #
 # For information about entries in this file, type "man shorewall6-hosts"
 #
--- a/Shorewall6/configfiles/init
+++ b/Shorewall6/configfiles/init
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Init File
+# Shorewall6 - Init File
 #
 # /etc/shorewall6/init
 #
--- a/Shorewall6/configfiles/interfaces
+++ b/Shorewall6/configfiles/interfaces
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Interfaces File
+# Shorewall6 - Interfaces File
 #
 # For information about entries in this file, type "man shorewall6-interfaces"
 #
--- a/Shorewall6/configfiles/isusable
+++ b/Shorewall6/configfiles/isusable
@@ -1,10 +1,10 @@
 #
-# Shorewall6 version 5 - isusable File
+# Shorewall6 - isusable File
 #
 # /etc/shorewall6/isusable
 #
 #	This script is called when Shorewall6 is attempting to determine
-#	if an interface named in /etc/shorewall/providers is usable.
+#	if an interface named in /etc/shorewall6/providers is usable.
 #
 #	The script is invoked inside a function that accepts an interface
 #	name as a single argument. The file below is designed to work with
--- a/Shorewall6/configfiles/lib.private
+++ b/Shorewall6/configfiles/lib.private
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - lib.private File
+# Shorewall6 - lib.private File
 #
 # /etc/shorewall6/lib.private
 #
--- a/Shorewall6/configfiles/maclist
+++ b/Shorewall6/configfiles/maclist
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Maclist file
+# Shorewall6 - Maclist file
 #
 # For information about entries in this file, type "man shorewall6-maclist"
 #
--- a/Shorewall6/configfiles/mangle
+++ b/Shorewall6/configfiles/mangle
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Mangle File
+# Shorewall6 - Mangle File
 #
 # For information about entries in this file, type "man shorewall6-mangle"
 #
--- a/Shorewall6/configfiles/masq
+++ b/Shorewall6/configfiles/masq
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - MASQUERADE/SNAT file
+# Shorewall6 - MASQUERADE/SNAT file
 #
 # For information about entries in this file, type "man shorewall6-masq"
 #
--- a/Shorewall6/configfiles/nat
+++ b/Shorewall6/configfiles/nat
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Nat File
+# Shorewall6 - Nat File
 #
 # For information about entries in this file, type "man shorewall6-nat"
 #
--- a/Shorewall6/configfiles/netmap
+++ b/Shorewall6/configfiles/netmap
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5	 - Netmap File
+# Shorewall6	 - Netmap File
 #
 # For information about entries in this file, type "man shorewall-netmap"
 #
--- a/Shorewall6/configfiles/params
+++ b/Shorewall6/configfiles/params
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Params File
+# Shorewall6 - Params File
 #
 # /etc/shorewall6/params
 #
--- a/Shorewall6/configfiles/policy
+++ b/Shorewall6/configfiles/policy
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Policy File
+# Shorewall6 - Policy File
 #
 # For information about entries in this file, type "man shorewall6-policy"
 #
--- a/Shorewall6/configfiles/providers
+++ b/Shorewall6/configfiles/providers
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Providers File
+# Shorewall6 - Providers File
 #
 # For information about entries in this file, type "man shorewall6-providers"
 #
--- a/Shorewall6/configfiles/refresh
+++ b/Shorewall6/configfiles/refresh
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - refresh File
+# Shorewall6 - refresh File
 #
 # /etc/shorewall6/refresh
 #
--- a/Shorewall6/configfiles/refreshed
+++ b/Shorewall6/configfiles/refreshed
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - refreshed File
+# Shorewall6 - refreshed File
 #
 # /etc/shorewall6/refreshed
 #
--- a/Shorewall6/configfiles/restored
+++ b/Shorewall6/configfiles/restored
@@ -1,5 +1,5 @@
 #
-# Shorewall 6 version 5 - Restored File
+# Shorewall6 - Restored File
 #
 # /etc/shorewall6/restored
 #
--- a/Shorewall6/configfiles/routes
+++ b/Shorewall6/configfiles/routes
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - routes File
+# Shorewall6 - routes File
 #
 # For information about entries in this file, type "man shorewall6-routes"
 #
--- a/Shorewall6/configfiles/routestopped
+++ b/Shorewall6/configfiles/routestopped
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Routestopped File
+# Shorewall6 - Routestopped File
 #
 # This file is deprecated in favor of the stoppedrules file.
 #
--- a/Shorewall6/configfiles/rtrules
+++ b/Shorewall6/configfiles/rtrules
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - route rules File
+# Shorewall6 - route rules File
 #
 # For information about entries in this file, type "man shorewall6-rtrules"
 #
--- a/Shorewall6/configfiles/rules
+++ b/Shorewall6/configfiles/rules
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Rules File
+# Shorewall6 - Rules File
 #
 # For information on the settings in this file, type "man shorewall6-rules"
 #
--- a/Shorewall6/configfiles/secmarks
+++ b/Shorewall6/configfiles/secmarks
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Secmarks File
+# Shorewall6 - Secmarks File
 #
 # For information about entries in this file, type "man shorewall-secmarks"
 #
--- a/Shorewall6/configfiles/start
+++ b/Shorewall6/configfiles/start
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Start File
+# Shorewall6 - Start File
 #
 # /etc/shorewall6/start
 #
--- a/Shorewall6/configfiles/started
+++ b/Shorewall6/configfiles/started
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Started File
+# Shorewall6 - Started File
 #
 # /etc/shorewall6/started
 #
--- a/Shorewall6/configfiles/stop
+++ b/Shorewall6/configfiles/stop
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Stop File
+# Shorewall6 - Stop File
 #
 # /etc/shorewall6/stop
 #
--- a/Shorewall6/configfiles/stopped
+++ b/Shorewall6/configfiles/stopped
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Stopped File
+# Shorewall6 - Stopped File
 #
 # /etc/shorewall6/stopped
 #
--- a/Shorewall6/configfiles/stoppedrules
+++ b/Shorewall6/configfiles/stoppedrules
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Stopped Rules File
+# Shorewall6 - Stopped Rules File
 #
 # For information about entries in this file, type "man shorewall6-stoppedrules"
 #
--- a/Shorewall6/configfiles/tcclasses
+++ b/Shorewall6/configfiles/tcclasses
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tcclasses File
+# Shorewall6 - Tcclasses File
 #
 # For information about entries in this file, type "man shorewall6-tcclasses"
 #
--- a/Shorewall6/configfiles/tcclear
+++ b/Shorewall6/configfiles/tcclear
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - tcclear File
+# Shorewall6 - tcclear File
 #
 # /etc/shorewall6/tcclear
 #
--- a/Shorewall6/configfiles/tcdevices
+++ b/Shorewall6/configfiles/tcdevices
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tcdevices File
+# Shorewall6 - Tcdevices File
 #
 # For information about entries in this file, type "man shorewall6-tcdevices"
 #
--- a/Shorewall6/configfiles/tcfilters
+++ b/Shorewall6/configfiles/tcfilters
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tcfilters File
+# Shorewall6 - Tcfilters File
 #
 # For information about entries in this file, type "man shorewall6-tcfilters"
 #
--- a/Shorewall6/configfiles/tcinterfaces
+++ b/Shorewall6/configfiles/tcinterfaces
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tcinterfaces File
+# Shorewall6 - Tcinterfaces File
 #
 # For information about entries in this file, type "man shorewall6-tcinterfaces"
 #
--- a/Shorewall6/configfiles/tcpri
+++ b/Shorewall6/configfiles/tcpri
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tcpri File
+# Shorewall6 - Tcpri File
 #
 # For information about entries in this file, type "man shorewall6-tcpri"
 #
--- a/Shorewall6/configfiles/tunnels
+++ b/Shorewall6/configfiles/tunnels
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Tunnels File
+# Shorewall6 - Tunnels File
 #
 # For information about entries in this file, type "man shorewall6-tunnels"
 #
--- a/Shorewall6/configfiles/zones
+++ b/Shorewall6/configfiles/zones
@@ -1,5 +1,5 @@
 #
-# Shorewall6 version 5 - Zones File
+# Shorewall6 - Zones File
 #
 # For information about this file, type "man shorewall6-zones"
 #
--- a/Shorewall6/manpages/shorewall6.xml
+++ b/Shorewall6/manpages/shorewall6.xml
@@ -378,7 +378,7 @@

      <arg>-<replaceable>options</replaceable></arg>

-      <arg choice="plain"><option>remote_start</option></arg>
+      <arg choice="plain"><option>remote-start</option></arg>

      <arg><option>-s</option></arg>

@@ -402,7 +402,7 @@

      <arg>-<replaceable>options</replaceable></arg>

-      <arg choice="plain"><option>remote_reload</option></arg>
+      <arg choice="plain"><option>remote-reload</option></arg>

      <arg><option>-s</option></arg>

@@ -426,7 +426,7 @@

      <arg>-<replaceable>options</replaceable></arg>

-      <arg choice="plain"><option>remote_restart</option></arg>
+      <arg choice="plain"><option>remote-restart</option></arg>

      <arg><option>-s</option></arg>

@@ -1457,7 +1457,7 @@
        <listitem>
          <para>This command was re-implemented in Shorewall 5.0.0. The
          pre-5.0.0 <command>reload</command> command is now called
-          <command>remote_restart</command> (see below).</para>
+          <command>remote-restart</command> (see below).</para>

          <para>Reload is similar to <command>shorewall6 start</command>
          except that it assumes that the firewall is already started.
@@ -1511,7 +1511,7 @@
      </varlistentry>

      <varlistentry>
-        <term><emphasis role="bold">remote_reload
+        <term><emphasis role="bold">remote-reload
        </emphasis>[-<option>s</option>] [-<option>c</option>]
        [-<option>r</option> <replaceable>root-user-name</replaceable>]
        [-<option>T</option>] [-<option>i</option>] [
@@ -1573,7 +1573,7 @@
      </varlistentry>

      <varlistentry>
-        <term><emphasis role="bold">remote_ restart
+        <term><emphasis role="bold">remote- restart
        </emphasis>[-<option>s</option>] [-<option>c</option>]
        [-<option>r</option> <replaceable>root-user-name</replaceable>]
        [-<option>T</option>] [-<option>i</option>] [
@@ -1636,7 +1636,7 @@
      </varlistentry>

      <varlistentry>
-        <term><emphasis role="bold">remote_start </emphasis>
+        <term><emphasis role="bold">remote-start </emphasis>
        [-<option>s</option>] [-<option>c</option>] [-<option>r</option>
        <replaceable>root-user-name</replaceable>] [-<option>T</option>]
        [-<option>i</option>] [ <replaceable>directory</replaceable> ]
--- a/docs/Shorewall-5.xml
+++ b/docs/Shorewall-5.xml
@@ -323,7 +323,7 @@
      <title>load</title>

      <para>The function performed by the Shorewall-4 <command>load</command>
-      command is now performed by the <command>remote_start</command>
+      command is now performed by the <command>remote-start</command>
      command.</para>
    </section>

@@ -334,7 +334,7 @@
      the same function as the <command>restart</command> command did in
      Shorewall 4. The action taken by the Shorewall-4
      <command>reload</command> command is now performed by the
-      <command>remote_restart</command> command.</para>
+      <command>remote-restart</command> command.</para>

      <para>For those that can't get used to the idea of using
      <command>reload</command> in place of <command>restart</command>, a
--- a/docs/upgrade_issues.xml
+++ b/docs/upgrade_issues.xml
@@ -37,7 +37,7 @@

      <holder>Thomas M. Eastep</holder>

-      <holder></holder>
+      <holder/>
    </copyright>

    <legalnotice>
@@ -78,6 +78,13 @@
    zones.</para>
  </section>

+  <section>
+    <title>Version &gt;= 5.0.0</title>
+
+    <para>See the <ulink url="Shorewall-5.html">Shorewall 5
+    documentation</ulink>.</para>
+  </section>
+
  <section>
    <title>Version &gt;= 4.6.0</title>

@@ -85,7 +92,7 @@
      <listitem>
        <para>Beginning with Shorewall 4.6.0, ection headers are now preceded
        by '?' (e.g., '?SECTION ...'). If your configuration contains any bare
-        'SECTION' entries, the following warning is issued: </para>
+        'SECTION' entries, the following warning is issued:</para>

        <programlisting>WARNING: 'SECTION' is deprecated in favor of '?SECTION' - consider running 'shorewall update -D' ...</programlisting>

@@ -111,7 +118,7 @@
      </listitem>

      <listitem>
-        <para> Beginning with Shorewall 4.5.0, FORMAT-1 actions and macros are
+        <para>Beginning with Shorewall 4.5.0, FORMAT-1 actions and macros are
        deprecated and a warning will be issued for each FORMAT-1 action or
        macro found.</para>

@@ -119,8 +126,8 @@

        <programlisting>WARNING: FORMAT-1 macros are deprecated and support will be dropped in a future release.</programlisting>

-        <para> To eliminate these warnings, add the following line before the
-        first rule in the action or macro: </para>
+        <para>To eliminate these warnings, add the following line before the
+        first rule in the action or macro:</para>

        <programlisting>?FORMAT 2</programlisting>

@@ -325,7 +332,7 @@
          <para>?ENDIF.</para>
        </blockquote>

-        <para></para>
+        <para/>
      </listitem>

      <listitem>
Author	SHA1	Message	Date
Tom Eastep	35b90c2709	Update documentation for 'remote-' vs. 'remote_' Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-27 08:16:06 -07:00
Tom Eastep	79a145bf83	Correct "remote-" commands Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-27 07:18:54 -07:00
Tom Eastep	c2768a2d64	Correct error message Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-26 13:08:09 -07:00
Tom Eastep	8dc16268a7	Delete main default routes when there are 'load=' or 'fallback=' interfaces Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-10-13 09:34:58 -07:00
Tuomo Soini	8771041a63	shorewall6: remove version from restored Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-10-13 12:51:00 +03:00
Tuomo Soini	dc7082b7a1	shorewall[6]: remove version from shorewall6 and macros	2015-10-13 12:17:18 +03:00