diff --git a/en/handbook/README b/en/handbook/README
index 047c13f577..13f7ea0c3d 100644
--- a/en/handbook/README
+++ b/en/handbook/README
@@ -250,3 +250,10 @@ for example,
      Converted '"' into <quote>, <literal>, <command>, <application>,
      <filename>, <emphasis>, <option> or removed it as neccessary.
 
+ 16. A general cleanup to get it to validate. The original conversion 
+     process left some <sect?>'s with just a title, which is invalid,
+     they must contain a <para> or similar element.
+
+     Also fixed a couple of typos in the tags. The document should now 
+     validate, save for the undefined external entitites.
+
diff --git a/en/handbook/handbook.sgml b/en/handbook/handbook.sgml
index ceaf109452..9c07dec26e 100644
--- a/en/handbook/handbook.sgml
+++ b/en/handbook/handbook.sgml
@@ -3745,7 +3745,6 @@
 		    <para>QIC-80 tape support requires a separate filter
 		      program called <command>ft(8)</command>, see the manual
 		      page for details.</para>
-		    </blockquote>
 		  </note>
 		</listitem>
 	      </varlistentry>
@@ -11741,17 +11740,20 @@
 	  
 	  <sect3>
 	    <title>* ISA</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* EISA</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* VLB</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3
@@ -11957,12 +11959,14 @@
 	  
 	  <sect3>
 	    <title>* 486 class</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* 386 class</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -11988,7 +11992,8 @@
 	
 	<sect2>
 	  <title>* BIOS</title>
-	  
+
+	  <para></para>
 	</sect2>
       </sect1>
       
@@ -11999,12 +12004,14 @@
 	
 	<sect2>
 	  <title>* Video cards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Sound cards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
@@ -13360,32 +13367,38 @@
 	
 	<sect2>
 	  <title>* Parallel ports</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Modems</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Network cards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Keyboards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Mice</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Other</title>
-	  
+
+	  <para></para>
 	</sect2>
       </sect1>
       
@@ -14970,17 +14983,20 @@
 	  
 	  <sect3>
 	    <title>* SCSI</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* IDE</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* Floppy</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	</sect2>
 	
@@ -15125,7 +15141,8 @@
 	  
 	  <sect3>
 	    <title>* IDE hard drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	</sect2>
 	
@@ -15279,7 +15296,8 @@
 	  
 	  <sect3>
 	    <title>* IDE drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -15292,7 +15310,8 @@
 	  
 	  <sect3>
 	    <title>* Parallel port drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -16018,7 +16037,7 @@
 	      <para>Other firmware revisions that are known to work are:
 		M75D</para>
 	      
-	      <para>Reported by: Marc van Kempen marc@bowtie.nl  <litera>REV73R1</litera>
+	      <para>Reported by: Marc van Kempen marc@bowtie.nl  <literal>REV73R1</literal>
 		Andrew Gordon Andrew.Gordon@net-tel.co.uk <literal>M75D</literal></para>
 	      
 	    </sect4>
@@ -16045,7 +16064,8 @@
 	  
 	  <sect3>
 	    <title>* Problem drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	</sect2>
 	
@@ -16079,12 +16099,14 @@
 	
 	<sect2>
 	  <title>* Other</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Adding and reconfiguring disks</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2
@@ -16094,7 +16116,8 @@
 	  
 	  <sect3>
 	    <title>* What about backups to floppies?</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -16212,7 +16235,8 @@
 	      id="hw-storage-tapebackups-mini">
 	      <title>
 		* Mini-Cartridge</title>
-	      
+
+	      <para></para>
 	    </sect4>
 	    
 	    <sect4
@@ -16634,7 +16658,8 @@
 	    
 	    <sect4>
 	      <title>* I did not prepare for the Disaster, What Now?</title>
-	      
+
+	      <para></para>
 	    </sect4>
 	  </sect3>
 	</sect2>
@@ -16647,7 +16672,8 @@
 	
 	<sect2>
 	  <title>* PCMCIA</title>
-	  
+
+	  <para></para>
 	</sect2>
       </sect1>
     </chapter>
@@ -21513,6 +21539,7 @@
 	    <variablelist>
 	      <varlistentry><term>&a.wilko;</term>
 		<listitem>
+		  <para></para>
 		</listitem>
 	      </varlistentry>
 	      
@@ -23199,8 +23226,8 @@
 	      <listitem>
 		<para>  Before compiling current, read the Makefile in
 		  <filename>/usr/src</filename> carefully.  You should at
-		  least run a <command><xref
-		    linkend="makeworld" remap="make world"></command> the first time
+		  least run a <xref
+		    linkend="makeworld" remap="make world"> the first time
 		  through as part of the upgrading process. Reading the
 		  &a.current; will keep you up-to-date on other bootstrapping
 		  procedures that sometimes become necessary as we move
@@ -23339,8 +23366,8 @@
 	      <listitem>
 		<para>  Before compiling stable, read the Makefile in
 		  <filename>/usr/src</filename> carefully.  You should at
-		  least run a <command><xref
-		    linkend="makeworld" remap="make world"></command> the first time
+		  least run a <xref
+		    linkend="makeworld" remap="make world"> the first time
 		  through as part of the upgrading process. Reading the
 		  &a.stable; will keep you up-to-date on other bootstrapping
 		  procedures that sometimes become necessary as we move
@@ -23782,7 +23809,7 @@
 	      manually to get an update, or they must set up a cron job to run
 	      it automatically on a regular basis.</para>
 	    
-	    <para>The term <qpplication>CVSup</qpplication>, capitalized just so, refers to the entire
+	    <para>The term <application>CVSup</application>, capitalized just so, refers to the entire
 	      software package.  Its main components are the client <command>cvsup</command>
 	      which runs on each user's machine, and the server <command>cvsupd</command> which
 	      runs at each of the FreeBSD mirror sites.</para>
@@ -27452,7 +27479,7 @@
 		<acronym>MANPREFIX</acronym> to set it. Also, if only manpages
 		in certain section go in a non-standard place, such as many
 		Perl modules ports, you can set individual man paths using
-		<acronym>MAN<replaceable>sect</replaceable>PREFIX</acronym>
+		<literal>MAN<replaceable>sect</replaceable>PREFIX</literal>
 		(where <emphasis>sect</emphasis> is one of 1-9, L or
 		N).</para>
 	      
@@ -31802,7 +31829,7 @@
 	    contents-file you will find it by grepping through them:
 	    <table>
 	      <title></title>
-	      <tgroup>
+	      <tgroup cols="2">
 		<tbody>
 		  <row><entry>Library </entry><entry>Package </entry></row>
 		  <row><entry><filename>ld.so</filename> </entry><entry>ldso
@@ -31839,7 +31866,7 @@
 	    would find the following locations:
 	    <table>
 	      <title></title>
-	      <tgroup>
+	      <tgroup cols="2">
 		<tbody>
 		  <row><entry>Package </entry><entry>Location	</entry></row>
 		  <row><entry>ldso </entry><entry>diska2 </entry></row>
diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index ceaf109452..9c07dec26e 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -3745,7 +3745,6 @@
 		    <para>QIC-80 tape support requires a separate filter
 		      program called <command>ft(8)</command>, see the manual
 		      page for details.</para>
-		    </blockquote>
 		  </note>
 		</listitem>
 	      </varlistentry>
@@ -11741,17 +11740,20 @@
 	  
 	  <sect3>
 	    <title>* ISA</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* EISA</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* VLB</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3
@@ -11957,12 +11959,14 @@
 	  
 	  <sect3>
 	    <title>* 486 class</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* 386 class</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -11988,7 +11992,8 @@
 	
 	<sect2>
 	  <title>* BIOS</title>
-	  
+
+	  <para></para>
 	</sect2>
       </sect1>
       
@@ -11999,12 +12004,14 @@
 	
 	<sect2>
 	  <title>* Video cards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Sound cards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
@@ -13360,32 +13367,38 @@
 	
 	<sect2>
 	  <title>* Parallel ports</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Modems</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Network cards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Keyboards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Mice</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Other</title>
-	  
+
+	  <para></para>
 	</sect2>
       </sect1>
       
@@ -14970,17 +14983,20 @@
 	  
 	  <sect3>
 	    <title>* SCSI</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* IDE</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* Floppy</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	</sect2>
 	
@@ -15125,7 +15141,8 @@
 	  
 	  <sect3>
 	    <title>* IDE hard drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	</sect2>
 	
@@ -15279,7 +15296,8 @@
 	  
 	  <sect3>
 	    <title>* IDE drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -15292,7 +15310,8 @@
 	  
 	  <sect3>
 	    <title>* Parallel port drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -16018,7 +16037,7 @@
 	      <para>Other firmware revisions that are known to work are:
 		M75D</para>
 	      
-	      <para>Reported by: Marc van Kempen marc@bowtie.nl  <litera>REV73R1</litera>
+	      <para>Reported by: Marc van Kempen marc@bowtie.nl  <literal>REV73R1</literal>
 		Andrew Gordon Andrew.Gordon@net-tel.co.uk <literal>M75D</literal></para>
 	      
 	    </sect4>
@@ -16045,7 +16064,8 @@
 	  
 	  <sect3>
 	    <title>* Problem drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	</sect2>
 	
@@ -16079,12 +16099,14 @@
 	
 	<sect2>
 	  <title>* Other</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Adding and reconfiguring disks</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2
@@ -16094,7 +16116,8 @@
 	  
 	  <sect3>
 	    <title>* What about backups to floppies?</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -16212,7 +16235,8 @@
 	      id="hw-storage-tapebackups-mini">
 	      <title>
 		* Mini-Cartridge</title>
-	      
+
+	      <para></para>
 	    </sect4>
 	    
 	    <sect4
@@ -16634,7 +16658,8 @@
 	    
 	    <sect4>
 	      <title>* I did not prepare for the Disaster, What Now?</title>
-	      
+
+	      <para></para>
 	    </sect4>
 	  </sect3>
 	</sect2>
@@ -16647,7 +16672,8 @@
 	
 	<sect2>
 	  <title>* PCMCIA</title>
-	  
+
+	  <para></para>
 	</sect2>
       </sect1>
     </chapter>
@@ -21513,6 +21539,7 @@
 	    <variablelist>
 	      <varlistentry><term>&a.wilko;</term>
 		<listitem>
+		  <para></para>
 		</listitem>
 	      </varlistentry>
 	      
@@ -23199,8 +23226,8 @@
 	      <listitem>
 		<para>  Before compiling current, read the Makefile in
 		  <filename>/usr/src</filename> carefully.  You should at
-		  least run a <command><xref
-		    linkend="makeworld" remap="make world"></command> the first time
+		  least run a <xref
+		    linkend="makeworld" remap="make world"> the first time
 		  through as part of the upgrading process. Reading the
 		  &a.current; will keep you up-to-date on other bootstrapping
 		  procedures that sometimes become necessary as we move
@@ -23339,8 +23366,8 @@
 	      <listitem>
 		<para>  Before compiling stable, read the Makefile in
 		  <filename>/usr/src</filename> carefully.  You should at
-		  least run a <command><xref
-		    linkend="makeworld" remap="make world"></command> the first time
+		  least run a <xref
+		    linkend="makeworld" remap="make world"> the first time
 		  through as part of the upgrading process. Reading the
 		  &a.stable; will keep you up-to-date on other bootstrapping
 		  procedures that sometimes become necessary as we move
@@ -23782,7 +23809,7 @@
 	      manually to get an update, or they must set up a cron job to run
 	      it automatically on a regular basis.</para>
 	    
-	    <para>The term <qpplication>CVSup</qpplication>, capitalized just so, refers to the entire
+	    <para>The term <application>CVSup</application>, capitalized just so, refers to the entire
 	      software package.  Its main components are the client <command>cvsup</command>
 	      which runs on each user's machine, and the server <command>cvsupd</command> which
 	      runs at each of the FreeBSD mirror sites.</para>
@@ -27452,7 +27479,7 @@
 		<acronym>MANPREFIX</acronym> to set it. Also, if only manpages
 		in certain section go in a non-standard place, such as many
 		Perl modules ports, you can set individual man paths using
-		<acronym>MAN<replaceable>sect</replaceable>PREFIX</acronym>
+		<literal>MAN<replaceable>sect</replaceable>PREFIX</literal>
 		(where <emphasis>sect</emphasis> is one of 1-9, L or
 		N).</para>
 	      
@@ -31802,7 +31829,7 @@
 	    contents-file you will find it by grepping through them:
 	    <table>
 	      <title></title>
-	      <tgroup>
+	      <tgroup cols="2">
 		<tbody>
 		  <row><entry>Library </entry><entry>Package </entry></row>
 		  <row><entry><filename>ld.so</filename> </entry><entry>ldso
@@ -31839,7 +31866,7 @@
 	    would find the following locations:
 	    <table>
 	      <title></title>
-	      <tgroup>
+	      <tgroup cols="2">
 		<tbody>
 		  <row><entry>Package </entry><entry>Location	</entry></row>
 		  <row><entry>ldso </entry><entry>diska2 </entry></row>
diff --git a/en_US.ISO_8859-1/books/handbook/book.sgml b/en_US.ISO_8859-1/books/handbook/book.sgml
index ceaf109452..9c07dec26e 100644
--- a/en_US.ISO_8859-1/books/handbook/book.sgml
+++ b/en_US.ISO_8859-1/books/handbook/book.sgml
@@ -3745,7 +3745,6 @@
 		    <para>QIC-80 tape support requires a separate filter
 		      program called <command>ft(8)</command>, see the manual
 		      page for details.</para>
-		    </blockquote>
 		  </note>
 		</listitem>
 	      </varlistentry>
@@ -11741,17 +11740,20 @@
 	  
 	  <sect3>
 	    <title>* ISA</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* EISA</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* VLB</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3
@@ -11957,12 +11959,14 @@
 	  
 	  <sect3>
 	    <title>* 486 class</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* 386 class</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -11988,7 +11992,8 @@
 	
 	<sect2>
 	  <title>* BIOS</title>
-	  
+
+	  <para></para>
 	</sect2>
       </sect1>
       
@@ -11999,12 +12004,14 @@
 	
 	<sect2>
 	  <title>* Video cards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Sound cards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
@@ -13360,32 +13367,38 @@
 	
 	<sect2>
 	  <title>* Parallel ports</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Modems</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Network cards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Keyboards</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Mice</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Other</title>
-	  
+
+	  <para></para>
 	</sect2>
       </sect1>
       
@@ -14970,17 +14983,20 @@
 	  
 	  <sect3>
 	    <title>* SCSI</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* IDE</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
 	    <title>* Floppy</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	</sect2>
 	
@@ -15125,7 +15141,8 @@
 	  
 	  <sect3>
 	    <title>* IDE hard drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	</sect2>
 	
@@ -15279,7 +15296,8 @@
 	  
 	  <sect3>
 	    <title>* IDE drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -15292,7 +15310,8 @@
 	  
 	  <sect3>
 	    <title>* Parallel port drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -16018,7 +16037,7 @@
 	      <para>Other firmware revisions that are known to work are:
 		M75D</para>
 	      
-	      <para>Reported by: Marc van Kempen marc@bowtie.nl  <litera>REV73R1</litera>
+	      <para>Reported by: Marc van Kempen marc@bowtie.nl  <literal>REV73R1</literal>
 		Andrew Gordon Andrew.Gordon@net-tel.co.uk <literal>M75D</literal></para>
 	      
 	    </sect4>
@@ -16045,7 +16064,8 @@
 	  
 	  <sect3>
 	    <title>* Problem drives</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	</sect2>
 	
@@ -16079,12 +16099,14 @@
 	
 	<sect2>
 	  <title>* Other</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2>
 	  <title>* Adding and reconfiguring disks</title>
-	  
+
+	  <para></para>
 	</sect2>
 	
 	<sect2
@@ -16094,7 +16116,8 @@
 	  
 	  <sect3>
 	    <title>* What about backups to floppies?</title>
-	    
+
+	    <para></para>
 	  </sect3>
 	  
 	  <sect3>
@@ -16212,7 +16235,8 @@
 	      id="hw-storage-tapebackups-mini">
 	      <title>
 		* Mini-Cartridge</title>
-	      
+
+	      <para></para>
 	    </sect4>
 	    
 	    <sect4
@@ -16634,7 +16658,8 @@
 	    
 	    <sect4>
 	      <title>* I did not prepare for the Disaster, What Now?</title>
-	      
+
+	      <para></para>
 	    </sect4>
 	  </sect3>
 	</sect2>
@@ -16647,7 +16672,8 @@
 	
 	<sect2>
 	  <title>* PCMCIA</title>
-	  
+
+	  <para></para>
 	</sect2>
       </sect1>
     </chapter>
@@ -21513,6 +21539,7 @@
 	    <variablelist>
 	      <varlistentry><term>&a.wilko;</term>
 		<listitem>
+		  <para></para>
 		</listitem>
 	      </varlistentry>
 	      
@@ -23199,8 +23226,8 @@
 	      <listitem>
 		<para>  Before compiling current, read the Makefile in
 		  <filename>/usr/src</filename> carefully.  You should at
-		  least run a <command><xref
-		    linkend="makeworld" remap="make world"></command> the first time
+		  least run a <xref
+		    linkend="makeworld" remap="make world"> the first time
 		  through as part of the upgrading process. Reading the
 		  &a.current; will keep you up-to-date on other bootstrapping
 		  procedures that sometimes become necessary as we move
@@ -23339,8 +23366,8 @@
 	      <listitem>
 		<para>  Before compiling stable, read the Makefile in
 		  <filename>/usr/src</filename> carefully.  You should at
-		  least run a <command><xref
-		    linkend="makeworld" remap="make world"></command> the first time
+		  least run a <xref
+		    linkend="makeworld" remap="make world"> the first time
 		  through as part of the upgrading process. Reading the
 		  &a.stable; will keep you up-to-date on other bootstrapping
 		  procedures that sometimes become necessary as we move
@@ -23782,7 +23809,7 @@
 	      manually to get an update, or they must set up a cron job to run
 	      it automatically on a regular basis.</para>
 	    
-	    <para>The term <qpplication>CVSup</qpplication>, capitalized just so, refers to the entire
+	    <para>The term <application>CVSup</application>, capitalized just so, refers to the entire
 	      software package.  Its main components are the client <command>cvsup</command>
 	      which runs on each user's machine, and the server <command>cvsupd</command> which
 	      runs at each of the FreeBSD mirror sites.</para>
@@ -27452,7 +27479,7 @@
 		<acronym>MANPREFIX</acronym> to set it. Also, if only manpages
 		in certain section go in a non-standard place, such as many
 		Perl modules ports, you can set individual man paths using
-		<acronym>MAN<replaceable>sect</replaceable>PREFIX</acronym>
+		<literal>MAN<replaceable>sect</replaceable>PREFIX</literal>
 		(where <emphasis>sect</emphasis> is one of 1-9, L or
 		N).</para>
 	      
@@ -31802,7 +31829,7 @@
 	    contents-file you will find it by grepping through them:
 	    <table>
 	      <title></title>
-	      <tgroup>
+	      <tgroup cols="2">
 		<tbody>
 		  <row><entry>Library </entry><entry>Package </entry></row>
 		  <row><entry><filename>ld.so</filename> </entry><entry>ldso
@@ -31839,7 +31866,7 @@
 	    would find the following locations:
 	    <table>
 	      <title></title>
-	      <tgroup>
+	      <tgroup cols="2">
 		<tbody>
 		  <row><entry>Package </entry><entry>Location	</entry></row>
 		  <row><entry>ldso </entry><entry>diska2 </entry></row>