From e952ada500bf335c15d51541d36780e89debad0a Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 22 Nov 2006 18:36:16 +0000
Subject: [PATCH] New syntax convention in hosts manpage

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4976 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 manpages/shorewall-hosts.xml | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/manpages/shorewall-hosts.xml b/manpages/shorewall-hosts.xml
index 356e62871..de090cad7 100644
--- a/manpages/shorewall-hosts.xml
+++ b/manpages/shorewall-hosts.xml
@@ -45,7 +45,8 @@
 
     <variablelist>
       <varlistentry>
-        <term><emphasis role="bold">ZONE</emphasis></term>
+        <term><emphasis role="bold">ZONE</emphasis> —
+        <emphasis>zone-name</emphasis></term>
 
         <listitem>
           <para>The name of a zone defined in shorewall-zones(5). You may not
@@ -54,7 +55,10 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">HOST(S)</emphasis></term>
+        <term><emphasis role="bold">HOST(S)</emphasis> —
+        <emphasis>interface</emphasis>:{[<emphasis>port</emphasis>:]{<emphasis>address-or-range</emphasis>[<emphasis
+        role="bold">,</emphasis><emphasis>address-or-range</emphasis>]...|<emphasis
+        role="bold">+</emphasis><emphasis>ipset</emphasis>}</term>
 
         <listitem>
           <para>The name of an interface defined in the
@@ -77,14 +81,19 @@
             </listitem>
 
             <listitem>
-              <para>A physical port name; only allowed when the interface
-              names a bridge created by the <command>brctl(8) addbr</command>
-              command. This port must not be defined in
-              shorewall-interfaces(5) and may be optionally followed by a
-              colon (":") and a host or network IP or a range. See
-              http://www.shorewall.net/bridge.html for details. Specifying a
-              physical port name requires that you have BRIDGING=Yes in
-              shorewall.conf(5).</para>
+              <para>A physical <emphasis>port</emphasis> name; only allowed
+              when the interface names a bridge created by the
+              <command>brctl(8) addbr</command> command. This port must not be
+              defined in shorewall-interfaces(5) and may be optionally
+              followed by a colon (":") and a host or network IP or a range.
+              See <ulink
+              url="http://www.shorewall.net/bridge.html">http://www.shorewall.net/bridge.html</ulink>
+              for details. Specifying a physical port name requires that you
+              have BRIDGING=Yes in shorewall.conf(5).</para>
+            </listitem>
+
+            <listitem>
+              <para>The name of an <emphasis>ipset</emphasis>.</para>
             </listitem>
           </orderedlist>
 
@@ -109,7 +118,8 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">OPTIONS</emphasis></term>
+        <term>OPTIONS — [<emphasis>option</emphasis>[<emphasis
+        role="bold">,</emphasis><emphasis>option</emphasis>]...]</term>
 
         <listitem>
           <para>A comma-separated list of options from the following list. The