diff --git a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
index ee66d10ad9..9b002baeeb 100644
--- a/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
@@ -46,8 +46,9 @@
       not answer to the &a.doc;.</para>
 
     <para>DocBook was originally developed by HaL Computer Systems and
-      O'Reilly &amp; Associates to be a Document Type Definition (<acronym>DTD</acronym>) for
-      writing technical documentation <footnote><para>A short history
+      O'Reilly &amp; Associates to be a Document Type Definition
+      (<acronym>DTD</acronym>) for writing technical documentation
+      <footnote><para>A short history
 	  can be found under <ulink
 	    url="http://www.oasis-open.org/docbook/intro.shtml#d0e41">
 	    http://www.oasis-open.org/docbook/intro.shtml#d0e41</ulink>.</para></footnote>.
@@ -92,9 +93,9 @@
     <title>&os; Extensions</title>
 
     <para>The &os; Documentation Project has extended the
-      DocBook <acronym>DTD</acronym> with additional elements and entities.
-      These additions serve to make some of the markup easier or more
-      precise.</para>
+      DocBook <acronym>DTD</acronym> with additional elements and
+      entities.  These additions serve to make some of the markup
+      easier or more precise.</para>
 
     <para>Throughout the rest of this document, the term
       <quote>DocBook</quote> is used to mean the &os;-extended
@@ -190,9 +191,9 @@
 	    <row>
 	      <entry><literal>&amp;man.<replaceable>command</replaceable>.<replaceable>sectionnumber</replaceable>;</literal></entry>
 	      <entry><emphasis>link to
-		<replaceable>command</replaceable> manual page in
-		section
-		<replaceable>sectionnumber</replaceable></emphasis></entry>
+		  <replaceable>command</replaceable> manual page in
+		  section
+		  <replaceable>sectionnumber</replaceable></emphasis></entry>
 	      <entry>Entities are defined for all the <ulink
 		  url="&url.base;/cgi/man.cgi">&os; manual
 		  pages</ulink>.</entry>
@@ -231,10 +232,10 @@
 	    <row>
 	      <entry><literal>&amp;a.<replaceable>listname</replaceable>;</literal></entry>
 	      <entry><emphasis>link to
-		<replaceable>listname</replaceable></emphasis></entry>
+		  <replaceable>listname</replaceable></emphasis></entry>
 	      <entry>Entities are defined for all the <ulink
-		  url="&url.books.handbook;/eresources.html#eresources-mail">&os; mailing
-		  lists</ulink>.</entry>
+		  url="&url.books.handbook;/eresources.html#eresources-mail">&os;
+		  mailing lists</ulink>.</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -280,9 +281,10 @@
 	    <row>
 	      <entry><literal>&amp;url.articles.<replaceable>articlename</replaceable>;</literal></entry>
 	      <entry><emphasis>relative path to
-		<replaceable>articlename</replaceable></emphasis></entry>
+		  <replaceable>articlename</replaceable></emphasis></entry>
 	      <entry>Entities are defined for all the <ulink
-		  url="&url.doc.langbase;/articles/">&os; articles</ulink>.</entry>
+		  url="&url.doc.langbase;/articles/">&os;
+		  articles</ulink>.</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -310,7 +312,7 @@
 	    <row>
 	      <entry><literal>&amp;unix;</literal></entry>
 	      <entry>&unix;</entry>
-	      <entry>The &unix;	operating system.</entry>
+	      <entry>The &unix; operating system.</entry>
 	    </row>
 
 	    <row>
@@ -1337,7 +1339,8 @@ This is the file called 'foo2'</screen>
 
 	<para>However, make sure that the search does not go beyond
 	  the <quote>boundary between local and public
-	    administration</quote>, as <acronym>RFC</acronym> 1535 calls it.</para>
+	    administration</quote>, as <acronym>RFC</acronym> 1535
+	  calls it.</para>
       </example>
     </sect2>
 
@@ -1851,11 +1854,11 @@ This is the file called 'foo2'</screen>
     <sect2 id="docbook-markup-email-addresses">
       <title>Email Addresses</title>
 
-      <para>Email addresses are marked up as
-	<sgmltag>email</sgmltag> elements.  In the <acronym>HTML</acronym>
-	output format, the wrapped text becomes a hyperlink to the
-	email address.  Other output formats that support hyperlinks
-	may also make the email address into a link.</para>
+      <para>Email addresses are marked up as <sgmltag>email</sgmltag>
+	elements.  In the <acronym>HTML</acronym> output format, the
+	wrapped text becomes a hyperlink to the email address.  Other
+	output formats that support hyperlinks may also make the email
+	address into a link.</para>
 
       <example>
 	<title><sgmltag>email</sgmltag> with a Hyperlink</title>
@@ -1914,9 +1917,10 @@ This is the file called 'foo2'</screen>
 	exported by a <filename>Makefile</filename> that can be
 	given as a parameter to <command>make</command>.
 	<sgmltag>makevar</sgmltag> identifies a variable that can be
-	set (in the environment, on the command line with <command>make</command>,
-	or within the <filename>Makefile</filename>)
-	to influence the process.</para>
+	set (in the environment, on the command line with
+	<command>make</command>, or within the
+	<filename>Makefile</filename>) to influence the
+	process.</para>
 
       <example>
 	<title><sgmltag>maketarget</sgmltag> and