diff --git a/Shorewall-docs/GenericTunnels.xml b/Shorewall-docs/GenericTunnels.xml
index 24775578c..3c7c26f47 100644
--- a/Shorewall-docs/GenericTunnels.xml
+++ b/Shorewall-docs/GenericTunnels.xml
@@ -30,15 +30,14 @@
       document under the terms of the GNU Free Documentation License, Version
       1.2 or any later version published by the Free Software Foundation; with
       no Invariant Sections, with no Front-Cover, and with no Back-Cover
-      Texts. A copy of the license is included in the section entitled &#34;<ulink
-      url="GnuCopyright.htm">GNU Free Documentation License</ulink>&#34;.</para>
+      Texts. A copy of the license is included in the section entitled
+      <quote><ulink url="GnuCopyright.htm">GNU Free Documentation License</ulink></quote>.</para>
     </legalnotice>
   </articleinfo>
 
   <para>Shorewall includes built-in support for a wide range of VPN solutions.
   If you have need for a tunnel type that does not have explicit support, you
-  can generally describe the tunneling software using &#34;generic
-  tunnels&#34;</para>
+  can generally describe the tunneling software using <quote>generic tunnels</quote>.</para>
 
   <section>
     <title>Bridging two Masqueraded Networks</title>
@@ -66,8 +65,8 @@
       </listitem>
 
       <listitem>
-        <para>The tunnel interface on system A is &#34;tun0&#34; and the
-        tunnel interface on system B is also &#34;tun0&#34;.</para>
+        <para>The tunnel interface on system A is <quote>tun0</quote> and the
+        tunnel interface on system B is also <quote>tun0</quote>.</para>
       </listitem>
     </orderedlist>
 
@@ -242,9 +241,9 @@
       </tgroup>
     </informaltable>
 
-    <para>You will need to allow traffic between the &#34;vpn&#34; zone and
-    the &#34;loc&#34; zone on both systems -- if you simply want to admit all
-    traffic in both directions, you can use the policy file:</para>
+    <para>You will need to allow traffic between the <quote>vpn</quote> zone
+    and the <quote>loc</quote> zone on both systems -- if you simply want to
+    admit all traffic in both directions, you can use the policy file:</para>
 
     <informaltable>
       <tgroup cols="4">