From 452f8fc4444dc2b8978b6925e5548c60f5eccd92 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 17 May 2013 18:53:29 +0000
Subject: [PATCH] - Update the release notes to DocBook 4.5 XML to build with
 the   updated documentation tree

---
 .../de_DE.ISO8859-1/early-adopter/article.xml |  11 +-
 .../doc/de_DE.ISO8859-1/errata/article.xml    |  53 ++-------
 .../hardware/alpha/article.xml                |  13 +--
 .../hardware/alpha/proc-alpha.xml             |   5 +-
 .../de_DE.ISO8859-1/hardware/common/dev.xml   |   5 +-
 .../de_DE.ISO8859-1/hardware/i386/article.xml |  13 +--
 .../de_DE.ISO8859-1/hardware/ia64/article.xml |  13 +--
 .../de_DE.ISO8859-1/hardware/pc98/article.xml |  13 +--
 .../hardware/sparc64/article.xml              |  13 +--
 .../installation/alpha/article.xml            |  11 +-
 .../installation/i386/article.xml             |  11 +-
 .../installation/ia64/article.xml             |  11 +-
 .../installation/pc98/article.xml             |  11 +-
 .../installation/sparc64/article.xml          |  12 +-
 .../doc/de_DE.ISO8859-1/readme/article.xml    |  36 +++---
 .../relnotes/alpha/article.xml                |  11 +-
 .../de_DE.ISO8859-1/relnotes/common/new.xml   |  26 +----
 .../de_DE.ISO8859-1/relnotes/i386/article.xml |  11 +-
 .../de_DE.ISO8859-1/relnotes/ia64/article.xml |  11 +-
 .../de_DE.ISO8859-1/relnotes/pc98/article.xml |  11 +-
 .../relnotes/sparc64/article.xml              |  11 +-
 release/doc/en_US.ISO8859-1/Makefile          |   3 +
 .../doc/en_US.ISO8859-1/errata/article.xml    |  92 +++------------
 .../doc/en_US.ISO8859-1/hardware/article.xml  |  16 ++-
 .../doc/en_US.ISO8859-1/readme/article.xml    |  39 ++-----
 .../doc/en_US.ISO8859-1/relnotes/article.xml  |  41 ++-----
 .../fr_FR.ISO8859-1/early-adopter/article.xml |  11 +-
 .../doc/fr_FR.ISO8859-1/errata/article.xml    |  30 ++---
 .../hardware/alpha/article.xml                |  13 +--
 .../hardware/alpha/proc-alpha.xml             |  47 ++++----
 .../fr_FR.ISO8859-1/hardware/common/dev.xml   |   9 +-
 .../fr_FR.ISO8859-1/hardware/i386/article.xml |  13 +--
 .../hardware/i386/proc-i386.xml               |   2 +-
 .../fr_FR.ISO8859-1/hardware/ia64/article.xml |  13 +--
 .../fr_FR.ISO8859-1/hardware/pc98/article.xml |  13 +--
 .../hardware/pc98/proc-pc98.xml               |   1 +
 .../hardware/sparc64/article.xml              |  13 +--
 .../hardware/sparc64/proc-sparc64.xml         |   1 +
 .../installation/alpha/article.xml            |  11 +-
 .../installation/common/install.xml           |   5 +-
 .../installation/common/layout.xml            |   3 +-
 .../installation/i386/article.xml             |  11 +-
 .../installation/pc98/article.xml             |  11 +-
 .../installation/sparc64/article.xml          |  11 +-
 .../relnotes/alpha/article.xml                |  11 +-
 .../fr_FR.ISO8859-1/relnotes/common/new.xml   |  25 +---
 .../fr_FR.ISO8859-1/relnotes/i386/article.xml |  11 +-
 release/doc/ja_JP.eucJP/errata/article.xml    | 107 ++++--------------
 .../ja_JP.eucJP/hardware/alpha/article.xml    |  24 ++--
 .../ja_JP.eucJP/hardware/amd64/article.xml    |  21 ++--
 .../ja_JP.eucJP/hardware/amd64/proc-amd64.xml |   1 +
 .../ja_JP.eucJP/hardware/common/artheader.xml |   1 +
 .../doc/ja_JP.eucJP/hardware/common/dev.xml   |  14 +--
 .../doc/ja_JP.eucJP/hardware/common/intro.xml |   1 +
 .../doc/ja_JP.eucJP/hardware/i386/article.xml |  25 ++--
 .../ja_JP.eucJP/hardware/i386/proc-i386.xml   |   1 +
 .../doc/ja_JP.eucJP/hardware/ia64/article.xml |  25 ++--
 .../ja_JP.eucJP/hardware/ia64/proc-ia64.xml   |   1 +
 .../doc/ja_JP.eucJP/hardware/pc98/article.xml |  25 ++--
 .../ja_JP.eucJP/hardware/pc98/proc-pc98.xml   |   1 +
 .../ja_JP.eucJP/hardware/sparc64/article.xml  |  24 ++--
 .../hardware/sparc64/proc-sparc64.xml         |   1 +
 .../ja_JP.eucJP/relnotes/alpha/article.xml    |  30 +++--
 .../ja_JP.eucJP/relnotes/amd64/article.xml    |  21 ++--
 .../doc/ja_JP.eucJP/relnotes/common/new.xml   |  29 +----
 .../ja_JP.eucJP/relnotes/common/relnotes.ent  |   1 +
 .../doc/ja_JP.eucJP/relnotes/i386/article.xml |  31 +++--
 .../doc/ja_JP.eucJP/relnotes/ia64/article.xml |  30 +++--
 .../doc/ja_JP.eucJP/relnotes/pc98/article.xml |  18 ++-
 .../ja_JP.eucJP/relnotes/sparc64/article.xml  |  28 +++--
 release/doc/ja_JP.eucJP/share/xml/catalog.xml |  11 ++
 .../doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml |   1 +
 release/doc/ru_RU.KOI8-R/errata/article.xml   |  99 ++++------------
 .../ru_RU.KOI8-R/hardware/alpha/article.xml   |  36 +++---
 .../ru_RU.KOI8-R/hardware/amd64/article.xml   |  36 +++---
 .../hardware/amd64/proc-amd64.xml             |   1 +
 .../hardware/common/artheader.xml             |   1 +
 .../doc/ru_RU.KOI8-R/hardware/common/dev.xml  |   5 +
 .../ru_RU.KOI8-R/hardware/common/intro.xml    |   1 +
 .../ru_RU.KOI8-R/hardware/i386/article.xml    |  36 +++---
 .../ru_RU.KOI8-R/hardware/i386/proc-i386.xml  |   1 +
 .../ru_RU.KOI8-R/hardware/ia64/article.xml    |  36 +++---
 .../ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml  |   1 +
 .../ru_RU.KOI8-R/hardware/pc98/article.xml    |  36 +++---
 .../ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml  |   1 +
 .../ru_RU.KOI8-R/hardware/sparc64/article.xml |  33 +++---
 .../hardware/sparc64/proc-sparc64.xml         |   1 +
 .../installation/alpha/article.xml            |  30 +++--
 .../installation/amd64/article.xml            |  30 +++--
 .../installation/common/abstract.xml          |   1 +
 .../installation/common/artheader.xml         |   1 +
 .../installation/common/install.xml           |  33 +++---
 .../installation/common/layout.xml            |   7 +-
 .../installation/common/trouble.xml           |   1 +
 .../installation/common/upgrade.xml           |   1 +
 .../installation/i386/article.xml             |  30 +++--
 .../installation/ia64/article.xml             |  30 +++--
 .../installation/pc98/article.xml             |  30 +++--
 .../installation/sparc64/article.xml          |  31 +++--
 release/doc/ru_RU.KOI8-R/readme/article.xml   |  42 +++----
 .../ru_RU.KOI8-R/relnotes/alpha/article.xml   |  30 +++--
 .../ru_RU.KOI8-R/relnotes/amd64/article.xml   |  30 +++--
 .../doc/ru_RU.KOI8-R/relnotes/common/new.xml  |  23 +---
 .../ru_RU.KOI8-R/relnotes/i386/article.xml    |  30 +++--
 .../ru_RU.KOI8-R/relnotes/ia64/article.xml    |  30 +++--
 .../ru_RU.KOI8-R/relnotes/pc98/article.xml    |  30 +++--
 .../ru_RU.KOI8-R/relnotes/sparc64/article.xml |  33 +++---
 .../doc/ru_RU.KOI8-R/share/xml/catalog.xml    |  11 ++
 .../ru_RU.KOI8-R/share/xml/dev-auto-ru.xml    |   1 +
 release/doc/share/mk/doc.relnotes.mk          |  23 ++--
 release/doc/share/xml/Makefile                |   8 +-
 release/doc/share/xml/catalog.xml             |  14 +++
 release/doc/share/xml/release.ent             |  13 +++
 release/doc/zh_CN.GB2312/errata/article.xml   |  93 +++------------
 release/doc/zh_CN.GB2312/hardware/article.xml |  41 ++++---
 release/doc/zh_CN.GB2312/readme/article.xml   |  51 +++------
 release/doc/zh_CN.GB2312/relnotes/article.xml |  37 ++----
 117 files changed, 942 insertions(+), 1387 deletions(-)
 create mode 100644 release/doc/ja_JP.eucJP/share/xml/catalog.xml
 create mode 100644 release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
 create mode 100644 release/doc/share/xml/catalog.xml

diff --git a/release/doc/de_DE.ISO8859-1/early-adopter/article.xml b/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
index dac9365f436..ae4e1e8a2c1 100644
--- a/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
+++ b/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 
 <!ENTITY release.4x "4.<replaceable>X</replaceable>">
 <!ENTITY release.5x "5.<replaceable>X</replaceable>">
diff --git a/release/doc/de_DE.ISO8859-1/errata/article.xml b/release/doc/de_DE.ISO8859-1/errata/article.xml
index baaae0c8196..9d8ff3f276b 100644
--- a/release/doc/de_DE.ISO8859-1/errata/article.xml
+++ b/release/doc/de_DE.ISO8859-1/errata/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 ]>
 
 <!--
@@ -23,14 +22,7 @@
 <article lang="de">
   <articleinfo>
 
-    <title>&os;
-<![ %release.type.snapshot [
-    &release.prev;
-]]>
-<![ %release.type.release [
-    &release.current;
-]]>
-    Errata</title>
+    <title>&os; &release; Errata</title>
 
     <authorgroup>
       <corpauthor>Das &os; Projekt</corpauthor>
@@ -55,16 +47,7 @@
   </articleinfo>
 
   <abstract>
-    <para>Dieses Dokument enth&auml;lt die Errata f&uuml;r &os;
-<![ %release.type.current [
-      &release.prev;,
-]]>
-<![ %release.type.snapshot [
-      &release.prev;,
-]]>
-<![ %release.type.release [
-      &release.current;,
-]]>
+    <para>Dieses Dokument enth&auml;lt die Errata f&uuml;r &os; &release;,
       also wichtige Informationen, die kurz vor bzw. erst nach
       der Ver&ouml;ffentlichung bekannt wurden.  Dazu geh&ouml;ren
       Ratschl&auml;ge zur Sicherheit sowie &Auml;nderungen in der
@@ -73,16 +56,7 @@
       die aktuelle Version dieses Dokumentes lesen, bevor sie diese
       Version von &os; installieren.</para>
 
-    <para>Diese Errata f&uuml;r &os;
-<![ %release.type.current [
-      &release.prev;
-]]>
-<![ %release.type.snapshot [
-      &release.prev;
-]]>
-<![ %release.type.release [
-      &release.current;
-]]>
+    <para>Diese Errata f&uuml;r &os; &release;
       werden bis zum
       Erscheinen von &os; 5.1-RELEASE weiter aktualisiert
       werden.</para>
@@ -92,16 +66,7 @@
     <title>Einleitung</title>
 
     <para>Diese Errata enthalten <quote>brandhei&szlig;e</quote>
-      Informationen &uuml;ber &os;
-<![ %release.type.current [
-      &release.prev;.
-]]>
-<![ %release.type.snapshot [
-      &release.prev;.
-]]>
-<![ %release.type.release [
-      &release.current;.
-]]>
+      Informationen &uuml;ber &os; &release;.
       Bevor Sie diese
       Version installieren, sollten Sie auf jeden Fall dieses Dokument
       lesen, um &uuml;ber Probleme informiert zu werden, die erst nach
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
index 78683a951b7..1f6cb1f251f 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
index 3103b934476..55df78a8584 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml,v 1.35 2003/05/24 19:11:43 ue Exp $
@@ -392,7 +393,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>PS/2 Maus & Tastatur ODER 5pin DIN Tastatur (2
+	  <para>PS/2 Maus &amp; Tastatur ODER 5pin DIN Tastatur (2
 	    verschiedene Mainboards)</para>
 	</listitem>
 
@@ -579,7 +580,7 @@ cpu     EV4</programlisting>
 	</listitem>
 
 	<listitem>
-	  <para>Anschl&uuml;sse f&uuml;r PS/2 Maus & Tastatur</para>
+	  <para>Anschl&uuml;sse f&uuml;r PS/2 Maus &amp; Tastatur</para>
 	</listitem>
 
 	<listitem>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml b/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
index 2cb36da5c59..0126f90dace 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
 
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/dev.xml,v 1.84 2003/05/25 09:36:36 ue Exp $
@@ -1236,7 +1237,7 @@
       &man.pcn.4; Treiber)
       <itemizedlist>
 	<listitem arch="i386,alpha">
-	  <para>AMD PCnet/PCI (79c970 & 53c974 oder 79c974)</para>
+	  <para>AMD PCnet/PCI (79c970 &amp; 53c974 oder 79c974)</para>
 	</listitem>
 
 	<listitem arch="i386,alpha">
@@ -3744,7 +3745,7 @@
 	</listitem>
 
 	<listitem arch="i386,alpha">
-	  <para>CMD Tech 670 & 673</para>
+	  <para>CMD Tech 670 &amp; 673</para>
 	</listitem>
 
 	<listitem arch="i386,alpha">
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml b/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
index 8c10a150f0f..3d8babc79c7 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
index 294310bee8c..e0f86ecb77e 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
index 6fea27e7fdb..870fd1ede86 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
index fa202499638..7ec9f89b4c3 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml b/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
index e859ce17e9d..94c82b658d9 100644
--- a/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/i386/article.xml b/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
index 8428cc3402b..55bd1c5240c 100644
--- a/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml b/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
index e98d6e75e5b..e484e745c08 100644
--- a/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml b/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
index f38f37db249..392bbf000e9 100644
--- a/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
index 30da9321513..ad21743f6dd 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/de_DE.ISO8859-1/readme/article.xml b/release/doc/de_DE.ISO8859-1/readme/article.xml
index 2c255464e62..3728f993420 100644
--- a/release/doc/de_DE.ISO8859-1/readme/article.xml
+++ b/release/doc/de_DE.ISO8859-1/readme/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 ]>
 
 <!--
@@ -104,21 +103,20 @@
     <sect2>
       <title>Zielgruppe</title>
 
-<![ %release.type.current; [
-      <para>Dieser &release.type; ist prim&auml;r f&uuml;r Bastler und
+      <para releasetype="current">Dieser &release.type; ist prim&auml;r f&uuml;r Bastler und
         andere Benutzer gedacht, die sich an der laufenden Entwicklung
         von &os; beteiligen wollen.  Das Entwicklerteam von &os;
         bem&uuml;ht sich zwar, da&szlig; jeder &release.type; so
         funktioniert wie versprochen, aber &release.branch; ist nun
         einmal der Entwicklungszweig.</para>
 
-      <para>Wenn Sie einen &release.type; benutzen wollen, m&uuml;ssen
+      <para releasetype="current">Wenn Sie einen &release.type; benutzen wollen, m&uuml;ssen
 	Sie sich mit der Technik von &os; und den aktuellen
 	Vorg&auml;ngen bei der Entwicklung von &os;  &release.branch;
 	(wie sie in der Mailingliste &a.current; diskutiert werden)
 	auskennen.</para>
 
-      <para>[Anmerkung des &Uuml;bersetzers:  Auf der Mailingliste
+      <para releasetype="current">[Anmerkung des &Uuml;bersetzers:  Auf der Mailingliste
 	&a.current; wird Englisch gesprochen und die meisten Dokumente
 	sind ebenfalls in dieser Sprache verfa&szlig;t worden.  Ohne
 	gute Englischkenntnisse kommt man also nicht weit.  Allerdings
@@ -126,30 +124,28 @@
 	interessanteren Varianten, die eigenen Englisch-Kenntnisse zu
 	erweitern.]</para>
 
-      <para>Wenn Sie mehr an einem st&ouml;rungsfreien Betrieb von
+      <para releasetype="current">Wenn Sie mehr an einem st&ouml;rungsfreien Betrieb von
         &os; als an den neuesten Features von &os; interessiert sind,
         ist eine offizielle Release (wie z.B. &release.prev.stable;) die
         deutliche bessere Wahl.  Releases werden ausf&uuml;hrlich
         getestet und auf Qualit&auml;t gepr&uuml;ft, um
         Zuverl&auml;ssigkeit und Betriebssicherheit garantieren zu
         k&ouml;nnen.</para>
-]]>
 
-<![ %release.type.snapshot; [
-      <para>Dieser &release.type; ist prim&auml;r f&uuml;r Bastler und
+      <para releasetype="snapshot">Dieser &release.type; ist prim&auml;r f&uuml;r Bastler und
         andere Benutzer gedacht, die sich an der laufenden Entwicklung
         von &os; beteiligen wollen.  Das Entwicklerteam von &os;
         bem&uuml;ht sich zwar, da&szlig; jeder &release.type; so
         funktioniert wie versprochen, aber &release.branch; ist nun
         einmal der Entwicklungszweig.</para>
 
-      <para>Wenn Sie einen &release.type; benutzen wollen, m&uuml;ssen
+      <para releasetype="snapshot">Wenn Sie einen &release.type; benutzen wollen, m&uuml;ssen
 	Sie sich mit der Technik von &os; und den aktuellen
 	Vorg&auml;ngen bei der Entwicklung von &os;  &release.branch;
 	(wie sie in der Mailingliste &a.current; diskutiert werden)
 	auskennen.</para>
 
-      <para>[Anmerkung des &Uuml;bersetzers:  Auf der Mailingliste
+      <para releasetype="snapshot">[Anmerkung des &Uuml;bersetzers:  Auf der Mailingliste
 	&a.current; wird Englisch gesprochen und die meisten Dokumente
 	sind ebenfalls in dieser Sprache verfa&szlig;t worden.  Ohne
 	gute Englischkenntnisse kommt man also nicht weit.  Allerdings
@@ -157,23 +153,19 @@
 	interessanteren Varianten, die eigenen Englisch-Kenntnisse zu
 	erweitern.]</para>
 
-      <para>Wenn Sie mehr an einem st&ouml;rungsfreien Betrieb von
+      <para releasetype="snapshot">Wenn Sie mehr an einem st&ouml;rungsfreien Betrieb von
         &os; als an den neuesten Features von &os; interessiert sind,
         ist eine offizielle Release (wie z.B. &release.prev.stable;) die
         deutliche bessere Wahl.  Releases werden ausf&uuml;hrlich
         getestet und auf Qualit&auml;t gepr&uuml;ft, um
         Zuverl&auml;ssigkeit und Betriebssicherheit garantieren zu
         k&ouml;nnen.</para>
-]]>
 
-<![ %release.type.release; [
-      <para>Diese &release.type; von &os; ist f&uuml;r alle Arten von
+      <para releasetype="release">Diese &release.type; von &os; ist f&uuml;r alle Arten von
         Benutzern gedacht.  Sie wurde ausf&uuml;hrlich gepr&uuml;ft
         und getestet, um die gr&ouml;&szlig;tm&ouml;gliche
         Zuverl&auml;ssigkeit und Betriebssicherheit garantieren zu
         k&ouml;&ouml;nnen.</para>
-
-]]>
     </sect2>
   </sect1>
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
index 8dc4e549a36..c0b69a4152f 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml b/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
index 28383887c55..b407464b2ba 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
@@ -34,13 +34,8 @@
   <abstract>
     <para>Die Release Notes f&uuml;r &os; &release.current; enthalten
       eine &Uuml;bersicht &uuml;ber
-<![ %include.historic; [
-      alle &Auml;nderungen in &os; seit der Version &release.prev;.
-]]>
-<![ %no.include.historic; [
       aktuelle &Auml;nderungen in &os; im Entwicklungszweig
       &release.branch;.
-]]>
       Dieses Dokument enth&auml;lt die Liste aller Sicherheitshinweise,
       die seit der letzten Version herausgegeben wurden, sowie eine
       &Uuml;bersicht &uuml;ber die wichtigsten &Auml;nderungen am
@@ -59,9 +54,7 @@
     Sie Hinweise f&uuml;r die Aktualisierung Ihres
     &os;-Systems.</para>
 
-<![ %release.type.snapshot [
-
-  <para>Die &release.type; Distribution, f&uuml;r die diese Release
+  <para releasetype="snapshot">Die &release.type; Distribution, f&uuml;r die diese Release
     Notes g&uuml;ltig sind, markiert einen Punkt im Entwicklungszweig
     &release.branch; zwischen &release.prev; und der zuk&uuml;nftigen
     Version &release.next;.  Sie k&ouml;nnen einige fertige
@@ -69,11 +62,7 @@
     entstanden sind, auf <ulink url="&release.url;"></ulink>
     finden.</para>
 
-]]>
-
-<![ %release.type.release [
-
-  <para>Diese Distribution von &os; &release.current; ist eine
+  <para releasetype="release">Diese Distribution von &os; &release.current; ist eine
     &release.type; Distribution.  Sie k&ouml;nnen Sie von <ulink
     url="&release.url;"></ulink> und allen seinen Mirrors erhalten.
     Weitere Informationen, wie Sie diese (oder andere) &release.type;
@@ -84,8 +73,6 @@
     url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/">FreeBSD
     Handbuchs</ulink>.</para>
 
-]]>
-
   <para>Anwender, die noch keine Erfahrung mit einer &release.branch;
     Version eines &os; &release.type; haben, sollten auf jeden Fall die
     <quote>Hinweise f&uuml;r die ersten Anwender von &os;
@@ -111,21 +98,12 @@
   <title>Neuerungen</title>
 
   <para>In diesem Artikel finden Sie
-<![ %include.historic; [
-    die f&uuml;r den Anwender offensichtlichsten Neuerungen und
-    &Auml;nderungen in &os; seit &release.prev;.  Die hier
-    aufgef&uuml;hrten &Auml;nderungen sind auf &release.branch;
-    beschr&auml;nkt, sofern Sie nicht explizit als &merged;
-    gekennzeichnet sind.
-]]>
-<![ %no.include.historic; [
     viele der f&uuml;r den Anwender offensichtlichsten Neuerungen und
     &Auml;nderungen in &os; seit &release.prev;.  Dazu geh&ouml;ren
     sowohl die &Auml;nderungen, die nur &release.prev; betreffen,
     als auch &Auml;nderungen in den anderen Entwicklungszweigen
     seit &os; &release.prev;.  Letztere sind als &merged;
     gekennzeichnet.
-]]>
   </para>
 
   <para>Die Eintr&auml;ge umfassen alle Sicherheitshinweise, die nach
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
index 450d29e826b..421e2be605c 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
index 1406f2c2501..2a0b2a9e184 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
index 79a8c5a108a..8493157cc2b 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
index f2c328deafd..1c08cdfd00b 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/en_US.ISO8859-1/Makefile b/release/doc/en_US.ISO8859-1/Makefile
index 9a76627f826..82e5f334b7c 100644
--- a/release/doc/en_US.ISO8859-1/Makefile
+++ b/release/doc/en_US.ISO8859-1/Makefile
@@ -9,5 +9,8 @@ SUBDIR+= errata
 
 COMPAT_SYMLINK = en
 
+LANGCODE=en_US.ISO8859-1
+_LANGCODE=en_US.ISO8859-1
+
 .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/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index 8328f5a9766..818c93b3825 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -1,20 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
 %release;
-
-<![ %release.type.current [
-<!ENTITY release "&release.current;">
-]]>
-<![ %release.type.snapshot [
-<!ENTITY release "&release.prev;">
-]]>
-<![ %release.type.release [
-<!ENTITY release "&release.current;">
-]]>
 ]>
 
 <!--
@@ -58,16 +46,7 @@
   </articleinfo>
 
   <abstract>
-    <para>This document lists errata items for &os;
-<![ %release.type.current [
-      &release.current;,
-]]>
-<![ %release.type.snapshot [
-      &release.prev;,
-]]>
-<![ %release.type.release [
-      &release.current;,
-]]>
+    <para>This document lists errata items for &os; &release;,
       containing significant information discovered after the release
       or too late in the release cycle to be otherwise included in the
       release documentation.
@@ -77,16 +56,7 @@
       should always be consulted before installing this version of
       &os;.</para>
 
-    <para>This errata document for &os;
-<![ %release.type.current [
-      &release.current;
-]]>
-<![ %release.type.snapshot [
-      &release.prev;
-]]>
-<![ %release.type.release [
-      &release.current;
-]]>
+    <para>This errata document for &os; &release;
       will be maintained until the release of &os; &release.next;.</para>
   </abstract>
 
@@ -94,16 +64,7 @@
     <title>Introduction</title>
 
     <para>This errata document contains <quote>late-breaking news</quote>
-      about &os;
-<![ %release.type.current [
-      &release.current;.
-]]>
-<![ %release.type.snapshot [
-      &release.prev;.
-]]>
-<![ %release.type.release [
-      &release.current;.
-]]>
+      about &os; &release;
       Before installing this version, it is important to consult this
       document to learn about any post-release discoveries or problems
       that may already have been found and fixed.</para>
@@ -130,51 +91,30 @@
   <sect1 id="security">
     <title>Security Advisories</title>
 
-<![ %release.type.release [
-    <para>No advisories.</para>
-]]>
+    <para releasetype="current">No advisories.</para>
 
-<![ %release.type.current [
-    <para>No advisories.</para>
-]]>
-
-<![ %release.type.snapshot [
-    <para>No advisories.</para>
-]]>
+    <para releasetype="release">No advisories.</para>
 
+    <para releasetype="snapshot">No advisories.</para>
   </sect1>
 
   <sect1 id="open-issues">
     <title>Open Issues</title>
 
-<![ %release.type.current [
-    <para>No open issues.</para>
-]]>
+    <para releasetype="current">No open issues.</para>
 
-<![ %release.type.release [
-    <para>No open issues.</para>
-]]>
-
-<![ %release.type.snapshot [
-    <para>No open issues.</para>
-]]>
+    <para releasetype="release">No open issues.</para>
 
+    <para releasetype="snapshot">No open issues.</para>
   </sect1>
 
   <sect1 id="late-news">
     <title>Late-Breaking News</title>
 
-<![ %release.type.current [
-    <para>No news.</para>
-]]>
+    <para releasetype="current">No news.</para>
 
-<![ %release.type.release [
-    <para>No news.</para>
-]]>
+    <para releasetype="release">No news.</para>
 
-<![ %release.type.snapshot [
-    <para>No news.</para>
-]]>
+    <para releasetype="snapshot">No news.</para>
   </sect1>
-
 </article>
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.xml b/release/doc/en_US.ISO8859-1/hardware/article.xml
index 0896704441e..cb11b02f917 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.xml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.xml
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
 %release;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "nonexistent">
 %devauto;
 ]>
 
@@ -334,7 +332,7 @@
 	  <para>Apple iMac G5</para>
 	</listitem>
 	<listitem>
-	  <para>Apple Power Macintosh G3 (Blue & White)</para>
+	  <para>Apple Power Macintosh G3 (Blue &amp; White)</para>
 	</listitem>
 	<listitem>
 	  <para>Apple Power Macintosh G4</para>
@@ -535,7 +533,7 @@
       <para>The following systems are partially supported by &os;.  In
 	particular the fiber channel controllers in SBus-based systems are not
 	supported.  However, it is possible to use these with a SCSI controller
-	supported by the &man.esp.4 driver (Sun ESP SCSI, Sun FAS Fast-SCSI
+	supported by the &man.esp.4; driver (Sun ESP SCSI, Sun FAS Fast-SCSI
 	and Sun FAS366 Fast-Wide SCSI controllers).</para>
 
       <itemizedlist>
diff --git a/release/doc/en_US.ISO8859-1/readme/article.xml b/release/doc/en_US.ISO8859-1/readme/article.xml
index 90654296433..7467131c44f 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.xml
+++ b/release/doc/en_US.ISO8859-1/readme/article.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 ]>
 
 <article>
@@ -92,59 +90,46 @@
     <sect2>
       <title>Target Audience</title>
 
-<![ %release.type.current; [
-
-      <para>This &release.type; is aimed primarily at early adopters
+      <para releasetype="current">This &release.type; is aimed primarily at early adopters
 	and various other users who want to get involved with the
 	ongoing development of &os;.  While the &os; development team
 	tries its best to ensure that each &release.type; works as
 	advertised, &release.branch; is very much a
 	work-in-progress.</para>
 
-      <para>The basic requirements for using this &release.type; are
+      <para releasetype="current">The basic requirements for using this &release.type; are
 	technical proficiency with &os; and an understanding of the
 	ongoing development process of &os; &release.branch; (as
 	discussed on the &a.current;).</para>
 
-      <para>For those more interested in doing business with &os; than
+      <para releasetype="current">For those more interested in doing business with &os; than
 	in experimenting with new &os; technology, formal releases
 	(such as &release.prev.stable;) are frequently more appropriate.
 	Releases undergo a period of testing and quality assurance
 	checking to ensure high reliability and dependability.</para>
 
-]]>
-
-<![ %release.type.snapshot; [
-
-      <para>This &release.type; is aimed primarily at early adopters
+      <para releasetype="snapshot">This &release.type; is aimed primarily at early adopters
 	and various other users who want to get involved with the
 	ongoing development of &os;.  While the &os; development team
 	tries its best to ensure that each &release.type; works as
 	advertised, &release.branch; is very much a
 	work-in-progress.</para>
 
-      <para>The basic requirements for using this &release.type; are
+      <para releasetype="snapshot">The basic requirements for using this &release.type; are
 	technical proficiency with &os; and an understanding of the
 	ongoing development process of &os; &release.branch; (as
 	discussed on the &a.current;).</para>
 
-      <para>For those more interested in doing business with &os; than
+      <para releasetype="snapshot">For those more interested in doing business with &os; than
 	in experimenting with new &os; technology, formal releases
 	(such as &release.prev.stable;) are frequently more appropriate.
 	Releases undergo a period of testing and quality assurance
 	checking to ensure high reliability and dependability.</para>
 
-]]>
-
-<![ %release.type.release; [
-
-      <para>This &release.type; of &os; is suitable for all users.  It
+      <para releasetype="release">This &release.type; of &os; is suitable for all users.  It
 	has undergone a period of testing and quality assurance
 	checking to ensure the highest reliability and
 	dependability.</para>
-
-]]>
-
     </sect2>
   </sect1>
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index b393a75f1a2..60ec8ab3398 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -1,15 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-
-<!-- Text constants which probably don't need to be changed.-->
-
-<!ENTITY % include.historic "IGNORE">
-<!ENTITY % no.include.historic "IGNORE">
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 ]>
 
 <article>
@@ -64,30 +57,20 @@
     It also provides some notes on upgrading
     from previous versions of &os;.</para>
 
-<![ %release.type.current [
-
-  <para>The &release.type; distribution to which these release notes
+  <para releasetype="current">The &release.type; distribution to which these release notes
     apply represents the latest point along the &release.branch; development
     branch since &release.branch; was created.  Information regarding pre-built, binary
     &release.type; distributions along this branch
     can be found at <ulink url="&release.url;"></ulink>.</para>
 
-]]>
-
-<![ %release.type.snapshot [
-
-  <para>The &release.type; distribution to which these release notes
+  <para releasetype="snapshot">The &release.type; distribution to which these release notes
     apply represents a point along the &release.branch; development
     branch between &release.prev; and the future &release.next;.
     Information regarding
     pre-built, binary &release.type; distributions along this branch
     can be found at <ulink url="&release.url;"></ulink>.</para>
 
-]]>
-
-<![ %release.type.release [
-
-  <para>This distribution of &os; &release.current; is a
+  <para releasetype="release">This distribution of &os; &release.current; is a
     &release.type; distribution.  It can be found at <ulink
     url="&release.url;"></ulink> or any of its mirrors.  More
     information on obtaining this (or other) &release.type;
@@ -97,8 +80,6 @@
     url="&url.books.handbook;/">&os;
     Handbook</ulink>.</para>
 
-]]>
-
   <para>All users are encouraged to consult the release errata before
     installing &os;.  The errata document is updated with
     <quote>late-breaking</quote> information discovered late in the
@@ -494,11 +475,11 @@
       the <application>tzdata2008h</application> release to
       the <application>tzdata2009m</application> release.</para>
 
-    <para>The stdtime part of libc, &man.zdump.8 and &man.zic.8
+    <para>The stdtime part of libc, &man.zdump.8; and &man.zic.8;
       have been updated from the <application>tzcode2004a</application>
       release to the <application>tzcode2009h</application> release.
-      If you have upgraded from source or via the &man.freebsd-update.8,
-      then please run &man.tzsetup.8 to install a new /etc/localtime.
+      If you have upgraded from source or via the &man.freebsd-update.8;,
+      then please run &man.tzsetup.8; to install a new /etc/localtime.
       </para>
 
     <para><application>WPA Supplicant</application> has been
diff --git a/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml b/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
index 1905e705487..68af541a4ba 100644
--- a/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 
 <!ENTITY release.4x "4.<replaceable>X</replaceable>">
 <!ENTITY release.5x "5.<replaceable>X</replaceable>">
diff --git a/release/doc/fr_FR.ISO8859-1/errata/article.xml b/release/doc/fr_FR.ISO8859-1/errata/article.xml
index 7d3e38ed193..05ce10d5485 100644
--- a/release/doc/fr_FR.ISO8859-1/errata/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/errata/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 ]>
 
 <!--
@@ -63,29 +62,16 @@ jour de ce document devrait toujours 
 d'installer cette version de &os;.  
 </para>
 
-
-<![ %release.type.current [
-
-<para>Cet errata de &os; &release.prev; sera maintenu 
+<para releasetype="current">Cet errata de &os; &release.prev; sera maintenu 
 jusqu'a  &os; &release.next;.</para>
 
-]]>
-
-<![ %release.type.snapshot [
-
-<para>Cet errata de &os; &release.prev; sera maintenu 
+<para releasetype="snapshot">Cet errata de &os; &release.prev; sera maintenu 
 jusqu'a  &os; &release.next;.</para>
 
-]]>
-
-<![ %release.type.release [
-
-<para>Ceci est la version final du errat pour &os; &release.prev;. 
+<para releasetype="release">Ceci est la version final du errat pour &os; &release.prev;. 
 Les errata suivants de la branche &release.branch; se r&eacute;f&eacute;reront 
 a &os; &release.current; et les version suivantes.</para>
 
-]]>
-
 <para>Actuellement, &release.current; ne comporte aucun errata, car 
 il n'y a pas eut de version finale dans la branche &release.branch; 
 depuis le dernier changement de branche (la prochaine version finale 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
index 07004080eb7..46ad91a2764 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
index 4439eeadf8b..7d96fc4c99c 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -379,7 +380,7 @@
             ou 1 Mbyte (utilisation des puces DIL)</para>
 	  </listitem>
 	  <listitem>
-	    <para>Souris PS/2 & port clavier OU clavier 5 broches DIN
+	    <para>Souris PS/2 &amp; port clavier OU clavier 5 broches DIN
             (2 mod&egrave;les de carte m&egrave;re)</para>
 	  </listitem>
 	  <listitem>
@@ -539,7 +540,7 @@
             sont vendus avec 256kB de cache</para>
 	  </listitem>
 	  <listitem>
-            <para>port souris PS/2 & clavier</para>
+            <para>port souris PS/2 &amp; clavier</para>
 	  </listitem>
           <listitem>
             <para>m&eacute;moire:</para>
@@ -838,7 +839,7 @@
 	    <para>1 port parall&egrave;le</para>
 	  </listitem>
 	  <listitem>
-	    <para>port PS/2 clavier & souris</para>
+	    <para>port PS/2 clavier &amp; souris</para>
 	  </listitem>
 	  <listitem>
 	    <para>interface USB [MiataGL uniquement]</para>
@@ -1152,7 +1153,7 @@ cpu	EV4</programlisting>
            <para>2 16550A serial ports</para>
         </listitem>
         <listitem>
-           <para>PS/2 style keyboard & mouse</para>
+           <para>PS/2 style keyboard &amp; mouse</para>
         </listitem>
         <listitem>
            <para>floppy controller</para>
@@ -1312,15 +1313,15 @@ cpu             EV5</programlisting>
         </listitem>
         <listitem>
           <para>32 bit PCI expansion slots (3 for the AS400-series, 
-  	2 for the AS200 & 250-series)</para>
+  	2 for the AS200 &amp; 250-series)</para>
         </listitem>
         <listitem>
           <para>ISA expansion slots (4 for the AS400-series, 
-  	  2 for the AS200 & 250-series) 
+  	  2 for the AS200 &amp; 250-series) 
           (some ISA/PCI slots are physically shared)</para>
         </listitem>
         <listitem>
-          <para>embedded 21040-based Ethernet (200 & 250 series)</para>
+          <para>embedded 21040-based Ethernet (200 &amp; 250 series)</para>
         </listitem>
         <listitem>
           <para>embedded Symbios 53c810 Fast SCSI-2 chip</para>
@@ -1332,7 +1333,7 @@ cpu             EV5</programlisting>
           <para>graphics is embedded TGA or PCI VGA (model dependent)</para>
         </listitem>
         <listitem>
-          <para>16 bit sound (on 200 & 250 series)</para>
+          <para>16 bit sound (on 200 &amp; 250 series)</para>
         </listitem>
       </itemizedlist>
 
@@ -1341,14 +1342,14 @@ cpu             EV5</programlisting>
       acceptable too. EDO or 32 bit SIMMs will not work. 4, 8, 16, 32 and 
       64 Mbyte SIMMs are supported.</para>
 
-      <para>The AS200 & AS250 sound hardware is reported to work OK assuming 
+      <para>The AS200 &amp; AS250 sound hardware is reported to work OK assuming 
       you have the following line in your kernel config file:</para>
       <programlisting>device pcm</programlisting>
 
       <para>The sound device uses port 0x530, IRQ 9 and drq 0. You also need
       to specify flags 0x10011 in the <filename>device.hints</filename> file.</para>
 
-      <para>AlphaStation 200 & 250 series have an automatic SCSI terminator. 
+      <para>AlphaStation 200 &amp; 250 series have an automatic SCSI terminator. 
       This means that as soon as you plug a cable onto the external SCSI 
       connector the internal terminator of the system is disabled. It also 
       means that you should not leave unterminated cables plugged into 
@@ -1369,7 +1370,7 @@ cpu	EV4</programlisting>
     </sect3>
 
     <sect3>
-      <title>AlphaStation 500 and 600 (<quote>Alcor</quote> &
+      <title>AlphaStation 500 and 600 (<quote>Alcor</quote> &amp;
       <quote>Maverick</quote> for EV5, <quote>Bret</quote> for EV56)</title>
 
       <para>AS500 and 600 were the high-end EV5 / PCI based workstations. 
@@ -1761,7 +1762,7 @@ cpu	EV5		# depends on the CPU model installed</programlisting>
             <para>2 USB</para>
 	  </listitem>
 	  <listitem>
-            <para>PS/2 keyboard & mouse port</para>
+            <para>PS/2 keyboard &amp; mouse port</para>
 	  </listitem>
 	</itemizedlist>
 
@@ -1892,7 +1893,7 @@ cpu	EV5</programlisting>
           <para>1 parallel port</para>
 	</listitem>
 	<listitem>
-          <para>PS/2 keyboard & mouse port</para>
+          <para>PS/2 keyboard &amp; mouse port</para>
 	</listitem>
 	<listitem>
           <para>embedded 16-bit ESS ES1888 sound chip</para>
@@ -2181,7 +2182,7 @@ cpu	EV5</programlisting>
           <para>1 parallel port</para>
 	</listitem>
 	<listitem>
-          <para>PS/2 style keyboard & mouse port</para>
+          <para>PS/2 style keyboard &amp; mouse port</para>
 	</listitem>
       </itemizedlist>
 
@@ -2343,7 +2344,7 @@ cpu	EV5	#dependent on CPU model installed</programlisting>
             <para>1 parallel port</para>
 	  </listitem>
 	  <listitem>
-            <para>PS/2 style keyboard & mouse port</para>
+            <para>PS/2 style keyboard &amp; mouse port</para>
 	  </listitem>
         </itemizedlist>
 
@@ -2425,7 +2426,7 @@ cpu	EV5</programlisting>
             <para>1 parallel port</para>
 	  </listitem>
 	  <listitem>
-            <para>PS/2 style keyboard & mouse port</para>
+            <para>PS/2 style keyboard &amp; mouse port</para>
 	  </listitem>
         </itemizedlist>
 
@@ -2599,7 +2600,7 @@ cpu	EV5</programlisting>
 	    super-IO chip</para>
 	  </listitem>
 	  <listitem>
-            <para>PS/2 mouse & keyboard port</para>
+            <para>PS/2 mouse &amp; keyboard port</para>
 	  </listitem>
 	  <listitem>
             <para>memory: 168-pin PC100 unbuffered SDRAM DIMMS, 3 DIMM slots
@@ -2649,9 +2650,9 @@ cpu	EV5</programlisting>
        <para>The UP1000 needs a 400Watt ATX power supply according 
        to the manufacturer. This might be a bit overly 
        conservative/pessimistic judging from the power consumption of 
-       the board & cpu. But as always you will have to take your
+       the board &amp; cpu. But as always you will have to take your
        expansion cards and peripherals into account. The M1543C chip 
-       contains power management functionality & temperature monitoring 
+       contains power management functionality &amp; temperature monitoring 
        (via I2C / SM bus).</para>
 
        <para>Chances are that your UP1000 comes by default with 
@@ -2705,7 +2706,7 @@ cpu	EV5</programlisting>
 	    super-IO chip</para>
 	  </listitem>
 	  <listitem>
-            <para>PS/2 mouse & keyboard port</para>
+            <para>PS/2 mouse &amp; keyboard port</para>
 	  </listitem>
 	  <listitem>
             <para>memory: 168-pin PC100 unbuffered SDRAM DIMMS, 3 DIMM slots
@@ -2742,10 +2743,10 @@ cpu	EV5</programlisting>
 
       <para>The UP1100 needs a 400Watt ATX power supply according to 
       the manufacturer. This might be a bit overly conservative/pessimistic 
-      judging from the power consumption of the board & cpu. But as 
+      judging from the power consumption of the board &amp; cpu. But as 
       always you will have to take your expansion cards and 
       peripherals into account. The M1535D chip contains power
-      management functionality & temperature monitoring 
+      management functionality &amp; temperature monitoring 
       (via I2C / SM bus using a LM75 thermal sensor).</para>
 
       <para>The UP1100 has an on-board 21143 10/100Mbit Ethernet 
@@ -2796,7 +2797,7 @@ cpu	EV5</programlisting>
 	    </para>
 	  </listitem>
 	  <listitem>
-            <para>PS/2 mouse & keyboard port</para>
+            <para>PS/2 mouse &amp; keyboard port</para>
 	  </listitem>
 	  <listitem>
             <para>memory: 168-pin PC100 PLL buffered/registered SDRAM DIMMS,
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
index dec4d320b97..da960c95333 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -104,7 +105,7 @@
 		<para>Promise Fasttrak-33, -66, -100, -100 TX2/TX4, -133 TX2/TX2000</para>
 	   </listitem>
 	   <listitem>
-		<para>Promise Ultra-33, -66, -100, -133 TX2/TX2000<</para>
+		<para>Promise Ultra-33, -66, -100, -133 TX2/TX2000</para>
 	   </listitem>
 	   <listitem>
 		<para>ServerWorks ROSB4 ATA33</para>
@@ -1028,7 +1029,7 @@
     &man.lnc.4; et &man.pcn.4;)
     <itemizedlist>
         <listitem arch="i386,alpha">
-          <para>AMD PCnet/PCI (79c970 & 53c974 ou 79c974)</para>
+          <para>AMD PCnet/PCI (79c970 &amp; 53c974 ou 79c974)</para>
         </listitem>
         <listitem arch="i386,alpha">
           <para>AMD PCnet/FAST</para>
@@ -2888,7 +2889,7 @@
       </itemizedlist>
     </para>
     <para arch="pc98">Port joystick des SoundBlaster(98) (gestionnaire
-    &man.joy.4)</para>
+    &man.joy.4;)</para>
   </sect2>
   <sect2>
     <title>P&eacute;riph&eacute;riques de capture vid&eacute;o et
@@ -2954,7 +2955,7 @@
 	  <para>AMD-756</para>
 	</listitem>
         <listitem arch="i386,alpha">
-	  <para>CMD Tech 670 & 673</para>
+	  <para>CMD Tech 670 &amp; 673</para>
 	</listitem>
         <listitem arch="i386,alpha">
 	  <para>Intel 82371SB (PIIX3)</para>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
index ba475e63d50..72e5ab35206 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
index c409d8ca0d3..caf0006081a 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
@@ -37,7 +37,7 @@
   utilis&eacute; sur les PC s&eacute;ries IBM PS/2.</para>
 
   <para>Les syst&egrave;mes multi-processeurs (SMP) sont
-  g&eacute;n&eacute;rallemetn support&eacute;s par &os, mais dans certains cas,
+  g&eacute;n&eacute;rallemetn support&eacute;s par &os;, mais dans certains cas,
   des bogues du aux cartes m&egrave;res ou au BIOS peuvent poser des
   probl&egrave;mes. La lecture des archives de la liste &a.smp;
   r&eacute;soudra certains probl&egrave;mes.</para>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
index 9edb86646f2..8883182dd92 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
index 019decf4ead..620d4df27b7 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
index 5166bb128f1..5f2686d1533 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
index ba10823db0b..6d0c34102b8 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
index f434ac0874d..0435ae84234 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
diff --git a/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
index d12f9f93fac..b01afae4e27 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/install.xml b/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
index f59071c7746..0cd62a01fa3 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -123,7 +124,7 @@ from {alpha,i386}/INSTALL.TXT.
   (g&eacute;n&eacute;ralement deux) pour commencer l'installation. Cette
   section d&eacute;crit bri&egrave;vement la fa&ccedil;on de cr&eacute;er ces
   disquettes que cela soit depuis le CDROM d'installation ou depuis
-  Internet. Notez que la fa&ccedil;on la plus courante d'installer &os est
+  Internet. Notez que la fa&ccedil;on la plus courante d'installer &os; est
   par un CDROM, sur une machine supportant le d&eacute;marrage sur CDROM,
   et cette proc&eacute;dure ne sert donc &agrave; rien dans ce cas.</para>
 
@@ -649,7 +650,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
         <title>Conseils d'installation via NFS</title>
 
         <para>L'installation via NFS est tr&egrave;s simple: copiez
-        simplement les fichiers des distributions de &os, dont vous
+        simplement les fichiers des distributions de &os;, dont vous
         avez besoin quelque part sur un serveur, et faites pointer le
         m&eacute;dia de selection NFS vers lui.</para>
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml b/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
index 472e60ffeca..7c4e1d43a17 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -32,7 +33,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
     suivre les instructions. Le reste des donn&eacute;es
     n&eacute;cessaires a l'installation serontcharg&eacute;es
     automatiquement en fonction de vos s&eacute;lections. Si vous n'avez
-    jamais install&eacute; &os, pr&eacute;cedemment, il est
+    jamais install&eacute; &os;, pr&eacute;cedemment, il est
     n&eacute;cessaire de lire enti&egrave;rement ce document.</para>
 
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml b/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
index 7ef6d2da6c4..cfa22e5106c 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
index 9b015e2ec58..1b646b2f330 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
index 14dbe2e2107..fe76d81cf4c 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
index 72a809f64b4..5ee926997a3 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
index 75634ccd258..20ae05ae5bb 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -24,15 +25,8 @@
   <abstract>
   <para>Les notes de version pour &os; &release.current;
   contiennent un r&eacute;sum&eacute; des 
-
-<![ %include.historic; [
-   changements r&eacute;alis&eacute;s dans le syst&egrave;me &os; de base 
-   depuis &release.prev;. 
-]]>
-<![ %no.include.historic; [
    changements r&eacute;cents r&eacute;alis&eacute;s dans le syst&egrave;me &os; de 
    base de la branche de d&eacute;veloppement &release.branch;.
-]]>
   Les changements concernant le noyau et les programmes
   utilisateurs sont mentionn&eacute;s ainsi que les avis de
   s&eacute;curit&eacute; applicables au syst&egrave;me de base qui ont &eacute;t&eacute;
@@ -50,21 +44,15 @@
   ajout&eacute;es, modifi&eacute;es ou retir&eacute;es dans &os;. Il
   contient &eacute;galement quelques notes sur la mise &agrave; jour
   depuis la version	pr&eacute;c&eacute;dente de &os;.</para>
-<![ %release.type.snapshot [
 
-<para>La distribution snapshot &agrave; laquelle s'applique ces notes
+<para releasetype="snapshot">La distribution snapshot &agrave; laquelle s'applique ces notes
 de version repr&eacute;sente une &eacute;tape sur la branche de
 d&eacute;veloppement &release.branch; entre &release.prev; et la
 future	&release.next;. Quelques distributions binaires
 pr&eacute;-compil&eacute;es de la version snapshot pour cette branche
 sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 
-]]>
-
-
-<![ %release.type.release [
-
-  <para>Cette distribution de &os; &release.current; est une distribution
+  <para releasetype="release">Cette distribution de &os; &release.current; est une distribution
   de type &release.type;. Elle est disponible &agrave; <ulink
   url="&release.url;"></ulink> 
   ou sur un des mirroirs. Pour plus d'informations sur la faГon d'obtenir 
@@ -75,7 +63,6 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
   <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">
   guide de r&eacute;f&eacute;rence de FreeBSD</ulink>.</para>
 
-]]>
 </sect1>
 
 <!--
@@ -1646,7 +1633,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 
       <para>Lors de l'installation de &os;, taper les lignes suivantes
        au moment du prompt du gestionnaire de d&eacute;marrage peut
-       etre tr&egrave;s utile pour d&eacute;marrer pour la premi&egrave;re fois &os :</para>
+       etre tr&egrave;s utile pour d&eacute;marrer pour la premi&egrave;re fois &os;:</para>
 
       <screen><prompt>ok</prompt> <userinput>set hw.pcic.intr_path="1"</userinput>
       <prompt>ok</prompt> <userinput>set hw.pcic.irq="0"</userinput></screen>
@@ -2076,7 +2063,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
     <filename>/etc/apmd.conf</filename> pour la syntaxe. &merged;</para>
 
     <para>&man.arp.8; affiche maintenant le nom de l'interface correspondante 
-    &agrave; chaque entr&eacute;e ARP. &merged</para>
+    &agrave; chaque entr&eacute;e ARP. &merged;</para>
 
     <para>&man.arp.8; affiche maintenant <literal>[fddi]</literal> ou
     <literal>[atm]</literal> pour les adresses d'interfaces de ce type.</para>
@@ -2322,7 +2309,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 
     <para arch="i386">&man.gdb.1; supporte maintenant des points d'arrets 
     mat&eacute;riel (en utilisant les registres de d&eacute;boggage du noyau qui
-    a &eacute;t&eacute; introduit dans &os 4.0). &merged;</para>
+    a &eacute;t&eacute; introduit dans &os; 4.0). &merged;</para>
 
     <para>Les fonctions &man.getprogname.3; et  &man.setprogname.3;
     ont &eacute;t&eacute; ajout&eacute;e pour permettre de manipuler le nom du programme courant.
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
index b06d2a77ab6..ca1297f2881 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
 
 <!-- Architecture-specific customization -->
diff --git a/release/doc/ja_JP.eucJP/errata/article.xml b/release/doc/ja_JP.eucJP/errata/article.xml
index 009dbd57a07..75f334fed7c 100644
--- a/release/doc/ja_JP.eucJP/errata/article.xml
+++ b/release/doc/ja_JP.eucJP/errata/article.xml
@@ -1,3 +1,11 @@
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY release.bugfix "5.2.1-RELEASE">
+]>
+
 <!--
     FreeBSD Japanese Documentation Project
 
@@ -17,36 +25,10 @@
 
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % ja-authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//JA">
-%ja-authors;
-<!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
-%ja-mlists;
-<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
-%ja-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 release.bugfix "5.2.1-RELEASE">
-]>
-
 <article>
   <articleinfo>
 
-    <title>&os;
-<![ %release.type.current [
-    &release.current;
-]]>
-<![ %release.type.snapshot [
-    &release.prev;
-]]>
-<![ %release.type.release [
-    &release.current;
-]]>
-    Errata</title>
+    <title>&os; &release; Errata</title>
 
     <corpauthor>&os; ╔в╔М╔╦╔╖╔╞╔х</corpauthor>
 
@@ -72,16 +54,7 @@
 
   <abstract>
 
-    <para>╓Ё╓нй╦╫Я╓о &os;
-<![ %release.type.current [
-      &release.current;
-]]>
-<![ %release.type.snapshot [
-      &release.prev;
-]]>
-<![ %release.type.release [
-       &release.current;
-]]>
+    <para>╓Ё╓нй╦╫Я╓о &os; &release;
       ╓н╦ЬЁ╚╦Е╓кх╫лю╓╥╓©╫емв╓й╬ПйС║╒╓╒╓К╓╓╓о╔Й╔Й║╪╔╧╧╘дЬ╓н╫╙хв╓гх╫лю╓╥║╒
       ╔Й╔Й║╪╔╧й╦╫Я╓к╪Що©╓г╓╜╓й╓╚╓ц╓©╫емв╓й╬ПйС╓╛╫Я╓╚╓Л╓ф╓╓╓К errata ╔Й╔╧╔х (ю╣╦Ми╫) ╓г╓╧║ё
       ╓Ё╓Л╓к╓о╔╩╔╜╔Е╔Й╔ф╔ё╢╚╧П╓╙╓Х╓с║╒
@@ -90,16 +63,7 @@
       ╓Ё╓н╔п║╪╔╦╔Г╔С╓н &os; ╓Р╔╓╔С╔╧╔х║╪╔К╓╧╓Ка╟╓к╓ои╛╓╨║╒
       ╨г©╥╓н errata ╓Р╩╡╬х╓╧╓К╓Х╓╕╓к╓╥╓ф╓╞╓ю╓╣╓╓║ё</para>
 
-    <para>╓Ё╓Л╓о &os; 
-<![ %release.type.current [
-      &release.current;
-]]>
-<![ %release.type.snapshot [
-      &release.prev;
-]]>
- <![ %release.type.release [
-      &release.current;
-]]>
+    <para>╓Ё╓Л╓о &os; &release;
       мя╓н errata й╦╫Я╓г╓╧║ё&os; &release.next; ╓н╦ЬЁ╚╓ч╓г╓н╢ж║╒йщ╪И╓╣╓Л╓ч╓╧║ё</para>
 
     <para>&release.branch;
@@ -116,16 +80,7 @@
   <sect1 id="intro">
     <title>╓о╓╦╓А╓к</title>
 
-    <para>╓Ё╓н errata й╦╫Я╓к╓о &os;
-<![ %release.type.snapshot [
-      &release.prev;
-]]>
-<![ %release.type.current [
-      &release.current;
-]]>
-<![ %release.type.release [
-      &release.current;
-]]>
+    <para>╓Ё╓н errata й╦╫Я╓к╓о &os; &release;
       ╓к╢ь╓╧╓К
       <quote>╨г©╥╓н╬ЦЁ╡╬ПйС</quote> ╓╛╫Я╓╚╓Л╓ф╓╓╓ч╓╧║ё
       ╓Ё╓нй╦╫Я╓Рфи╓ъ║╒
@@ -157,49 +112,31 @@
   <sect1 id="security">
     <title>╔╩╔╜╔Е╔Й╔ф╔ё╢╚╧П</title>
 
-<![ %release.type.release [
-    <para>╔╩╔╜╔Е╔Й╔ф╔ё╢╚╧П╓ох╞╧т╓╣╓Л╓ф╓╓╓ч╓╩╓С║ё</para>
-]]>
+    <para releasetype="release">╔╩╔╜╔Е╔Й╔ф╔ё╢╚╧П╓ох╞╧т╓╣╓Л╓ф╓╓╓ч╓╩╓С║ё</para>
 
-<![ %release.type.current [
-    <para>╔╩╔╜╔Е╔Й╔ф╔ё╢╚╧П╓ох╞╧т╓╣╓Л╓ф╓╓╓ч╓╩╓С║ё</para>
-]]>
+    <para releasetype="current">╔╩╔╜╔Е╔Й╔ф╔ё╢╚╧П╓ох╞╧т╓╣╓Л╓ф╓╓╓ч╓╩╓С║ё</para>
 
-<![ %release.type.snapshot [
-    <para>╔╩╔╜╔Е╔Й╔ф╔ё╢╚╧П╓ох╞╧т╓╣╓Л╓ф╓╓╓ч╓╩╓С║ё</para>
-]]>
+    <para releasetype="snapshot">╔╩╔╜╔Е╔Й╔ф╔ё╢╚╧П╓ох╞╧т╓╣╓Л╓ф╓╓╓ч╓╩╓С║ё</para>
 
   </sect1>
 
   <sect1 id="open-issues">
     <title>л╓╡Р╥Х╓нлДбЙ</title>
 
-<![ %release.type.release [
-    <para>л╓╡Р╥Х╓нлДбЙ╓о╓╒╓Й╓ч╓╩╓С║ё</para>
-]]>
+    <para releasetype="release">л╓╡Р╥Х╓нлДбЙ╓о╓╒╓Й╓ч╓╩╓С║ё</para>
 
-<![ %release.type.current [
-    <para>л╓╡Р╥Х╓нлДбЙ╓о╓╒╓Й╓ч╓╩╓С║ё</para>
-]]>
+    <para releasetype="current">л╓╡Р╥Х╓нлДбЙ╓о╓╒╓Й╓ч╓╩╓С║ё</para>
 
-<![ %release.type.snapshot [
-    <para>л╓╡Р╥Х╓нлДбЙ╓о╓╒╓Й╓ч╓╩╓С║ё</para>
-]]>
+    <para releasetype="snapshot">л╓╡Р╥Х╓нлДбЙ╓о╓╒╓Й╓ч╓╩╓С║ё</para>
+  </sect1>
 
   <sect1 id="late-news">
     <title>╨г©╥╬ПйС</title>
 
-<![ %release.type.release [
-    <para>╬ПйС╓о╓╒╓Й╓ч╓╩╓С║ё</para>
-]]>
+    <para releasetype="release">╬ПйС╓о╓╒╓Й╓ч╓╩╓С║ё</para>
 
-<![ %release.type.current [
-    <para>╬ПйС╓о╓╒╓Й╓ч╓╩╓С║ё</para>
-]]>
+    <para releasetype="current">╬ПйС╓о╓╒╓Й╓ч╓╩╓С║ё</para>
 
-<![ %release.type.snapshot [
-    <para>╬ПйС╓о╓╒╓Й╓ч╓╩╓С║ё</para>
-]]>
+    <para releasetype="snapshot">╬ПйС╓о╓╒╓Й╓ч╓╩╓С║ё</para>
   </sect1>
-
 </article>
diff --git a/release/doc/ja_JP.eucJP/hardware/alpha/article.xml b/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
index 65c72c08c63..8ef0b4cf94d 100644
--- a/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
@@ -1,16 +1,12 @@
-<!--
-    $FreeBSD$
-    Original revision: 1.6
--->
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA">
+<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" "devauto.ja.ent">
 %devauto-ja;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
 %devauto;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
@@ -18,9 +14,13 @@
 
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
-
 ]>
 
+<!--
+    $FreeBSD$
+    Original revision: 1.6
+-->
+
 <article>
   &artheader;
   &sect.intro;
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/article.xml b/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
index 374409bb7e0..8f7910c69d0 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
@@ -1,14 +1,11 @@
-<!-- $FreeBSD$ -->
-<!-- Original revision: 1.3 -->
-
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA">
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" "devauto.ja.ent">
 %devauto-ja;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
 %devauto;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
@@ -16,9 +13,11 @@
 
 <!ENTITY arch "amd64">
 <!ENTITY arch.print "AMD64">
-
 ]>
 
+<!-- $FreeBSD$ -->
+<!-- Original revision: 1.3 -->
+
 <article>
   &artheader;
   &sect.intro;
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml
index 8741b88de97..6f20cbea214 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
     $FreeBSD$
     Original revision: 1.5
diff --git a/release/doc/ja_JP.eucJP/hardware/common/artheader.xml b/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
index b21ca826b6d..b49250dcc49 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
+++ b/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
     $FreeBSD$
     Original revision: 1.7
diff --git a/release/doc/ja_JP.eucJP/hardware/common/dev.xml b/release/doc/ja_JP.eucJP/hardware/common/dev.xml
index 65f2fb7088a..324c2fa8a14 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/dev.xml
+++ b/release/doc/ja_JP.eucJP/hardware/common/dev.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
 
 	The "Supported Devices" section of the release notes.
@@ -139,8 +140,9 @@
     &hwlist.stg;
 
     &hwlist.isp;
-
+<!--
     &hwlist.amd;
+-->
 
     &hwlist.nsp;
 
@@ -589,7 +591,9 @@
 
     &hwlist.rc;
 
+<!--
     &hwlist.sr;
+-->
 
     <!-- 2002/03/03 hrs: "enhanced" is a part of product name? -->
     <para arch="i386,amd64">Specialix SI/XIO/SX ╔ч╔К╔а╔щ║╪╔х╔╥╔Й╔╒╔К╔╚║╪╔и║ё
@@ -916,7 +920,7 @@
 
     <para arch="i386,amd64">PC ╦ъ╢╧╓н╔╦╔Г╔╓╔╧╔ф╔ё╔ц╔╞ (&man.joy.4; ╔и╔И╔╓╔п)</para>
 
-    <para arch="pc98">SoundBlaster(98) ╓н╔╦╔Г╔╓╔╧╔ф╔ё╔ц╔╞╔щ║╪╔х (&man.joy.4
+    <para arch="pc98">SoundBlaster(98) ╓н╔╦╔Г╔╓╔╧╔ф╔ё╔ц╔╞╔щ║╪╔х (&man.joy.4;
       ╔и╔И╔╓╔п)</para>
 
     <para arch="i386,pc98">PHS ╔г║╪╔©дл©╝╔╚║╪╔и/PCCARD
@@ -943,9 +947,3 @@
 
   </sect2>
 </sect1>
-<!-- 
-     Local Variables:
-     mode: sgml
-     sgml-parent-document: ("../i386/article.xml" "article" "articleinfo")
-     End:
--->
diff --git a/release/doc/ja_JP.eucJP/hardware/common/intro.xml b/release/doc/ja_JP.eucJP/hardware/common/intro.xml
index e8a2345a002..21b066a5eb7 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/intro.xml
+++ b/release/doc/ja_JP.eucJP/hardware/common/intro.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
     $FreeBSD$
     Original revision: 1.7
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/article.xml b/release/doc/ja_JP.eucJP/hardware/i386/article.xml
index 00acf40d65e..708d52cef27 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/article.xml
@@ -1,16 +1,11 @@
-<!--
-    $FreeBSD$
-    Original revision: 1.6
--->
-
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA">
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" "devauto.ja.ent">
 %devauto-ja;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
 %devauto;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
@@ -18,9 +13,13 @@
 
 <!ENTITY arch "i386">
 <!ENTITY arch.print "i386">
-
 ]>
 
+<!--
+    $FreeBSD$
+    Original revision: 1.6
+-->
+
 <article>
   &artheader;
   &sect.intro;
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml
index 2aa3fc74e1f..1c3570c86a8 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
     $FreeBSD$
     Original revision: 1.14
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/article.xml b/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
index 928734626cf..8c6f4fca811 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
@@ -1,16 +1,11 @@
-<!--
-    $FreeBSD$
-    Original revision: 1.5
--->
-
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA">
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" "devauto.ja.ent">
 %devauto-ja;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
 %devauto;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
@@ -18,9 +13,13 @@
 
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
-
 ]>
 
+<!--
+    $FreeBSD$
+    Original revision: 1.5
+-->
+
 <article>
   &artheader;
 
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml
index 47134b3c0d0..d605c70dbb7 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
     $FreeBSD$
     Original revision: 1.9
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/article.xml b/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
index ee77a3600d0..188fa76c480 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
@@ -1,16 +1,11 @@
-<!--
-    $FreeBSD$
-    Original revision: 1.3
--->
-
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA">
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" "devauto.ja.ent">
 %devauto-ja;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
 %devauto;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
@@ -18,9 +13,13 @@
 
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
-
 ]>
 
+<!--
+    $FreeBSD$
+    Original revision: 1.3
+-->
+
 <article>
   &artheader;
   &sect.intro;
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml
index 03df50efad8..b376f6041d7 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
     $FreeBSD$
     Original revision: 1.5
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml b/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
index 92e3a8f800d..c3557359c2f 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
@@ -1,16 +1,11 @@
-<!--
-    $FreeBSD$
-    Original revision: 1.5
--->
-
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA">
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" "devauto.ja.ent">
 %devauto-ja;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
 %devauto;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
@@ -20,6 +15,11 @@
 <!ENTITY arch.print "UltraSPARC">
 ]>
 
+<!--
+    $FreeBSD$
+    Original revision: 1.5
+-->
+
 <article>
   &artheader;
   &sect.intro;
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
index 209e72c419d..4e599af0495 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
     $FreeBSD$
     Original revision: 1.12
diff --git a/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml b/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
index c1afb1df7bb..e4592cf3907 100644
--- a/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "alpha">
+<!ENTITY arch.print "Alpha/AXP">
+]>
+
 <!--
     FreeBSD Japanese Documentation Project
 
@@ -6,22 +20,6 @@
     Original revision: 1.6
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "alpha">
-<!ENTITY arch.print "Alpha/AXP">
-
-]>
-
 <article>
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml b/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
index 102a998a153..4439825e8fc 100644
--- a/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
@@ -1,14 +1,9 @@
-<!--
-    $FreeBSD$
-    Original revision: 1.4
--->
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
 
@@ -16,9 +11,13 @@
 
 <!ENTITY arch "amd64">
 <!ENTITY arch.print "AMD64">
-
 ]>
 
+<!--
+    $FreeBSD$
+    Original revision: 1.4
+-->
+
 <article>
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/new.xml b/release/doc/ja_JP.eucJP/relnotes/common/new.xml
index 512adfc5b81..3637367b398 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/new.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/common/new.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!--
     FreeBSD Japanese Documentation Project
 
@@ -25,14 +26,8 @@
 
   <abstract>
     <para>╓Ё╓н &os; &release.current; мя╔Й╔Й║╪╔╧╔н║╪╔х╓к╓о║╒
-<![ %include.historic; [
-      &release.prev; ╟й╧ъ╓н &os; ╔ы║╪╔╧╔╥╔╧╔ф╔Ю╓кбп╓╧╓Кйя╧╧ею╓нЁ╣мв
-      ╓╛╢ч╓ч╓Л╓ф╓╓╓ч╓╧║ё
-]]>
-<![ %no.include.historic; [
       &release.branch; Ё╚х╞╔ж╔И╔С╔а╓н &os; ╔ы║╪╔╧╔╥╔╧╔ф╔Ю╓кбп╓╧╓К╨г╤А╓н
       йя╧╧ею╓нЁ╣мв╓╛╢ч╓ч╓Л╓ф╓╓╓ч╓╧║ё
-]]>
       &os; ╔╚║╪╔м╔К╓╙╓Х╓с╔Ф║╪╔╤║╪╔И╔С╔и╓к╓╙╓╠╓Кйя╧╧ею║╒
       а╟╓н╔Й╔Й║╪╔╧╟й╧ъ╓кх╞╧т╓╣╓Л╓©╔╩╔╜╔Е╔Й╔ф╔ё╢╚╧П╓╛╫Я╓╚╓Л╓ф╓╓╓ч╓╧║ё
       ╓ч╓©║╒╔╒╔ц╔в╔╟╔Л║╪╔и╓н╨щ╓нцМ╟уею╓Б╨э╓╩╓ф╓╒╓Й╓ч╓╧║ё</para>
@@ -47,20 +42,14 @@
     ╓Ё╓Л╓о &os; ╓к╨г╤Ади╡ц║╒йя╧╧║╒╨О╫Э╓╣╓Л╓©╣║г╫╓к╓д╓╓╓ф╡РюБ╓╥╓©╓Б╓н╓г╓╒╓Й║╒
     &os; ╓на╟╓н╔п║╪╔╦╔Г╔С╓╚╓И╓н╔╒╔ц╔в╔╟╔Л║╪╔и╓к╓д╓╓╓ф╓Б╦ю╣з╓╥╓ф╓╓╓ч╓╧║ё</para>
 
-<![ %release.type.snapshot [
-
-  <para>╓Ё╓н╔Й╔Й║╪╔╧╔н║╪╔х╓╛бп╠Ч╓╧╓К &release.type; гшишй╙╓о║╒
+  <para releasetype="snapshot">╓Ё╓н╔Й╔Й║╪╔╧╔н║╪╔х╓╛бп╠Ч╓╧╓К &release.type; гшишй╙╓о║╒
     &release.branch; Ё╚х╞╔ж╔И╔С╔а╓н &release.prev; ╓╚╓И
     ╬╜мХ╓н &release.next; ╓н╢ж╓к╟лцж╓╥╓ч╓╧║ё
     ╓Ё╓н╔ж╔И╔С╔а╓н╓╒╓И╓╚╓╦╓А╔Ё╔С╔я╔╓╔К╓╣╓Л╓©╔п╔╓╔й╔Й &release.type;
     гшишй╙╓о <ulink url="&release.url;"></ulink> ╓к╦ЬЁ╚╓╣╓Л╓ф╓╓╓ч╓╧║ё
   </para>
 
-]]>
-
-<![ %release.type.release [
-
-  <para>╓Ё╓н &os; &release.current; гшишй╙╓о &release.type; гшишй╙╓г╓╧║ё
+  <para releasetype="release">╓Ё╓н &os; &release.current; гшишй╙╓о &release.type; гшишй╙╓г╓╧║ё
     ╓Ё╓нгшишй╙╓о╓╒╓И╓Ф╓К╔ъ╔И║╪╓н <ulink url="&release.url;"></ulink>
     ╓г╦╚╓д╓╠╓К╓Ё╓х╓╛╓г╓╜╓ч╓╧║ё
     ╓Ё╓н (╓Б╓╥╓╞╓об╬╓н) &os; ╓н &release.type; гшишй╙╓Р╪Хфю╓╧╓КйЩк║
@@ -71,8 +60,6 @@
       иуо© <quote>FreeBSD ╓Р╪Хфю╓╧╓К</quote></ulink>
     ╓Р╩╡╬х╓╥╓ф╓╞╓ю╓╣╓╓║ё</para>
 
-]]>
-
   <para>&os; &release.type; ╓н &release.branch;
     ╥онС╓Р╓о╓╦╓А╓фмЬмя╓╧╓К╔Ф║╪╔╤╓о║╒╓ч╓╨ <quote>&os;
     &release.current; ╫И╢ЭмЬмя╪т╓н╪Й╟З╓╜</quote> ╓Р╓╢мВ╓╞╓ю╓╣╓╓║ё
@@ -98,19 +85,11 @@
   <title>╧╧©╥╬ПйС</title>
 
   <para>╓Ё╓нюА╓г╓о
-<![ %include.historic; [
-    &release.prev; ╟й╧ъ╓к©╥╓©╓кди╡ц║╕йя╧╧╓╣╓Л╓©
-    ╔Ф║╪╔╤╓к╠ф╤а╓╧╓К╣║г╫╓к╓д╓╓╓фюБлю╓╥╓ч╓╧║ё
-    ╟Лхле╙╓к║╒╓Ё╓Ё╓к╫Я╓╚╓Л╓ф╓╓╓Кйя╧╧ею╓н╓╕╓а &merged;
-    ╓х╓╓╓╕╟У╓ниу╓╓╓ф╓╓╓й╓╓╓Б╓н╓о &release.branch; ╓к╦гм╜╓н╓Б╓н╓г╓╧║ё
-]]>
-<![ %no.include.historic; [
     &release.prev; ╟й╧ъ╓к©╥╓©╓кди╡ц║╕йя╧╧╓╣╓Л╓©
     ╔Ф║╪╔╤╓к╠ф╤а╓╧╓К╣║г╫╓к╓д╓╓╓фюБлю╓╥╓ч╓╧║ё
     ╓Ё╓Л╓к╓об╬╓н╔ж╔И╔С╔а (&os; &release.prev; ╟й╧ъ) ╓ь╓х
     ╨г╤А╔ч║╪╔╦╓╣╓Л╓©╣║г╫╓к╡ц╓╗╓ф║╒&release.branch; ╔ж╔И╔С╔а
     ╓к╦гм╜╓н╧Юлэ╓Б╢ч╓ч╓Л╓ч╓╧║ё
-]]>
   </para>
 
   <para>╔Й╔Й║╪╔╧╔н║╪╔х╓к╓о║╒
@@ -610,7 +589,7 @@
       <para>╔ф╔И╔п╔╓╔х╔╙║╪╔ю╓н╔у╔║╔╓╔К╔╥╔╧╔ф╔Ю╓кбп╠Ч╓╧╓К╓©╓А║╒
 	<literal>statfs</literal>
 	╧╫б╓бн╓к╢ч╓ч╓Л╓К╓╓╓╞╓д╓╚╓н╔А╔С╔пйя©Т╓нбГ╓╜╓╣╓╛║╒
-	32 ╔с╔ц╔х╓╚╓И 64 ╔с╔ц╔х╓кйя╧╧╓╣╓Л╓ч╓╥╓©║ё
+	32 ╔с╔ц╔х╓╚╓И 64 ╔с╔ц╔х╓кйя╧╧╓╣╓Л╓ч╓╥╓©║ё</para>
 
       <itemizedlist>
 	<listitem>
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent b/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
index 0e76fc67639..6e946a600c1 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
+++ b/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- -*- sgml -*- -->
 
 <!--
diff --git a/release/doc/ja_JP.eucJP/relnotes/i386/article.xml b/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
index a075a64b80c..2d083611f1f 100644
--- a/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
@@ -1,3 +1,18 @@
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "i386">
+<!ENTITY arch.print "i386">
+]>
+
 <!--
     FreeBSD Japanese Documentation Project
 
@@ -6,22 +21,6 @@
     Original revision: 1.7
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "i386">
-<!ENTITY arch.print "i386">
-
-]>
-
 <article>
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml b/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
index a8517b03b56..c403e0e262b 100644
--- a/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "ia64">
+<!ENTITY arch.print "IA-64">
+]>
+
 <!--
     FreeBSD Japanese Documentation Project
 
@@ -6,22 +20,6 @@
     Original revision: 1.4
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "ia64">
-<!ENTITY arch.print "IA-64">
-
-]>
-
 <article>
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml b/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
index aead305540d..047f3049435 100644
--- a/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
@@ -1,12 +1,8 @@
-<!-- $FreeBSD$ -->
-<!-- Original revision: 1.4 -->
-
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
 
@@ -14,9 +10,11 @@
 
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
-
 ]>
 
+<!-- $FreeBSD$ -->
+<!-- Original revision: 1.4 -->
+
 <article>
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
index 10923499110..7c5d0cb8027 100644
--- a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
@@ -1,17 +1,8 @@
-<!--
-    FreeBSD Japanese Documentation Project
-
-    $FreeBSD$
-
-    Original revision: 1.6
--->
-
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
 %sections;
 
@@ -20,9 +11,16 @@
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
 <!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
-
 ]>
 
+<!--
+    FreeBSD Japanese Documentation Project
+
+    $FreeBSD$
+
+    Original revision: 1.6
+-->
+
 <article>
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/share/xml/catalog.xml b/release/doc/ja_JP.eucJP/share/xml/catalog.xml
new file mode 100644
index 00000000000..96a961d86bb
--- /dev/null
+++ b/release/doc/ja_JP.eucJP/share/xml/catalog.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <public
+        publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//JA"
+        uri="dev-auto-ja.xml"/>
+</catalog>
diff --git a/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml b/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml
index 57e4deacbb6..7e898e84e01 100644
--- a/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml
+++ b/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
 <!-- $FreeBSD$ -->
 
 <!ENTITY hwlist.62c9ec99a9ca598d738dcf66b339aa1e '&man.aac.4; ╔и╔И╔╓╔п╓╛бп╠Ч╓╥╓ф╓╓╓К╔Ё╔С╔х╔М║╪╔И╓о╟й╡╪╓н╓х╓╙╓Й╓г╓╧║ё'>
diff --git a/release/doc/ru_RU.KOI8-R/errata/article.xml b/release/doc/ru_RU.KOI8-R/errata/article.xml
index a758456e824..44d41f1fd88 100644
--- a/release/doc/ru_RU.KOI8-R/errata/article.xml
+++ b/release/doc/ru_RU.KOI8-R/errata/article.xml
@@ -1,3 +1,11 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY release.bugfix "5.2.1-RELEASE">
+]>
+
 <!--
    The FreeBSD Russian Documentation Project
 
@@ -7,28 +15,9 @@
    Original revision: 1.72
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY release.bugfix "5.2.1-RELEASE">
-]>
-
 <article lang="ru">
   <articleinfo>
-    <title>Список проблем &os;
-<![ %release.type.current [
-    &release.current;
-]]>
-<![ %release.type.snapshot [
-    &release.prev;
-]]>
-<![ %release.type.release [
-    &release.current;
-]]>
-    </title>
+    <title>Список проблем &os; &release;</title>
 
     <corpauthor>
     Проект &os;
@@ -54,16 +43,7 @@
   </articleinfo>
 
   <abstract>
-    <para>В этом документе находится список проблем &os;
-<![ %release.type.current [
-      &release.current;,
-]]>
-<![ %release.type.snapshot [
-      &release.prev;,
-]]>
-<![ %release.type.release [
-      &release.current;,
-]]>
+    <para>В этом документе находится список проблем &os; &release;,
       содержащий важную информацию, полученную после релиза или на поздней
       стадии выпуска релиза и не попавшую в документацию на релиз.
       Эта информация включает сообщения безопасности, а также новости,
@@ -71,32 +51,14 @@
       могут повлиять на использование системы.  Перед установкой этой версии
       &os; необходимо сверяться с обновленной версией этого документа.</para>
 
-    <para>Этот список проблем &os; 
-<![ %release.type.current [
-      &release.current;.
-]]>
-<![ %release.type.snapshot [
-      &release.prev;
-]]>
-<![ %release.type.release [
-      &release.current;
-]]>
+    <para>Этот список проблем &os; &release;.
       будет поддерживаться до &os; &release.next;.</para>
   </abstract>
 
   <sect1 id="intro">
     <title>Введение</title>
 
-    <para>Этот документ содержит последние новости об &os;
-<![ %release.type.current [
-      &release.current;.
-]]>
-<![ %release.type.snapshot [
-      &release.prev;.
-]]>
-<![ %release.type.release [
-      &release.current;.
-]]>
+    <para>Этот документ содержит последние новости об &os; &release;.
       Перед установкой этой версии необходимо проконсультироваться с данным
       документом для получения информации о обнаруженных после выпуска
       релиза проблемах, которые уже могли быть найдены
@@ -123,51 +85,32 @@
   <sect1 id="security">
     <title>Сообщения безопасности</title>
 
-<![ %release.type.current [
-    <para>Нет сообщений.</para>
-]]>
+    <para releasetype="current">Нет сообщений.</para>
 
-<![ %release.type.release [
-    <para>Нет сообщений.</para>
-]]>
+    <para releasetype="release">Нет сообщений.</para>
 
-<![ %release.type.snapshot [
-    <para>Нет сообщений.</para>
-]]>
+    <para releasetype="snapshot">Нет сообщений.</para>
 
   </sect1>
 
   <sect1 id="open-issues">
     <title>Актуальные проблемы</title>
 
-<![ %release.type.current [
-    <para>Нет актуальных проблем.</para>
-]]>
+    <para releasetype="current">Нет актуальных проблем.</para>
 
-<![ %release.type.release [
-    <para>Нет актуальных проблем.</para>
-]]>
+    <para releasetype="release">Нет актуальных проблем.</para>
 
-<![ %release.type.snapshot [
-    <para>Нет актуальных проблем.</para>
-]]>
+    <para releasetype="snapshot">Нет актуальных проблем.</para>
 
   </sect1>
 
   <sect1 id="late-news">
     <title>Последние новости</title>
 
-<![ %release.type.current [
-    <para>Нет новостей.</para>
-]]>
+    <para releasetype="current">Нет новостей.</para>
 
-<![ %release.type.release [
-    <para>Нет новостей.</para>
-]]>
+    <para releasetype="release">Нет новостей.</para>
 
-<![ %release.type.snapshot [
-    <para>Нет новостей.</para>
-]]>
+    <para releasetype="snapshot">Нет новостей.</para>
   </sect1>
-
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
index acf2e92ba42..16913213afc 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
+%devauto-ru;
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
+%devauto;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "alpha">
+<!ENTITY arch.print "Alpha/AXP">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,25 +24,6 @@
      Original revision: 1.6
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU">
-%devauto-ru;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
-%devauto;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "alpha">
-<!ENTITY arch.print "Alpha/AXP">
-
-]>
-
 <article lang="ru">
   &artheader;
   &sect.intro;
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
index 0654720016e..68505861f6a 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
+%devauto-ru;
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
+%devauto;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "amd64">
+<!ENTITY arch.print "AMD64">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,25 +24,6 @@
      Original revision: 1.3
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU">
-%devauto-ru;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
-%devauto;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "amd64">
-<!ENTITY arch.print "AMD64">
-
-]>
-
 <article lang="ru">
   &artheader;
   &sect.intro;
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
index a392270cdf8..9e6b349607f 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
index 8aea81f95af..4edc33b6fd3 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml b/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
index cb2ab13d342..1580d048926 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -140,7 +141,9 @@
 
     &hwlist.isp;
 
+<!--
     &hwlist.amd;
+-->
 
     &hwlist.nsp;
 
@@ -604,7 +607,9 @@
 
     &hwlist.rc;
 
+<!--
     &hwlist.sr;
+-->
 
     <para arch="i386,amd64">Specialix SI/XIO/SX многопортовые последовательные
       карты, с старым SIHOST2.x и новым <quote>расширенным</quote> (transputer
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml b/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
index 32dffe8a169..55fe779e1bb 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml b/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
index 3c38a6e5105..ad5bf8e0801 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
+%devauto-ru;
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
+%devauto;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "i386">
+<!ENTITY arch.print "i386">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,25 +24,6 @@
      Original revision: 1.6
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU">
-%devauto-ru;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
-%devauto;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "i386">
-<!ENTITY arch.print "i386">
-
-]>
-
 <article lang="ru">
   &artheader;
   &sect.intro;
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
index c3e244b8f95..d7961b7c3e4 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
index eb36ee93fce..45f1c185940 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
+%devauto-ru;
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
+%devauto;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "ia64">
+<!ENTITY arch.print "IA-64">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,25 +24,6 @@
      Original revision: 1.5
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU">
-%devauto-ru;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
-%devauto;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "ia64">
-<!ENTITY arch.print "IA-64">
-
-]>
-
 <article lang="ru">
   &artheader;
 
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
index 7b612df9301..ca70a047e03 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
index 7780d42ecaf..8caed9b18cf 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
+%devauto-ru;
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
+%devauto;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "pc98">
+<!ENTITY arch.print "NEC PC-98x1">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,25 +24,6 @@
      Original revision: 1.3
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU">
-%devauto-ru;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
-%devauto;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "pc98">
-<!ENTITY arch.print "NEC PC-98x1">
-
-]>
-
 <article lang="ru">
   &artheader;
   &sect.intro;
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
index eb4d458c379..493101f46a2 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
index d49d4c526be..377ac93663e 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
@@ -1,21 +1,11 @@
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml,v 1.6 2005/03/10 11:04:21 den Exp $
-
-     Original revision: 1.5
--->
-
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU">
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
 %devauto-ru;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
 %devauto;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
@@ -25,6 +15,15 @@
 <!ENTITY arch.print "UltraSPARC">
 ]>
 
+<!--
+     The FreeBSD Russian Documentation Project
+
+     $FreeBSD$
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml,v 1.6 2005/03/10 11:04:21 den Exp $
+
+     Original revision: 1.5
+-->
+
 <article lang="ru">
   &artheader;
   &sect.intro;
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
index 56d11f0d77a..6022026bca6 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml b/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
index e05b68022f4..18130d7f630 100644
--- a/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/install.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "alpha">
+<!ENTITY arch.print "Alpha/AXP">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,22 +21,6 @@
      Original revision: 1.4
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/install.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "alpha">
-<!ENTITY arch.print "Alpha/AXP">
-
-]>
-
 <article lang="ru">
 &artheader;
 &abstract;
diff --git a/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml b/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
index 74da35991e7..886693cb952 100644
--- a/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/install.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "amd64">
+<!ENTITY arch.print "AMD64">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,22 +21,6 @@
      Original revision: 1.2
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/install.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "amd64">
-<!ENTITY arch.print "AMD64">
-
-]>
-
 <article lang="ru">
 &artheader;
 &abstract;
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml b/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
index c2a3d9c8396..a60e98f72bb 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml b/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
index d612a17f02d..97ff87fad99 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/install.xml b/release/doc/ru_RU.KOI8-R/installation/common/install.xml
index 07de898a994..d376a164f87 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/install.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/install.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
 The FreeBSD Russian Documentation Project
 
@@ -27,7 +28,7 @@ from {alpha,i386}/INSTALL.TXT.
     с иллюстрациями.</para>
 
   <para>Если вы обновляете предыдущий релиз &os;, ознакомьтесь с
-    <xref linkend="upgrading">, где находятся инструкции по
+    <xref linkend="upgrading"/>, где находятся инструкции по
     обновлению.</para>
 
   <sect2 id="getting-started">
@@ -54,7 +55,7 @@ from {alpha,i386}/INSTALL.TXT.
       установке.</para>
 
     <para>Даже правильные действия иногда приводят к неудаче, так что
-      если вы столкнулись с проблемами, обратитесь к <xref linkend="trouble">,
+      если вы столкнулись с проблемами, обратитесь к <xref linkend="trouble"/>,
       где находится информация по решению проблем.  Вам также понадобится
       прочесть свежую копию файла <filename>ERRATA.TXT</filename> перед
       установкой, он предупредит вас о проблемах, которые были обнаружены
@@ -242,7 +243,7 @@ from {alpha,i386}/INSTALL.TXT.
 	<listitem>
 	  <para>Создайте набор загрузочных дискет &os; из каталога
 	    <filename>floppies/</filename> дистрибутива &os;.
-	    Прочтите <xref linkend="floppies"> с более
+	    Прочтите <xref linkend="floppies"/> с более
 	    подробной информацией по созданию загрузочных дискет
 	    под различными операционными системами.  Затем просто
 	    загрузитесь с первой дискеты, и вскоре начнется установка
@@ -258,7 +259,7 @@ from {alpha,i386}/INSTALL.TXT.
 	<listitem>
 	  <para>Создайте набор загрузочных дискет &os; из каталога
 	    <filename>floppies/</filename> дистрибутива &os;.
-	    Прочтите <xref linkend="floppies"> с более подробной
+	    Прочтите <xref linkend="floppies"/> с более подробной
 	    информацией по созданию загрузочных дискет под различными
 	    операционными системами.  Затем просто загрузитесь с первой
 	    дискеты, и вскоре начнется установка &os;.</para>
@@ -272,10 +273,10 @@ from {alpha,i386}/INSTALL.TXT.
       Начните установку, создав набор загрузочных дискет &os;
       из файлов <filename>floppies/boot.flp</filename> и
       <filename>floppies/kern<replaceable>X</replaceable>.flp</filename>, используя инструкции
-      в <xref linkend="floppies">.  Перезагрузите компьютер,
+      в <xref linkend="floppies"/>.  Перезагрузите компьютер,
       диск <filename>boot.flp</filename>; после запроса вставьте
       последовательно остальные диски.  Прочтите
-      <xref linkend="ftpnfs"> с дополнительной информацией по установке
+      <xref linkend="ftpnfs"/> с дополнительной информацией по установке
       через FTP или NFS.</para>
 
     <para arch="pc98">Если у вас нет CDROM, вы можете просто выполнить
@@ -283,10 +284,10 @@ from {alpha,i386}/INSTALL.TXT.
       Начните установку, создав набор загрузочных дискет &os;
       из файлов <filename>floppies/boot.flp</filename> и
       <filename>floppies/mfsroot.flp</filename>, используя инструкции
-      в <xref linkend="floppies">.  Перезагрузите компьютер,
+      в <xref linkend="floppies"/>.  Перезагрузите компьютер,
       диск <filename>kern.flp</filename>; после запроса вставьте
       последовательно остальные диски.  Прочтите
-      <xref linkend="ftpnfs"> с дополнительной информацией по установке
+      <xref linkend="ftpnfs"/> с дополнительной информацией по установке
       через FTP или NFS.</para>
 
 <!-- alpha text starts here -->
@@ -304,7 +305,7 @@ from {alpha,i386}/INSTALL.TXT.
       с дискеты.  Для начала вам потребуется создать набор загрузочных
       дискет из <filename>floppies/boot.flp</filename> и файлов
       <filename>floppies/kern<replaceable>X</replaceable>.flp</filename>, используя инструкции из
-      <xref linkend="floppies">.  Вставьте <filename>boot.flp</filename>,
+      <xref linkend="floppies"/>.  Вставьте <filename>boot.flp</filename>,
       для запуска установки из приглашения SRM консоли
       (<literal>&gt;&gt;&gt;</literal>) наберите следующую команду:</para>
 
@@ -342,8 +343,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
     <screenco arch="sparc64">
       <areaspec>
-	<area id="prompt-single" coords="1 5">
-	<area id="prompt-smp" coords="2 5">
+	<area id="prompt-single" coords="1 5"/>
+	<area id="prompt-smp" coords="2 5"/>
       </areaspec>
 
       <screen><prompt>ok     </prompt>
@@ -440,7 +441,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       <title>Установка с CDROM по сети</title>
 
       <para>Если вы просто хотите установить систему с локального привода
-	CDROM, прочтите <xref linkend="start-installation">.  Если в вашей
+	CDROM, прочтите <xref linkend="start-installation"/>.  Если в вашей
 	системе нет привода CDROM и вы хотите использовать CDROM на другой
 	системе, к которой у вас есть подключение по сети, существует
 	несколько способов чтобы сделать это:</para>
@@ -500,9 +501,9 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	дискеты.</para>
 
       <para>Сначала подготовьте дискеты, как описано в
-	<xref linkend="floppies">.</para>
+	<xref linkend="floppies"/>.</para>
 
-      <para>Затем, внимательно прочтите <xref linkend="layout"> и обратите
+      <para>Затем, внимательно прочтите <xref linkend="layout"/> и обратите
 	особое внимание на раздел <quote>Distribution Format</quote>,
 	поскольку он описывает файлы, которые необходимо поместить на
 	дискеты и те, которые вы можете пропустить.</para>
@@ -621,7 +622,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       </note>
 
       <para>Теперь создайте загрузочные дискеты, как описано в
-	<xref linkend="floppies"> и приступайте к установке.</para>
+	<xref linkend="floppies"/> и приступайте к установке.</para>
     </sect3>
 
     <sect3 id="ftpnfs">
@@ -833,7 +834,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	  <para>Если вы не видите ничего на последовательной консоли,
 	    подключите клавиатуру опять.
 	    Если вы загружаетесь с CDROM, выполните <xref
-	    linkend="hitspace"> после получения сигналов.</para>
+	    linkend="hitspace"/> после получения сигналов.</para>
 	</step>
 	<step>
 	  <para>При загрузке с дискет, после остановки чтения с диска
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/layout.xml b/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
index 8a50f61a0c5..f214261b11b 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
 	The FreeBSD Russian Documentation Project
 
@@ -29,13 +30,13 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
     на диске с установкой находится также <quote>live filesystem</quote>.
     Она полезна при восстановлении или решении проблем с существующей
     установкой &os; (обратитесь к <xref
-    linkend="trouble"> за инструкциями по ее использованию).</para>
+    linkend="trouble"/> за инструкциями по ее использованию).</para>
 
   <para>Каталог <filename>floppies</filename> представляет определенный
     интерес для пользователей, которые не могут выполнить загрузку с
     компакт-диска (но могут прочитать его содержимое.  Несложно
     создать набор 1.44Мб загрузочных дискет, воспользовавшись каталогом
-    <filename>floppies</filename> (см. <xref linkend="floppies">), и
+    <filename>floppies</filename> (см. <xref linkend="floppies"/>), и
     использовать их для запуска установки с CDROM, FTP, или NFS.
     Остальные файлы, необходимые для установки, будут
     получены автоматически на основе вашего выбора.  Если вы никогда раньше
@@ -93,7 +94,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
       <listitem>
 	<para>В каталоге <filename>floppies/</filename> находятся образы
 	  загрузочных дискет; дальнейшая информация по их использованию
-	  дана в <xref linkend="floppies">.</para>
+	  дана в <xref linkend="floppies"/>.</para>
       </listitem>
       <listitem>
 	<para>Каталоги <filename>packages</filename> и
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml b/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
index 99d65d62391..aebf96bd73b 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
 	The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
index 96c9d9659f2..a414f0af4c0 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
 	The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/i386/article.xml b/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
index d938b5995a4..6b2dbee8582 100644
--- a/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/install.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "i386">
+<!ENTITY arch.print "i386">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,22 +21,6 @@
      Original revision: 1.5
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/install.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "i386">
-<!ENTITY arch.print "i386">
-
-]>
-
 <article lang="ru">
 &artheader;
 &abstract;
diff --git a/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml b/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
index 8143fb72d15..7f59c3cca49 100644
--- a/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/install.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "ia64">
+<!ENTITY arch.print "IA-64">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,22 +21,6 @@
      Original revision: 1.2
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/install.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "ia64">
-<!ENTITY arch.print "IA-64">
-
-]>
-
 <article lang="ru">
 &artheader;
 &abstract;
diff --git a/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml b/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
index cfe7bc0e0c5..b57503ba5aa 100644
--- a/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/install.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "pc98">
+<!ENTITY arch.print "NEC PC-98x1">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,22 +21,6 @@
      Original revision: 1.2
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/install.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "pc98">
-<!ENTITY arch.print "NEC PC-98x1">
-
-]>
-
 <article lang="ru">
 &artheader;
 &abstract;
diff --git a/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
index e9186abdf0c..27380d1a1dd 100644
--- a/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
@@ -1,20 +1,8 @@
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml,v 1.5 2004/08/12 08:31:36 den Exp $
-
-     Original revision: 1.5
--->
-
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-
-<!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 <!ENTITY % sections SYSTEM "../common/install.ent">
 %sections;
 
@@ -24,6 +12,15 @@
 <!ENTITY arch.print "UltraSPARC">
 ]>
 
+<!--
+     The FreeBSD Russian Documentation Project
+
+     $FreeBSD$
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml,v 1.5 2004/08/12 08:31:36 den Exp $
+
+     Original revision: 1.5
+-->
+
 <article lang="ru">
 &artheader;
 &abstract;
diff --git a/release/doc/ru_RU.KOI8-R/readme/article.xml b/release/doc/ru_RU.KOI8-R/readme/article.xml
index 26a8bf36378..e7bf567dd33 100644
--- a/release/doc/ru_RU.KOI8-R/readme/article.xml
+++ b/release/doc/ru_RU.KOI8-R/readme/article.xml
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+]>
+
 <!--
    The FreeBSD Russian Documentation Project
 
@@ -7,14 +14,6 @@
    Original revision: 1.37
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-]>
-
 <article lang="ru">
   <articleinfo>
     <title>&os; &release.current; README</title>
@@ -97,9 +96,7 @@
     <sect2>
       <title>Целевая аудитория</title>
 
-<![ %release.type.current; [
-
-      <para>Этот дистрибутив (<quote>&release.type;</quote>) предназначен
+      <para releasetype="current">Этот дистрибутив (<quote>&release.type;</quote>) предназначен
 	в основном для предварительного ознакомления и различных
 	пользователей, желающих быть на переднем краю продолжающейся
 	разработки &os;.  Хотя команда разработки &os; прилагает все
@@ -107,21 +104,17 @@
 	предполагается, &release.branch; находится в промежуточном
 	состоянии.</para>
 
-      <para>Основное требование к использованию таких релизов это опыт
+      <para releasetype="current">Основное требование к использованию таких релизов это опыт
 	работы с &os; и понимание процесса разработки &os; &release.branch;
 	(обсуждается в списке рассылки &a.current.name;).</para>
 
-      <para>Тем, кому &os; нужна для решения конкретных задач,
+      <para releasetype="current">Тем, кому &os; нужна для решения конкретных задач,
 	а не для экспериментирования с новыми технологиями, зачастую
 	больше подходят формальные релизы (такие как
 	&release.prev.stable;).  Релизы проходят через период тестирования
 	и проверку качества, где выясняется их надежность.</para>
 
-]]>
-
-<![ %release.type.snapshot; [
-
-      <para>Этот дистрибутив (<quote>&release.type;</quote>) предназначен
+      <para releasetype="snapshot">Этот дистрибутив (<quote>&release.type;</quote>) предназначен
 	в основном для предварительного ознакомления и различных
 	пользователей, желающих быть на переднем краю продолжающейся
 	разработки &os;.  Хотя команда разработки &os; прилагает все
@@ -129,26 +122,19 @@
 	предполагается, &release.branch; находится в промежуточном
 	состоянии.</para>
 
-      <para>Основное требование к использованию снэпшотов это опыт
+      <para releasetype="snapshot">Основное требование к использованию снэпшотов это опыт
 	работы с &os; и понимание процесса разработки &os; &release.branch;
 	(обсуждается в &a.current;).</para>
 
-      <para>Тем, кому &os; нужна для решения конкретных задач,
+      <para releasetype="snapshot">Тем, кому &os; нужна для решения конкретных задач,
 	а не для экспериментирования с новыми технологиями, зачастую
 	больше подходят формальные релизы (такие как
 	&release.prev.stable;).  Релизы проходят через период тестирования
 	и проверку качества, где выясняется их надежность.</para>
 
-]]>
-
-<![ %release.type.release; [
-
-      <para>Этот дистрибутив (<quote>&release.type;</quote>) &os; подходит для
+      <para releasetype="release">Этот дистрибутив (<quote>&release.type;</quote>) &os; подходит для
 	всех пользователей.  Он прошел период тестирования и проверки
 	качества, которые подтвердили его надежность.</para>
-
-]]>
-
     </sect2>
   </sect1>
 
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
index 82fafc7a25d..04611351e92 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "alpha">
+<!ENTITY arch.print "Alpha/AXP">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,22 +21,6 @@
      Original revision: 1.6
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "alpha">
-<!ENTITY arch.print "Alpha/AXP">
-
-]>
-
 <article lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
index c1b9a58db3b..76fcd79401f 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "amd64">
+<!ENTITY arch.print "AMD64">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,22 +21,6 @@
      Original revision: 1.4
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "amd64">
-<!ENTITY arch.print "AMD64">
-
-]>
-
 <article lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml b/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
index e95711ed30c..f2c8b23419d 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -52,29 +53,19 @@
     &os;.  Он также представляет некоторые заметки по обновлению
     с предыдущей версии &os;.</para>
 
-<![ %release.type.current [
-
-  <para>Дистрибутив (&release.type;), для которого предоставлена эта
+  <para releasetype="current">Дистрибутив (&release.type;), для которого предоставлена эта
     информация, представляет собой последнюю точку на ветви разработки
     с момента создания &release.branch;.  Информацию о собранных бинарных дистрибутивах
     (&release.type;) из этой ветви можно найти на <ulink
     url="&release.url;"></ulink>.</para>
 
-]]>
-
-<![ %release.type.snapshot [
-
-  <para>Дистрибутив (&release.type;), для которого предоставлена эта
+  <para releasetype="snapshot">Дистрибутив (&release.type;), для которого предоставлена эта
     информация, представляет собой точку на ветви разработки между
     &release.prev; и будущим релизом &release.next;.   Информацию о
     собранных бинарных дистрибутивах (&release.type;) из этой ветви
     можно найти на <ulink url="&release.url;"></ulink>.</para>
 
-]]>
-
-<![ %release.type.release [
-
-  <para>Этот дистрибутив &os; &release.current; представляет собой
+  <para releasetype="release">Этот дистрибутив &os; &release.current; представляет собой
     &release.type;.  Его можно найти на <ulink
     url="&release.url;"></ulink> или на любом из зеркал.  Дополнительная
     информация по получению этого (или другого) &release.type;
@@ -86,8 +77,6 @@
     url="&url.books.handbook;/">Руководства
     &os;</ulink>.</para>
 
-]]>
-
   <para>Всем пользователям рекомендуется ознакомиться с сообщениями о
     проблемах перед установкой &os;.  В этот документ вносятся
     самая последняя информация, полученная в позже в процессе выпуска релиза
@@ -287,8 +276,8 @@
 
     <informaltable frame="none">
       <tgroup cols="2">
-	<colspec colwidth="1*">
-	<colspec colwidth="3*">
+	<colspec colwidth="1*"/>
+	<colspec colwidth="3*"/>
 	<thead>
 	  <row>
 	    <entry>Значение</entry>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
index 9609eac608f..6f4a97f1ad0 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "i386">
+<!ENTITY arch.print "i386">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,22 +21,6 @@
      Original revision: 1.7
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "i386">
-<!ENTITY arch.print "i386">
-
-]>
-
 <article lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
index 344ef0325be..5943cadc50e 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "ia64">
+<!ENTITY arch.print "IA-64">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,22 +21,6 @@
      Original revision: 1.4
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "ia64">
-<!ENTITY arch.print "IA-64">
-
-]>
-
 <article lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
index d4dad0be7ea..3750e277bf9 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "pc98">
+<!ENTITY arch.print "NEC PC-98x1">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,22 +21,6 @@
      Original revision: 1.4
 -->
 
-<!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 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "pc98">
-<!ENTITY arch.print "NEC PC-98x1">
-
-]>
-
 <article lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
index b3f33758bc0..989d486edda 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
@@ -1,3 +1,17 @@
+<?xml version="1.0" encoding="koi8-r"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent">
+%sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "sparc64">
+<!ENTITY arch.print "UltraSPARC">
+]>
+
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -7,25 +21,6 @@
      Original revision: 1.6
 -->
 
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-
-<!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
-
-<!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/relnotes.ent">
-%sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "sparc64">
-<!ENTITY arch.print "UltraSPARC">
-
-]>
-
 <article lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml b/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
new file mode 100644
index 00000000000..dd196acd6ab
--- /dev/null
+++ b/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <public
+        publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//RU"
+        uri="dev-auto-ru.xml"/>
+</catalog>
diff --git a/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml b/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml
index 5d7b4fae27c..5bc952556cf 100644
--- a/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml
+++ b/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="koi8-r"?>
 <!--
      The FreeBSD Russian Documentation Project
 
diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk
index e78c5274ef0..19247ac2610 100644
--- a/release/doc/share/mk/doc.relnotes.mk
+++ b/release/doc/share/mk/doc.relnotes.mk
@@ -2,12 +2,21 @@
 
 DOC_PREFIX?= ${RELN_ROOT}/../../../doc
 
+# XXX
+RELEASETYPE!= grep -o 'release.type "[a-z]*"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[a-z.]* "\([a-z]*\)"|\1|'
+.if ${RELEASETYPE} == "current"
+PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'current'"
+.elif ${RELEASETYPE} == "snapshot"
+PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'snapshot'"
+.elif ${RELEASETYPE} == "release"
+PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'release'"
+.endif
+
 # Find the RELNOTESng document catalogs
-EXTRA_CATALOGS+= ${RELN_ROOT}/${LANGCODE}/share/xml/catalog
-EXTRA_CATALOGS+= ${RELN_ROOT}/share/xml/catalog
+EXTRA_CATALOGS+= file://${RELN_ROOT}/${LANGCODE}/share/xml/catalog.xml \
+		file://${RELN_ROOT}/share/xml/catalog.xml
 
 # Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLHTML?=	${RELN_ROOT}/share/xml/default.dsl
 DSLPRINT?=	${RELN_ROOT}/share/xml/default.dsl
 
 #
@@ -23,7 +32,7 @@ MAN4DIR?=	${RELN_ROOT}/../../share/man/man4
 MAN4PAGES?=	${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4
 ARCHLIST?=	${RELN_ROOT}/share/misc/dev.archlist.txt
 DEV-AUTODIR=	${RELN_ROOT:S/${.CURDIR}/${.OBJDIR}/}/share/xml
-CLEANFILES+=	${DEV-AUTODIR}/dev-auto.xml ${DEV-AUTODIR}/catalog-auto
+CLEANFILES+=	${DEV-AUTODIR}/dev-auto.ent
 
 MAN2HWNOTES_CMD=${RELN_ROOT}/share/misc/man2hwnotes.pl
 .if defined(HWNOTES_MI)
@@ -33,7 +42,7 @@ MAN2HWNOTES_FLAGS=	-c
 .endif
 
 # Dependency that the article makefiles can use to pull in
-# dev-auto.xml.
-${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.xml: ${MAN4PAGES} \
+# dev-auto.ent.
+${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.ent: ${MAN4PAGES} \
 	${ARCHLIST} ${MAN2HWNOTES_CMD}
-	cd ${RELN_ROOT}/share/xml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.xml
+	cd ${RELN_ROOT}/share/xml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.ent
diff --git a/release/doc/share/xml/Makefile b/release/doc/share/xml/Makefile
index d7112ecdd6b..b2c1b6db213 100644
--- a/release/doc/share/xml/Makefile
+++ b/release/doc/share/xml/Makefile
@@ -5,11 +5,7 @@ RELN_ROOT?= ${.CURDIR}/../..
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
-dev-auto.xml: ${MAN4PAGES} ${ARCHLIST} ${MAN2HWNOTES_CMD} catalog-auto
+dev-auto.ent: ${MAN4PAGES} ${ARCHLIST} ${MAN2HWNOTES_CMD}
 	${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES}
 
-catalog-auto:
-	${ECHO_CMD} 'PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN"' \
-		'"dev-auto.xml"' > ${.TARGET}
-
-all: dev-auto.xml
+all: dev-auto.ent
diff --git a/release/doc/share/xml/catalog.xml b/release/doc/share/xml/catalog.xml
new file mode 100644
index 00000000000..b2a322fa400
--- /dev/null
+++ b/release/doc/share/xml/catalog.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <public
+        publicId="-//FreeBSD//ENTITIES Release Specification//EN"
+        uri="release.ent"/>
+  <public
+	publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//EN"
+	uri="dev-auto.ent"/>
+</catalog>
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index dcfb8971757..1d31710f3d8 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -29,11 +29,24 @@
 
 <!-- The type of release (usually this will be either "snapshot"
      or "release" -->
+<!-- WARNING: Do not forget to also change the release type in
+     doc.relnotes.mk when updating this -->
 <!ENTITY release.type "snapshot">
 <!ENTITY % release.type.current  "INCLUDE">
 <!ENTITY % release.type.snapshot "IGNORE">
 <!ENTITY % release.type.release "IGNORE">
 
+<![%release.type.current;[
+<!ENTITY release '&release.current;'>
+]]>
+<![%release.type.snapshot;[
+<!ENTITY release '&release.prev;'>
+]]>
+<![%release.type.release;[
+<!ENTITY release '&release.current;'>
+]]>
+<!ENTITY release ''>
+
 <!-- The manpaths for man page references -->
 <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">
 <!ENTITY release.manpath.xorg          "7.5.1">
diff --git a/release/doc/zh_CN.GB2312/errata/article.xml b/release/doc/zh_CN.GB2312/errata/article.xml
index c9fc0477c34..7d02ae964d6 100644
--- a/release/doc/zh_CN.GB2312/errata/article.xml
+++ b/release/doc/zh_CN.GB2312/errata/article.xml
@@ -1,21 +1,8 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-
-<!ENTITY release.bugfix "5.2.1-RELEASE">
-
-<![ %release.type.current [
-<!ENTITY release "&release.current;">
-]]>
-<![ %release.type.snapshot [
-<!ENTITY release "&release.prev;">
-]]>
-<![ %release.type.release [
-<!ENTITY release "&release.current;">
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 ]>
 
 <!--
@@ -62,16 +49,7 @@
   </articleinfo>
 
   <abstract>
-    <para>уБ╥щнд╣╣апЁЖак &os;
-<![ %release.type.current [
-      &release.current;,
-]]>
-<![ %release.type.snapshot [
-      &release.prev;,
-]]>
-<![ %release.type.release [
-      &release.current;,
-]]>
+    <para>уБ╥щнд╣╣апЁЖак &os; &release;
       ╣д©╠нСдзхщё╛
       фДжп╟Эю╗тз╥╒пп╟Ф╥╒╡╪ж╝╨С╥╒ож╣джь╢СнйлБё╛
       рт╪╟тз╥╒пп╟Ф╣д╫╩╦╤╧╓Ёл╨Сфз╠╬с╕п╢╫Ь╥╒пп╟Фнд╣╣ё╛
@@ -79,16 +57,7 @@
       рт╪╟╧ьсз©идэс╟оЛхМ╪Ч╨мнд╣╣╣д╡ывВ╩Р©исцпт╣дпбне║ё
       тз╟╡в╟╢к╟Ф╠╬╣д &os; ж╝г╟ё╛ с╕йвохтд╤а╢кнд╣╣╣двНпб╟Ф╠╬║ё</para>
 
-    <para>уБ╥щ &os;
-<![ %release.type.current [
-      &release.current;
-]]>
-<![ %release.type.snapshot [
-      &release.prev;
-]]>
-<![ %release.type.release [
-      &release.current;
-]]>
+    <para>уБ╥щ &os; &release;
       ╣д©╠нСнд╣╣╫╚ЁжпЬ╣ьн╛╩╓ё╛
       ж╠╣╫ &os; &release.next; ╥╒╡╪н╙ж╧║ё</para>
   </abstract>
@@ -96,15 +65,7 @@
   <sect1 id="intro">
     <title>╫Ииэ</title>
 
-    <para>уБ╥щ©╠нСнд╣╣╟Э╨╛ак╧ьсз &os; <![ %release.type.current [
-      &release.current;.
-]]>
-<![ %release.type.snapshot [
-      &release.prev;.
-]]>
-<![ %release.type.release [
-      &release.current;.
-]]>
+    <para>уБ╥щ©╠нСнд╣╣╟Э╨╛ак╧ьсз &os; &release;.
       ╣д <quote>вНпбжь╢Спбне</quote>║ё тз╟╡в╟уБр╩╟Ф╠╬ж╝г╟ё╛
       м╗╧Щ╡н©╪уБ╥щнд╣╣ю╢ак╫Бтз╥╒╡╪ж╝╨Сё╛
       ©идэря╬╜╥╒ож╡╒пчуЩ╣днйлБ╥гЁёжьр╙║ё</para>
@@ -128,51 +89,31 @@
   <sect1 id="security">
     <title>╟╡х╚╧╚╦Ф</title>
 
-<![ %release.type.release [
-    <para>тщнч╟╡х╚╧╚╦Ф║ё</para>
-]]>
+    <para releasetype="release">тщнч╟╡х╚╧╚╦Ф║ё</para>
 
-<![ %release.type.current [
-    <para>тщнч╟╡х╚╧╚╦Ф║ё</para>
-]]>
-
-<![ %release.type.snapshot [
-    <para>тщнч╟╡х╚╧╚╦Ф║ё</para>
-]]>
+    <para releasetype="current">тщнч╟╡х╚╧╚╦Ф║ё</para>
 
+    <para releasetype="snapshot">тщнч╟╡х╚╧╚╦Ф║ё</para>
   </sect1>
 
   <sect1 id="open-issues">
     <title>н╢╫Б╬Ж╣днйлБ</title>
 
-<![ %release.type.current [
-    <para>тщнчн╢╫Б╬Ж╣днйлБ║ё</para>
-]]>
+    <para releasetype="release">тщнчн╢╫Б╬Ж╣днйлБ║ё</para>
 
-<![ %release.type.release [
-    <para>тщнчн╢╫Б╬Ж╣днйлБ║ё</para>
-]]>
-
-<![ %release.type.snapshot [
-    <para>тщнчн╢╫Б╬Ж╣днйлБ║ё</para>
-]]>
+    <para releasetype="current">тщнчн╢╫Б╬Ж╣днйлБ║ё</para>
 
+    <para releasetype="snapshot">тщнчн╢╫Б╬Ж╣днйлБ║ё</para>
   </sect1>
 
   <sect1 id="late-news">
     <title>вНпбоШо╒</title>
 
-<![ %release.type.current [
-    <para>нчпбне║ё</para>
-]]>
+    <para releasetype="release">нчпбне║ё</para>
 
-<![ %release.type.release [
-    <para>нчпбне║ё</para>
-]]>
+    <para releasetype="current">нчпбне║ё</para>
 
-<![ %release.type.snapshot [
-    <para>нчпбне║ё</para>
-]]>
+    <para releasetype="snapshot">нчпбне║ё</para>
   </sect1>
 
 </article>
diff --git a/release/doc/zh_CN.GB2312/hardware/article.xml b/release/doc/zh_CN.GB2312/hardware/article.xml
index 676e0cec4fb..dcb37f4960a 100644
--- a/release/doc/zh_CN.GB2312/hardware/article.xml
+++ b/release/doc/zh_CN.GB2312/hardware/article.xml
@@ -1,15 +1,10 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
+<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
 %devauto;
-
-<!-- Text constants which probably don't need to be changed.-->
 ]>
 
 <article>
@@ -131,13 +126,13 @@
     ╡╩╧Щё╛уБюО╦ЬЁЖакр╩п╘р╩╟Ц╣дж╦╣╪т╜тР║ё</para>
 
   <para>╪╦╨УкЫсп╣д╟Э╨╛╦║╣ЦтккЦ╣╔т╙╣д &i386;-╪Фхщ ╢╕юМфВ╤╪дэ╠╩╨э╨ц╣ьж╖Ёж║ё
-    &os ж╖Ёж╢с 80486 ©╙й╪╣дкЫсп
+    &os; ж╖Ёж╢с 80486 ©╙й╪╣дкЫсп
     &intel; ╢╕юМфВё╛ уБ╟Эю╗ 80486║╒ &pentium;║╒ &pentium; Pro║╒ &pentium; II║╒ &pentium; III║╒
     &pentium; 4ё╛ рт╪╟уБп╘╢╕юМфВ╣д╦Вжж╠ДлЕё╛ хГ &xeon; ╨м &celeron;
     ╢╕юМфВ║ё ЁЩ╢кж╝мБё╛ кЫсп &i386;-╪Фхщ╣д AMD
     ╢╕юМфВр╡╤╪╠╩ж╖Ёжё╛ уБ╟Эю╗ &am486;║╒ &am5x86;║╒ K5║╒ &amd.k6;
     (╪╟фД╠ДлЕ)║╒ &amd.athlon; (╟Эю╗ Athlon-MP║╒ Athlon-XP║╒ Athlon-4║╒
-    рт╪╟ Athlon Thunderbird)ё╛ рт╪╟ &amd.duron; ╢╕юМфВ║ё аМмБё╛ &os ╩╧ж╖Ёж AMD
+    рт╪╟ Athlon Thunderbird)ё╛ рт╪╟ &amd.duron; ╢╕юМфВ║ё аМмБё╛ &os; ╩╧ж╖Ёж AMD
     &Eacute;lan SC520 г╤хКй╫╢╕юМфВ║ё Transmeta
     Crusoe дэ╧╩╠╩й╤╠П╡╒ж╖Ёжё╛ юЮкф╣ь╩╧сп Cyrix ╨м NexGen жфтЛ╣дфДкШ &i386;-╪Фхщ╢╕юМфВ║ё</para>
 
@@ -427,7 +422,7 @@
 <sect1 id="support">
   <title>ж╖Ёж╣дс╡╪Ч</title>
 
-  <para>уБр╩╫зцХйЖакд©г╟ряж╙╣д &os ж╖Ёж╣дс╡╪Ч║ё
+  <para>уБр╩╫зцХйЖакд©г╟ряж╙╣д &os; ж╖Ёж╣дс╡╪Ч║ё
   фДкШеДжц©идэр╡дэсцё╛ ж╩йгипн╢╡Бйт╧Щ║ё
   нрцг╧дюЬдЗ╤туБ╥щап╠М╣ддзхщ╫Ьпп╥╢ю║║╒ ╦Эпб╨мпчуЩ║ё</para>
 
@@ -469,7 +464,9 @@
 
     &hwlist.aic;
 
+<!--
     &hwlist.amd;
+-->
 
     &hwlist.amr;
 
@@ -668,7 +665,7 @@
 
     &hwlist.tl;
 
-    <para>[&arch.amd64;, &arch.i386, &arch.pc98;] ╩Ысз SMC 83c17x (EPIC) ╣дртл╚мЬ NIC (&man.tx.4; гЩ╤╞ЁлпР)
+    <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] ╩Ысз SMC 83c17x (EPIC) ╣дртл╚мЬ NIC (&man.tx.4; гЩ╤╞ЁлпР)
     </para>
 
     &hwlist.txp;
@@ -691,23 +688,23 @@
 
   <sect2 id="fddi">
     <title>FDDI ╫с©з</title>
-    <para>[&arch.i386, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4; гЩ╤╞ЁлпР)</para>
+    <para>[&arch.i386;, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4; гЩ╤╞ЁлпР)</para>
     <para>[&arch.i386;] DEC DEFEA EISA (&man.fpa.4; гЩ╤╞ЁлпР)</para>
   </sect2>
 
   <sect2 id="atm">
     <title>ATM ╫с©з</title>
 
-    <para>[&arch.i386, &arch.pc98;] ╩Ысз Midway ╣д ATM ╫с©з (&man.en.4;
+    <para>[&arch.i386;, &arch.pc98;] ╩Ысз Midway ╣д ATM ╫с©з (&man.en.4;
       гЩ╤╞ЁлпР)</para>
 
-    <para>[&arch.i386, &arch.pc98; &arch.sparc64;] FORE Systems, Inc. PCA-200E ATM PCI
+    <para>[&arch.i386;, &arch.pc98; &arch.sparc64;] FORE Systems, Inc. PCA-200E ATM PCI
       ййеДфВ (hfa ╨м &man.fatm.4; гЩ╤╞ЁлпР)</para>
 
     <para>[&arch.i386;, &arch.pc98;] ╩Ысз IDT NICStAR 77201/211 ╣д ATM ййеДфВ (&man.idt.4;
     гЩ╤╞ЁлпР)</para>
 
-    <para>[&arch.i386, &arch.pc98; &arch.sparc64;] FORE Systems, Inc. HE155 ╨м HE622
+    <para>[&arch.i386;, &arch.pc98; &arch.sparc64;] FORE Systems, Inc. HE155 ╨м HE622
       ATM ╫с©з (&man.hatm.4; гЩ╤╞ЁлпР)</para>
 
     <para>[&arch.i386;, &arch.pc98;] ╩Ысз IDT77252 ╣д ATM ©╗ (&man.patm.4;
@@ -909,7 +906,7 @@
     <para>[&arch.i386;] DigiBoard жгдэ╢╝©з©╗ (digi гЩ╤╞ЁлпР)
     </para>
 
-    <para>[&arch.amd64;, &arch.i386, &arch.ia64;] ╩Ысз PCI ╣д╤Ю©з╢╝©з╟Е (&man.puc.4;
+    <para>[&arch.amd64;, &arch.i386;, &arch.ia64;] ╩Ысз PCI ╣д╤Ю©з╢╝©з╟Е (&man.puc.4;
     гЩ╤╞ЁлпР)
       <itemizedlist>
 	<listitem>
@@ -986,7 +983,9 @@
 
     &hwlist.rc;
 
+<!--
     &hwlist.sr;
+-->
 
     <para>[&arch.i386;, &arch.amd64;] ж╖Ёж Specialix SI/XIO/SX ╤Ю©з╢╝©з©╗, м╛й╠╟Эю╗╫о╬и╣д
     SIHOST2.x рт╪╟ <quote>тЖг©пм</quote> (╩Ысз transputerё╛
@@ -1172,7 +1171,7 @@
     </para>
     <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] ╪Эел (&man.ukbd.4; гЩ╤╞ЁлпР)
     </para>
-    <para>[&arch.amd64;, &arch.i386, &arch.pc98;] фДкШ
+    <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] фДкШ
       <itemizedlist>
         <listitem>
 	  <para>Assist Computer Systems PC Camera C-M1</para>
diff --git a/release/doc/zh_CN.GB2312/readme/article.xml b/release/doc/zh_CN.GB2312/readme/article.xml
index 177b2b8d3f4..b76e4a99de7 100644
--- a/release/doc/zh_CN.GB2312/readme/article.xml
+++ b/release/doc/zh_CN.GB2312/readme/article.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 ]>
 
 <!--
@@ -92,70 +90,53 @@
     <sect2>
       <title>д©╠Йсц╩╖</title>
 
-<![ %release.type.current; [
-
-      <para>&release.type; жВр╙йгуК╤т╦╩сзц╟оу╬╚иЯё╛
+      <para releasetype="current">&release.type; жВр╙йгуК╤т╦╩сзц╟оу╬╚иЯё╛
 	рт╪╟дгп╘оёмШ╡нсКобр╩╡╫╣д &os; ©╙╥╒╣дсц╩╖║ё
 	╬║╧э  &os; ©╙╥╒ме╤с╬║вН╢Се╛а╕ю╢х╥╠ёц©р╩╦Ж
 	&release.type; дэ╧╩оЯкЫпШ╢╚╣ддгяЫткппё╛
 	&release.branch; хтх╩╢╕сз©╙╥╒╧ЩЁлжп║ё</para>
 
-      <para>й╧сцуБ╦Ж &release.type; ╣д╩Ы╠╬р╙гСйг╬╚м╗ &os;
+      <para releasetype="current">й╧сцуБ╦Ж &release.type; ╣д╩Ы╠╬р╙гСйг╬╚м╗ &os;
 	╡╒грюМ╫БуЩтз╫Ьпп╣д &os; &release.branch; ©╙╥╒╫ЬЁл
 	(тз &a.current;жплжбш)║ё</para>
 
-      <para>╤тсздгп╘╤ттзилр╣жпй╧сц &os; ╤Ь╡╩йглЕяИпб╣д &os;
+      <para releasetype="current">╤тсздгп╘╤ттзилр╣жпй╧сц &os; ╤Ь╡╩йглЕяИпб╣д &os;
 	╪╪йУ╦ппкх╓╣дхкю╢к╣ё╛уЩй╫╣д╥╒пп╟Ф
 	(╠ххГ &release.prev.stable;) мЫмЫ╦Э╨ойй║ё
 	уБп╘╟Ф╠╬╬╜юЗакр╩╤╗й╠фз╣д╡Бйт╨мжйа©╠ёж╓╪Л╡Бю╢х╥╠ё╦ъ©исцпт╨м©и©©пт║ё</para>
 
-]]>
-
-<![ %release.type.current; [
-
-      <para>уБ╦Ж &release.type; жВр╙уК╤тв╥гСвНпб╧╕дэё╛
+      <para releasetype="current">уБ╦Ж &release.type; жВр╙уК╤тв╥гСвНпб╧╕дэё╛
 	рт╪╟оёмШ╡нсКуЩтз╫Ьпп╣д &os; ©╙╥╒╩Н╤╞╣дсц╩╖║ё ╬║╧э &os;
 	╣д©╙╥╒ме╤с╩А╬║вН╢Се╛а╕х╥╠ёц©р╩╦Ж &release.type;
 	╤╪дэ╧╩хГпШ╢╚╣ддгяЫ╧╓вВё╛ ╣╚ &release.branch; хтх╩йгр╩╦Ж©╙╥╒жп╣д╥жж╖║ё</para>
 
-      <para>й╧сцуБ╦Ж &release.type; ╣д╩Ы╠╬р╙гСйг╤т &os; ╪╪йУ╣дйЛа╥птё╛
+      <para releasetype="current">й╧сцуБ╦Ж &release.type; ╣д╩Ы╠╬р╙гСйг╤т &os; ╪╪йУ╣дйЛа╥птё╛
 	рт╪╟╤туЩтз╫Ьпп╣д &os; &release.branch; ©╙╥╒╧ЩЁл╣дюМ╫Б (уБп╘ё╛
 	╤╪╩Атз &a.current; жп╫Ьпплжбш)║ё</para>
 
-      <para>╤тсздгп╘оёмШсц &os; ю╢╢╕юМхуЁёр╣нЯё╛
+      <para releasetype="current">╤тсздгп╘оёмШсц &os; ю╢╢╕юМхуЁёр╣нЯё╛
 	╤Ь╡╩йгЁ╒йтвНпб &os; ╪╪йУ╣дсц╩╖ю╢к╣ё╛ уЩй╫╣д╥╒пп╟Ф╠╬
 	(юЩхГ &release.prev.stable;) м╗Ёё╦Эн╙╨ойй║ё
 	╥╒пп╟Ф╠╬╬╜╧Щакр╩╤нй╠╪Д╣д╡Бйт╨мжйа©╠ёуо╪Л╡Иё╛
 	ртх╥╠ёфД╦ъ©и©©пт║ё</para>
 
-]]>
-
-<![ %release.type.snapshot; [
-
-      <para>&release.type; жВр╙д©╠Ййгспц╟оу╬╚иЯ╣дё╛
+      <para releasetype="snapshot">&release.type; жВр╙д©╠Ййгспц╟оу╬╚иЯ╣дё╛
 	рт╪╟оК╡нсКуЩтз╫Ьпп╣д &os; ©╙╥╒╣дсц╩╖║ё
 	╬║╧э &os; ©╙╥╒ме╤с╬║вН╢Се╛а╕ю╢х╥╠ёц©р╩╦Ж
 	&release.type; дэ╧╩оЯкЫпШ╢╚╣ддгяЫткппё╛
 	&release.branch; хтх╩╢╕сз©╙╥╒╧ЩЁлжп║ё</para>
 
-      <para>й╧сцуБ╦Ж &release.type; ╣д╩Ы╠╬р╙гСйг╬╚м╗
+      <para releasetype="snapshot">й╧сцуБ╦Ж &release.type; ╣д╩Ы╠╬р╙гСйг╬╚м╗
 	&os; ╡╒грюМ╫БуЩтз╫Ьпп╣д &os; &release.branch;
 	©╙╥╒╫ЬЁл (тз &a.current; жплжбш)║ё</para>
 
-      <para>╤тсздгп╘╤ттзилр╣жпй╧сц &os; ╤Ь╡╩йглЕяИпб╣д &os;
+      <para releasetype="snapshot">╤тсздгп╘╤ттзилр╣жпй╧сц &os; ╤Ь╡╩йглЕяИпб╣д &os;
 	╪╪йУ╦ппкх╓╣дхкю╢к╣ё╛уЩй╫╣д╥╒пп╟Ф
 	(╠ххГ &release.prev.stable;) мЫмЫ╦Э╨ойй║ё
 	уБп╘╟Ф╠╬╬╜юЗакр╩╤╗й╠фз╣д╡Бйт╨мжйа©╠ёж╓╪Л╡Бю╢х╥╠ё╦ъ©исцпт╨м©и©©пт║ё</para>
 
-]]>
-
-<![ %release.type.release; [
-
-      <para>&os; ╣дуБ╦Ж &release.type; ййсцсзкЫспсц╩╖║ё
+      <para releasetype="release">&os; ╣дуБ╦Ж &release.type; ййсцсзкЫспсц╩╖║ё
 	кЭ╬╜юЗакр╩╤╗й╠фз╣д╡Бйт╨мжйа©╪Л╡Бю╢х╥╠ёвН╦ъ╣д©исцпт╨м©и©©пт║ё</para>
-
-]]>
-
     </sect2>
   </sect1>
 
@@ -200,7 +181,7 @@
       <para>нрцг╥гЁё╩╤с╜дЗ╫╗а╒пб╣д╬╣оЯу╬╣Ц║ё а╙о╣
 	<email>freebsd-admin@FreeBSD.org</email> ак╫БЁин╙╧ы╥╫╬╣оЯу╬╣Ц╣д╦Э╤Юо╦╫з║ё
 	р╡©ирттз<ulink
-        URL="&url.articles.hubs;/">хГ╨нн╙ &os; вЖ╬╣оЯу╬╣Ц</ulink>
+        url="&url.articles.hubs;/">хГ╨нн╙ &os; вЖ╬╣оЯу╬╣Ц</ulink>
         уБф╙ндубжпур╣╫╧ьсз╬╣оЯу╬╣Ц╣д╦Э╤Юспсц╣дпео╒║ё</para>
 
       <para>╬╣оЯу╬╣Цм╗Ёё╩АлА╧╘сцсз©лб╪ &os; ╥╒пп╟Ф╠╬╣д CDROM
diff --git a/release/doc/zh_CN.GB2312/relnotes/article.xml b/release/doc/zh_CN.GB2312/relnotes/article.xml
index e370971ae2f..ce6a2bded9e 100644
--- a/release/doc/zh_CN.GB2312/relnotes/article.xml
+++ b/release/doc/zh_CN.GB2312/relnotes/article.xml
@@ -1,17 +1,8 @@
-<?xml version="1.0" encoding="gb2312" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-
-<!-- The FreeBSD Simplified Chinese Project -->
-<!-- Original Revision: 182873 -->
-<!-- Text constants which probably don't need to be changed.-->
-
-<!ENTITY % include.historic "IGNORE">
-<!ENTITY % no.include.historic "IGNORE">
+<?xml version="1.0" encoding="gb2312"?>
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
+        "../../../share/xml/freebsd45.dtd" [
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
+ %release;
 ]>
 
 <article>
@@ -61,28 +52,18 @@
     пч╦д╩Ри╬ЁЩак╣д &os; льпт╣дк╣цВ║ё м╛й╠ё╛
     кЭр╡╫╚╦ЬЁЖхГ╨н╢сохг╟╣д &os; ╟Ф╠╬мЙЁииЩ╪╤╣дк╣цВ║ё</para>
 
-<![ %release.type.current [
-
-  <para>уБф╙нд╣╣кЫ╫Ииэ╣д &release.type; хМ╪Ч╟Эё╛
+  <para releasetype="current">уБф╙нд╣╣кЫ╫Ииэ╣д &release.type; хМ╪Ч╟Эё╛
     ╫Ииэак &release.branch; ©╙╥╒╥жж╖вт &release.branch;
     ╢╢╫╗ртю╢╣д╫Ьу╧║ё ╧ьсзуБр╩╥жж╖иот╓╠ЮрК╣д║╒ ╤Ч╫Ьжф╟Ф╠╬╣д
     &release.type; хМ╪Ч╟Эё╛ ©ирттз <ulink url="&release.url;"></ulink>
     ур╣╫║ё</para>
 
-]]>
-
-<![ %release.type.snapshot [
-
-  <para>уБ╥щк╣цВкЫк╣╣д &release.type; ╟Ф╠╬ё╛
+  <para releasetype="snapshot">уБ╥щк╣цВкЫк╣╣д &release.type; ╟Ф╠╬ё╛
     йгтз &release.branch; ©╙╥╒╥жж╖ио &release.prev; ╣╫н╢ю╢╣д &release.next;
     ио╣др╩╣Ц║ё уБр╩©╙╥╒╥жж╖иот╓╠ЮрК╣д╤Ч╫Ьжфпнй╫╣д &release.type;
     ╟╡в╟╟Эё╛ ©ирттз <ulink url="&release.url;"></ulink> ур╣╫║ё</para>
 
-]]>
-
-<![ %release.type.release [
-
-  <para>уБйгр╩╥щ &os; &release.current; ╣д
+  <para releasetype="release">уБйгр╩╥щ &os; &release.current; ╣д
     &release.type; ╥╒╡╪╟Э║ё дЗ©ирт╢с <ulink
     url="&release.url;"></ulink> ╩РфДкШ╬╣оЯдгюО╣ц╣╫кЭ╣д╦╠╠╬║ё
     ╧ьсзуБ╦Ж (╩РфДкШ) &release.type; ╥╒╡╪╟Э╣д╦Э╤Юпео╒ё╛©ирттз
@@ -90,8 +71,6 @@
     жп╣д <ulink url="&url.books.handbook;/mirrors.html"><quote>хГ╨н╩Я╣ц
     &os;</quote>╦╫б╪</ulink> жпур╣╫║ё</para>
 
-]]>
-
   <para>нрцг╧дюЬкЫсп╣дсц╩╖тз©╙й╪╟╡в╟ &os;
     ж╝г╟йвох╡н©╪уБр╩╟Ф╠╬кЫ╤тс╕╣д©╠нСпео╒║ё
     ©╠нСнд╣╣╫╚кФй╠╦Эпбё╛рт╠Цн╙сц╩╖лА╧╘тз╥╒╡╪╧╓Ёл╨Сфз╩Р╦ц╟Ф╠╬╥╒╡╪ж╝╨С