Another 'reload' tweak

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

Shorewall/help

@@ -249,12 +249,16 @@ reset)
 	;;
 
 reload)
-	echo "reload: reload <system>
+	echo "reload: reload [ <directory> ] <system>
-    Causes the shorewall configuration in the current working directory to be
+    If <directory> is omitted, then the current working directory is assumed.
-    compiled into a program called 'firewall'. If compilation is successful,
+
-    the 'firewall' script is copied via scp to the /usr/share/shorewall-lite/ 
+    Requires that Shorewall Lite be installed on the named <system>.
-    directory on <system>. If the script is copied successfully, Shorewall 
+
-    Lite on <system> is restarted via ssh."
+    Causes the shorewall configuration in <directory> to be compiled into a
+    program called '<directory>/firewall'. If compilation is successful,
+    the '<directory>/firewall' script is copied via scp to the
+    /usr/share/shorewall-lite/ directory on <system>. If the script is copied
+    successfully, Shorewall Lite on <system> is restarted via ssh."
 	;;
 
 restart)

Shorewall/shorewall

@@ -1323,7 +1323,7 @@ usage() # $1 = exit status
     echo "   logwatch [<refresh interval>]"
     echo "   refresh"
     echo "   reject <address> ..."
-    echo "   reload [ <directory> ] [ <system> ]"
+    echo "   reload [ <directory> ] <system>"
     echo "   reset"
     echo "   restart [ -n ] [ <directory> ]"
     echo "   restore [ -n ] [ <file name> ]"
@@ -1633,10 +1633,6 @@ case "$COMMAND" in
     reload)
 	shift
 	case $# in
-	    0)
-		directory="."
-		system="localhost"
-		;;
 	    1)
 		directory="."
 		system=$1

docs/starting_and_stopping_shorewall.xml

@@ -948,16 +948,15 @@
         Shorewall Lite)</term>
 
         <listitem>
-          <para><command>reload [ [ &lt;directory&gt; ] &lt;system&gt;
+          <para><command>reload [ &lt;directory&gt; ]
-          ]</command></para>
+          &lt;system&gt;</command></para>
 
           <para>If &lt;directory&gt; is omitted, the current working directory
-          is assumed. If &lt;system&gt; is omitted, the local system is
+          is assumed. </para>
-          assumed.</para>
 
           <para>Allows a non-root user to compile a shorewall script and
-          install it on a system (provided that the user has access to the
+          install it on a system (provided that the user has root access to
-          system via ssh). The command is equivalent to:</para>
+          the system via ssh). The command is equivalent to:</para>
 
           <simplelist>
             <member><command>/sbin/shorewall compile -e &lt;directory&gt;
@@ -974,9 +973,11 @@
           <para>In other words, the configuration in the specified (or
           defaulted) directory is compiled to a file called
           <filename>firewall</filename> in that directory. If compilation
-          succeeds, then <filename>firewall</filename> is copied to the
+          succeeds, then <filename>firewall</filename> is copied to
-          (usually remote) &lt;system&gt; using scp. If the copy succeeds,
+          &lt;system&gt; using scp. If the copy succeeds, Shorewall Lite on
-          Shorewall Lite on &lt;system&gt; is restarted via ssh.</para>
+          &lt;system&gt; is restarted via ssh.</para>
+
+          <para>Example: <command>shorewall reload gateway</command></para>
         </listitem>
       </varlistentry>