From dd403daba15abf2a7c1bda21e459df8fcb77dd98 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 23 Nov 2006 17:37:31 +0000
Subject: [PATCH] New syntax convention in tos manpage

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4992 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 manpages/shorewall-tos.xml | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/manpages/shorewall-tos.xml b/manpages/shorewall-tos.xml
index 42220b41a..2b5bbd90a 100644
--- a/manpages/shorewall-tos.xml
+++ b/manpages/shorewall-tos.xml
@@ -27,10 +27,14 @@
 
     <variablelist>
       <varlistentry>
-        <term><emphasis role="bold">SOURCE</emphasis></term>
+        <term><emphasis role="bold">SOURCE</emphasis> -
+        {<emphasis>zone</emphasis>[<emphasis
+        role="bold">:</emphasis><emphasis>address</emphasis>]|<emphasis
+        role="bold">all</emphasis>|<emphasis
+        role="bold">$FW</emphasis>}</term>
 
         <listitem>
-          <para>Name of a zone declared in shorewall.zones(5), <emphasis
+          <para>Name of a zone declared in shorewall-zones(5), <emphasis
           role="bold">all</emphasis> or <emphasis
           role="bold">$FW</emphasis>.</para>
 
@@ -49,23 +53,25 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">DEST</emphasis></term>
+        <term><emphasis role="bold">DEST</emphasis> -
+        {<emphasis>zone</emphasis>[<emphasis
+        role="bold">:</emphasis><emphasis>address</emphasis>]|<emphasis
+        role="bold">all</emphasis>}</term>
 
         <listitem>
-          <para>Name of a zone declared in shorewall.zones(5), <emphasis
-          role="bold">all</emphasis> or <emphasis
-          role="bold">$FW</emphasis>.</para>
+          <para>Name of a zone declared in shorewall-zones(5) or <emphasis
+          role="bold">all</emphasis>.</para>
 
-          <para>If not <emphasis role="bold">all</emphasis> or <emphasis
-          role="bold">$FW</emphasis>, may optionally be followed by ":" and an
-          IP address or a subnet specification</para>
+          <para>If not <emphasis role="bold">all</emphasis>, may optionally be
+          followed by ":" and an IP address or a subnet specification</para>
 
           <para>Example: loc:192.168.2.3</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">PROTOCOL</emphasis></term>
+        <term><emphasis role="bold">PROTOCOL</emphasis> —
+        <emphasis>proto-name-or-number</emphasis></term>
 
         <listitem>
           <para>Protocol name or number.</para>
@@ -73,7 +79,9 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">SOURCE PORTS</emphasis></term>
+        <term><emphasis role="bold">SOURCE PORT(S)</emphasis> —
+        {-|<emphasis>port</emphasis>|<emphasis>lowport</emphasis><emphasis
+        role="bold">:</emphasis><emphasis>highport</emphasis>}</term>
 
         <listitem>
           <para>Source port or port range. If all ports, use "-".</para>
@@ -81,7 +89,9 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">DEST PORTS</emphasis></term>
+        <term><emphasis role="bold">DEST PORT(S)</emphasis> —
+        {-|<emphasis>port</emphasis>|<emphasis>lowport</emphasis><emphasis
+        role="bold">:</emphasis><emphasis>highport</emphasis>}</term>
 
         <listitem>
           <para>Destination port or port range. If all ports, use "-"</para>
@@ -89,7 +99,8 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">TOS</emphasis></term>
+        <term><emphasis role="bold">TOS</emphasis> —
+        <emphasis>tos</emphasis></term>
 
         <listitem>
           <para>Must be one of the following;</para>