From 90ad8341baf739554f9704df611a59d95941cf9b Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 13 Jun 2006 00:04:15 +0000
Subject: [PATCH] More Lite tweaks -- will they ever end?

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4081 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-lite/help             | 11 ++---------
 Shorewall-lite/releasenotes.txt |  6 +++++-
 Shorewall/compiler              |  4 ++--
 Shorewall/help                  |  4 ++--
 docs/CompiledPrograms.xml       |  6 ++++++
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Shorewall-lite/help b/Shorewall-lite/help
index 5c07ea20d..7613a82b2 100755
--- a/Shorewall-lite/help
+++ b/Shorewall-lite/help
@@ -62,7 +62,7 @@ debug)
     If you include the keyword debug as the first argument to any
     of these commands:
 
-	start|stop|restart|reset|clear|refresh|check|add|delete
+	start|stop|restart|reset|clear|add|delete
 
     then a shell trace of the command is produced.  For example:
 
@@ -157,13 +157,6 @@ logreject)
     See also \"help address\""
 	;;
 
-refresh)
-	echo "refresh: refresh
-    The rules involving the broadcast addresses of firewall interfaces,
-    the black list, and ECN control rules are recreated to reflect any
-    changes made.  Existing connections are untouched."
-	;;
-
 reject)
 	echo "$1: $1 <address> ...
     Causes packets from the specified <address> to be rejected
@@ -275,7 +268,7 @@ trace)
     If you include the keyword trace as the first argument to any
     of these commands:
 
-	start|stop|restart|reset|clear|refresh|check|add|delete
+	start|stop|restart|reset|clear|check|add|delete
 
     then a shell trace of the command is produced.  For example:
 
diff --git a/Shorewall-lite/releasenotes.txt b/Shorewall-lite/releasenotes.txt
index 6481180bf..87be8754f 100644
--- a/Shorewall-lite/releasenotes.txt
+++ b/Shorewall-lite/releasenotes.txt
@@ -59,6 +59,10 @@ e) On the administrative system, for each firewall system you:
 
    3) On the firewall system, 'shorewall-lite start'.
 
-It is possible to have both shorewall and Shorewall Lite 
+It is possible to have both shorewall and Shorewall Lite
 installed on the same system.
 
+For more information, see:
+
+    http://www.shorewall.net/CompiledProgram.html#Lite
+
diff --git a/Shorewall/compiler b/Shorewall/compiler
index 404fe5e72..f8eb75409 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -8335,7 +8335,7 @@ __EOF__
     # [re]-Establish routing
     #
     setup_providers $(find_file providers)
-    [ -n "$ROUTEMARK_INTERFACES" ] &&                      setup_routes
+    [ -n "$ROUTEMARK_INTERFACES" ] &&                   setup_routes
 
     progress_message2 "$DOING NAT...";                  setup_nat
     progress_message2 "$DOING NETMAP...";               setup_netmap
@@ -8370,7 +8370,7 @@ __EOF__
     save_progress_message "Setting up Actions..."
 
     progress_message2 "$DOING Actions...";               process_actions2
-                                                            process_actions3
+                                                         process_actions3
 
     save_progress_message "Applying Policies..."
 
diff --git a/Shorewall/help b/Shorewall/help
index 98b08138b..c92187605 100755
--- a/Shorewall/help
+++ b/Shorewall/help
@@ -110,7 +110,7 @@ debug)
     If you include the keyword debug as the first argument to any
     of these commands:
 
-	start|stop|restart|reset|clear|refresh|check|add|delete
+	start|stop|restart|reset|clear|refresh|check|add|delete|compile
 
     then a shell trace of the command is produced.  For example:
 
@@ -362,7 +362,7 @@ trace)
     If you include the keyword trace as the first argument to any
     of these commands:
 
-	start|stop|restart|reset|clear|refresh|check|add|delete
+	start|stop|restart|reset|clear|refresh|check|add|delete|compile
 
     then a shell trace of the command is produced.  For example:
 
diff --git a/docs/CompiledPrograms.xml b/docs/CompiledPrograms.xml
index 6ab23c139..9b1783006 100644
--- a/docs/CompiledPrograms.xml
+++ b/docs/CompiledPrograms.xml
@@ -297,11 +297,17 @@
 
         <member>delete</member>
 
+        <member>refresh</member>
+
         <member>try</member>
 
         <member>safe-start</member>
 
         <member>safe-restart</member>
+
+        <member>show actions</member>
+
+        <member>show macros</member>
       </simplelist>
     </blockquote>