From 9d03fe20e0acdcd5f92856e8ce9ce2a988c9b73e Mon Sep 17 00:00:00 2001 From: teastep Date: Sat, 4 Apr 2009 17:22:29 +0000 Subject: [PATCH] Minor documentation updates Signed-off-by: Tom Eastep git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9806 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- docs/Actions.xml | 5 ++--- docs/Build.xml | 10 +++++++--- docs/Shorewall-perl.xml | 11 ++++++----- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/docs/Actions.xml b/docs/Actions.xml index a7ee3c8b7..b9d6460e1 100644 --- a/docs/Actions.xml +++ b/docs/Actions.xml @@ -670,9 +670,8 @@ acton:info:test $FW net - For an example of how to use these variables in both Shorewall-shell - and Shorewall-perl, see this - article. + For an example of how to use these variablesl, see this article.
diff --git a/docs/Build.xml b/docs/Build.xml index 2fabe825f..2932cfcf7 100644 --- a/docs/Build.xml +++ b/docs/Build.xml @@ -36,7 +36,11 @@ This information is provided primarily for Shorewall developers. - Users are expected to install from pre-built tarballs or packages. + Users are expected to install from pre-built tarballs or packages. + + Beginning with Shorewall 4.4, the Shorewall project will use Git as + it's SCM system rather than SVN. This document will be updated prior to + the release of 4.4 to refect the move to Git.
@@ -256,7 +260,7 @@ You should ensure that you have the latest script. The scripts - change periodically as we move through the release cycles. + change periodically as we move through the release cycles. The scripts may need to be modified to fit your particular environment. There are a number of variables that are set near the front @@ -440,7 +444,7 @@ prior release - The release to be used to generate patch files. + The release to be used to generate patch files. diff --git a/docs/Shorewall-perl.xml b/docs/Shorewall-perl.xml index 831b1ab71..4c794b6b0 100644 --- a/docs/Shorewall-perl.xml +++ b/docs/Shorewall-perl.xml @@ -348,11 +348,12 @@ insert_rule $filter_table->{OUTPUT}, 1, "-p udp --sport 1701 -j ACCEPT"; used in a Shorewall configuration file, the name must be preceded by a plus sign (+) as with the shell-based compiler. - Shorewall is now out of the ipset load/reload business. With - scripts generated by the Perl-based Compiler, the Netfilter rule set - is never cleared. That means that there is no opportunity for - Shorewall to load/reload your ipsets since that cannot be done while - there are any current rules using ipsets. + Shorewall is now out of the ipset load/reload business with + the exception of ipsets used for dynamic zones. With scripts + generated by the Perl-based Compiler, the Netfilter rule set is + never cleared. That means that there is no opportunity for Shorewall + to load/reload your ipsets since that cannot be done while there are + any current rules using ipsets. So: