diff --git a/de_DE.ISO8859-1/books/handbook/book.sgml b/de_DE.ISO8859-1/books/handbook/book.sgml
index 8046148b22..2162e3a846 100644
--- a/de_DE.ISO8859-1/books/handbook/book.sgml
+++ b/de_DE.ISO8859-1/books/handbook/book.sgml
@@ -2,7 +2,7 @@
     The FreeBSD Documentation Project
     The FreeBSD German Documentation Project
 
-    $FreeBSD$
+    $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/book.sgml,v 1.11 2001/06/14 17:11:52 alex Exp $
     $FreeBSDde: de-docproj/books/handbook/book.sgml,v 1.7 2001/06/12 09:04:48 alex Exp $
     Original version: ?
 -->
@@ -19,7 +19,7 @@
 
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent">  %authors;
-<!ENTITY % mailing-lists SYSTEM "mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE"> %mailing-lists;
 <!ENTITY % newsgroups SYSTEM "newsgroups.ent"> %newsgroups;
 <!ENTITY % not.published "INCLUDE">
 
diff --git a/de_DE.ISO8859-1/share/sgml/catalog b/de_DE.ISO8859-1/share/sgml/catalog
index 5ebe8768fc..17caa7cb99 100644
--- a/de_DE.ISO8859-1/share/sgml/catalog
+++ b/de_DE.ISO8859-1/share/sgml/catalog
@@ -1,9 +1,11 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
   
-  -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+  -- $FreeBSD: doc/de_DE.ISO8859-1/share/sgml/catalog,v 1.1 2000/09/28 23:29:44 nbm Exp $
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE"
+	"mailing-lists.ent"
diff --git a/de_DE.ISO8859-1/books/handbook/mailing-lists.ent b/de_DE.ISO8859-1/share/sgml/mailing-lists.ent
similarity index 97%
rename from de_DE.ISO8859-1/books/handbook/mailing-lists.ent
rename to de_DE.ISO8859-1/share/sgml/mailing-lists.ent
index 6f62fb4418..58185f9821 100644
--- a/de_DE.ISO8859-1/books/handbook/mailing-lists.ent
+++ b/de_DE.ISO8859-1/share/sgml/mailing-lists.ent
@@ -1,7 +1,7 @@
 <!--
      Namen der FreeBSD Mailinglisten und verwandter Software
 
-     $FreeBSD: doc/de_DE.ISO_8859-1/books/handbook/mailing-lists.ent,v 1.1 2000/06/11 18:50:56 alex Exp $
+     $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/mailing-lists.ent,v 1.2 2000/06/13 09:48:26 alex Exp $
 -->
 
 <!ENTITY a.advocacy "FreeBSD Bef&uuml;rworter Mailingliste
diff --git a/en_US.ISO8859-1/books/arch-handbook/book.sgml b/en_US.ISO8859-1/books/arch-handbook/book.sgml
index 10879f994e..a9c8c3212b 100644
--- a/en_US.ISO8859-1/books/arch-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/book.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/developers-handbook/book.sgml,v 1.18 2001/05/14 01:36:20 murray Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/book.sgml,v 1.19 2001/05/14 02:52:41 murray Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -11,7 +11,7 @@
 %man;
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % authors SYSTEM "../handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists;
 ]>
 
 <book>
diff --git a/en_US.ISO8859-1/books/developers-handbook/book.sgml b/en_US.ISO8859-1/books/developers-handbook/book.sgml
index 10879f994e..a9c8c3212b 100644
--- a/en_US.ISO8859-1/books/developers-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/book.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/developers-handbook/book.sgml,v 1.18 2001/05/14 01:36:20 murray Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/book.sgml,v 1.19 2001/05/14 02:52:41 murray Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -11,7 +11,7 @@
 %man;
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % authors SYSTEM "../handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists;
 ]>
 
 <book>
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 60f5dff022..ef29097fe2 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -1,5 +1,5 @@
 # 
-# $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/Makefile,v 1.31 2001/02/28 22:50:05 nik Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.32 2001/05/14 03:07:50 murray Exp $
 #
 # Build the FreeBSD Handbook.
 #
@@ -54,7 +54,6 @@ SRCS+= ports/chapter.sgml
 # Entities
 SRCS+= authors.ent 
 SRCS+= chapters.ent 
-SRCS+= mailing-lists.ent
 
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.sgml
index 1d7516a311..1a34aa368c 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/book.sgml,v 1.99 2001/05/15 03:42:57 murray Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.100 2001/06/08 02:56:35 dd Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -17,7 +17,7 @@
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
-<!ENTITY % mailing-lists SYSTEM "mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists;
 <!ENTITY % newsgroups SYSTEM "newsgroups.ent"> %newsgroups;
 <!ENTITY % not.published "INCLUDE">
 
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index a3a570a4c7..7a6dce195a 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.149 2001/06/13 11:37:03 tom Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.150 2001/06/15 23:13:33 ache Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -12,7 +12,7 @@
 %bookinfo;
 
 <!ENTITY % authors SYSTEM "../handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../handbook/mailing-lists.ent">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
 %mailing-lists;
 
 ]>
diff --git a/en_US.ISO8859-1/share/sgml/catalog b/en_US.ISO8859-1/share/sgml/catalog
index 5ebe8768fc..f92e609315 100644
--- a/en_US.ISO8859-1/share/sgml/catalog
+++ b/en_US.ISO8859-1/share/sgml/catalog
@@ -1,9 +1,11 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
   
-  -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+  -- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/catalog,v 1.1 2000/09/28 23:29:45 nbm Exp $
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
+	"mailing-lists.ent"
diff --git a/en_US.ISO8859-1/books/handbook/mailing-lists.ent b/en_US.ISO8859-1/share/sgml/mailing-lists.ent
similarity index 97%
rename from en_US.ISO8859-1/books/handbook/mailing-lists.ent
rename to en_US.ISO8859-1/share/sgml/mailing-lists.ent
index 24b61d9225..97acf12bb2 100644
--- a/en_US.ISO8859-1/books/handbook/mailing-lists.ent
+++ b/en_US.ISO8859-1/share/sgml/mailing-lists.ent
@@ -1,7 +1,7 @@
 <!--
      Names of FreeBSD mailing lists and related software.
 
-     $FreeBSD: doc/en_US.ISO_8859-1/books/handbook/mailing-lists.ent,v 1.5 2000/04/17 17:28:47 phantom Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mailing-lists.ent,v 1.6 2000/12/05 21:39:14 jim Exp $
 -->
 
 <!ENTITY a.advocacy "FreeBSD advocacy mailing list
diff --git a/es_ES.ISO8859-1/books/handbook/Makefile b/es_ES.ISO8859-1/books/handbook/Makefile
index ba06443285..8fba3a95bc 100755
--- a/es_ES.ISO8859-1/books/handbook/Makefile
+++ b/es_ES.ISO8859-1/books/handbook/Makefile
@@ -1,5 +1,5 @@
 # 
-# $FreeBSD$
+# $FreeBSD: doc/es_ES.ISO8859-1/books/handbook/Makefile,v 1.2 2000/05/28 19:21:43 jesusr Exp $
 #
 # Build the FreeBSD Handbook.
 #
@@ -53,7 +53,6 @@ SRCS+= ports/chapter.sgml
 # Entities
 SRCS+= authors.ent 
 SRCS+= chapters.ent 
-SRCS+= mailing-lists.ent
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/es_ES.ISO8859-1/books/handbook/book.sgml b/es_ES.ISO8859-1/books/handbook/book.sgml
index 40744db275..a9f1dfff07 100755
--- a/es_ES.ISO8859-1/books/handbook/book.sgml
+++ b/es_ES.ISO8859-1/books/handbook/book.sgml
@@ -1,7 +1,7 @@
 <!--
       The FreeBSD Documentation Project
 
-      $FreeBSD: doc/es_ES.ISO_8859-1/books/handbook/book.sgml,v 1.1 2000/05/28 19:51:44 jesusr Exp $
+      $FreeBSD: doc/es_ES.ISO8859-1/books/handbook/book.sgml,v 1.2 2001/03/07 11:50:14 jesusr Exp $
 
 -->
 
@@ -15,7 +15,7 @@
 
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % authors  SYSTEM "authors.ent">  %authors; 
-<!ENTITY % mailing-lists SYSTEM "mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"> %mailing-lists;
 <!ENTITY % newsgroups SYSTEM "newsgroups.ent"> %newsgroups;
 <!ENTITY % not.published "INCLUDE">
 
diff --git a/es_ES.ISO8859-1/share/sgml/catalog b/es_ES.ISO8859-1/share/sgml/catalog
index 5ebe8768fc..a3628f677f 100644
--- a/es_ES.ISO8859-1/share/sgml/catalog
+++ b/es_ES.ISO8859-1/share/sgml/catalog
@@ -1,9 +1,11 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
   
-  -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+  -- $FreeBSD: doc/es_ES.ISO8859-1/share/sgml/catalog,v 1.1 2000/09/28 23:29:45 nbm Exp $
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
+	"mailing-lists.ent"
diff --git a/es_ES.ISO8859-1/books/handbook/mailing-lists.ent b/es_ES.ISO8859-1/share/sgml/mailing-lists.ent
similarity index 93%
rename from es_ES.ISO8859-1/books/handbook/mailing-lists.ent
rename to es_ES.ISO8859-1/share/sgml/mailing-lists.ent
index a3a3647a21..ecb720befb 100755
--- a/es_ES.ISO8859-1/books/handbook/mailing-lists.ent
+++ b/es_ES.ISO8859-1/share/sgml/mailing-lists.ent
@@ -1,7 +1,7 @@
 <!--
      Nombres de listas de distribucion de FreeBSD.
 
-     $FreeBSD$
+     $FreeBSD: doc/es_ES.ISO8859-1/books/handbook/mailing-lists.ent,v 1.1 2000/05/28 19:48:50 jesusr Exp $
 -->
 
 <!ENTITY a.announce "Lista de anuncios de FreeBSD
diff --git a/fr_FR.ISO8859-1/articles/committers-guide/article.sgml b/fr_FR.ISO8859-1/articles/committers-guide/article.sgml
index b8b412af50..1a48a114b2 100644
--- a/fr_FR.ISO8859-1/articles/committers-guide/article.sgml
+++ b/fr_FR.ISO8859-1/articles/committers-guide/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml,v 1.2 2000/06/01 19:02:49 gioria Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml,v 1.3 2001/06/11 01:18:48 ache Exp $
      Original revision: n.nn 
 -->   
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
@@ -13,7 +13,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
 <!ENTITY sgml.todo SYSTEM "../../books/handbook/todo.sgml">
 <!ENTITY sgml.in-progress SYSTEM "../../books/handbook/in-progress.sgml">
 <!ENTITY rel.current CDATA "3.2">
diff --git a/fr_FR.ISO8859-1/articles/ddwg/article.sgml b/fr_FR.ISO8859-1/articles/ddwg/article.sgml
index 2605a8f6a0..43c72d4217 100644
--- a/fr_FR.ISO8859-1/articles/ddwg/article.sgml
+++ b/fr_FR.ISO8859-1/articles/ddwg/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: article.sgml,v 1.2 2001-06-11 01:18:48 ache Exp $
+     $Id: article.sgml,v 1.3 2001-06-21 03:38:20 chris Exp $
      Original revision: n.nn
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 
diff --git a/fr_FR.ISO8859-1/articles/diskless-x/article.sgml b/fr_FR.ISO8859-1/articles/diskless-x/article.sgml
index 06e7730218..f347877d83 100644
--- a/fr_FR.ISO8859-1/articles/diskless-x/article.sgml
+++ b/fr_FR.ISO8859-1/articles/diskless-x/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml,v 1.1 1999/11/10 21:28:22 nik Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml,v 1.2 2001/06/11 01:18:49 ache Exp $
      Original revision: n.nn
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 
diff --git a/fr_FR.ISO8859-1/articles/fonts/article.sgml b/fr_FR.ISO8859-1/articles/fonts/article.sgml
index 9c25025ba2..d65c5193d2 100755
--- a/fr_FR.ISO8859-1/articles/fonts/article.sgml
+++ b/fr_FR.ISO8859-1/articles/fonts/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/fonts/article.sgml,v 1.2 2001/05/04 23:20:43 dd Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/fonts/article.sgml,v 1.3 2001/06/11 01:18:50 ache Exp $
      Original revision: n.nn
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 
diff --git a/fr_FR.ISO8859-1/articles/formatting-media/article.sgml b/fr_FR.ISO8859-1/articles/formatting-media/article.sgml
index b3da305a77..2db26ace34 100755
--- a/fr_FR.ISO8859-1/articles/formatting-media/article.sgml
+++ b/fr_FR.ISO8859-1/articles/formatting-media/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml,v 1.1 1999/11/10 21:28:24 nik Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml,v 1.2 2001/06/11 01:18:51 ache Exp $
      Original revision: n.nn
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 
diff --git a/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml b/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml
index 94dce240ff..7e8715c32b 100755
--- a/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml
+++ b/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml,v 1.1 1999/11/10 21:28:24 nik Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml,v 1.2 2001/06/11 01:18:52 ache Exp $
      Original revision: n.nn
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 
diff --git a/fr_FR.ISO8859-1/articles/make-world/article.sgml b/fr_FR.ISO8859-1/articles/make-world/article.sgml
index 137f17dfb3..249879a110 100755
--- a/fr_FR.ISO8859-1/articles/make-world/article.sgml
+++ b/fr_FR.ISO8859-1/articles/make-world/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/make-world/article.sgml,v 1.1 1999/11/10 21:28:24 nik Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/make-world/article.sgml,v 1.2 2001/06/11 01:18:53 ache Exp $
      Original revision: 1.39
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 
diff --git a/fr_FR.ISO8859-1/articles/mh/article.sgml b/fr_FR.ISO8859-1/articles/mh/article.sgml
index 8c5fe10010..92c765e257 100644
--- a/fr_FR.ISO8859-1/articles/mh/article.sgml
+++ b/fr_FR.ISO8859-1/articles/mh/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/mh/article.sgml,v 1.1 1999/11/10 21:28:25 nik Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/mh/article.sgml,v 1.2 2001/06/11 01:18:54 ache Exp $
      Original revision: 1.2
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 <article id="mh" LANG="fr">
diff --git a/fr_FR.ISO8859-1/articles/multi-os/article.sgml b/fr_FR.ISO8859-1/articles/multi-os/article.sgml
index 90b94c6de7..6b2a40dd47 100755
--- a/fr_FR.ISO8859-1/articles/multi-os/article.sgml
+++ b/fr_FR.ISO8859-1/articles/multi-os/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml,v 1.1 1999/11/10 21:28:25 nik Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml,v 1.2 2001/06/11 01:18:54 ache Exp $
      Original revision: n.nn
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 
diff --git a/fr_FR.ISO8859-1/articles/new-users/article.sgml b/fr_FR.ISO8859-1/articles/new-users/article.sgml
index 1f69bda228..3f9d12ab90 100755
--- a/fr_FR.ISO8859-1/articles/new-users/article.sgml
+++ b/fr_FR.ISO8859-1/articles/new-users/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/new-users/article.sgml,v 1.1 1999/11/10 21:28:26 nik Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/new-users/article.sgml,v 1.2 2001/06/11 01:18:55 ache Exp $
      Original revision: n.nn
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 
diff --git a/fr_FR.ISO8859-1/articles/ntfs/article.sgml b/fr_FR.ISO8859-1/articles/ntfs/article.sgml
index 0b3fd9f85c..1304ea67e3 100644
--- a/fr_FR.ISO8859-1/articles/ntfs/article.sgml
+++ b/fr_FR.ISO8859-1/articles/ntfs/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml,v 1.1 1999/11/10 21:28:26 nik Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml,v 1.2 2001/06/11 01:18:56 ache Exp $
      Original revision: n.nn
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 
diff --git a/fr_FR.ISO8859-1/articles/ppp/article.sgml b/fr_FR.ISO8859-1/articles/ppp/article.sgml
index 4c587ef4f4..a65d87a10c 100755
--- a/fr_FR.ISO8859-1/articles/ppp/article.sgml
+++ b/fr_FR.ISO8859-1/articles/ppp/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/ppp/article.sgml,v 1.1 1999/11/10 21:28:27 nik Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/ppp/article.sgml,v 1.2 2001/06/11 01:18:57 ache Exp $
      Original revision: n.nn
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 
diff --git a/fr_FR.ISO8859-1/articles/programming-tools/article.sgml b/fr_FR.ISO8859-1/articles/programming-tools/article.sgml
index 60b613df59..3cf63f5963 100755
--- a/fr_FR.ISO8859-1/articles/programming-tools/article.sgml
+++ b/fr_FR.ISO8859-1/articles/programming-tools/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml,v 1.1 1999/11/10 21:28:29 nik Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml,v 1.2 2001/06/11 01:18:58 ache Exp $
      Original revision: n.nn
 -->   
 
@@ -14,7 +14,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
  <!ENTITY rel.current CDATA "3.2">
 ]>
 
diff --git a/fr_FR.ISO8859-1/articles/zip-drive/article.sgml b/fr_FR.ISO8859-1/articles/zip-drive/article.sgml
index 2f5acbe491..088b052288 100644
--- a/fr_FR.ISO8859-1/articles/zip-drive/article.sgml
+++ b/fr_FR.ISO8859-1/articles/zip-drive/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml,v 1.1 2000/05/25 16:19:40 gioria Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml,v 1.2 2001/06/11 01:18:58 ache Exp $
      Version fran�aise : Michel Boucey
      Original revision: n.nn
 
@@ -17,7 +17,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
 <!ENTITY rel.current CDATA "3.2">
 
 
diff --git a/fr_FR.ISO8859-1/books/faq/book.sgml b/fr_FR.ISO8859-1/books/faq/book.sgml
index eecc13fafa..c82e4287f7 100644
--- a/fr_FR.ISO8859-1/books/faq/book.sgml
+++ b/fr_FR.ISO8859-1/books/faq/book.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/books/faq/book.sgml,v 1.3 2000/06/12 16:02:20 gioria Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/books/faq/book.sgml,v 1.4 2001/06/11 01:19:00 ache Exp $
      Original revision: n.nn
 -->
 
@@ -13,7 +13,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../../books/handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
 
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 <!ENTITY preface SYSTEM "preface.sgml">
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/Makefile b/fr_FR.ISO8859-1/books/fdp-primer/Makefile
index 0f8428ab7a..723d396da8 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/Makefile
+++ b/fr_FR.ISO8859-1/books/fdp-primer/Makefile
@@ -4,7 +4,7 @@
 #
 #    Compilation de l'Introduction au Projet de Documentation de FreeBSD
 #
-#    $FreeBSD: doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile,v 1.2 2000/11/10 12:30:58 kuriyama Exp $
+#    $FreeBSD: doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile,v 1.3 2001/06/11 01:19:01 ache Exp $
 #    Original revision: 1.6
 # 
 
@@ -39,7 +39,6 @@ SRCS+= writing-style/chapter.sgml
 
 # Entities
 SRCS+= chapters.ent 
-SRCS+= ../handbook/mailing-lists.ent
 SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent
 
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/book.sgml b/fr_FR.ISO8859-1/books/fdp-primer/book.sgml
index 8fa2d69f68..1492132b81 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/book.sgml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/book.sgml
@@ -30,7 +30,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $FreeBSD: doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml,v 1.2 2000/11/10 12:30:58 kuriyama Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml,v 1.3 2001/06/11 01:19:02 ache Exp $
      Original revision: 1.7
 -->
 
@@ -41,7 +41,7 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"> %translators;
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
 <!ENTITY rel.current CDATA "3.2">
 <!-- We need the followings until the translation is completed -->
 <!ENTITY sgml.in-progress SYSTEM "../handbook/in-progress.sgml">
@@ -67,9 +67,9 @@
       <holder role="mailto:nik@FreeBSD.ORG">Nik Clayton</holder>
     </copyright>
 
-    <pubdate role="rcs">$Date: 2001-06-11 01:19:02 $</pubdate>
+    <pubdate role="rcs">$Date: 2001-06-21 03:38:28 $</pubdate>
 
-    <releaseinfo>$Id: book.sgml,v 1.3 2001-06-11 01:19:02 ache Exp $</releaseinfo>
+    <releaseinfo>$Id: book.sgml,v 1.4 2001-06-21 03:38:28 chris Exp $</releaseinfo>
 
     <legalnotice>
       <para>La redistribution et l'utilisation du code source (SGML), et
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index 2637828c1f..3c451178f7 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -4,7 +4,7 @@
 #
 #    Compilation du Manuel de Reference de FreeBSD
 #
-#    $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/Makefile,v 1.1 1999/11/10 21:28:38 nik Exp $
+#    $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/Makefile,v 1.2 2001/06/11 01:19:05 ache Exp $
 #    Original revision: 1.25
 #
 
@@ -61,7 +61,6 @@ SRCS+= ports/chapter.sgml
 # Entities
 SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent 
 SRCS+= chapters.ent 
-SRCS+= mailing-lists.ent
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/fr_FR.ISO8859-1/books/handbook/book.sgml b/fr_FR.ISO8859-1/books/handbook/book.sgml
index 52369cbd0a..ed4a212270 100644
--- a/fr_FR.ISO8859-1/books/handbook/book.sgml
+++ b/fr_FR.ISO8859-1/books/handbook/book.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
          
-     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/book.sgml,v 1.1 1999/11/10 21:28:38 nik Exp $
+     $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/book.sgml,v 1.2 2001/06/11 01:19:05 ache Exp $
      Original revision: n.nn
 -->
 
@@ -21,7 +21,7 @@
 
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"> %mailing-lists;
 <!ENTITY rel.current CDATA "2.2.8">
 <!-- We need the followings until the translation is completed -->
 <!ENTITY sgml.in-progress SYSTEM "in-progress.sgml">
diff --git a/fr_FR.ISO8859-1/share/sgml/catalog b/fr_FR.ISO8859-1/share/sgml/catalog
index 5ebe8768fc..4ecaa76c57 100644
--- a/fr_FR.ISO8859-1/share/sgml/catalog
+++ b/fr_FR.ISO8859-1/share/sgml/catalog
@@ -1,9 +1,11 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
   
-  -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+  -- $FreeBSD: doc/fr_FR.ISO8859-1/share/sgml/catalog,v 1.1 2000/09/28 23:29:45 nbm Exp $
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
+	"mailing-lists.ent"
diff --git a/fr_FR.ISO8859-1/books/handbook/mailing-lists.ent b/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent
similarity index 98%
rename from fr_FR.ISO8859-1/books/handbook/mailing-lists.ent
rename to fr_FR.ISO8859-1/share/sgml/mailing-lists.ent
index 40523ef292..535889de0a 100644
--- a/fr_FR.ISO8859-1/books/handbook/mailing-lists.ent
+++ b/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent
@@ -2,7 +2,7 @@
 	The FreeBSD Documentation Project
 	The FreeBSD French Documentation Project
          
-        $Id: mailing-lists.ent,v 1.2 2000-05-26 05:47:48 gioria Exp $
+        $Id: mailing-lists.ent,v 1.1 2001-06-21 03:38:29 chris Exp $
         Original revision: n.nn
 --> 
 <!--
diff --git a/ja_JP.eucJP/books/faq/book.sgml b/ja_JP.eucJP/books/faq/book.sgml
index b59ad0dabc..37119eb7f8 100644
--- a/ja_JP.eucJP/books/faq/book.sgml
+++ b/ja_JP.eucJP/books/faq/book.sgml
@@ -4,7 +4,7 @@
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
 <!ENTITY % jauthors SYSTEM "../handbook/jauthors.ent"> %jauthors;
-<!ENTITY % mailing-lists SYSTEM "../handbook/mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JP"> %mailing-lists;
 <!ENTITY % newsgroups SYSTEM "../handbook/newsgroups.ent"> %newsgroups;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
@@ -16,7 +16,7 @@
 
     <corpauthor>FreeBSD �ɥ�����ơ������ץ���������</corpauthor>
 
-    <pubdate>$FreeBSD: doc/ja_JP.eucJP/books/faq/book.sgml,v 1.41 2001/03/08 22:18:23 hrs Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/ja_JP.eucJP/books/faq/book.sgml,v 1.42 2001/06/11 01:20:08 ache Exp $</pubdate>
 
     <abstract>
       <para>
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index a7ff0b08fe..af74d2053d 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -1,5 +1,5 @@
 # 
-# $FreeBSD: doc/ja_JP.eucJP/books/handbook/Makefile,v 1.46 2000/08/08 07:27:21 hanai Exp $
+# $FreeBSD: doc/ja_JP.eucJP/books/handbook/Makefile,v 1.47 2000/12/24 19:08:49 hrs Exp $
 #
 # Build the FreeBSD Handbook (Japanese).
 #
@@ -59,7 +59,6 @@ SRCS+= ports/chapter.sgml
 # Entities
 SRCS+= authors.ent 
 SRCS+= chapters.ent 
-SRCS+= mailing-lists.ent
 
 # Japanese only
 SRCS+=	jcontrib/chapter.sgml
diff --git a/ja_JP.eucJP/books/handbook/book.sgml b/ja_JP.eucJP/books/handbook/book.sgml
index 2b9ba51f23..08678661fa 100644
--- a/ja_JP.eucJP/books/handbook/book.sgml
+++ b/ja_JP.eucJP/books/handbook/book.sgml
@@ -3,7 +3,7 @@
      The FreeBSD Japanese Documentation Project
 
      Original revision: 1.97
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/book.sgml,v 1.65 2001/01/23 01:38:49 hrs Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/book.sgml,v 1.66 2001/04/29 17:51:25 hrs Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -18,7 +18,7 @@
 <!ENTITY % authors SYSTEM "authors.ent">
 %authors;
 <!ENTITY % jauthors SYSTEM "jauthors.ent"> %jauthors;
-<!ENTITY % mailing-lists SYSTEM "mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JP"> %mailing-lists;
 <!ENTITY % newsgroups SYSTEM "newsgroups.ent"> %newsgroups;
 <!ENTITY % not.published "INCLUDE">
 
diff --git a/ja_JP.eucJP/books/porters-handbook/book.sgml b/ja_JP.eucJP/books/porters-handbook/book.sgml
index 16f0a22e16..b5ea8ca452 100644
--- a/ja_JP.eucJP/books/porters-handbook/book.sgml
+++ b/ja_JP.eucJP/books/porters-handbook/book.sgml
@@ -3,7 +3,7 @@
      The FreeBSD Japanese Documentation Project
 
      Original revision: 1.120
-     $FreeBSD: doc/ja_JP.eucJP/books/porters-handbook/book.sgml,v 1.22 2000/08/28 21:13:00 hrs Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/porters-handbook/book.sgml,v 1.23 2000/09/15 07:41:37 hrs Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN" [
@@ -15,7 +15,7 @@
 
 <!ENTITY % authors SYSTEM "../handbook/authors.ent"> %authors;
 <!ENTITY % jauthors SYSTEM "../handbook/jauthors.ent"> %jauthors;
-<!ENTITY % mailing-lists SYSTEM "../handbook/mailing-lists.ent">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JP">
 %mailing-lists;
 ]>
 
diff --git a/ja_JP.eucJP/share/sgml/catalog b/ja_JP.eucJP/share/sgml/catalog
index 5ebe8768fc..2635dac5fe 100644
--- a/ja_JP.eucJP/share/sgml/catalog
+++ b/ja_JP.eucJP/share/sgml/catalog
@@ -1,9 +1,11 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
   
-  -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+  -- $FreeBSD: doc/ja_JP.eucJP/share/sgml/catalog,v 1.1 2000/09/28 23:29:46 nbm Exp $
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JP"
+	"mailing-lists.ent"
diff --git a/ja_JP.eucJP/books/handbook/mailing-lists.ent b/ja_JP.eucJP/share/sgml/mailing-lists.ent
similarity index 99%
rename from ja_JP.eucJP/books/handbook/mailing-lists.ent
rename to ja_JP.eucJP/share/sgml/mailing-lists.ent
index 52e5cb1c7e..4191ed3ca3 100644
--- a/ja_JP.eucJP/books/handbook/mailing-lists.ent
+++ b/ja_JP.eucJP/share/sgml/mailing-lists.ent
@@ -3,7 +3,7 @@
      The FreeBSD Japanese Documentation Project
 
      Original revision: 1.6
-     $FreeBSD: doc/ja_JP.eucJP/books/handbook/mailing-lists.ent,v 1.6 2000/07/16 17:52:10 hrs Exp $
+     $FreeBSD: doc/ja_JP.eucJP/books/handbook/mailing-lists.ent,v 1.7 2000/12/24 19:08:49 hrs Exp $
 
      Names of FreeBSD mailing lists and related software.
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index 04fdd4416f..776aa8e0d8 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -2,7 +2,7 @@
 # Build the FreeBSD Handbook.
 #
 # The FreeBSD Russian Documentation Project
-# $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/Makefile,v 1.4 2001/03/11 16:44:41 phantom Exp $
+# $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/Makefile,v 1.5 2001/06/11 01:20:25 ache Exp $
 # $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/Makefile,v 1.18 2001/03/11 12:04:50 phantom Exp $
 # Original version: 1.28
 #
@@ -57,7 +57,6 @@ SRCS+= x11/chapter.sgml
 # Entities
 SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent 
 SRCS+= chapters.ent 
-SRCS+= mailing-lists.ent
 SRCS+= newsgroups.ent
 SRCS+= ruauthors.ent
 
diff --git a/ru_RU.KOI8-R/books/handbook/book.sgml b/ru_RU.KOI8-R/books/handbook/book.sgml
index 400b0a7ca5..8976440434 100644
--- a/ru_RU.KOI8-R/books/handbook/book.sgml
+++ b/ru_RU.KOI8-R/books/handbook/book.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/book.sgml,v 1.4 2001/03/11 16:44:41 phantom Exp $
+     $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/book.sgml,v 1.5 2001/06/11 01:20:25 ache Exp $
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/book.sgml,v 1.22 2001/03/11 12:04:50 phantom Exp $
      Original revision: 1.89
 -->
@@ -16,7 +16,7 @@
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent">  %authors;
 <!ENTITY % ruauthors SYSTEM "ruauthors.ent">  %ruauthors;
-<!ENTITY % mailing-lists SYSTEM "mailing-lists.ent"> %mailing-lists;
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU"> %mailing-lists;
 <!ENTITY % newsgroups SYSTEM "newsgroups.ent"> %newsgroups;
 <!ENTITY % not.published "INCLUDE">
 
diff --git a/ru_RU.KOI8-R/books/porters-handbook/book.sgml b/ru_RU.KOI8-R/books/porters-handbook/book.sgml
index 43b6e47cbc..4e7107186a 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/book.sgml
+++ b/ru_RU.KOI8-R/books/porters-handbook/book.sgml
@@ -5,14 +5,14 @@
 <!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//RU">
 %bookinfo;
 <!ENTITY % authors SYSTEM "../../../en_US.ISO8859-1/books/handbook/authors.ent"> %authors;
-<!ENTITY % mailing-lists SYSTEM "../handbook/mailing-lists.ent">
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU">
 %mailing-lists;
 ]>
 
 <!--
     The FreeBSD Russian Documentation Project
 
-    $FreeBSD: doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml,v 1.3 2001/03/11 16:30:55 phantom Exp $
+    $FreeBSD: doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml,v 1.4 2001/06/11 01:20:27 ache Exp $
     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml,v 1.44 2001/03/11 11:06:30 phantom Exp $
 
     Original revision: 1.140
diff --git a/ru_RU.KOI8-R/share/sgml/catalog b/ru_RU.KOI8-R/share/sgml/catalog
index 5ebe8768fc..ca31937605 100644
--- a/ru_RU.KOI8-R/share/sgml/catalog
+++ b/ru_RU.KOI8-R/share/sgml/catalog
@@ -1,9 +1,11 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
   
-  -- $FreeBSD: doc/share/sgml/catalog,v 1.9 2000/07/08 16:31:28 phantom Exp $
+  -- $FreeBSD: doc/ru_RU.KOI8-R/share/sgml/catalog,v 1.1 2000/09/28 23:29:47 nbm Exp $
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU"
+	"mailing-lists.ent"
diff --git a/ru_RU.KOI8-R/books/handbook/mailing-lists.ent b/ru_RU.KOI8-R/share/sgml/mailing-lists.ent
similarity index 97%
rename from ru_RU.KOI8-R/books/handbook/mailing-lists.ent
rename to ru_RU.KOI8-R/share/sgml/mailing-lists.ent
index 4ea644a172..7d9c6be3ee 100644
--- a/ru_RU.KOI8-R/books/handbook/mailing-lists.ent
+++ b/ru_RU.KOI8-R/share/sgml/mailing-lists.ent
@@ -2,7 +2,7 @@
      �������� ������� �������� FreeBSD
 
      The FreeBSD Russian Documentation Project
-     $FreeBSD$
+     $FreeBSD: doc/ru_RU.KOI8-R/books/handbook/mailing-lists.ent,v 1.2 2000/10/17 17:32:07 phantom Exp $
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/mailing-lists.ent,v 1.4 2000/09/01 11:15:34 phantom Exp $
      Original revision: 1.5
 -->