diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index dd5aeed31..f21f39ed9 100755 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -8,6 +8,8 @@ Changes in 3.0.3 4) Fix 'safe-start' and 'safe'restart' -- add support for -q in the process. +5) Fix help text for restore. Add -q to help for safe-start and safe-restart. + Changes in 3.0.2 1) Typos in the Samples corrected. diff --git a/Shorewall/help b/Shorewall/help index 587ebf4e1..23282e3d3 100755 --- a/Shorewall/help +++ b/Shorewall/help @@ -215,20 +215,20 @@ restart) ;; safe-restart) - echo "safe-restart: safe-restart + echo "safe-restart: [ -q ] safe-restart Restart the same way as a shorewall restart except that previous firewall configuration is backed up and will be restored if you notice any anomalies or you are not able to reach the firewall any more." ;; safe-start) - echo "safe-start: safe-start + echo "safe-start: [ -q ] safe-start Start the same way as a shorewall start except that in case of anomalies shorewall clear is issued. " ;; restore) - echo "restore: restore [ -n ] [ ] + echo "restore: [ -n ] restore [ ] Restore Shorewall to a state saved using the 'save' command Existing connections are maintained. The names a restore file in /var/lib/shorewall created using "shorewall save"; if no is given diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 4df9c7fab..f049122cb 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -12,6 +12,9 @@ Problems Corrected in 3.0.3 3) Specifying 'trace' on the 'safe-start' and 'safe-restart' command no longer fails. +4) The output of "shorewall help restore" has been corrected. It previously + printed incorrect syntax for that command. + New Features in 3.0.3 1) A "shorewall show macros" command has been added. This command displays