diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 33aadfacf2..de703cfb07 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -1,73 +1,78 @@
 # 
-# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.33 2001/06/21 03:38:14 chris Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.34 2001/06/23 22:46:14 murray Exp $
 #
 # Build the FreeBSD Handbook.
 #
 
 MAINTAINER=nik@FreeBSD.org
 
 DOC?= book
 
 FORMATS?= html-split
 
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-# IMAGES= advanced-networking/natd.png advanced-networking/natd.eps
+#IMAGES= advanced-networking/natd.eps
 
 # 
 # SRCS lists the individual SGML files that make up the document. Changes
 # to any of these files will force a rebuild
 #
 
 # SGML content
 SRCS=  book.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= backups/chapter.sgml
 SRCS+= basics/chapter.sgml
 SRCS+= bibliography/chapter.sgml
 SRCS+= boot/chapter.sgml
 SRCS+= contrib/chapter.sgml
 SRCS+= cutting-edge/chapter.sgml
 SRCS+= disks/chapter.sgml
 SRCS+= eresources/chapter.sgml
 SRCS+= hw/chapter.sgml
 SRCS+= install/chapter.sgml
 SRCS+= introduction/chapter.sgml
 SRCS+= kernelconfig/chapter.sgml
 SRCS+= kerneldebug/chapter.sgml
 SRCS+= kernelopts/chapter.sgml
 SRCS+= l10n/chapter.sgml
 SRCS+= linuxemu/chapter.sgml
 SRCS+= mail/chapter.sgml
 SRCS+= mirrors/chapter.sgml
 SRCS+= pgpkeys/chapter.sgml
 SRCS+= policies/chapter.sgml
 SRCS+= ppp-and-slip/chapter.sgml
 SRCS+= printing/chapter.sgml
 SRCS+= security/chapter.sgml
 SRCS+= serialcomms/chapter.sgml
 SRCS+= sound/chapter.sgml
 SRCS+= staff/chapter.sgml
 SRCS+= users/chapter.sgml
 SRCS+= x11/chapter.sgml
 SRCS+= ports/chapter.sgml
 
 # Entities
 SRCS+= authors.ent 
 SRCS+= chapters.ent 
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
+# Turn on all the chapters.
+CHAPTERS?= ${SRCS:M*chapter.sgml}
+
+JADEFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
+
 # XXX The Handbook build currently overflows some internal, hardcoded 
 # limits in pdftex.  Until we split the Handbook up, build the PDF 
 # version using ps2pdf instead of pdftex.
 
 book.tex-pdf:
 	touch book.tex-pdf
 
 book.pdf: book.ps
 	ps2pdf book.ps book.pdf
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index 1a34aa368c..fe13138ec6 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -1,136 +1,167 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.100 2001/06/08 02:56:35 dd Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.101 2001/06/21 03:38:14 chris Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 
 <!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
 %bookinfo;
 
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
 %freebsd;
 
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists;
 <!ENTITY % newsgroups SYSTEM "newsgroups.ent"> %newsgroups;
 <!ENTITY % not.published "INCLUDE">
 
 <!-- The currently released version of FreeBSD.  This value is used to
      create some links on web sites and such, so do NOT change it until
      it's really release time -->
 <!ENTITY rel.current CDATA "4.3">
+
+<!ENTITY % chap.introduction "IGNORE">
+<!ENTITY % chap.install "IGNORE">
+<!ENTITY % chap.basics "IGNORE">
+<!ENTITY % chap.ports "IGNORE">
+<!ENTITY % chap.boot "IGNORE">
+<!ENTITY % chap.users "IGNORE">
+<!ENTITY % chap.kernelconfig "IGNORE">
+<!ENTITY % chap.security "IGNORE">
+<!ENTITY % chap.printing "IGNORE">
+<!ENTITY % chap.disks "IGNORE">
+<!ENTITY % chap.backups "IGNORE">
+<!ENTITY % chap.x11 "IGNORE">
+<!ENTITY % chap.l10n "IGNORE">
+<!ENTITY % chap.sound "IGNORE">
+<!ENTITY % chap.serialcomms "IGNORE">
+<!ENTITY % chap.ppp-and-slip "IGNORE">
+<!ENTITY % chap.advanced-networking "IGNORE">
+<!ENTITY % chap.mail "IGNORE">
+<!ENTITY % chap.cutting-edge "IGNORE">
+<!ENTITY % chap.contrib "IGNORE">
+<!ENTITY % chap.policies "IGNORE">
+<!ENTITY % chap.kerneldebug "IGNORE">
+<!ENTITY % chap.linuxemu "IGNORE">
+<!ENTITY % chap.mirrors "IGNORE">
+<!ENTITY % chap.bibliography "IGNORE">
+<!ENTITY % chap.eresources "IGNORE">
+<!ENTITY % chap.staff "IGNORE">
+<!ENTITY % chap.pgpkeys "IGNORE">
+<!ENTITY % chap.hw "IGNORE">
+
 ]>
 
 <book>
   <bookinfo>
     <title>FreeBSD Handbook</title>
     
     <corpauthor>The FreeBSD Documentation Project</corpauthor>
     
     <pubdate>February 1999</pubdate>
     
     <copyright>
       <year>1995</year>
       <year>1996</year>
       <year>1997</year>
       <year>1998</year>
       <year>1999</year>
       <year>2000</year>
       <year>2001</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
     &bookinfo.legalnotice;
     
     <abstract>
       <para>Welcome to FreeBSD! This handbook covers the installation and day
 	to day use of <emphasis>FreeBSD Release &rel.current;</emphasis>.
 	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;.  The latest version of
 	this document is always available from the <ulink
 	  URL="http://www.FreeBSD.org/">FreeBSD World Wide Web server</ulink>.
 	It may also be downloaded in a variety of formats and compression
 	options from the <ulink 
           url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc">FreeBSD FTP 
           server</ulink> or one of the numerous <link
 	  linkend="mirrors-ftp">mirror sites</link>.  If you would prefer
 	  to have a hard copy of the handbook, you can purchase one at the
 	  <ulink
 	  url="http://www.freebsdmall.com/books/">FreeBSD Mall</ulink>.  You
 	  may also want to <ulink
 	  URL="http://www.FreeBSD.org/search.html">Search the
 	  Handbook</ulink>.</para>
     </abstract>
   </bookinfo>
   
   <part>
     <title>Getting Started</title>
     
-    &chap.introduction;
-    &chap.install;
-    &chap.basics;
-    &chap.ports;
+    <![ %chap.introduction;             [ &chap.introduction;         ]]>
+    <![ %chap.install;                  [ &chap.install;              ]]>
+    <![ %chap.basics;                   [ &chap.basics;               ]]>
+    <![ %chap.ports;                    [ &chap.ports;                ]]>
   </part>
   
   <part>
     <title>System Administration</title>
     
-    &chap.boot;
-    &chap.users;
-    &chap.kernelconfig;
-    &chap.security;
-    &chap.printing;
-    &chap.disks;
-    &chap.backups;
-    &chap.x11;
-    &chap.l10n;
-    &chap.sound;
+    <![ %chap.boot;                     [ &chap.boot;                 ]]>
+    <![ %chap.users;                    [ &chap.users;                ]]>
+    <![ %chap.kernelconfig;             [ &chap.kernelconfig;         ]]>
+    <![ %chap.security;                 [ &chap.security;             ]]>
+    <![ %chap.printing;                 [ &chap.printing;             ]]>
+    <![ %chap.disks;                    [ &chap.disks;                ]]>
+    <![ %chap.backups;                  [ &chap.backups;              ]]>
+    <![ %chap.x11;                      [ &chap.x11;                  ]]>
+    <![ %chap.l10n;                     [ &chap.l10n;                 ]]>
+    <![ %chap.sound;                    [ &chap.sound;                ]]>
   </part>
   
   <part>
     <title>Network Communications</title>
     
-    &chap.serialcomms;
-    &chap.ppp-and-slip;
-    &chap.advanced-networking;
-    &chap.mail;
+    <![ %chap.serialcomms;              [ &chap.serialcomms;          ]]>
+    <![ %chap.ppp-and-slip;             [ &chap.ppp-and-slip;         ]]>
+    <![ %chap.advanced-networking;      [ &chap.advanced-networking;  ]]>
+    <![ %chap.mail;                     [ &chap.mail;                 ]]>
   </part>
   
   <part>
     <title>Advanced topics</title>
     
-    &chap.cutting-edge;
-    &chap.contrib;
-    &chap.policies;
-    &chap.kerneldebug;
-    &chap.linuxemu;
+    <![ %chap.cutting-edge;             [ &chap.cutting-edge;         ]]>
+    <![ %chap.contrib;                  [ &chap.contrib;              ]]>
+    <![ %chap.policies;                 [ &chap.policies;             ]]>
+    <![ %chap.kerneldebug;              [ &chap.kerneldebug;          ]]>
+    <![ %chap.linuxemu;                 [ &chap.linuxemu;             ]]>
   </part>
   
   <part>
     <title>Appendices</title>
     
-    &chap.mirrors;
-    &chap.bibliography;
-    &chap.eresources;
-    &chap.staff;
-    &chap.pgpkeys;
-    &chap.hw;
+    <![ %chap.mirrors;                  [ &chap.mirrors;              ]]>
+    <![ %chap.bibliography;             [ &chap.bibliography;         ]]>
+    <![ %chap.eresources;               [ &chap.eresources;           ]]>
+    <![ %chap.staff;                    [ &chap.staff;                ]]>
+    <![ %chap.pgpkeys;                  [ &chap.pgpkeys;              ]]>
+    <![ %chap.hw;                       [ &chap.hw;                   ]]>
   </part>
 </book>
 
 <!-- 
      Local Variables:
      mode: sgml
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      End:
 -->