diff --git a/manpages/shorewall-actions.xml b/manpages/shorewall-actions.xml
index a8853b65b..a5dd0db2a 100644
--- a/manpages/shorewall-actions.xml
+++ b/manpages/shorewall-actions.xml
@@ -29,12 +29,10 @@
/etc/shorewall/action.action-name.
ACTION names should begin with an upper-case letter to distinguish
- them from Shorewall-generated chain names and they must meet the
- requirements of a Netfilter chain. If you intend to log from the action
- then the name must be no longer than 11 characters in length. Names must
- also meet the requirements for a Bourne Shell identifier (must begin with
- a letter and be composed of letters, digits and underscore
- characters).
+ them from Shorewall-generated chain names and be composed of letters,
+ digits or numbers. If you intend to log from the action then the name must
+ be no longer than 11 characters in length if you use the standard
+ LOGFORMAT.
@@ -50,12 +48,13 @@
url="http://shorewall.net/Actions.html">http://shorewall.net/Actions.html
shorewall(8), shorewall-accounting(5), shorewall-blacklist(5),
- shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5), shorewall-maclist(5),
- shorewall-masq(5), shorewall-nat(5), shorewall-netmap(5),
- shorewall-params(5), shorewall-policy(5), shorewall-providers(5),
- shorewall-proxyarp(5), shorewall-route_rules(5),
- shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5),
- shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
- shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)
+ shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
+ shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
+ shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
+ shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+ shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
+ shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
+ shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
+ shorewall-zones(5)
diff --git a/manpages/shorewall-blacklist.xml b/manpages/shorewall-blacklist.xml
index 09fe6bbfc..e7b83800a 100644
--- a/manpages/shorewall-blacklist.xml
+++ b/manpages/shorewall-blacklist.xml
@@ -113,8 +113,8 @@
'blacklist' in the OPTIONS or OUT_OPTIONS column.
- Trafficto this zone is passed against the entries in this file
- that have the dst
+ Traffic to this zone is passed against the entries in this
+ file that have the dst
option.
@@ -168,10 +168,10 @@
url="http://shorewall.net/blacklisting_support.htm">http://shorewall.net/blacklisting_support.htm
shorewall(8), shorewall-accounting(5), shorewall-actions(5),
- shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5), shorewall-maclist(5),
- shorewall-masq(5), shorewall-nat(5), shorewall-netmap(5),
- shorewall-params(5), shorewall-policy(5), shorewall-providers(5),
- shorewall-proxyarp(5), shorewall-route_rules(5),
+ shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
+ shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
+ shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
+ shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
diff --git a/manpages/shorewall-hosts.xml b/manpages/shorewall-hosts.xml
index e203f2d72..82ae3a397 100644
--- a/manpages/shorewall-hosts.xml
+++ b/manpages/shorewall-hosts.xml
@@ -100,7 +100,8 @@
- OPTIONS (Optional) - [option[OPTIONS (Optional) -
+ [option[,option]...]
@@ -140,8 +141,8 @@
This option only makes sense for ports on a bridge. As
- of Shoreawall 4.4.13, ithe option is no longer supported and
- is ignored with a warning:
+ of Shoreawall 4.4.13, the option is no longer supported and is
+ ignored with a warning:
WARNING: The "blacklist" host
@@ -263,13 +264,13 @@ vpn ppp+:192.168.3.0/24
See ALSO
shorewall(8), shorewall-accounting(5), shorewall-actions(5),
- shorewall-blacklist(5), shorewall_interfaces(5), shorewall-ipsets(5), shorewall-maclist(5),
- shorewall-masq(5), shorewall-nat(5), shorewall-nesting(5),
- shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
- shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
- shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
- shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
- shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
- shorewall-zones(5)
+ shorewall-blacklist(5), shorewall_interfaces(5), shorewall-ipsets(5),
+ shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
+ shorewall-nesting(5), shorewall-netmap(5), shorewall-params(5),
+ shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
+ shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
+ shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
+ shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5),
+ shorewall-tunnels(5), shorewall-zones(5)
diff --git a/manpages6/shorewall6-actions.xml b/manpages6/shorewall6-actions.xml
index f7ff772dd..789f9c351 100644
--- a/manpages6/shorewall6-actions.xml
+++ b/manpages6/shorewall6-actions.xml
@@ -29,12 +29,10 @@
/etc/shorewall6/action.action-name.
ACTION names should begin with an upper-case letter to distinguish
- them from shorewall6-generated chain names and they must meet the
- requirements of a Netfilter chain. If you intend to log from the action
- then the name must be no longer than 11 characters in length. Names must
- also meet the requirements for a Bourne Shell identifier (must begin with
- a letter and be composed of letters, digits and underscore
- characters).
+ them from Shorewall-generated chain names and be composed of letters,
+ digits or numbers. If you intend to log from the action then the name must
+ be no longer than 11 characters in length if you use the standard
+ LOGFORMAT.
@@ -53,8 +51,8 @@
shorewall6-hosts(5), shorewall6-interfaces(5), shorewall6-maclist(5),
shorewall6-params(5), shorewall6-policy(5), shorewall6-providers(5),
shorewall6-route_rules(5), shorewall6-routestopped(5),
- shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5), shorewall6-tcclasses(5),
- shorewall6-tcdevices(5), shorewall6-tcrules(5), shorewall6-tos(5),
- shorewall6-tunnels(5), shorewall-zones(5)
+ shorewall6-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
+ shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
+ shorewall6-tos(5), shorewall6-tunnels(5), shorewall-zones(5)
diff --git a/manpages6/shorewall6-blacklist.xml b/manpages6/shorewall6-blacklist.xml
index ec81ee78a..568af05b1 100644
--- a/manpages6/shorewall6-blacklist.xml
+++ b/manpages6/shorewall6-blacklist.xml
@@ -114,8 +114,8 @@
'blacklist' in the OPTIONS or OUT_OPTIONS column.
- Trafficto this zone is passed against the entries in this file
- that have the dst
+ Traffic to this zone is passed against the entries in this
+ file that have the dst
option.