From owner-freebsd-doc@FreeBSD.ORG  Sat Aug  7 10:45:54 2004
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: freebsd-doc@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C922C16A4CE
	for <doc@FreeBSD.org>; Sat,  7 Aug 2004 10:45:54 +0000 (GMT)
Received: from smtp.eos.ocn.ne.jp (eos.ocn.ne.jp [222.146.51.150])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1783743D45
	for <doc@FreeBSD.org>; Sat,  7 Aug 2004 10:45:54 +0000 (GMT)
	(envelope-from hrs@FreeBSD.org)
Received: from delta.allbsd.org (p27072-adsao12honb4-acca.tokyo.ocn.ne.jp
	[219.161.180.72])
	by smtp.eos.ocn.ne.jp (Postfix) with ESMTP id 7CD881A77
	for <doc@FreeBSD.org>; Sat,  7 Aug 2004 19:45:51 +0900 (JST)
Received: from localhost (alph.allbsd.org [192.168.0.10])
	by delta.allbsd.org (8.12.9p2/8.12.9) with ESMTP id i77AjcA2058488
	for <doc@freebsd.org>; Sat, 7 Aug 2004 19:45:38 +0900 (JST)
	(envelope-from hrs@FreeBSD.org)
Date: Sat, 07 Aug 2004 19:45:25 +0900 (JST)
Message-Id: <20040807.194525.15584783.hrs@eos.ocn.ne.jp>
To: doc@FreeBSD.org
From: Hiroki Sato <hrs@FreeBSD.org>
X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530  FFD7 4F2C D3D8 2793 CF2D
X-Mailer: Mew version 4.0.65 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Multipart/Signed; protocol="application/pgp-signature";
 micalg=pgp-sha1;
 boundary="--Security_Multipart0(Sat_Aug__7_19_45_25_2004_328)--"
Content-Transfer-Encoding: 7bit
Subject: simplify entity declaration in books and articles
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Aug 2004 10:45:54 -0000

----Security_Multipart0(Sat_Aug__7_19_45_25_2004_328)--
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Sat_Aug__7_19_45_25_2004_634)--"
Content-Transfer-Encoding: 7bit

----Next_Part(Sat_Aug__7_19_45_25_2004_634)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi,

 I made patches to simplify entity declarations in DOCTYPE of
 the books and the articles.  We have a lot of entities,
 so adding them properly becomes more and more difficult now.
 For example, after applying these patches, we only need to
 add the following entry in a FreeBSD article:

 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
 %articles.ent;

 and this pulls all of the necessary entities.

 Of course, the translation teams can customize these entities
 by refining the articles.ent file in <langcode>/share/sgml.
 The patches include an example for ja_JP.eucJP.

 Comments?

-- 
| Hiroki SATO

----Next_Part(Sat_Aug__7_19_45_25_2004_634)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="doc-entset-share.diff"

Index: share/sgml/articles.ent
===================================================================
RCS file: share/sgml/articles.ent
diff -N share/sgml/articles.ent
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ share/sgml/articles.ent	6 Aug 2004 20:27:01 -0000
@@ -0,0 +1,22 @@
+<!-- $FreeBSD$ -->
+
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!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//EN">
+%mailing-lists;
+<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
+%newsgroups;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+%l10n;
+<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
+%l10n-common;
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+%urls;
Index: share/sgml/books.ent
===================================================================
RCS file: share/sgml/books.ent
diff -N share/sgml/books.ent
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ share/sgml/books.ent	6 Aug 2004 20:26:44 -0000
@@ -0,0 +1,24 @@
+<!-- $FreeBSD$ -->
+
+<!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 % 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 % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
+%l10n;
+<!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
+%l10n-common;
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+%urls;
Index: share/sgml/catalog
===================================================================
RCS file: /home/ncvs/doc/share/sgml/catalog,v
retrieving revision 1.30
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.30 catalog
--- share/sgml/catalog	5 May 2004 12:52:48 -0000	1.30
+++ share/sgml/catalog	6 Aug 2004 20:23:27 -0000
@@ -17,14 +17,20 @@
 PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN"
 	"freebsd41.dtd"
 
-PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN" 
-       "man-refs.ent"
-
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN"
 	"freebsd.dsl"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN" 
+       "articles.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN" 
+       "books.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN" 
+       "man-refs.ent"
 
 PUBLIC	"-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"freebsd.ent"

----Next_Part(Sat_Aug__7_19_45_25_2004_634)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="doc-entset-en.diff"

Index: en_US.ISO8859-1/articles/5-roadmap/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml,v
retrieving revision 1.22
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.22 article.sgml
--- en_US.ISO8859-1/articles/5-roadmap/article.sgml	23 Jul 2004 10:30:48 -0000	1.22
+++ en_US.ISO8859-1/articles/5-roadmap/article.sgml	6 Aug 2004 20:13:33 -0000
@@ -1,21 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!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//EN">
-%mailing-lists;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 
 <!ENTITY t.releng.3 "<literal>RELENG_3</literal>">
 <!ENTITY t.releng.4 "<literal>RELENG_4</literal>">
@@ -24,7 +9,6 @@
 <!ENTITY t.releng.5.2 "<literal>RELENG_5_2</literal>">
 <!ENTITY t.releng.5.3 "<literal>RELENG_5_3</literal>">
 <!ENTITY t.releng.head "<literal>HEAD</literal>">
-
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/checkpoint/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml,v
retrieving revision 1.20
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.20 article.sgml
--- en_US.ISO8859-1/articles/checkpoint/article.sgml	23 Jul 2004 10:43:21 -0000	1.20
+++ en_US.ISO8859-1/articles/checkpoint/article.sgml	6 Aug 2004 20:21:37 -0000
@@ -29,12 +29,9 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY legalnotice SYSTEM "../../share/sgml/legalnotice.sgml">
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/committers-guide/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v
retrieving revision 1.205
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.205 article.sgml
--- en_US.ISO8859-1/articles/committers-guide/article.sgml	6 Aug 2004 07:39:09 -0000	1.205
+++ en_US.ISO8859-1/articles/committers-guide/article.sgml	6 Aug 2004 20:13:37 -0000
@@ -1,24 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!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//EN">
-%mailing-lists;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/console-server/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/console-server/article.sgml,v
retrieving revision 1.19
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.19 article.sgml
--- en_US.ISO8859-1/articles/console-server/article.sgml	5 Aug 2004 10:04:26 -0000	1.19
+++ en_US.ISO8859-1/articles/console-server/article.sgml	6 Aug 2004 20:14:04 -0000
@@ -1,14 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % trademark PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademark;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/contributing/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/contributing/article.sgml,v
retrieving revision 1.500
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.500 article.sgml
--- en_US.ISO8859-1/articles/contributing/article.sgml	5 Aug 2004 10:04:26 -0000	1.500
+++ en_US.ISO8859-1/articles/contributing/article.sgml	6 Aug 2004 20:14:17 -0000
@@ -1,16 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous
-FreeBSD Entities//EN"> %freebsd;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"> %newsgroups;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % not.published "IGNORE">
 ]>
 
Index: en_US.ISO8859-1/articles/contributors/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/contributors/article.sgml,v
retrieving revision 1.432
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.432 article.sgml
--- en_US.ISO8859-1/articles/contributors/article.sgml	5 Aug 2004 10:04:26 -0000	1.432
+++ en_US.ISO8859-1/articles/contributors/article.sgml	6 Aug 2004 20:14:31 -0000
@@ -1,20 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!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 % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
-
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % contrib.ent SYSTEM "contrib.ent">
 %contrib.ent;
 <!ENTITY % not.published "IGNORE">
Index: en_US.ISO8859-1/articles/cvs-freebsd/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml,v
retrieving revision 1.13
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.13 article.sgml
--- en_US.ISO8859-1/articles/cvs-freebsd/article.sgml	5 Aug 2004 10:04:26 -0000	1.13
+++ en_US.ISO8859-1/articles/cvs-freebsd/article.sgml	6 Aug 2004 20:14:44 -0000
@@ -1,12 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml,v
retrieving revision 1.12
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.12 article.sgml
--- en_US.ISO8859-1/articles/cvsup-advanced/article.sgml	24 Dec 2003 00:26:39 -0000	1.12
+++ en_US.ISO8859-1/articles/cvsup-advanced/article.sgml	6 Aug 2004 20:14:52 -0000
@@ -3,11 +3,8 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/dialup-firewall/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml,v
retrieving revision 1.37
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.37 article.sgml
--- en_US.ISO8859-1/articles/dialup-firewall/article.sgml	5 Aug 2004 10:04:26 -0000	1.37
+++ en_US.ISO8859-1/articles/dialup-firewall/article.sgml	6 Aug 2004 20:15:00 -0000
@@ -3,17 +3,8 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/diskless-x/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml,v
retrieving revision 1.15
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.15 article.sgml
--- en_US.ISO8859-1/articles/diskless-x/article.sgml	15 Nov 2003 22:01:53 -0000	1.15
+++ en_US.ISO8859-1/articles/diskless-x/article.sgml	6 Aug 2004 20:15:09 -0000
@@ -5,12 +5,8 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/euro/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/euro/article.sgml,v
retrieving revision 1.9
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.9 article.sgml
--- en_US.ISO8859-1/articles/euro/article.sgml	5 Aug 2004 10:04:27 -0000	1.9
+++ en_US.ISO8859-1/articles/euro/article.sgml	6 Aug 2004 20:15:18 -0000
@@ -1,12 +1,6 @@
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/explaining-bsd/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml,v
retrieving revision 1.11
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.11 article.sgml
--- en_US.ISO8859-1/articles/explaining-bsd/article.sgml	6 Jul 2004 15:09:52 -0000	1.11
+++ en_US.ISO8859-1/articles/explaining-bsd/article.sgml	6 Aug 2004 20:15:28 -0000
@@ -2,14 +2,8 @@
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml,v
retrieving revision 1.10
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.10 article.sgml
--- en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml	19 Jul 2004 20:58:41 -0000	1.10
+++ en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml	6 Aug 2004 20:15:36 -0000
@@ -1,10 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>">
 ]>
 
Index: en_US.ISO8859-1/articles/filtering-bridges/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml,v
retrieving revision 1.19
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.19 article.sgml
--- en_US.ISO8859-1/articles/filtering-bridges/article.sgml	5 Aug 2004 10:04:27 -0000	1.19
+++ en_US.ISO8859-1/articles/filtering-bridges/article.sgml	6 Aug 2004 20:15:49 -0000
@@ -1,12 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/fonts/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/fonts/article.sgml,v
retrieving revision 1.25
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.25 article.sgml
--- en_US.ISO8859-1/articles/fonts/article.sgml	5 Aug 2004 10:04:27 -0000	1.25
+++ en_US.ISO8859-1/articles/fonts/article.sgml	6 Aug 2004 20:15:58 -0000
@@ -1,14 +1,8 @@
 <!-- $FreeBSD: doc/en_US.ISO8859-1/articles/fonts/article.sgml,v 1.25 2004/08/05 10:04:27 den Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <!-- Recently, I wanted to figure out how to use some additional fonts that
Index: en_US.ISO8859-1/articles/formatting-media/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml,v
retrieving revision 1.27
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.27 article.sgml
--- en_US.ISO8859-1/articles/formatting-media/article.sgml	14 Aug 2003 19:54:05 -0000	1.27
+++ en_US.ISO8859-1/articles/formatting-media/article.sgml	6 Aug 2004 20:16:08 -0000
@@ -1,15 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 <!-- $FreeBSD: doc/en_US.ISO8859-1/articles/formatting-media/article.sgml,v 1.27 2003/08/14 19:54:05 simon Exp $ -->
 <article>
Index: en_US.ISO8859-1/articles/freebsd-questions/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml,v
retrieving revision 1.21
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.21 article.sgml
--- en_US.ISO8859-1/articles/freebsd-questions/article.sgml	5 Aug 2004 10:04:27 -0000	1.21
+++ en_US.ISO8859-1/articles/freebsd-questions/article.sgml	6 Aug 2004 20:16:16 -0000
@@ -1,14 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/hats/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/hats/article.sgml,v
retrieving revision 1.7
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.7 article.sgml
--- en_US.ISO8859-1/articles/hats/article.sgml	25 Jul 2003 20:19:18 -0000	1.7
+++ en_US.ISO8859-1/articles/hats/article.sgml	6 Aug 2004 20:16:24 -0000
@@ -1,18 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!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//EN">
-%mailing-lists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/hubs/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/hubs/article.sgml,v
retrieving revision 1.50
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.50 article.sgml
--- en_US.ISO8859-1/articles/hubs/article.sgml	18 Jul 2004 01:48:27 -0000	1.50
+++ en_US.ISO8859-1/articles/hubs/article.sgml	6 Aug 2004 20:16:33 -0000
@@ -1,16 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!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 % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % not.published "IGNORE">
 ]>
 
Index: en_US.ISO8859-1/articles/ipsec-must/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml,v
retrieving revision 1.14
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.14 article.sgml
--- en_US.ISO8859-1/articles/ipsec-must/article.sgml	5 Aug 2004 10:04:27 -0000	1.14
+++ en_US.ISO8859-1/articles/ipsec-must/article.sgml	6 Aug 2004 20:16:41 -0000
@@ -5,14 +5,8 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/java-tomcat/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml,v
retrieving revision 1.22
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.22 article.sgml
--- en_US.ISO8859-1/articles/java-tomcat/article.sgml	5 Aug 2004 10:04:27 -0000	1.22
+++ en_US.ISO8859-1/articles/java-tomcat/article.sgml	6 Aug 2004 20:16:56 -0000
@@ -32,14 +32,8 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!--
   URL Entities.  These are in place, to allow wrapping long URLs to the 80th
   column.
Index: en_US.ISO8859-1/articles/laptop/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/laptop/article.sgml,v
retrieving revision 1.19
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.19 article.sgml
--- en_US.ISO8859-1/articles/laptop/article.sgml	14 Sep 2003 11:29:06 -0000	1.19
+++ en_US.ISO8859-1/articles/laptop/article.sgml	6 Aug 2004 20:17:08 -0000
@@ -1,18 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/mailing-list-faq/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml,v
retrieving revision 1.3
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.3 article.sgml
--- en_US.ISO8859-1/articles/mailing-list-faq/article.sgml	5 Aug 2004 10:04:27 -0000	1.3
+++ en_US.ISO8859-1/articles/mailing-list-faq/article.sgml	6 Aug 2004 20:17:18 -0000
@@ -2,26 +2,8 @@
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!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//EN">
-%mailing-lists;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/mh/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/mh/article.sgml,v
retrieving revision 1.23
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.23 article.sgml
--- en_US.ISO8859-1/articles/mh/article.sgml	5 Nov 2003 10:59:34 -0000	1.23
+++ en_US.ISO8859-1/articles/mh/article.sgml	6 Aug 2004 20:17:26 -0000
@@ -2,12 +2,8 @@
 <!-- FreeBSD Documentation Project -->
 
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 <article>
   <articleinfo>
Index: en_US.ISO8859-1/articles/multi-os/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/multi-os/article.sgml,v
retrieving revision 1.37
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.37 article.sgml
--- en_US.ISO8859-1/articles/multi-os/article.sgml	23 Nov 2003 18:48:37 -0000	1.37
+++ en_US.ISO8859-1/articles/multi-os/article.sgml	6 Aug 2004 20:17:33 -0000
@@ -1,11 +1,8 @@
 <!-- $FreeBSD: doc/en_US.ISO8859-1/articles/multi-os/article.sgml,v 1.37 2003/11/23 18:48:37 ceri Exp $ -->
 
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/new-users/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/new-users/article.sgml,v
retrieving revision 1.45
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.45 article.sgml
--- en_US.ISO8859-1/articles/new-users/article.sgml	5 Aug 2004 10:04:27 -0000	1.45
+++ en_US.ISO8859-1/articles/new-users/article.sgml	6 Aug 2004 20:17:42 -0000
@@ -2,16 +2,8 @@
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/pam/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/pam/article.sgml,v
retrieving revision 1.27
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.27 article.sgml
--- en_US.ISO8859-1/articles/pam/article.sgml	12 Dec 2003 23:40:55 -0000	1.27
+++ en_US.ISO8859-1/articles/pam/article.sgml	6 Aug 2004 20:17:51 -0000
@@ -1,12 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <!--
Index: en_US.ISO8859-1/articles/portbuild/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v
retrieving revision 1.5
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.5 article.sgml
--- en_US.ISO8859-1/articles/portbuild/article.sgml	25 Jul 2004 20:48:38 -0000	1.5
+++ en_US.ISO8859-1/articles/portbuild/article.sgml	6 Aug 2004 20:17:59 -0000
@@ -1,16 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!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//EN">
-%mailing-lists;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/pr-guidelines/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v
retrieving revision 1.16
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.16 article.sgml
--- en_US.ISO8859-1/articles/pr-guidelines/article.sgml	5 Aug 2004 10:04:27 -0000	1.16
+++ en_US.ISO8859-1/articles/pr-guidelines/article.sgml	6 Aug 2004 20:18:10 -0000
@@ -4,16 +4,8 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY man.edit-pr.1 "<citerefentry/<refentrytitle/edit-pr/<manvolnum/1//">
 <!ENTITY man.query-pr.1 "<citerefentry/<refentrytitle/query-pr/<manvolnum/1//">
 ]>
Index: en_US.ISO8859-1/articles/problem-reports/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v
retrieving revision 1.33
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.33 article.sgml
--- en_US.ISO8859-1/articles/problem-reports/article.sgml	5 Aug 2004 10:04:28 -0000	1.33
+++ en_US.ISO8859-1/articles/problem-reports/article.sgml	6 Aug 2004 20:18:29 -0000
@@ -1,14 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/pxe/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/pxe/article.sgml,v
retrieving revision 1.23
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.23 article.sgml
--- en_US.ISO8859-1/articles/pxe/article.sgml	18 Jan 2004 20:52:42 -0000	1.23
+++ en_US.ISO8859-1/articles/pxe/article.sgml	6 Aug 2004 20:18:38 -0000
@@ -1,15 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man
-
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-
-<!ENTITY % misc PUBLIC	"-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%misc;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/relaydelay/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml,v
retrieving revision 1.5
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.5 article.sgml
--- en_US.ISO8859-1/articles/relaydelay/article.sgml	5 Aug 2004 05:54:23 -0000	1.5
+++ en_US.ISO8859-1/articles/relaydelay/article.sgml	6 Aug 2004 20:18:47 -0000
@@ -3,17 +3,8 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-
-
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % not.published "IGNORE">
 ]>
 
Index: en_US.ISO8859-1/articles/releng/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/releng/article.sgml,v
retrieving revision 1.59
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.59 article.sgml
--- en_US.ISO8859-1/articles/releng/article.sgml	5 Aug 2004 10:04:28 -0000	1.59
+++ en_US.ISO8859-1/articles/releng/article.sgml	6 Aug 2004 20:18:58 -0000
@@ -3,20 +3,8 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!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 % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>
 ]>
 
Index: en_US.ISO8859-1/articles/releng-packages/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml,v
retrieving revision 1.16
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.16 article.sgml
--- en_US.ISO8859-1/articles/releng-packages/article.sgml	5 Nov 2003 10:59:35 -0000	1.16
+++ en_US.ISO8859-1/articles/releng-packages/article.sgml	6 Aug 2004 20:19:16 -0000
@@ -3,16 +3,8 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
-%teams;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/serial-uart/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml,v
retrieving revision 1.11
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.11 article.sgml
--- en_US.ISO8859-1/articles/serial-uart/article.sgml	5 Aug 2004 10:04:28 -0000	1.11
+++ en_US.ISO8859-1/articles/serial-uart/article.sgml	6 Aug 2004 20:19:25 -0000
@@ -1,12 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/solid-state/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/solid-state/article.sgml,v
retrieving revision 1.11
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.11 article.sgml
--- en_US.ISO8859-1/articles/solid-state/article.sgml	18 Oct 2003 10:39:15 -0000	1.11
+++ en_US.ISO8859-1/articles/solid-state/article.sgml	6 Aug 2004 20:29:36 -0000
@@ -31,12 +31,9 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY legalnotice SYSTEM "../../share/sgml/legalnotice.sgml">
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/storage-devices/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml,v
retrieving revision 1.13
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.13 article.sgml
--- en_US.ISO8859-1/articles/storage-devices/article.sgml	18 Oct 2003 10:39:16 -0000	1.13
+++ en_US.ISO8859-1/articles/storage-devices/article.sgml	6 Aug 2004 20:19:44 -0000
@@ -1,10 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/vinum/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/vinum/article.sgml,v
retrieving revision 1.14
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.14 article.sgml
--- en_US.ISO8859-1/articles/vinum/article.sgml	18 Oct 2003 10:39:16 -0000	1.14
+++ en_US.ISO8859-1/articles/vinum/article.sgml	6 Aug 2004 20:19:54 -0000
@@ -2,13 +2,10 @@
 <!-- FreeBSD Documentation Project -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 
 <!ENTITY vinum.ap "<application>Vinum</application>">
-%man;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/vm-design/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/vm-design/article.sgml,v
retrieving revision 1.13
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.13 article.sgml
--- en_US.ISO8859-1/articles/vm-design/article.sgml	18 Oct 2003 10:39:16 -0000	1.13
+++ en_US.ISO8859-1/articles/vm-design/article.sgml	6 Aug 2004 20:20:03 -0000
@@ -2,13 +2,8 @@
 <!-- FreeBSD Documentation Project -->
 
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/articles/zip-drive/article.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml,v
retrieving revision 1.12
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.12 article.sgml
--- en_US.ISO8859-1/articles/zip-drive/article.sgml	18 Oct 2003 10:39:16 -0000	1.12
+++ en_US.ISO8859-1/articles/zip-drive/article.sgml	6 Aug 2004 20:20:15 -0000
@@ -1,13 +1,8 @@
 <!-- $FreeBSD: doc/en_US.ISO8859-1/articles/zip-drive/article.sgml,v 1.12 2003/10/18 10:39:16 simon Exp $ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: en_US.ISO8859-1/books/arch-handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml,v
retrieving revision 1.46
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.46 book.sgml
--- en_US.ISO8859-1/books/arch-handbook/book.sgml	5 Aug 2004 10:04:28 -0000	1.46
+++ en_US.ISO8859-1/books/arch-handbook/book.sgml	6 Aug 2004 20:06:39 -0000
@@ -5,18 +5,13 @@
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
-%bookinfo;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
-<!ENTITY % mac-entities SYSTEM "mac.ent"> %mac-entities;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"> %authors
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
+<!ENTITY % chapters SYSTEM "chapters.ent">
+%chapters;
+<!ENTITY % mac-entities SYSTEM "mac.ent">
+%mac-entities;
+
 <!ENTITY % chap.index "IGNORE">
 ]>
 
Index: en_US.ISO8859-1/books/bibliography/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/bibliography/book.sgml,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 book.sgml
--- en_US.ISO8859-1/books/bibliography/book.sgml	8 Aug 2001 02:25:55 -0000	1.1
+++ en_US.ISO8859-1/books/bibliography/book.sgml	6 Aug 2004 20:07:03 -0000
@@ -5,6 +5,9 @@
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
+
 <!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.sgml">
 ]>
 
Index: en_US.ISO8859-1/books/corp-net-guide/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml,v
retrieving revision 1.9
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.9 book.sgml
--- en_US.ISO8859-1/books/corp-net-guide/book.sgml	30 Jan 2004 10:24:50 -0000	1.9
+++ en_US.ISO8859-1/books/corp-net-guide/book.sgml	6 Aug 2004 20:10:09 -0000
@@ -1,7 +1,10 @@
 <!-- $FreeBSD: doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml,v 1.9 2004/01/30 10:24:50 hrs Exp $ -->
 <!-- FreeBSD Documentation Project -->
 
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN">
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
+]>
 
 <book>
   <bookinfo>
Index: en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 freebsd.dsl
--- en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl	9 Apr 2001 20:39:29 -0000	1.1
+++ en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl	6 Aug 2004 20:09:42 -0000
@@ -1,7 +1,7 @@
 <!-- $FreeBSD: doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl,v 1.1 2001/04/09 20:39:29 nik Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/sgml/freebsd.dsl" CDATA DSSSL>
+<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
 ]>
 
 <style-sheet>
Index: en_US.ISO8859-1/books/design-44bsd/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml,v
retrieving revision 1.7
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.7 book.sgml
--- en_US.ISO8859-1/books/design-44bsd/book.sgml	30 Jan 2004 10:32:50 -0000	1.7
+++ en_US.ISO8859-1/books/design-44bsd/book.sgml	6 Aug 2004 20:08:00 -0000
@@ -2,8 +2,8 @@
 <!-- FreeBSD Documentation Project -->
 
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 ]>
 
 <book>
Index: en_US.ISO8859-1/books/design-44bsd/freebsd.dsl
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 freebsd.dsl
--- en_US.ISO8859-1/books/design-44bsd/freebsd.dsl	2 Jun 2001 23:06:52 -0000	1.2
+++ en_US.ISO8859-1/books/design-44bsd/freebsd.dsl	6 Aug 2004 20:09:06 -0000
@@ -1,7 +1,7 @@
 <!-- $FreeBSD: doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl,v 1.2 2001/06/02 23:06:52 dd Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY freebsd.dsl SYSTEM "../../share/sgml/freebsd.dsl" CDATA DSSSL>
+<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
 ]>
 
 <style-sheet>
Index: en_US.ISO8859-1/books/dev-model/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/dev-model/book.sgml,v
retrieving revision 1.4
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.4 book.sgml
--- en_US.ISO8859-1/books/dev-model/book.sgml	28 Jul 2004 19:42:39 -0000	1.4
+++ en_US.ISO8859-1/books/dev-model/book.sgml	6 Aug 2004 20:10:27 -0000
@@ -27,12 +27,8 @@
   -->
 
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
-%bookinfo;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
 <!ENTITY % chap.index "IGNORE">
Index: en_US.ISO8859-1/books/developers-handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml,v
retrieving revision 1.48
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.48 book.sgml
--- en_US.ISO8859-1/books/developers-handbook/book.sgml	5 Aug 2004 10:04:28 -0000	1.48
+++ en_US.ISO8859-1/books/developers-handbook/book.sgml	6 Aug 2004 20:10:48 -0000
@@ -5,19 +5,9 @@
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
-%bookinfo;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"> %authors
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"> %mailing-lists;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
 <!ENTITY % chap.index "IGNORE">
 ]>
 
Index: en_US.ISO8859-1/books/faq/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v
retrieving revision 1.637
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.637 book.sgml
--- en_US.ISO8859-1/books/faq/book.sgml	5 Aug 2004 18:36:50 -0000	1.637
+++ en_US.ISO8859-1/books/faq/book.sgml	6 Aug 2004 20:11:11 -0000
@@ -1,27 +1,7 @@
-<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!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 % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
-%bookinfo;
-
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mailing-lists;
-
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 <!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.sgml">
-
 ]>
 
 <book>
Index: en_US.ISO8859-1/books/fdp-primer/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v
retrieving revision 1.24
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.24 book.sgml
--- en_US.ISO8859-1/books/fdp-primer/book.sgml	12 Jul 2004 03:12:29 -0000	1.24
+++ en_US.ISO8859-1/books/fdp-primer/book.sgml	6 Aug 2004 20:11:35 -0000
@@ -31,22 +31,8 @@
 -->
 
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-
-<!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
-%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//EN">
-%mailing-lists;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
-
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 <!ENTITY % not.published "INCLUDE">
 <!-- ENTITY index SYSTEM "index.sgml" -->
Index: en_US.ISO8859-1/books/handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/book.sgml,v
retrieving revision 1.154
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.154 book.sgml
--- en_US.ISO8859-1/books/handbook/book.sgml	31 Jul 2004 14:47:03 -0000	1.154
+++ en_US.ISO8859-1/books/handbook/book.sgml	6 Aug 2004 20:03:39 -0000
@@ -5,27 +5,12 @@
 -->
 
 <!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 % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
-<!ENTITY % txtfiles SYSTEM "txtfiles.ent"> %txtfiles;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
+<!ENTITY % chapters SYSTEM "chapters.ent">
+%chapters;
+<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
+%txtfiles;
 
 <!ENTITY % not.published "INCLUDE">
 
Index: en_US.ISO8859-1/books/porters-handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v
retrieving revision 1.471
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.471 book.sgml
--- en_US.ISO8859-1/books/porters-handbook/book.sgml	6 Aug 2004 07:50:24 -0000	1.471
+++ en_US.ISO8859-1/books/porters-handbook/book.sgml	6 Aug 2004 20:11:53 -0000
@@ -5,21 +5,8 @@
 -->
 
 <!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 % 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 % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls;
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 ]>
 
 <book>

----Next_Part(Sat_Aug__7_19_45_25_2004_634)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="doc-entset-ja.diff"

Index: ja_JP.eucJP/articles/contributing/article.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/articles/contributing/article.sgml,v
retrieving revision 1.76
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.76 article.sgml
--- ja_JP.eucJP/articles/contributing/article.sgml	1 Nov 2003 07:27:25 -0000	1.76
+++ ja_JP.eucJP/articles/contributing/article.sgml	6 Aug 2004 20:41:24 -0000
@@ -6,16 +6,8 @@
      $FreeBSD: doc/ja_JP.eucJP/articles/contributing/article.sgml,v 1.76 2003/11/01 07:27:25 rushani Exp $
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous
-FreeBSD Entities//EN"> %freebsd;
-<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"> %newsgroups;
-<!ENTITY % ja-authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
-%ja-authors;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"> %mailing-lists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % not.published "IGNORE">
 ]>
 
Index: ja_JP.eucJP/articles/contributors/article.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/articles/contributors/article.sgml,v
retrieving revision 1.17
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.17 article.sgml
--- ja_JP.eucJP/articles/contributors/article.sgml	20 Oct 2003 10:11:13 -0000	1.17
+++ ja_JP.eucJP/articles/contributors/article.sgml	6 Aug 2004 20:41:39 -0000
@@ -6,20 +6,8 @@
      $FreeBSD: doc/ja_JP.eucJP/articles/contributors/article.sgml,v 1.17 2003/10/20 10:11:13 rushani Exp $
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!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 % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
-%mailing-lists;
-<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
-%ja-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % contrib.ent SYSTEM "../../../en_US.ISO8859-1/articles/contributors/contrib.ent">
 %contrib.ent;
 <!ENTITY % not.published "IGNORE">
Index: ja_JP.eucJP/articles/dialup-firewall/article.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml,v
retrieving revision 1.11
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.11 article.sgml
--- ja_JP.eucJP/articles/dialup-firewall/article.sgml	19 Apr 2004 16:57:53 -0000	1.11
+++ ja_JP.eucJP/articles/dialup-firewall/article.sgml	6 Aug 2004 20:41:51 -0000
@@ -12,12 +12,8 @@
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
-%ja-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: ja_JP.eucJP/articles/diskless-x/article.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/articles/diskless-x/article.sgml,v
retrieving revision 1.8
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.8 article.sgml
--- ja_JP.eucJP/articles/diskless-x/article.sgml	6 Dec 2003 08:12:54 -0000	1.8
+++ ja_JP.eucJP/articles/diskless-x/article.sgml	6 Aug 2004 20:42:01 -0000
@@ -6,12 +6,8 @@
     $FreeBSD: doc/ja_JP.eucJP/articles/diskless-x/article.sgml,v 1.8 2003/12/06 08:12:54 hrs Exp $
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
-%ja-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <!--
Index: ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml,v
retrieving revision 1.3
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.3 article.sgml
--- ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml	20 Oct 2003 10:11:13 -0000	1.3
+++ ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml	6 Aug 2004 20:42:10 -0000
@@ -1,12 +1,6 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
-%ja-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY scratch.ap "<application>FreeBSD をゼロから設定する</application>">
 <!--
   $FreeBSD: doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml,v 1.3 2003/10/20 10:11:13 rushani Exp $
Index: ja_JP.eucJP/articles/fonts/article.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/articles/fonts/article.sgml,v
retrieving revision 1.9
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.9 article.sgml
--- ja_JP.eucJP/articles/fonts/article.sgml	1 Apr 2004 19:29:57 -0000	1.9
+++ ja_JP.eucJP/articles/fonts/article.sgml	6 Aug 2004 20:42:21 -0000
@@ -6,14 +6,8 @@
     Original revision: 1.24
 -->
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
-%ja-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <!-- Recently, I wanted to figure out how to use some additional fonts that
Index: ja_JP.eucJP/articles/ipsec-must/article.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml,v
retrieving revision 1.7
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.7 article.sgml
--- ja_JP.eucJP/articles/ipsec-must/article.sgml	11 Oct 2003 13:10:29 -0000	1.7
+++ ja_JP.eucJP/articles/ipsec-must/article.sgml	6 Aug 2004 20:42:30 -0000
@@ -6,14 +6,8 @@
     Original revision: 1.12
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-
-<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
-%ja-trademarks;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: ja_JP.eucJP/articles/multi-os/article.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/articles/multi-os/article.sgml,v
retrieving revision 1.11
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.11 article.sgml
--- ja_JP.eucJP/articles/multi-os/article.sgml	6 Dec 2003 08:12:54 -0000	1.11
+++ ja_JP.eucJP/articles/multi-os/article.sgml	6 Aug 2004 20:42:38 -0000
@@ -6,16 +6,8 @@
      $FreeBSD: doc/ja_JP.eucJP/articles/multi-os/article.sgml,v 1.11 2003/12/06 08:12:54 hrs Exp $
 -->
 <!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % ja-authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
-%ja-authors;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-
-<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
-%ja-trademarks;
-
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 <article>
   <articleinfo>
Index: ja_JP.eucJP/articles/problem-reports/article.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/articles/problem-reports/article.sgml,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 article.sgml
--- ja_JP.eucJP/articles/problem-reports/article.sgml	11 Oct 2003 13:55:24 -0000	1.2
+++ ja_JP.eucJP/articles/problem-reports/article.sgml	6 Aug 2004 20:42:46 -0000
@@ -4,12 +4,8 @@
    $FreeBSD: doc/ja_JP.eucJP/articles/problem-reports/article.sgml,v 1.2 2003/10/11 13:55:24 rushani Exp $
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
-%mailing-lists;
-<!ENTITY % ja-authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
-%ja-authors;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 
 <article>
Index: ja_JP.eucJP/articles/zip-drive/article.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/articles/zip-drive/article.sgml,v
retrieving revision 1.7
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.7 article.sgml
--- ja_JP.eucJP/articles/zip-drive/article.sgml	20 Oct 2003 10:11:13 -0000	1.7
+++ ja_JP.eucJP/articles/zip-drive/article.sgml	6 Aug 2004 20:42:54 -0000
@@ -6,14 +6,8 @@
     $FreeBSD: doc/ja_JP.eucJP/articles/zip-drive/article.sgml,v 1.7 2003/10/20 10:11:13 rushani Exp $
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
-%ja-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 ]>
 <!--
 訳:
Index: ja_JP.eucJP/books/design-44bsd/book.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/books/design-44bsd/book.sgml,v
retrieving revision 1.8
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.8 book.sgml
--- ja_JP.eucJP/books/design-44bsd/book.sgml	6 Mar 2004 06:42:26 -0000	1.8
+++ ja_JP.eucJP/books/design-44bsd/book.sgml	6 Aug 2004 20:39:48 -0000
@@ -7,8 +7,8 @@
 -->
 
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 ]>
 
 <book>
Index: ja_JP.eucJP/books/faq/book.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/books/faq/book.sgml,v
retrieving revision 1.63
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.63 book.sgml
--- ja_JP.eucJP/books/faq/book.sgml	1 Apr 2004 01:09:40 -0000	1.63
+++ ja_JP.eucJP/books/faq/book.sgml	6 Aug 2004 20:40:09 -0000
@@ -1,22 +1,6 @@
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%freebsd;
-
-<!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 % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
-%bookinfo;
-
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
-%mailing-lists;
-<!ENTITY % newsgroups SYSTEM "../handbook/newsgroups.ent"> %newsgroups;
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.194 -->
Index: ja_JP.eucJP/books/fdp-primer/book.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/books/fdp-primer/book.sgml,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 book.sgml
--- ja_JP.eucJP/books/fdp-primer/book.sgml	13 Jul 2001 16:09:15 -0000	1.2
+++ ja_JP.eucJP/books/fdp-primer/book.sgml	6 Aug 2004 20:40:21 -0000
@@ -34,8 +34,8 @@
 -->
 
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
 ]>
Index: ja_JP.eucJP/books/handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/books/handbook/book.sgml,v
retrieving revision 1.77
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.77 book.sgml
--- ja_JP.eucJP/books/handbook/book.sgml	9 Jan 2004 16:43:56 -0000	1.77
+++ ja_JP.eucJP/books/handbook/book.sgml	6 Aug 2004 20:29:04 -0000
@@ -7,30 +7,9 @@
 -->
 
 <!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 % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 <!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 % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
-%ja-trademarks;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
 <!ENTITY % txtfiles SYSTEM "../../../en_US.ISO8859-1/books/handbook/txtfiles.ent"> %txtfiles;
 
 <!ENTITY % not.published "INCLUDE">
Index: ja_JP.eucJP/books/porters-handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/books/porters-handbook/book.sgml,v
retrieving revision 1.26
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.26 book.sgml
--- ja_JP.eucJP/books/porters-handbook/book.sgml	3 Dec 2001 03:51:01 -0000	1.26
+++ ja_JP.eucJP/books/porters-handbook/book.sgml	6 Aug 2004 20:40:38 -0000
@@ -7,18 +7,8 @@
 -->
 
 <!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 % ja-authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
-%ja-authors;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
-%mailing-lists;
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 ]>
 
 <book>
Index: ja_JP.eucJP/books/ppp-primer/book.sgml
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/books/ppp-primer/book.sgml,v
retrieving revision 1.6
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.6 book.sgml
--- ja_JP.eucJP/books/ppp-primer/book.sgml	10 Dec 2001 15:14:43 -0000	1.6
+++ ja_JP.eucJP/books/ppp-primer/book.sgml	6 Aug 2004 20:40:47 -0000
@@ -1,6 +1,6 @@
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
+<!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN">
+%books.ent;
 ]>
 
 <!-- The FreeBSD Japanese Documentation Project -->
Index: ja_JP.eucJP/share/sgml/catalog
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/share/sgml/catalog,v
retrieving revision 1.6
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.6 catalog
--- ja_JP.eucJP/share/sgml/catalog	11 Oct 2003 08:54:51 -0000	1.6
+++ ja_JP.eucJP/share/sgml/catalog	6 Aug 2004 20:24:32 -0000
@@ -7,6 +7,12 @@
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN" 
+       "articles.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN" 
+       "books.ent"
+
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"
 	"mailing-lists.ent"
 

----Next_Part(Sat_Aug__7_19_45_25_2004_634)----

----Security_Multipart0(Sat_Aug__7_19_45_25_2004_328)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQBBFLLFTyzT2CeTzy0RAqIbAJ9RxPuskBLRnx27dWBsK2L686IZuACgogiB
t7AV3U20e3urfUn13C2bE94=
=Anhc
-----END PGP SIGNATURE-----

----Security_Multipart0(Sat_Aug__7_19_45_25_2004_328)----