diff --git a/en_US.ISO8859-1/books/arch-handbook/book.xml b/en_US.ISO8859-1/books/arch-handbook/book.xml
index 212d13ba34..83fbc2a758 100644
--- a/en_US.ISO8859-1/books/arch-handbook/book.xml
+++ b/en_US.ISO8859-1/books/arch-handbook/book.xml
@@ -1,168 +1,192 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
 	"http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % mac-entities SYSTEM "mac.ent">
 %mac-entities;
 ]>
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
-  <info><title>&os; Architecture Handbook</title>
-    
+<book xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:lang="en">
 
-    <author><orgname>The FreeBSD Documentation Project</orgname></author>
+  <info>
+    <title>&os; Architecture Handbook</title>
+
+    <author><orgname>The FreeBSD Documentation
+      Project</orgname></author>
 
     <pubdate>$FreeBSD$</pubdate>
 
     <copyright>
       <year>2000</year>
       <year>2001</year>
       <year>2002</year>
       <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
       <year>2012</year>
       <year>2013</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
     <legalnotice xml:id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.unix;
       &tm-attrib.apple;
       &tm-attrib.microsoft;
       &tm-attrib.general;
     </legalnotice>
 
     &legalnotice;
 
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <abstract>
       <para>Welcome to the &os; Architecture Handbook.  This manual is
 	a
 	<emphasis>work in progress</emphasis> and is the work of many
 	individuals.  Many sections do not yet exist and some of those
 	that do exist need to be updated.  If you are interested in
 	helping with this project, send email to the &a.doc;.</para>
 
       <para>The latest version of this document is always available
-	from the <link xlink:href="&url.base;/index.html">FreeBSD World
-	Wide Web server</link>.  It may also be downloaded in a
-	variety of formats and compression options from the <link xlink:href="https://download.freebsd.org/ftp/doc/">FreeBSD FTP server</link>
-	or one of the numerous <link xlink:href="&url.books.handbook;/mirrors-ftp.html">mirror sites</link>.</para>
+	from the <link xlink:href="&url.base;/index.html">FreeBSD
+	  World Wide Web server</link>.  It may also be downloaded in
+	a variety of formats and compression options from the <link
+	  xlink:href="https://download.freebsd.org/ftp/doc/">FreeBSD
+	  FTP server</link> or one of the numerous <link
+	  xlink:href="&url.books.handbook;/mirrors-ftp.html">mirror
+	  sites</link>.</para>
     </abstract>
   </info>
 
   <part xml:id="kernel">
     <title>Kernel</title>
 
     &chap.boot;
     &chap.locking;
     &chap.kobj;
     &chap.jail;
     &chap.sysinit;
     &chap.mac;
     &chap.vm;
     &chap.smp;
 
   </part>
 
   <part xml:id="devicedrivers">
     <title>Device Drivers</title>
 
     &chap.driverbasics;
     &chap.isa;
     &chap.pci;
     &chap.scsi;
     &chap.usb;
     &chap.newbus;
 
     &chap.snd;
     &chap.pccard;
 
   </part>
 
 <!-- XXX - finish me
   <part id="architectures">
     <title>Architectures</title>
 
     <chapter id="i386">
       <title>* I386</title>
 
       <para>Talk about <literal>i386</literal> specific &os;
 	architecture.</para>
     </chapter>
 
-    <chapter id="ia64">
-      <title>* IA-64</title>
-
-      <para>Talk about the architectural specifics of
-      FreeBSD/ia64.</para>
-
-    </chapter>
-
     <chapter id="sparc64">
       <title>* SPARC64</title>
 
       <para>Talk about <literal>SPARC64</literal> specific &os;
 	architecture.</para>
     </chapter>
 
     <chapter id="amd64">
       <title>* AMD64</title>
 
       <para>Talk about <literal>AMD64</literal> specific &os;
 	architecture.</para>
     </chapter>
 
     <chapter id="powerpc">
       <title>* PowerPC</title>
 
       <para>Talk about <literal>PowerPC</literal> specific &os;
 	architecture.</para>
     </chapter>
   </part>
 -->
 
   <part xml:id="appendices">
     <title>Appendices</title>
 
     <bibliography>
 
       <biblioentry xreflabel="1">
 	<authorgroup>
-	  <author><personname><firstname>Marshall</firstname><othername role="Middle">Kirk</othername><surname>McKusick</surname></personname></author>
-	  <author><personname><firstname>Keith</firstname><surname>Bostic</surname></personname></author>
-	  <author><personname><firstname>Michael</firstname><othername role="MI">J</othername><surname>Karels</surname></personname></author>
-	  <author><personname><firstname>John</firstname><othername role="MI">S</othername><surname>Quarterman</surname></personname></author>
+	  <author>
+	    <personname>
+	      <firstname>Marshall</firstname>
+	      <othername role="Middle">Kirk</othername>
+	      <surname>McKusick</surname>
+	    </personname>
+	  </author>
+	  <author>
+	    <personname>
+	      <firstname>Keith</firstname>
+	      <surname>Bostic</surname>
+	    </personname>
+	  </author>
+	  <author>
+	    <personname>
+	      <firstname>Michael</firstname>
+	      <othername role="MI">J</othername>
+	      <surname>Karels</surname>
+	    </personname>
+	  </author>
+	  <author>
+	    <personname>
+	      <firstname>John</firstname>
+	      <othername role="MI">S</othername>
+	      <surname>Quarterman</surname>
+	    </personname>
+	  </author>
 	</authorgroup>
 
 	<copyright>
 	  <year>1996</year>
 	  <holder>Addison-Wesley Publishing Company, Inc.</holder>
 	</copyright>
 
 	<biblioid class="isbn">0-201-54979-4</biblioid>
 
 	<publisher>
-	  <publishername>Addison-Wesley Publishing Company, Inc.</publishername>
+	  <publishername>Addison-Wesley Publishing Company,
+	    Inc.</publishername>
 	</publisher>
 
-	<citetitle>The Design and Implementation of the 4.4 BSD Operating System</citetitle>
+	<citetitle>The Design and Implementation of the 4.4 BSD
+	  Operating System</citetitle>
 
 	<pagenums>1-2</pagenums>
       </biblioentry>
 
     </bibliography>
   </part>
 
   &chap.index;
 
 </book>