diff --git a/manpages/shorewall.xml b/manpages/shorewall.xml
index b7ada64d1..2221cf051 100644
--- a/manpages/shorewall.xml
+++ b/manpages/shorewall.xml
@@ -24,8 +24,6 @@
       <arg choice="plain" rep="repeat">interface[:host-list]</arg>
 
       <arg choice="plain">zone</arg>
-
-      <sbr />
     </cmdsynopsis>
 
     <cmdsynopsis>
@@ -82,8 +80,6 @@
       <arg choice="plain" rep="repeat">interface[:host-list]</arg>
 
       <arg choice="plain">zone</arg>
-
-      <sbr />
     </cmdsynopsis>
 
     <cmdsynopsis>
@@ -167,7 +163,7 @@
 
       <command>iprange</command>
 
-      <arg choice="plain">address1-address2</arg>
+      <arg choice="plain">address1<option>-</option>address2</arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
@@ -367,7 +363,7 @@
 
       <arg><option>-m</option></arg>
 
-      <command> log</command>
+      <command>log</command>
     </cmdsynopsis>
 
     <cmdsynopsis>
@@ -634,20 +630,20 @@
           has root access to the system via ssh). The command is equivalent
           to:</para>
 
-          <programlisting>    <emphasis role="bold">/sbin/shorewall compile -e</emphasis> <emphasis>directory</emphasis> <emphasis>directory</emphasis><emphasis
+          <programlisting>    <emphasis role="bold">/sbin/shorewall compile -e</emphasis> <emphasis><replaceable>directory</replaceable></emphasis> <replaceable>directory</replaceable><emphasis
               role="bold">/firewall &amp;&amp;\</emphasis>
     <emphasis role="bold">scp</emphasis> <emphasis>directory</emphasis><emphasis
               role="bold">/firewall</emphasis> <emphasis>directory</emphasis><emphasis
-              role="bold">/firewall.conf</emphasis> <emphasis role="bold">root@</emphasis><emphasis>system</emphasis><emphasis
+              role="bold">/firewall.conf</emphasis> <emphasis role="bold">root@</emphasis><replaceable>system</replaceable><emphasis
               role="bold">:/var/lib/shorewall-lite/ &amp;&amp;\</emphasis>
-    <emphasis role="bold">ssh root@</emphasis><emphasis>system</emphasis> <emphasis
+    <emphasis role="bold">ssh root@</emphasis><replaceable>system</replaceable> <emphasis
               role="bold">'/sbin/shorewall-lite start'</emphasis></programlisting>
 
           <para>In other words, the configuration in the specified (or
           defaulted) directory is compiled to a file called firewall in that
           directory. If compilation succeeds, then firewall is copied to
-          <emphasis>system</emphasis> using scp. If the copy succeeds,
-          Shorewall Lite on <emphasis>system</emphasis> is started via
+          <replaceable>system</replaceable> using scp. If the copy succeeds,
+          Shorewall Lite on <replaceable>system</replaceable> is started via
           ssh.</para>
 
           <para>If <emphasis role="bold">-s</emphasis> is specified and the
@@ -659,8 +655,8 @@
           command <emphasis role="bold">shorewall-lite show capabilities -f
           &gt; /var/lib/shorewall-lite/capabilities</emphasis> is executed via
           ssh then the generated file is copied to
-          <emphasis>directory</emphasis> using scp. This step is performed
-          before the configuration is compiled.</para>
+          <replaceable>directory</replaceable> using scp. This step is
+          performed before the configuration is compiled.</para>
         </listitem>
       </varlistentry>