diff --git a/manpages/shorewall-accounting.xml b/manpages/shorewall-accounting.xml
index 7d873116a..b9a9a7eed 100644
--- a/manpages/shorewall-accounting.xml
+++ b/manpages/shorewall-accounting.xml
@@ -102,8 +102,10 @@
         <listitem>
           <para>Packet Source.</para>
 
-          <para>The name of an interface, an address (host or net) or an
-          interface name followed by ":" and a host or net address.</para>
+          <para>The name of an <replaceable>interface</replaceable>, an
+          <replaceable>address</replaceable> (host or net) or an
+          <replaceable>interface</replaceable> name followed by ":" and a host
+          or net <replaceable>address</replaceable>.</para>
         </listitem>
       </varlistentry>
 
@@ -148,20 +150,20 @@
         role="bold">all</emphasis>|<emphasis>ipp2p-option</emphasis>|<emphasis>port-name-or-number</emphasis>[,<emphasis>port-name-or-number</emphasis>]...}</term>
 
         <listitem>
-          <para>Destination Port number. If the PROTOCOL is <emphasis
-          role="bold">ipp2p</emphasis> then this column must contain an
-          <emphasis>ipp2p-option</emphasis> ("iptables -m ipp2p --help")
-          without the leading "--". If no option is given in this column,
-          <emphasis role="bold">ipp2p</emphasis> is assumed.</para>
-
-          <para>Service name from services(5) or <emphasis>port
-          number</emphasis>. May only be specified if the protocol is
-          <emphasis role="bold">tcp</emphasis> or <emphasis
+          <para>Destination Port number. Service name from services(5) or
+          <emphasis>port number</emphasis>. May only be specified if the
+          protocol is <emphasis role="bold">tcp</emphasis> or <emphasis
           role="bold">udp</emphasis> (6 or 17).</para>
 
           <para>You may place a comma-separated list of port names or numbers
           in this column if your kernel and iptables include multiport match
           support.</para>
+
+          <para>If the PROTOCOL is <emphasis role="bold">ipp2p</emphasis> then
+          this column must contain an <emphasis>ipp2p-option</emphasis>
+          ("iptables -m ipp2p --help") without the leading "--". If no option
+          is given in this column, <emphasis role="bold">ipp2p</emphasis> is
+          assumed.</para>
         </listitem>
       </varlistentry>
 
@@ -172,7 +174,7 @@
         role="bold">all</emphasis>|<emphasis>port-name-or-number</emphasis>[,<emphasis>port-name-or-number</emphasis>]...}</term>
 
         <listitem>
-          <para>Source Port Service name from services(5) or <emphasis>port
+          <para>Service name from services(5) or <emphasis>port
           number</emphasis>. May only be specified if the protocol is TCP or
           UDP (6 or 17).</para>
 
@@ -274,4 +276,4 @@
     shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
     shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
   </refsect1>
-</refentry>
+</refentry>
\ No newline at end of file
diff --git a/manpages/shorewall-exclusion.xml b/manpages/shorewall-exclusion.xml
index 2c2f1e1fb..35136c62e 100644
--- a/manpages/shorewall-exclusion.xml
+++ b/manpages/shorewall-exclusion.xml
@@ -15,11 +15,8 @@
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>!</command>
-
-      <arg choice="plain">address-or-range</arg>
-
-      <arg rep="repeat">,address-or-range</arg>
+      <arg choice="plain"
+      rep="repeat"><option>!</option><replaceable>address-or-range</replaceable>[,<replaceable>address-or-range</replaceable>]</arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml
index 8caba4e33..906929a13 100644
--- a/manpages/shorewall.conf.xml
+++ b/manpages/shorewall.conf.xml
@@ -851,9 +851,10 @@
         role="bold">0</emphasis>|<emphasis role="bold">1</emphasis>]</term>
 
         <listitem>
-          <para>Traditionally, Shorewall has created rules for the complete
-          matrix of Networks defined by the zones, interfaces and hosts files.
-          Any traffic that didn't correspond to an element of that matrix was
+          <para>Traditionally, Shorewall has created rules for <ulink
+          url="../ScalabilityAndPerformance.html">the complete matrix of host
+          groups defined by the zones, interfaces and hosts files</ulink>. Any
+          traffic that didn't correspond to an element of that matrix was
           rejected in one of the built-in changes. When the matrix is sparse,
           this results in lots of largely useless rules.</para>
 
@@ -1167,7 +1168,7 @@
 
             <member>1 — Major progress messages displayed</member>
 
-            <member>2 — All progress messages displayed (old default
+            <member>2 — All progress messages displayed (pre Shorewall-3.2.0
             behavior)</member>
           </simplelist>