Simplify parameter entities in doctype declaration.

22 files changed, 86 insertions, 186 deletions

diff --git a/release/doc/en_US.ISO8859-1/early-adopter/article.sgml b/release/doc/en_US.ISO8859-1/early-adopter/article.sgml
index 3ccfbf6..8d23551 100644
--- a/release/doc/en_US.ISO8859-1/early-adopter/article.sgml
+++ b/release/doc/en_US.ISO8859-1/early-adopter/article.sgml
@@ -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 % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
@@ -24,7 +9,6 @@
 <!ENTITY release.5x "5.<replaceable>X</replaceable>">
 <!ENTITY release.4last "4.10-RELEASE">
 <!ENTITY release.5branchpoint "5.3-RELEASE">
-
 ]>
 
 <article>
diff --git a/release/doc/en_US.ISO8859-1/errata/article.sgml b/release/doc/en_US.ISO8859-1/errata/article.sgml
index 6526685..9ddad04 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.sgml
+++ b/release/doc/en_US.ISO8859-1/errata/article.sgml
@@ -11,19 +11,11 @@
 -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
-<!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 % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % misc PUBLIC  "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%misc;
-
 <!ENTITY release.bugfix "5.2.1-RELEASE">
 ]>
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml b/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml
index fc342a1..d8c3e79 100644
--- a/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml
@@ -1,12 +1,8 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
diff --git a/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml b/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml
index c40771c..712367b 100644
--- a/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/amd64/article.sgml
@@ -1,12 +1,9 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
+
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
diff --git a/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml b/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml
index c8a4bf4..1d9eb5d 100644
--- a/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/i386/article.sgml
@@ -1,12 +1,9 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
+
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
diff --git a/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml b/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml
index 4a188b7..1f1e7d0 100644
--- a/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml
@@ -1,12 +1,9 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
+
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
diff --git a/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml b/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml
index 205fd2b..d312c4c 100644
--- a/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml
@@ -1,12 +1,9 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
+
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
diff --git a/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml b/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml
index 9db5748..fb55134 100644
--- a/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/sparc64/article.sgml
@@ -1,12 +1,9 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
+
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
diff --git a/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml b/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml
index c6200f8..f6c2a8b 100644
--- a/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml
@@ -1,15 +1,13 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
+
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
+<!ENTITY % sections SYSTEM "../common/install.ent">
+%sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml b/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml
index 3191f0d..7e71f15 100644
--- a/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/amd64/article.sgml
@@ -1,15 +1,13 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
+
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
+<!ENTITY % sections SYSTEM "../common/install.ent">
+%sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/en_US.ISO8859-1/installation/i386/article.sgml b/release/doc/en_US.ISO8859-1/installation/i386/article.sgml
index 3779488..c113a8c 100644
--- a/release/doc/en_US.ISO8859-1/installation/i386/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/i386/article.sgml
@@ -1,15 +1,13 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
+
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
+<!ENTITY % sections SYSTEM "../common/install.ent">
+%sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml b/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml
index 5380b93..0a0e54c 100644
--- a/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml
@@ -1,15 +1,13 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
+
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
+<!ENTITY % sections SYSTEM "../common/install.ent">
+%sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml b/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml
index 9a4a97c..84ff87e 100644
--- a/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml
@@ -1,15 +1,13 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
+
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
+<!ENTITY % sections SYSTEM "../common/install.ent">
+%sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml b/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml
index 8c42600..16c0582 100644
--- a/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml
@@ -1,15 +1,9 @@
 <!-- $FreeBSD$ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 
-<!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
-
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -18,6 +12,8 @@
 
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
+<!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
+
 ]>
 
 <article>
diff --git a/release/doc/en_US.ISO8859-1/readme/article.sgml b/release/doc/en_US.ISO8859-1/readme/article.sgml
index b908b0f..5d49a50 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.sgml
+++ b/release/doc/en_US.ISO8859-1/readme/article.sgml
@@ -1,16 +1,9 @@
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
-<!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 % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % misc PUBLIC  "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%misc;
 ]>
 
 <article>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
index e02527f..961662f 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml
@@ -1,19 +1,13 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
-<!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 % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % urls.ent PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls.ent;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
index 1bff367..0b18339 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml
@@ -1,19 +1,13 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
-<!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 % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % urls.ent PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls.ent;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile b/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile
index f548b33..494ef81 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile
+++ b/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile
@@ -14,5 +14,7 @@ SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
 SRCS+=	../common/new.sgml
 
+URL_RELPREFIX?=	../../../..
+
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
index c386312..d49e02b 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml
@@ -1,19 +1,13 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
-<!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 % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % urls.ent PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls.ent;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
index 4e48340..0c5323e 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml
@@ -1,19 +1,13 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
-<!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 % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % urls.ent PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls.ent;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
index d41b811..87027bf 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml
@@ -1,19 +1,13 @@
 <!-- $FreeBSD$ -->
 
 <!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 % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
-<!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 % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % urls.ent PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls.ent;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
index 798563f..2763630 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml
@@ -1,27 +1,19 @@
 <!-- $FreeBSD$ -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 
-<!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
-
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % urls.ent PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
-%urls.ent;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
 
 <!-- Architecture-specific customization -->
 
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
+<!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
 
 ]>