- Bump versions and revert XML migration of the release documents in

  releng/9.1 branch.  The doc tree release/9.1.0 for this release still uses
  SGML toolchain[1].

- Add SVNROOT{BASE,SRC,DOC,PORTS} for subversion repository URLs and
  BRANCH{SRC,DOC,PORTS} for the branches to generate-release.sh, and
  remove -p, -r, -d options.  The revision to be built should be specified
  in the URL.

- Add {WORLD,KERNEL}_FLAGS to generate-release.sh.  These were supported in
  the old release build framework.

- Disable to use binary package for docproj port during a release build.
  This package should be built successfully.

Pointy hat to:	hrs [1]
Approved by:	re (implicitly)

247 files changed, 1523 insertions, 3309 deletions

diff --git a/release/doc/Makefile b/release/doc/Makefile
index 18d4d8f64104..02e41931c19f 100644
--- a/release/doc/Makefile
+++ b/release/doc/Makefile
@@ -8,31 +8,9 @@ SUBDIR+= 	${RELNOTES_LANG}
 .else
 SUBDIR+=	en_US.ISO8859-1
 .endif
-SUBDIR+=	share/xml
+SUBDIR+=	share/sgml
 
 RELN_ROOT?= ${.CURDIR}
 
-.if defined(SUPHOST)
-SUPFLAGS+=	-h ${SUPHOST}
-.endif
-update:
-.if defined(SUP_UPDATE)
-.if !defined(DOCSUPFILE)
-	@echo "Error: Please define DOCSUPFILE before doing make update."
-	@exit 1
-.endif
-	@echo "--------------------------------------------------------------"
-	@echo ">>> Running ${SUP}"
-	@echo "--------------------------------------------------------------"
-	@${SUP} ${SUPFLAGS} ${DOCSUPFILE}
-.elif defined(CVS_UPDATE)
-	@echo "--------------------------------------------------------------"
-	@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; cvs -q update -P -d
-.else
-	@echo "Error: Please define either SUP_UPDATE or CVS_UPDATE first."
-.endif
-
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.subdir.mk"
diff --git a/release/doc/README b/release/doc/README
index 93cc12b40154..b57b10a671d5 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/xml/catalog
+share/sgml/catalog
 	Main SGML catalog for all language-neutral (and default EN)
 	stylesheet and entity files.  Can be overridden if needed for
 	translations.
-share/xml/default.dsl
+share/sgml/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/xml/release.dsl
+share/sgml/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/xml/release.ent
+share/sgml/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/xml/release.dsl
+en_US.ISO8859-1/share/sgml/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/xml/release.dsl and */share/xml/catalog.
+	*/share/sgml/release.dsl and */share/sgml/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/xml/release.ent file; release engineers should peruse the
+share/sgml/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/xml/release.dsl, a ${LANG}/share/xml/catalog that
+${LANG}/share/sgml/release.dsl, a ${LANG}/share/sgml/catalog that
 points to it, and a new definition in the Makefiles that adds
-${LANG}/share/xml/catalog to EXTRA_CATALOGS.  Except for the Makefile
+${LANG}/share/sgml/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 7fd0b200d826..8019ccac94dd 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.xml
+SRCS+= article.sgml
 
 .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.xml b/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml
index dac9365f436b..49d3af042562 100644
--- a/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
+++ b/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml
@@ -1,22 +1,35 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-
-<!ENTITY release.4x "4.<replaceable>X</replaceable>">
-<!ENTITY release.5x "5.<replaceable>X</replaceable>">
-]>
-
 <!--
   The FreeBSD Documentation Project
   The FreeBSD German Documentation Project
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/early-adopter/article.xml,v 1.24 2003/05/25 12:44:41 mheinen Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.24 2003/05/25 12:44:41 mheinen Exp $
   basiert auf: 1.15
 -->
 
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+%freebsd;
+
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
+%teams;
+
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mailing-lists;
+
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+
+<!ENTITY release.4x "4.<replaceable>X</replaceable>">
+<!ENTITY release.5x "5.<replaceable>X</replaceable>">
+
+]>
+
 <article lang="de">
   <articleinfo>
     <title>Hinweise f&uuml;r die ersten Anwender von &os;
diff --git a/release/doc/de_DE.ISO8859-1/errata/Makefile b/release/doc/de_DE.ISO8859-1/errata/Makefile
index b254368ac2f5..de5344dfeec1 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.xml
+SRCS+=	article.sgml
 
 .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.xml b/release/doc/de_DE.ISO8859-1/errata/article.sgml
index baaae0c8196e..f7a8d284d128 100644
--- a/release/doc/de_DE.ISO8859-1/errata/article.xml
+++ b/release/doc/de_DE.ISO8859-1/errata/article.sgml
@@ -1,11 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-]>
-
 <!--
 	FreeBSD errata document.  Unlike some of the other RELNOTESng
 	files, this file should remain as a single SGML file, so that
@@ -16,10 +8,23 @@
 	(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.xml,v 1.39 2003/05/24 13:23:46 ue Exp $
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/errata/article.sgml,v 1.39 2003/05/24 13:23:46 ue Exp $
 	basiert auf: 1.38
 -->
 
+<!DOCTYPE ARTICLE PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE">
+%translators;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+]>
+
 <article lang="de">
   <articleinfo>
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile b/release/doc/de_DE.ISO8859-1/hardware/alpha/Makefile
index 535c079f6010..7b97c3801700 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.xml
-SRCS+=	proc-alpha.xml
+SRCS+=	article.sgml
+SRCS+=	proc-alpha.sgml
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 
 .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.sgml
new file mode 100644
index 000000000000..c09494b4f657
--- /dev/null
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml
@@ -0,0 +1,32 @@
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/article.sgml,v 1.5 2002/10/12 18:02:21 ue Exp $
+  basiert auf: 1.4
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE">
+%translators;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "alpha">
+<!ENTITY arch.print "Alpha/AXP">
+
+]>
+
+<article lang="de">
+  &artheader;
+  &sect.intro;
+  &sect.proc.alpha;
+  &sect.dev;
+</article>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
deleted file mode 100644
index 78683a951b7f..000000000000
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "alpha">
-<!ENTITY arch.print "Alpha/AXP">
-]>
-
-<!--
-  $FreeBSD$
-  $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
--->
-
-<article lang="de">
-  &artheader;
-  &sect.intro;
-  &sect.proc.alpha;
-  &sect.dev;
-</article>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml
index 3103b9344762..30ceb44a084f 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml,v 1.35 2003/05/24 19:11:43 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml,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.xml b/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml
index d890400eb3ec..94a9d0fc8f5f 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/artheader.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml
@@ -1,6 +1,6 @@
 <!--
 	$FreeBSD$
-	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/artheader.xml,v 1.4 2003/01/09 12:14:47 ue Exp $
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/artheader.sgml,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.xml b/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml
index 2cb36da5c59d..020bffc69d2a 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml
@@ -1,6 +1,6 @@
 <!--
 
-	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/dev.xml,v 1.84 2003/05/25 09:36:36 ue Exp $
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/dev.sgml,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 7c43a92693a9..7a8048bd2379 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.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">
+<!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">
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml b/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml
index c7813083d5a7..1ff4a5a9a12c 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/intro.sgml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/intro.xml,v 1.6 2003/05/24 21:35:15 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/intro.sgml,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 03d16e97b3a0..e8ec75f3dbce 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.xml 
-SRCS+=	proc-i386.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-i386.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 
 .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.sgml
new file mode 100644
index 000000000000..fdbf5d31d3b8
--- /dev/null
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml
@@ -0,0 +1,30 @@
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/article.sgml,v 1.5 2002/12/07 21:09:09 ue Exp $
+  basiert auf: 1.4
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "i386">
+<!ENTITY arch.print "i386">
+
+]>
+
+<article lang="de">
+  &artheader;
+  &sect.intro;
+  &sect.proc.i386;
+  &sect.dev;
+</article>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml b/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
deleted file mode 100644
index 8c10a150f0fb..000000000000
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "i386">
-<!ENTITY arch.print "i386">
-]>
-
-<!--
-  $FreeBSD$
-  $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
--->
-
-<article lang="de">
-  &artheader;
-  &sect.intro;
-  &sect.proc.i386;
-  &sect.dev;
-</article>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml b/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml
index 889f38ccb092..5c5273b1244a 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/proc-i386.xml,v 1.13 2003/05/24 21:49:22 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml,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 62383695bfc8..5531a50226cd 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.xml 
-# SRCS+=	proc-ia64.xml 
+SRCS+=	article.sgml 
+# SRCS+=	proc-ia64.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 
 .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.xml b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml
index 294310bee8c3..01c6ef708f53 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml
@@ -1,22 +1,26 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/article.sgml,v 1.6 2003/05/24 21:52:46 ue Exp $
+  basiert auf: 1.3
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
-]>
 
-<!--
-  $FreeBSD$
-  $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
--->
+]>
 
 <article lang="de">
   &artheader;
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml b/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml
index 00c733aa91ad..9119a2a330fb 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml,v 1.5 2003/05/24 22:16:24 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml,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 d00de40769ea..7b3a0a86844c 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.xml 
-SRCS+=	proc-pc98.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-pc98.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 
 .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.sgml
new file mode 100644
index 000000000000..5911d341237e
--- /dev/null
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml
@@ -0,0 +1,30 @@
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/article.sgml,v 1.2 2002/10/12 18:02:22 ue Exp $
+  basiert auf: 1.1
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "pc98">
+<!ENTITY arch.print "NEC PC-98x1">
+
+]>
+
+<article lang="de">
+  &artheader;
+  &sect.intro;
+  &sect.proc.pc98;
+  &sect.dev;
+</article>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
deleted file mode 100644
index 6fea27e7fdbe..000000000000
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "pc98">
-<!ENTITY arch.print "NEC PC-98x1">
-]>
-
-<!--
-  $FreeBSD$
-  $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
--->
-
-<article lang="de">
-  &artheader;
-  &sect.intro;
-  &sect.proc.pc98;
-  &sect.dev;
-</article>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml b/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml
index 22bc97156095..9dbc7047f4ea 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml,v 1.3 2003/01/13 20:30:49 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml,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 98813cf5745a..2ae7bfd36d18 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.xml 
-SRCS+=	proc-sparc64.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-sparc64.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 
 .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.sgml
new file mode 100644
index 000000000000..7e3b0ebc3d56
--- /dev/null
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml
@@ -0,0 +1,29 @@
+<!--
+	$FreeBSD$
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/article.sgml,v 1.7 2003/01/09 12:46:28 ue Exp $
+	basiert auf: 1.3
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "sparc64">
+<!ENTITY arch.print "UltraSPARC">
+]>
+
+<article lang="de">
+  &artheader;
+  &sect.intro;
+  &sect.proc.sparc64;
+  &sect.dev;
+</article>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
deleted file mode 100644
index fa202499638c..000000000000
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "sparc64">
-<!ENTITY arch.print "UltraSPARC">
-]>
-
-<!--
-	$FreeBSD$
-	$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
--->
-
-<article lang="de">
-  &artheader;
-  &sect.intro;
-  &sect.proc.sparc64;
-  &sect.dev;
-</article>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
index 87d49bf518bb..9563a4fc146c 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
@@ -1,6 +1,6 @@
 <!--
-  $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 $
+  $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 $
   basiert auf: 1.3
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
index 363434fb0749..4b6b351adf47 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
@@ -1,6 +1,6 @@
 <!--
 	$FreeBSD$
-	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml,v 1.10 2003/02/08 07:43:14 ue Exp $
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml,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 78f1bc369441..f0092048aecb 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.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
+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
 
 .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.xml b/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
index e859ce17e9d9..16ca34e610fb 100644
--- a/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/alpha/article.sgml
@@ -1,7 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/alpha/article.sgml,v 1.4 2002/10/12 18:02:23 ue Exp $
+  basiert auf: 1.3
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -12,12 +21,6 @@
 <!ENTITY arch.print "Alpha/AXP">
 ]>
 
-<!--
-  $FreeBSD$
-  $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
--->
-
 <article lang="de">
   &artheader;
   &abstract;
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml b/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml
index 4d467dd094c7..8dd1c0244116 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/abstract.sgml
@@ -1,7 +1,7 @@
 <!--
   $FreeBSD$
-  $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 $
+  $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 $
   basiert auf: 1.2
 -->
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml b/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml
index ea171f826644..58396b8006e4 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/artheader.sgml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/artheader.xml,v 1.3 2003/01/09 12:17:18 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/artheader.sgml,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 60f6fe96fe47..5ce38e015a2e 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.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">
+<!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">
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/install.xml b/release/doc/de_DE.ISO8859-1/installation/common/install.sgml
index 8f313f6c76f6..76588c371bf6 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/install.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/install.sgml
@@ -1,10 +1,10 @@
 <!--
 
 $FreeBSD$
-$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/install.xml,v 1.18 2003/05/24 19:11:45 ue Exp $
+$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/install.sgml,v 1.18 2003/05/24 19:11:45 ue Exp $
 basiert auf: 1.20
 
-install.xml
+install.sgml
 
 This file has architecture-dependent installation instructions, culled
 from {alpha,i386}/INSTALL.TXT.
@@ -26,7 +26,7 @@ from {alpha,i386}/INSTALL.TXT.
     ausf&uuml;hrlichen, bebilderten Installationsleitung.</para>
 
   <para>Wenn Sie eine &auml;ltere Version von &os; aktualisieren
-    wollen, sollten Sie <xref linkend="upgrading"/>, Aktualisierung von
+    wollen, sollten Sie <xref linkend="upgrading">, Aktualisierung von
     FreeBSD, lesen.</para>
 
   <sect2 id="getting-started">
@@ -60,7 +60,7 @@ from {alpha,i386}/INSTALL.TXT.
 
     <para>Irgend etwas kann immer schiefgehen und wenn Ihnen das
       passiert, sollten Sie einen Blick in <xref
-      linkend="trouble"/> werfen, wo Sie hilfreiche Informationen
+      linkend="trouble"> werfen, wo Sie hilfreiche Informationen
       finden k&ouml;nnen.  Sie sollten ebenfalls einen Blick auf die
       aktuelle Version von <filename>ERRATA.TXT</filename> werfen,
       bevor Sie mit der Installation beginnen, da Sie dort
@@ -76,7 +76,6 @@ from {alpha,i386}/INSTALL.TXT.
         Backup haben, bevor Sie die Installation
         durchf&uuml;hren.</para>
     </important>
-  </sect2>
 
   <sect2>
     <title>Hardware-Anforderungen</title>
@@ -287,7 +286,7 @@ from {alpha,i386}/INSTALL.TXT.
             benutzen, k&ouml;nnen Sie das Script
             <filename>makeflp.bat</filename> verwenden.  Weitere
             Informationen zu diesem Thema finden Sie im Kapitel <xref
-            linkend="floppies"/>.  Danach m&uuml;ssen Sie nur noch von
+            linkend="floppies">.  Danach m&uuml;ssen Sie nur noch von
             der ersten Diskette booten, um die &os;-Installation zu
             starten.</para>
         </listitem>
@@ -307,7 +306,7 @@ from {alpha,i386}/INSTALL.TXT.
 	    benutzen, k&ouml;nnen Sie das Script
 	    <filename>makeflp.bat</filename> verwenden.  Weitere
 	    Informationen zu diesem Thema finden Sie im Kapitel <xref
-	    linkend="floppies"/>.  Danach m&uuml;ssen Sie nur noch von
+	    linkend="floppies">.  Danach m&uuml;ssen Sie nur noch von
 	    der ersten Diskette booten, um die &os;-Installation zu
 	    starten.</para>
 	</listitem>
@@ -321,12 +320,12 @@ from {alpha,i386}/INSTALL.TXT.
       m&uuml;ssen Sie ebenfalls die beiden &os; Bootdisketten aus den
       Dateien <filename>floppies/kern.flp</filename> und
       <filename>floppies/mfsroot.flp</filename> erzeugen, wie in
-      <xref linkend="floppies"/> beschrieben.  Booten Sie Ihren
+      <xref linkend="floppies"> beschrieben.  Booten Sie Ihren
       Rechner von der Diskette mit <filename>kern.flp</filename>; und
       legen Sie die Diskette mit <filename>mfsroot.flp</filename> ein,
       sobald Sie dazu aufgefordert werden.  Weitere Informationen zu
       dieser Art der Installation finden Sie in <xref
-      linkend="ftpnfs"/>.</para>
+      linkend="ftpnfs">.</para>
 
     <para arch="pc98">Wenn Ihr Rechner kein CDROM Laufwerk hat,
       k&ouml;nnen Sie &os;  auch direkt &uuml;ber das Internet
@@ -335,12 +334,12 @@ from {alpha,i386}/INSTALL.TXT.
       Bootdisketten aus den Dateien
       <filename>floppies/kern.flp</filename> und
       <filename>floppies/mfsroot.flp</filename> erzeugen, wie in <xref
-      linkend="floppies"/> beschrieben.  Booten Sie Ihren Rechner von
+      linkend="floppies"> beschrieben.  Booten Sie Ihren Rechner von
       der Diskette mit <filename>kern.flp</filename>;  und legen Sie
       die Diskette mit <filename>mfsroot.flp</filename> ein, sobald
       Sie dazu aufgefordert werden.  Weitere Informationen zu dieser
       Art der Installation finden Sie in <xref
-      linkend="ftpnfs"/>.</para>
+      linkend="ftpnfs">.</para>
 
 <!-- alpha text starts here -->
 
@@ -359,7 +358,7 @@ from {alpha,i386}/INSTALL.TXT.
       Bootdisketten aus den Dateien
       <filename>floppies/kern.flp</filename> und
       <filename>floppies/mfsroot.flp</filename> erzeugen, wie in
-      <xref linkend="floppies"/> beschrieben.  Legen Sie die
+      <xref linkend="floppies"> beschrieben.  Legen Sie die
       Diskette mit dem Inhalt von <filename>kern.flp</filename> ein
       und geben Sie an der Eingabeaufforderung des SRM
       (<literal>&gt;&gt;&gt;</literal>) den folgenden Befehl ein, um
@@ -401,8 +400,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID:  830b92d4.</screen>
 
     <screenco arch="sparc64">
       <areaspec>
-	<area id="prompt-single" coords="1 5"/>
-	<area id="prompt-smp" coords="2 5"/>
+	<area id="prompt-single" coords="1 5">
+	<area id="prompt-smp" coords="2 5">
       </areaspec>
 
       <screen><prompt>ok </prompt>
@@ -507,7 +506,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 
       <para>Wenn Sie von einem lokalen CDROM installieren wollen,
         sollten Sie nicht dieses Kapitel lesen, sondern
-        <xref linkend="start-installation"/>.  Wenn in Ihrem System
+        <xref linkend="start-installation">.  Wenn in Ihrem System
         kein CDROM vorhanden ist und Sie eine &os; CD benutzen wollen,
         die in einem CDROM Laufwerk eines anderen Systems liegt und
         Sie dieses System &uuml;ber ein Netzwerk erreichen
@@ -581,10 +580,10 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
         Installation vorbereiten.</para>
 
       <para>Der erste Schritt ist die Erstellung der Bootdisketten,
-        wie in <xref linkend="floppies"/> beschrieben.</para>
+        wie in <xref linkend="floppies"> beschrieben.</para>
 
       <para>Der zweite Schritt ist, einen Blick in <xref
-        linkend="layout"/> zu werfen.  Das Kapitel <quote>Distribution
+        linkend="layout"> zu werfen.  Das Kapitel <quote>Distribution
         Format</quote> ist besonders wichtig, da Sie hier erfahren,
         welche Dateien Sie auf Diskette &uuml;bertragen m&uuml;ssen
         und welche Sie ignorieren k&ouml;nnen.</para>
@@ -734,14 +733,14 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       </note>
 
       <para>Der letzte Schritt ist die Erzeugung der Bootdisketten,
-        siehe <xref linkend="floppies"/>.</para>
+        siehe <xref linkend="floppies">.</para>
     </sect3>
 
     <sect3 id="ftpnfs">
       <title>Netzwerk-Installation mit FTP oder NFS</title>
 
       <para>Wenn Sie die Bootdisketten erzeugt haben, wie in <xref
-        linkend="floppies"/> beschrieben, k&ouml;nnen Sie die restliche
+        linkend="floppies"> beschrieben, k&ouml;nnen Sie die restliche
         Installation &uuml;ber eine Netzwerk-Verbindung
         durchf&uuml;hren, wobei drei Arten von Netzwerkverbindungen
         unterst&uuml;tzt werden: seriell, parallel, oder
@@ -982,7 +981,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
           <para>Wenn Sie keine Meldungen auf Ihrer seriellen Konsole
             sehen, m&uuml;ssen Sie die Tastatur wieder einstecken und
             auf ein Tonsignal warten.  Wenn Sie von CD booten, machen
-            Sie bei <xref linkend="hitspace"/> weiter, wenn Sie das
+            Sie bei <xref linkend="hitspace"> weiter, wenn Sie das
             Tonsignal h&ouml;ren..</para>
         </step>
 
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/layout.xml b/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml
index 73de4aa63255..99fc17fef5fe 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/layout.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/layout.xml,v 1.5 2002/11/09 23:07:18 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/layout.sgml,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.
@@ -23,7 +23,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
   <para>Wenn Sie dieses Verzeichnis f&uuml;r eine CD-, FTP- oder
     NFS-Installation nutzen wollen, brauchen Sie nur die beiden 1.44
     MByte gro&szlig;en Bootdisketten zu erstellen (wie das geht, ist
-    in <xref linkend="floppies"/> beschrieben), von diesen zu booten,
+    in <xref linkend="floppies"> beschrieben), von diesen zu booten,
     und dann den Anweisungen zu folgen.  Alle anderen Dateien, die
     f&uuml;r die Installation notwendig sind, werden auf der Grundlage
     Ihrer Angaben automatisch geholt.  Wenn Sie &os; noch nie
@@ -86,7 +86,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
       <para>Das Verzeichnis <filename>floppies/</filename>
         enth&auml;lt die Images der Bootdisketten.  Informationen, wie
         man diese Images benutzt, finden Sie in <xref
-        linkend="floppies"/>.</para>
+        linkend="floppies">.</para>
     </listitem>
 
     <listitem>
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml b/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml
index ee6284ec61b8..0e7c726b9518 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/trouble.xml,v 1.13 2003/05/24 19:11:45 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/trouble.sgml,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.xml b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
index e61129d8d18f..54539debfca2 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/upgrade.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/upgrade.xml,v 1.10 2003/05/24 19:11:45 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/upgrade.sgml,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 90a4029bab60..c3eb92c6cf46 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.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
+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
 
 .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.xml b/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
index 8428cc3402b1..5e5f42f9316b 100644
--- a/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml
@@ -1,7 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/i386/article.sgml,v 1.5 2002/12/07 21:09:56 ue Exp $
+  basiert auf: 1.4
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,13 +19,8 @@
 
 <!ENTITY arch "i386">
 <!ENTITY arch.print "i386">
-]>
 
-<!--
-  $FreeBSD$
-  $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
--->
+]>
 
 <article lang="de">
   &artheader;
diff --git a/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile b/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
index addf11d5e440..b0e2b5080750 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.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
+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
 
 .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.xml b/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml
index e98d6e75e5b9..bcf65ce7d0b1 100644
--- a/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml
@@ -1,7 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/ia64/article.sgml,v 1.1 2002/11/09 20:07:25 ue Exp $
+  basiert auf: 1.1
+-->
+
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,13 +20,8 @@
 
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
-]>
 
-<!--
-  $FreeBSD$
-  $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
--->
+]>
 
 <article lang="de">
 &artheader;
diff --git a/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile b/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
index e243d77f60e6..0e431f0899c9 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.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
+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
 
 .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.xml b/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml
index f38f37db2494..916e1027e603 100644
--- a/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/pc98/article.sgml
@@ -1,7 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/pc98/article.sgml,v 1.2 2002/10/12 18:02:23 ue Exp $
+  basiert auf: 1.1
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,13 +19,8 @@
 
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
-]>
 
-<!--
-  $FreeBSD$
-  $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
--->
+]>
 
 <article lang="de">
 &artheader;
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile b/release/doc/de_DE.ISO8859-1/installation/sparc64/Makefile
index f22afce4b84f..958e6aa03046 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.xml
-SRCS+=	install.xml
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/install.xml
-SRCS+=	../common/layout.xml
+SRCS+=	article.sgml
+SRCS+=	install.sgml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/install.sgml
+SRCS+=	../common/layout.sgml
 
 .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.xml b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml
index 30da93215133..473392e8002b 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml
@@ -1,8 +1,19 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/article.sgml,v 1.3 2002/11/16 12:10:42 ue Exp $
+  basiert auf: 1.4
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+
 <!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
+
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -13,12 +24,6 @@
 <!ENTITY arch.print "UltraSPARC">
 ]>
 
-<!--
-  $FreeBSD$
-  $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
--->
-
 <article lang="de">
   &artheader;
   &abstract;
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml b/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml
index 5fc8c79dec78..91b240b453cc 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/install.xml,v 1.10 2003/01/13 20:30:51 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/install.sgml,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 311a95b575d0..f65809eec366 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.xml
+SRCS+=	article.sgml
 
 .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.xml b/release/doc/de_DE.ISO8859-1/readme/article.sgml
index 2c255464e623..a64f50f4efa2 100644
--- a/release/doc/de_DE.ISO8859-1/readme/article.xml
+++ b/release/doc/de_DE.ISO8859-1/readme/article.sgml
@@ -1,18 +1,23 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-]>
-
 <!--
   The FreeBSD German Documentation Project
   The FreeBSD Documentation Project
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/readme/article.xml,v 1.18 2003/05/11 23:28:35 mheinen Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/readme/article.sgml,v 1.18 2003/05/11 23:28:35 mheinen Exp $
   basiert auf: 1.26
 -->
 
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+<!ENTITY % misc PUBLIC  "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+%misc;
+]>
+
 <article lang="de">
   <articleinfo>
     <title>&os; &release.current; README</title>
@@ -224,7 +229,7 @@
         wenn Sie an weiteren Informationen zu diesem Thema
         interessiert sind.  Zus&auml;tzliche Informationen zu diesem
         Thema finden Sie im Artikel <ulink
-        url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/hubs/">Mirroring
+        URL="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/hubs/">Mirroring
         FreeBSD</ulink>.</para>
 
       <para>Sie finden die f&uuml;r den Start der Installation
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile
index a1fa06f22776..4d7265652497 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
index 8dc4e549a361..ca3bf375d81d 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml
@@ -1,7 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/alpha/article.sgml,v 1.4 2002/10/12 18:02:24 ue Exp $
+  basiert auf: 1.3
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,13 +19,8 @@
 
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
-]>
 
-<!--
-  $FreeBSD$
-  $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
--->
+]>
 
 <article lang="de">
   &art;
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml b/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml
index 28383887c555..e4505c5c0c7a 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml
@@ -1,5 +1,5 @@
 <!--
-  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/common/new.xml,v 1.250 2003/05/24 22:38:23 ue Exp $
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/common/new.sgml,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 1bbef2071210..e7dc5f5c4653 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.xml">
+<!ENTITY art SYSTEM "../common/new.sgml">
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/i386/Makefile
index f9e1765a1c47..30d6a145ca33 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
index 450d29e826bf..2420f67f01fc 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml
@@ -1,7 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/i386/article.sgml,v 1.6 2002/12/07 22:11:35 ue Exp $
+  basiert auf: 1.4
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,14 +19,8 @@
 
 <!ENTITY arch "i386">
 <!ENTITY arch.print "i386">
-]>
 
-
-<!--
-  $FreeBSD$
-  $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
--->
+]>
 
 <article lang="de">
   &art;
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile
index 90ff5e5a51f8..e106b467ed96 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml
index 1406f2c25014..769af0af2714 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml
@@ -1,7 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/ia64/article.sgml,v 1.2 2002/11/10 10:47:53 ue Exp $
+  basiert auf: 1.1
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,12 +19,8 @@
 
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
+
 ]>
-<!--
-  $FreeBSD$
-  $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
--->
 
 <article lang="de">
   &art;
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile
index b27bd167e34b..33f8a62dbfe0 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml
index 79a8c5a108a4..49edccc09357 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml
@@ -1,7 +1,16 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/pc98/article.sgml,v 1.2 2002/10/12 18:02:25 ue Exp $
+  basiert auf: 1.1
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,14 +19,8 @@
 
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
-]>
 
-
-<!--
-  $FreeBSD$
-  $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
--->
+]>
 
 <article lang="de">
   &art;
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile
index 6eaeb22f3482..85ec1603c610 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.sgml
new file mode 100644
index 000000000000..4b121e13b148
--- /dev/null
+++ b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml
@@ -0,0 +1,30 @@
+<!--
+  $FreeBSD$
+  $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/sparc64/article.sgml,v 1.4 2002/10/12 18:02:25 ue Exp $
+  basiert auf: 1.3
+  -->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+
+<!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
+
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "sparc64">
+<!ENTITY arch.print "UltraSPARC">
+
+]>
+
+<article lang="de">
+  &art;
+</article>
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
deleted file mode 100644
index f2c328deafda..000000000000
--- a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "sparc64">
-<!ENTITY arch.print "UltraSPARC">
-]>
-
-<!--
-  $FreeBSD$
-  $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
-  -->
-
-<article lang="de">
-  &art;
-</article>
diff --git a/release/doc/de_DE.ISO8859-1/share/xml/catalog b/release/doc/de_DE.ISO8859-1/share/sgml/catalog
index d3b1a6dd1d5b..8530d26a582b 100644
--- a/release/doc/de_DE.ISO8859-1/share/xml/catalog
+++ b/release/doc/de_DE.ISO8859-1/share/sgml/catalog
@@ -2,7 +2,7 @@
   -- Language-specific --
 
   -- $FreeBSD$ --
-  -- $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/xml/catalog,v 1.6 2002/10/12 18:02:25 ue Exp $ --
+  -- $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/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/xml/release.dsl b/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
index 49bf4c121df9..79f4a8753bb2 100644
--- a/release/doc/de_DE.ISO8859-1/share/xml/release.dsl
+++ b/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl
@@ -1,6 +1,6 @@
 <!--
 	$FreeBSD$
-	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/xml/release.dsl,v 1.9 2003/05/24 22:43:52 ue Exp $
+	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/share/sgml/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 036609adc7ac..4dff58da06a9 100644
--- a/release/doc/en_US.ISO8859-1/errata/Makefile
+++ b/release/doc/en_US.ISO8859-1/errata/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
 RELN_ROOT?= ${.CURDIR}/../..
+LANGCODE=	en_US.ISO8859-1
+
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?= ${DOCDIR}/errata
 .else
@@ -13,7 +15,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.xml
+SRCS+=	article.sgml
 
 .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.sgml
new file mode 100644
index 000000000000..f25aff2e7706
--- /dev/null
+++ b/release/doc/en_US.ISO8859-1/errata/article.sgml
@@ -0,0 +1,211 @@
+<!--
+	FreeBSD errata document.  Unlike some of the other RELNOTESng
+	files, this file should remain as a single SGML file, so that
+	the dollar FreeBSD dollar header has a meaningful modification
+	time.  This file is all but useless without a datestamp on it,
+	so we'll take some extra care to make sure it has one.
+
+	(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.)
+
+-->
+
+<!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>
+    <title>&os;
+<![ %release.type.current [
+    &release.current;
+]]>
+<![ %release.type.snapshot [
+    &release.prev;
+]]>
+<![ %release.type.release [
+    &release.current;
+]]>
+    Errata</title>
+
+    <corpauthor>
+    The &os; Project
+    </corpauthor>
+
+    <pubdate>$FreeBSD$</pubdate>
+
+    <copyright>
+      <year>2012</year>
+      <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
+    </copyright>
+
+    <legalnotice id="trademarks" role="trademarks">
+      &tm-attrib.freebsd;
+      &tm-attrib.intel;
+      &tm-attrib.sparc;
+      &tm-attrib.general;
+    </legalnotice>
+  </articleinfo>
+
+  <abstract>
+    <para>This document lists errata items for &os;
+<![ %release.type.current [
+      &release.current;,
+]]>
+<![ %release.type.snapshot [
+      &release.prev;,
+]]>
+<![ %release.type.release [
+      &release.current;,
+]]>
+      containing significant information discovered after the release
+      or too late in the release cycle to be otherwise included in the
+      release documentation.
+      This information includes security advisories, as well as news
+      relating to the software or documentation that could affect its
+      operation or usability.  An up-to-date version of this document
+      should always be consulted before installing this version of
+      &os;.</para>
+
+    <para>This errata document for &os;
+<![ %release.type.current [
+      &release.current;
+]]>
+<![ %release.type.snapshot [
+      &release.prev;
+]]>
+<![ %release.type.release [
+      &release.current;
+]]>
+      will be maintained until the release of &os; &release.next;.</para>
+  </abstract>
+
+  <sect1 id="intro">
+    <title>Introduction</title>
+
+    <para>This errata document contains <quote>late-breaking news</quote>
+      about &os;
+<![ %release.type.current [
+      &release.current;.
+]]>
+<![ %release.type.snapshot [
+      &release.prev;.
+]]>
+<![ %release.type.release [
+      &release.current;.
+]]>
+      Before installing this version, it is important to consult this
+      document to learn about any post-release discoveries or problems
+      that may already have been found and fixed.</para>
+
+    <para>Any version of this errata document actually distributed
+      with the release (for example, on a CDROM distribution) will be
+      out of date by definition, but other copies are kept updated on
+      the Internet and should be consulted as the <quote>current
+      errata</quote> for this release.  These other copies of the
+      errata are located at <ulink
+      url="http://www.FreeBSD.org/releases/"></ulink>, plus any sites
+      which keep up-to-date mirrors of this location.</para>
+
+    <para>Source and binary snapshots of &os; &release.branch; also
+      contain up-to-date copies of this document (as of the time of
+      the snapshot).</para>
+
+    <para>For a list of all &os; CERT security advisories, see <ulink
+      url="http://www.FreeBSD.org/security/"></ulink> or <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"></ulink>.</para>
+
+  </sect1>
+
+  <sect1 id="security">
+    <title>Security Advisories</title>
+
+    <para>Problems described in the following security advisories have
+      been fixed in &release.current;.  For more information, consult
+      the individual advisories available from <ulink
+	url="http://security.FreeBSD.org/"></ulink>.</para>
+
+    <informaltable frame="none" pgwide="1">
+      <tgroup cols="3">
+	<colspec colwidth="1*">
+	<colspec colwidth="1*">
+	<colspec colwidth="3*">
+	<thead>
+	  <row>
+	    <entry>Advisory</entry>
+	    <entry>Date</entry>
+	    <entry>Topic</entry>
+	  </row>
+	</thead>
+
+	<tbody>
+	  <row>
+	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-12:01.openssl.asc"
+		>SA-12:01.openssl</ulink></entry>
+	    <entry>3&nbsp;May&nbsp;2012</entry>
+	    <entry><para>OpenSSL multiple vulnerabilities</para></entry>
+	  </row>
+
+	  <row>
+	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-12:02.crypt.asc"
+		>SA-12:02.crypt</ulink></entry>
+	    <entry>30&nbsp;May&nbsp;2012</entry>
+	    <entry><para>Incorrect <function>crypt()</function> hashing</para></entry>
+	  </row>
+
+	  <row>
+	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-12:03.bind.asc"
+		>SA-12:03.bind</ulink></entry>
+	    <entry>12&nbsp;June&nbsp;2012</entry>
+	    <entry><para>Incorrect handling of zero-length RDATA fields in &man.named.8;</para></entry>
+	  </row>
+
+	  <row>
+	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-12:04.sysret.asc"
+		>SA-12:04.sysret</ulink></entry>
+	    <entry>12&nbsp;June&nbsp;2012</entry>
+	    <entry><para>Privilege escalation when returning from kernel</para></entry>
+	  </row>
+
+	  <row>
+	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-12:05.bind.asc"
+		>SA-12:05.bind</ulink></entry>
+	    <entry>6&nbsp;August&nbsp;2012</entry>
+	    <entry><para>&man.named.8; DNSSEC validation Denial of Service</para></entry>
+	  </row>
+
+	  <row>
+	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-12:06.bind.asc"
+		>SA-12:06.bind</ulink></entry>
+	    <entry>22&nbsp;November&nbsp;2012</entry>
+	    <entry><para>Multiple Denial of Service vulnerabilities with &man.named.8;</para></entry>
+	  </row>
+
+	  <row>
+	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-12:07.hostapd.asc"
+		>SA-12:07.hostapd</ulink></entry>
+	    <entry>22&nbsp;November&nbsp;2012</entry>
+	    <entry><para>Insufficient message length validation for EAP-TLS messages</para></entry>
+	  </row>
+
+	  <row>
+	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-12:08.linux.asc"
+		>SA-12:08.linux</ulink></entry>
+	    <entry>22&nbsp;November&nbsp;2012</entry>
+	    <entry><para>Linux compatibility layer input validation error</para></entry>
+	  </row>
+	</tbody>
+      </tgroup>
+    </informaltable>
+  </sect1>
+
+  <sect1 id="late-news">
+    <title>Late-Breaking News</title>
+
+    <para>No news.</para>
+  </sect1>
+</article>
diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
deleted file mode 100644
index 21a1b46ed731..000000000000
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-
-<![ %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
-	the dollar FreeBSD dollar header has a meaningful modification
-	time.  This file is all but useless without a datestamp on it,
-	so we'll take some extra care to make sure it has one.
-
-	(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.)
-
--->
-
-<article>
-  <articleinfo>
-    <title>&os; &release; Errata </title>
-
-    <corpauthor>
-    The &os; Project
-    </corpauthor>
-
-    <pubdate>$FreeBSD$</pubdate>
-
-    <copyright>
-      <year>2012</year>
-      <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
-    </copyright>
-
-    <legalnotice id="trademarks" role="trademarks">
-      &tm-attrib.freebsd;
-      &tm-attrib.intel;
-      &tm-attrib.sparc;
-      &tm-attrib.general;
-    </legalnotice>
-  </articleinfo>
-
-  <abstract>
-    <para>This document lists errata items for &os;
-<![ %release.type.current [
-      &release.current;,
-]]>
-<![ %release.type.snapshot [
-      &release.prev;,
-]]>
-<![ %release.type.release [
-      &release.current;,
-]]>
-      containing significant information discovered after the release
-      or too late in the release cycle to be otherwise included in the
-      release documentation.
-      This information includes security advisories, as well as news
-      relating to the software or documentation that could affect its
-      operation or usability.  An up-to-date version of this document
-      should always be consulted before installing this version of
-      &os;.</para>
-
-    <para>This errata document for &os;
-<![ %release.type.current [
-      &release.current;
-]]>
-<![ %release.type.snapshot [
-      &release.prev;
-]]>
-<![ %release.type.release [
-      &release.current;
-]]>
-      will be maintained until the release of &os; &release.next;.</para>
-  </abstract>
-
-  <sect1 id="intro">
-    <title>Introduction</title>
-
-    <para>This errata document contains <quote>late-breaking news</quote>
-      about &os;
-<![ %release.type.current [
-      &release.current;.
-]]>
-<![ %release.type.snapshot [
-      &release.prev;.
-]]>
-<![ %release.type.release [
-      &release.current;.
-]]>
-      Before installing this version, it is important to consult this
-      document to learn about any post-release discoveries or problems
-      that may already have been found and fixed.</para>
-
-    <para>Any version of this errata document actually distributed
-      with the release (for example, on a CDROM distribution) will be
-      out of date by definition, but other copies are kept updated on
-      the Internet and should be consulted as the <quote>current
-      errata</quote> for this release.  These other copies of the
-      errata are located at <ulink
-      url="http://www.FreeBSD.org/releases/"></ulink>, plus any sites
-      which keep up-to-date mirrors of this location.</para>
-
-    <para>Source and binary snapshots of &os; &release.branch; also
-      contain up-to-date copies of this document (as of the time of
-      the snapshot).</para>
-
-    <para>For a list of all &os; CERT security advisories, see <ulink
-      url="http://www.FreeBSD.org/security/"></ulink> or <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"></ulink>.</para>
-
-  </sect1>
-
-  <sect1 id="security">
-    <title>Security Advisories</title>
-
-    <para>Problems described in the following security advisories have
-      been fixed in &release.current;.  For more information, consult
-      the individual advisories available from <ulink
-	url="http://security.FreeBSD.org/"></ulink>.</para>
-
-    <informaltable frame="none" pgwide="1">
-      <tgroup cols="3">
-      <colspec colwidth="1*"/>
-      <colspec colwidth="1*"/>
-      <colspec colwidth="3*"/>
-
-      <thead>
-	  <row>
-	    <entry>Advisory</entry>
-	    <entry>Date</entry>
-	    <entry>Topic</entry>
-	  </row>
-	</thead>
-
-	<tbody>
-	  <row>
-	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:01.mountd.asc"
-		>SA-11:01.mountd</ulink></entry>
-	    <entry>20&nbsp;April&nbsp;2011</entry>
-	    <entry><para>Network ACL mishandling in &man.mountd.8;</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:02.bind.asc"
-		>SA-11:02.bind</ulink></entry>
-	    <entry>28&nbsp;May&nbsp;2011</entry>
-	    <entry><para>BIND remote DoS with large RRSIG RRsets and negative
-		caching</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:04.compress.asc"
-		>SA-11:04.compress</ulink></entry>
-	    <entry>28&nbsp;September&nbsp;2011</entry>
-	    <entry><para>Errors handling corrupt compress file in
-		&man.compress.1; and &man.gzip.1;</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:05.unix.asc"
-		>SA-11:05.unix</ulink></entry>
-	    <entry>28&nbsp;September&nbsp;2011</entry>
-	    <entry><para>Buffer overflow in handling of UNIX socket
-		addresses</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:06.bind.asc"
-		>SA-11:06.bind</ulink></entry>
-	    <entry>23&nbsp;December&nbsp;2011</entry>
-	    <entry><para>Remote packet Denial of Service against &man.named.8;
-		servers</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:07.chroot.asc"
-		>SA-11:07.chroot</ulink></entry>
-	    <entry>23&nbsp;December&nbsp;2011</entry>
-	    <entry><para>Code execution via chrooted ftpd</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:08.telnetd.asc"
-		>SA-11:08.telnetd</ulink></entry>
-	    <entry>23&nbsp;December&nbsp;2011</entry>
-	    <entry><para>telnetd code execution vulnerability</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:09.pam_ssh.asc"
-		>SA-11:09.pam_ssh</ulink></entry>
-	    <entry>23&nbsp;December&nbsp;2011</entry>
-	    <entry><para>pam_ssh improperly grants access when user account has
-		unencrypted SSH private keys</para></entry>
-	  </row>
-
-	  <row>
-	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:10.pam.asc"
-		>SA-11:10.pam</ulink></entry>
-	    <entry>23&nbsp;December&nbsp;2011</entry>
-	    <entry><para><function>pam_start()</function> does not validate
-		service names</para></entry>
-	  </row>
-	</tbody>
-      </tgroup>
-    </informaltable>
-  </sect1>
-
-  <sect1 id="open-issues">
-    <title>Open Issues</title>
-
-    <itemizedlist>
-      <listitem>
-	<para>In some releases prior to &release.current;, upgrading
-	  by using &man.freebsd-update.8; can fail.  This issue has
-	  been fixed by a change in Errata Notice EN-12:01.  For more
-	  information, see <ulink
-	    url="http://security.freebsd.org/advisories/FreeBSD-EN-12:01.freebsd-update.asc"></ulink></para>
-      </listitem>
-
-      <listitem>
-	<para arch="amd64,i386">&os; &release.current; includes
-	  several changes to improve resource management of PCI
-	  devices.  Some x86 machines may not boot or may have devices
-	  that no longer attach when using ACPI as a result of these
-	  changes.  This can be worked around by setting a
-	  &man.loader.8; tunable
-	  <varname>debug.acpi.disabled</varname> to
-	  <literal>hostres</literal>.  To do this, enter the following
-	  lines at the loader prompt:</para>
-
-	<screen>set debug.acpi.disabled="hostres"
-boot</screen>
-
-	<para>Or, put the following line into
-	  <filename>/boot/loader.conf</filename>:</para>
-
-	<programlisting>debug.acpi.disabled="hostres"</programlisting>
-      </listitem>
-
-      <listitem>
-	<para>A &man.devctl.4; event upon arrival of a &man.ugen.4;
-	  device has been changed.  The event now includes
-	  <literal>ugen</literal> and <literal>cdev</literal>
-	  variables instead of <literal>device-name</literal>.  This
-	  change can prevent the following &man.devd.8; rule which
-	  worked in a previous releases from working:</para>
-
-	<programlisting>attach 0 {
-	match "device-name" "ugen[0-9]+.[0-9]+";
-	action "/path/to/script /dev/$device-name";
-}</programlisting>
-
-	<para>This should be updated to the following:</para>
-
-	<programlisting>attach 0 {
-	match "subsystem" "DEVICE";
-	match "type" "ATTACH";
-	match "cdev" "ugen[0-9]+.[0-9]+";
-	action "/path/to/script /dev/$cdev";
-}</programlisting>
-      </listitem>
-
-      <listitem>
-	<para>The &os; &release.current; Release Notes should have
-	  mentioned that SSM (Source-Specific Multicast) MLDv2 now
-	  uses <literal>ALLOW_NEW_SOURCES</literal> and
-	  <literal>BLOCK_OLD_SOURCES</literal> record types to signal
-	  a join or a leave by default.  This conforms RFC 4604,
-	  <quote>Using Internet Group Management Protocol Version 3
-	  (IGMPv3) and Multicast Listener Discovery Protocol Version 2
-	  (MLDv2) for Source-Specific Multicast</quote>.  A new
-	  &man.sysctl.8; variable
-	  <varname>net.inet6.mld.use_allow</varname> which controls
-	  the behavior has been added.  The default value is
-	  <literal>1</literal> (use
-	  <literal>ALLOW_NEW_SOURCES</literal> and
-	  <literal>BLOCK_OLD_SOURCES</literal>).</para>
-      </listitem>
-
-      <listitem>
-	<para>&release.current; fails to configure an interface
-	  specified in the &man.rc.conf.5; variable
-	  <varname>ipv6_prefix_<replaceable>IF</replaceable></varname>
-	  when the interface does not have a corresponding
-	  <varname>ifconfig_<replaceable>IF</replaceable>_ipv6</varname>
-	  variable.  This problem will be fixed in the future
-	  releases.  To work around this problem on &release.current;,
-	  add an
-	  <varname>ifconfig_<replaceable>IF</replaceable>_ipv6</varname>
-	  line for each interface specified in
-	  <varname>ipv6_prefix_<replaceable>IF</replaceable></varname>
-	  as the following:</para>
-
-	<programlisting>ipv6_prefix_em0="2001:db8:1:0 2001:db8:2:0"
-ifconfig_em0_ipv6="inet6 auto_linklocal"</programlisting>
-      </listitem>
-
-      <listitem>
-	<para>In &release.current; the &os; USB subsystem supports USB
-	  3.0 by the &man.xhci.4; driver.  However, a bug that could
-	  prevent it from working with a USB 3.0 hub has been found
-	  and fixed after the release date.  This means
-	  &release.current; and prior do not work with a USB 3.0 hub.
-	  This problem has been fixed in HEAD and will be merged into
-	  the 9-STABLE branch.</para>
-      </listitem>
-    </itemizedlist>
-  </sect1>
-
-  <sect1 id="late-news">
-    <title>Late-Breaking News</title>
-
-<![ %release.type.current [
-    <para>No news.</para>
-]]>
-
-<![ %release.type.release [
-    <para>No news.</para>
-]]>
-
-<![ %release.type.snapshot [
-    <para>No news.</para>
-]]>
-  </sect1>
-
-</article>
diff --git a/release/doc/en_US.ISO8859-1/hardware/Makefile b/release/doc/en_US.ISO8859-1/hardware/Makefile
index 9818f8f8a2fd..439d7027c04e 100644
--- a/release/doc/en_US.ISO8859-1/hardware/Makefile
+++ b/release/doc/en_US.ISO8859-1/hardware/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 RELN_ROOT?= ${.CURDIR}/../..
+LANGCODE=	en_US.ISO8859-1
 
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?=	${DOCDIR}/hardware
@@ -16,9 +17,9 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.xml
+SRCS+=	article.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
 
 CATALOGS+=	-c ${DEV-AUTODIR}/catalog-auto
 
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.xml b/release/doc/en_US.ISO8859-1/hardware/article.sgml
index 42416af9095b..260f5b129b58 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.xml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.sgml
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % devauto 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/en_US.ISO8859-1/installation/Makefile b/release/doc/en_US.ISO8859-1/installation/Makefile
index 53ec983799e8..58f20b48babd 100644
--- a/release/doc/en_US.ISO8859-1/installation/Makefile
+++ b/release/doc/en_US.ISO8859-1/installation/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
 RELN_ROOT?= ${.CURDIR}/../..
+LANGCODE=	en_US.ISO8859-1
+
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?= ${DOCDIR}/installation
 .else
@@ -13,7 +15,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS+=	article.xml
+SRCS+=	article.sgml
 
 .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/installation/article.xml b/release/doc/en_US.ISO8859-1/installation/article.sgml
index 30e654ff8f12..82fa4beb1309 100644
--- a/release/doc/en_US.ISO8859-1/installation/article.xml
+++ b/release/doc/en_US.ISO8859-1/installation/article.sgml
@@ -1,15 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
+<!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;
-
-<!-- Text constants which probably don't need to be changed.-->
-
-<!ENTITY % include.historic "IGNORE">
-<!ENTITY % no.include.historic "IGNORE">
 ]>
 
 <article>
diff --git a/release/doc/en_US.ISO8859-1/readme/Makefile b/release/doc/en_US.ISO8859-1/readme/Makefile
index 35219fced674..3ee1253c311e 100644
--- a/release/doc/en_US.ISO8859-1/readme/Makefile
+++ b/release/doc/en_US.ISO8859-1/readme/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
 RELN_ROOT?= ${.CURDIR}/../..
+LANGCODE=	en_US.ISO8859-1
+
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?= ${DOCDIR}/readme
 .else
@@ -18,7 +20,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS+=	article.xml
+SRCS+=	article.sgml
 
 .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.xml b/release/doc/en_US.ISO8859-1/readme/article.sgml
index b50c686bfbd3..caebe1a68c54 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.xml
+++ b/release/doc/en_US.ISO8859-1/readme/article.sgml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
+<!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;
@@ -185,7 +184,7 @@
 	<email>freebsd-admin@FreeBSD.org</email> for more details on
 	becoming an official mirror site.  You can also find useful
         information for mirror sites at the <ulink
-        url="&url.articles.hubs;/">Mirroring
+        URL="&url.articles.hubs;/">Mirroring
         &os;</ulink> article.</para>
 
       <para>Mirrors generally contain the ISO images generally used to
diff --git a/release/doc/en_US.ISO8859-1/relnotes/Makefile b/release/doc/en_US.ISO8859-1/relnotes/Makefile
index c0f473e72dcb..5743a8e200a5 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/Makefile
+++ b/release/doc/en_US.ISO8859-1/relnotes/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 RELN_ROOT?= ${.CURDIR}/../..
+LANGCODE=	en_US.ISO8859-1
 
 .ifdef NO_LANGCODE_IN_DESTDIR
 DESTDIR?=	${DOCDIR}/relnotes
@@ -16,7 +17,7 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS+=	article.xml
+SRCS+=	article.sgml
 
 URL_RELPREFIX?=	../../../..
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
new file mode 100644
index 000000000000..e6102325b0f5
--- /dev/null
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -0,0 +1,122 @@
+<!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>
+  <title>&os; &release.current; Release Notes</title>
+
+  <corpauthor>The &os; Project</corpauthor>
+
+  <pubdate>$FreeBSD$</pubdate>
+
+  <copyright>
+    <year>2012</year>
+    <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
+  </copyright>
+
+  <legalnotice id="trademarks" role="trademarks">
+    &tm-attrib.freebsd;
+    &tm-attrib.ibm;
+    &tm-attrib.ieee;
+    &tm-attrib.intel;
+    &tm-attrib.sparc;
+    &tm-attrib.general;
+  </legalnotice>
+
+  <abstract>
+    <para>The release notes for &os; &release.current; contain a summary
+      of the changes made to the &os; base system on the
+      &release.branch; development line.
+      This document lists applicable security advisories that were issued since
+      the last release, as well as significant changes to the &os;
+      kernel and userland.
+      Some brief remarks on upgrading are also presented.</para>
+  </abstract>
+</articleinfo>
+
+<sect1 id="intro">
+  <title>Introduction</title>
+
+  <para>This document contains the release notes for &os;
+    &release.current;.  It
+    describes recently added, changed, or deleted features of &os;.
+    It also provides some notes on upgrading
+    from previous versions of &os;.</para>
+
+  <para>This distribution of &os; &release.current; is a
+    &release.type; distribution.  It can be found at <ulink
+    url="&release.url;"></ulink> or any of its mirrors.  More
+    information on obtaining this (or other) &release.type;
+    distributions of &os; can be found in the <ulink
+    url="&url.books.handbook;/mirrors.html"><quote>Obtaining
+    &os;</quote> appendix</ulink> to the <ulink
+    url="&url.books.handbook;/">&os;
+    Handbook</ulink>.</para>
+
+  <para>All users are encouraged to consult the release errata before
+    installing &os;.  The errata document is updated with
+    <quote>late-breaking</quote> information discovered late in the
+    release cycle or after the release.  Typically, it contains
+    information on known bugs, security advisories, and corrections to
+    documentation.  An up-to-date copy of the errata for &os;
+    &release.current; can be found on the &os; Web site.</para>
+
+</sect1>
+
+<sect1 id="new">
+    <title>What's New</title>
+
+    <para>The changes since the previous release can be found at
+      <ulink url="http://www.FreeBSD.org/releases/9.1R/relnotes.html"></ulink>.</para>
+</sect1>
+
+<sect1 id="upgrade">
+  <title>Upgrading from previous releases of &os;</title>
+
+    <sect2>
+      <title>Upgrading using freebsd-update(8) or a source-based
+	procedure</title>
+
+  <para arch="amd64,i386">Beginning with &os; 6.2-RELEASE,
+    binary upgrades between RELEASE versions (and snapshots of the
+    various security branches) are supported using the
+    &man.freebsd-update.8; utility.  The binary upgrade procedure will
+    update unmodified userland utilities, as well as a unmodified GENERIC kernel
+    distributed as a part of an official &os; release.
+    The &man.freebsd-update.8; utility requires that the host being
+    upgraded have Internet connectivity.</para>
+
+  <para>Source-based upgrades (those based on recompiling the &os;
+    base system from source code) from previous versions are
+    supported, according to the instructions in
+    <filename>/usr/src/UPDATING</filename>.</para>
+
+      <para>For more specific information about upgrading
+	instructions, see <ulink
+	url="http://www.FreeBSD.org/releases/9.1R/installation.html"></ulink>.</para>
+
+  <important>
+    <para>Upgrading &os; should, of course, only be attempted after
+      backing up <emphasis>all</emphasis> data and configuration
+      files.</para>
+  </important>
+    </sect2>
+
+    <sect2>
+      <title id="upgrade-pitfalls">User-visible incompatibilities</title>
+
+      <para>FreeBSD 9.0 and later have several incompatiblities in
+	system configuration which you might want to know before
+	upgrading your system.  <emphasis>Please read this section and
+	the <ulink
+	url="http://www.freebsd.org/releases/9.0R/relnotes-detailed.html#UPGRADE">Upgrading Section in 9.0-RELEASE Release Notes</ulink> carefully before submitting a problem report
+	and/or posting a question to the FreeBSD mailing
+	lists.</emphasis></para>
+    </sect2>
+  </sect1>
+</article>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
deleted file mode 100644
index 8d218af1eb9d..000000000000
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ /dev/null
@@ -1,1910 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN">
-%entities;
-
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-]>
-
-<article>
-<articleinfo>
-  <title>&os; &release.current; Release Notes</title>
-
-  <corpauthor>The &os; Project</corpauthor>
-
-  <pubdate>$FreeBSD$</pubdate>
-
-  <copyright>
-    <year>2012</year>
-    <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
-  </copyright>
-
-  <legalnotice id="trademarks" role="trademarks">
-    &tm-attrib.freebsd;
-    &tm-attrib.ibm;
-    &tm-attrib.ieee;
-    &tm-attrib.intel;
-    &tm-attrib.sparc;
-    &tm-attrib.general;
-  </legalnotice>
-
-  <abstract>
-    <para>The release notes for &os; &release.current; contain a summary
-      of the changes made to the &os; base system on the
-      &release.branch; development line.
-      This document lists applicable security advisories that were issued since
-      the last release, as well as significant changes to the &os;
-      kernel and userland.
-      Some brief remarks on upgrading are also presented.</para>
-  </abstract>
-</articleinfo>
-
-<sect1 id="intro">
-  <title>Introduction</title>
-
-  <para>This document contains the release notes for &os;
-    &release.current;.  It
-    describes recently added, changed, or deleted features of &os;.
-    It also provides some notes on upgrading
-    from previous versions of &os;.</para>
-
-  <para>This distribution of &os; &release.current; is a
-    &release.type; distribution.  It can be found at <ulink
-    url="&release.url;"></ulink> or any of its mirrors.  More
-    information on obtaining this (or other) &release.type;
-    distributions of &os; can be found in the <ulink
-    url="&url.books.handbook;/mirrors.html"><quote>Obtaining
-    &os;</quote> appendix</ulink> to the <ulink
-    url="&url.books.handbook;/">&os;
-    Handbook</ulink>.</para>
-
-  <para>All users are encouraged to consult the release errata before
-    installing &os;.  The errata document is updated with
-    <quote>late-breaking</quote> information discovered late in the
-    release cycle or after the release.  Typically, it contains
-    information on known bugs, security advisories, and corrections to
-    documentation.  An up-to-date copy of the errata for &os;
-    &release.current; can be found on the &os; Web site.</para>
-
-</sect1>
-
-<sect1 id="new">
-  <title>What's New</title>
-
-  <para>This section describes
-    the most user-visible new or changed features in &os;
-    since &release.prev;.</para>
-
-  <para>Typical release note items
-    document recent security advisories issued after
-    &release.prev;,
-    new drivers or hardware support, new commands or options,
-    major bug fixes, or contributed software upgrades.  They may also
-    list changes to major ports/packages or release engineering
-    practices.  Clearly the release notes cannot list every single
-    change made to &os; between releases; this document focuses
-    primarily on security advisories, user-visible changes, and major
-    architectural improvements.</para>
-
-  <sect2 id="security">
-    <title>Security Advisories</title>
-
-      <para>Problems described in the following security advisories have
-	been fixed.  For more information, consult the individual
-	advisories available from
-	<ulink url="http://security.FreeBSD.org/"></ulink>.</para>
-
-      <informaltable frame="none" pgwide="1">
-	<tgroup cols="3">
-	  <colspec colwidth="1*"/>
-	  <colspec colwidth="1*"/>
-	  <colspec colwidth="3*"/>
-	  <thead>
-	    <row>
-	      <entry>Advisory</entry>
-	      <entry>Date</entry>
-	      <entry>Topic</entry>
-	    </row>
-	  </thead>
-
-	  <tbody>
-	    <row>
-	      <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:01.mountd.asc"
-		  >SA-11:01.mountd</ulink></entry>
-	      <entry>20&nbsp;April&nbsp;2011</entry>
-	      <entry><para>Network ACL mishandling in &man.mountd.8;</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:02.bind.asc"
-		  >SA-11:02.bind</ulink></entry>
-	      <entry>28&nbsp;May&nbsp;2011</entry>
-	      <entry><para>BIND remote DoS with large RRSIG RRsets and negative
-		  caching</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:04.compress.asc"
-		  >SA-11:04.compress</ulink></entry>
-	      <entry>28&nbsp;September&nbsp;2011</entry>
-	      <entry><para>Errors handling corrupt compress file in
-		  &man.compress.1; and &man.gzip.1;</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:05.unix.asc"
-		  >SA-11:05.unix</ulink></entry>
-	      <entry>28&nbsp;September&nbsp;2011</entry>
-	      <entry><para>Buffer overflow in handling of UNIX socket
-		  addresses</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:06.bind.asc"
-		  >SA-11:06.bind</ulink></entry>
-	      <entry>23&nbsp;December&nbsp;2011</entry>
-	      <entry><para>Remote packet Denial of Service against &man.named.8;
-		  servers</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:07.chroot.asc"
-		  >SA-11:07.chroot</ulink></entry>
-	      <entry>23&nbsp;December&nbsp;2011</entry>
-	      <entry><para>Code execution via chrooted ftpd</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:08.telnetd.asc"
-		  >SA-11:08.telnetd</ulink></entry>
-	      <entry>23&nbsp;December&nbsp;2011</entry>
-	      <entry><para>telnetd code execution vulnerability</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:09.pam_ssh.asc"
-		  >SA-11:09.pam_ssh</ulink></entry>
-	      <entry>23&nbsp;December&nbsp;2011</entry>
-	      <entry><para>pam_ssh improperly grants access when user account has
-		  unencrypted SSH private keys</para></entry>
-	    </row>
-
-	    <row>
-	      <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-11:10.pam.asc"
-		  >SA-11:10.pam</ulink></entry>
-	      <entry>23&nbsp;December&nbsp;2011</entry>
-	      <entry><para><function>pam_start()</function> does not validate
-		  service names</para></entry>
-	    </row>
-	  </tbody>
-	</tgroup>
-      </informaltable>
-    </sect2>
-
-  <sect2 id="kernel">
-    <title>Kernel Changes</title>
-
-      <para revision="219129">The &os; kernel now supports Capsicum
-	Capability Mode.  Capsicum is a set of features for sandboxing
-	support, using a capability model in which the capabilities
-	are file descriptors.  Two new kernel options
-	<literal>CAPABILITIES</literal> and
-	<literal>CAPABILITY_MODE</literal> have been added to the
-	<filename>GENERIC</filename> kernel.  For more information
-	about Capsicum, see <ulink
-	url="http://www.cl.cam.ac.uk/research/security/capsicum/"></ulink>.</para>
-
-      <para revision="219559,219561" arch="amd64,i386">The &os;
-	&man.dtrace.1; framework now supports
-	<literal>systrace</literal> for system calls of
-	<literal>linux32</literal> and <literal>freebsd32</literal> on
-	&os;/&arch.amd64;.  Two new
-	<filename>systrace_linux32</filename> and
-	<filename>systrace_freebsd32</filename> kernel modules provide
-	support for tracing compat system calls in addition to the native
-	system call tracing provided by the
-	<filename>systrace</filename> module.</para>
-
-      <para revision="217152,217396" arch="amd64,i386,powerpc">The
-	&os; ELF image activator now supports the
-	<literal>PT_GNU_STACK</literal> program header.  This is
-	disabled by default.  New &man.sysctl.8; variables
-	<varname>kern.elf32.nxstack</varname> and
-	<varname>kern.elf64.nxstack</varname> allow enabling
-	<literal>PT_GNU_STACK</literal> for the specified ABIs
-	(e.g. <literal>elf32</literal> for 32-bit ABI).</para>
-
-      <para revision="216758,216615">The &man.hhook.9; (Helper Hook)
-	and &man.khelp.9; (Kernel Helpers) KPIs have been implemented.
-	These are a kind of superset of &man.pfil.9; framework for
-	more general use in the kernel.  The &man.hhook.9; KPI
-	provides a way for kernel subsystems to export hook points
-	that &man.khelp.9; modules can hook to provide enhanced or new
-	functionality to the kernel.  The &man.khelp.9; KPI provides a
-	framework for managing &man.khelp.9; modules, which indirectly
-	use the &man.hhook.9; KPI to register their hook functions
-	with hook points of interest within the kernel.  These allow a
-	structured way to dynamically extend the kernel at runtime in
-	an ABI preserving manner.</para>
-
-      <para revision="224516" arch="amd64,i386,pc98">A &man.loader.8;
-	tunable <varname>hw.memtest.tests</varname> has been added.
-	This controls whether to perform memory testing at boot time
-	or not.  The default value is <literal>1</literal> (perform a
-	memory test).</para>
-
-      <para revision="220137">A new resource accounting API has been
-	implemented.  It can keep per-process, per-jail, and
-	per-loginclass resource accounting information.  Note that
-	this is not built nor installed by default.  To build and
-	install them, specify <literal>options RACCT</literal> in the
-	kernel configuration file and rebuild the base system as
-	described in the <ulink
-	url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html">&os;
-	Handbook</ulink>.</para>
-
-      <para revision="220163">A new resource-limiting API has been
-	implemented.  It works in conjunction with the
-	<literal>RACCT</literal> resource accounting implementation
-	and takes user-configurable actions based on the set of rules
-	it maintains and the current resource usage.  The &man.rctl.8;
-	utility has been added to manage the rules in userland.  Note
-	that this is not built nor installed by default.  To build and
-	install them, specify <literal>options RCTL</literal> in the
-	kernel configuration file and rebuild the base system as
-	described in the <ulink
-	url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html">&os;
-	Handbook</ulink>.</para>
-
-      <para revision="220031">The &man.sendmsg.2; and &man.recvmsg.2;
-	system calls in the &os; Linux ABI compatibility have been
-	improved.</para>
-
-      <para revision="219999">The &man.open.2; and &man.fhopen.2;
-	system calls now support the <literal>O_CLOEXEC</literal> flag,
-	which allows setting the <literal>FD_CLOEXEC</literal> flag for the
-	newly created file descriptor.  This is standardized in IEEE
-	Std 1003.1-2008 (POSIX, Single UNIX Specification Version
-	4).</para>
-
-      <para revision="220791">The &man.posix.fallocate.2; system call has
-	been implemented.  This is a function in POSIX to ensure that
-	a part of the storage for regular file data is allocated on the
-	file system storage media.</para>
-
-      <para revision="219304">Two new system calls
-	<function>setloginclass(2)</function> and
-	<function>getloginclass(2)</function> have been added.  This
-	makes it possible for the kernel to track the login class a
-	process is assigned to, which is required for the
-	<literal>RCTL</literal> resource limiting framework.</para>
-
-      <para revision="220238" arch="amd64">&os; now supports executing
-	&os; 1/&arch.i386; a.out binaries on &os;/&arch.amd64;.  Note
-	that this is not built nor installed by default.  To build and
-	install them, specify <literal>options COMPAT_43</literal> in
-	the kernel configuration file and rebuild the base system as
-	described in the <ulink
-	url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html">&os;
-	Handbook</ulink>.</para>
-
-      <para revision="218485,219028,219029">The following
-	&man.sysctl.8; variables have been added to show the availability
-	of various kernel features:</para>
-
-      <informaltable frame="none" pgwide="1">
-	<tgroup cols="2">
-	  <colspec colwidth="1*"/>
-	  <colspec colwidth="3*"/>
-	  <thead>
-	    <row>
-	      <entry>&man.sysctl.8; variable name</entry>
-	      <entry>Description</entry>
-	    </row>
-	  </thead>
-
-	  <tbody>
-	    <row>
-	      <entry><varname>kern.features.ufs_acl</varname></entry>
-	      <entry>ACL (Access Control List) support in UFS</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.ufs_gjournal</varname></entry>
-	      <entry>journaling support through &man.gjournal.8; for
-		UFS</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.ufs_quota</varname></entry>
-	      <entry>UFS disk quotas support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.ufs_quota64</varname></entry>
-	      <entry>64-bit UFS disk quotas support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.softupdates</varname></entry>
-	      <entry>FFS soft-updates support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.ffs_snapshot</varname></entry>
-	      <entry>FFS snapshot support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.nfsclient</varname></entry>
-	      <entry>NFS client (old implementation)</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.nfscl</varname></entry>
-	      <entry>NFS client (new implementation)</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.nfsserver</varname></entry>
-	      <entry>NFS server (old implementation)</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.nfsd</varname></entry>
-	      <entry>NFS server (new implementation)</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.kdtrace_hooks</varname></entry>
-	      <entry>Kernel DTrace hooks which are required to load
-		DTrace kernel modules</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.ktr</varname></entry>
-	      <entry>Kernel support for KTR kernel tracing facility</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.ktrace</varname></entry>
-	      <entry>Kernel support for system call tracing</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.hwpmc_hooks</varname></entry>
-	      <entry>Kernel support for HW PMC</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.sysv_msg</varname></entry>
-	      <entry>System V message queues support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.sysv_sem</varname></entry>
-	      <entry>System V semaphores support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.p1003_1b_mqueue</varname></entry>
-	      <entry>POSIX P1003.1B message queues support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.p1003_1b_semaphores</varname></entry>
-	      <entry>POSIX P1003.1B semaphores support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.kposix_priority_scheduling</varname></entry>
-	      <entry>POSIX P1003.1B real-time extensions</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.stack</varname></entry>
-	      <entry>Support for capturing the kernel stack</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.sysv_shm</varname></entry>
-	      <entry>System V shared memory segments support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.pps_sync</varname></entry>
-	      <entry>Support usage of external PPS signal by kernel PLL</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.regression</varname></entry>
-	      <entry>Kernel support for interfaces necessary for
-		regression testing</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.invariant_support</varname></entry>
-	      <entry>Support for modules compiled with the INVARIANTS option</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.zero_copy_sockets</varname></entry>
-	      <entry>Zero copy sockets support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.libmchain</varname></entry>
-	      <entry>mchain library</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.scbus</varname></entry>
-	      <entry>SCSI devices support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.mac</varname></entry>
-	      <entry>Mandatory Access Control Framework support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.audit</varname></entry>
-	      <entry>BSM audit support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_gate</varname></entry>
-	      <entry>GEOM Gate module</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_uzip</varname></entry>
-	      <entry>GEOM uzip read-only compressed disks support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_cache</varname></entry>
-	      <entry>GEOM cache module</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_mirror</varname></entry>
-	      <entry>GEOM mirroring support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_stripe</varname></entry>
-	      <entry>GEOM striping support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_concat</varname></entry>
-	      <entry>GEOM concatenation support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_raid3</varname></entry>
-	      <entry>GEOM RAID-3 functionality</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_fox</varname></entry>
-	      <entry>GEOM FOX redundant path mitigation support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_multipath</varname></entry>
-	      <entry>GEOM multipath support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.g_virstor</varname></entry>
-	      <entry>GEOM virtual storage support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_bde</varname></entry>
-	      <entry>GEOM-based Disk Encryption</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_eli</varname></entry>
-	      <entry>GEOM crypto module</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_journal</varname></entry>
-	      <entry>GEOM journaling support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_shsec</varname></entry>
-	      <entry>GEOM shared secret device support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_vol</varname></entry>
-	      <entry>GEOM support for volume names from UFS superblocks</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_label</varname></entry>
-	      <entry>GEOM labeling support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_sunlabel</varname></entry>
-	      <entry>GEOM Sun/Solaris partitioning support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_bsd</varname></entry>
-	      <entry>GEOM BSD disklabels support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_pc98</varname></entry>
-	      <entry>GEOM NEC PC9800 partitioning support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_linux_lvm</varname></entry>
-	      <entry>GEOM Linux LVM partitioning support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_part_pc98</varname></entry>
-	      <entry>GEOM partitioning class for PC-9800 disk partitions</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_part_vtoc8</varname></entry>
-	      <entry>GEOM partitioning class for SMI VTOC8 disk labels</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_part_bsd</varname></entry>
-	      <entry>GEOM partitioning class for BSD disklabels</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_part_ebr</varname></entry>
-	      <entry>GEOM partitioning class for extended boot records support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_part_ebr_compat</varname></entry>
-	      <entry>GEOM EBR partitioning class:
-		backward-compatible partition names</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_part_gpt</varname></entry>
-	      <entry>GEOM partitioning class for GPT partitions
-		support</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_part_apm</varname></entry>
-	      <entry>GEOM partitioning class for Apple-style
-		partitions</entry>
-	    </row>
-
-	    <row>
-	      <entry><varname>kern.features.geom_part_mbr</varname></entry>
-	      <entry>GEOM partitioning class for MBR support</entry>
-	    </row>
-	  </tbody>
-	</tgroup>
-      </informaltable>
-
-    <sect3 id="boot">
-      <title>Boot Loader Changes</title>
-
-	<para revision="222417">The default boot loader menu has been
-	  updated.</para>
-
-	<para revision="219541" arch="ia64">The &man.loader.8; loader
-	  now supports PBVM (Pre-Boot Virtual Memory).  This allows
-	  linking the kernel at a fixed virtual address without having to
-	  make any assumptions about the physical memory layout.  The
-	  PBVM also allows fine control of the address where the
-	  kernel and its modules are to be loaded.</para>
-      </sect3>
-
-    <sect3 id="proc">
-      <title>Hardware Support</title>
-
-	<para revision="217044" arch="powerpc">&os;/powerpc now
-	  supports Sony Playstation 3 using the OtherOS feature
-	  available on firmwares 3.15 and earlier.</para>
-
-	<para revision="219473,220577">A new &man.loader.8; tunable
-	  <varname>machdep.disable_tsc</varname> has been added.
-	  Setting this to a non-zero value disables use of TSC (Time
-	  Stamp Counter) by turning off boot-time CPU frequency
-	  calibration, DELAY(9) with TSC, and using TSC as a CPU
-	  ticker.  Another new &man.loader.8; tunable
-	  <varname>machdep.disable_tsc_calibration</varname> allows to
-	  skip the TSC frequency calibration only.  This is useful when
-	  one wants to use the nominal frequency of the chip in Intel
-	  processors, for example.</para>
-
-	<para revision="223098" arch="amd64,i386">The &os; &man.usb.4;
-	  subsystem now supports USB 3.0 by default.</para>
-
-	<para revision="215649">The &os; &man.usb.4; subsystem now
-	  supports USB packet filter.  This allows to capture packets
-	  which go through each USB host controller.  The
-	  implementation is almost based on &man.bpf.4; code.
-	  The userland program &man.usbdump.8; has been added.</para>
-
-      <sect4 id="net-if">
-	<title>Network Interface Support</title>
-
-	  <para revision="217649">A bug in the &man.alc.4; driver which
-	    could make AR8152-based network interfaces stop working
-	    has been fixed.</para>
-
-	  <para revision="219647">A bxe(4) driver for Broadcom
-	    NetXtreme II 10GbE controllers (BCM57710, BCM57711,
-	    BCM57711E) has been added.</para>
-
-	  <para revision="220009">The &man.cxgb.4; driver has been
-	    updated to version 7.11.0.</para>
-
-	  <para revision="218794">A &man.cxgbe.4; driver for Chelsio
-	    T4 (Terminator 4) based 10Gb/1Gb adapters has been
-	    added.</para>
-
-	  <para revision="218832" arch="i386">The &man.dc.4; driver
-	    now works correctly in kernels with the
-	    <option>PAE</option> option.</para>
-
-	  <para revision="219753">The &man.em.4; driver has been
-	    updated to version 7.3.2.</para>
-
-	  <para revision="223350">The &man.igb.4; driver has been
-	    updated to version 2.2.5.</para>
-
-	  <para revision="218530">The &man.igb.4; driver now supports
-	    Intel I350 PCIe Gigabit Ethernet controllers.</para>
-
-	  <para revision="217593">The &man.ixgbe.4; driver has been
-	    updated to version 2.3.8.</para>
-
-	  <para revision="220892">Firmware images in the &man.iwn.4;
-	    driver for 1000, 5000, 6000, and 6500 series cards have been
-	    updated.</para>
-
-	  <para revision="216860">A bug in the &man.msk.4; driver has been
-	    fixed.  It could prevent RX checksum offloading from
-	    working.</para>
-
-	  <para revision="217794">A bug in the &man.nfe.4; driver which
-	    could prevent reinitialization after changing the MTU has
-	    been fixed.</para>
-
-	  <para revision="217511">A bug in the &man.ral.4; and &man.run.4;
-	    drivers which could prevent <literal>hostap</literal> mode
-	    from working has been fixed.</para>
-
-	  <para revision="216828">A rdcphy(4) driver for RDC Semiconductor
-	    R6040 10/100 PHY has been added.</para>
-
-	  <para revision="217498,218760">The &man.re.4; driver now supports
-	    RTL8168E/8111E-VL PCIe Gigabit Ethernet controllers and
-	    RTL8401E PCIe Fast Ethernet controllers.</para>
-
-	  <para revision="217766">The &man.re.4; driver now supports
-	    TX interrupt moderation on RTL810xE PCIe Fast Ethernet
-	    controllers.</para>
-
-	  <para revision="217902">The &man.re.4; driver now supports
-	    another mechanism for RX interrupt moderation because of
-	    performance problems.  A &man.sysctl.8; variable
-	    <varname>dev.re.<replaceable>N</replaceable>.int_rx_mod</varname>
-	    has been added to control amount of time to delay RX
-	    interrupt processing, in units of microsecond.  Setting it
-	    to <literal>0</literal> completely disables RX interrupt
-	    moderation.  A &man.loader.8; tunable
-	    <varname>hw.re.intr_filter</varname> controls whether the
-	    old mechanism utilizing MSI/MSI-X capability on
-	    supported controllers is used or not.  When set to
-	    a non-zero value, the &man.re.4; driver uses the old
-	    mechanism.  The default value is <literal>0</literal> and
-	    this tunable has no effect on controllers without MSI/MSI-X
-	    capability.</para>
-
-	  <para revision="217246,217832">The &man.re.4; driver now
-	    supports TSO (TCP Segmentation Offload) on RealTek
-	    RTL8168/8111 C or later controllers.  Note that this is
-	    disabled by default because broken frames can be sent
-	    under certain conditions.</para>
-
-	  <para revision="217381,218289">The &man.re.4; driver now
-	    supports enabling TX and/or RX checksum offloading
-	    independently from each other.  Note that TX IP checksum
-	    is disabled on some RTL8168C-based network interfaces
-	    because it can generate an incorrect IP checksum when the
-	    packet contains IP options.</para>
-
-	  <para revision="217296">A bug in the &man.re.4; driver has
-	    been fixed.  It could cause a panic when receiving a jumbo
-	    frame on an RTL8169C, 8169D, or 8169E controller-based
-	    network interface.</para>
-
-	  <para revision="217911">The &man.re.4; driver now supports
-	    RTL8105E PCIe Fast Ethernet controllers.</para>
-
-	  <para revision="217910">The rlphy(4) driver now supports the
-	    Realtek RTL8201E 10/100 PHY found in RTL8105E
-	    controllers.</para>
-
-	  <para revision="217548">A bug in the &man.sis.4; driver has
-	    been fixed.  It could prevent a proper reinitialization
-	    on DP83815, DP83816, and SiS 900/7016 controllers when the
-	    configuration of multicast packet handling and/or
-	    promiscuous mode is changed.</para>
-
-	  <para revision="216650">A bug in the &man.vlan.4; pseudo interface
-	    han been fixed.  It could have a random interface
-	    identifier in an automatically configured IPv6 link-local
-	    address, instead of one generated with the parent
-	    interface's IEEE 802 48-bit MAC address and an algorithm
-	    described in RFC 4291.</para>
-
-	  <para revision="216829">A &man.vte.4; driver for RDC R6040 Fast
-	    Ethernet controllers, which are commonly found on the Vortex86
-	    System On a Chip, has been added.</para>
-
-	  <para revision="221167">A &man.vxge.4; driver for the Neterion
-	    X3100 10GbE Server/Storage adapter has been added.</para>
-
-	  <para revision="216824">A bug in the &man.wpi.4; driver has been
-	    fixed.  It could display the following error messages and
-	    result in the device being unusable:</para>
-
-	  <screen>wpi0: could not map mbuf (error 12)
-wpi0: wpi_rx_intr: bus_dmamap_load failed, error 12</screen>
-
-      </sect4>
-    </sect3>
-
-    <sect3 id="net-proto">
-      <title>Network Protocols</title>
-
-	<para revision="225044">&man.ipfw.8; now supports IPv6 in
-	  the <command>fwd</command> action.</para>
-
-	<para revision="223666">&man.ipfw.8; now supports the
-	  <command>call</command> and <command>return</command>
-	  actions.  Upon the <command>call
-	  <replaceable>number</replaceable></command> action, the
-	  current rule number is saved in the internal stack and
-	  ruleset processing continues with the first rule numbered
-	  <replaceable>number</replaceable> or higher.  The
-	  <command>return</command> action takes the rule number saved
-	  to internal stack by the latest <command>call</command>
-	  action and returns ruleset processing to the first rule with
-	  number greater than that saved number.</para>
-
-	<para revision="218794">&os;'s &man.ipsec.4; support now uses
-	  half of the hash size as the authenticator hash size in
-	  Hashed Message Authentication Mode (HMAC-SHA-256,
-	  HMAC-SHA-384, and HMAC-SHA-512) as described in RFC 4868.
-	  This was a fixed 96-bit length in prior releases because the
-	  implementation was based on an old Internet draft
-	  draft-ietf-ipsec-ciph-sha-256-00.  Note that this means
-	  &release.current; and later are no longer interoperable with
-	  the older &os; releases.</para>
-
-	<para revision="219820">For Infiniband support, OFED
-	  (OpenFabrics Enterprise Distribution) version 1.5.3 has been
-	  imported into the base system.  Note that this is not built
-	  nor installed by default.  To build and install them,
-	  specify <literal>WITH_OFED=yes</literal> in
-	  <filename>/etc/src.conf</filename> and rebuild the base
-	  system as described in the <ulink
-	  url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html">&os;
-	  Handbook</ulink>.</para>
-
-	<para revision="226572">The &os; TCP/IP network stack now supports
-	  IPv4 prefixes with /31 as described in RFC 3021,
-	  <quote>Using 31-Bit Prefixes on IPv4 Point-to-Point
-	  Links</quote>.</para>
-
-	<para revision="217169">A bug in the &os; TCP/IP network stack has
-	  been fixed.  Source address selection could not be
-	  performed when multicast options were present but without an
-	  interface being specified.</para>
-
-	<para revision="225682">A bug in the
-	  <literal>IPV6_PKTINFO</literal> option used in
-	  &man.sendmsg.2; has been fixed.  The
-	  <literal>IPV6_USE_MIN_MTU</literal> state set by
-	  &man.setsockopt.2; was ignored.</para>
-
-	<para revision="216109,216114,216115,218152,218153,218155">
-	  The &os; TCP/IP network stack now supports the &man.mod.cc.9; pluggable
-	  congestion control framework.  This allows TCP congestion
-	  control algorithms to be implemented as dynamically loadable
-	  kernel modules.  The following kernel modules are available
-	  as of &release.current;: &man.cc.chd.4; for the
-	  CAIA-Hamilton-Delay algorithm, &man.cc.cubic.4; for the CUBIC
-	  algorithm, &man.cc.hd.4; for the Hamilton-Delay algorithm,
-	  &man.cc.htcp.4; for the H-TCP algorithm, &man.cc.newreno.4; for
-	  the NewReno algorithm, and &man.cc.vegas.4; for the Vegas algorithm.
-	  The default algorithm can be set by a new &man.sysctl.8;
-	  variable <varname>net.inet.tcp.cc.algorithm</varname>.  The
-	  value must be set to one of the names listed by
-	  <varname>net.inet.tcp.cc.available</varname>, and
-	  <literal>newreno</literal> is the default set at boot time.
-	  For more
-	  detail, see the &man.mod.cc.4; and &man.mod.cc.9; manual pages.</para>
-
-	<para revision="217806">An &man.h.ertt.4; (Enhanced Round Trip
-	  Time) &man.khelp.9; module has been added.  This module
-	  allows per-connection, low noise estimates of the
-	  instantaneous RTT in the TCP/IP network stack with a robust
-	  implementation even in the face of delayed acknowledgments
-	  and/or TSO (TCP Segmentation Offload) being in use for a
-	  connection.</para>
-
-	<para revision="218912">A new &man.tcp.4; socket option
-	  <literal>TCP_CONGESTION</literal> has been added.  This
-	  allows to select or query the congestion control algorithm
-	  that the TCP/IP network stack will use for connections on
-	  the socket.</para>
-
-	<para revision="225586">The &man.ng.ipfw.4; &man.netgraph.4;
-	  node now supports IPv6.</para>
-
-	<para revision="219127">The &man.ng.one2many.4;
-	  &man.netgraph.4; node now supports the
-	  <literal>XMIT_FAILOVER</literal> transmit algorithm.  This
-	  makes packets deliver out of the first active
-	  <literal>many</literal> hook.</para>
-
-	<para revision="219183">The &man.ng.netflow.4;
-	  &man.netgraph.4; node now supports NetFlow version 9.  A new
-	  <literal>export9</literal> hook has been added for NetFlow
-	  v9 data.  Note that data export can be done
-	  simultaneously in both version 5 and version 9.</para>
-
-	<para revision="239615">The IEEE 802.11s element identifiers have
-	  been updated to reflect the final version of the amendment.  This
-	  update breaks compatibility with older mesh setups but is necessary
-	  as the previous IDs are used by another amendment leading to
-	  unexpected results when trying to associate with an accesspoint
-	  using the affected IDs.</para>
-
-    </sect3>
-
-    <sect3 id="disks">
-      <title>Disks and Storage</title>
-
-	<para revision="220412">The &man.ada.4; driver now supports
-	  write cache control.  A new &man.sysctl.8 variable
-	  <varname>kern.cam.ada.write_cache</varname> determines
-	  whether the write cache of &man.ada.4; devices is enabled or
-	  not.  Setting to <literal>1</literal> enables and
-	  <literal>0</literal> disables the write cache, and <literal>-1</literal>
-	  leaves the device default behavior.  &man.sysctl.8 variables
-	  <varname>kern.cam.ada.<replaceable>N</replaceable>.write_cache</varname>
-	  can override the configuration in a per-device basis (the
-	  default value is <literal>-1</literal>, which means to use
-	  the global setting).  Note that the value can be changed at
-	  runtime, but it takes effect only after a device
-	  reset.</para>
-
-	<para revision="224905">The &man.arcmsr.4; driver has been
-	  updated to version 1.20.00.22.</para>
-
-	<para revision="226067">The &man.cam.4; subsystem now supports the
-	  descriptor format sense data of the SPC-3 (SCSI Primary Commands
-	  3) specification.</para>
-
-	<para revision="220559">The &man.geom.map.4; GEOM class has
-	  been added.  This allows to generate multiple geom providers
-	  based on a hard-coded layout of a device with no explicit
-	  partition table such as embedded flash storage.  For more
-	  information, see the &man.geom.map.4; manual page.</para>
-
-	<para revision="218014">The &man.gpart.8; GEOM class now
-	  supports the following aliases for the MBR and EBR schemes:
-	  <literal>fat32</literal>, <literal>ebr</literal>,
-	  <literal>linux-data</literal>,
-	  <literal>linux-raid</literal>, and
-	  <literal>linux-swap</literal>.</para>
-
-	<para revision="218014">The &man.gpart.8; GEOM class now
-	  supports <literal>bios-boot</literal> GUID for the GPT
-	  scheme which is used in GRUB 2 loader.</para>
-
-	<para revision="219974">The &man.graid.8; GEOM class has been
-	  added.  This is a replacement of the &man.ataraid.4; driver
-	  supporting various BIOS-based software RAID.</para>
-
-	<para revision="219056">The &man.sysctl.8; variable
-	  <varname>kern.geom.confxml</varname> now contains
-	  information about disk identification in an
-	  <sgmltag>ident</sgmltag> tag and disk model strings in a
-	  <sgmltag>descr</sgmltag> tag.</para>
-
-	<para revision="216793">The &man.md.4; memory-backed pseudo disk
-	  device driver now supports a &man.sysctl.8; variable
-	  <varname>vm.md_malloc_wait</varname> to specify whether a
-	  malloc-backed disk will use <varname>M_WAITOK</varname> or
-	  <varname>M_NOWAIT</varname> for &man.malloc.9; calls.  The
-	  <varname>M_WAITOK</varname> setting can prevent memory allocation
-	  failure under high load.  If it is set to
-	  <literal>0</literal>, a malloc-backed disk uses
-	  <varname>M_NOWAIT</varname> for memory allocation.  The
-	  default value is <literal>0</literal>.</para>
-
-	<para revision="216941,217509">A bug in the &man.mmc.4; driver
-	  that could cause device detection to fail has been fixed.</para>
-
-	<para revision="223958">The &man.mxge.4; driver has been
-	  updated.</para>
-
-	<para revision="226115">A &man.tws.4; driver for 3ware 9750
-	  SATA+SAS 6Gb/s RAID controllers has been added.</para>
-      </sect3>
-
-    <sect3 id="fs">
-      <title>File Systems</title>
-
-	<para revision="207141,218726">The &os; Fast File System now supports
-	  softupdates journaling.  It introduces a intent log into a
-	  softupdates-enabled file system which eliminates the need
-	  for background &man.fsck.8; even on unclean shutdown.  This
-	  can be enabled in a per-filesystem basis by using the
-	  <option>-j</option> flag of the &man.newfs.8; utility or the
-	  <option>-j enable</option> option of the &man.tunefs.8;
-	  utility.  Note that the &release.current; installer
-	  automatically enables softupdates journaling for
-	  newly-created UFS file systems.</para>
-
-	<para revision="216796">The &os; Fast File System now
-	  supports the <literal>TRIM</literal> command when freeing data
-	  blocks.  A new flag <option>-t</option> in the &man.newfs.8;
-	  and &man.tunefs.8; utilities sets the TRIM-enable flag for a
-	  file system.  The TRIM-enable flag makes the file system
-	  send a delete request to the underlying device for each
-	  freed block.  The <literal>TRIM</literal> command is
-	  specified as a Data Set Management Command in the ATA8-ACS2
-	  standard to carry the information related to deleted data
-	  blocks to a device, especially for a SSD (Solid-State Drive) for
-	  optimization.</para>
-
-	<para revision="221233">A new flag <option>-E</option> has
-	  been added to the &man.newfs.8; and &man.fsck.ffs.8; utilities.
-	  This clears unallocated blocks, notifying the underlying
-	  device that they are not used and that their contents may be
-	  discarded.  This is useful in &man.fsck.ffs.8; for file
-	  systems which have been mounted on systems without
-	  <literal>TRIM</literal> support, or with
-	  <literal>TRIM</literal> support disabled, as well as
-	  filesystems which have been copied from one device to
-	  another.</para>
-
-	<para revision="221124">The &os; NFS subsystem has been
-	  updated.  The new implementation supports NFS version 4 in
-	  addition to 2 and 3.  The kernel options for the NFS server
-	  and client are changed from <literal>NFSSERVER</literal> and
-	  <literal>NFSCLIENT</literal> to <literal>NFSD</literal> and
-	  <literal>NFSCL</literal>.  &man.sysctl.8; variables which
-	  start with <varname>vfs.nfssrv.</varname> have been renamed
-	  to <varname>vfs.nfsd.</varname>.  The NFS server now
-	  supports <varname>vfs.nfsd.server_max_nfsvers</varname> and
-	  <varname>vfs.nfsd.server_min_nfsvers</varname>
-	  &man.sysctl.8; variables to specify the maximum and the
-	  minimum NFS version number which the server accepts.  The
-	  default value is set to <literal>3</literal> and
-	  <literal>2</literal>, respectively.</para>
-
-	<para>To enable NFSv4, the following variables are needed on
-	  the server side in &man.rc.conf.5;:</para>
-
-	  <programlisting>nfsv_server_enable="YES"
-nfsv4_server_enable="YES"
-nfsuserd_enable="YES"</programlisting>
-
-	<para>and the following line is needed in
-	  <filename>/etc/exports</filename>:</para>
-
-	<programlisting>V4: /</programlisting>
-
-	<para>For more information about NFSv4 and its configuration,
-	  see the &man.nfsv4.4; and &man.exports.5; manual pages.</para>
-
-	<para revision="221436">The &os; NFS subsystem now supports a
-	  <option>nocto</option> mount option.  This disables the
-	  close-to-open cache coherency check at open time.  This
-	  option may improve performance for read-only mounts, but
-	  should only be used only if the data on the server changes
-	  rarely.  The &man.mount.nfs.8; utility now also supports
-	  this flag keyword.</para>
-
-	<para revision="225537">A &man.loader.8; tunable
-	  <varname>vfs.typenumhash</varname> has been added and set to
-	  <literal>1</literal> by default.  This enables to use a hash
-	  calculation on the file system identification number internally
-	  used in the kernel.  This fixes the <quote>Stale NFS file
-	  handle</quote> error on NFS clients when upgrading or
-	  rebuilding the kernel on the NFS server due to unexpected
-	  change of these identification number values.</para>
-
-	<para revision="219089">The &os; ZFS subsystem has been
-	  updated to the SPA (Storage Pool Allocator, also known as
-	  zpool) version 28.  It now supports data deduplication,
-	  triple parity RAIDZ (raidz3), snapshot holds, log device
-	  removal, zfs diff, zpool split, zpool import
-	  <option>-F</option>, and read-only zpool import.</para>
-    </sect3>
-  </sect2>
-
-  <sect2 id="userland">
-    <title>Userland Changes</title>
-
-      <para revision="219359,219571">Complex exponential functions
-	&man.cexp.3; and &man.cexpf.3;, and cube root function
-	&man.cbrtl.3; have been added to
-	<application>libm</application>.</para>
-
-      <para revision="224152,224153,224154">The &man.bsdtar.1; and
-	&man.cpio.1; utilities are now based on
-	<application>libarchive</application> version 2.8.4.</para>
-
-      <para revision="217416">The &man.cpuset.1; utility now supports
-	a <option>-C</option> flag to create a new cpuset and assign
-	an existing process into that set, and an
-	<literal>all</literal> keyword in the <option>-l
-	<replaceable>cpu-list</replaceable></option> option to specify
-	all CPUs in the system.</para>
-
-      <para revision="219739">The &man.dhclient.8; utility now uses
-	&man.resolvconf.8; to manage the &man.resolv.conf.5; file by
-	default.  A <varname>resolvconf_enable</varname> variable in
-	<filename>/etc/dhclient-enter-hooks</filename> controls the
-	behavior.</para>
-
-      <para revision="217505">A bug in the &man.fetch.1; utility which
-	could prevent the <command>STAT</command> FTP command from working
-	properly has been fixed.</para>
-
-      <para revision="219415">The &man.gpart.8; utility now supports a
-	<option>-p</option> flag to the <command>show</command>
-	subcommand.  This allows showing providers' names of
-	partitions instead of the partitions' indexes.</para>
-
-      <para revision="218049">The &man.hastd.8; utility now drops
-	<literal>root</literal> privileges of the worker processes to the
-	<literal>hast</literal> user.</para>
-
-      <para revision="219351">The &man.hastd.8; utility now supports a
-	<literal>checksum</literal> keyword to specify the checksum
-	algorithm in a <literal>resource</literal> section.  As of
-	&release.current;, <literal>none</literal>,
-	<literal>sha256</literal>, and <literal>crc32</literal> are
-	supported.</para>
-
-      <para revision="219354">The &man.hastd.8; utility now supports a
-	<literal>compression</literal> keyword to specify the compression
-	algorithm in a <literal>resource</literal> section.  As of
-	&release.current;, <literal>none</literal>,
-	<literal>hole</literal> and <literal>lzf</literal> are
-	supported.</para>
-
-      <para revision="219818">The &man.hastd.8; utility now supports a
-	<literal>source</literal> keyword to specify the local address
-	to bind to before connecting the remote &man.hastd.8
-	daemon.</para>
-
-      <para revision="219019">An implementation of
-	<function>iconv()</function> API libraries and utilities which
-	are standardized in Single UNIX Specification has been
-	imported.  These are based on NetBSD's Citrus implementation.
-	Note that these are not built nor installed by default.  To
-	build and install them, specify
-	<literal>WITH_ICONV=yes</literal> in
-	<filename>/etc/src.conf</filename> and rebuild the base system
-	as described in the <ulink
-	url="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html">&os;
-	Handbook</ulink>.</para>
-
-      <para revision="217013">The &man.ifconfig.8; utility now
-	supports <literal>fdx</literal>, <literal>flow</literal>,
-	<literal>hdx</literal>, and <literal>loop</literal> keywords
-	as aliases of <literal>full-duplex</literal>,
-	<literal>flowcontrol</literal>,
-	<literal>half-duplex</literal>,
-	and <literal>loopback</literal>, respectively.</para>
-
-      <para revision="220370">A &man.readline.3; API set has been
-	imported into <application>libedit</application>.  This is
-	based on NetBSD's implementation and BSD licensed utilities
-	now use it instead of GNU
-	<application>libreadline</application>.</para>
-
-      <para revision="224762">The &man.makefs.8; utility now supports the
-	ISO 9660 format.</para>
-
-      <para revision="220496,220497"><application>libmd</application>
-	and <application>libcrypt</application> now support the SHA-256
-	and SHA-512 algorithms.</para>
-
-      <para revision="217642">The &man.netstat.1; utility now does not
-	expose the internal scope address representation used in the &os;
-	kernel, which is derived from KAME IPv6 stack, in the results
-	of <command>netstat -ani</command> and <command>netstat
-	  -nr</command>.</para>
-
-      <para revision="218127">The &man.newsyslog.8; utility now
-	supports &man.xz.1; compression.  An <literal>X</literal> flag
-	in the optional field has been added to specify the
-	compression.</para>
-
-      <para revision="219563">The &man.pam.group.8; module now
-	supports <option>ruser</option> and <option>luser</option>
-	options.  The <option>ruser</option> make it accept or reject
-	based on the supplicant's group membership and this is the
-	default behavior.  The <option>luser</option> checks the
-	target user's group membership instead of the supplicant's
-	one.  If neither option was specified, &man.pam.group.8;
-	assumes <option>ruser</option> and issues a warning.</para>
-
-      <para revision="216823">A &man.poweroff.8; utility has been added.
-	This is equivalent to:</para>
-
-      <screen>&prompt.root; shutdown -p now</screen>
-
-      <para revision="218397">The &man.ppp.8; utility now supports
-	<command>iface name <replaceable>name</replaceable></command>
-	and <command>iface description
-	<replaceable>description</replaceable></command> commands.
-	These have the same functionalities as the <literal>name</literal>
-	and <literal>description</literal> subcommands of the
-	&man.ifconfig.8; utility.</para>
-
-      <para revision="219307,219713">The &man.ps.1; utility now
-	supports an <option>-o class</option> option to display the login
-	class information of each process, and <option>-o
-	usertime</option> and <option>-o systime</option> options for
-	accumulated system and user CPU time, respectively.</para>
-
-      <para revision="222732">The &man.rtadvd.8; daemon now supports a
-	<literal>noifprefix</literal> keyword to disable gathering
-	on-link prefixes from interfaces when no
-	<literal>addr</literal> keyword is specified.  An entry in
-	<filename>/etc/rtadvd.conf</filename> with
-	<literal>noifprefix</literal> and no <literal>addr</literal>
-	generates an RA message with no prefix information
-	option.</para>
-
-      <para revision="222732,224006">The &man.rtsold.8; and
-	&man.rtadvd.8; daemons now support the RDNSS and DNSSL options
-	described in RFC 6106, <quote>IPv6 Router Advertisement
-	Options for DNS Configuration</quote>.  A &man.rtadvctl.8;
-	utility to control the &man.rtadvd.8; daemon has been
-	added.</para>
-
-      <para revision="216695">The &man.rtld.1; runtime linker now supports
-	shared objects as filters in ELF shared libraries.  Both
-	standard and auxiliary filtering have been supported.  The
-	&man.rtld.1; linker's processing of a filter defers loading a
-	filtee until a filter symbol is referenced unless the
-	<varname>LD_LOADFLTR</varname> environment variable is defined
-	or a <literal>-z loadfltr</literal> option was specified when
-	the filter was created.</para>
-
-      <para revision="217133">A race condition in the &man.sed.1;
-	utility has been fixed.  When an <option>-i</option> option is
-	specified, there could be a short time window with no file
-	with the original file name.</para>
-
-      <para revision="216629">The &man.sh.1; program now supports
-	<command>kill</command> as a built-in command.  This allows
-	specifying <literal>%<replaceable>job</replaceable></literal>
-	which is equivalent to the corresponding process group.  Note
-	that this built-in command returns the exit status
-	<literal>2</literal> instead of <literal>1</literal> if a
-	fatal error occurs as other built-in commands do.</para>
-
-      <para revision="217176,217472">A bug in the &man.sh.1; program has been
-	fixed for POSIX conformance.  It could return an incorrect exit
-	status when an <command>exit</command> command with no
-	parameter is specified in the <literal>EXIT trap</literal>
-	handler, which is triggered when the shell terminates.
-	In trap actions for other signals, an <command>exit</command>
-	command with no parameter returns an exit status corresponding
-	to the received signal.</para>
-
-      <para revision="217557">A bug in the &man.sh.1; program has been
-	fixed.  When a foreground job exits on a signal, a message is
-	printed to <filename>stdout</filename> about this. The buffer
-	was not flushed after printing which could result in the message
-	being written to the wrong file if the next command was a
-	built-in and had <filename>stdout</filename> redirected.</para>
-
-      <para revision="217461">The &man.sh.1; program now supports a
-	<option>--</option> flag in <command>trap</command> command to
-	stop the option processing.</para>
-
-      <para revision="217206">The <literal>%builtin</literal> keyword
-	support in the <varname>$PATH</varname> variable has been removed
-	from the &man.sh.1; program.  All built-in commands are always
-	found before looking up directories in
-	<varname>$PATH</varname>.</para>
-
-      <para revision="218466">Arithmetic expression handling code in
-	the &man.sh.1; program has been updated by importing code from
-	<application>dash</application>.  It now supports the conditional
-	operator (<literal>?:</literal>) and a bug in evaluation of
-	&amp;&amp; and || around an arithmetic expression has been
-	fixed.</para>
-
-      <para revision="224536">A bug in the &man.tftpd.8; daemon has
-	been fixed.  It had an interoperability issue when
-	transferring a large file.</para>
-
-      <para revision="202188">The &man.utmp.5; user accounting
-	database has been replaced by &man.utmpx.3;. User accounting
-	utilities will now use <filename>utmpx</filename> database
-	files exclusively.  The &man.wtmpcvt.1; utility can be used to
-	convert <filename>wtmp</filename> files to the new format,
-	making it possible to read them using the updated
-	utilities.</para>
-
-      <para revision="218847">A &man.utxrm.8; utility has been added.
-	This allows one to remove an entry from the
-	<filename>utmpx</filename> database by hand. This is useful
-	when a login daemon crashes or fails to remove the entry
-	during shutdown.</para>
-
-      <para revision="224171">The &man.zpool.8; utility now supports a
-	<command>zpool labelclear</command> command.  This allows to
-	wipe the label data from a drive that is not active in a
-	pool.</para>
-  </sect2>
-
-  <sect2 id="contrib">
-    <title>Contributed Software</title>
-
-      <para revision="222544"><literal>ACPI CA</literal> has been
-	updated to version 20110527.</para>
-
-      <para revision="224731">The <application>awk</application> has
-	been updated to the 7 August 2011 release.</para>
-
-      <para revision="228189"><application>ISC BIND</application> has
-	been updated to version 9.8.1-P1.</para>
-
-      <para revision="218822"><application>GNU binutils</application>
-	has been updated to 2.17.50 (as of 3 July 2007), which is the
-	last available version under GPLv2.</para>
-
-      <para revision="222656">The
-	<application>compiler-rt</application> library, which provides
-	low-level target-specific interfaces such as functions in
-	<application>libgcc</application>, has been imported.</para>
-
-      <para revision="224014"><literal>dialog</literal> has been
-	updated to version 1.1-20110707.</para>
-
-      <para revision="221793">The <literal>netcat</literal> utility
-	has been updated to version 4.9.</para>
-
-      <para revision="223328">The <application>tnftp</application> (formerly
-	known as <application>lukemftp</application>) has been updated
-	to tnftp-20100108.</para>
-
-      <para revision="220150"><application>GNU GCC</application> and
-	<application>libstdc++</application> have been updated to rev
-	127959 of <literal>gcc-4_2-branch</literal> (the last
-	GPLv2-licensed version).</para>
-
-      <para revision="219557"><application>gdtoa</application>, a set
-	of binary from/to decimal number conversion routines used in
-	&os;'s <application>libc</application> library has been updated
-	to a snapshot as of 4 March, 2011.</para>
-
-      <para revision="222906">The <application>LESS</application>
-	program has been updated to version v444.</para>
-
-      <para revision="208954">The <application>LLVM</application>
-	compiler infrastructure and
-	<application>clang</application>, a C language family
-	front-end, version 3.0 have been imported.  Note that it is not
-	used for building the &os; base system by default.  In the &os; build
-	infrastructure, the &man.clang.1;, &man.clang...1;, and
-	&man.clang-cpp.1; utilities can be used in
-	<varname>CC</varname>, <varname>CXX</varname>, and
-	<varname>CPP</varname> &man.make.1; variables,
-	respectively.</para>
-
-      <para revision="219734"><application>Openresolv</application>
-	version 3.4.4 has been imported.  The &man.resolvconf.8;
-	utility now manages the &man.resolv.conf.5; file.</para>
-
-      <para revision="221484,224638">The
-	<application>OpenSSH</application> utility has been updated to
-	5.8p2, and optimization for large bandwidth-delay product
-	connection and <literal>none</literal> cipher support have
-	been merged</para>
-
-      <para revision="223637">The <application>pf</application> packet
-	filter has been updated to version 4.5.</para>
-
-      <para revision="223067"><application>sendmail</application>
-	has been updated to version 8.14.5.</para>
-
-      <para revision="226750">The <application>timezone</application>
-	database has been updated to the
-	<application>tzdata2011m</application> release.</para>
-
-      <para revision="217698">The &man.unifdef.1; utility has been updated
-	to version 2.5.6.</para>
-
-      <para revision="223935">The <application>xz</application>
-	program has been updated from 5.0.0 to a snapshot as of 11
-	July, 2011.</para>
-    </sect2>
-
-  <sect2 id="releng">
-    <title>Release Engineering and Integration</title>
-
-      <para revision="218799">A new installer &man.bsdinstall.8; has
-	been added and integrated into installation ISO images.  The
-	&man.sysinstall.8; utility is also available for configuration
-	after the installation.</para>
-
-      <para>The supported version of
-	the <application>KDE</application> desktop environment
-	(<filename role="package">x11/kde4</filename>) has been
-	updated from 4.5.5 to 4.7.3.</para>
-  </sect2>
-</sect1>
-
-<sect1 id="upgrade">
-  <title>Upgrading from previous releases of &os;</title>
-
-    <sect2>
-      <title>Upgrading using freebsd-update(8) or a source-based
-	procedure</title>
-
-  <para arch="amd64,i386">Beginning with &os; 6.2-RELEASE,
-    binary upgrades between RELEASE versions (and snapshots of the
-    various security branches) are supported using the
-    &man.freebsd-update.8; utility.  The binary upgrade procedure will
-    update unmodified userland utilities, as well as a unmodified GENERIC kernel
-    distributed as a part of an official &os; release.
-    The &man.freebsd-update.8; utility requires that the host being
-    upgraded have Internet connectivity.</para>
-
-  <para>Source-based upgrades (those based on recompiling the &os;
-    base system from source code) from previous versions are
-    supported, according to the instructions in
-    <filename>/usr/src/UPDATING</filename>.</para>
-
-      <para>For more specific information about upgrading
-	instructions, see <ulink
-	url="http://www.FreeBSD.org/releases/9.0R/installation.html"></ulink>.</para>
-
-  <important>
-    <para>Upgrading &os; should, of course, only be attempted after
-      backing up <emphasis>all</emphasis> data and configuration
-      files.</para>
-  </important>
-    </sect2>
-
-    <sect2>
-      <title id="upgrade-pitfalls">User-visible incompatibilities</title>
-
-      <para>This section describes notable incompatibilities which you
-	might want to know before upgrading your system.
-	<emphasis>Please read this section and the <ulink
-	url="http://www.FreeBSD.org/releases/9.0R/errata.html">Errata
-	    document</ulink> carefully before submitting a problem report
-	and/or posting a question to the FreeBSD mailing
-	lists.</emphasis></para>
-
-      <sect3>
-	<title>Update of <literal>dialog</literal></title>
-
-	<para>The <literal>dialog</literal> library is used in &os;'s
-	  new installer and the &os; Ports Collection to display a dialog
-	  window and allow users to select various options.  Note that
-	  it is updated in &release.current; and there are several
-	  differences in key operations which might confuse users
-	  who are familiar with releases prior to &release.current;.
-	  For example, pushing the enter key in a checklist window will
-	  no longer check an item.  The new version
-	  consistently uses space bar for selecting an item and the
-	  enter key for OK/Cancel selection.</para>
-      </sect3>
-
-      <sect3>
-	<title>Partition Metadata Integrity Check</title>
-
-	<para>&os; now checks the integrity of partition metadata when
-	  a partition table is found on a disk though the GEOM
-	  <application>PART</application> subsystem.  This detection
-	  is automatically performed when a disk device is ready.
-	  The GEOM <application>PART</application> class in the kernel
-	  verifies all generic partition parameters obtained from the
-	  disk metadata, and if some inconsistency is detected, the
-	  partition table will be rejected with the following
-	  diagnostic message:</para>
-
-	<screen>GEOM_PART: Integrity check failed</screen>
-
-	<para>This integrity check is enabled by default.  On a system
-	  prior to &release.current;, the inconsistencies were
-	  silently ignored.  Therefore, there is a possibility that this
-	  prevents a system from booting after upgrading it to
-	  &release.current;.  More specifically, the kernel cannot
-	  mount the system partition at boot time in some
-	  cases.</para>
-
-	<para>If this happens, a &man.loader.8; tunable
-	  <varname>kern.geom.part.check_integrity</varname> can be
-	  used as a workaround.  Enter the following lines in the
-	  &man.loader.8; prompt at boot time:</para>
-
-	<screen><userinput>set kern.geom.part.check_integrity="0"</userinput>
-<userinput>boot</userinput></screen>
-
-	<para>These commands temporarily disable the integrity check.
-	  If it was the cause of the boot failure, the &os; kernel should detect the
-	  partitions as the prior release
-	  did, after entering the commands.  This configuration can be added into
-	  <filename>/boot/loader.conf</filename> as follows:</para>
-
-	<programlisting>kern.geom.part.check_integrity="0"</programlisting>
-
-	<para>To check inconsistent metadata after booting on the
-	  system, use the &man.gpart.8; utility on the system.  A
-	  corrupted entry will be displayed like the following:</para>
-
-	<screen>&prompt.user; gpart show
-=>        63  1953525104  mirror/gm0  MBR  (931G) [CORRUPT]
-          63  1953525105           1  freebsd  [active]  (931G)</screen>
-
-	<para>For more information, see the &man.gpart.8; manual page.</para>
-      </sect3>
-
-      <sect3>
-	<title>ATA/SATA subsystem now &man.cam.4;-based</title>
-
-	<para>In &release.current;, the &os; ATA/SATA disk subsystem has
-	  been replaced with a new &man.cam.4;-based implementation.
-	  &man.cam.4; stands for Common Access Method, which is an
-	  implementation of an API set originally for SCSI-2 and
-	  standardized as "SCSI-2 Common Access Method Transport and
-	  SCSI Interface Module".  &os; has used the &man.cam.4; subsystem
-	  to handle SCSI devices since 3.X.</para>
-
-	<para>Although the new &man.cam.4;-based ATA/SATA subsystem
-	  provides various functionality which the old &man.ata.4; did
-	  not have, it also has some incompatibilities:</para>
-
-	<itemizedlist>
-	  <listitem>
-	    <para>An ATA/SATA disk is now recognized as a device node
-	      with a name
-	      <devicename>ada<replaceable>0</replaceable></devicename>
-	      instead of
-	      <devicename>ad<replaceable>0</replaceable></devicename>.
-	      Currently, a symbolic link
-	      <filename>/dev/ad<replaceable>0</replaceable></filename>
-	      is automatically generated for
-	      <filename>/dev/ada<replaceable>0</replaceable></filename>
-	      to keep backward compatibility.  This symbolic link
-	      generation can be controlled by a
-	      <varname>kern.cam.ada.legacy_aliases</varname> (enabled
-	      by default).  You might want to update
-	      <filename>/etc/fstab</filename> and/or consider using
-	      volume labels (see &man.glabel.8; for more details) for
-	      specifying each file system to be mounted.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>The &man.atacontrol.8; utility cannot be used for
-	      &man.cam.4;-based devices.  The &man.camcontrol.8
-	      utility is a replacement.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>&man.ataraid.4; software RAID is now supported by the
-	      &man.graid.8; GEOM class.  It generates a device node
-	      with a name
-	      <filename>/dev/raid/r<replaceable>0</replaceable></filename>
-	      if you previously had
-	      <filename>/dev/ar<replaceable>0</replaceable></filename>.
-	      Note that this is not enabled by default.  To enable it,
-	      enter the following line in the &man.loader.8; prompt:</para>
-
-	    <screen>set geom_raid_load="YES"
-boot</screen>
-
-	    <para>or add the following line to
-	      <filename>/boot/loader.conf</filename>:</para>
-
-	    <programlisting>geom_raid_load="YES"</programlisting>
-
-	    <para>and reboot the system.  A symbolic link like
-	      <filename>/dev/ar<replaceable>0</replaceable></filename>
-	      will NOT be generated for
-	      <filename>/dev/raid/r<replaceable>0</replaceable></filename>.
-	      Therefore, if your system used
-	      <filename>/dev/ar<replaceable>0</replaceable></filename>
-	      as the root partition, mounting local file systems will
-	      fail because it is renamed to
-	      <filename>/dev/raid/r<replaceable>0</replaceable></filename>.
-	      You need to update <filename>/etc/fstab</filename>
-	      manually in that case.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>The &man.burncd.8; utility does not work with
-	      &man.cam.4;-based devices.  Use the cdrecord(1) utility
-	      in <filename role="package">sysutils/cdrtools</filename>
-	      instead.</para>
-	  </listitem>
-	</itemizedlist>
-      </sect3>
-
-      <sect3>
-	<title>Network Configuration Changes in
-	  <filename>/etc/rc.conf</filename></title>
-
-	<para>Although variables in &man.rc.conf.5; are basically
-	  compatible with earlier releases, ones related to network
-	  configuration are changed because of reorganization of the
-	  &man.rc.8; scripts.</para>
-
-	<itemizedlist>
-	  <listitem>
-	    <para>An address configuration now always needs an address
-	      family keyword.  For example, the following line</para>
-
-	    <programlisting>ifconfig_em0="192.168.2.1 netmask 255.255.255.0"</programlisting>
-
-	    <para>should be</para>
-
-	    <programlisting>ifconfig_em0="inet 192.168.2.1 netmask 255.255.255.0"</programlisting>
-
-	    <para>Although the old convention is still supported in
-	      the existing variables for backward compatibility, some
-	      new variables do not support it.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>The
-	      <varname>ifconfig_<replaceable>IF</replaceable>_alias<replaceable>0</replaceable></varname>
-	      variable now requires an address family keyword to
-	      support non-IPv4 address families.  For instance,</para>
-
-	    <programlisting>ifconfig_em0_alias0="192.168.2.10 netmask 255.255.255.255"</programlisting>
-
-	    <para>should be</para>
-
-	    <programlisting>ifconfig_em0_alias0="inet 192.168.2.10 netmask 255.255.255.255"</programlisting>
-
-	    <para>Different address families can coexist like the
-	      following:</para>
-
-	    <programlisting>ifconfig_em0_alias0="inet 192.168.2.10 netmask 255.255.255.255"
-ifconfig_em0_alias1="inet6 2001:db8:1::1 prefixlen 64"</programlisting>
-
-	    <para>Note that IPv6 alias configurations in
-	      <varname>ifconfig_<replaceable>IF</replaceable>_alias<replaceable>N</replaceable></varname>
-	      will be ignored when no
-	      <varname>ifconfig_<replaceable>IF</replaceable>_ipv6</varname>
-	      variable is defined because it determines whether IPv6
-	      functionality is enabled on that interface or not (this
-	      variable will be explained later).</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>All alias and static routing configurations
-	      through &man.rc.conf.5; variables will be deactivated when
-	      invoking &man.rc.8; scripts or the &man.service.8; command
-	      with the <literal>stop</literal> keyword.</para>
-
-	    <screen>&prompt.root; service netif stop em0</screen>
-
-	    <para>stops the interface <literal>em0</literal>.</para>
-
-	    <screen>&prompt.root; service routing stop</screen>
-
-	    <para>deactivates all static route configurations.</para>
-
-	    <para>Releases prior to &os; &release.current; did not
-	      support this functionality properly for non-IPv4
-	      protocols.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>IPv6 configuration handling has been changed in the
-	      following way.  Before in-depth explanations, here is a
-	      before-and-after example.  What was previously:</para>
-
-	    <programlisting>ifconfig_em0="192.168.2.1 netmask 255.255.255.0"
-ifconfig_em0_alias0="192.168.2.2 netmask 255.255.255.255"
-
-ipv6_enable="YES"
-ipv6_ifconfig_em0="2001:db8:1::1 prefixlen 64"
-ipv6_ifconfig_em0_alias0="2001:db8:2::1 prefixlen 64"
-# em1 uses SLAAC for IPv6 address configuration</programlisting>
-
-	    <para>should be in &release.current;:</para>
-
-	    <programlisting>ifconfig_em0="inet 192.168.2.1 netmask 255.255.255.0"
-ifconfig_em0_ipv6="inet6 2001:db8:1::1 prefixlen 64 accept_rtadv"
-ifconfig_em0_alias0="inet 192.168.2.2 netmask 255.255.255.255"
-ifconfig_em0_alias1="inet6 2001:db8:2::1 prefixlen 64"
-
-ifconfig_em1_ipv6="inet6 accept_rtadv"</programlisting>
-
-	    <para>More specific explanations of the changes are as
-	      follows:</para>
-
-	    <itemizedlist>
-	      <listitem>
-		<para>The <varname>ipv6_enable</varname> variable is
-		  deprecated.  IPv6 functionality on the system is
-		  enabled by default.  No IPv6 communication will
-		  happen if you configure no IPv6 address.</para>
-
-		<para>&release.current; now supports intermediate
-		  configurations between a host and a router IPv6
-		  node.  The <varname>ipv6_enable</varname> variable
-		  assumed that the system was a host node when
-		  <varname>ipv6_gateway_enable</varname> was set to
-		  <literal>NO</literal> (default), and a router node
-		  if not.  A host node always accepted ICMPv6 Router
-		  Advertise messages, and a router did not.</para>
-
-		<para>In &release.current;, this model is still
-		  applied but on a per-interface basis, not a
-		  system-wide basis.  Specifically, if an interface has
-		  an <literal>ACCEPT_RTADV</literal> flag, RA messages
-		  will be accepted on that interface for SLAAC
-		  (StateLess Address AutoConfiguration) regardless of
-		  whether the packet forwarding is enabled or
-		  not.</para>
-
-		<para>In addition to them, a per-interface flag
-		  <literal>NO_RADR</literal> and a &man.sysctl.8;
-		  variable <varname>net.inet6.ip6.rfc6204w3</varname>
-		  have been added.  This controls whether default
-		  router list information via RA messages on an
-		  RA-accepting interface should be ignored or not.  In
-		  an IPv6 router model, it is not supposed to accept
-		  RA messages as an information source for the default
-		  router list.  Because of that, &os; &release.current;
-		  ignores the default router list part when IPv6
-		  packet forwarding is enabled, even if the interface
-		  has an <literal>ACCEPT_RTADV</literal> flag.  However,
-		  this can make for a difficult situation when the system
-		  has to work as a CPE (Customer Premises Equipment)
-		  which needs RA messages from the upstream network
-		  for network configuration and acts as a router for
-		  the LAN simultaneously.  For more information about
-		  this kind of configuration, see RFC 6204.</para>
-
-		<para>To support this kind of configuration, the
-		  <varname>ipv6_cpe_wanif</varname> variable in
-		  &man.rc.conf.5; can be used.</para>
-
-		<programlisting>ipv6_gateway_enable="YES"
-ipv6_cpe_wanif="em0"</programlisting>
-
-		<para>means the <literal>em0</literal> interface
-		  accepts RA messages and the default router
-		  information in them, and the other interfaces ignore
-		  the default router information part even when
-		  the <literal>ACCEPT_RTADV</literal> flag is set on
-		  them.</para>
-
-		<para><varname>ipv6_cpe_wanif</varname> handling internally
-		  sets the <varname>net.inet6.ip6.rfc6204w3</varname>
-		  and the <varname>net.inet6.ip6.no_radr</varname>
-		  &man.sysctl.8; variables to <literal>1</literal>.
-		  Note that both are set to <literal>0</literal> by
-		  default.  When the former is set to
-		  <literal>1</literal>, &os; accepts the default
-		  router list even when IPv6 packet forwarding is
-		  enabled.  Note that a system administrator needs to
-		  set a <literal>NO_RADR</literal> flag on the other
-		  RA-accepting interfaces, if any, to prevent it from
-		  accepting unexpected default router information.
-		  The latter variable means the <literal>NO_RADR</literal> flag is automatically
-		  set on them.</para>
-
-		<para>If <literal>ipv6_enable="YES"</literal> is
-		  defined in &os; &release.current;, it sets
-		  <literal>ipv6_activate_all_interfaces="YES"</literal>
-		  in <filename>/etc/rc.conf</filename> and the
-		  <literal>inet6 accept_rtadv</literal>
-		  &man.ifconfig.8; option on all network interfaces.
-		  Note that this is only for backward compatibility.
-		  The <varname>ipv6_enable</varname> should not be
-		  used in &os; &release.current;.</para>
-	      </listitem>
-
-	      <listitem>
-		<para>The
-		  <varname>ipv6_ifconfig_<replaceable>IF</replaceable></varname>
-		  variable is renamed to
-		  <varname>ifconfig_<replaceable>IF</replaceable>_ipv6</varname>.
-		  This variable controls whether IPv6 functionality
-		  should be enabled on that interface or not.  If
-		  <varname>ifconfig_<replaceable>IF</replaceable>_ipv6</varname>,
-		  is not set, there is no IPv6 functionality on the interface
-		  <replaceable>IF</replaceable>.</para>
-
-		<para>Note that the
-		  <varname>ifconfig_<replaceable>IF</replaceable>_ipv6</varname> variable
-		  always needs the address family keyword
-		  <literal>inet6</literal>.  If you need an automatic
-		  link-local address only, the following line is enough:</para>
-
-		<programlisting>ifconfig_em0_ipv6="inet6 auto_linklocal"</programlisting>
-
-		<para>If you need full-blown IPv6 functionality on all
-		  interfaces like prior releases with
-		  <literal>ipv6_enable="YES"</literal>, including ones
-		  with no
-		  <varname>ifconfig_<replaceable>IF</replaceable>_ipv6
-		  line</varname>, you might want to use the
-		  <varname>ipv6_activate_all_interfaces</varname>
-		  variable as explained later.</para>
-
-		<para>If <literal>ipv6_ifconfig_<replaceable>IF</replaceable>="..."</literal> is
-		  defined in &os; &release.current;, it means
-		  <literal>ifconfig_<replaceable>IF</replaceable>_ipv6="inet6 ..."</literal>.
-		  Note that this is only for backward compatibility.
-		  The <literal>inet6</literal> address family keyword
-		  is required for <varname>ifconfig_<replaceable>IF</replaceable>_ipv6</varname>,
-		  but was NOT required for
-		  <varname>ipv6_ifconfig_<replaceable>IF</replaceable></varname>.  The
-		  <varname>ipv6_ifconfig_<replaceable>IF</replaceable></varname> variables should not be
-		  used in &release.current;.</para>
-	      </listitem>
-
-	      <listitem>
-		<para>An interface with no corresponding
-		  <varname>ifconfig_<replaceable>IF</replaceable>_ipv6</varname> variable is
-		  marked with an <literal>IFDISABLED</literal> flag by
-		  &man.devd.8; daemon.  This flag means IPv6
-		  communication is disabled on that interface.  This
-		  can also be found in output of
-		  &man.ifconfig.8;:</para>
-
-		<screen>&prompt.user; ifconfig em0
-em0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
-        options=9b&lt;RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,VLAN_HWCSUM&gt;
-        ether xx:xx:xx:xx:xx:xx
-        inet 192.168.2.1 netmask 0xffffff00 broadcast 192.168.2.255
-        nd6 options=3&lt;PERFORMNUD,IFDISABLED,ACCEPT_RTADV&gt;
-        media: Ethernet autoselect (1000baseT &lt;full-duplex&gt;)
-        status: active
-</screen>
-
-		<para>To enable IPv6 functionality, this flag should
-		  be removed first.  There are several ways to do so.
-		  Adding an IPv6 address automatically removes this
-		  flag.  It is possible to remove this flag explicitly
-		  by using the following command:</para>
-
-		<screen>&prompt.root; ifconfig em0 inet6 -ifdisabled</screen>
-
-		<para>Note that defining an
-		  <varname>ifconfig_<replaceable>IF</replaceable>_ipv6</varname> is the most
-		  reasonable way to activate IPv6 functionality on
-		  that interface.  This <literal>IFDISABLED</literal>
-		  flag is to prevent unintended IPv6 communications
-		  in an IPv4-only environment even when the interface
-		  has an IPv6 link-local address.  If you need
-		  full-blown IPv6 functionality on all interfaces, you
-		  might want to use the
-		  <varname>ipv6_activate_all_interfaces</varname>
-		  variable as explained later.</para>
-	      </listitem>
-
-	      <listitem>
-		<para>The &man.sysctl.8; variable
-		  <varname>net.inet6.ip6.accept_rtadv</varname> has
-		  been changed.  It was a system-wide configuration
-		  knob which controlled whether the system accepts ICMPv6
-		  Router Advertisement messages or not.  In
-		  &os; &release.current;, this knob is converted into a
-		  per-interface <literal>inet6 accept_rtadv</literal>
-		  &man.ifconfig.8; option.  Although the
-		  &man.sysctl.8; variable is available still in
-		  &os; &release.current;, it now controls whether the
-		  per-interface option is set by default or not.  The
-		  default value is <literal>0</literal> (not accept
-		  the RA messages).</para>
-	      </listitem>
-
-	      <listitem>
-		<para>The &man.sysctl.8; variable
-		  <varname>net.inet6.ip6.auto_linklocal</varname> has
-		  been changed.  It was a system-wide configuration
-		  knob which controlled whether an IPv6 link-local address
-		  was generated on a network interface when it became
-		  up.  In &os; &release.current;, this knob is converted
-		  into a per-interface <literal>inet6
-		  auto_linklocal</literal> &man.ifconfig.8; option.
-		  Although the &man.sysctl.8; variable is still available
-		  in &os; &release.current;, it now controls whether the
-		  per-interface option is set by default or not.  The
-		  default value is <literal>1</literal> (generate a
-		  link-local automatically).</para>
-	      </listitem>
-
-	      <listitem>
-		<para>The functionality of
-		  <varname>ipv6_ifconfig_<replaceable>IF</replaceable>_alias<replaceable>0</replaceable></varname>
-		  is integrated into
-		  <varname>ifconfig_<replaceable>IF</replaceable>_alias<replaceable>0</replaceable></varname>.
-		  Note that address family keywords are always required:</para>
-
-		<programlisting>ifconfig_em0_alias0="inet 192.168.2.10 netmask 255.255.255.255"
-ifconfig_em0_alias1="inet6 2001:db8:1::1 prefixlen 64</programlisting>
-
-		<para>Although
-		  <varname>ipv6_ifconfig_<replaceable>IF</replaceable>_alias<replaceable>N</replaceable></varname>
-		  is still usable in &os; &release.current;, it is only for
-		  backward compatibility.</para>
-	      </listitem>
-
-	      <listitem>
-		<para>A new
-		  <varname>ipv6_activate_all_interfaces</varname> variable
-		  has been added.  If this variable is set to
-		  <literal>YES</literal>, the <literal>IFDISABLED</literal>
-		  option will not be added even if
-		  <varname>ifconfig_<replaceable>IF</replaceable>_ipv6</varname> variables are not
-		  defined.  This can prevent <literal>IFDISABLED</literal>
-		  on dynamically-added interfaces such as &man.ppp.4;,
-		  &man.tap.4;, and &man.ng.iface.4; where defining
-		  <varname>ifconfig_<replaceable>IF</replaceable>_ipv6</varname> in advance is
-		  difficult.</para>
-	      </listitem>
-	    </itemizedlist>
-	  </listitem>
-	</itemizedlist>
-      </sect3>
-
-      <sect3>
-	<title>Openresolv and <filename>/etc/resolv.conf</filename></title>
-
-	<para>The &man.resolvconf.8; utility has been added and it now
-	  handles updating the &man.resolv.conf.5; file.  Direct
-	  modifications to <filename>/etc/resolv.conf</filename> can
-	  be overwritten by network configuration utilities such as
-	  &man.dhclient.8; and &man.rtsold.8;.</para>
-      </sect3>
-
-      <sect3>
-	<title>Disk Partition Management Utilities</title>
-
-	<para>In earlier releases various utilities were available to
-	  manage disk partition information.  They are deprecated in
-	  favor of the &man.gpart.8; utility.  Specifically, the
-	  &man.fdisk.8;, &man.disklabel.8; &man.bsdlabel.8;, and
-	  &man.sunlabel.8; utilities are no longer supported actively
-	  though these are still available for backward
-	  compatibility.</para>
-      </sect3>
-    </sect2>
-  </sect1>
-</article>
diff --git a/release/doc/en_US.ISO8859-1/share/xml/catalog b/release/doc/en_US.ISO8859-1/share/sgml/catalog
index 9995d5af1340..9995d5af1340 100644
--- a/release/doc/en_US.ISO8859-1/share/xml/catalog
+++ b/release/doc/en_US.ISO8859-1/share/sgml/catalog
diff --git a/release/doc/en_US.ISO8859-1/share/xml/release.dsl b/release/doc/en_US.ISO8859-1/share/sgml/release.dsl
index 7b1c975fb12e..37a7ea5d92c5 100644
--- a/release/doc/en_US.ISO8859-1/share/xml/release.dsl
+++ b/release/doc/en_US.ISO8859-1/share/sgml/release.dsl
@@ -42,8 +42,8 @@
 		(literal (entity-text "release.branch"))
 		(literal " should subscribe to the ")
                 (literal "<")
-		(create-link (list (list "HREF" "mailto:current@FreeBSD.org"))
-                  (literal "current@FreeBSD.org"))
+		(create-link (list (list "HREF" "mailto:stable@FreeBSD.org"))
+                  (literal "stable@FreeBSD.org"))
                 (literal "> mailing list.")))
 
             (make element gi: "p"
diff --git a/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile b/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile
index 1b9fff9acb12..5bf7a1516988 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.xml
+SRCS+= article.sgml
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml
index 1905e7054877..40c16340cb95 100644
--- a/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml
@@ -1,14 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-
-<!ENTITY release.4x "4.<replaceable>X</replaceable>">
-<!ENTITY release.5x "5.<replaceable>X</replaceable>">
-]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -17,6 +6,28 @@
      $FreeBSD$
      Original revision: 1.3
 -->
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
+%freebsd;
+
+<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+
+<!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR">
+%teams;
+
+<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mailing-lists;
+
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+<!ENTITY release.4x "4.<replaceable>X</replaceable>">
+<!ENTITY release.5x "5.<replaceable>X</replaceable>">
+
+]>
 
 <article>
   <articleinfo>
diff --git a/release/doc/fr_FR.ISO8859-1/errata/Makefile b/release/doc/fr_FR.ISO8859-1/errata/Makefile
index bde952662e8e..df21579da984 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.xml
+SRCS+=	article.sgml
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/errata/article.sgml
index 7d3e38ed1936..449b3dd6d46e 100644
--- a/release/doc/fr_FR.ISO8859-1/errata/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/errata/article.sgml
@@ -1,11 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -25,6 +17,17 @@
 
 -->
 
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+]>
+
 <article>
   <articleinfo>
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile
index 8a2955576c44..68f2784af8a6 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.xml
-SRCS+=	proc-alpha.xml
+SRCS+=	article.sgml
+SRCS+=	proc-alpha.sgml
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml
index 07004080eb70..f70bed890889 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml
@@ -1,17 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "alpha">
-<!ENTITY arch.print "Alpha/AXP">
-]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -21,6 +7,25 @@
      Original revision: 1.4
 -->
 
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "alpha">
+<!ENTITY arch.print "Alpha/AXP">
+
+]>
+
 <article>
   &artheader;
   &sect.intro;
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml
index 4439eeadf8b4..6b6128ab415f 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: proc-alpha.xml,v 1.5 2002/09/29 17:03:01 eagle Exp $
+     $Id: proc-alpha.sgml,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.xml b/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml
index 35883b1d0020..35883b1d0020 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml
index dec4d320b971..1fd74f0e5133 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: dev.xml,v 1.3 2002/09/29 21:03:53 eagle Exp $
+     $Id: dev.sgml,v 1.3 2002/09/29 21:03:53 eagle Exp $
      $FreeBSD$
      Original revision: 1.114
 -->
@@ -833,7 +833,7 @@
 	  <para>Carte RAID ATA Promise SuperTrak SX6000</para>
 	</listitem>
       </itemizedlist>
-    </para>
+    <para>
 
     <para arch="i386,alpha,pc98,sparc64">Cartes LSI Logic Fusion/MP
 	architecture Fiber Channel (gestionnaire mpt)
@@ -857,7 +857,6 @@
         <para>Tekram DC315U</para>
       </listitem>
     </itemizedlist>
-    </para>
 
 
     <para>Sur toutes les cartes SCSI support&eacute;es, le support total
@@ -1376,7 +1375,7 @@
 	<listitem>
 	  <para>NetGear FA310-TX Rev. D1</para>
         </listitem>
-      </itemizedlist>
+      </itemizedlist
     </para>
 
     <para arch="i386,pc98,alpha">Cartes Macronix 98713, 98713A, 98715,
@@ -1748,7 +1747,7 @@
 	  <para>ELECOM LD-PCI2T, LD-PCITS (PCI)</para>
 	</listitem>
 	<listitem arch="pc98">
-	  <para>Corega FastEther PCI-TX (PCI)</para>
+	  <para>Corega FastEther PCI-TX (PCI)
 	</listitem>
       </itemizedlist>
     </para>
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 a6bb1d967903..103c5673858b 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.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">
+<!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">
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml b/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml
index 0503345828d1..0503345828d1 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile
index ceb9b9a6121a..4b7d052f03ef 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.xml 
-SRCS+=	proc-i386.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-i386.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml
index ba475e63d505..38228bb8e45a 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml
@@ -1,17 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "i386">
-<!ENTITY arch.print "IA-32">
-]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -21,6 +7,25 @@
      Original revision: 1.3
 -->
 
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "i386">
+<!ENTITY arch.print "IA-32">
+
+]>
+
 <article>
   &artheader;
   &sect.intro;
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml
index c409d8ca0d3c..91e09f36d715 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: proc-i386.xml,v 1.2 2002/09/28 23:23:21 eagle Exp $
+     $Id: proc-i386.sgml,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 42d63cca3a29..180657b8fc54 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.xml 
-# SRCS+=	proc-ia64.xml 
+SRCS+=	article.sgml 
+# SRCS+=	proc-ia64.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml
index 9edb86646f26..48ecd83910b1 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml
@@ -1,17 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "ia64">
-<!ENTITY arch.print "IA-64">
-]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -21,6 +7,24 @@
      Original revision: 1.2
 -->
 
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "ia64">
+<!ENTITY arch.print "IA-64">
+
+]>
+
 <article>
   &artheader;
   
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml b/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml
index 8319c1be9fd9..8319c1be9fd9 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile
index df72aca0c2b2..c900c54f0dc4 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.xml 
-SRCS+=	proc-pc98.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-pc98.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml
index 019decf4eadc..f1471b9dca3c 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml
@@ -1,17 +1,3 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "pc98">
-<!ENTITY arch.print "NEC PC-98x1">
-]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -21,6 +7,24 @@
      Original revision: 1.1
 -->
 
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
+<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
+%release;
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
+
+<!-- Architecture-specific customization -->
+
+<!ENTITY arch "pc98">
+<!ENTITY arch.print "NEC PC-98x1">
+
+]>
+
 <article>
   &artheader;
   &sect.intro;
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml
index 5166bb128f13..5166bb128f13 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile
index 84b9da2b6f29..51acc371b5d3 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.xml 
-SRCS+=	proc-sparc64.xml 
-SRCS+=	dev-sparc64.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-sparc64.sgml 
+SRCS+=	dev-sparc64.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
+SRCS+=	../common/artheader.sgml
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml
index ba10823db0b2..de8b4913e921 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml
@@ -1,10 +1,22 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
+<!--
+     The FreeBSD Documentation Project
+     The FreeBSD French Documentation Project
+
+     $Id$
+     $FreeBSD$
+     Original revision: 1.2
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections
+<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
 
 <!-- Architecture-specific customization -->
 
@@ -12,18 +24,9 @@
 <!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.xml">
+<!ENTITY sect.dev.sparc64 SYSTEM "./dev-sparc64.sgml">
 ]>
 
-<!--
-     The FreeBSD Documentation Project
-     The FreeBSD French Documentation Project
-
-     $Id$
-     $FreeBSD$
-     Original revision: 1.2
--->
-
 <article>
   &artheader;
   &sect.intro;
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
index b97cbf8a5a4a..4bc54a39b215 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: dev-sparc64.xml,v 1.2 2002/09/28 23:01:52 eagle Exp $
+     $Id: dev-sparc64.sgml,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.xml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
index f434ac0874dc..f434ac0874dc 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
index 06dfd252486b..30b5589ddbb2 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.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
+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
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml
index d12f9f93facf..78045ad37f36 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml
@@ -1,7 +1,20 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
+<!--
+     The FreeBSD Documentation Project
+     The FreeBSD French Documentation Project
+
+     $Id$
+     $FreeBSD$
+     Original revision: 1.3
+-->
+
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,16 +23,8 @@
 
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
-]>
-
-<!--
-     The FreeBSD Documentation Project
-     The FreeBSD French Documentation Project
 
-     $Id$
-     $FreeBSD$
-     Original revision: 1.3
--->
+]>
 
 <article>
 &artheader;
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/abstract.xml b/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml
index 34e7da3e6294..34e7da3e6294 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/abstract.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml b/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml
index 8573012b061a..8573012b061a 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml
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 d125f400e54e..76db954deda9 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.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">
+<!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">
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/install.xml b/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml
index f59071c77464..895729c61f9b 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml
@@ -31,7 +31,7 @@ from {alpha,i386}/INSTALL.TXT.
 
   <para>Si vous effectuez une mise &agrave; jour depuis une version
   pr&eacute;cedente de &os;, r&eacute;f&eacute;rez vous aux, <xref
-  linkend="upgrading"/>, instructions sur la mise &agrave; jour.</para>
+  linkend="upgrading">, instructions sur la mise &agrave; jour.</para>
 
   <sect2 id="getting-started">
     <title>Pour commencer</title>
@@ -61,7 +61,7 @@ from {alpha,i386}/INSTALL.TXT.
     l'installation.</para>
 
     <para>Si vous avez des probl&egrave;mes, voyez la <xref
-    linkend="trouble"/>, qui contient certaines informations
+    linkend="trouble">, qui contient certaines informations
     interessantes. Vous pouvez aussi lire une copie &agrave; jour du
     fichier <filename>ERRATA.TXT</filename> avant l'installation, qui
     vous alertera sur les probl&egrave;mes rencontr&eacute;s depuis la mise
@@ -76,7 +76,6 @@ from {alpha,i386}/INSTALL.TXT.
       que vous n'avez pas effectu&eacute; une sauvegarde de vos donn&eacute;es
       importantes.</para>
     </important>
-  </sect2>
 
   <sect2>
     <title>Mat&eacute;riel N&eacute;cessaire</title>
@@ -217,7 +216,7 @@ from {alpha,i386}/INSTALL.TXT.
             depuis le r&eacute;pertoire <filename>floppies/</filename>. En
             utilisant le script <filename>makeflp.bat</filename>
             depuis DOS ou en lisant la 
-            <xref linkend="floppies"/> pour plus d'informations sur la
+            <xref linkend="floppies"> pour plus d'informations sur la
             cr&eacute;ation de disquettes de d&eacute;marrage sous
             diff&eacute;rents syst&egrave;mes. Vous d&eacute;marrerez depuis la
             premi&egrave;re disquette et vous vous trouverez rapidement
@@ -234,11 +233,11 @@ from {alpha,i386}/INSTALL.TXT.
       depuis les fichiers <filename>floppies/kern.flp</filename> et
       <filename>floppies/mfsroot.flp</filename> en suivant les
       instructions que vous trouverez &agrave; la  
-      <xref linkend="floppies"/>. Red&eacute;marrez votre ordinateur en utilisant
+      <xref linkend="floppies">. Red&eacute;marrez votre ordinateur en utilisant
       la disquette <filename>kern.flp</filename> et lorsqu'on vous le
       demande, inserez alors la disquette
       <filename>mfsroot.flp</filename>. Allez &agrave; la <xref
-      linkend="ftpnfs"/> pour plus d'information sur l'installation
+      linkend="ftpnfs"> pour plus d'information sur l'installation
       via FTP ou NFS.</para>
 
       <para arch="alpha">La fa&ccedil;on la plus simple d'effectuer
@@ -257,7 +256,7 @@ from {alpha,i386}/INSTALL.TXT.
       de &os; depuis les fichiers <filename>floppies/kern.flp</filename> et
       <filename>floppies/mfsroot.flp</filename> en suivant les
       instructions que vous trouverez &agrave; la  <xref
-      linkend="floppies"/>. Depuis l'invite de console SRM
+      linkend="floppies">. Depuis l'invite de console SRM
       (<literal>&gt;&gt;&gt;</literal>), inserez la disquette
       <filename>kern.flp</filename> et tapez la commande suivante pour
       d&eacute;marrer l'installation:</para>
@@ -347,7 +346,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       <title>Installation depuis un CDROM r&eacute;seau</title>
 
       <para>Si vous d&eacute;sirez installer depuis un lecteur de CDROM
-      local voyez la <xref linkend="start-installation"/>. Si vous ne
+      local voyez la <xref linkend="start-installation">. Si vous ne
       disposez pas d'un lecteur de CDROM sur votre syst&egrave;me et que
       vous d&eacute;sirez utiliser une distribution CD de &os; dans le
       lecteur CDROM d'une autre machine que vous pouvez acc&eacute;der via
@@ -412,9 +411,9 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       quelques disquettes pour l'installation.</para>
 
       <para>Premi&egrave;rement, cr&eacute;ez vos disquettes de d&eacute;marrage
-      comme indiqu&eacute; &agrave; la <xref linkend="floppies"/>.</para>
+      comme indiqu&eacute; &agrave; la <xref linkend="floppies">.</para>
 
-      <para>Deuxi&egrave;emement, lisez la <xref linkend="layout"/> et
+      <para>Deuxi&egrave;emement, lisez la <xref linkend="layout"> et
       faites attention &agrave; la section <quote>Format de la
       distribution</quote> qui d&eacute;crit quels fichiers vous devez
       copier sur disquette et ceux que vous pouvez ne pas copier.</para>
@@ -515,7 +514,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       tout simplement en format tar sur la bande, donc apr&egrave;s avoir
       r&eacute;cup&eacute;rer l'ensemble des fichiers des distributions
       n&eacute;cessaires, utilisez simplement la commande &man.tar.1; pour
-      les mettre sur la bande, comme cela :</para>
+      les mettre sur la bande, comme cela :/<para>
 
       <screen>&prompt.root; <userinput>cd <replaceable>/where/you/have/your/dists</replaceable></userinput>
 &prompt.root; <userinput>tar cvf /dev/rsa0 <replaceable>dist1</replaceable> .. <replaceable>dist2</replaceable></userinput></screen>
@@ -538,7 +537,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       </note>
 
       <para>Ensuite cr&eacute;ez une disquette de d&eacute;marrage comme
-      indiqu&eacute; &agrave; la  <xref linkend="floppies"/> et proc&eacute;dez
+      indiqu&eacute; &agrave; la  <xref linkend="floppies"> et proc&eacute;dez
       &agrave; l'installation.</para>
     </sect3>
 
@@ -740,7 +739,6 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
               correspond au num&eacute;ro du port du serveur FTP proxy.</para>
 	    </listitem>
 	  </itemizedlist>
-	</para>
 
       </sect4>
     </sect3>
@@ -768,7 +766,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	  <para>Si vous n'obtenez aucun caract&egrave;re sur votre console
           s&eacute;rie, branchez le clavier et attendez des sonneries. Si
           vous d&eacute;marrez depuis le CDROM, allez &agrave; <xref
-	  linkend="hitspace"/> aussi vite que possible.</para>
+	  linkend="hitspace"> aussi vite que possible.</para>
 	</step>
 	<step>
 	  <para>Pour une installation via des disquettes, la premi&egrave;re
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml b/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml
index 472e60ffecaf..fe2147cbd4a5 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml
@@ -27,7 +27,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
     FTP ou NFS, depuis ce r&eacute;pertoire, la seule chose
     n&eacute;cesaire est de cr&eacute;er les disquettes 1.44Mb bootables
     depuis les fichiers se trouvant dans le r&eacute;pertoire floppies
-    (voir <xref linkend="floppies"/> pour les instructions sur la faГon
+    (voir <xref linkend="floppies"> pour les instructions sur la faГon
     de proc&eacute;der), de d&eacute;marrer grace &agrave; elles et de
     suivre les instructions. Le reste des donn&eacute;es
     n&eacute;cessaires a l'installation serontcharg&eacute;es
@@ -58,7 +58,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
       <listitem>
         <para><filename>docbook.css</filename> est un fichier de 
 	style(CSS) utilis&eacute; par certains browsers WWW pour formatter 
-	la documentation HTML.</para>
+	la documentation HTML.
       </listitem>
       <listitem>
 	<para>Les r&eacute;pertoire <filename>bin</filename>,
@@ -94,7 +94,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
 	<para>Le sous-r&eacute;pertoire <filename>floppies/</filename>
         contient les images de la disquette d'installation. Plus
         d'informations sur son utilisation dans <xref
-        linkend="floppies"/>.</para>
+        linkend="floppies">.</para>
       </listitem>
       <listitem>
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
index c248227aa7f8..940f66f7aed3 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml
@@ -349,7 +349,7 @@ boot:</screen>
           the machine (turn off and on).  At the
           <literal>Boot:</literal> prompt specify the
           <option>-c</option>.  This will invoke UserConfig (see
-          <xref linkend="repairing"/> above).
+          <xref linkend="repairing"> above).
 	  Use the <literal>disable</literal>
           command to disable the device probes for all devices at
           address 0x300 except the ep0 driver.  On exit, your machine
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
index 54dd0728e3b5..a2609aa8cf8e 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
@@ -210,6 +210,6 @@
     <para><filename>/usr/src/UPDATING</filename> contains important
     information on updating a &os; system from source code.  It lists
     various issues resulting from changes in &os; that may affect an
-    upgrade.</para>
+    upgrade.<para>
   </sect2>
 </sect1>  
diff --git a/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile b/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
index 49e6c23358b1..a377905e3dad 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.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
+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
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml
index 7ef6d2da6c41..dfbec1edd691 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml
@@ -1,7 +1,20 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
+<!--
+     The FreeBSD Documentation Project
+     The FreeBSD French Documentation Project
+
+     $Id$
+     $FreeBSD$
+     Original revision: 1.3
+-->
+
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,16 +23,8 @@
 
 <!ENTITY arch "i386">
 <!ENTITY arch.print "IA-32">
-]>
-
-<!--
-     The FreeBSD Documentation Project
-     The FreeBSD French Documentation Project
 
-     $Id$
-     $FreeBSD$
-     Original revision: 1.3
--->
+]>
 
 <article>
 &artheader;
diff --git a/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile b/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
index f191fbc8651b..6ff53b66239b 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.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
+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
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml
index 9b015e2ec582..5e68d6e4d555 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml
@@ -1,7 +1,19 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
+<!--
+     The FreeBSD Documentation Project
+     The FreeBSD French Documentation Project
+
+     $Id$
+     $FreeBSD$
+     Original revision: 1.1
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,16 +22,8 @@
 
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
-]>
 
-<!--
-     The FreeBSD Documentation Project
-     The FreeBSD French Documentation Project
-
-     $Id$
-     $FreeBSD$
-     Original revision: 1.1
--->
+]>
 
 <article>
 &artheader;
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile b/release/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile
index f8f6448ea60f..c3e7481e0ab3 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.xml
-SRCS+=	install.xml
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/install.xml
-SRCS+=	../common/layout.xml
+SRCS+=	article.sgml
+SRCS+=	install.sgml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/install.sgml
+SRCS+=	../common/layout.sgml
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml
index 14dbe2e21075..cdbbc68fecfc 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml
@@ -1,7 +1,22 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
+<!--
+     The FreeBSD Documentation Project
+     The FreeBSD French Documentation Project
+
+     $Id$
+     $FreeBSD$
+     Original revision: 1.3
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+
+<!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
+
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,18 +25,9 @@
 
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
-<!ENTITY sect.sparc64.install SYSTEM "./install.xml">
+<!ENTITY sect.sparc64.install SYSTEM "./install.sgml">
 ]>
 
-<!--
-     The FreeBSD Documentation Project
-     The FreeBSD French Documentation Project
-
-     $Id$
-     $FreeBSD$
-     Original revision: 1.3
--->
-
 <article>
 &artheader;
 <abstract>
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml b/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml
index e4d8f5b1a34d..56270ecaad71 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml
@@ -90,8 +90,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
     <screenco>
       <areaspec>
-	<area id="prompt-single" coords="1 5"/>
-	<area id="prompt-smp" coords="2 5"/>
+	<area id="prompt-single" coords="1 5">
+	<area id="prompt-smp" coords="2 5">
       </areaspec>
 
       <screen><prompt>ok     </prompt>
@@ -126,8 +126,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
       cdrom</command>.  The system should boot into single-user mode
       now, and you can create the disk label and install the base
       system archive as described in <xref
-      linkend="creating-disk-label"/> and <xref
-      linkend="creating-root-filesystem"/>.</para>
+      linkend="creating-disk-label"> and <xref
+      linkend="creating-root-filesystem">.</para>
   </sect2>
 
   <sect2 id="prepare-network">
@@ -302,7 +302,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
       <para>With the daemons on the netboot server configured, the
 	next step is to copy the kernel (obtained during the steps of
-	<xref linkend="downloading"/>) to an appropriate directory.
+	<xref linkend="downloading">) to an appropriate directory.
 	There are two ways of retrieving a kernel over the network:
 	TFTP and NFS.  (You specified one of these two alternatives by
 	picking a loader.)</para>
@@ -362,7 +362,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
       <para>If all goes well, you can now boot the &os; on your &arch;
 	machine by dropping into the PROM prompt as described in <xref
-	linkend="getting-to-prom-prompt"/>.  Now, just type
+	linkend="getting-to-prom-prompt">.  Now, just type
 	<command>boot net</command> and the system should boot.
 	Specifically, the loader is retrieved via TFTP, it then does a
 	BOOTP request and will proceed to load the kernel (either
@@ -519,7 +519,7 @@ drivedata: 0
 
     <para>To create filesystems and to install the base system, boot
       from CDROM or via NFS and create a disk label as described in
-      <xref linkend="creating-disk-label"/>.</para>
+      <xref linkend="creating-disk-label">.</para>
 
     <para>When booting the first time and you have not entered your
       root partition into <filename>/etc/fstab</filename> yet, you may
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile
index 3389969e5086..eaff0b77c2ff 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml
index 72a809f64b4f..f641c0a85f8b 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml
@@ -1,7 +1,20 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
+<!--
+     The FreeBSD Documentation Project
+     The FreeBSD French Documentation Project
+
+     $Id$
+     $FreeBSD$
+     Original revision: 1.3
+-->
+
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,16 +23,8 @@
 
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
-]>
-
-<!--
-     The FreeBSD Documentation Project
-     The FreeBSD French Documentation Project
 
-     $Id$
-     $FreeBSD$
-     Original revision: 1.3
--->
+]>
 
 <article>
   &art;
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml
index 75634ccd2586..5263ca4e85b7 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: new.xml,v 1.5 2002/09/28 21:57:12 eagle Exp $
+     $Id: new.sgml,v 1.5 2002/09/28 21:57:12 eagle Exp $
      $FreeBSD$
      Original revision: 1.423
 -->
@@ -1784,7 +1784,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
         <para>La couche IPv6 est maintenant bas&eacute;e sur la snapshot
 	du projet KAME IPv6 en date du 28 Mai 2001. La plupart
 	des ajouts de cette section r&eacute;sultent de cet import. La 
-	<xref linkend="kame-userland"/> liste les modifications
+	<xref linkend="kame-userland"> liste les modifications
 	dans les programmes utilisateurs de la couche 
 	KAME IPv6 . &merged;</para>
 
@@ -1813,7 +1813,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 	Autoconfiguration) est support&eacute;. Il peut etre activ&eacute; par la 
 	variable sysctl <varname>net.inet6.ip6.use_tempaddr</varname>.
 	 &merged;</para>
-     </sect4>
+
    </sect3>
   </sect2>
   <sect2 id="security">
@@ -2475,7 +2475,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
     d'environnement <envar>HTTP_USER_AGENT</envar>. &merged;</para>
 
     <para><filename>libgmp</filename> a &eacute;t&eacute; remplac&eacute; par
-    <filename>libmp</filename>.</para>
+    <filename>libmp</filename>.
 
     <para>Les fonctions de <filename>libposix1e</filename> ont &eacute;t&eacute; 
     int&eacute;gr&eacute;s dans <filename>libc</filename>.</para>
@@ -2613,7 +2613,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
     fix&eacute;e &agrave; 16. Cela augmente les performances de &man.fsck.8; tout en 
     r&eacute;duisant la fragmentation. &merged;</para>
 
-    <para><anchor id="newfs-block-frag-sizes"/>La taille des blocs et des fragments
+    <para><anchor id="newfs-block-frag-sizes">La taille des blocs et des fragments
     lors de la cr&eacute;ation de syst&egrave;mes de fichiers par &man.newfs.8; sont 
     respectivement de 16384 bytes et 2048 bytes (les anciennes valeurs
     &eacute;taient de 8192 bytes et 1024 bytes). Ce changement augmente la performance
@@ -3252,7 +3252,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 	 <para>La couche IPv6 est maintenant bas&eacute;e sur la snapshot
 	du projet KAME IPv6 en date du 28 Mai 2001. La plupart
 	des ajouts de cette section r&eacute;sultent de cet import. La 
-	<xref linkend="kame-kernel"/> liste les modifications
+	<xref linkend="kame-kernel"> liste les modifications
 	dans le noyau de la couche KAME IPv6 . &merged;</para>
 
 	<para>&man.faithd.8; dispose d'un fichier de configuration de liste de
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 3879c3a2e659..2051522133b8 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.xml">
+<!ENTITY art SYSTEM "../common/new.sgml">
 
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile b/release/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile
index f902e479a2c0..10faa9d1a634 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-#SRCS+=	../common/new.xml
+#SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml
index b06d2a77ab66..7c0714ee5dd6 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml
@@ -1,7 +1,19 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN" [
-<!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR">
-%entities;
+<!--
+     The FreeBSD Documentation Project
+     The FreeBSD French Documentation Project
+
+     $Id$
+     $FreeBSD$
+     Original revision: 1.3
+-->
+
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
+%man;
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
+%authors;
+<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
+%mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,16 +22,8 @@
 
 <!ENTITY arch "i386">
 <!ENTITY arch.print "IA-32">
-]>
 
-<!--
-     The FreeBSD Documentation Project
-     The FreeBSD French Documentation Project
-
-     $Id$
-     $FreeBSD$
-     Original revision: 1.3
--->
+]>
 
 <article>
   &art;
diff --git a/release/doc/fr_FR.ISO8859-1/share/xml/catalog b/release/doc/fr_FR.ISO8859-1/share/sgml/catalog
index 9995d5af1340..9995d5af1340 100644
--- a/release/doc/fr_FR.ISO8859-1/share/xml/catalog
+++ b/release/doc/fr_FR.ISO8859-1/share/sgml/catalog
diff --git a/release/doc/fr_FR.ISO8859-1/share/xml/release.dsl b/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl
index 2de7155d09d1..2de7155d09d1 100644
--- a/release/doc/fr_FR.ISO8859-1/share/xml/release.dsl
+++ b/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl
diff --git a/release/doc/ja_JP.eucJP/errata/Makefile b/release/doc/ja_JP.eucJP/errata/Makefile
index 18081771783d..f9bbcfd977ed 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.xml
+SRCS+=	article.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/errata/article.sgml
index 009dbd57a07d..009dbd57a07d 100644
--- a/release/doc/ja_JP.eucJP/errata/article.xml
+++ b/release/doc/ja_JP.eucJP/errata/article.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/alpha/Makefile b/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
index a3e402f7a8a6..f431bf9cb7a6 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.xml
-#SRCS+=	proc-alpha.xml
+SRCS+=	article.sgml
+#SRCS+=	proc-alpha.sgml
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+=	../../share/sgml/dev-auto-ja.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml
index 65c72c08c63f..65c72c08c63f 100644
--- a/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/Makefile b/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
index 9843764547f4..fa57ac6b3d9b 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.xml 
-SRCS+=	proc-amd64.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-amd64.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+=	../../share/sgml/dev-auto-ja.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml
index 374409bb7e08..374409bb7e08 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml
index 8741b88de973..8741b88de973 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/common/artheader.xml b/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml
index b21ca826b6d2..b21ca826b6d2 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
+++ b/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/common/dev.xml b/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
index 65f2fb7088a0..a681565ab1dd 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/dev.xml
+++ b/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
@@ -946,6 +946,6 @@
 <!-- 
      Local Variables:
      mode: sgml
-     sgml-parent-document: ("../i386/article.xml" "article" "articleinfo")
+     sgml-parent-document: ("../i386/article.sgml" "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 3f45fcfa54f8..d31cd665c39a 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.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">
+<!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">
diff --git a/release/doc/ja_JP.eucJP/hardware/common/intro.xml b/release/doc/ja_JP.eucJP/hardware/common/intro.sgml
index e8a2345a002e..e8a2345a002e 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/intro.xml
+++ b/release/doc/ja_JP.eucJP/hardware/common/intro.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/Makefile b/release/doc/ja_JP.eucJP/hardware/i386/Makefile
index 4872631ac037..9673692d8a90 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.xml 
-SRCS+=	proc-i386.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-i386.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+=	../../share/sgml/dev-auto-ja.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
index 00acf40d65e6..00acf40d65e6 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml
index 2aa3fc74e1f8..2aa3fc74e1f8 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/Makefile b/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
index c797e668a83e..97f456684761 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.xml 
-# SRCS+=	proc-ia64.xml 
+SRCS+=	article.sgml 
+# SRCS+=	proc-ia64.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+=	../../share/sgml/dev-auto-ja.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml
index 928734626cf9..928734626cf9 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml
index 47134b3c0d01..47134b3c0d01 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/Makefile b/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
index 788a6e829f18..a83a68ca7908 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.xml 
-SRCS+=	proc-pc98.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-pc98.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+=	../../share/sgml/dev-auto-ja.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml
index ee77a3600d04..ee77a3600d04 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml
index 03df50efad8f..03df50efad8f 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile b/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
index cd5ad68b558d..74724537b8fb 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.xml 
-SRCS+=	proc-sparc64.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-sparc64.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+=	../../share/xml/dev-auto-ja.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+=	../../share/sgml/dev-auto-ja.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
index 92e3a8f800d6..92e3a8f800d6 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml
index 209e72c419d8..209e72c419d8 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml
diff --git a/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile b/release/doc/ja_JP.eucJP/relnotes/alpha/Makefile
index 8dd7309a088a..baf44f5c7d95 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
index c1afb1df7bb4..c1afb1df7bb4 100644
--- a/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
diff --git a/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile b/release/doc/ja_JP.eucJP/relnotes/amd64/Makefile
index a704edaca376..647128cdbda1 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
index 102a998a1537..102a998a1537 100644
--- a/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/new.xml b/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
index 512adfc5b81e..c49592d91e95 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/new.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
@@ -1009,6 +1009,6 @@
 <!--
      Local Variables:
      mode: sgml
-     sgml-parent-document: ("../i386/article.xml" "article" "articleinfo")
+     sgml-parent-document: ("../i386/article.sgml" "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 0e76fc67639f..cfd39c89edb3 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.xml">
+<!ENTITY art SYSTEM "../common/new.sgml">
diff --git a/release/doc/ja_JP.eucJP/relnotes/i386/Makefile b/release/doc/ja_JP.eucJP/relnotes/i386/Makefile
index ecb7b1751fc3..ed0d1e93a2ee 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 URL_RELPREFIX?=	../../../..
 
diff --git a/release/doc/ja_JP.eucJP/relnotes/i386/article.xml b/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
index a075a64b80c4..a075a64b80c4 100644
--- a/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
diff --git a/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile b/release/doc/ja_JP.eucJP/relnotes/ia64/Makefile
index a704edaca376..647128cdbda1 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
index a8517b03b563..a8517b03b563 100644
--- a/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
diff --git a/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile b/release/doc/ja_JP.eucJP/relnotes/pc98/Makefile
index a704edaca376..647128cdbda1 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
index aead305540d8..aead305540d8 100644
--- a/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
diff --git a/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile b/release/doc/ja_JP.eucJP/relnotes/sparc64/Makefile
index a704edaca376..647128cdbda1 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
index 109234991104..109234991104 100644
--- a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
diff --git a/release/doc/ja_JP.eucJP/share/xml/catalog b/release/doc/ja_JP.eucJP/share/sgml/catalog
index c96f4d2df094..19ce2927725b 100644
--- a/release/doc/ja_JP.eucJP/share/xml/catalog
+++ b/release/doc/ja_JP.eucJP/share/sgml/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.xml"
+       "dev-auto-ja.sgml"
 
 
 
diff --git a/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml b/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml
index 57e4deacbb6b..57e4deacbb6b 100644
--- a/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml
+++ b/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml
diff --git a/release/doc/ja_JP.eucJP/share/xml/release.dsl b/release/doc/ja_JP.eucJP/share/sgml/release.dsl
index 5cf5d795fa2a..5cf5d795fa2a 100644
--- a/release/doc/ja_JP.eucJP/share/xml/release.dsl
+++ b/release/doc/ja_JP.eucJP/share/sgml/release.dsl
diff --git a/release/doc/ru_RU.KOI8-R/errata/Makefile b/release/doc/ru_RU.KOI8-R/errata/Makefile
index 28699d89ec76..569e28c75f03 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.xml
+SRCS+=	article.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/errata/article.sgml
index a758456e8245..a4ca7db58bd4 100644
--- a/release/doc/ru_RU.KOI8-R/errata/article.xml
+++ b/release/doc/ru_RU.KOI8-R/errata/article.sgml
@@ -2,7 +2,7 @@
    The FreeBSD Russian Documentation Project
 
    $FreeBSD$
-   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/errata/article.xml,v 1.5 2004/09/10 13:56:07 den Exp $
+   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/errata/article.sgml,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 08d3f6af7f2f..4b097f502f6f 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.xml
-SRCS+=	../../../en_US.ISO8859-1/hardware/alpha/proc-alpha.xml
+SRCS+=	article.sgml
+SRCS+=	../../../en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+= ../../share/sgml/dev-auto-ru.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml
index acf2e92ba42b..dd7e6068b888 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml,v 1.6 2005/03/10 11:04:19 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml,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 4cc732fdeea8..3ee019da3d92 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.xml 
-SRCS+=	proc-amd64.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-amd64.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+= ../../share/sgml/dev-auto-ru.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml
index 0654720016ef..11ff4d3f2125 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml,v 1.6 2005/03/10 11:04:20 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml,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.xml b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml
index a392270cdf88..1cdd4a9e3743 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml,v 1.3 2004/09/13 09:24:00 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml,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.xml b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml
index 8aea81f95af7..4c11f77691f8 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml,v 1.2 2005/04/25 12:23:24 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml,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.xml b/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml
index cb2ab13d342e..9a2657084d92 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml,v 1.18 2005/06/30 11:12:31 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,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 c39258735c14..3f86696b7c59 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.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">
+<!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">
 
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml b/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml
index 32dffe8a1695..739191ef7d4f 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml,v 1.2 2004/09/06 14:05:02 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml,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 e8a2abc6e36c..3aa62b541d11 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.xml 
-SRCS+=	proc-i386.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-i386.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+= ../../share/sgml/dev-auto-ru.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml
index 3c38a6e51057..ef074447f516 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml,v 1.6 2005/03/10 11:04:20 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml,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.xml b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml
index c3e244b8f95d..905a9a3ed12c 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml,v 1.1 2004/05/27 06:09:43 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml,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 b32a22b3dc4b..126215b50db3 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.xml 
-# SRCS+=	proc-ia64.xml 
+SRCS+=	article.sgml 
+# SRCS+=	proc-ia64.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+= ../../share/sgml/dev-auto-ru.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml
index eb36ee93fce5..1281aa45af5d 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml,v 1.6 2005/03/10 11:04:20 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml,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.xml b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml
index 7b612df93016..4656bd6edeb5 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml,v 1.2 2004/08/03 12:53:39 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml,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 53b9df08af9c..6fc857fd2f88 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.xml 
-SRCS+=	proc-pc98.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-pc98.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+= ../../share/sgml/dev-auto-ru.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml
index 7780d42ecaf4..bab60c052ed2 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml,v 1.6 2005/03/10 11:04:21 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml,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.xml b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml
index eb4d458c3799..224512b39546 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml,v 1.1 2004/05/27 06:09:43 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml,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 d622a6c14603..ead67c9359cf 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.xml 
-SRCS+=	proc-sparc64.xml 
+SRCS+=	article.sgml 
+SRCS+=	proc-sparc64.sgml 
 SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/dev.xml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/dev.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
-SRCS+= ../../share/xml/dev-auto-ru.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
+SRCS+= ../../share/sgml/dev-auto-ru.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml
index d49d4c526be5..2b0fc786fb30 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml,v 1.6 2005/03/10 11:04:21 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml,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.xml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml
index 56d11f0d77a7..95fcebf0c260 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml,v 1.2 2004/09/01 12:23:40 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml,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 e6ebc349c01b..7241133f65b6 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.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
+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
 
 .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.xml b/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml
index e05b68022f41..d43057bcbe27 100644
--- a/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml,v 1.5 2004/08/12 08:31:35 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml,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 e3180497050a..1c7ac4d9bbd5 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.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
+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
 
 .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.xml b/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml
index 74da35991e76..b46561a82b38 100644
--- a/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml,v 1.5 2004/08/12 08:31:35 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml,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.xml b/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml
index c2a3d9c83968..00bca530ae81 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml,v 1.1 2004/06/24 07:21:47 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml,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.xml b/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml
index d612a17f02d6..0475eed4dd55 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml,v 1.3 2005/06/30 11:12:32 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml,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 46281d19db00..cfe8a868d617 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.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">
+<!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">
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/install.xml b/release/doc/ru_RU.KOI8-R/installation/common/install.sgml
index 07de898a9940..30487d149d4d 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/install.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/install.sgml
@@ -2,11 +2,11 @@
 The FreeBSD Russian Documentation Project
 
 $FreeBSD$
-$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.xml,v 1.8 2005/06/30 11:12:32 den Exp $
+$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/install.sgml,v 1.8 2005/06/30 11:12:32 den Exp $
 
 Original revision: 1.32
 
-install.xml
+install.sgml
 
 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.xml b/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml
index 8a50f61a0c57..48191b6bd553 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Russian Documentation Project
 
 	$FreeBSD$
-	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/layout.xml,v 1.5 2005/04/14 13:30:11 den Exp $
+	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml,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.xml b/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml
index 99d65d623917..4bc38b41e2e5 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Russian Documentation Project
 
 	$FreeBSD$
-	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml,v 1.5 2005/06/30 11:12:32 den Exp $
+	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml,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.xml b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml
index 96c9d9659f29..dffe1a55541f 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml
@@ -2,7 +2,7 @@
 	The FreeBSD Russian Documentation Project
 
 	$FreeBSD$
-	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml,v 1.3 2004/09/06 14:05:03 den Exp $
+	$FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml,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 bb21c10d84bf..b1d897d9b39f 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.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
+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
 
 .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.xml b/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml
index d938b5995a40..14199c01d870 100644
--- a/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/i386/article.xml,v 1.5 2004/08/12 08:31:36 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml,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 e4223135aef6..adf6a2a28548 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.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
+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
 
 .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.xml b/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml
index 8143fb72d157..df280dba03dd 100644
--- a/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml,v 1.5 2004/08/12 08:31:36 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml,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 ba113856a7a2..9cd2b17582ba 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.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
+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
 
 .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.xml b/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml
index cfe7bc0e0c5a..b6c1767f7c5b 100644
--- a/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml,v 1.5 2004/08/12 08:31:36 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml,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 646c27832743..ac6fb72e90aa 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.xml
-SRCS+=	../../../en_US.ISO8859-1/installation/sparc64/install.xml
-SRCS+=	../common/artheader.xml
-SRCS+=	../common/install.xml
-SRCS+=	../common/layout.xml
+SRCS+=	article.sgml
+SRCS+=	../../../en_US.ISO8859-1/installation/sparc64/install.sgml
+SRCS+=	../common/artheader.sgml
+SRCS+=	../common/install.sgml
+SRCS+=	../common/layout.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml
index e9186abdf0c4..90b0ae44da0a 100644
--- a/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml,v 1.5 2004/08/12 08:31:36 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml,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 e5cc54f6bb21..9b6f10fff328 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.xml
+SRCS+=	article.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/readme/article.sgml
index 26a8bf363781..fa45cd9d1632 100644
--- a/release/doc/ru_RU.KOI8-R/readme/article.xml
+++ b/release/doc/ru_RU.KOI8-R/readme/article.sgml
@@ -2,7 +2,7 @@
    The FreeBSD Russian Documentation Project
 
    $FreeBSD$
-   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/readme/article.xml,v 1.11 2005/06/30 11:12:33 den Exp $
+   $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/readme/article.sgml,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 9dc27f87cd19..2587e1c08635 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml
index 82fafc7a25d6..11ed2dc30d68 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml,v 1.7 2004/08/12 08:31:37 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml,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 a311eac1fe41..97dedc60f8e2 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml
index c1b9a58db3ba..14ee72855531 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml,v 1.7 2004/08/12 08:31:37 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml,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.xml b/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml
index e95711ed30cc..415ef6238fe9 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml,v 1.29 2005/07/08 10:19:47 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,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 21ff7688f3b9..96df30653d6e 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.xml">
+<!ENTITY art SYSTEM "../common/new.sgml">
 
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile b/release/doc/ru_RU.KOI8-R/relnotes/i386/Makefile
index 7827cbf7f754..2bbe5e9a9f41 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 URL_RELPREFIX?=	../../../../..
 
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml
index 9609eac608fd..debdea7acc2c 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml,v 1.7 2004/08/12 08:31:37 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml,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 cf8734d4c306..62016749f741 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml
index 344ef0325be4..9c15d726694a 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml,v 1.7 2004/08/12 08:31:37 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml,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 1858165e3d79..2abd4f224717 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml
index d4dad0be7eac..ede9cc3f093d 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml,v 1.7 2004/08/12 08:31:37 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml,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 9984f3ab6575..6084f36a6160 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.xml
+SRCS+=	article.sgml
 SRCS+=	../common/relnotes.ent
-SRCS+=	../common/new.xml
+SRCS+=	../common/new.sgml
 
 .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.xml b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml
index b3f33758bc0c..957adaa190b4 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml
@@ -2,7 +2,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml,v 1.7 2004/08/12 08:31:38 den Exp $
+     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml,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 a12a679c555b..7f36ca10d052 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/xml/dev-auto-ru.sgml < ../share/xml/dev-auto.sgml
+# perl share/examples/dev-auto-translate.pl -o share/sgml/dev-auto-ru.sgml < ../share/sgml/dev-auto.sgml
 #
 # This script is maintained only in HEAD branch.
 
diff --git a/release/doc/ru_RU.KOI8-R/share/xml/catalog b/release/doc/ru_RU.KOI8-R/share/sgml/catalog
index f4e131ec98c2..a8ea7378ae00 100644
--- a/release/doc/ru_RU.KOI8-R/share/xml/catalog
+++ b/release/doc/ru_RU.KOI8-R/share/sgml/catalog
@@ -1,7 +1,7 @@
   -- FreeBSD SGML Public Identifiers --
   -- Language-specific --
 
-  -- $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/xml/catalog,v 1.3 2005/03/10 11:04:21 den Exp $ --
+  -- $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/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.xml"
+       "dev-auto-ru.sgml"
diff --git a/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml b/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml
index 5d7b4fae27cd..9084f8981e04 100644
--- a/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml
+++ b/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml
@@ -10,7 +10,7 @@
      This script maintained in HEAD branch.
 
      $FreeBSD$
-     $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 $
+     $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 $
 -->
 <!ENTITY hwlist.62c9ec99a9ca598d738dcf66b339aa1e 'Контроллеры, поддерживаемые драйвером &man.aac.4;, включая:'>
 <!ENTITY hwlist.43922be022d49dabc274b2afffd0db8b 'Драйвер &man.adv.4; поддерживает следующие контроллеры SCSI:'>
diff --git a/release/doc/ru_RU.KOI8-R/share/xml/release.dsl b/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl
index cad76eac45a7..96cf087b371e 100644
--- a/release/doc/ru_RU.KOI8-R/share/xml/release.dsl
+++ b/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl
@@ -1,7 +1,7 @@
 <!--
   The FreeBSD Russian Documentation Project
 
-  $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/xml/release.dsl,v 1.5 2004/09/13 08:00:12 den Exp $
+  $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl,v 1.5 2004/09/13 08:00:12 den Exp $
   $FreeBSD$
   
   Original revision: 1.8
diff --git a/release/doc/share/examples/Makefile.relnotesng b/release/doc/share/examples/Makefile.relnotesng
index fafba2bfa436..34d3cdde2e73 100644
--- a/release/doc/share/examples/Makefile.relnotesng
+++ b/release/doc/share/examples/Makefile.relnotesng
@@ -12,7 +12,7 @@ UNITEXTS=	hardware readme relnotes errata
 
 IMAGEDIR=	.imagedir
 RHOST=		freefall.freebsd.org
-RDIR=		public_html/relnotes/RELENG_9
+RDIR=		public_html/relnotes/releng/9.1
 DOCDIR=		./release/doc
 LANG=		en_US.ISO8859-1
 
diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk
index e78c5274ef0f..d05e35923ea8 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/xml/catalog
-EXTRA_CATALOGS+= ${RELN_ROOT}/share/xml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/${LANGCODE}/share/sgml/catalog
+EXTRA_CATALOGS+= ${RELN_ROOT}/share/sgml/catalog
 
 # Use the appropriate architecture-dependent RELNOTESng stylesheet
-DSLHTML?=	${RELN_ROOT}/share/xml/default.dsl
-DSLPRINT?=	${RELN_ROOT}/share/xml/default.dsl
+DSLHTML?=	${RELN_ROOT}/share/sgml/default.dsl
+DSLPRINT?=	${RELN_ROOT}/share/sgml/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/xml
-CLEANFILES+=	${DEV-AUTODIR}/dev-auto.xml ${DEV-AUTODIR}/catalog-auto
+DEV-AUTODIR=	${RELN_ROOT:S/${.CURDIR}/${.OBJDIR}/}/share/sgml
+CLEANFILES+=	${DEV-AUTODIR}/dev-auto.sgml ${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.xml.
-${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.xml: ${MAN4PAGES} \
+# dev-auto.sgml.
+${DEV-AUTODIR}/catalog-auto ${DEV-AUTODIR}/dev-auto.sgml: ${MAN4PAGES} \
 	${ARCHLIST} ${MAN2HWNOTES_CMD}
-	cd ${RELN_ROOT}/share/xml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.xml
+	cd ${RELN_ROOT}/share/sgml && make MAN2HWNOTES_FLAGS=${MAN2HWNOTES_FLAGS} dev-auto.sgml
diff --git a/release/doc/share/xml/Makefile b/release/doc/share/sgml/Makefile
index d7112ecdd6bc..e15b14189e7c 100644
--- a/release/doc/share/xml/Makefile
+++ b/release/doc/share/sgml/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.xml: ${MAN4PAGES} ${ARCHLIST} ${MAN2HWNOTES_CMD} catalog-auto
+dev-auto.sgml: ${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.xml"' > ${.TARGET}
+		'"dev-auto.sgml"' > ${.TARGET}
 
-all: dev-auto.xml
+all: dev-auto.sgml
diff --git a/release/doc/share/xml/catalog b/release/doc/share/sgml/catalog
index 3f91cf0a9afc..e456e6743159 100644
--- a/release/doc/share/xml/catalog
+++ b/release/doc/share/sgml/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/xml/release.dsl"
+       "../../en_US.ISO8859-1/share/sgml/release.dsl"
 
 
diff --git a/release/doc/share/xml/default.dsl b/release/doc/share/sgml/default.dsl
index 58d82314f960..58d82314f960 100644
--- a/release/doc/share/xml/default.dsl
+++ b/release/doc/share/sgml/default.dsl
diff --git a/release/doc/share/xml/release.dsl b/release/doc/share/sgml/release.dsl
index 66e9ae24a412..de3c8e388a4e 100644
--- a/release/doc/share/xml/release.dsl
+++ b/release/doc/share/sgml/release.dsl
@@ -170,6 +170,7 @@
 	      (tgroup (have-ancestor? (normalize "tgroup")))
 	      (arch (attribute-string (normalize "arch")))
 	      (role (attribute-string (normalize "role")))
+	      (rev (attribute-string (normalize "revision")))
 	      (arch-string (entity-text "arch"))
 	      (merged-string (entity-text "merged")))
 	  (make sequence
@@ -179,28 +180,46 @@
 				   (list (list "ALIGN" %default-quadding%))
 				   '()))
 		  (make sequence
-		    (cond
-		     ;; If arch= not specified, then print unconditionally.  This clause
-		     ;; handles the majority of cases.
-		     ((or (equal? arch #f)
-			  (equal? arch "")
-			  (equal? arch "all"))
-		      (process-children))
-		     (else
-		      (sosofo-append
-		       (make sequence
-			 (literal "[")
-			 (let loop ((prev (car (split-string-to-list arch)))
-				    (rest (cdr (split-string-to-list arch))))
-			   (make sequence
-			     (literal prev)
-			     (if (not (null? rest))
-				 (make sequence
-				   (literal ", ")
-				   (loop (car rest) (cdr rest)))
-				 (empty-sosofo))))
-			 (literal "] ")
-			 (process-children)))))
+		    (sosofo-append
+		     (if (and (not (equal? arch #f))
+			      (not (equal? arch ""))
+			      (not (equal? arch "all")))
+			 (make sequence
+			   (literal "[")
+			   (let loop ((prev (car (split-string-to-list arch)))
+				      (rest (cdr (split-string-to-list arch))))
+			     (make sequence
+			       (literal prev)
+			       (if (not (null? rest))
+				   (make sequence
+				     (literal ", ")
+				     (loop (car rest) (cdr rest)))
+				   (empty-sosofo))))
+			   (literal "] "))
+			 (empty-sosofo))
+		     (process-children)
+		     (if (and (not (equal? rev #f))
+			      (not (equal? rev "")))
+			 (make sequence
+			   (literal "[")
+			   (let loop ((prev (car (split-string-to-list rev)))
+				      (rest (cdr (split-string-to-list rev))))
+			     (make sequence
+			       (make element gi: "A"
+				     attributes: (list
+						  (list "HREF" (string-append
+								"http://svn.freebsd.org/viewvc/base?view=revision&#38;revision="
+								prev))
+						  (list "TARGET" "_top"))
+				     (literal "r")
+				     (literal prev))
+			       (if (not (null? rest))
+				   (make sequence
+				     (literal ", ")
+				     (loop (car rest) (cdr rest)))
+				   (empty-sosofo))))
+			   (literal "] "))
+			 (empty-sosofo)))
 		    (if (and (not (null? role)) (equal? role "merged"))
 			(literal " [" merged-string "]")
 			(empty-sosofo))
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/sgml/release.ent
index 60b71307c364..531ba16cc97c 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/sgml/release.ent
@@ -6,40 +6,35 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "9.0-CURRENT">
+<!ENTITY release.current "9.1-RELEASE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
      branchpoint. -->
-<!ENTITY release.prev "8.0-RELEASE">
-
-<!-- The previous stable release, useful for pointing user's at the
-     release they SHOULD be running if they don't want the bleeding
-     edge. -->
-<!ENTITY release.prev.stable "8.0-RELEASE">
+<!ENTITY release.prev "9.0-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "9.0-RELEASE">
+<!ENTITY release.next "9.2-RELEASE">
 
 <!-- The name of this branch. -->
-<!ENTITY release.branch "9-CURRENT">
+<!ENTITY release.branch "9.1-STABLE">
 
 <!-- The URL for obtaining this version of FreeBSD. -->
-<!ENTITY release.url "http://www.FreeBSD.org/snapshots/">
+<!ENTITY release.url "http://www.FreeBSD.org/releases/">
 
 <!-- The type of release (usually this will be either "snapshot"
      or "release" -->
-<!ENTITY release.type "snapshot">
-<!ENTITY % release.type.current  "INCLUDE">
+<!ENTITY release.type "release">
+<!ENTITY % release.type.current  "IGNORE">
 <!ENTITY % release.type.snapshot "IGNORE">
-<!ENTITY % release.type.release "IGNORE">
+<!ENTITY % release.type.release "INCLUDE">
 
 <!-- The manpaths for man page references -->
 <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">
-<!ENTITY release.manpath.xorg          "7.5.1">
-<!ENTITY release.manpath.netbsd        "5.1">
+<!ENTITY release.manpath.xorg          "7.5.2">
+<!ENTITY release.manpath.netbsd        "6.0">
 <!ENTITY release.manpath.freebsd-ports "Ports">
-<!ENTITY release.manpath.freebsd       "9-current">
+<!ENTITY release.manpath.freebsd       "9.1-RELEASE">
 
 <!-- Text constants which probably don't need to be changed.-->
 
@@ -57,6 +52,3 @@
 <!ENTITY arch.pc98 "pc98">
 <!ENTITY arch.powerpc "powerpc">
 <!ENTITY arch.sparc64 "sparc64">
-
-<!-- The marker for MFCs. -->
-<!ENTITY merged "MERGED">
diff --git a/release/doc/zh_CN.GB2312/errata/Makefile b/release/doc/zh_CN.GB2312/errata/Makefile
index b584b5f73270..fc7790b21ca5 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.xml
+SRCS+=	article.sgml
 
 .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.xml b/release/doc/zh_CN.GB2312/errata/article.sgml
index c9fc0477c347..df0b697b9098 100644
--- a/release/doc/zh_CN.GB2312/errata/article.xml
+++ b/release/doc/zh_CN.GB2312/errata/article.sgml
@@ -1,23 +1,3 @@
-<?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
@@ -33,9 +13,28 @@
 	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; ╥╒пп╟Ф©╠нС</title>
+    <title>&os;
+<![ %release.type.current [
+    &release.current;
+]]>
+<![ %release.type.snapshot [
+    &release.prev;
+]]>
+<![ %release.type.release [
+    &release.current;
+]]>
+    ╥╒пп╟Ф©╠нС</title>
 
     <corpauthor>
     The &os; Project
diff --git a/release/doc/zh_CN.GB2312/hardware/Makefile b/release/doc/zh_CN.GB2312/hardware/Makefile
index 53037dd8ab03..5aab040299b2 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.xml
+SRCS+=	article.sgml
 SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.xml
+SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
 
 CATALOGS+=	-c ${DEV-AUTODIR}/catalog-auto
 
diff --git a/release/doc/zh_CN.GB2312/hardware/article.xml b/release/doc/zh_CN.GB2312/hardware/article.sgml
index 676e0cec4fb7..52683bef50e1 100644
--- a/release/doc/zh_CN.GB2312/hardware/article.xml
+++ b/release/doc/zh_CN.GB2312/hardware/article.sgml
@@ -1,15 +1,14 @@
-<?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;
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-
 <!ENTITY % devauto 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 e6bef9eeda8c..a2b9bd677d4c 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.xml
+SRCS+=	article.sgml
 
 .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.xml b/release/doc/zh_CN.GB2312/readme/article.sgml
index 177b2b8d3f44..9c5bafc0cda0 100644
--- a/release/doc/zh_CN.GB2312/readme/article.xml
+++ b/release/doc/zh_CN.GB2312/readme/article.sgml
@@ -1,18 +1,16 @@
-<?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 41cc98946269..a3c3e459a349 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.xml
+SRCS+=	article.sgml
 
 URL_RELPREFIX?=	../../../..
 
diff --git a/release/doc/zh_CN.GB2312/relnotes/article.xml b/release/doc/zh_CN.GB2312/relnotes/article.sgml
index e370971ae2fb..e23015977f34 100644
--- a/release/doc/zh_CN.GB2312/relnotes/article.xml
+++ b/release/doc/zh_CN.GB2312/relnotes/article.sgml
@@ -1,7 +1,6 @@
-<?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;
+<!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;
diff --git a/release/doc/zh_CN.GB2312/share/xml/catalog b/release/doc/zh_CN.GB2312/share/sgml/catalog
index b7a974123666..b7a974123666 100644
--- a/release/doc/zh_CN.GB2312/share/xml/catalog
+++ b/release/doc/zh_CN.GB2312/share/sgml/catalog
diff --git a/release/doc/zh_CN.GB2312/share/xml/release.dsl b/release/doc/zh_CN.GB2312/share/sgml/release.dsl
index d9688d6c7a07..d9688d6c7a07 100644
--- a/release/doc/zh_CN.GB2312/share/xml/release.dsl
+++ b/release/doc/zh_CN.GB2312/share/sgml/release.dsl
diff --git a/release/generate-release.sh b/release/generate-release.sh
index 881906746ace..6f37ec3b1e72 100755
--- a/release/generate-release.sh
+++ b/release/generate-release.sh
@@ -3,13 +3,18 @@
 # generate-release.sh: check out source trees, and build release components with
 #  totally clean, fresh trees.
 #
-#  Usage: generate-release.sh [-r revision] [-d docrevision] \
-#	[-p portsrevision] svn-branch scratch-dir
+#  Usage: generate-release.sh svn-branch[@revision] scratch-dir
 #
-# Environment variables:
-#  SVNROOT:    SVN URL to FreeBSD source repository (by default, 
-#   svn://svn.freebsd.org/base)
-#  MAKE_FLAGS: optional flags to pass to make (e.g. -j)
+# Environment variables (default):
+#  SVNROOTBASE:	SVN base URL to FreeBSD repository (svn://svn.freebsd.org)
+#  SVNROOTSRC:	URL to FreeBSD src tree (${SVNROOTBASE}/base)
+#  SVNROOTDOC:	URL to FreeBSD doc tree (${SVNROOTBASE}/doc)
+#  SVNROOTPORTS:URL to FreeBSD ports tree (${SVNROOTBASE}/ports)
+#  BRANCHSRC:	branch name of src (svn-branch[@revision])
+#  BRANCHDOC:	branch name of doc (release/9.1.0)
+#  BRANCHPORTS:	branch name of ports (tags/RELEASE_9_1_0)
+#  WORLD_FLAGS: optional flags to pass to buildworld (e.g. -j)
+#  KERNEL_FLAGS: optional flags to pass to buildkernel (e.g. -j)
 # 
 #  Note: Since this requires a chroot, release cross-builds will not work!
 #
@@ -18,43 +23,33 @@
 
 usage()
 {
-	echo "Usage: $0 [-r revision] [-d docrevision] [-p portsrevision] svn-branch scratch-dir"
+	echo "Usage: $0 svn-branch[@revision] scratch-dir" 2>&1
 	exit 1
 }
 
-REVISION=
-DOCREVISION=
-PORTSREVISION=
-while getopts d:r:p: opt; do
-	case $opt in
-	d)
-		DOCREVISION="-r $OPTARG"
-		;;
-	r)
-		REVISION="-r $OPTARG"
-		;;
-	p)
-		PORTSREVISION="-r $OPTARG"
-		;;
-	\?)
-		usage
-		;;
-	esac
-done
-shift $(($OPTIND - 1))
-
 if [ $# -lt 2 ]; then
 	usage
 fi
 
+: ${SVNROOTBASE:=svn://svn.freebsd.org}
+: ${SVNROOTSRC:=${SVNROOTBASE}/base}
+: ${SVNROOTDOC:=${SVNROOTBASE}/doc}
+: ${SVNROOTPORTS:=${SVNROOTBASE}/ports}
+: ${SVNROOT:=${SVNROOTSRC}} # for backward compatibility
+BRANCHSRC=$1
+: ${BRANCHDOC:=release/9.1.0}
+: ${BRANCHPORTS:=branches/RELENG_9_1_0}
+: ${WORLD_FLAGS:=${MAKE_FLAGS}}
+: ${KERNEL_FLAGS:=${MAKE_FLAGS}}
+
 set -e # Everything must succeed
 
-svn co ${SVNROOT:-svn://svn.freebsd.org/base}/$1 $2/usr/src
-svn co ${SVNROOT:-svn://svn.freebsd.org/doc}/head $2/usr/doc $DOCREVISION
-svn co ${SVNROOT:-svn://svn.freebsd.org/ports}/head $2/usr/ports $PORTSREVISION
+svn co ${SVNROOT}/${BRANCHSRC} $2/usr/src
+svn co ${SVNROOTDOC}/${BRANCHDOC} $2/usr/doc
+svn co ${SVNROOTPORTS}/${BRANCHPORTS} $2/usr/ports
 
 cd $2/usr/src
-make $MAKE_FLAGS buildworld
+make $WORLD_FLAGS buildworld
 make installworld distribution DESTDIR=$2
 mount -t devfs devfs $2/dev
 trap "umount $2/dev" EXIT # Clean up devfs mount on exit
@@ -63,10 +58,11 @@ if [ -d $2/usr/doc ]; then
 	cp /etc/resolv.conf $2/etc/resolv.conf
 
 	# Install docproj to build release documentation
-	chroot $2 /bin/sh -c '(export ASSUME_ALWAYS_YES=1 && /usr/sbin/pkg install -y docproj) || (cd /usr/ports/textproc/docproj && make install clean BATCH=yes WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes)'
+	chroot $2 make -C /usr/ports/textproc/docproj install \
+		BATCH=yes WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes
 fi
 
-chroot $2 make -C /usr/src $MAKE_FLAGS buildworld buildkernel
+chroot $2 make -C /usr/src $WORLD_FLAGS buildworld
+chroot $2 make -C /usr/src $KERNEL_FLAGS buildkernel
 chroot $2 make -C /usr/src/release release
 chroot $2 make -C /usr/src/release install DESTDIR=/R
-