diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index 4359852dff..3c7b7ea207 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -845,7 +845,7 @@ lib/X11/oneko/mouse.xpm
 	    numerically less than the previous version (20000801), but
 	    the <literal>,1</literal> suffix is treated specially by
 	    automated tools and found to be greater than the implied
-	    suffix ",0" on the earlier package.</para>
+	    suffix <literal>,0</literal> on the earlier package.</para>
 
 	  <para>It is expected that <makevar>PORTEPOCH</makevar> will
 	    not be used for the majority of ports, and that sensible
@@ -853,10 +853,10 @@ lib/X11/oneko/mouse.xpm
 	    it becoming necessary if a future release of the software
 	    should change the version structure. However, care is
 	    needed by FreeBSD porters when a vendor release is made
-	    without an official version number - such as a code
-	    "snapshot" release.  The temptation is to label the
+	    without an official version number &mdash; such as a code
+	    <quote>snapshot</quote> release.  The temptation is to label the
 	    release with the release date, which will cause problems
-	    as in the example above when a new "official" release is
+	    as in the example above when a new <quote>official</quote> release is
 	    made.</para>
 
 	  <para>For example, if a snapshot release is made on the date
@@ -891,7 +891,7 @@ PORTREVISION=	1</programlisting>
 	  <para><makevar>PKGNAME</makevar> becomes
 	    <literal>gtkmumble-0.10_1</literal></para>
 
-	  <para>A new version is released by the vendor, numbered 0.2
+	  <para>A new version is released by the vendor, numbered <literal>0.2</literal>
 	    (it turns out the author actually intended
 	    <literal>0.10</literal> to actually mean
 	    <literal>0.1.0</literal>, not <quote>what comes after
@@ -899,7 +899,7 @@ PORTREVISION=	1</programlisting>
 	    version <literal>2</literal> is numerically less than the
 	    previous version <literal>10</literal> the
 	    <makevar>PORTEPOCH</makevar> must be bumped to manually
-	    force the new package to be detected as "newer". Since it
+	    force the new package to be detected as <quote>newer</quote>. Since it
 	    is a new vendor release of the code,
 	    <makevar>PORTREVISION</makevar> is reset to 0 (or removed
 	    from the makefile).</para>
@@ -1022,10 +1022,10 @@ PORTEPOCH=	1</programlisting>
             integers and single lowercase alphabetics.  In particular,
             it is not permissible to have another dash inside the
             version string.  The only exception is the string
-            <literal>pl</literal> (meaning `patchlevel'), which can be
+            <literal>pl</literal> (meaning <quote>patchlevel</quote>), which can be
             used <emphasis>only</emphasis> when there are no major and
             minor version numbers in the software.  If the software
-            version has strings like "alpha", "beta", "rc", or "pre", take
+            version has strings like <quote>alpha</quote>, <quote>beta</quote>, <quote>rc</quote>, or <quote>pre</quote>, take
             the first letter and put it immediately after a period.
             If the version string continues after those names, the
             numbers should follow the single alphabet without an extra