diff --git a/de_DE.ISO8859-1/books/handbook/book.sgml b/de_DE.ISO8859-1/books/handbook/book.sgml
index de4e904e7a..3d9b8cf96b 100644
--- a/de_DE.ISO8859-1/books/handbook/book.sgml
+++ b/de_DE.ISO8859-1/books/handbook/book.sgml
@@ -1,222 +1,222 @@
 <!--
     The FreeBSD Documentation Project
     The FreeBSD German Documentation Project
 
     $FreeBSD$
     $FreeBSDde: de-docproj/books/handbook/book.sgml,v 1.45 2003/04/09 23:24:27 mheinen Exp $
     basiert auf: 1.131
 -->
 
 <!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 % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE">
 %translators;
 
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"> %authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DE">
 %teams;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE"> %mailing-lists;
 <!ENTITY % newsgroups SYSTEM "newsgroups.ent"> %newsgroups;
 <!ENTITY % txtfiles SYSTEM "../../../en_US.ISO8859-1/books/handbook/txtfiles.ent"> %txtfiles;
 <!ENTITY % not.published "INCLUDE">
 
 <!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.vinum "IGNORE">
 <!ENTITY % chap.x11 "IGNORE">
 <!ENTITY % chap.l10n "IGNORE">
 <!ENTITY % chap.sound "IGNORE">
 <!ENTITY % chap.desktop "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.linuxemu "IGNORE">
 <!ENTITY % chap.mirrors "IGNORE">
 <!ENTITY % chap.bibliography "IGNORE">
 <!ENTITY % chap.eresources "IGNORE">
 <!ENTITY % chap.pgpkeys "IGNORE">
 <!ENTITY % chap.index "IGNORE">
 
-<!ENTITY % pgpkeys SYSTEM "../../../en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent"> %pgpkeys;
+<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 ]>
 
 <book lang="de">
   <bookinfo>
     <title>FreeBSD Handbuch</title>
 
     <authorgroup>
       <author>
 	<surname>The FreeBSD German Documentation Project</surname>
         <affiliation>
           <address>
             <email>de-bsd-translators@de.FreeBSD.org</email>
           </address>
         </affiliation>
       </author>
     </authorgroup>
 
     <pubdate>Februar 1999</pubdate>
 
     <copyright>
       <year>1995</year>
       <year>1996</year>
       <year>1997</year>
       <year>1998</year>
       <year>1999</year>
       <year>2000</year>
       <year>2001</year>
       <year>2002</year>
       <year>2003</year>
       <holder>The FreeBSD German Documentation Project</holder>
     </copyright>
 
     &bookinfo.legalnotice;
 
     <abstract>
       <para>Willkommen bei FreeBSD!  Dieses Handbuch beschreibt die
         Installation und den t&auml;glichen Umgang mit
 	<emphasis>FreeBSD &rel2.current;-RELEASE</emphasis> und
 	<emphasis>FreeBSD &rel.current;-RELEASE</emphasis>.
         Das Handbuch ist <emphasis>jederzeit unter Bearbeitung</emphasis>
         und die Arbeit vieler Einzelpersonen.  Manche Kapitel existieren noch
         nicht und andere Kapitel m&uuml;ssen auf den neusten Stand
         gebracht werden.
 	Wenn Sie an diesem Projekt mithelfen m&ouml;chten, senden Sie bitte
         eine E-Mail an die Mailingliste &a.de.translators;.  Die letzte
 	Version des Handbuchs ist immer auf dem
         <ulink URL="http://www.de.FreeBSD.ORG/doc/de_DE.ISO8859-1/books/handbook/">FreeBSD Web
         Server</ulink> verf&uuml;gbar.
         Es kann au&szlig;erdem in verschiedenen Formaten und in komprimierter
         Form vom <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc">FreeBSD
         FTP Server</ulink> oder einer der vielen
         <link linkend="mirrors-ftp">Spiegel</link>
 	herunter geladen werden.
         Vielleicht m&ouml;chten Sie das Handbuch auch
 	<ulink URL="http://www.FreeBSD.org/search.html">durchsuchen</ulink>.</para>
     </abstract>
   </bookinfo>
 
   &chap.preface;
 
   <part id="getting-started">
     <title>Erste Schritte</title>
 
     <partintro>
       <para>Dieser Teil des FreeBSD Handbuchs richtet sich an Benutzer
         und Administratoren f&uuml;r die FreeBSD neu ist.  Diese
 	Kapitel</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>geben Ihnen eine Einf&uuml;hrung in FreeBSD,</para>
 	</listitem>
 
 	<listitem>
 	  <para>geleiten Sie durch den Installationsprozess,</para>
 	</listitem>
 
 	<listitem>
 	  <para>erkl&auml;ren Ihnen einige Grundlagen von &unix; Systemen,</para>
 	</listitem>
 
 	<listitem>
 	  <para>zeigen Ihnen, wie Sie die F&uuml;lle der erh&auml;ltlichen
 	    Anwendungen Dritter installieren und</para>
 	</listitem>
 
 	<listitem>
 	  <para>f&uuml;hren Sie in X, der Benutzeroberfl&auml;che von &unix; Systemen
 	    ein.  Es wird gezeigt, wie Sie den Desktop konfigurieren, um
 	    effektiver arbeiten zu k&ouml;nnen.</para>
 	</listitem>
       </itemizedlist>
 
       <para>Wir haben uns bem&uuml;ht, Referenzen auf weiter vorne liegende
         Textteile auf ein Minimum zu beschr&auml;nken, so dass Sie
 	diesen Teil des Handbuchs ohne viel Bl&auml;ttern durcharbeiten
 	k&ouml;nnen.</para>
     </partintro>
 
     <![ %chap.introduction;		[ &chap.introduction;		]]>
     <![ %chap.install;			[ &chap.install;		]]>
     <![ %chap.basics;			[ &chap.basics;			]]>
     <![ %chap.ports;			[ &chap.ports;			]]>
     <![ %chap.x11;			[ &chap.x11;			]]>
   </part>
 
   <part id="system-administration">
     <title>System Administration</title>
 
     <partintro>
       <para>Die restlichen Kapitel behandeln alle Aspekte der FreeBSD
         Systemadministration.  Am Anfang jedes Kapitels finden Sie eine
 	Zusammenfassung, die beschreibt, was Sie nach dem Durcharbeiten des
 	Kapitels gelernt haben.  Weiterhin werden die Voraussetzungen
 	beschrieben, die f&uuml;r das Durcharbeiten des Kapitels
 	erforderlich sind.</para>
 
       <para>Diese Kapitel sollten Sie lesen, wenn Sie die Informationen
         darin ben&ouml;tigen.  Sie brauchen Sie nicht in einer bestimmten
 	Reihenfolge zu lesen, noch m&uuml;ssen Sie die Kapitel lesen, bevor Sie
 	anfangen, FreeBSD zu benutzen.</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.vinum;			[ &chap.vinum;			]]>
     <![ %chap.l10n;			[ &chap.l10n;			]]>
     <![ %chap.desktop;			[ &chap.desktop;		]]>
     <![ %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.linuxemu;			[ &chap.linuxemu;		]]>
   </part>
 
   <part id="appendicies">
     <title>Anhang</title>
 
     <![ %chap.mirrors;			[ &chap.mirrors;		]]>
     <![ %chap.bibliography;		[ &chap.bibliography;		]]>
     <![ %chap.eresources;		[ &chap.eresources;		]]>
     <![ %chap.pgpkeys;			[ &chap.pgpkeys;		]]>
     <![ %chap.index;			[ &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/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index 1326216ab2..57b87282b6 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -1,211 +1,211 @@
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 
 <!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 % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
 %teams;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists;
 <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"> %newsgroups;
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent"> %txtfiles;
 
 <!ENTITY % not.published "INCLUDE">
 
 <!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.vinum "IGNORE">
 <!ENTITY % chap.x11 "IGNORE">
 <!ENTITY % chap.l10n "IGNORE">
 <!ENTITY % chap.multimedia "IGNORE">
 <!ENTITY % chap.desktop "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">
 <!ENTITY % chap.index "IGNORE">
 
-<!ENTITY % pgpkeys SYSTEM "pgpkeys/pgpkeys.ent"> %pgpkeys;
+<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 ]>
 
 <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>
       <year>2002</year>
       <year>2003</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 &rel2.current;-RELEASE</emphasis>
 	and <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="../../../../index.html">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="../../../../search/index.html">search the
 	  handbook</ulink>.</para>
     </abstract>
   </bookinfo>
 
   &chap.preface;
 
   <part id="getting-started">
     <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 id="system-administration">
     <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.vinum;                    [ &chap.vinum;                ]]>
     <![ %chap.l10n;                     [ &chap.l10n;                 ]]>
     <![ %chap.desktop;                  [ &chap.desktop;              ]]>
     <![ %chap.multimedia;               [ &chap.multimedia;           ]]>
     <![ %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 id="appendicies">
     <title>Appendices</title>
     
     <![ %chap.mirrors;                  [ &chap.mirrors;              ]]>
     <![ %chap.bibliography;             [ &chap.bibliography;         ]]>
     <![ %chap.eresources;               [ &chap.eresources;           ]]>
     <![ %chap.pgpkeys;                  [ &chap.pgpkeys;              ]]>
     <![ %chap.index;                    [ &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/pgpkeys/Makefile b/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile
index 5623e601fd..7c61203aff 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile
@@ -1,19 +1,19 @@
 #
 # Build the Handbook with just the content from this chapter.
 #
 # $FreeBSD$
 #
 
 CHAPTERS= 	pgpkeys/chapter.sgml
 
 PGPKEYS!=	perl -ne 'm/\"([\w-]+.key)\"/ && print "$$1\n"' \
-		    ${.CURDIR}/pgpkeys.ent
+		    ${DOC_PREFIX}/share/pgpkeys/pgpkeys.ent
 SRCS+=		${PGPKEYS}
 
 VPATH=		..
 
 MASTERDOC=	${.CURDIR}/../${DOC}.${DOCBOOKSUFFIX}
 
 DOC_PREFIX?= 	${.CURDIR}/../../../..
 
 .include "../Makefile"
diff --git a/fr_FR.ISO8859-1/books/handbook/book.sgml b/fr_FR.ISO8859-1/books/handbook/book.sgml
index e3ab2878ad..197a905b23 100644
--- a/fr_FR.ISO8859-1/books/handbook/book.sgml
+++ b/fr_FR.ISO8859-1/books/handbook/book.sgml
@@ -1,235 +1,235 @@
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
      $FreeBSD$
-     $Id: book.sgml,v 1.12 2003-01-01 19:37:24 blackend Exp $
+     $Id: book.sgml,v 1.13 2003-05-08 10:07:51 blackend Exp $
      Original revision: 1.127
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES Common Document URL Entities//FR">
 %urls;
 <!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//FR">
 %bookinfo;
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR">
 %translators;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
 %mailing-lists;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR">
 %teams;
 <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR">
 %newsgroups;
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
 <!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 % txtfiles SYSTEM "../../../en_US.ISO8859-1/books/handbook/txtfiles.ent"> %txtfiles;
 <!ENTITY % not.published "INCLUDE">
 
 <!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.vinum "IGNORE">
 <!ENTITY % chap.x11 "IGNORE">
 <!ENTITY % chap.l10n "IGNORE">
 <!ENTITY % chap.multimedia "IGNORE">
 <!ENTITY % chap.desktop "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">
 <!ENTITY % chap.index "IGNORE">
 
-<!ENTITY % pgpkeys SYSTEM "../../../en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent"> %pgpkeys;
+<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 ]>
 
 <book lang="fr">
   <bookinfo>
     <title>Manuel FreeBSD</title>
 
     <corpauthor>Groupe de Documentation FreeBSD</corpauthor>
 
     <pubdate>F&eacute;vrier 1999</pubdate>
 
     <copyright>
       <year>1995</year>
       <year>1996</year>
       <year>1997</year>
       <year>1998</year>
       <year>1999</year>
       <year>2000</year>
       <year>2001</year>
       <year>2002</year>
       <year>2003</year>
       <holder>Groupe de Documentation FreeBSD</holder>
     </copyright>
 
     &bookinfo.legalnotice;
 
     <abstract>
       <para>Bienvenue &agrave; FreeBSD!  Ce manuel d&eacute;crit l'installation
 	et l'utilisation quotidienne de la <emphasis>Version
 	&rel.current;-RELEASE de FreeBSD</emphasis>.  Ce manuel est en
         <emphasis>constante &eacute;volution</emphasis>.  Il est le
 	r&eacute;sultat du travail de
         nombreuses personnes.  Certaines sections ne sont pas encore
         r&eacute;dig&eacute;es et celles qui le sont ont besoin d'&ecirc;tre
         mises &agrave; jour.  Si vous voulez participer &agrave; ce projet,
         envoyez un courrier &eacute;lectronique &agrave; la &a.doc;.  La
         derni&egrave;re version anglaise de ce document est disponible sur le
         <ulink url="http://www.FreeBSD.ORG/">serveur World Wide Web
         FreeBSD</ulink>.  Il peut &ecirc;tre aussi
 	t&eacute;l&eacute;charg&eacute; dans divers
 	formats et options de compression depuis le
         <ulink url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/doc">serveur FTP
         FreeBSD</ulink> ou l'un des nombreux <link linkend="mirrors-ftp">sites
         miroirs</link>.  Si vous pr&eacute;f&eacute;rez avoir une version
 	imprim&eacute;e du manuel, vous pouvez en acqu&eacute;rir une
 	aupr&egrave;s
 	de <ulink url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.
 	Vous pouvez aussi
         <ulink url="http://www.freeBSD.ORG/search/search.html">faire des
         recherches dans le Manuel</ulink>.</para>
 
       <para>N.d.T.: La version fran&ccedil;aise est publi&eacute;e sur le
         <ulink url="&url.base;">serveur World Wide Web du groupe de
         traduction en langue fran&ccedil;aise de la documentation de
         FreeBSD</ulink>.</para>
 
       <para>N.d.T.: Contactez la &a.fr-doc; si vous voulez collaborer &agrave;
         la traduction.</para>
 	&trans.a.fonvieille;
 	<para><emphasis>Première version de &a.fr.haby;</emphasis>
     </abstract>
   </bookinfo>
 
   &chap.preface;
 
   <part>
     <title>Pour commencer</title>
 
     <partintro>
       <para>Cette partie du Manuel FreeBSD est destin&eacute;e aux nouveaux
 	venus &agrave; FreeBSD, utilisateurs et administrateurs.  Ces
 	chapitres:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>Vous pr&eacute;senteront FreeBSD.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Vous guideront &agrave; travers le processus
 	    d'installation.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Vous apprendront quelques bases d'Unix.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Vous montreront comment installer la profusion d'applications 
 	    tiers disponibles pour FreeBSD.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Vous pr&eacute;senteront X, le syst&egrave;me de
 	    fren&ecirc;trage d'Unix, et d&eacute;tailleront comment configurer
 	    un environnement de travail qui vous rendra plus productif.</para>
 	</listitem>
       </itemizedlist>
 
       <para>Nous avons essay&eacute; de limiter le nombre de
         r&eacute;f&eacute;rences dans le
         texte &agrave; un minimun afin que vous puissiez lire cette section du
 	Manuel du d&eacute;but jusqu'&agrave; la fin avec le moins de mouvement
 	de page possible.</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>Administration Syst&egrave;me</title>
 
     <partintro>
       <para>Les chapitres restant du Manuel FreeBSD couvrent tous les
         aspects de l'administration syst&egrave;me de FreeBSD.  Chaque chapitre
 	d&eacute;bute en d&eacute;crivant ce que vous apprendrez &agrave; la
 	lecture du chapitre, et d&eacute;taille &eacute;galement ce que vous
 	&ecirc;tes sens&eacute;s conna&icirc;tre avant de l'aborder.</para>
 
       <para>Ces chapitres sont con&ccedil;us pour &ecirc;tre consult&eacute;s
         quand vous avez besoin d'une information.  Vous ne devez pas les lire
 	suivant un ordre particulier, ni tous les lire avant de pouvoir
 	utiliser 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.vinum;                    [ &chap.vinum;                ]]>
     <![ %chap.l10n;                     [ &chap.l10n;                 ]]>
     <![ %chap.desktop;                  [ &chap.desktop;              ]]>
     <![ %chap.multimedia;               [ &chap.multimedia;           ]]>
     <![ %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>Annexes</title>
 
     <![ %chap.mirrors;                  [ &chap.mirrors;              ]]>
     <![ %chap.bibliography;             [ &chap.bibliography;         ]]>
     <![ %chap.eresources;               [ &chap.eresources;           ]]>
     <![ %chap.pgpkeys;                  [ &chap.pgpkeys;              ]]>
     <![ %chap.index;                    [ &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/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile b/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile
index 6b20b9d3d2..07f0e1858c 100644
--- a/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile
@@ -1,21 +1,21 @@
 #
 # Build the Handbook with just the content from this chapter.
 #
 # $FreeBSD$
-# $Id: Makefile,v 1.1 2002-08-30 17:52:00 blackend Exp $
+# $Id: Makefile,v 1.2 2003-05-08 10:07:51 blackend Exp $
 # Original revision: 1.2
 #
 
 CHAPTERS= 	pgpkeys/chapter.sgml
 
 PGPKEYS!=	perl -ne 'm/\"([\w-]+.key)\"/ && print "$$1\n"' \
-		${DOC_PREFIX}/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
+		${DOC_PREFIX}/share/pgpkeys/pgpkeys.ent
 SRCS+=		${PGPKEYS}
 
 VPATH=		..
 
 MASTERDOC=	${.CURDIR}/../${DOC}.${DOCBOOKSUFFIX}
 
 DOC_PREFIX?= 	${.CURDIR}/../../../..
 
 .include "../Makefile"
diff --git a/it_IT.ISO8859-15/books/handbook/book.sgml b/it_IT.ISO8859-15/books/handbook/book.sgml
index 98f1553613..2491bef93a 100644
--- a/it_IT.ISO8859-15/books/handbook/book.sgml
+++ b/it_IT.ISO8859-15/books/handbook/book.sgml
@@ -1,227 +1,227 @@
 <!--
      The FreeBSD Italian Documentation Project
 
      $FreeBSD$
      Original revision: 1.131
 -->
 
 <!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//IT">
 %bookinfo;
 
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
 %freebsd;
 
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
 
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
 %teams;
 
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT">
 %mailing-lists;
 
 <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
 %newsgroups;
 
 <!ENTITY % txtfiles SYSTEM "txtfiles.ent">
 %txtfiles;
 
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT">
 %translators;
 
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % not.published "INCLUDE">
 
 <!ENTITY % chap.introduction "IGNORE">
 <!ENTITY % chap.install "IGNORE">
 <!ENTITY % chap.basics "IGNORE">
 <!ENTITY % chap.ports "IGNORE">
 <!ENTITY % chap.x11 "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.vinum "IGNORE">
 <!ENTITY % chap.l10n "IGNORE">
 <!ENTITY % chap.desktop "IGNORE">
 <!ENTITY % chap.multimedia "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.linuxemu "IGNORE">
 <!ENTITY % chap.mirrors "IGNORE">
 <!ENTITY % chap.bibliography "IGNORE">
 <!ENTITY % chap.eresources "IGNORE">
 <!ENTITY % chap.pgpkeys "IGNORE">
 <!ENTITY % chap.index "IGNORE">
 <!ENTITY % chap.colophon "IGNORE">
 
-<!ENTITY % pgpkeys SYSTEM "../../../en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent">
+<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent">
 %pgpkeys;
 ]>
 
 <book lang="it">
   <bookinfo>
     <title>Manuale di FreeBSD</title>
 
     <corpauthor>The FreeBSD Italian Documentation Project</corpauthor>
 
     <pubdate>Febbraio 1999</pubdate>
 
     <copyright>
       <year>1995</year>
 
       <year>1996</year>
 
       <year>1997</year>
 
       <year>1998</year>
 
       <year>1999</year>
 
       <year>2000</year>
 
       <year>2001</year>
 
       <year>2002</year>
 
       <year>2003</year>
 
       <holder>The FreeBSD Italian Documentation Project</holder>
     </copyright>
 
     &bookinfo.legalnotice;
 
     <abstract>
       <para>Benvenuto in FreeBSD! Questo manuale copre l'installazione e l'uso
         giorno per giorno di <emphasis>FreeBSD
           &rel2.current;-RELEASE</emphasis> e <emphasis>FreeBSD
           &rel.current;-RELEASE</emphasis>.
         Questo manuale &egrave; un <emphasis>progetto in evoluzione</emphasis>
         ed &egrave; il frutto del lavoro di molti singoli.  Molte sezioni non
         esistono ancora e alcune di quelle che esistono devono essere
         aggiornate.  Se sei interessato ad aiutare questo progetto, invia
         un'email alla &a.doc;.  L'ultima versione di questo documento &egrave;
         sempre disponibile sul <ulink url="../../../../index.html">sito web di
         FreeBSD</ulink>.  Inoltre pu&ograve; essere scaricata in una
         variet&agrave; di formati e tipi di compressione dal <ulink
         url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">server FTP di
         FreeBSD</ulink> o da uno dei numerosi <link linkend="mirrors-ftp">siti
         mirror</link>.  Se preferisci avere una copia rilegata del manuale,
         puoi comprarne una su <ulink url="http://www.freebsdmall.com/">FreeBSD
         Mall</ulink>.  Puoi anche voler <ulink
         url="../../../../search/index.html">cercare nel manuale</ulink>.</para>
     </abstract>
   </bookinfo>
 
   &chap.preface;
 
   <part id="getting-started">
     <title>Per Cominciare</title>
 
     <partintro>
       <para>Questa parte del Manuale di FreeBSD &egrave; per gli utenti e gli
         amministratori che si affacciano a FreeBSD.  Questi capitoli:</para>
 
       <itemizedlist>
         <listitem>
           <para>Ti introdurranno a FreeBSD.</para>
         </listitem>
 
         <listitem>
           <para>Ti guideranno attraverso il processo di installazione.</para>
         </listitem>
 
         <listitem>
           <para>Ti insegneranno qualche base di Unix.</para>
         </listitem>
 
         <listitem>
           <para>Ti mostreranno come installare la variet&agrave; delle
             applicazioni di terze parti disponibili per FreeBSD.</para>
         </listitem>
 
         <listitem>
           <para>Ti introdurranno a X, il sistema a finestre di Unix, e ti
             spiegheranno come configurare un ambiente desktop che ti renda
             pi&ugrave; produttivo.</para>
         </listitem>
       </itemizedlist>
 
       <para>Abbiamo cercato di mantenere il numero di riferimenti in avanti nel
         testo al minimo cos&igrave; che tu possa leggere questa sezione del
         Manuale dall'inizio alla fine con il minimo scorrimento di pagine
         possibile.</para>
     </partintro>
 
     <![ %chap.introduction;             [ &chap.introduction;         ]]>
     <![ %chap.install;                  [ &chap.install;              ]]>
     <![ %chap.basics;                   [ &chap.basics;               ]]>
     <![ %chap.ports;                    [ &chap.ports;                ]]>
     <![ %chap.x11;                      [ &chap.x11;                  ]]>
   </part>
 
   <part id="system-administration">
     <title>Amministrazione del Sistema</title>
 
     <partintro>
       <para>I rimanenti capitoli del Manuale di FreeBSD coprono tutti gli
         aspetti dell'amministrazione di un sistema FreeBSD.  Ogni capitolo
         inizia descrivendo quello che imparerai dopo aver letto il capitolo, e
         specifica anche quello che dovresti sapere prima di affrontare il
         materiale.</para>
 
       <para>Questi capitoli sono studiati per essere letti quando si ha
         bisogno di un'informazione.  Non devi leggerli in un ordine
         particolare, n&eacute; devi leggerli tutti prima di poter usare
         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.vinum;                    [ &chap.vinum;                ]]>
     <![ %chap.l10n;                     [ &chap.l10n;                 ]]>
     <![ %chap.desktop                   [ &chap.desktop;              ]]>
     <![ %chap.multimedia                [ &chap.multimedia;           ]]>
     <![ %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.linuxemu;                 [ &chap.linuxemu;             ]]>
   </part>
 
   <part id="appendicies">
     <title>Appendici</title>
 
     <![ %chap.mirrors;                  [ &chap.mirrors;              ]]>
     <![ %chap.bibliography;             [ &chap.bibliography;         ]]>
     <![ %chap.eresources;               [ &chap.eresources;           ]]>
     <![ %chap.pgpkeys;                  [ &chap.pgpkeys;              ]]>
     <![ %chap.index;                    [ &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/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile b/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile
index 0e7ebb48f8..dec9fbe096 100644
--- a/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile
@@ -1,19 +1,19 @@
 #
 # Crea il Manuale con il contenuto di solo questo capitolo.
 #
 # $FreeBSD$
 #
 
 CHAPTERS= 	pgpkeys/chapter.sgml
 
 PGPKEYS!=	perl -ne 'm/\"([\w-]+.key)\"/ && print "$$1\n"' \
-		    ${.CURDIR}/../../../../en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
+		    ${DOC_PREFIX}/share/pgpkeys/pgpkeys.ent
 SRCS+=		${PGPKEYS}
 
 VPATH=		..
 
 MASTERDOC=	${.CURDIR}/../${DOC}.${DOCBOOKSUFFIX}
 
 DOC_PREFIX?= 	${.CURDIR}/../../../..
 
 .include "../Makefile"
diff --git a/ja_JP.eucJP/books/handbook/book.sgml b/ja_JP.eucJP/books/handbook/book.sgml
index 97532fde19..aa3014bf86 100644
--- a/ja_JP.eucJP/books/handbook/book.sgml
+++ b/ja_JP.eucJP/books/handbook/book.sgml
@@ -1,214 +1,214 @@
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
      Original revision: 1.118
      $FreeBSD$
 -->
 
 <!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 % ja-authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
 %ja-authors;
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
 %teams;
 <!ENTITY % ja-mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
 %ja-mailing-lists;
 <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"> %newsgroups;
 <!ENTITY % not.published "INCLUDE">
 
 <!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">
 <!ENTITY % chap.index "IGNORE">
 
-<!ENTITY % pgpkeys SYSTEM "../../../en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent"> %pgpkeys;
+<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 ]>
 
 <book>
   <bookinfo>
     <title>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯</title>
 
     <corpauthor>FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</corpauthor>
 
     <pubdate>1999 ǯ 2 ·î</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>FreeBSD ¤Ø¤è¤¦¤³¤½!
         ¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ï <emphasis>FreeBSD &rel.current;-RELEASE</emphasis>
 	¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ª¤è¤Ó¡¢Æü¾ï¤Ç¤Î»È¤¤Êý¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤¿¤â¤Î¤Ç¤¹¡£
 	Ëܥϥó¥É¥Ö¥Ã¥¯¤Ï<emphasis>²þÊÔºî¶ÈÃæ</emphasis>¤Ç¤¢¤ê¡¢
         ¤µ¤Þ¤¶¤Þ¤Ê¿Í¡¹¤¬ÊÔ½¸¤Ë·È¤ï¤Ã¤Æ¤¤¤Þ¤¹¡£
 	¿¤¯¤Î¥»¥¯¥·¥ç¥ó¤Ï¤Þ¤À¸ºß¤·¤Þ¤»¤ó¤·¡¢
         ¤¤¤Þ¸ºß¤¹¤ë¥»¥¯¥·¥ç¥ó¤Ë¤â¹¹¿·ºî¶È¤ÎɬÍפ¬¤¢¤ë¤â¤Î¤â´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
         ¤â¤·¡¢¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤òÊÔ½¸¤¹¤ë¥×¥í¥¸¥§¥¯¥È¤Ë¶¨ÎϤ·¤¿¤¤¤È¤ª¹Í¤¨¤Ê¤é¡¢
 	&a.doc; ¤Þ¤ÇÅŻҥ᡼¥ë¤ò(±Ñ¸ì¤Ç)Á÷¤Ã¤Æ¤¯¤À¤µ¤¤¡£
 	¤³¤Îʸ½ñ¤ÎºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢¤¤¤Ä¤Ç¤â
 	<ulink URL="http://www.jp.FreeBSD.org/">ÆüËܹñÆâÈǤÎ
         FreeBSD ¥¦¥§¥Ö¥µ¥¤¥È</ulink> ¤ª¤è¤Ó
         <ulink url="../../../../index.html">FreeBSD ¥¦¥§¥Ö¥µ¥¤¥È</ulink>
         ¤ÇÆþ¼ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
         ¤Þ¤¿¡¢Â¾¤Î¤µ¤Þ¤¶¤Þ¤Êʸ½ñ·Á¼°¡¢°µ½Ì·Á¼°¤Î¤â¤Î¤¬
 	<ulink URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc">FreeBSD FTP 
 	  ¥µ¡¼¥Ð</ulink>¤ä¿ô¿¤¯¤Î<link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link>¤«¤é¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È
 	¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î½ñÀÒÈÇ (±Ñ¸ìÈÇ) ¤Ï¡¢
 	<ulink url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>
         ¤«¤é¹ØÆþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢
 	<ulink url="../../../../search/index.html">¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î¸¡º÷</ulink>¤ò¹Ô¤Ê¤¦¤³¤È¤â²Äǽ¤Ç¤¹¡£</para>
         
       <para>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯ÆüËܸìÈǤκîÀ®¤Ï FreeBSD
         ÆüËܸì¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È (FreeBSD doc-jp) ¤¬¤ª¤³¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
         ¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎÆüËܸìÌõ¤Ë´Ø¤¹¤ë¤³¤È¤Ï FreeBSD &a.jp.doc-jp;
 	¤Ë¤ª¤¤¤ÆÆüËܸì¤ÇµÄÏÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para>ʸ½ñ¤ÎÆüËܸìÌõ¤Ë´Ø¤¹¤ë¤ªÌ䤤¹ç¤ï¤»¤ä¡¢
         ʸ½ñ¤Î¸¶Ê¸¤Ë´Ø¤¹¤ëÌ䤤¹ç¤ï¤»¤ò¤·¤¿¤¤¤¬±Ñ¸ì¤¬ÆÀ°Õ¤Ç¤Ê¤¤¤È¤¤¤¦Êý¤Ï
         FreeBSD &a.jp.doc-jp; ¤Þ¤Ç¡¢ÆüËܸì¤Ç¥³¥á¥ó¥È¤ò¤ª´ó¤»¤¯¤À¤µ¤¤¡£</para>
     </abstract>
   </bookinfo>
 
   <part>
     <title>ƳÆþ</title>
 
     <partintro>
       <para>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎÂè 1 Éô¤Ï¥æ¡¼¥¶¤È
         FreeBSD ¤¬½é¤á¤Æ¤Î´ÉÍý¼Ô¸þ¤±¤Ç¤¹¡£³Æ¾Ï¤ÎÆâÍƤϰʲ¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
 
       <itemizedlist>
         <listitem>
           <para>FreeBSD ¤Î¾Ò²ð</para>
         </listitem>
 
         <listitem>
           <para>¥¤¥ó¥¹¥È¡¼¥ë¤Î¼ê½ç¤Î²òÀâ</para>
         </listitem>
         
         <listitem>
           <para>Unix ¤Î´ðÁÃ</para>
         </listitem>
         
         <listitem>
           <para>FreeBSD ¤ÇÍøÍѤǤ­¤ëË­É٤ʥµ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î
             ¥¤¥ó¥¹¥È¡¼¥ëÊýË¡</para>
         </listitem>
         
         <listitem>
           <para>Unix ¤Ë¤ª¤±¤ë¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à X¡¢
             ¤ª¤è¤Ó¥¯¥ê¥¨¥¤¥Æ¥£¥Ö¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤ÎÀßÄê¤Î¾ÜºÙ¤Î¾Ò²ð</para>
         </listitem>
       </itemizedlist>
 
       <para>¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ç¤ÏÉÑÈˤ˥ڡ¼¥¸¤òÈô¤¹¤³¤È¤Ê¤¯Á°¤«¤é¸å¤Ø¤È
         ¥¹¥à¡¼¥º¤ËÆɤ߿ʤá¤ë¤è¤¦¤Ë¡¢
         ¸åÊý¤Ø¤Î»²¾È¤ò¶ËÎÏÍÞ¤¨¤ë¤è¤¦¤Ë¤·¤Æ¤¤¤Þ¤¹¡£</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>¥·¥¹¥Æ¥à´ÉÍý</title>
 
     <partintro>
       <para>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î°Ê²¼¤Î¾Ï¤Ï¡¢
         FreeBSD ¤Î¥·¥¹¥Æ¥à´ÉÍý¤ÎÌ̤ˤĤ¤¤Æ½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
         ³Æ¾Ï¤Î¤Ï¤¸¤á¤Ç¤Ï¡¢¤½¤Î¾Ï¤Ç³Ø¤ÖÆâÍƤä
         ¼ÂºÝ¤Ë¼è¤êÁȤàÁ°¤ËÃΤäƤª¤¯¤Ù¤­¤³¤È¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
       <para>³Æ¾Ï¤Ï¡¢É¬Íפˤʤä¿»þ¤Ë¸ÄÊ̤˻²¾È¤Ç¤­¤ë¤è¤¦¤Ë¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
         ¤É¤Î½çÈÖ¤ÇÆɤó¤Ç¤â¹½¤¤¤Þ¤»¤ó¤·¡¢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>ÉÕÏ¿</title>
 
     <![ %chap.mirrors;                  [ &chap.mirrors;              ]]>
     <![ %chap.bibliography;             [ &chap.bibliography;         ]]>
     <![ %chap.eresources;               [ &chap.eresources;           ]]>
     <![ %chap.pgpkeys;                  [ &chap.pgpkeys;              ]]>
     <![ %chap.index;                    [ &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/ja_JP.eucJP/books/handbook/pgpkeys/Makefile b/ja_JP.eucJP/books/handbook/pgpkeys/Makefile
index 9c0c31d6fd..b69886a3ff 100644
--- a/ja_JP.eucJP/books/handbook/pgpkeys/Makefile
+++ b/ja_JP.eucJP/books/handbook/pgpkeys/Makefile
@@ -1,20 +1,20 @@
 #
 # Build the Handbook with just the content from this chapter.
 #
 # $FreeBSD$
 #
 # Original revision: 1.2
 
 CHAPTERS= 	pgpkeys/chapter.sgml
 
 PGPKEYS!=	perl -ne 'm/\"([\w-]+.key)\"/ && print "$$1\n"' \
-		    ${DOC_PREFIX}/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent
+		    ${DOC_PREFIX}/share/pgpkeys/pgpkeys.ent
 SRCS+=		${PGPKEYS}
 
 VPATH=		..
 
 MASTERDOC=	${.CURDIR}/../${DOC}.${DOCBOOKSUFFIX}
 
 DOC_PREFIX?= 	${.CURDIR}/../../../..
 
 .include "../Makefile"