236 files changed, 476 insertions, 471 deletions

diff --git a/release/doc/Makefile b/release/doc/Makefile
index 787ec93ecbdfa..18d4d8f641040 100644
--- a/release/doc/Makefile
+++ b/release/doc/Makefile
@@ -8,7 +8,7 @@ SUBDIR+= 	${RELNOTES_LANG}
 .else
 SUBDIR+=	en_US.ISO8859-1
 .endif
-SUBDIR+=	share/sgml
+SUBDIR+=	share/xml
 
 RELN_ROOT?= ${.CURDIR}
 
diff --git a/release/doc/README b/release/doc/README
index b57b10a671d59..93cc12b401547 100644
--- a/release/doc/README
+++ b/release/doc/README
@@ -24,34 +24,34 @@ share/mk/doc.relnotes.mk
 	Common Makefile definitions for RELNOTESng.  These definitions
 	mostly accommodate the fact that we're building DocProj-like
 	documents outside the doc/ tree.
-share/sgml/catalog
+share/xml/catalog
 	Main SGML catalog for all language-neutral (and default EN)
 	stylesheet and entity files.  Can be overridden if needed for
 	translations.
-share/sgml/default.dsl
+share/xml/default.dsl
 	All documents build with this file as a stylesheet.  All it
 	does is to make it possible to use the document catalogs to
 	locate the "real" stylesheet by reference, rather than having
 	to specify it by pathname.
-share/sgml/release.dsl
+share/xml/release.dsl
 	Language-neutral stylesheet.  This stylesheet supports
 	the arch= attribute on (all?) DocBook elements; elements with
 	an arch= attribute are only included in the output if their
 	value is equal to the value of the &arch; entity.  In the
 	future, arch= could be a list of possible &arch; entity values
 	that match, such as "i386,sparc64".
-share/sgml/release.ent
+share/xml/release.ent
 	Release information.  Need to update the entry definitions in
 	this file when rolling new revisions; these should take effect
 	in all documents.
 
-en_US.ISO8859-1/share/sgml/release.dsl
+en_US.ISO8859-1/share/xml/release.dsl
 	Language-dependent stylesheet for en, but also the default for
 	translations if they don't override the settings here.  This
 	stylesheet sets the email footer at the bottom of HTML pages,
 	as well as a few other parameters.  If necessary for
 	translations, this file can be overridden with
-	*/share/sgml/release.dsl and */share/sgml/catalog.
+	*/share/xml/release.dsl and */share/xml/catalog.
 
 */relnotes/common/
 	Directory for multi-architecture release notes files.
@@ -88,7 +88,7 @@ tree.  For example:
 	 % make DOC_PREFIX=/usr/doc all
 
 All definition of the "current" version of FreeBSD is contained in the
-share/sgml/release.ent file; release engineers should peruse the
+share/xml/release.ent file; release engineers should peruse the
 contents of this file carefully when doing version number bumps.
 
 When creating content for the architecture-dependent files, authors
@@ -108,9 +108,9 @@ When creating a translation, make a new directory under this
 directory with a language code (paralleling the DocProj directory
 structure).  If necessary, new language-dependent HTML footers can be
 generated by making a new language-dependent
-${LANG}/share/sgml/release.dsl, a ${LANG}/share/sgml/catalog that
+${LANG}/share/xml/release.dsl, a ${LANG}/share/xml/catalog that
 points to it, and a new definition in the Makefiles that adds
-${LANG}/share/sgml/catalog to EXTRA_CATALOGS.  Except for the Makefile
+${LANG}/share/xml/catalog to EXTRA_CATALOGS.  Except for the Makefile
 changes, this is the same procedure that is used for creating a new
 translation for DocProj files.
 
diff --git a/release/doc/de_DE.ISO8859-1/early-adopter/Makefile b/release/doc/de_DE.ISO8859-1/early-adopter/Makefile
index 8019ccac94ddc..7fd0b200d8268 100644
--- a/release/doc/de_DE.ISO8859-1/early-adopter/Makefile
+++ b/release/doc/de_DE.ISO8859-1/early-adopter/Makefile
@@ -17,7 +17,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS+= article.sgml
+SRCS+= article.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml b/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
index a755ff92f3672..dac9365f436b4 100644
--- a/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
@@ -13,7 +13,7 @@
   The FreeBSD Documentation Project
   The FreeBSD German Documentation Project
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.24 2003/05/25 12:44:41 mheinen Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/early-adopter/article.xml,v 1.24 2003/05/25 12:44:41 mheinen Exp $
   basiert auf: 1.15
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/errata/Makefile b/release/doc/de_DE.ISO8859-1/errata/Makefile
index de5344dfeec16..b254368ac2f52 100644
--- a/release/doc/de_DE.ISO8859-1/errata/Makefile
+++ b/release/doc/de_DE.ISO8859-1/errata/Makefile
@@ -16,7 +16,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/errata/article.sgml b/release/doc/de_DE.ISO8859-1/errata/article.xml
index 3001286617704..baaae0c8196e1 100644
--- a/release/doc/de_DE.ISO8859-1/errata/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/errata/article.xml
@@ -16,7 +16,7 @@
 	(If we didn't do this, then the file with the datestamp might
 	not be the one that received the last change in the document.)
 
-	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/errata/article.sgml,v 1.39 2003/05/24 13:23:46 ue Exp $
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/errata/article.xml,v 1.39 2003/05/24 13:23:46 ue Exp $
 	basiert auf: 1.38
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile b/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile
index 7b97c3801700e..535c079f6010e 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile
@@ -13,11 +13,11 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=    -V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	proc-alpha.sgml
+SRCS+=	article.xml
+SRCS+=	proc-alpha.xml
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
index 32ac5cef1673c..78683a951b7f1 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
@@ -14,7 +14,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/article.sgml,v 1.5 2002/10/12 18:02:21 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/article.xml,v 1.5 2002/10/12 18:02:21 ue Exp $
   basiert auf: 1.4
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
index 30ceb44a084f7..3103b93447624 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.35 2003/05/24 19:11:43 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml,v 1.35 2003/05/24 19:11:43 ue Exp $
   basiert auf: 1.60
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml b/release/doc/de_DE.ISO8859-1/hardware/common/artheader.xml
index 94a9d0fc8f5f7..d890400eb3ec3 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/artheader.xml
@@ -1,6 +1,6 @@
 <!--
 	$FreeBSD$
-	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/artheader.sgml,v 1.4 2003/01/09 12:14:47 ue Exp $
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/artheader.xml,v 1.4 2003/01/09 12:14:47 ue Exp $
 	basiert auf: 1.4
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml b/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
index 020bffc69d2a7..2cb36da5c59de 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
@@ -1,6 +1,6 @@
 <!--
 
-	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/dev.sgml,v 1.84 2003/05/25 09:36:36 ue Exp $
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/dev.xml,v 1.84 2003/05/25 09:36:36 ue Exp $
 	basiert auf: 1.155
 
 	The "Supported Devices" section of the release notes.
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent b/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent
index 7a8048bd23798..7c43a92693a94 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/hw.ent
@@ -9,12 +9,12 @@
 
 <!-- Files to be included -->
 
-<!ENTITY artheader SYSTEM "../common/artheader.sgml">
-<!ENTITY sect.intro SYSTEM "../common/intro.sgml">
-<!ENTITY sect.proc.alpha SYSTEM "../alpha/proc-alpha.sgml">
-<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.sgml">
-<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.sgml">
-<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.sgml">
-<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.sgml">
-<!ENTITY sect.dev SYSTEM "../common/dev.sgml">
+<!ENTITY artheader SYSTEM "../common/artheader.xml">
+<!ENTITY sect.intro SYSTEM "../common/intro.xml">
+<!ENTITY sect.proc.alpha SYSTEM "../alpha/proc-alpha.xml">
+<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.xml">
+<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.xml">
+<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.xml">
+<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.xml">
+<!ENTITY sect.dev SYSTEM "../common/dev.xml">
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml b/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml
index 1ff4a5a9a12cb..c7813083d5a76 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/intro.sgml,v 1.6 2003/05/24 21:35:15 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/intro.xml,v 1.6 2003/05/24 21:35:15 ue Exp $
   basiert auf: 1.6
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile b/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile
index e8ec75f3dbce9..03d16e97b3a01 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/Makefile
@@ -13,11 +13,11 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=    -V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-i386.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-i386.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
index 6fc56dd9fcdf8..8c10a150f0fb8 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
@@ -14,7 +14,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/article.sgml,v 1.5 2002/12/07 21:09:09 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/article.xml,v 1.5 2002/12/07 21:09:09 ue Exp $
   basiert auf: 1.4
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml b/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml
index 5c5273b1244a3..889f38ccb092b 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.13 2003/05/24 21:49:22 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/proc-i386.xml,v 1.13 2003/05/24 21:49:22 ue Exp $
   basiert auf: 1.11
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile b/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile
index 5531a50226cd0..62383695bfc81 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/Makefile
@@ -13,11 +13,11 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-# SRCS+=	proc-ia64.sgml 
+SRCS+=	article.xml 
+# SRCS+=	proc-ia64.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
index 641daa0c0b5b0..294310bee8c39 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
@@ -14,7 +14,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/article.sgml,v 1.6 2003/05/24 21:52:46 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/article.xml,v 1.6 2003/05/24 21:52:46 ue Exp $
   basiert auf: 1.3
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml b/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml
index 9119a2a330fbf..00c733aa91ad5 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.5 2003/05/24 22:16:24 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml,v 1.5 2003/05/24 22:16:24 ue Exp $
   basiert auf: 1.7
 -->
 <sect1 id="proc-ia64">
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile b/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile
index 7b3a0a86844ce..d00de40769eaf 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/Makefile
@@ -12,11 +12,11 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=    -V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-pc98.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-pc98.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
index e885893c761b4..6fea27e7fdbe4 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
@@ -14,7 +14,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/article.sgml,v 1.2 2002/10/12 18:02:22 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/article.xml,v 1.2 2002/10/12 18:02:22 ue Exp $
   basiert auf: 1.1
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml b/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml
index 9dbc7047f4ea7..22bc971560955 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml,v 1.3 2003/01/13 20:30:49 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml,v 1.3 2003/01/13 20:30:49 ue Exp $
   basiert auf: 1.4
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile b/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile
index 2ae7bfd36d182..98813cf5745a8 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile
@@ -12,11 +12,11 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-sparc64.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-sparc64.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
index 1c256d491b78a..fa202499638c3 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
@@ -14,7 +14,7 @@
 
 <!--
 	$FreeBSD$
-	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/article.sgml,v 1.7 2003/01/09 12:46:28 ue Exp $
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/article.xml,v 1.7 2003/01/09 12:46:28 ue Exp $
 	basiert auf: 1.3
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml
index 9563a4fc146c4..87d49bf518bbb 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml
@@ -1,6 +1,6 @@
 <!--
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml,v 1.4 2003/01/13 20:30:50 ue Exp $
-  $Id: dev-sparc64.sgml,v 1.4 2002/03/10 15:37:16 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml,v 1.4 2003/01/13 20:30:50 ue Exp $
+  $Id: dev-sparc64.xml,v 1.4 2002/03/10 15:37:16 ue Exp $
   basiert auf: 1.3
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml
index 4b6b351adf470..363434fb07499 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml
@@ -1,6 +1,6 @@
 <!--
 	$FreeBSD$
-	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml,v 1.10 2003/02/08 07:43:14 ue Exp $
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml,v 1.10 2003/02/08 07:43:14 ue Exp $
 	basiert auf: 1.11
 -->
 <sect1 id="support-sys">
diff --git a/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile b/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
index f0092048aecb8..78f1bc369441e 100644
--- a/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
@@ -11,13 +11,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+= ../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+= ../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
index 470985e73b0f9..e859ce17e9d98 100644
--- a/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
@@ -14,7 +14,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/alpha/article.sgml,v 1.4 2002/10/12 18:02:23 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/alpha/article.xml,v 1.4 2002/10/12 18:02:23 ue Exp $
   basiert auf: 1.3
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml b/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml
index 8dd1c02441166..4d467dd094c75 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml
@@ -1,7 +1,7 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/abstract.sgml,v 1.3 2002/03/12 17:24:25 ue Exp $
-  $Id: abstract.sgml,v 1.2 2002/03/10 15:37:17 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/abstract.xml,v 1.3 2002/03/12 17:24:25 ue Exp $
+  $Id: abstract.xml,v 1.2 2002/03/10 15:37:17 ue Exp $
   basiert auf: 1.2
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml b/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml
index 58396b8006e45..ea171f8266442 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/artheader.sgml,v 1.3 2003/01/09 12:17:18 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/artheader.xml,v 1.3 2003/01/09 12:17:18 ue Exp $
   basiert auf: 1.4
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/install.ent b/release/doc/de_DE.ISO8859-1/installation/common/install.ent
index 5ce38e015a2e2..60f6fe96fe478 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/install.ent
+++ b/release/doc/de_DE.ISO8859-1/installation/common/install.ent
@@ -11,10 +11,10 @@
 
 <!-- Files to be included -->
 
-<!ENTITY artheader SYSTEM "artheader.sgml">
-<!ENTITY abstract SYSTEM "abstract.sgml">
-<!ENTITY sect.install SYSTEM "install.sgml">
-<!ENTITY sect.layout SYSTEM "layout.sgml">
-<!ENTITY sect.upgrade SYSTEM "upgrade.sgml">
-<!ENTITY sect.trouble SYSTEM "trouble.sgml">
+<!ENTITY artheader SYSTEM "artheader.xml">
+<!ENTITY abstract SYSTEM "abstract.xml">
+<!ENTITY sect.install SYSTEM "install.xml">
+<!ENTITY sect.layout SYSTEM "layout.xml">
+<!ENTITY sect.upgrade SYSTEM "upgrade.xml">
+<!ENTITY sect.trouble SYSTEM "trouble.xml">
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/install.sgml b/release/doc/de_DE.ISO8859-1/installation/common/install.xml
index fdeee2db6e9d2..8f313f6c76f65 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/install.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/install.xml
@@ -1,10 +1,10 @@
 <!--
 
 $FreeBSD$
-$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/install.sgml,v 1.18 2003/05/24 19:11:45 ue Exp $
+$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/install.xml,v 1.18 2003/05/24 19:11:45 ue Exp $
 basiert auf: 1.20
 
-install.sgml
+install.xml
 
 This file has architecture-dependent installation instructions, culled
 from {alpha,i386}/INSTALL.TXT.
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml b/release/doc/de_DE.ISO8859-1/installation/common/layout.xml
index a92194fe807a5..73de4aa632551 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/layout.xml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/layout.sgml,v 1.5 2002/11/09 23:07:18 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/layout.xml,v 1.5 2002/11/09 23:07:18 ue Exp $
   basiert auf: 1.6
 
 	This section contains the contents of the old LAYOUT.TXT file.
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml b/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml
index 0e7c726b95189..ee6284ec61b8c 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/trouble.sgml,v 1.13 2003/05/24 19:11:45 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/trouble.xml,v 1.13 2003/05/24 19:11:45 ue Exp $
   basiert auf: 1.12
 
 	This file contains the comments of the old TROUBLE.TXT file.
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.xml
index 54539debfca22..e61129d8d18f2 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.xml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/upgrade.sgml,v 1.10 2003/05/24 19:11:45 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/upgrade.xml,v 1.10 2003/05/24 19:11:45 ue Exp $
   basiert auf: 1.11
 
 	This section contains the contents of the old UPGRADE.TXT
diff --git a/release/doc/de_DE.ISO8859-1/installation/i386/Makefile b/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
index c3eb92c6cf462..90a4029bab600 100644
--- a/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
@@ -11,13 +11,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml b/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
index 675ffadf5b556..8428cc3402b1b 100644
--- a/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
@@ -14,7 +14,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/i386/article.sgml,v 1.5 2002/12/07 21:09:56 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/i386/article.xml,v 1.5 2002/12/07 21:09:56 ue Exp $
   basiert auf: 1.4
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile b/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
index b0e2b50807503..addf11d5e4405 100644
--- a/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
@@ -10,13 +10,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml b/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
index 9d4eb8ead3923..e98d6e75e5b9a 100644
--- a/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
@@ -14,7 +14,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/ia64/article.sgml,v 1.1 2002/11/09 20:07:25 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/ia64/article.xml,v 1.1 2002/11/09 20:07:25 ue Exp $
   basiert auf: 1.1
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile b/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
index 0e431f0899c9b..e243d77f60e6b 100644
--- a/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
@@ -10,13 +10,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml b/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
index dd0bb1c55167c..f38f37db24944 100644
--- a/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
@@ -14,7 +14,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/pc98/article.sgml,v 1.2 2002/10/12 18:02:23 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/pc98/article.xml,v 1.2 2002/10/12 18:02:23 ue Exp $
   basiert auf: 1.1
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile b/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile
index 958e6aa03046d..f22afce4b84f1 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile
@@ -10,11 +10,11 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	install.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
+SRCS+=	article.xml
+SRCS+=	install.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
index 4b6f9ec0e5efd..30da93215133b 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
@@ -15,7 +15,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/article.sgml,v 1.3 2002/11/16 12:10:42 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/article.xml,v 1.3 2002/11/16 12:10:42 ue Exp $
   basiert auf: 1.4
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml b/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml
index 91b240b453ccf..5fc8c79dec787 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/install.sgml,v 1.10 2003/01/13 20:30:51 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/install.xml,v 1.10 2003/01/13 20:30:51 ue Exp $
   basiert auf: 1.14
   This file contains sparc64-specific installation instructions.
 -->
diff --git a/release/doc/de_DE.ISO8859-1/readme/Makefile b/release/doc/de_DE.ISO8859-1/readme/Makefile
index f65809eec366c..311a95b575d08 100644
--- a/release/doc/de_DE.ISO8859-1/readme/Makefile
+++ b/release/doc/de_DE.ISO8859-1/readme/Makefile
@@ -21,7 +21,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/readme/article.sgml b/release/doc/de_DE.ISO8859-1/readme/article.xml
index bb746c22b6008..2c255464e623d 100644
--- a/release/doc/de_DE.ISO8859-1/readme/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/readme/article.xml
@@ -9,7 +9,7 @@
 <!--
   The FreeBSD German Documentation Project
   The FreeBSD Documentation Project
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/readme/article.sgml,v 1.18 2003/05/11 23:28:35 mheinen Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/readme/article.xml,v 1.18 2003/05/11 23:28:35 mheinen Exp $
   basiert auf: 1.26
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile
index 4d72656524979..a1fa06f22776a 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile
@@ -13,9 +13,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
index 6650fb357b08f..8dc4e549a361f 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
@@ -14,7 +14,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/alpha/article.sgml,v 1.4 2002/10/12 18:02:24 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/alpha/article.xml,v 1.4 2002/10/12 18:02:24 ue Exp $
   basiert auf: 1.3
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml b/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
index e4505c5c0c7ab..28383887c555c 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/common/new.sgml,v 1.250 2003/05/24 22:38:23 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/common/new.xml,v 1.250 2003/05/24 22:38:23 ue Exp $
   basiert auf: 1.571
 -->
 <articleinfo>
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent b/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent
index e7dc5f5c46538..1bbef2071210b 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent
+++ b/release/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent
@@ -16,4 +16,4 @@
 
 <!-- Files to be included -->
 
-<!ENTITY art SYSTEM "../common/new.sgml">
+<!ENTITY art SYSTEM "../common/new.xml">
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile
index 30d6a145ca332..f9e1765a1c474 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile
@@ -13,9 +13,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
index f3821e44f7313..450d29e826bf2 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
@@ -15,7 +15,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/i386/article.sgml,v 1.6 2002/12/07 22:11:35 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/i386/article.xml,v 1.6 2002/12/07 22:11:35 ue Exp $
   basiert auf: 1.4
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile
index e106b467ed965..90ff5e5a51f86 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile
@@ -12,9 +12,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
index e43f3073b0b93..1406f2c250143 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
@@ -13,7 +13,7 @@
 ]>
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/ia64/article.sgml,v 1.2 2002/11/10 10:47:53 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/ia64/article.xml,v 1.2 2002/11/10 10:47:53 ue Exp $
   basiert auf: 1.1
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile
index 33f8a62dbfe0d..b27bd167e34b1 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile
@@ -12,9 +12,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
index f207527078a0c..79a8c5a108a41 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
@@ -15,7 +15,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/pc98/article.sgml,v 1.2 2002/10/12 18:02:25 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/pc98/article.xml,v 1.2 2002/10/12 18:02:25 ue Exp $
   basiert auf: 1.1
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile
index 85ec1603c610a..6eaeb22f34827 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile
@@ -13,9 +13,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
index 2bdb42aa70d21..f2c328deafda8 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
@@ -14,7 +14,7 @@
 
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/sparc64/article.sgml,v 1.4 2002/10/12 18:02:25 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/sparc64/article.xml,v 1.4 2002/10/12 18:02:25 ue Exp $
   basiert auf: 1.3
   -->
 
diff --git a/release/doc/de_DE.ISO8859-1/share/sgml/catalog b/release/doc/de_DE.ISO8859-1/share/xml/catalog
index 8530d26a582ba..d3b1a6dd1d5b2 100644
--- a/release/doc/de_DE.ISO8859-1/share/sgml/catalog
+++ b/release/doc/de_DE.ISO8859-1/share/xml/catalog
@@ -2,7 +2,7 @@
   -- Language-specific --
 
   -- $FreeBSD$ --
-  -- $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/catalog,v 1.6 2002/10/12 18:02:25 ue Exp $ --
+  -- $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/xml/catalog,v 1.6 2002/10/12 18:02:25 ue Exp $ --
   -- basiert auf: 1.1 --
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
diff --git a/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl b/release/doc/de_DE.ISO8859-1/share/xml/release.dsl
index 79f4a8753bb27..49bf4c121df9a 100644
--- a/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
+++ b/release/doc/de_DE.ISO8859-1/share/xml/release.dsl
@@ -1,6 +1,6 @@
 <!--
 	$FreeBSD$
-	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/release.dsl,v 1.9 2003/05/24 22:43:52 ue Exp $
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/xml/release.dsl,v 1.9 2003/05/24 22:43:52 ue Exp $
 	basiert auf: 1.7
 -->
 
diff --git a/release/doc/en_US.ISO8859-1/errata/Makefile b/release/doc/en_US.ISO8859-1/errata/Makefile
index c8ac2093f88a0..036609adc7acf 100644
--- a/release/doc/en_US.ISO8859-1/errata/Makefile
+++ b/release/doc/en_US.ISO8859-1/errata/Makefile
@@ -13,7 +13,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 .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.sgml b/release/doc/en_US.ISO8859-1/errata/article.xml
index 8328f5a97660b..8328f5a97660b 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.sgml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
diff --git a/release/doc/en_US.ISO8859-1/hardware/Makefile b/release/doc/en_US.ISO8859-1/hardware/Makefile
index 182fb1e935e47..9818f8f8a2fda 100644
--- a/release/doc/en_US.ISO8859-1/hardware/Makefile
+++ b/release/doc/en_US.ISO8859-1/hardware/Makefile
@@ -16,9 +16,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
 
 CATALOGS+=	-c ${DEV-AUTODIR}/catalog-auto
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.sgml b/release/doc/en_US.ISO8859-1/hardware/article.xml
index 3d48cb957bc7f..3d48cb957bc7f 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.xml
diff --git a/release/doc/en_US.ISO8859-1/readme/Makefile b/release/doc/en_US.ISO8859-1/readme/Makefile
index 05486df04aa9c..35219fced6741 100644
--- a/release/doc/en_US.ISO8859-1/readme/Makefile
+++ b/release/doc/en_US.ISO8859-1/readme/Makefile
@@ -18,7 +18,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 .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/readme/article.sgml b/release/doc/en_US.ISO8859-1/readme/article.xml
index 90654296433e5..90654296433e5 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.sgml
+++ b/release/doc/en_US.ISO8859-1/readme/article.xml
diff --git a/release/doc/en_US.ISO8859-1/relnotes/Makefile b/release/doc/en_US.ISO8859-1/relnotes/Makefile
index bd01e5fd9143f..c0f473e72dcb3 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/Makefile
+++ b/release/doc/en_US.ISO8859-1/relnotes/Makefile
@@ -16,7 +16,7 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 URL_RELPREFIX?=	../../../..
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index c1b9af5f606fd..c1b9af5f606fd 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
diff --git a/release/doc/en_US.ISO8859-1/share/sgml/catalog b/release/doc/en_US.ISO8859-1/share/xml/catalog
index 9995d5af1340f..9995d5af1340f 100644
--- a/release/doc/en_US.ISO8859-1/share/sgml/catalog
+++ b/release/doc/en_US.ISO8859-1/share/xml/catalog
diff --git a/release/doc/en_US.ISO8859-1/share/sgml/release.dsl b/release/doc/en_US.ISO8859-1/share/xml/release.dsl
index 7b1c975fb12ed..7b1c975fb12ed 100644
--- a/release/doc/en_US.ISO8859-1/share/sgml/release.dsl
+++ b/release/doc/en_US.ISO8859-1/share/xml/release.dsl
diff --git a/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile b/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile
index 5bf7a1516988e..1b9fff9acb124 100644
--- a/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile
@@ -18,7 +18,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS+= article.sgml
+SRCS+= article.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml b/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
index 1905e70548774..1905e70548774 100644
--- a/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
diff --git a/release/doc/fr_FR.ISO8859-1/errata/Makefile b/release/doc/fr_FR.ISO8859-1/errata/Makefile
index df21579da984b..bde952662e8ea 100644
--- a/release/doc/fr_FR.ISO8859-1/errata/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/errata/Makefile
@@ -19,7 +19,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/errata/article.sgml b/release/doc/fr_FR.ISO8859-1/errata/article.xml
index 7d3e38ed19366..7d3e38ed19366 100644
--- a/release/doc/fr_FR.ISO8859-1/errata/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/errata/article.xml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile
index 68f2784af8a6b..8a2955576c448 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile
@@ -16,11 +16,11 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	proc-alpha.sgml
+SRCS+=	article.xml
+SRCS+=	proc-alpha.xml
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
index 07004080eb70d..07004080eb70d 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
index 6b6128ab415f6..4439eeadf8b45 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: proc-alpha.sgml,v 1.5 2002/09/29 17:03:01 eagle Exp $
+     $Id: proc-alpha.xml,v 1.5 2002/09/29 17:03:01 eagle Exp $
      $FreeBSD$
      Original revision: 1.43
 -->
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml b/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.xml
index 35883b1d00203..35883b1d00203 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.xml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
index f6d5d8da2a038..dec4d320b971f 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: dev.sgml,v 1.3 2002/09/29 21:03:53 eagle Exp $
+     $Id: dev.xml,v 1.3 2002/09/29 21:03:53 eagle Exp $
      $FreeBSD$
      Original revision: 1.114
 -->
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent b/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent
index 103c5673858b2..a6bb1d9679035 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent
@@ -12,12 +12,12 @@
 
 <!-- Files to be included -->
 
-<!ENTITY artheader SYSTEM "../common/artheader.sgml">
-<!ENTITY sect.intro SYSTEM "../common/intro.sgml">
-<!ENTITY sect.proc.alpha SYSTEM "../alpha/proc-alpha.sgml">
-<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.sgml">
-<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.sgml">
-<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.sgml">
-<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.sgml">
-<!ENTITY sect.dev SYSTEM "../common/dev.sgml">
+<!ENTITY artheader SYSTEM "../common/artheader.xml">
+<!ENTITY sect.intro SYSTEM "../common/intro.xml">
+<!ENTITY sect.proc.alpha SYSTEM "../alpha/proc-alpha.xml">
+<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.xml">
+<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.xml">
+<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.xml">
+<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.xml">
+<!ENTITY sect.dev SYSTEM "../common/dev.xml">
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml b/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml
index 0503345828d17..0503345828d17 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile
index 4b7d052f03efc..ceb9b9a6121ad 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile
@@ -16,11 +16,11 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-i386.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-i386.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
index ba475e63d505b..ba475e63d505b 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
index 91e09f36d7155..c409d8ca0d3c4 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: proc-i386.sgml,v 1.2 2002/09/28 23:23:21 eagle Exp $
+     $Id: proc-i386.xml,v 1.2 2002/09/28 23:23:21 eagle Exp $
      $FreeBSD$
      Original revision: 1.3
 -->
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile
index 180657b8fc540..42d63cca3a297 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile
@@ -16,11 +16,11 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-# SRCS+=	proc-ia64.sgml 
+SRCS+=	article.xml 
+# SRCS+=	proc-ia64.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
index 9edb86646f267..9edb86646f267 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml b/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml
index 8319c1be9fd98..8319c1be9fd98 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile
index c900c54f0dc4c..df72aca0c2b2e 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile
@@ -16,11 +16,11 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-pc98.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-pc98.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
index 019decf4eadc2..019decf4eadc2 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
index 5166bb128f136..5166bb128f136 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile
index 51acc371b5d39..84b9da2b6f29b 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile
@@ -17,11 +17,11 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-sparc64.sgml 
-SRCS+=	dev-sparc64.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-sparc64.xml 
+SRCS+=	dev-sparc64.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
+SRCS+=	../common/artheader.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
index c6d59e01420f0..ba10823db0b2d 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
@@ -12,7 +12,7 @@
 <!ENTITY arch.print "UltraSPARC">
 <!ENTITY unsupported "<emphasis>(non support&eacute;)</emphasis>">
 <!ENTITY perforce "<emphasis>(non encore commiter - dans l'arbre Perforce)</emphasis>">
-<!ENTITY sect.dev.sparc64 SYSTEM "./dev-sparc64.sgml">
+<!ENTITY sect.dev.sparc64 SYSTEM "./dev-sparc64.xml">
 ]>
 
 <!--
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml
index 4bc54a39b215c..b97cbf8a5a4af 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: dev-sparc64.sgml,v 1.2 2002/09/28 23:01:52 eagle Exp $
+     $Id: dev-sparc64.xml,v 1.2 2002/09/28 23:01:52 eagle Exp $
      $FreeBSD$
      Original revision: 1.1
 -->
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
index f434ac0874dc2..f434ac0874dc2 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
index 30b5589ddbb2c..06dfd252486bf 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
@@ -14,13 +14,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
index d12f9f93facf0..d12f9f93facf0 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/abstract.xml
index 34e7da3e62942..34e7da3e62942 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/abstract.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml
index 8573012b061ac..8573012b061ac 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/install.ent b/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
index 76db954deda96..d125f400e54eb 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
@@ -13,10 +13,10 @@
 
 <!-- Files to be included -->
 
-<!ENTITY artheader SYSTEM "artheader.sgml">
-<!ENTITY abstract SYSTEM "abstract.sgml">
-<!ENTITY sect.install SYSTEM "install.sgml">
-<!ENTITY sect.layout SYSTEM "layout.sgml">
-<!ENTITY sect.upgrade SYSTEM "upgrade.sgml">
-<!ENTITY sect.trouble SYSTEM "trouble.sgml">
+<!ENTITY artheader SYSTEM "artheader.xml">
+<!ENTITY abstract SYSTEM "abstract.xml">
+<!ENTITY sect.install SYSTEM "install.xml">
+<!ENTITY sect.layout SYSTEM "layout.xml">
+<!ENTITY sect.upgrade SYSTEM "upgrade.xml">
+<!ENTITY sect.trouble SYSTEM "trouble.xml">
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
index f59071c774648..f59071c774648 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
index 472e60ffecafa..472e60ffecafa 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml
index c248227aa7f84..c248227aa7f84 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml
index 54dd0728e3b53..54dd0728e3b53 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile b/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
index a377905e3dade..49e6c23358b1f 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
@@ -15,13 +15,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
index 7ef6d2da6c41a..7ef6d2da6c41a 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile b/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
index 6ff53b66239bd..f191fbc8651ba 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
@@ -16,13 +16,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
index 9b015e2ec5825..9b015e2ec5825 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile b/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile
index c3e7481e0ab38..f8f6448ea60ff 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile
@@ -16,11 +16,11 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	install.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
+SRCS+=	article.xml
+SRCS+=	install.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
index 4b894cac3f5f3..14dbe2e210750 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
@@ -10,7 +10,7 @@
 
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
-<!ENTITY sect.sparc64.install SYSTEM "./install.sgml">
+<!ENTITY sect.sparc64.install SYSTEM "./install.xml">
 ]>
 
 <!--
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml b/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml
index e4d8f5b1a34d4..e4d8f5b1a34d4 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile
index eaff0b77c2ff0..3389969e50867 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile
@@ -16,9 +16,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
index 72a809f64b4fe..72a809f64b4fe 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
index 6ded6c6270c08..75634ccd25866 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: new.sgml,v 1.5 2002/09/28 21:57:12 eagle Exp $
+     $Id: new.xml,v 1.5 2002/09/28 21:57:12 eagle Exp $
      $FreeBSD$
      Original revision: 1.423
 -->
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent b/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent
index 2051522133b8a..3879c3a2e6599 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent
@@ -16,5 +16,5 @@
  
 <!-- Files to be included -->
 
-<!ENTITY art SYSTEM "../common/new.sgml">
+<!ENTITY art SYSTEM "../common/new.xml">
 
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile b/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile
index 10faa9d1a6346..f902e479a2c03 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile
@@ -16,9 +16,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-#SRCS+=	../common/new.sgml
+#SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
index b06d2a77ab66b..b06d2a77ab66b 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
diff --git a/release/doc/fr_FR.ISO8859-1/share/sgml/catalog b/release/doc/fr_FR.ISO8859-1/share/xml/catalog
index 9995d5af1340f..9995d5af1340f 100644
--- a/release/doc/fr_FR.ISO8859-1/share/sgml/catalog
+++ b/release/doc/fr_FR.ISO8859-1/share/xml/catalog
diff --git a/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl b/release/doc/fr_FR.ISO8859-1/share/xml/release.dsl
index 2de7155d09d1b..2de7155d09d1b 100644
--- a/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl
+++ b/release/doc/fr_FR.ISO8859-1/share/xml/release.dsl
diff --git a/release/doc/ja_JP.eucJP/errata/Makefile b/release/doc/ja_JP.eucJP/errata/Makefile
index f9bbcfd977edc..18081771783d4 100644
--- a/release/doc/ja_JP.eucJP/errata/Makefile
+++ b/release/doc/ja_JP.eucJP/errata/Makefile
@@ -14,7 +14,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/errata/article.sgml b/release/doc/ja_JP.eucJP/errata/article.xml
index 009dbd57a07d9..009dbd57a07d9 100644
--- a/release/doc/ja_JP.eucJP/errata/article.sgml
+++ b/release/doc/ja_JP.eucJP/errata/article.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/alpha/Makefile b/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
index f431bf9cb7a61..a3e402f7a8a66 100644
--- a/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
@@ -11,14 +11,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
-#SRCS+=	proc-alpha.sgml
+SRCS+=	article.xml
+#SRCS+=	proc-alpha.xml
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+=	../../share/sgml/dev-auto-ja.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+=	../../share/xml/dev-auto-ja.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml b/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
index 65c72c08c63f4..65c72c08c63f4 100644
--- a/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/Makefile b/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
index fa57ac6b3d9b5..9843764547f40 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
@@ -11,14 +11,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-amd64.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-amd64.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+=	../../share/sgml/dev-auto-ja.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+=	../../share/xml/dev-auto-ja.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml b/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
index 374409bb7e083..374409bb7e083 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml
index 8741b88de973e..8741b88de973e 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml b/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
index b21ca826b6d29..b21ca826b6d29 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/common/dev.sgml b/release/doc/ja_JP.eucJP/hardware/common/dev.xml
index a681565ab1dde..65f2fb7088a06 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/common/dev.xml
@@ -946,6 +946,6 @@
 <!-- 
      Local Variables:
      mode: sgml
-     sgml-parent-document: ("../i386/article.sgml" "article" "articleinfo")
+     sgml-parent-document: ("../i386/article.xml" "article" "articleinfo")
      End:
 -->
diff --git a/release/doc/ja_JP.eucJP/hardware/common/hw.ent b/release/doc/ja_JP.eucJP/hardware/common/hw.ent
index d31cd665c39a7..3f45fcfa54f8f 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/hw.ent
+++ b/release/doc/ja_JP.eucJP/hardware/common/hw.ent
@@ -8,12 +8,12 @@
 
 <!-- Files to be included -->
 
-<!ENTITY artheader SYSTEM "../common/artheader.sgml">
-<!ENTITY sect.intro SYSTEM "../common/intro.sgml">
-<!ENTITY sect.proc.alpha SYSTEM "../alpha/proc-alpha.sgml">
-<!ENTITY sect.proc.amd64 SYSTEM "../amd64/proc-amd64.sgml">
-<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.sgml">
-<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.sgml">
-<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.sgml">
-<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.sgml">
-<!ENTITY sect.dev SYSTEM "../common/dev.sgml">
+<!ENTITY artheader SYSTEM "../common/artheader.xml">
+<!ENTITY sect.intro SYSTEM "../common/intro.xml">
+<!ENTITY sect.proc.alpha SYSTEM "../alpha/proc-alpha.xml">
+<!ENTITY sect.proc.amd64 SYSTEM "../amd64/proc-amd64.xml">
+<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.xml">
+<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.xml">
+<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.xml">
+<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.xml">
+<!ENTITY sect.dev SYSTEM "../common/dev.xml">
diff --git a/release/doc/ja_JP.eucJP/hardware/common/intro.sgml b/release/doc/ja_JP.eucJP/hardware/common/intro.xml
index e8a2345a002e1..e8a2345a002e1 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/intro.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/common/intro.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/Makefile b/release/doc/ja_JP.eucJP/hardware/i386/Makefile
index 9673692d8a90c..4872631ac037a 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/i386/Makefile
@@ -11,14 +11,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-i386.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-i386.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+=	../../share/sgml/dev-auto-ja.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+=	../../share/xml/dev-auto-ja.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/article.sgml b/release/doc/ja_JP.eucJP/hardware/i386/article.xml
index 00acf40d65e65..00acf40d65e65 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/article.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml
index 2aa3fc74e1f86..2aa3fc74e1f86 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/Makefile b/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
index 97f4566847610..c797e668a83eb 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
@@ -11,14 +11,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-# SRCS+=	proc-ia64.sgml 
+SRCS+=	article.xml 
+# SRCS+=	proc-ia64.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+=	../../share/sgml/dev-auto-ja.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+=	../../share/xml/dev-auto-ja.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml b/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
index 928734626cf94..928734626cf94 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml
index 47134b3c0d016..47134b3c0d016 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/Makefile b/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
index a83a68ca7908c..788a6e829f180 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
@@ -11,14 +11,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-pc98.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-pc98.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+=	../../share/sgml/dev-auto-ja.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+=	../../share/xml/dev-auto-ja.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml b/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
index ee77a3600d043..ee77a3600d043 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml
index 03df50efad8fa..03df50efad8fa 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile b/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
index 74724537b8fb7..cd5ad68b558df 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
@@ -11,14 +11,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-sparc64.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-sparc64.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+=	../../share/sgml/dev-auto-ja.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+=	../../share/xml/dev-auto-ja.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml b/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
index 92e3a8f800d6e..92e3a8f800d6e 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
index 209e72c419d8b..209e72c419d8b 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
diff --git a/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile b/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile
index baf44f5c7d95f..8dd7309a088a0 100644
--- a/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile
@@ -11,9 +11,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml b/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
index c1afb1df7bb44..c1afb1df7bb44 100644
--- a/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
diff --git a/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile b/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile
index 647128cdbda1e..a704edaca3765 100644
--- a/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile
@@ -11,9 +11,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
index 102a998a15370..102a998a15370 100644
--- a/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/new.sgml b/release/doc/ja_JP.eucJP/relnotes/common/new.xml
index c49592d91e95c..512adfc5b81ea 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/common/new.xml
@@ -1009,6 +1009,6 @@
 <!--
      Local Variables:
      mode: sgml
-     sgml-parent-document: ("../i386/article.sgml" "article" "articleinfo")
+     sgml-parent-document: ("../i386/article.xml" "article" "articleinfo")
      End:
 -->
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent b/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
index cfd39c89edb31..0e76fc67639fb 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
+++ b/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
@@ -17,4 +17,4 @@
 <!ENTITY % no.include.historic "IGNORE">
 
 <!-- Files to be included -->
-<!ENTITY art SYSTEM "../common/new.sgml">
+<!ENTITY art SYSTEM "../common/new.xml">
diff --git a/release/doc/ja_JP.eucJP/relnotes/i386/Makefile b/release/doc/ja_JP.eucJP/relnotes/i386/Makefile
index ed0d1e93a2ee8..ecb7b1751fc34 100644
--- a/release/doc/ja_JP.eucJP/relnotes/i386/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/i386/Makefile
@@ -11,9 +11,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 URL_RELPREFIX?=	../../../..
 
diff --git a/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml b/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
index a075a64b80c41..a075a64b80c41 100644
--- a/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
diff --git a/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile b/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile
index 647128cdbda1e..a704edaca3765 100644
--- a/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile
@@ -11,9 +11,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
index a8517b03b5639..a8517b03b5639 100644
--- a/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
diff --git a/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile b/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile
index 647128cdbda1e..a704edaca3765 100644
--- a/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile
@@ -11,9 +11,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml b/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
index aead305540d88..aead305540d88 100644
--- a/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
diff --git a/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile b/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile
index 647128cdbda1e..a704edaca3765 100644
--- a/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile
+++ b/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile
@@ -11,9 +11,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
index 1092349911044..1092349911044 100644
--- a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
diff --git a/release/doc/ja_JP.eucJP/share/sgml/catalog b/release/doc/ja_JP.eucJP/share/xml/catalog
index 19ce2927725b7..c96f4d2df094a 100644
--- a/release/doc/ja_JP.eucJP/share/sgml/catalog
+++ b/release/doc/ja_JP.eucJP/share/xml/catalog
@@ -6,7 +6,7 @@
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
 PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA"
-       "dev-auto-ja.sgml"
+       "dev-auto-ja.xml"
 
 
 
diff --git a/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml b/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml
index 57e4deacbb6b3..57e4deacbb6b3 100644
--- a/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml
+++ b/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml
diff --git a/release/doc/ja_JP.eucJP/share/sgml/release.dsl b/release/doc/ja_JP.eucJP/share/xml/release.dsl
index 5cf5d795fa2a9..5cf5d795fa2a9 100644
--- a/release/doc/ja_JP.eucJP/share/sgml/release.dsl
+++ b/release/doc/ja_JP.eucJP/share/xml/release.dsl
diff --git a/release/doc/ru_RU.KOI8-R/errata/Makefile b/release/doc/ru_RU.KOI8-R/errata/Makefile
index 569e28c75f037..28699d89ec76a 100644
--- a/release/doc/ru_RU.KOI8-R/errata/Makefile
+++ b/release/doc/ru_RU.KOI8-R/errata/Makefile
@@ -19,7 +19,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/errata/article.sgml b/release/doc/ru_RU.KOI8-R/errata/article.xml
index a4ca7db58bd40..a758456e8245e 100644
--- a/release/doc/ru_RU.KOI8-R/errata/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/errata/article.xml
@@ -2,7 +2,7 @@
    The FreeBSD Russian Documentation Project
 
    $FreeBSD$
-   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/errata/article.sgml,v 1.5 2004/09/10 13:56:07 den Exp $
+   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/errata/article.xml,v 1.5 2004/09/10 13:56:07 den Exp $
 
    Original revision: 1.72
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile b/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
index 4b097f502f6fa..08d3f6af7f2f1 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
@@ -15,14 +15,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../../../en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml
+SRCS+=	article.xml
+SRCS+=	../../../en_US.ISO8859-1/hardware/alpha/proc-alpha.xml
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+= ../../share/sgml/dev-auto-ru.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+= ../../share/xml/dev-auto-ru.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
index dd7e6068b888e..acf2e92ba42bf 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml,v 1.6 2005/03/10 11:04:19 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml,v 1.6 2005/03/10 11:04:19 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
index 3ee019da3d929..4cc732fdeea85 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
@@ -15,14 +15,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-amd64.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-amd64.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+= ../../share/sgml/dev-auto-ru.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+= ../../share/xml/dev-auto-ru.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
index 11ff4d3f2125c..0654720016efd 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml,v 1.6 2005/03/10 11:04:20 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml,v 1.6 2005/03/10 11:04:20 den Exp $
 
      Original revision: 1.3
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
index 1cdd4a9e37432..a392270cdf887 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml,v 1.3 2004/09/13 09:24:00 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml,v 1.3 2004/09/13 09:24:00 den Exp $
 
      Original revision: 1.5
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
index 4c11f77691f84..8aea81f95af7f 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml,v 1.2 2005/04/25 12:23:24 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml,v 1.2 2005/04/25 12:23:24 den Exp $
 
      Original revision: 1.7
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml b/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
index 9a2657084d928..cb2ab13d342e4 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.18 2005/06/30 11:12:31 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml,v 1.18 2005/06/30 11:12:31 den Exp $
 
      Original revision: 1.282
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent b/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent
index 3f86696b7c590..c39258735c140 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/hw.ent
@@ -13,13 +13,13 @@
 
 <!-- Files to be included -->
 
-<!ENTITY artheader SYSTEM "../common/artheader.sgml">
-<!ENTITY sect.intro SYSTEM "../common/intro.sgml">
-<!ENTITY sect.proc.alpha SYSTEM "../../../en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml">
-<!ENTITY sect.proc.amd64 SYSTEM "../amd64/proc-amd64.sgml">
-<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.sgml">
-<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.sgml">
-<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.sgml">
-<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.sgml">
-<!ENTITY sect.dev SYSTEM "../common/dev.sgml">
+<!ENTITY artheader SYSTEM "../common/artheader.xml">
+<!ENTITY sect.intro SYSTEM "../common/intro.xml">
+<!ENTITY sect.proc.alpha SYSTEM "../../../en_US.ISO8859-1/hardware/alpha/proc-alpha.xml">
+<!ENTITY sect.proc.amd64 SYSTEM "../amd64/proc-amd64.xml">
+<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.xml">
+<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.xml">
+<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.xml">
+<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.xml">
+<!ENTITY sect.dev SYSTEM "../common/dev.xml">
 
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml b/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
index 739191ef7d4fa..32dffe8a16955 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml,v 1.2 2004/09/06 14:05:02 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml,v 1.2 2004/09/06 14:05:02 den Exp $
 
      Original revision: 1.7
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile b/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
index 3aa62b541d11a..e8a2abc6e36ce 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
@@ -15,14 +15,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-i386.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-i386.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+= ../../share/sgml/dev-auto-ru.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+= ../../share/xml/dev-auto-ru.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
index ef074447f516b..3c38a6e510573 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml,v 1.6 2005/03/10 11:04:20 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml,v 1.6 2005/03/10 11:04:20 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
index 905a9a3ed12ca..c3e244b8f95d7 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml,v 1.1 2004/05/27 06:09:43 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml,v 1.1 2004/05/27 06:09:43 den Exp $
 
      Original revision: 1.14
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
index 126215b50db3f..b32a22b3dc4ba 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
@@ -15,14 +15,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-# SRCS+=	proc-ia64.sgml 
+SRCS+=	article.xml 
+# SRCS+=	proc-ia64.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+= ../../share/sgml/dev-auto-ru.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+= ../../share/xml/dev-auto-ru.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
index 1281aa45af5dd..eb36ee93fce52 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml,v 1.6 2005/03/10 11:04:20 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml,v 1.6 2005/03/10 11:04:20 den Exp $
 
      Original revision: 1.5
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
index 4656bd6edeb58..7b612df93016f 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml,v 1.2 2004/08/03 12:53:39 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml,v 1.2 2004/08/03 12:53:39 den Exp $
 
      Original revision: 1.9
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile b/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
index 6fc857fd2f889..53b9df08af9cd 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
@@ -15,14 +15,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-pc98.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-pc98.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+= ../../share/sgml/dev-auto-ru.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+= ../../share/xml/dev-auto-ru.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
index bab60c052ed28..7780d42ecaf4a 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml,v 1.6 2005/03/10 11:04:21 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml,v 1.6 2005/03/10 11:04:21 den Exp $
 
      Original revision: 1.3
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
index 224512b39546e..eb4d458c37991 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml,v 1.1 2004/05/27 06:09:43 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml,v 1.1 2004/05/27 06:09:43 den Exp $
 
      Original revision: 1.5
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
index ead67c9359cfa..d622a6c146032 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
@@ -15,14 +15,14 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-sparc64.sgml 
+SRCS+=	article.xml 
+SRCS+=	proc-sparc64.xml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/dev.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+= ../../share/sgml/dev-auto-ru.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+= ../../share/xml/dev-auto-ru.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
index 2b0fc786fb30d..d49d4c526be51 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml,v 1.6 2005/03/10 11:04:21 den Exp $
+     $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
 -->
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
index 95fcebf0c260d..56d11f0d77a7d 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml,v 1.2 2004/09/01 12:23:40 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml,v 1.2 2004/09/01 12:23:40 den Exp $
 
      Original revision: 1.12
 -->
diff --git a/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile b/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
index 7241133f65b6d..e6ebc349c01b5 100644
--- a/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
@@ -14,13 +14,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml b/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
index d43057bcbe270..e05b68022f414 100644
--- a/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml,v 1.5 2004/08/12 08:31:35 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml,v 1.5 2004/08/12 08:31:35 den Exp $
 
      Original revision: 1.4
 -->
diff --git a/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile b/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
index 1c7ac4d9bbd54..e3180497050a3 100644
--- a/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
@@ -14,13 +14,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml b/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
index b46561a82b383..74da35991e765 100644
--- a/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml,v 1.5 2004/08/12 08:31:35 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml,v 1.5 2004/08/12 08:31:35 den Exp $
 
      Original revision: 1.2
 -->
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml b/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
index 00bca530ae811..c2a3d9c839684 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml,v 1.1 2004/06/24 07:21:47 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml,v 1.1 2004/06/24 07:21:47 den Exp $
 
      Original revision: 1.2
 -->
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml b/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
index 0475eed4dd55e..d612a17f02d64 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml,v 1.3 2005/06/30 11:12:32 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml,v 1.3 2005/06/30 11:12:32 den Exp $
 
      Original revision: 1.7
 -->
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/install.ent b/release/doc/ru_RU.KOI8-R/installation/common/install.ent
index cfe8a868d6173..46281d19db00d 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/install.ent
+++ b/release/doc/ru_RU.KOI8-R/installation/common/install.ent
@@ -13,10 +13,10 @@
 
 <!-- Files to be included -->
 
-<!ENTITY artheader SYSTEM "artheader.sgml">
-<!ENTITY abstract SYSTEM "abstract.sgml">
-<!ENTITY sect.install SYSTEM "install.sgml">
-<!ENTITY sect.layout SYSTEM "layout.sgml">
-<!ENTITY sect.upgrade SYSTEM "upgrade.sgml">
-<!ENTITY sect.trouble SYSTEM "trouble.sgml">
+<!ENTITY artheader SYSTEM "artheader.xml">
+<!ENTITY abstract SYSTEM "abstract.xml">
+<!ENTITY sect.install SYSTEM "install.xml">
+<!ENTITY sect.layout SYSTEM "layout.xml">
+<!ENTITY sect.upgrade SYSTEM "upgrade.xml">
+<!ENTITY sect.trouble SYSTEM "trouble.xml">
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/install.sgml b/release/doc/ru_RU.KOI8-R/installation/common/install.xml
index 30487d149d4d7..07de898a99403 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/install.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/install.xml
@@ -2,11 +2,11 @@
 The FreeBSD Russian Documentation Project
 
 $FreeBSD$
-$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.8 2005/06/30 11:12:32 den Exp $
+$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.xml,v 1.8 2005/06/30 11:12:32 den Exp $
 
 Original revision: 1.32
 
-install.sgml
+install.xml
 
 This file has architecture-dependent installation instructions, culled
 from {alpha,i386}/INSTALL.TXT.
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml b/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
index 48191b6bd553d..8a50f61a0c57f 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
@@ -2,7 +2,7 @@
 	The FreeBSD Russian Documentation Project
 
 	$FreeBSD$
-	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml,v 1.5 2005/04/14 13:30:11 den Exp $
+	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/layout.xml,v 1.5 2005/04/14 13:30:11 den Exp $
 
 	Original revision: 1.10
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml b/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
index 4bc38b41e2e54..99d65d623917d 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
@@ -2,7 +2,7 @@
 	The FreeBSD Russian Documentation Project
 
 	$FreeBSD$
-	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,v 1.5 2005/06/30 11:12:32 den Exp $
+	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml,v 1.5 2005/06/30 11:12:32 den Exp $
 
 	Original revision: 1.19
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
index dffe1a55541ff..96c9d9659f29f 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
@@ -2,7 +2,7 @@
 	The FreeBSD Russian Documentation Project
 
 	$FreeBSD$
-	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml,v 1.3 2004/09/06 14:05:03 den Exp $
+	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml,v 1.3 2004/09/06 14:05:03 den Exp $
 
 	Original revision: 1.13
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/i386/Makefile b/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
index b1d897d9b39fc..bb21c10d84bfb 100644
--- a/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
@@ -14,13 +14,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml b/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
index 14199c01d8707..d938b5995a40a 100644
--- a/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/i386/article.xml,v 1.5 2004/08/12 08:31:36 den Exp $
 
      Original revision: 1.5
 -->
diff --git a/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile b/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
index adf6a2a28548a..e4223135aef63 100644
--- a/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
@@ -14,13 +14,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml b/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
index df280dba03dd9..8143fb72d157a 100644
--- a/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml,v 1.5 2004/08/12 08:31:36 den Exp $
 
      Original revision: 1.2
 -->
diff --git a/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile b/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
index 9cd2b17582bab..ba113856a7a24 100644
--- a/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
@@ -14,13 +14,13 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/abstract.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
-SRCS+=	../common/trouble.sgml
-SRCS+=	../common/upgrade.sgml
+SRCS+=	article.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/abstract.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
+SRCS+=	../common/trouble.xml
+SRCS+=	../common/upgrade.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml b/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
index b6c1767f7c5b2..cfe7bc0e0c5a6 100644
--- a/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml,v 1.5 2004/08/12 08:31:36 den Exp $
 
      Original revision: 1.2
 -->
diff --git a/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
index ac6fb72e90aa0..646c278327430 100644
--- a/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
@@ -14,11 +14,11 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
-SRCS+=	../../../en_US.ISO8859-1/installation/sparc64/install.sgml
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/install.sgml
-SRCS+=	../common/layout.sgml
+SRCS+=	article.xml
+SRCS+=	../../../en_US.ISO8859-1/installation/sparc64/install.xml
+SRCS+=	../common/artheader.xml
+SRCS+=	../common/install.xml
+SRCS+=	../common/layout.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
index 90b0ae44da0af..e9186abdf0c48 100644
--- a/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml,v 1.5 2004/08/12 08:31:36 den Exp $
+     $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
 -->
diff --git a/release/doc/ru_RU.KOI8-R/readme/Makefile b/release/doc/ru_RU.KOI8-R/readme/Makefile
index 9b6f10fff3284..e5cc54f6bb21e 100644
--- a/release/doc/ru_RU.KOI8-R/readme/Makefile
+++ b/release/doc/ru_RU.KOI8-R/readme/Makefile
@@ -24,7 +24,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/readme/article.sgml b/release/doc/ru_RU.KOI8-R/readme/article.xml
index fa45cd9d1632b..26a8bf363781a 100644
--- a/release/doc/ru_RU.KOI8-R/readme/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/readme/article.xml
@@ -2,7 +2,7 @@
    The FreeBSD Russian Documentation Project
 
    $FreeBSD$
-   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/readme/article.sgml,v 1.11 2005/06/30 11:12:33 den Exp $
+   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/readme/article.xml,v 1.11 2005/06/30 11:12:33 den Exp $
 
    Original revision: 1.37
 -->
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile
index 2587e1c086359..9dc27f87cd19f 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile
@@ -15,9 +15,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
index 11ed2dc30d680..82fafc7a25d6b 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile
index 97dedc60f8e26..a311eac1fe416 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile
@@ -15,9 +15,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
index 14ee728555311..c1b9a58db3ba0 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.4
 -->
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml b/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
index 415ef6238fe99..e95711ed30cc7 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.29 2005/07/08 10:19:47 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml,v 1.29 2005/07/08 10:19:47 den Exp $
 
      Original revision: 1.880
 -->
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent b/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent
index 96df30653d6e2..21ff7688f3b96 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent
+++ b/release/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent
@@ -19,5 +19,5 @@
 
 <!-- Files to be included -->
 
-<!ENTITY art SYSTEM "../common/new.sgml">
+<!ENTITY art SYSTEM "../common/new.xml">
 
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile
index 2bbe5e9a9f415..7827cbf7f7547 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile
@@ -15,9 +15,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 URL_RELPREFIX?=	../../../../..
 
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
index debdea7acc2c1..9609eac608fdb 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.7
 -->
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile
index 62016749f7417..cf8734d4c3068 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile
@@ -15,9 +15,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
index 9c15d726694a3..344ef0325be4f 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.4
 -->
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile
index 2abd4f2247171..1858165e3d792 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile
@@ -15,9 +15,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
index ede9cc3f093dd..d4dad0be7eacc 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml,v 1.7 2004/08/12 08:31:37 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml,v 1.7 2004/08/12 08:31:37 den Exp $
 
      Original revision: 1.4
 -->
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile
index 6084f36a61603..9984f3ab65756 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile
@@ -15,9 +15,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.sgml
+SRCS+=	../common/new.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
index 957adaa190b40..b3f33758bc0c4 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml,v 1.7 2004/08/12 08:31:38 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml,v 1.7 2004/08/12 08:31:38 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl b/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl
index 7f36ca10d0521..a12a679c555b4 100644
--- a/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl
+++ b/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl
@@ -6,7 +6,7 @@
 #
 # Example:
 # cd /usr/src/release/doc/ru_RU.KOI8-R
-# perl share/examples/dev-auto-translate.pl -o share/sgml/dev-auto-ru.sgml < ../share/sgml/dev-auto.sgml
+# perl share/examples/dev-auto-translate.pl -o share/xml/dev-auto-ru.sgml < ../share/xml/dev-auto.sgml
 #
 # This script is maintained only in HEAD branch.
 
diff --git a/release/doc/ru_RU.KOI8-R/share/sgml/catalog b/release/doc/ru_RU.KOI8-R/share/xml/catalog
index a8ea7378ae007..f4e131ec98c2c 100644
--- a/release/doc/ru_RU.KOI8-R/share/sgml/catalog
+++ b/release/doc/ru_RU.KOI8-R/share/xml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Language-specific --
 
-  -- $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/catalog,v 1.3 2005/03/10 11:04:21 den Exp $ --
+  -- $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/xml/catalog,v 1.3 2005/03/10 11:04:21 den Exp $ --
   -- $FreeBSD$ --
 
   -- Original revision: 1.1 --
@@ -9,4 +9,4 @@
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "release.dsl"
 PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU"
-       "dev-auto-ru.sgml"
+       "dev-auto-ru.xml"
diff --git a/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml b/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml
index 9084f8981e047..5d7b4fae27cd0 100644
--- a/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml
+++ b/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml
@@ -10,7 +10,7 @@
      This script maintained in HEAD branch.
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml,v 1.5 2005/06/30 12:11:18 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml,v 1.5 2005/06/30 12:11:18 den Exp $
 -->
 <!ENTITY hwlist.62c9ec99a9ca598d738dcf66b339aa1e 'Контроллеры, поддерживаемые драйвером &man.aac.4;, включая:'>
 <!ENTITY hwlist.43922be022d49dabc274b2afffd0db8b 'Драйвер &man.adv.4; поддерживает следующие контроллеры SCSI:'>
diff --git a/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl b/release/doc/ru_RU.KOI8-R/share/xml/release.dsl
index 96cf087b371e7..cad76eac45a7a 100644
--- a/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl
+++ b/release/doc/ru_RU.KOI8-R/share/xml/release.dsl
@@ -1,7 +1,7 @@
 <!--
   The FreeBSD Russian Documentation Project
 
-  $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl,v 1.5 2004/09/13 08:00:12 den Exp $
+  $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/xml/release.dsl,v 1.5 2004/09/13 08:00:12 den Exp $
   $FreeBSD$
   
   Original revision: 1.8
diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk
index d05e35923ea8e..e78c5274ef0f4 100644
--- a/release/doc/share/mk/doc.relnotes.mk
+++ b/release/doc/share/mk/doc.relnotes.mk
@@ -3,12 +3,12 @@
 DOC_PREFIX?= ${RELN_ROOT}/../../../doc
 
 # Find the RELNOTESng document catalogs
-EXTRA_CATALOGS+= ${RELN_ROOT}/${LANGCODE}/share/sgml/catalog
-EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/${LANGCODE}/share/xml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/share/xml/catalog
 
 # Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLHTML?=	${RELN_ROOT}/share/sgml/default.dsl
-DSLPRINT?=	${RELN_ROOT}/share/sgml/default.dsl
+DSLHTML?=	${RELN_ROOT}/share/xml/default.dsl
+DSLPRINT?=	${RELN_ROOT}/share/xml/default.dsl
 
 #
 # Automatic device list generation:
@@ -22,8 +22,8 @@ MAN4DIR?=	${RELN_ROOT}/../../share/man/man4
 .endif
 MAN4PAGES?=	${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4
 ARCHLIST?=	${RELN_ROOT}/share/misc/dev.archlist.txt
-DEV-AUTODIR=	${RELN_ROOT:S/${.CURDIR}/${.OBJDIR}/}/share/sgml
-CLEANFILES+=	${DEV-AUTODIR}/dev-auto.sgml ${DEV-AUTODIR}/catalog-auto
+DEV-AUTODIR=	${RELN_ROOT:S/${.CURDIR}/${.OBJDIR}/}/share/xml
+CLEANFILES+=	${DEV-AUTODIR}/dev-auto.xml ${DEV-AUTODIR}/catalog-auto
 
 MAN2HWNOTES_CMD=${RELN_ROOT}/share/misc/man2hwnotes.pl
 .if defined(HWNOTES_MI)
@@ -33,7 +33,7 @@ MAN2HWNOTES_FLAGS=	-c
 .endif
 
 # Dependency that the article makefiles can use to pull in
-# dev-auto.sgml.
-${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.sgml: ${MAN4PAGES} \
+# dev-auto.xml.
+${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.xml: ${MAN4PAGES} \
 	${ARCHLIST} ${MAN2HWNOTES_CMD}
-	cd ${RELN_ROOT}/share/sgml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.sgml
+	cd ${RELN_ROOT}/share/xml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.xml
diff --git a/release/doc/share/sgml/Makefile b/release/doc/share/xml/Makefile
index e15b14189e7c9..d7112ecdd6bc4 100644
--- a/release/doc/share/sgml/Makefile
+++ b/release/doc/share/xml/Makefile
@@ -5,11 +5,11 @@ RELN_ROOT?= ${.CURDIR}/../..
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
-dev-auto.sgml: ${MAN4PAGES} ${ARCHLIST} ${MAN2HWNOTES_CMD} catalog-auto
+dev-auto.xml: ${MAN4PAGES} ${ARCHLIST} ${MAN2HWNOTES_CMD} catalog-auto
 	${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES}
 
 catalog-auto:
 	${ECHO_CMD} 'PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN"' \
-		'"dev-auto.sgml"' > ${.TARGET}
+		'"dev-auto.xml"' > ${.TARGET}
 
-all: dev-auto.sgml
+all: dev-auto.xml
diff --git a/release/doc/share/sgml/catalog b/release/doc/share/xml/catalog
index e456e6743159c..3f91cf0a9afcb 100644
--- a/release/doc/share/sgml/catalog
+++ b/release/doc/share/xml/catalog
@@ -10,6 +10,6 @@ PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//
        "release.dsl"
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
-       "../../en_US.ISO8859-1/share/sgml/release.dsl"
+       "../../en_US.ISO8859-1/share/xml/release.dsl"
 
 
diff --git a/release/doc/share/sgml/default.dsl b/release/doc/share/xml/default.dsl
index 58d82314f960b..58d82314f960b 100644
--- a/release/doc/share/sgml/default.dsl
+++ b/release/doc/share/xml/default.dsl
diff --git a/release/doc/share/sgml/release.dsl b/release/doc/share/xml/release.dsl
index 66e9ae24a412f..66e9ae24a412f 100644
--- a/release/doc/share/sgml/release.dsl
+++ b/release/doc/share/xml/release.dsl
diff --git a/release/doc/share/sgml/release.ent b/release/doc/share/xml/release.ent
index 60b71307c364b..60b71307c364b 100644
--- a/release/doc/share/sgml/release.ent
+++ b/release/doc/share/xml/release.ent
diff --git a/release/doc/zh_CN.GB2312/errata/Makefile b/release/doc/zh_CN.GB2312/errata/Makefile
index fc7790b21ca51..b584b5f732702 100644
--- a/release/doc/zh_CN.GB2312/errata/Makefile
+++ b/release/doc/zh_CN.GB2312/errata/Makefile
@@ -14,7 +14,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/zh_CN.GB2312/errata/article.sgml b/release/doc/zh_CN.GB2312/errata/article.xml
index df0b697b90984..c9fc0477c347e 100644
--- a/release/doc/zh_CN.GB2312/errata/article.sgml
+++ b/release/doc/zh_CN.GB2312/errata/article.xml
@@ -1,3 +1,23 @@
+<?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;">
+]>
+
 <!--
 	FreeBSD errata document.  Unlike some of the other RELNOTESng
 	files, this file should remain as a single SGML file, so that
@@ -13,28 +33,9 @@
 	Original Revision: 145264
 -->
 
-<!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>
   <articleinfo>
-    <title>&os;
-<![ %release.type.current [
-    &release.current;
-]]>
-<![ %release.type.snapshot [
-    &release.prev;
-]]>
-<![ %release.type.release [
-    &release.current;
-]]>
-    ╥╒пп╟Ф©╠нС</title>
+    <title>&os; &release; ╥╒пп╟Ф©╠нС</title>
 
     <corpauthor>
     The &os; Project
diff --git a/release/doc/zh_CN.GB2312/hardware/Makefile b/release/doc/zh_CN.GB2312/hardware/Makefile
index 5aab040299b20..53037dd8ab035 100644
--- a/release/doc/zh_CN.GB2312/hardware/Makefile
+++ b/release/doc/zh_CN.GB2312/hardware/Makefile
@@ -19,9 +19,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+=	${DEV-AUTODIR}/dev-auto.xml
 
 CATALOGS+=	-c ${DEV-AUTODIR}/catalog-auto
 
diff --git a/release/doc/zh_CN.GB2312/hardware/article.sgml b/release/doc/zh_CN.GB2312/hardware/article.xml
index 52683bef50e1e..676e0cec4fb7f 100644
--- a/release/doc/zh_CN.GB2312/hardware/article.sgml
+++ b/release/doc/zh_CN.GB2312/hardware/article.xml
@@ -1,14 +1,15 @@
-<!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;
+<?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">
 %devauto;
 
 <!-- Text constants which probably don't need to be changed.-->
-
 ]>
 
 <article>
diff --git a/release/doc/zh_CN.GB2312/readme/Makefile b/release/doc/zh_CN.GB2312/readme/Makefile
index a2b9bd677d4cc..e6bef9eeda8cf 100644
--- a/release/doc/zh_CN.GB2312/readme/Makefile
+++ b/release/doc/zh_CN.GB2312/readme/Makefile
@@ -21,7 +21,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/zh_CN.GB2312/readme/article.sgml b/release/doc/zh_CN.GB2312/readme/article.xml
index 9c5bafc0cda0d..177b2b8d3f443 100644
--- a/release/doc/zh_CN.GB2312/readme/article.sgml
+++ b/release/doc/zh_CN.GB2312/readme/article.xml
@@ -1,16 +1,18 @@
+<?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 Documentation Project
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 179456
 -->
-<!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>
   <articleinfo>
diff --git a/release/doc/zh_CN.GB2312/relnotes/Makefile b/release/doc/zh_CN.GB2312/relnotes/Makefile
index a3c3e459a349d..41cc98946269e 100644
--- a/release/doc/zh_CN.GB2312/relnotes/Makefile
+++ b/release/doc/zh_CN.GB2312/relnotes/Makefile
@@ -19,7 +19,7 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.sgml
+SRCS+=	article.xml
 
 URL_RELPREFIX?=	../../../..
 
diff --git a/release/doc/zh_CN.GB2312/relnotes/article.sgml b/release/doc/zh_CN.GB2312/relnotes/article.xml
index e23015977f341..e370971ae2fb4 100644
--- a/release/doc/zh_CN.GB2312/relnotes/article.sgml
+++ b/release/doc/zh_CN.GB2312/relnotes/article.xml
@@ -1,6 +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;
+<?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;
diff --git a/release/doc/zh_CN.GB2312/share/sgml/catalog b/release/doc/zh_CN.GB2312/share/xml/catalog
index b7a9741236663..b7a9741236663 100644
--- a/release/doc/zh_CN.GB2312/share/sgml/catalog
+++ b/release/doc/zh_CN.GB2312/share/xml/catalog
diff --git a/release/doc/zh_CN.GB2312/share/sgml/release.dsl b/release/doc/zh_CN.GB2312/share/xml/release.dsl
index d9688d6c7a079..d9688d6c7a079 100644
--- a/release/doc/zh_CN.GB2312/share/sgml/release.dsl
+++ b/release/doc/zh_CN.GB2312/share/xml/release.dsl