Update manpages

manpages/shorewall-actions.xml

@@ -29,12 +29,10 @@
     /etc/shorewall/action.<emphasis>action-name</emphasis>.</para>
 
     <para>ACTION names should begin with an upper-case letter to distinguish
-    them from Shorewall-generated chain names and they must meet the
+    them from Shorewall-generated chain names and be composed of letters,
-    requirements of a Netfilter chain. If you intend to log from the action
+    digits or numbers. If you intend to log from the action then the name must
-    then the name must be no longer than 11 characters in length. Names must
+    be no longer than 11 characters in length if you use the standard
-    also meet the requirements for a Bourne Shell identifier (must begin with
+    LOGFORMAT.</para>
-    a letter and be composed of letters, digits and underscore
-    characters).</para>
   </refsect1>
 
   <refsect1>
@@ -50,12 +48,13 @@
     url="http://shorewall.net/Actions.html">http://shorewall.net/Actions.html</ulink></para>
 
     <para>shorewall(8), shorewall-accounting(5), shorewall-blacklist(5),
-    shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5), shorewall-maclist(5),
+    shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
-    shorewall-masq(5), shorewall-nat(5), shorewall-netmap(5),
+    shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
-    shorewall-params(5), shorewall-policy(5), shorewall-providers(5),
+    shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
-    shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5),
+    shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
-    shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
+    shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
-    shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
+    shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
+    shorewall-zones(5)</para>
   </refsect1>
 </refentry>

manpages/shorewall-blacklist.xml

@@ -113,8 +113,8 @@
 
               <listitem>
                 <para>'blacklist' in the OPTIONS or OUT_OPTIONS column.
-                Trafficto this zone is passed against the entries in this file
+                Traffic to this zone is passed against the entries in this
-                that have the <emphasis role="bold">dst</emphasis>
+                file that have the <emphasis role="bold">dst</emphasis>
                 option.</para>
               </listitem>
             </orderedlist>
@@ -168,10 +168,10 @@
     url="http://shorewall.net/blacklisting_support.htm">http://shorewall.net/blacklisting_support.htm</ulink></para>
 
     <para>shorewall(8), shorewall-accounting(5), shorewall-actions(5),
-    shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5), shorewall-maclist(5),
+    shorewall-hosts(5), shorewall_interfaces(5), shorewall-ipsets(5),
-    shorewall-masq(5), shorewall-nat(5), shorewall-netmap(5),
+    shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
-    shorewall-params(5), shorewall-policy(5), shorewall-providers(5),
+    shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
-    shorewall-proxyarp(5), shorewall-route_rules(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),

manpages/shorewall-hosts.xml

@@ -100,7 +100,8 @@
       </varlistentry>
 
       <varlistentry>
-        <term>OPTIONS (Optional) - [<emphasis>option</emphasis>[<emphasis
+        <term><emphasis role="bold">OPTIONS</emphasis> (Optional) -
+        [<emphasis>option</emphasis>[<emphasis
         role="bold">,</emphasis><emphasis>option</emphasis>]...]</term>
 
         <listitem>
@@ -140,8 +141,8 @@
 
               <listitem>
                 <para>This option only makes sense for ports on a bridge. As
-                of Shoreawall 4.4.13, ithe option is no longer supported and
+                of Shoreawall 4.4.13, the option is no longer supported and is
-                is ignored with a warning:</para>
+                ignored with a warning:</para>
 
                 <blockquote>
                   <para><emphasis role="bold">WARNING: The "blacklist" host
@@ -263,13 +264,13 @@ vpn         ppp+:192.168.3.0/24</programlisting></para>
     <title>See ALSO</title>
 
     <para>shorewall(8), shorewall-accounting(5), shorewall-actions(5),
-    shorewall-blacklist(5), shorewall_interfaces(5), shorewall-ipsets(5), shorewall-maclist(5),
+    shorewall-blacklist(5), shorewall_interfaces(5), shorewall-ipsets(5),
-    shorewall-masq(5), shorewall-nat(5), shorewall-nesting(5),
+    shorewall-maclist(5), shorewall-masq(5), shorewall-nat(5),
-    shorewall-netmap(5), shorewall-params(5), shorewall-policy(5),
+    shorewall-nesting(5), shorewall-netmap(5), shorewall-params(5),
-    shorewall-providers(5), shorewall-proxyarp(5), shorewall-route_rules(5),
+    shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
+    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
-    shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
+    shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
-    shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
+    shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5),
-    shorewall-zones(5)</para>
+    shorewall-tunnels(5), shorewall-zones(5)</para>
   </refsect1>
 </refentry>

manpages6/shorewall6-actions.xml

@@ -29,12 +29,10 @@
     /etc/shorewall6/action.<emphasis>action-name</emphasis>.</para>
 
     <para>ACTION names should begin with an upper-case letter to distinguish
-    them from shorewall6-generated chain names and they must meet the
+    them from Shorewall-generated chain names and be composed of letters,
-    requirements of a Netfilter chain. If you intend to log from the action
+    digits or numbers. If you intend to log from the action then the name must
-    then the name must be no longer than 11 characters in length. Names must
+    be no longer than 11 characters in length if you use the standard
-    also meet the requirements for a Bourne Shell identifier (must begin with
+    LOGFORMAT.</para>
-    a letter and be composed of letters, digits and underscore
-    characters).</para>
   </refsect1>
 
   <refsect1>
@@ -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-rules(5), shorewall6.conf(5), shorewall6-secmarks(5),
-    shorewall6-tcdevices(5), shorewall6-tcrules(5), shorewall6-tos(5),
+    shorewall6-tcclasses(5), shorewall6-tcdevices(5), shorewall6-tcrules(5),
-    shorewall6-tunnels(5), shorewall-zones(5)</para>
+    shorewall6-tos(5), shorewall6-tunnels(5), shorewall-zones(5)</para>
   </refsect1>
 </refentry>

manpages6/shorewall6-blacklist.xml

@@ -114,8 +114,8 @@
 
               <listitem>
                 <para>'blacklist' in the OPTIONS or OUT_OPTIONS column.
-                Trafficto this zone is passed against the entries in this file
+                Traffic to this zone is passed against the entries in this
-                that have the <emphasis role="bold">dst</emphasis>
+                file that have the <emphasis role="bold">dst</emphasis>
                 option.</para>
               </listitem>
             </orderedlist>