diff --git a/manpages-lite/shorewall-lite.xml b/manpages-lite/shorewall-lite.xml
index e75e629e1..f35896bf7 100644
--- a/manpages-lite/shorewall-lite.xml
+++ b/manpages-lite/shorewall-lite.xml
@@ -17,17 +17,17 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>allow</option></arg>
 
-      <arg choice="plain">address</arg>
+      <arg choice="plain"><replaceable>address</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>clear</option></arg>
     </cmdsynopsis>
@@ -35,17 +35,17 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>drop</option></arg>
 
-      <arg choice="plain">address</arg>
+      <arg choice="plain"><replaceable>address</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>dump</option></arg>
 
@@ -57,17 +57,17 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>forget</option></arg>
 
-      <arg>filename</arg>
+      <arg><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>help</option></arg>
     </cmdsynopsis>
@@ -75,7 +75,7 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>hits</option></arg>
     </cmdsynopsis>
@@ -83,73 +83,76 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>ipcalc</option></arg>
 
       <group choice="req">
-        <arg choice="plain">address mask</arg>
+        <arg choice="plain"><replaceable>address</replaceable>
+        <replaceable>mask</replaceable></arg>
 
-        <arg choice="plain">address/vlsm</arg>
+        <arg
+        choice="plain"><replaceable>address</replaceable>/<replaceable>vlsm</replaceable></arg>
       </group>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>iprange</option></arg>
 
-      <arg choice="plain">address1<option>-</option>address2</arg>
+      <arg
+      choice="plain"><replaceable>address1</replaceable><option>-</option><replaceable>address2</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>logdrop</option></arg>
 
-      <arg choice="plain">address</arg>
+      <arg choice="plain"><replaceable>address</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>logwatch</option></arg>
 
       <arg><option>-m</option></arg>
 
-      <arg>refresh-interval</arg>
+      <arg><replaceable>refresh-interval</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>logreject</option></arg>
 
-      <arg choice="plain">address</arg>
+      <arg choice="plain"><replaceable>address</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>reject</option></arg>
 
-      <arg choice="plain">address</arg>
+      <arg choice="plain"><replaceable>address</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>restart</option></arg>
     </cmdsynopsis>
@@ -157,27 +160,27 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>restore</option></arg>
 
-      <arg>filename</arg>
+      <arg><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>save</option></arg>
 
-      <arg choice="opt">filename</arg>
+      <arg choice="opt"><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -186,13 +189,13 @@
       <arg><option>-t</option>
       {<option>filter</option>|<option>mangle</option>|<option>nat</option>|<option>raw</option>}</arg>
 
-      <arg rep="repeat">chain</arg>
+      <arg rep="repeat"><replaceable>chain</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -204,7 +207,7 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -215,7 +218,7 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -227,7 +230,7 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -237,7 +240,7 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -249,7 +252,7 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>start</option></arg>
 
@@ -259,7 +262,7 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>stop</option></arg>
     </cmdsynopsis>
@@ -267,7 +270,7 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>status</option></arg>
     </cmdsynopsis>
@@ -275,7 +278,7 @@
     <cmdsynopsis>
       <command>shorewall-lite</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>version</option></arg>
     </cmdsynopsis>
diff --git a/manpages/shorewall.xml b/manpages/shorewall.xml
index a955f537f..c163e40f1 100644
--- a/manpages/shorewall.xml
+++ b/manpages/shorewall.xml
@@ -17,41 +17,42 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg rep="norepeat">-options</arg>
+      <arg rep="norepeat">-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>add</option></arg>
 
-      <arg choice="plain" rep="repeat">interface[:host-list]</arg>
+      <arg choice="plain"
+      rep="repeat"><replaceable>interface</replaceable>[:<replaceable>host-list</replaceable>]</arg>
 
-      <arg choice="plain">zone</arg>
+      <arg choice="plain"><replaceable>zone</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>allow</option></arg>
 
-      <arg choice="plain">address</arg>
+      <arg choice="plain"><replaceable>address</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>check</option></arg>
 
       <arg><option>-e</option></arg>
 
-      <arg>directory</arg>
+      <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>clear</option></arg>
     </cmdsynopsis>
@@ -59,43 +60,44 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>compile</option></arg>
 
       <arg><option>-e</option></arg>
 
-      <arg>directory</arg>
+      <arg><replaceable>directory</replaceable></arg>
 
-      <arg choice="plain">pathname</arg>
+      <arg choice="plain"><replaceable>pathname</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg rep="norepeat">-options</arg>
+      <arg rep="norepeat">-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>delete</option></arg>
 
-      <arg choice="plain" rep="repeat">interface[:host-list]</arg>
+      <arg choice="plain"
+      rep="repeat"><replaceable>interface</replaceable>[:<replaceable>host-list</replaceable>]</arg>
 
-      <arg choice="plain">zone</arg>
+      <arg choice="plain"><replaceable>zone</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>drop</option></arg>
 
-      <arg choice="plain">address</arg>
+      <arg choice="plain"><replaceable>address</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>dump</option></arg>
 
@@ -107,29 +109,30 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>export</option></arg>
 
-      <arg choice="opt">directory1</arg>
+      <arg choice="opt"><replaceable>directory1</replaceable></arg>
 
-      <arg choice="plain">[user@]system[<option>:</option>directory2]</arg>
+      <arg
+      choice="plain">[<replaceable>user</replaceable>@]<replaceable>system</replaceable>[<option>:</option><replaceable>directory2</replaceable>]</arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>forget</option></arg>
 
-      <arg>filename</arg>
+      <arg><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>help</option></arg>
     </cmdsynopsis>
@@ -137,7 +140,7 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>hits</option></arg>
     </cmdsynopsis>
@@ -145,31 +148,34 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>ipcalc</option></arg>
 
       <group choice="req">
-        <arg choice="plain">address mask</arg>
+        <arg choice="plain"><replaceable>address</replaceable>
+        <replaceable>mask</replaceable></arg>
 
-        <arg choice="plain">address/vlsm</arg>
+        <arg
+        choice="plain"><replaceable>address</replaceable>/<replaceable>vlsm</replaceable></arg>
       </group>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>iprange</option></arg>
 
-      <arg choice="plain">address1<option>-</option>address2</arg>
+      <arg
+      choice="plain"><replaceable>address1</replaceable><option>-</option><replaceable>address2</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>load</option></arg>
 
@@ -177,49 +183,49 @@
 
       <arg><option>-c</option></arg>
 
-      <arg><option>-r</option> root-user-name</arg>
+      <arg><option>-r</option> <replaceable>root-user-name</replaceable></arg>
 
-      <arg>directory</arg>
+      <arg><replaceable>directory</replaceable></arg>
 
-      <arg choice="plain">system</arg>
+      <arg choice="plain"><replaceable>system</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>logdrop</option></arg>
 
-      <arg choice="plain">address</arg>
+      <arg choice="plain"><replaceable>address</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>logwatch</option></arg>
 
       <arg><option>-m</option></arg>
 
-      <arg>refresh-interval</arg>
+      <arg><replaceable>refresh-interval</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>logreject</option></arg>
 
-      <arg choice="plain">address</arg>
+      <arg choice="plain"><replaceable>address</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>refresh</option></arg>
     </cmdsynopsis>
@@ -227,17 +233,17 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>reject</option></arg>
 
-      <arg choice="plain">address</arg>
+      <arg choice="plain"><replaceable>address</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>reload</option></arg>
 
@@ -245,67 +251,67 @@
 
       <arg><option>-c</option></arg>
 
-      <arg><option>-r</option> root-user-name</arg>
+      <arg><option>-r</option> <replaceable>root-user-name</replaceable></arg>
 
-      <arg>directory</arg>
+      <arg><replaceable>directory</replaceable></arg>
 
-      <arg choice="plain">system</arg>
+      <arg choice="plain"><replaceable>system</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>restart</option></arg>
 
-      <arg>directory</arg>
+      <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>restore</option></arg>
 
-      <arg>filename</arg>
+      <arg><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>safe-restart</option></arg>
 
-      <arg>directory</arg>
+      <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>safe-start</option></arg>
 
-      <arg>directory</arg>
+      <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>save</option></arg>
 
-      <arg choice="opt">filename</arg>
+      <arg choice="opt"><replaceable>filename</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -314,13 +320,13 @@
       <arg><option>-t</option>
       {<option>filter</option>|<option>mangle</option>|<option>nat</option>|<option>raw</option>}</arg>
 
-      <arg rep="repeat">chain</arg>
+      <arg rep="repeat"><replaceable>chain</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -332,7 +338,7 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -343,7 +349,7 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -355,7 +361,7 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -365,7 +371,7 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>show</option></arg>
 
@@ -377,19 +383,19 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>start</option></arg>
 
       <arg><option>-f</option></arg>
 
-      <arg>directory</arg>
+      <arg><replaceable>directory</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>stop</option></arg>
     </cmdsynopsis>
@@ -397,7 +403,7 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>status</option></arg>
     </cmdsynopsis>
@@ -405,19 +411,19 @@
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>try</option></arg>
 
-      <arg choice="plain">directory</arg>
+      <arg choice="plain"><replaceable>directory</replaceable></arg>
 
-      <arg>timeout</arg>
+      <arg><replaceable>timeout</replaceable></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
       <command>shorewall</command>
 
-      <arg>-options</arg>
+      <arg>-<replaceable>options</replaceable></arg>
 
       <arg choice="plain"><option>version</option></arg>
     </cmdsynopsis>