diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index f96d6ca97b..3656579c57 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -1,202 +1,202 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.112 2001/09/12 23:52:15 chern Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.113 2001/09/18 03:59:36 murray 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 % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"> %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.config "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.policies "IGNORE">
 <!ENTITY % chap.kerneldebug "IGNORE">
 <!ENTITY % chap.linuxemu "IGNORE">
 <!ENTITY % chap.mirrors "IGNORE">
 <!ENTITY % chap.bibliography "IGNORE">
 <!ENTITY % chap.eresources "IGNORE">
 <!ENTITY % chap.pgpkeys "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 &rel.current;-RELEASE</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 web site</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/">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>
     
     <partintro>
       <para>This part of the FreeBSD Handbook is for users and
 	administrators who are new to FreeBSD.  These chapters:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>Introduce you to FreeBSD.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Guide you through the installation process.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Teach you some Unix basics.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Show you how to install the wealth of third party
 	    applications available for FreeBSD.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Introduce you to X, the Unix windowing system, and
 	    detail how to configure a desktop environment that makes you
 	    more productive.</para>
 	</listitem>
       </itemizedlist>
 
       <para>We have tried to keep the number of forward references in
 	the text to a minimum so that you can read this section of the
 	Handbook from front to back with the minimum of page flipping
 	required.</para>
     </partintro>
 
     <![ %chap.introduction;             [ &chap.introduction;         ]]>
     <![ %chap.install;                  [ &chap.install;              ]]>
     <![ %chap.basics;                   [ &chap.basics;               ]]>
     <![ %chap.ports;                    [ &chap.ports;                ]]>
     <![ %chap.x11;                      [ &chap.x11;                  ]]>
   </part>
   
   <part>
     <title>System Administration</title>
 
     <partintro>
       <para>The remaining chapters of the FreeBSD Handbook cover all
 	aspects of FreeBSD system administration.  Each chapter
 	starts by describing what you will learn as a result of reading
 	the chapter, and also details what you are expected to know
 	before tackling the material.</para>
 
       <para>These chapters are designed to be read when
 	you need the information.  You do not have to read them in any
 	particular order, nor do you need to read all of them before you
 	can begin using FreeBSD.</para>
     </partintro>
 
     <![ %chap.config;                   [ &chap.config;               ]]>
     <![ %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.l10n;                     [ &chap.l10n;                 ]]>
     <![ %chap.sound;                    [ &chap.sound;                ]]>
     <![ %chap.serialcomms;              [ &chap.serialcomms;          ]]>
     <![ %chap.ppp-and-slip;             [ &chap.ppp-and-slip;         ]]>
     <![ %chap.advanced-networking;      [ &chap.advanced-networking;  ]]>
     <![ %chap.mail;                     [ &chap.mail;                 ]]>
     <![ %chap.cutting-edge;             [ &chap.cutting-edge;         ]]>
     <![ %chap.policies;                 [ &chap.policies;             ]]>
     <![ %chap.kerneldebug;              [ &chap.kerneldebug;          ]]>
     <![ %chap.linuxemu;                 [ &chap.linuxemu;             ]]>
   </part>
   
   <part>
     <title>Appendices</title>
     
     <![ %chap.mirrors;                  [ &chap.mirrors;              ]]>
     <![ %chap.bibliography;             [ &chap.bibliography;         ]]>
     <![ %chap.eresources;               [ &chap.eresources;           ]]>
     <![ %chap.pgpkeys;                  [ &chap.pgpkeys;              ]]>
     &chap.index;
   </part>
   &chap.colophon;
 </book>
 
 <!-- 
      Local Variables:
      mode: sgml
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      End:
 -->
diff --git a/en_US.ISO8859-1/books/handbook/newsgroups.ent b/en_US.ISO8859-1/share/sgml/newsgroups.ent
similarity index 60%
rename from en_US.ISO8859-1/books/handbook/newsgroups.ent
rename to en_US.ISO8859-1/share/sgml/newsgroups.ent
index db6585344a..04f5cc7c7b 100644
--- a/en_US.ISO8859-1/books/handbook/newsgroups.ent
+++ b/en_US.ISO8859-1/share/sgml/newsgroups.ent
@@ -1,10 +1,10 @@
 <!--
      Names of FreeBSD newsgroups
 
-     $FreeBSD$
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/newsgroups.ent,v 1.2 1999/09/06 06:52:47 peter Exp $
 -->
 
 <!ENTITY ng.misc "the
  <ulink url='news:comp.unix.bsd.freebsd.misc'>comp.unix.bsd.freebsd.misc</ulink>
  newsgroup">
 
diff --git a/share/sgml/catalog b/share/sgml/catalog
index 888831394e..f060f3b90d 100644
--- a/share/sgml/catalog
+++ b/share/sgml/catalog
@@ -1,95 +1,98 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
   
-  -- $FreeBSD: doc/share/sgml/catalog,v 1.18 2001/08/05 19:40:38 jesusr Exp $
+  -- $FreeBSD: doc/share/sgml/catalog,v 1.19 2001/08/25 22:02:08 dd Exp $
   --
 
   -- ...................................................................... --
   -- Language neutral ..................................................... --
  
   -- These identifiers are shared across all translations of the FreeBSD
      documentation, even though the listed language is "EN"
   --
 
 PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" 
        "freebsd.dtd"
 
 PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN"
 	"freebsd41.dtd"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN" 
        "man-refs.ent"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN"
 	"freebsd.dsl"
 
 PUBLIC	"-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"freebsd.ent"
 
   -- ...................................................................... --
   -- English specific ..................................................... --
 
   -- These identifiers should only be used by English language versions of 
      the FreeBSD Documentation.
 
      All other translations should base their FPIs on these, but change the
      final parameter in the FPI to represent the target language, as 
      appropriate.  Do not change the rest of the FPI
   --
 
 PUBLIC 	"-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN" 
 	"../../en_US.ISO8859-1/share/sgml/bookinfo.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
         "../../en_US.ISO8859-1/share/sgml/authors.ent"
 
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
+        "../../en_US.ISO8859-1/share/sgml/newsgroups.ent"
+
   -- ...................................................................... --
   -- French specific ...................................................... --
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//FR"
         "../../fr_FR.ISO8859-1/share/sgml/bookinfo.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES Common Document URL Entities//FR"
         "../../fr_FR.ISO8859-1/share/sgml/urls.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
         "../../fr_FR.ISO8859-1/share/sgml/translators.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Abstract Entities//FR"
         "../../fr_FR.ISO8859-1/share/sgml/abstract.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook ArtHeader Entities//FR"
         "../../fr_FR.ISO8859-1/share/sgml/artheader.ent"
 
   -- ...................................................................... --
   -- Russian specific ...................................................... --
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//RU"
         "../../ru_RU.KOI8-R/share/sgml/bookinfo.ent"
 
   -- ...................................................................... --
   -- German specific ...................................................... --
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//DE"
         "../../de_DE.ISO8859-1/share/sgml/bookinfo.ent"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//DE"
 	"../../de_DE.ISO8859-1/share/sgml/freebsd.dsl"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//DE"
 	"../../de_DE.ISO8859-1/share/sgml/freebsd.dsl"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
         "../../de_DE.ISO8859-1/share/sgml/translators.ent"
 
   -- ...................................................................... --
   -- Spanish specific ..................................................... --
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//ES"
         "../../es_ES.ISO8859-1/share/sgml/bookinfo.ent"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//ES"
         "../../es_ES.ISO8859-1/share/sgml/freebsd.dsl"