diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 78f10a042a..dd6a25f941 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
@@ -4,15 +4,15 @@
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/xml/entities.ent">
 %entities;
 
+<!ENTITY values.uses SYSTEM "uses.xml">
+]>
+
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 
-<!ENTITY values.uses SYSTEM "uses.xml">
-]>
-
 <book lang='en'>
   <bookinfo>
     <title>FreeBSD Porter's Handbook</title>
@@ -4110,8 +4110,8 @@ PKGNAMESUFFIX=	${RESOLUTION}
  :
 # default
 RESOLUTION?=	300
-.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
-	${RESOLUTION} != 300 && ${RESOLUTION} != 400
+.if ${RESOLUTION} != 118 &amp;&amp; ${RESOLUTION} != 240 &amp;&amp; \
+	${RESOLUTION} != 300 &amp;&amp; ${RESOLUTION} != 400
 	@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
 	@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400."
 	@${FALSE}
@@ -6669,7 +6669,7 @@ PLIST_SUB+=	QT_INCDIR_REL=${QT_INCDIR_REL} \
 	<programlisting>HAS_CONFIGURE=	yes
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+	@cd ${WRKSRC} &amp;&amp; ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} texmaker.pro</programlisting>
 
 	<para>Note the similarity to the <command>qmake</command> line
@@ -10037,7 +10037,7 @@ etc/orbit.conf.sample
 
       <para>Store the directory structure in a new file.</para>
 
-      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
+      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort &gt; OLD-DIRS</userinput></screen>
 
       <para>Create an empty <filename>pkg-plist</filename>
 	file:</para>
@@ -10049,12 +10049,12 @@ etc/orbit.conf.sample
 	list.</para>
 
       <screen>&prompt.root; <userinput>make install PREFIX=/var/tmp/`make -V PORTNAME`</userinput>
-&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
+&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * \! -type d) | sort &gt; pkg-plist</userinput></screen>
 
       <para>You must also add any newly created directories to the
 	packing list.</para>
 
-      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` && find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
+      <screen>&prompt.root; <userinput>(cd /var/tmp/`make -V PORTNAME` &amp;&amp; find -d * -type d) | sort | comm -13 OLD-DIRS - | sort -r | sed -e 's#^#@dirrm #' &gt;&gt; pkg-plist</userinput></screen>
 
       <para>Finally, you need to tidy up the packing list by hand; it
 	is not <emphasis>all</emphasis> automated.  Manual pages
@@ -10640,7 +10640,7 @@ as .putsy.conf and edit it.</programlisting>
     <sect1 id="svn-diff">
       <title>Using <literal>SVN</literal> to Make Patches</title>
 
-      <para>If you can, please submit a &man.svn.1 diff; they are
+      <para>If you can, please submit a &man.svn.1; diff they are
 	easier to handle than diffs between <quote>new and old</quote>
 	directories.  Plus it is easier for you to see what you have
 	changed and to update your diff if something is modified in