diff --git a/Shorewall-common/macro.IPPserver b/Shorewall-common/macro.IPPserver
index 4c01d119b..ed5a67c62 100644
--- a/Shorewall-common/macro.IPPserver
+++ b/Shorewall-common/macro.IPPserver
@@ -10,7 +10,7 @@
#
# Example usage on a single-interface firewall which is a print
# client:
-# IPPserver/ACCEPT $FW lan
+# IPPserver/ACCEPT $FW net
#
# Example for a two-interface firewall which acts as a print
# server for loc:
diff --git a/contrib/shoregen/install_shoregen b/contrib/shoregen/install_shoregen
old mode 100644
new mode 100755
index dbaa391e8..3b4fcb5e3
--- a/contrib/shoregen/install_shoregen
+++ b/contrib/shoregen/install_shoregen
@@ -26,7 +26,7 @@
VERBOSE=0
RESTART=0
CHECK=1
-TIME=1
+TIME=0
usage()
{
diff --git a/contrib/shoregen/shoregen b/contrib/shoregen/shoregen
old mode 100644
new mode 100755
index c91962517..81d5468c8
--- a/contrib/shoregen/shoregen
+++ b/contrib/shoregen/shoregen
@@ -257,7 +257,7 @@ unless (-r "zones") {
for (stripfile "zones") {
chomp;
- my ($zone, $details) = split /\s+/, $_, 2;
+ my ($zone, $details) = split /[\s:]+/, $_, 2;
push @globalzones, $zone;
$globalzones{ $zone } = $details;
}
diff --git a/manpages/shorewall-interfaces.xml b/manpages/shorewall-interfaces.xml
index 2be1846a0..71317fdcf 100644
--- a/manpages/shorewall-interfaces.xml
+++ b/manpages/shorewall-interfaces.xml
@@ -316,7 +316,7 @@ loc eth2 -
detectnets
- Automatically taylors the zone named in the ZONE column
+ Automatically tailors the zone named in the ZONE column
to include only those hosts routed through the
interface.
@@ -429,4 +429,4 @@ net ppp0 -
shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)
-
\ No newline at end of file
+
diff --git a/web/oldnews.html b/web/oldnews.html
index 6ecafc6fb..9c7cec1a9 100644
--- a/web/oldnews.html
+++ b/web/oldnews.html
@@ -4651,7 +4651,7 @@ loc Local Extended local zone
A "detectnets" interface option has been added for
entries in /etc/shorewall/interfaces. This option
- automatically taylors the definition of the zone named in the
+ automatically tailors the definition of the zone named in the
ZONE column to include just those hosts that have
routes through the interface named in the INTERFACE column.
The named interface must be UP when Shorewall is
@@ -4736,7 +4736,7 @@ loc Local Extended local zone
A "detectnets" interface option has been added for
entries in /etc/shorewall/interfaces. This option
- automatically taylors the definition of the zone named in the
+ automatically tailors the definition of the zone named in the
ZONE column to include just those hosts that have
routes through the interface named in the INTERFACE column.
The named interface must be UP when Shorewall is
@@ -4812,7 +4812,7 @@ loc Local Extended local zone
A "detectnets" interface option has been added for
entries in /etc/shorewall/interfaces. This option
- automatically taylors the definition of the zone named in the
+ automatically tailors the definition of the zone named in the
ZONE column to include just those hosts that have
routes through the interface named in the INTERFACE column.
The named interface must be UP when Shorewall is