diff --git a/en/handbook/chapters.ent b/en/handbook/chapters.ent
index f8699f1081..c302e4c975 100644
--- a/en/handbook/chapters.ent
+++ b/en/handbook/chapters.ent
@@ -1,47 +1,47 @@
 <!-- 
      Creates entities for each chapter in the FreeBSD Handbook. Each entity
      is named chap.foo, where foo is the value of the id attribute on that
      chapter, and corresponds to the name of the directory in which that
      chapter's .sgml file is stored.
    
      Chapters should be listed in the order in which they are referenced.
  
-     $Id: chapters.ent,v 1.1 1998-11-03 23:16:38 nik Exp $
+     $Id: chapters.ent,v 1.2 1998-11-04 22:38:06 nik Exp $
 -->
 
 <!-- Part one -->
 <!ENTITY chap.introduction		SYSTEM "introduction/chapter.sgml">
 <!ENTITY chap.install			SYSTEM "install/chapter.sgml">
 <!ENTITY chap.basics			SYSTEM "basics/chapter.sgml">
 <!ENTITY chap.ports			SYSTEM "ports/chapter.sgml">
 
 <!-- Part two -->
 <!ENTITY chap.kernelconfig		SYSTEM "kernelconfig/chapter.sgml">
 <!ENTITY chap.security			SYSTEM "security/chapter.sgml">
 <!ENTITY chap.printing			SYSTEM "printing/chapter.sgml">
 <!ENTITY chap.quotas			SYSTEM "quotas/chapter.sgml">
 <!ENTITY chap.x11			SYSTEM "x11/chapter.sgml">
 <!ENTITY chap.hw			SYSTEM "hw/chapter.sgml">
 <!ENTITY chap.l10n			SYSTEM "l10n/chapter.sgml">
 
 <!-- Part three -->
 <!ENTITY chap.serialcomms		SYSTEM "serialcomms/chapter.sgml">
 <!ENTITY chap.ppp-and-slip		SYSTEM "ppp-and-slip/chapter.sgml">
-<!ENTITY chap.advanced-networking	SYSTEM "advanced-networking.sgml">
+<!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.sgml">
 <!ENTITY chap.mail			SYSTEM "mail/chapter.sgml">
 
 <!-- Part four -->
 <!ENTITY chap.cutting-edge		SYSTEM "cutting-edge/chapter.sgml">
 <!ENTITY chap.contrib			SYSTEM "contrib/chapter.sgml">
 <!ENTITY chap.policies			SYSTEM "policies/chapter.sgml">
 <!ENTITY chap.kernelopts		SYSTEM "kernelopts/chapter.sgml">
 <!ENTITY chap.kerneldebug		SYSTEM "kerneldebug/chapter.sgml">
 <!ENTITY chap.linuxemu			SYSTEM "linuxemu/chapter.sgml">
 <!ENTITY chap.internals			SYSTEM "internals/chapter.sgml">
 
 <!-- Part five (appendices) -->
 <!ENTITY chap.mirrors			SYSTEM "mirrors/chapter.sgml">
 <!ENTITY chap.bibliography		SYSTEM "bibliography/chapter.sgml">
 <!ENTITY chap.eresources		SYSTEM "eresources/chapter.sgml">
 <!ENTITY chap.staff			SYSTEM "staff/chapter.sgml">
 <!ENTITY chap.pgpkeys			SYSTEM "pgpkeys/chapter.sgml">
diff --git a/en_US.ISO8859-1/books/handbook/chapters.ent b/en_US.ISO8859-1/books/handbook/chapters.ent
index f8699f1081..c302e4c975 100644
--- a/en_US.ISO8859-1/books/handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/handbook/chapters.ent
@@ -1,47 +1,47 @@
 <!-- 
      Creates entities for each chapter in the FreeBSD Handbook. Each entity
      is named chap.foo, where foo is the value of the id attribute on that
      chapter, and corresponds to the name of the directory in which that
      chapter's .sgml file is stored.
    
      Chapters should be listed in the order in which they are referenced.
  
-     $Id: chapters.ent,v 1.1 1998-11-03 23:16:38 nik Exp $
+     $Id: chapters.ent,v 1.2 1998-11-04 22:38:06 nik Exp $
 -->
 
 <!-- Part one -->
 <!ENTITY chap.introduction		SYSTEM "introduction/chapter.sgml">
 <!ENTITY chap.install			SYSTEM "install/chapter.sgml">
 <!ENTITY chap.basics			SYSTEM "basics/chapter.sgml">
 <!ENTITY chap.ports			SYSTEM "ports/chapter.sgml">
 
 <!-- Part two -->
 <!ENTITY chap.kernelconfig		SYSTEM "kernelconfig/chapter.sgml">
 <!ENTITY chap.security			SYSTEM "security/chapter.sgml">
 <!ENTITY chap.printing			SYSTEM "printing/chapter.sgml">
 <!ENTITY chap.quotas			SYSTEM "quotas/chapter.sgml">
 <!ENTITY chap.x11			SYSTEM "x11/chapter.sgml">
 <!ENTITY chap.hw			SYSTEM "hw/chapter.sgml">
 <!ENTITY chap.l10n			SYSTEM "l10n/chapter.sgml">
 
 <!-- Part three -->
 <!ENTITY chap.serialcomms		SYSTEM "serialcomms/chapter.sgml">
 <!ENTITY chap.ppp-and-slip		SYSTEM "ppp-and-slip/chapter.sgml">
-<!ENTITY chap.advanced-networking	SYSTEM "advanced-networking.sgml">
+<!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.sgml">
 <!ENTITY chap.mail			SYSTEM "mail/chapter.sgml">
 
 <!-- Part four -->
 <!ENTITY chap.cutting-edge		SYSTEM "cutting-edge/chapter.sgml">
 <!ENTITY chap.contrib			SYSTEM "contrib/chapter.sgml">
 <!ENTITY chap.policies			SYSTEM "policies/chapter.sgml">
 <!ENTITY chap.kernelopts		SYSTEM "kernelopts/chapter.sgml">
 <!ENTITY chap.kerneldebug		SYSTEM "kerneldebug/chapter.sgml">
 <!ENTITY chap.linuxemu			SYSTEM "linuxemu/chapter.sgml">
 <!ENTITY chap.internals			SYSTEM "internals/chapter.sgml">
 
 <!-- Part five (appendices) -->
 <!ENTITY chap.mirrors			SYSTEM "mirrors/chapter.sgml">
 <!ENTITY chap.bibliography		SYSTEM "bibliography/chapter.sgml">
 <!ENTITY chap.eresources		SYSTEM "eresources/chapter.sgml">
 <!ENTITY chap.staff			SYSTEM "staff/chapter.sgml">
 <!ENTITY chap.pgpkeys			SYSTEM "pgpkeys/chapter.sgml">
diff --git a/en_US.ISO_8859-1/books/handbook/chapters.ent b/en_US.ISO_8859-1/books/handbook/chapters.ent
index f8699f1081..c302e4c975 100644
--- a/en_US.ISO_8859-1/books/handbook/chapters.ent
+++ b/en_US.ISO_8859-1/books/handbook/chapters.ent
@@ -1,47 +1,47 @@
 <!-- 
      Creates entities for each chapter in the FreeBSD Handbook. Each entity
      is named chap.foo, where foo is the value of the id attribute on that
      chapter, and corresponds to the name of the directory in which that
      chapter's .sgml file is stored.
    
      Chapters should be listed in the order in which they are referenced.
  
-     $Id: chapters.ent,v 1.1 1998-11-03 23:16:38 nik Exp $
+     $Id: chapters.ent,v 1.2 1998-11-04 22:38:06 nik Exp $
 -->
 
 <!-- Part one -->
 <!ENTITY chap.introduction		SYSTEM "introduction/chapter.sgml">
 <!ENTITY chap.install			SYSTEM "install/chapter.sgml">
 <!ENTITY chap.basics			SYSTEM "basics/chapter.sgml">
 <!ENTITY chap.ports			SYSTEM "ports/chapter.sgml">
 
 <!-- Part two -->
 <!ENTITY chap.kernelconfig		SYSTEM "kernelconfig/chapter.sgml">
 <!ENTITY chap.security			SYSTEM "security/chapter.sgml">
 <!ENTITY chap.printing			SYSTEM "printing/chapter.sgml">
 <!ENTITY chap.quotas			SYSTEM "quotas/chapter.sgml">
 <!ENTITY chap.x11			SYSTEM "x11/chapter.sgml">
 <!ENTITY chap.hw			SYSTEM "hw/chapter.sgml">
 <!ENTITY chap.l10n			SYSTEM "l10n/chapter.sgml">
 
 <!-- Part three -->
 <!ENTITY chap.serialcomms		SYSTEM "serialcomms/chapter.sgml">
 <!ENTITY chap.ppp-and-slip		SYSTEM "ppp-and-slip/chapter.sgml">
-<!ENTITY chap.advanced-networking	SYSTEM "advanced-networking.sgml">
+<!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.sgml">
 <!ENTITY chap.mail			SYSTEM "mail/chapter.sgml">
 
 <!-- Part four -->
 <!ENTITY chap.cutting-edge		SYSTEM "cutting-edge/chapter.sgml">
 <!ENTITY chap.contrib			SYSTEM "contrib/chapter.sgml">
 <!ENTITY chap.policies			SYSTEM "policies/chapter.sgml">
 <!ENTITY chap.kernelopts		SYSTEM "kernelopts/chapter.sgml">
 <!ENTITY chap.kerneldebug		SYSTEM "kerneldebug/chapter.sgml">
 <!ENTITY chap.linuxemu			SYSTEM "linuxemu/chapter.sgml">
 <!ENTITY chap.internals			SYSTEM "internals/chapter.sgml">
 
 <!-- Part five (appendices) -->
 <!ENTITY chap.mirrors			SYSTEM "mirrors/chapter.sgml">
 <!ENTITY chap.bibliography		SYSTEM "bibliography/chapter.sgml">
 <!ENTITY chap.eresources		SYSTEM "eresources/chapter.sgml">
 <!ENTITY chap.staff			SYSTEM "staff/chapter.sgml">
 <!ENTITY chap.pgpkeys			SYSTEM "pgpkeys/chapter.sgml">