804 files changed, 824 insertions, 3006 deletions

diff --git a/en_US.ISO8859-1/articles/bsdl-gpl/Makefile b/en_US.ISO8859-1/articles/bsdl-gpl/Makefile
index a221a6dfe5..4d09e9c3c3 100644
--- a/en_US.ISO8859-1/articles/bsdl-gpl/Makefile
+++ b/en_US.ISO8859-1/articles/bsdl-gpl/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
index 4c1d498c27..4c1d498c27 100644
--- a/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml
+++ b/en_US.ISO8859-1/articles/bsdl-gpl/article.xml
diff --git a/en_US.ISO8859-1/articles/building-products/Makefile b/en_US.ISO8859-1/articles/building-products/Makefile
index 7ca6b11b43..2513ec172a 100644
--- a/en_US.ISO8859-1/articles/building-products/Makefile
+++ b/en_US.ISO8859-1/articles/building-products/Makefile
@@ -10,7 +10,7 @@ FORMATS?=		html
 INSTALL_COMPRESSED?=	gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=			article.sgml
+SRCS=			article.xml
 
 IMAGES_EN=		freebsd-branches.pic freebsd-organization.pic
 
diff --git a/en_US.ISO8859-1/articles/building-products/article.sgml b/en_US.ISO8859-1/articles/building-products/article.xml
index 305537b153..305537b153 100644
--- a/en_US.ISO8859-1/articles/building-products/article.sgml
+++ b/en_US.ISO8859-1/articles/building-products/article.xml
diff --git a/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile b/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile
index d07a81bc94..56cebee8a7 100644
--- a/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile
+++ b/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
index aeb4feb4b9..aeb4feb4b9 100644
--- a/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml
+++ b/en_US.ISO8859-1/articles/casestudy-argentina.com/article.xml
diff --git a/en_US.ISO8859-1/articles/committers-guide/Makefile b/en_US.ISO8859-1/articles/committers-guide/Makefile
index 420756adac..18f3c61e04 100644
--- a/en_US.ISO8859-1/articles/committers-guide/Makefile
+++ b/en_US.ISO8859-1/articles/committers-guide/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 021a826be2..0f684bf690 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -2069,7 +2069,7 @@ U    stable/9/share/man/man4/netmap.4
       <title>Guidelines For Committers</title>
 
       <note>
-	<para>The <literal>.ent</literal>, <literal>.sgml</literal>,
+	<para>The <literal>.ent</literal>, <literal>.xml</literal>,
 	  and <literal>.xml</literal> files listed below exist in the
 	  &os; Documentation Project SVN repository at
 	  <hostid role="fqdn">svn.FreeBSD.org/doc/</hostid>.</para>
@@ -2115,8 +2115,8 @@ U    stable/9/share/man/man4/netmap.4
       <listitem>
 	<para>Add yourself to the <quote>Developers</quote> section of
 	  the <ulink url="&url.articles.contributors;/index.html">Contributors List</ulink>
-	  (<filename>head/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml</filename>) and remove yourself from the <quote>Additional
-	  Contributors</quote> section (<filename>head/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml</filename>).
+	  (<filename>head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml</filename>) and remove yourself from the <quote>Additional
+	  Contributors</quote> section (<filename>head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml</filename>).
 	  Please note that entries are sorted by last name.</para>
       </listitem>
 
@@ -2132,7 +2132,7 @@ U    stable/9/share/man/man4/netmap.4
 	  <filename>head/share/pgpkeys</filename> (and if you do not
 	  have a key, you should create one).  Do not forget to commit
 	  the updated <filename>head/share/pgpkeys/pgpkeys.ent</filename>
-	  and <filename>head/share/pgpkeys/pgpkeys-developers.sgml</filename>.
+	  and <filename>head/share/pgpkeys/pgpkeys-developers.xml</filename>.
 	  Please note that entries are sorted by last name.</para>
 
 	<para>&a.des; has
@@ -4312,7 +4312,7 @@ bak/packages  packages from last complete &lt;major_version&gt; run on &lt;arch&
 	<note>
 	  <para>You should get your mentor to add you to the
 	    <quote>Additional Contributors</quote>
-	    (<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml</filename>),
+	    (<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.additional.xml</filename>),
 	    if you are not already listed there.</para>
 	</note>
       </listitem>
diff --git a/en_US.ISO8859-1/articles/compiz-fusion/Makefile b/en_US.ISO8859-1/articles/compiz-fusion/Makefile
index 2105eb46cf..7dcdc45366 100644
--- a/en_US.ISO8859-1/articles/compiz-fusion/Makefile
+++ b/en_US.ISO8859-1/articles/compiz-fusion/Makefile
@@ -10,7 +10,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/compiz-fusion/article.sgml b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
index bacf647c0d..bacf647c0d 100644
--- a/en_US.ISO8859-1/articles/compiz-fusion/article.sgml
+++ b/en_US.ISO8859-1/articles/compiz-fusion/article.xml
diff --git a/en_US.ISO8859-1/articles/console-server/Makefile b/en_US.ISO8859-1/articles/console-server/Makefile
index fcb305cc9c..906ce47b74 100644
--- a/en_US.ISO8859-1/articles/console-server/Makefile
+++ b/en_US.ISO8859-1/articles/console-server/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 IMAGES_EN=	tk0231-9-1.png
 
 URL_RELPREFIX?=	../../../..
diff --git a/en_US.ISO8859-1/articles/console-server/article.sgml b/en_US.ISO8859-1/articles/console-server/article.xml
index e8f0caa590..e8f0caa590 100644
--- a/en_US.ISO8859-1/articles/console-server/article.sgml
+++ b/en_US.ISO8859-1/articles/console-server/article.xml
diff --git a/en_US.ISO8859-1/articles/contributing-ports/Makefile b/en_US.ISO8859-1/articles/contributing-ports/Makefile
index d2b8aa3ceb..bc11e81810 100644
--- a/en_US.ISO8859-1/articles/contributing-ports/Makefile
+++ b/en_US.ISO8859-1/articles/contributing-ports/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/contributing-ports/article.sgml b/en_US.ISO8859-1/articles/contributing-ports/article.xml
index dbc9f612c6..dbc9f612c6 100644
--- a/en_US.ISO8859-1/articles/contributing-ports/article.sgml
+++ b/en_US.ISO8859-1/articles/contributing-ports/article.xml
diff --git a/en_US.ISO8859-1/articles/contributing/Makefile b/en_US.ISO8859-1/articles/contributing/Makefile
index 1f5b5eb47b..905bbf0562 100644
--- a/en_US.ISO8859-1/articles/contributing/Makefile
+++ b/en_US.ISO8859-1/articles/contributing/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/contributing/article.sgml b/en_US.ISO8859-1/articles/contributing/article.xml
index 046d23e68f..046d23e68f 100644
--- a/en_US.ISO8859-1/articles/contributing/article.sgml
+++ b/en_US.ISO8859-1/articles/contributing/article.xml
diff --git a/en_US.ISO8859-1/articles/contributors/Makefile b/en_US.ISO8859-1/articles/contributors/Makefile
index 9a6caf9789..ea1dc06b77 100644
--- a/en_US.ISO8859-1/articles/contributors/Makefile
+++ b/en_US.ISO8859-1/articles/contributors/Makefile
@@ -11,15 +11,15 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 SRCS+=	contrib.ent
-SRCS+=	contrib.386bsd.sgml
-SRCS+=	contrib.additional.sgml
-SRCS+=	contrib.committers.sgml
-SRCS+=	contrib.corealumni.sgml
-SRCS+=	contrib.develalumni.sgml
-SRCS+=	contrib.develinmemoriam.sgml
-SRCS+=	contrib.portmgralumni.sgml
+SRCS+=	contrib.386bsd.xml
+SRCS+=	contrib.additional.xml
+SRCS+=	contrib.committers.xml
+SRCS+=	contrib.corealumni.xml
+SRCS+=	contrib.develalumni.xml
+SRCS+=	contrib.develinmemoriam.xml
+SRCS+=	contrib.portmgralumni.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/contributors/article.sgml b/en_US.ISO8859-1/articles/contributors/article.xml
index 18e4592653..18e4592653 100644
--- a/en_US.ISO8859-1/articles/contributors/article.sgml
+++ b/en_US.ISO8859-1/articles/contributors/article.xml
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
index 1d9100b739..1d9100b739 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.386bsd.xml
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
index 78b401a1a1..78b401a1a1 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
index 2adb6cb171..2adb6cb171 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
index d971803318..d971803318 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
index 02b6c2ced3..02b6c2ced3 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develalumni.xml
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.sgml b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
index 12fa30b4cf..12fa30b4cf 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.ent b/en_US.ISO8859-1/articles/contributors/contrib.ent
index bf52a21b64..c5e1a94508 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.ent
+++ b/en_US.ISO8859-1/articles/contributors/contrib.ent
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY contrib.386bsd      SYSTEM "contrib.386bsd.sgml">
-<!ENTITY contrib.additional  SYSTEM "contrib.additional.sgml">
-<!ENTITY contrib.committers  SYSTEM "contrib.committers.sgml">
-<!ENTITY contrib.corealumni  SYSTEM "contrib.corealumni.sgml">
-<!ENTITY contrib.develalumni SYSTEM "contrib.develalumni.sgml">
-<!ENTITY contrib.develinmemoriam SYSTEM "contrib.develinmemoriam.sgml">
-<!ENTITY contrib.portmgralumni SYSTEM "contrib.portmgralumni.sgml">
+<!ENTITY contrib.386bsd      SYSTEM "contrib.386bsd.xml">
+<!ENTITY contrib.additional  SYSTEM "contrib.additional.xml">
+<!ENTITY contrib.committers  SYSTEM "contrib.committers.xml">
+<!ENTITY contrib.corealumni  SYSTEM "contrib.corealumni.xml">
+<!ENTITY contrib.develalumni SYSTEM "contrib.develalumni.xml">
+<!ENTITY contrib.develinmemoriam SYSTEM "contrib.develinmemoriam.xml">
+<!ENTITY contrib.portmgralumni SYSTEM "contrib.portmgralumni.xml">
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
index 418f3e058e..418f3e058e 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.xml
diff --git a/en_US.ISO8859-1/articles/cups/Makefile b/en_US.ISO8859-1/articles/cups/Makefile
index bfc00d4dbb..0cf6ec4981 100644
--- a/en_US.ISO8859-1/articles/cups/Makefile
+++ b/en_US.ISO8859-1/articles/cups/Makefile
@@ -10,7 +10,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/cups/article.sgml b/en_US.ISO8859-1/articles/cups/article.xml
index bd3b9144d4..bd3b9144d4 100644
--- a/en_US.ISO8859-1/articles/cups/article.sgml
+++ b/en_US.ISO8859-1/articles/cups/article.xml
diff --git a/en_US.ISO8859-1/articles/custom-gcc/Makefile b/en_US.ISO8859-1/articles/custom-gcc/Makefile
index 77336c615e..c6b3eb4a60 100644
--- a/en_US.ISO8859-1/articles/custom-gcc/Makefile
+++ b/en_US.ISO8859-1/articles/custom-gcc/Makefile
@@ -10,7 +10,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/custom-gcc/article.sgml b/en_US.ISO8859-1/articles/custom-gcc/article.xml
index 1df19d7ebd..1df19d7ebd 100644
--- a/en_US.ISO8859-1/articles/custom-gcc/article.sgml
+++ b/en_US.ISO8859-1/articles/custom-gcc/article.xml
diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/Makefile b/en_US.ISO8859-1/articles/cvs-freebsd/Makefile
index 1740a1a8e9..260a18d395 100644
--- a/en_US.ISO8859-1/articles/cvs-freebsd/Makefile
+++ b/en_US.ISO8859-1/articles/cvs-freebsd/Makefile
@@ -11,7 +11,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
index 7f8755fa46..7f8755fa46 100644
--- a/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml
+++ b/en_US.ISO8859-1/articles/cvs-freebsd/article.xml
diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/Makefile b/en_US.ISO8859-1/articles/cvsup-advanced/Makefile
index 8683682652..808a32ab38 100644
--- a/en_US.ISO8859-1/articles/cvsup-advanced/Makefile
+++ b/en_US.ISO8859-1/articles/cvsup-advanced/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml b/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
index df654034ad..df654034ad 100644
--- a/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
+++ b/en_US.ISO8859-1/articles/cvsup-advanced/article.xml
diff --git a/en_US.ISO8859-1/articles/explaining-bsd/Makefile b/en_US.ISO8859-1/articles/explaining-bsd/Makefile
index e0728a0215..e08ac589b0 100644
--- a/en_US.ISO8859-1/articles/explaining-bsd/Makefile
+++ b/en_US.ISO8859-1/articles/explaining-bsd/Makefile
@@ -13,7 +13,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/explaining-bsd/article.sgml b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
index cc04cd2e4b..cc04cd2e4b 100644
--- a/en_US.ISO8859-1/articles/explaining-bsd/article.sgml
+++ b/en_US.ISO8859-1/articles/explaining-bsd/article.xml
diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile b/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile
index 980700e113..978c47925e 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile
@@ -18,7 +18,7 @@ EXTRAS+=	stage_2.conf.default
 EXTRAS+=	stage_2.sh
 EXTRAS+=	stage_3.mk
 
-SRCS=		article.sgml
+SRCS=		article.xml
 SRCS+=		${EXTRAS}
 
 afterinstall:
diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
index 7f4166dbba..7f4166dbba 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
diff --git a/en_US.ISO8859-1/articles/filtering-bridges/Makefile b/en_US.ISO8859-1/articles/filtering-bridges/Makefile
index d9e00e9285..132ac7baf1 100644
--- a/en_US.ISO8859-1/articles/filtering-bridges/Makefile
+++ b/en_US.ISO8859-1/articles/filtering-bridges/Makefile
@@ -10,7 +10,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/filtering-bridges/article.sgml b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
index af1e3fc165..af1e3fc165 100644
--- a/en_US.ISO8859-1/articles/filtering-bridges/article.sgml
+++ b/en_US.ISO8859-1/articles/filtering-bridges/article.xml
diff --git a/en_US.ISO8859-1/articles/fonts/Makefile b/en_US.ISO8859-1/articles/fonts/Makefile
index 0163a287fa..2d79fc912f 100644
--- a/en_US.ISO8859-1/articles/fonts/Makefile
+++ b/en_US.ISO8859-1/articles/fonts/Makefile
@@ -10,7 +10,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/fonts/article.sgml b/en_US.ISO8859-1/articles/fonts/article.xml
index 0efdca5176..0efdca5176 100644
--- a/en_US.ISO8859-1/articles/fonts/article.sgml
+++ b/en_US.ISO8859-1/articles/fonts/article.xml
diff --git a/en_US.ISO8859-1/articles/freebsd-questions/Makefile b/en_US.ISO8859-1/articles/freebsd-questions/Makefile
index 216dfe9c92..dbd898c774 100644
--- a/en_US.ISO8859-1/articles/freebsd-questions/Makefile
+++ b/en_US.ISO8859-1/articles/freebsd-questions/Makefile
@@ -13,7 +13,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/freebsd-questions/article.sgml b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
index cd15ea8327..cd15ea8327 100644
--- a/en_US.ISO8859-1/articles/freebsd-questions/article.sgml
+++ b/en_US.ISO8859-1/articles/freebsd-questions/article.xml
diff --git a/en_US.ISO8859-1/articles/freebsd-update-server/Makefile b/en_US.ISO8859-1/articles/freebsd-update-server/Makefile
index e0f50cf42f..595d936d77 100644
--- a/en_US.ISO8859-1/articles/freebsd-update-server/Makefile
+++ b/en_US.ISO8859-1/articles/freebsd-update-server/Makefile
@@ -14,7 +14,7 @@ WITH_ARTICLE_TOC?=YES
 EXTRAS=		init.txt
 EXTRAS+=	diff.txt
 
-SRCS=		article.sgml
+SRCS=		article.xml
 SRCS+=		${EXTRAS}
 
 IMAGES_LIB=	callouts/1.png
diff --git a/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
index 253830af7e..253830af7e 100644
--- a/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml
+++ b/en_US.ISO8859-1/articles/freebsd-update-server/article.xml
diff --git a/en_US.ISO8859-1/articles/geom-class/Makefile b/en_US.ISO8859-1/articles/geom-class/Makefile
index 80e7914137..851ca39a39 100644
--- a/en_US.ISO8859-1/articles/geom-class/Makefile
+++ b/en_US.ISO8859-1/articles/geom-class/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/geom-class/article.sgml b/en_US.ISO8859-1/articles/geom-class/article.xml
index 1862452fcb..1862452fcb 100644
--- a/en_US.ISO8859-1/articles/geom-class/article.sgml
+++ b/en_US.ISO8859-1/articles/geom-class/article.xml
diff --git a/en_US.ISO8859-1/articles/gjournal-desktop/Makefile b/en_US.ISO8859-1/articles/gjournal-desktop/Makefile
index ad5b88dc5e..3911361c8b 100644
--- a/en_US.ISO8859-1/articles/gjournal-desktop/Makefile
+++ b/en_US.ISO8859-1/articles/gjournal-desktop/Makefile
@@ -10,7 +10,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 IMAGES_EN=	disklabel1.png
 IMAGES_EN+=	disklabel2.png
 URL_RELPREFIX?=	../../../..
diff --git a/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
index 0af6343302..0af6343302 100644
--- a/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml
+++ b/en_US.ISO8859-1/articles/gjournal-desktop/article.xml
diff --git a/en_US.ISO8859-1/articles/hubs/Makefile b/en_US.ISO8859-1/articles/hubs/Makefile
index cded48ba4b..f04f8a971f 100644
--- a/en_US.ISO8859-1/articles/hubs/Makefile
+++ b/en_US.ISO8859-1/articles/hubs/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/hubs/article.sgml b/en_US.ISO8859-1/articles/hubs/article.xml
index d70e8bdfd5..d70e8bdfd5 100644
--- a/en_US.ISO8859-1/articles/hubs/article.sgml
+++ b/en_US.ISO8859-1/articles/hubs/article.xml
diff --git a/en_US.ISO8859-1/articles/ipsec-must/Makefile b/en_US.ISO8859-1/articles/ipsec-must/Makefile
index bcc0fec86e..dabf06c8de 100644
--- a/en_US.ISO8859-1/articles/ipsec-must/Makefile
+++ b/en_US.ISO8859-1/articles/ipsec-must/Makefile
@@ -10,7 +10,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/ipsec-must/article.sgml b/en_US.ISO8859-1/articles/ipsec-must/article.xml
index 75d48cd691..75d48cd691 100644
--- a/en_US.ISO8859-1/articles/ipsec-must/article.sgml
+++ b/en_US.ISO8859-1/articles/ipsec-must/article.xml
diff --git a/en_US.ISO8859-1/articles/laptop/Makefile b/en_US.ISO8859-1/articles/laptop/Makefile
index 554a79327f..afd974abc1 100644
--- a/en_US.ISO8859-1/articles/laptop/Makefile
+++ b/en_US.ISO8859-1/articles/laptop/Makefile
@@ -11,7 +11,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/laptop/article.sgml b/en_US.ISO8859-1/articles/laptop/article.xml
index 47fc7b5b29..47fc7b5b29 100644
--- a/en_US.ISO8859-1/articles/laptop/article.sgml
+++ b/en_US.ISO8859-1/articles/laptop/article.xml
diff --git a/en_US.ISO8859-1/articles/ldap-auth/Makefile b/en_US.ISO8859-1/articles/ldap-auth/Makefile
index df0bcdb4d8..e59c8bba27 100644
--- a/en_US.ISO8859-1/articles/ldap-auth/Makefile
+++ b/en_US.ISO8859-1/articles/ldap-auth/Makefile
@@ -13,7 +13,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/ldap-auth/article.sgml b/en_US.ISO8859-1/articles/ldap-auth/article.xml
index 77238ff576..77238ff576 100644
--- a/en_US.ISO8859-1/articles/ldap-auth/article.sgml
+++ b/en_US.ISO8859-1/articles/ldap-auth/article.xml
diff --git a/en_US.ISO8859-1/articles/linux-comparison/Makefile b/en_US.ISO8859-1/articles/linux-comparison/Makefile
index c794872d1a..47bad67d7f 100644
--- a/en_US.ISO8859-1/articles/linux-comparison/Makefile
+++ b/en_US.ISO8859-1/articles/linux-comparison/Makefile
@@ -10,7 +10,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/linux-comparison/article.sgml b/en_US.ISO8859-1/articles/linux-comparison/article.xml
index 15f8d63269..15f8d63269 100644
--- a/en_US.ISO8859-1/articles/linux-comparison/article.sgml
+++ b/en_US.ISO8859-1/articles/linux-comparison/article.xml
diff --git a/en_US.ISO8859-1/articles/linux-emulation/Makefile b/en_US.ISO8859-1/articles/linux-emulation/Makefile
index de22a79fc3..ad0bbe728c 100644
--- a/en_US.ISO8859-1/articles/linux-emulation/Makefile
+++ b/en_US.ISO8859-1/articles/linux-emulation/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/linux-emulation/article.sgml b/en_US.ISO8859-1/articles/linux-emulation/article.xml
index cb665e9dc9..cb665e9dc9 100644
--- a/en_US.ISO8859-1/articles/linux-emulation/article.sgml
+++ b/en_US.ISO8859-1/articles/linux-emulation/article.xml
diff --git a/en_US.ISO8859-1/articles/linux-users/Makefile b/en_US.ISO8859-1/articles/linux-users/Makefile
index 4c0ac44d24..fbe7e3f17c 100644
--- a/en_US.ISO8859-1/articles/linux-users/Makefile
+++ b/en_US.ISO8859-1/articles/linux-users/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/linux-users/article.sgml b/en_US.ISO8859-1/articles/linux-users/article.xml
index e8a6a5ab98..e8a6a5ab98 100644
--- a/en_US.ISO8859-1/articles/linux-users/article.sgml
+++ b/en_US.ISO8859-1/articles/linux-users/article.xml
diff --git a/en_US.ISO8859-1/articles/mailing-list-faq/Makefile b/en_US.ISO8859-1/articles/mailing-list-faq/Makefile
index a089bd63c7..6412bc5980 100644
--- a/en_US.ISO8859-1/articles/mailing-list-faq/Makefile
+++ b/en_US.ISO8859-1/articles/mailing-list-faq/Makefile
@@ -18,7 +18,7 @@ WITH_ARTICLE_TOC?=YES
 #
 
 # SGML content
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
index 332810a58a..332810a58a 100644
--- a/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml
+++ b/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
diff --git a/en_US.ISO8859-1/articles/mh/Makefile b/en_US.ISO8859-1/articles/mh/Makefile
index 45a8cf393a..730ebb9ddc 100644
--- a/en_US.ISO8859-1/articles/mh/Makefile
+++ b/en_US.ISO8859-1/articles/mh/Makefile
@@ -10,7 +10,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/mh/article.sgml b/en_US.ISO8859-1/articles/mh/article.xml
index f722101117..f722101117 100644
--- a/en_US.ISO8859-1/articles/mh/article.sgml
+++ b/en_US.ISO8859-1/articles/mh/article.xml
diff --git a/en_US.ISO8859-1/articles/nanobsd/Makefile b/en_US.ISO8859-1/articles/nanobsd/Makefile
index 1b3baa6fe3..c250f8c418 100644
--- a/en_US.ISO8859-1/articles/nanobsd/Makefile
+++ b/en_US.ISO8859-1/articles/nanobsd/Makefile
@@ -17,7 +17,7 @@ IMAGES_LIB+= callouts/2.png
 IMAGES_LIB+= callouts/3.png
 IMAGES_LIB+= callouts/4.png
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/nanobsd/article.sgml b/en_US.ISO8859-1/articles/nanobsd/article.xml
index 7fadeea061..7fadeea061 100644
--- a/en_US.ISO8859-1/articles/nanobsd/article.sgml
+++ b/en_US.ISO8859-1/articles/nanobsd/article.xml
diff --git a/en_US.ISO8859-1/articles/new-users/Makefile b/en_US.ISO8859-1/articles/new-users/Makefile
index 5eaabc4d5a..88518b1d6c 100644
--- a/en_US.ISO8859-1/articles/new-users/Makefile
+++ b/en_US.ISO8859-1/articles/new-users/Makefile
@@ -10,7 +10,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/new-users/article.sgml b/en_US.ISO8859-1/articles/new-users/article.xml
index 97fe5acc4b..97fe5acc4b 100644
--- a/en_US.ISO8859-1/articles/new-users/article.sgml
+++ b/en_US.ISO8859-1/articles/new-users/article.xml
diff --git a/en_US.ISO8859-1/articles/p4-primer/Makefile b/en_US.ISO8859-1/articles/p4-primer/Makefile
index cb9bac7f12..97d792df95 100644
--- a/en_US.ISO8859-1/articles/p4-primer/Makefile
+++ b/en_US.ISO8859-1/articles/p4-primer/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/p4-primer/article.sgml b/en_US.ISO8859-1/articles/p4-primer/article.xml
index c174348aea..c174348aea 100644
--- a/en_US.ISO8859-1/articles/p4-primer/article.sgml
+++ b/en_US.ISO8859-1/articles/p4-primer/article.xml
diff --git a/en_US.ISO8859-1/articles/pam/Makefile b/en_US.ISO8859-1/articles/pam/Makefile
index c7252e978d..30d284054b 100644
--- a/en_US.ISO8859-1/articles/pam/Makefile
+++ b/en_US.ISO8859-1/articles/pam/Makefile
@@ -17,7 +17,7 @@ EXTRAS+=	pam_conv.c
 EXTRAS+=	pam_module.c
 CLEANFILES+=	${EXTRAS}
 
-SRCS=	article.sgml
+SRCS=	article.xml
 SRCS+=	${EXTRAS}
 
 pam_app.c: su.c
diff --git a/en_US.ISO8859-1/articles/pam/article.sgml b/en_US.ISO8859-1/articles/pam/article.xml
index dcfbfcc310..dcfbfcc310 100644
--- a/en_US.ISO8859-1/articles/pam/article.sgml
+++ b/en_US.ISO8859-1/articles/pam/article.xml
diff --git a/en_US.ISO8859-1/articles/port-mentor-guidelines/Makefile b/en_US.ISO8859-1/articles/port-mentor-guidelines/Makefile
index 0cde28a802..72bf628751 100644
--- a/en_US.ISO8859-1/articles/port-mentor-guidelines/Makefile
+++ b/en_US.ISO8859-1/articles/port-mentor-guidelines/Makefile
@@ -12,7 +12,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.sgml b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
index 4e9db9f565..4e9db9f565 100644
--- a/en_US.ISO8859-1/articles/port-mentor-guidelines/article.sgml
+++ b/en_US.ISO8859-1/articles/port-mentor-guidelines/article.xml
diff --git a/en_US.ISO8859-1/articles/portbuild/Makefile b/en_US.ISO8859-1/articles/portbuild/Makefile
index f61284a9be..05eedddce3 100644
--- a/en_US.ISO8859-1/articles/portbuild/Makefile
+++ b/en_US.ISO8859-1/articles/portbuild/Makefile
@@ -12,7 +12,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/portbuild/article.sgml b/en_US.ISO8859-1/articles/portbuild/article.xml
index 8c762e0215..8c762e0215 100644
--- a/en_US.ISO8859-1/articles/portbuild/article.sgml
+++ b/en_US.ISO8859-1/articles/portbuild/article.xml
diff --git a/en_US.ISO8859-1/articles/pr-guidelines/Makefile b/en_US.ISO8859-1/articles/pr-guidelines/Makefile
index 9aa329f736..17e369ff2c 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/Makefile
+++ b/en_US.ISO8859-1/articles/pr-guidelines/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml b/en_US.ISO8859-1/articles/pr-guidelines/article.xml
index 12168ed771..12168ed771 100644
--- a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml
+++ b/en_US.ISO8859-1/articles/pr-guidelines/article.xml
diff --git a/en_US.ISO8859-1/articles/problem-reports/Makefile b/en_US.ISO8859-1/articles/problem-reports/Makefile
index 081f20e0f8..ab12340558 100644
--- a/en_US.ISO8859-1/articles/problem-reports/Makefile
+++ b/en_US.ISO8859-1/articles/problem-reports/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/problem-reports/article.sgml b/en_US.ISO8859-1/articles/problem-reports/article.xml
index ad30cba1c1..ad30cba1c1 100644
--- a/en_US.ISO8859-1/articles/problem-reports/article.sgml
+++ b/en_US.ISO8859-1/articles/problem-reports/article.xml
diff --git a/en_US.ISO8859-1/articles/rc-scripting/Makefile b/en_US.ISO8859-1/articles/rc-scripting/Makefile
index 586196f69f..5713fe3f55 100644
--- a/en_US.ISO8859-1/articles/rc-scripting/Makefile
+++ b/en_US.ISO8859-1/articles/rc-scripting/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 
 IMAGES_LIB+=	callouts/1.png
 IMAGES_LIB+=	callouts/2.png
diff --git a/en_US.ISO8859-1/articles/rc-scripting/article.sgml b/en_US.ISO8859-1/articles/rc-scripting/article.xml
index 47594140c4..47594140c4 100644
--- a/en_US.ISO8859-1/articles/rc-scripting/article.sgml
+++ b/en_US.ISO8859-1/articles/rc-scripting/article.xml
diff --git a/en_US.ISO8859-1/articles/relaydelay/Makefile b/en_US.ISO8859-1/articles/relaydelay/Makefile
index 68d6d001fc..e3443b1ab0 100644
--- a/en_US.ISO8859-1/articles/relaydelay/Makefile
+++ b/en_US.ISO8859-1/articles/relaydelay/Makefile
@@ -10,7 +10,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/relaydelay/article.sgml b/en_US.ISO8859-1/articles/relaydelay/article.xml
index e07c55237b..e07c55237b 100644
--- a/en_US.ISO8859-1/articles/relaydelay/article.sgml
+++ b/en_US.ISO8859-1/articles/relaydelay/article.xml
diff --git a/en_US.ISO8859-1/articles/releng-packages/Makefile b/en_US.ISO8859-1/articles/releng-packages/Makefile
index 78b5446bc3..bfd86cc332 100644
--- a/en_US.ISO8859-1/articles/releng-packages/Makefile
+++ b/en_US.ISO8859-1/articles/releng-packages/Makefile
@@ -10,7 +10,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 CSS_SHEET_ADDITIONS= extra.css
 
diff --git a/en_US.ISO8859-1/articles/releng-packages/article.sgml b/en_US.ISO8859-1/articles/releng-packages/article.xml
index 47de8273ff..47de8273ff 100644
--- a/en_US.ISO8859-1/articles/releng-packages/article.sgml
+++ b/en_US.ISO8859-1/articles/releng-packages/article.xml
diff --git a/en_US.ISO8859-1/articles/releng/Makefile b/en_US.ISO8859-1/articles/releng/Makefile
index 59137dbad0..fb9fe5bcf9 100644
--- a/en_US.ISO8859-1/articles/releng/Makefile
+++ b/en_US.ISO8859-1/articles/releng/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 IMAGES_EN=	branches-head.pic
 IMAGES_EN+=	branches-releng3.pic
 IMAGES_EN+=	branches-releng4.pic
diff --git a/en_US.ISO8859-1/articles/releng/article.sgml b/en_US.ISO8859-1/articles/releng/article.xml
index baaf7df525..64c53ffadd 100644
--- a/en_US.ISO8859-1/articles/releng/article.sgml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -380,12 +380,12 @@
 
       <itemizedlist>
         <listitem>
-          <para><filename>doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+          <para><filename>doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
           </filename></para>
         </listitem>
 
         <listitem>
-          <para><filename>doc/en_US.ISO8859-1/books/porters-handbook/book.sgml
+          <para><filename>doc/en_US.ISO8859-1/books/porters-handbook/book.xml
           </filename></para>
         </listitem>
 
@@ -438,7 +438,7 @@
         </listitem>
 
         <listitem>
-          <para><filename>www/en/docs/man.sgml</filename></para>
+          <para><filename>www/en/docs/man.xml</filename></para>
         </listitem>
 
         <listitem>
@@ -457,12 +457,12 @@
 
       <itemizedlist>
         <listitem>
-          <para><filename>src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+          <para><filename>src/release/doc/en_US.ISO8859-1/relnotes/common/new.xml
           </filename></para>
         </listitem>
 
         <listitem>
-          <para><filename>src/release/doc/en_US.ISO8859-1/errata/article.sgml
+          <para><filename>src/release/doc/en_US.ISO8859-1/errata/article.xml
           </filename></para>
         </listitem>
       </itemizedlist>
@@ -485,7 +485,7 @@
         </listitem>
 
         <listitem>
-          <para><filename>www/share/sgml/includes.release.sgml</filename></para>
+          <para><filename>www/share/sgml/includes.release.xml</filename></para>
         </listitem>
 
         <listitem>
@@ -497,7 +497,7 @@
         </listitem>
 
         <listitem>
-          <para><filename>www/en/releng/index.sgml</filename></para>
+          <para><filename>www/en/releng/index.xml</filename></para>
         </listitem>
 
         <listitem>
diff --git a/en_US.ISO8859-1/articles/remote-install/Makefile b/en_US.ISO8859-1/articles/remote-install/Makefile
index 388906f144..9a75114e2e 100644
--- a/en_US.ISO8859-1/articles/remote-install/Makefile
+++ b/en_US.ISO8859-1/articles/remote-install/Makefile
@@ -10,7 +10,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
diff --git a/en_US.ISO8859-1/articles/remote-install/article.sgml b/en_US.ISO8859-1/articles/remote-install/article.xml
index 4b37865fe6..4b37865fe6 100644
--- a/en_US.ISO8859-1/articles/remote-install/article.sgml
+++ b/en_US.ISO8859-1/articles/remote-install/article.xml
diff --git a/en_US.ISO8859-1/articles/serial-uart/Makefile b/en_US.ISO8859-1/articles/serial-uart/Makefile
index b0465bf0c0..07164f6417 100644
--- a/en_US.ISO8859-1/articles/serial-uart/Makefile
+++ b/en_US.ISO8859-1/articles/serial-uart/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/serial-uart/article.sgml b/en_US.ISO8859-1/articles/serial-uart/article.xml
index 17755bc62f..17755bc62f 100644
--- a/en_US.ISO8859-1/articles/serial-uart/article.sgml
+++ b/en_US.ISO8859-1/articles/serial-uart/article.xml
diff --git a/en_US.ISO8859-1/articles/solid-state/Makefile b/en_US.ISO8859-1/articles/solid-state/Makefile
index 6861fab294..e2eaeaee14 100644
--- a/en_US.ISO8859-1/articles/solid-state/Makefile
+++ b/en_US.ISO8859-1/articles/solid-state/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/articles/solid-state/article.sgml b/en_US.ISO8859-1/articles/solid-state/article.xml
index 06e5c24eeb..06e5c24eeb 100644
--- a/en_US.ISO8859-1/articles/solid-state/article.sgml
+++ b/en_US.ISO8859-1/articles/solid-state/article.xml
diff --git a/en_US.ISO8859-1/articles/vm-design/Makefile b/en_US.ISO8859-1/articles/vm-design/Makefile
index 718d474191..2a66de31e1 100644
--- a/en_US.ISO8859-1/articles/vm-design/Makefile
+++ b/en_US.ISO8859-1/articles/vm-design/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 IMAGES_EN=	fig1.eps
 IMAGES_EN+=	fig2.eps
 IMAGES_EN+=	fig3.eps
diff --git a/en_US.ISO8859-1/articles/vm-design/article.sgml b/en_US.ISO8859-1/articles/vm-design/article.xml
index 5724edb6de..5724edb6de 100644
--- a/en_US.ISO8859-1/articles/vm-design/article.sgml
+++ b/en_US.ISO8859-1/articles/vm-design/article.xml
diff --git a/en_US.ISO8859-1/articles/wp-toolbox/Makefile b/en_US.ISO8859-1/articles/wp-toolbox/Makefile
index efcf23ead2..bf453e2a12 100644
--- a/en_US.ISO8859-1/articles/wp-toolbox/Makefile
+++ b/en_US.ISO8859-1/articles/wp-toolbox/Makefile
@@ -11,7 +11,7 @@ WITH_ARTICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=		article.sgml
+SRCS=		article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/wp-toolbox/article.sgml b/en_US.ISO8859-1/articles/wp-toolbox/article.xml
index 73d0ccc98c..73d0ccc98c 100644
--- a/en_US.ISO8859-1/articles/wp-toolbox/article.sgml
+++ b/en_US.ISO8859-1/articles/wp-toolbox/article.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/Makefile b/en_US.ISO8859-1/books/arch-handbook/Makefile
index 5a10c604cd..7c1f296a6c 100644
--- a/en_US.ISO8859-1/books/arch-handbook/Makefile
+++ b/en_US.ISO8859-1/books/arch-handbook/Makefile
@@ -21,23 +21,23 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
-SRCS+= boot/chapter.sgml
-SRCS+= driverbasics/chapter.sgml
-SRCS+= isa/chapter.sgml
-SRCS+= jail/chapter.sgml
-SRCS+= kobj/chapter.sgml
-SRCS+= locking/chapter.sgml
-SRCS+= mac/chapter.sgml
-SRCS+= newbus/chapter.sgml
-SRCS+= pci/chapter.sgml
-SRCS+= scsi/chapter.sgml
-SRCS+= smp/chapter.sgml
-SRCS+= sound/chapter.sgml
-SRCS+= pccard/chapter.sgml
-SRCS+= sysinit/chapter.sgml
-SRCS+= usb/chapter.sgml
-SRCS+= vm/chapter.sgml
+SRCS=  book.xml
+SRCS+= boot/chapter.xml
+SRCS+= driverbasics/chapter.xml
+SRCS+= isa/chapter.xml
+SRCS+= jail/chapter.xml
+SRCS+= kobj/chapter.xml
+SRCS+= locking/chapter.xml
+SRCS+= mac/chapter.xml
+SRCS+= newbus/chapter.xml
+SRCS+= pci/chapter.xml
+SRCS+= scsi/chapter.xml
+SRCS+= smp/chapter.xml
+SRCS+= sound/chapter.xml
+SRCS+= pccard/chapter.xml
+SRCS+= sysinit/chapter.xml
+SRCS+= usb/chapter.xml
+SRCS+= vm/chapter.xml
 
 # Images from the cross-document image library
 IMAGES_LIB=  callouts/1.png
diff --git a/en_US.ISO8859-1/books/arch-handbook/book.sgml b/en_US.ISO8859-1/books/arch-handbook/book.xml
index 785de588bf..785de588bf 100644
--- a/en_US.ISO8859-1/books/arch-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/book.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
index 08776a032e..08776a032e 100644
--- a/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/boot/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/chapters.ent b/en_US.ISO8859-1/books/arch-handbook/chapters.ent
index 5c8bc71247..d36157997c 100644
--- a/en_US.ISO8859-1/books/arch-handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/arch-handbook/chapters.ent
@@ -3,7 +3,7 @@
      Creates entities for each chapter in the FreeBSD Architecture
      Handbook. Each entity is named chap.foo, where foo is the value
      of the id attribute on that chapter, and corresponds to the name of
-     the directory in which that chapter's .sgml file is stored.
+     the directory in which that chapter's .xml file is stored.
 
      Chapters should be listed in the order in which they are referenced.
 
@@ -13,27 +13,27 @@
 <!ENTITY % chap.index "IGNORE">
 
 <!-- Part one - Kernel -->
-<!ENTITY chap.boot			SYSTEM "boot/chapter.sgml">
-<!ENTITY chap.kobj			SYSTEM "kobj/chapter.sgml">
-<!ENTITY chap.sysinit			SYSTEM "sysinit/chapter.sgml">
-<!ENTITY chap.locking			SYSTEM "locking/chapter.sgml">
-<!ENTITY chap.vm			SYSTEM "vm/chapter.sgml">
-<!ENTITY chap.jail			SYSTEM "jail/chapter.sgml">
-<!ENTITY chap.mac			SYSTEM "mac/chapter.sgml">
-<!ENTITY chap.smp			SYSTEM "smp/chapter.sgml">
+<!ENTITY chap.boot			SYSTEM "boot/chapter.xml">
+<!ENTITY chap.kobj			SYSTEM "kobj/chapter.xml">
+<!ENTITY chap.sysinit			SYSTEM "sysinit/chapter.xml">
+<!ENTITY chap.locking			SYSTEM "locking/chapter.xml">
+<!ENTITY chap.vm			SYSTEM "vm/chapter.xml">
+<!ENTITY chap.jail			SYSTEM "jail/chapter.xml">
+<!ENTITY chap.mac			SYSTEM "mac/chapter.xml">
+<!ENTITY chap.smp			SYSTEM "smp/chapter.xml">
 
 <!-- Part Two - Device Drivers -->
-<!ENTITY chap.driverbasics		SYSTEM "driverbasics/chapter.sgml">
-<!ENTITY chap.isa			SYSTEM "isa/chapter.sgml">
-<!ENTITY chap.pci			SYSTEM "pci/chapter.sgml">
-<!ENTITY chap.scsi			SYSTEM "scsi/chapter.sgml">
-<!ENTITY chap.usb			SYSTEM "usb/chapter.sgml">
-<!ENTITY chap.newbus			SYSTEM "newbus/chapter.sgml">
-<!ENTITY chap.snd			SYSTEM "sound/chapter.sgml">
-<!ENTITY chap.pccard			SYSTEM "pccard/chapter.sgml">
+<!ENTITY chap.driverbasics		SYSTEM "driverbasics/chapter.xml">
+<!ENTITY chap.isa			SYSTEM "isa/chapter.xml">
+<!ENTITY chap.pci			SYSTEM "pci/chapter.xml">
+<!ENTITY chap.scsi			SYSTEM "scsi/chapter.xml">
+<!ENTITY chap.usb			SYSTEM "usb/chapter.xml">
+<!ENTITY chap.newbus			SYSTEM "newbus/chapter.xml">
+<!ENTITY chap.snd			SYSTEM "sound/chapter.xml">
+<!ENTITY chap.pccard			SYSTEM "pccard/chapter.xml">
 
 <!-- Part three - Appendices -->
 <![%chap.index[
-  <!ENTITY chap.index			SYSTEM "index.sgml">
+  <!ENTITY chap.index			SYSTEM "index.xml">
 ]]>
 <!ENTITY chap.index			"">
diff --git a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
index 9b653e41ca..9b653e41ca 100644
--- a/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
index d046c2aa88..d046c2aa88 100644
--- a/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
index 0cd77ee50e..0cd77ee50e 100644
--- a/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/jail/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
index ee0c27679b..ee0c27679b 100644
--- a/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
index 0818c0fbdd..0818c0fbdd 100644
--- a/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/locking/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
index 483889c9dc..483889c9dc 100644
--- a/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/mac/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
index 7fd0152d02..7fd0152d02 100644
--- a/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
index 301de79aee..301de79aee 100644
--- a/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
index 272b6aab3e..272b6aab3e 100644
--- a/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
index bdd4fd3928..bdd4fd3928 100644
--- a/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
index 0d0f001e6c..0d0f001e6c 100644
--- a/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/smp/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
index b21a45a2bd..b21a45a2bd 100644
--- a/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
index 01b91357c1..01b91357c1 100644
--- a/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
index 95f0a6e5c5..95f0a6e5c5 100644
--- a/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/usb/chapter.xml
diff --git a/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml b/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
index af2d1d5f50..af2d1d5f50 100644
--- a/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml
+++ b/en_US.ISO8859-1/books/arch-handbook/vm/chapter.xml
diff --git a/en_US.ISO8859-1/books/bibliography/Makefile b/en_US.ISO8859-1/books/bibliography/Makefile
index 2152970d57..c638bf7fff 100644
--- a/en_US.ISO8859-1/books/bibliography/Makefile
+++ b/en_US.ISO8859-1/books/bibliography/Makefile
@@ -18,7 +18,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/en_US.ISO8859-1/books/bibliography/book.sgml b/en_US.ISO8859-1/books/bibliography/book.xml
index 174b6d67c2..1a22f326d9 100644
--- a/en_US.ISO8859-1/books/bibliography/book.sgml
+++ b/en_US.ISO8859-1/books/bibliography/book.xml
@@ -3,7 +3,7 @@
 	"../../../share/sgml/freebsd42.dtd" [
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
 %entities;
-<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.sgml">
+<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.xml">
 ]>
 
 <!--
diff --git a/en_US.ISO8859-1/books/corp-net-guide/Makefile b/en_US.ISO8859-1/books/corp-net-guide/Makefile
index a15b0c5382..e4834d3e81 100644
--- a/en_US.ISO8859-1/books/corp-net-guide/Makefile
+++ b/en_US.ISO8859-1/books/corp-net-guide/Makefile
@@ -7,7 +7,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= book.sgml
+SRCS= book.xml
 
 IMAGES_EN=		08-01.eps
 IMAGES_EN+= 	08-02.eps
diff --git a/en_US.ISO8859-1/books/corp-net-guide/book.sgml b/en_US.ISO8859-1/books/corp-net-guide/book.xml
index 2f9705b4cc..2f9705b4cc 100644
--- a/en_US.ISO8859-1/books/corp-net-guide/book.sgml
+++ b/en_US.ISO8859-1/books/corp-net-guide/book.xml
diff --git a/en_US.ISO8859-1/books/design-44bsd/Makefile b/en_US.ISO8859-1/books/design-44bsd/Makefile
index 3784c7b90d..927603f613 100644
--- a/en_US.ISO8859-1/books/design-44bsd/Makefile
+++ b/en_US.ISO8859-1/books/design-44bsd/Makefile
@@ -9,7 +9,7 @@ IMAGES_EN= fig1.eps fig2.eps
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= book.sgml
+SRCS= book.xml
 
 # Use the local DSSSL file
 DSLHTML?=       ${.CURDIR}/freebsd.dsl
diff --git a/en_US.ISO8859-1/books/design-44bsd/book.sgml b/en_US.ISO8859-1/books/design-44bsd/book.xml
index 3d79287bab..3d79287bab 100644
--- a/en_US.ISO8859-1/books/design-44bsd/book.sgml
+++ b/en_US.ISO8859-1/books/design-44bsd/book.xml
diff --git a/en_US.ISO8859-1/books/dev-model/Makefile b/en_US.ISO8859-1/books/dev-model/Makefile
index 92eb9a1388..4e681d3861 100644
--- a/en_US.ISO8859-1/books/dev-model/Makefile
+++ b/en_US.ISO8859-1/books/dev-model/Makefile
@@ -11,7 +11,7 @@ FORMATS?= html-split html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= book.sgml
+SRCS= book.xml
 
 IMAGES_EN= branches.png
 IMAGES_EN+= freebsd-code-model.png
diff --git a/en_US.ISO8859-1/books/dev-model/book.sgml b/en_US.ISO8859-1/books/dev-model/book.xml
index e3a7053138..e3a7053138 100644
--- a/en_US.ISO8859-1/books/dev-model/book.sgml
+++ b/en_US.ISO8859-1/books/dev-model/book.xml
diff --git a/en_US.ISO8859-1/books/dev-model/chapters.ent b/en_US.ISO8859-1/books/dev-model/chapters.ent
index be4294b32c..055463bf64 100644
--- a/en_US.ISO8859-1/books/dev-model/chapters.ent
+++ b/en_US.ISO8859-1/books/dev-model/chapters.ent
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
-<!--!ENTITY chap.references	SYSTEM "references.sgml"-->
+<!--!ENTITY chap.references	SYSTEM "references.xml"-->
diff --git a/en_US.ISO8859-1/books/developers-handbook/Makefile b/en_US.ISO8859-1/books/developers-handbook/Makefile
index ddc2582db4..436231ffd9 100644
--- a/en_US.ISO8859-1/books/developers-handbook/Makefile
+++ b/en_US.ISO8859-1/books/developers-handbook/Makefile
@@ -24,18 +24,18 @@ IMAGES_EN= sockets/layers.eps sockets/sain.eps sockets/sainfill.eps sockets/sain
 #
 
 # SGML content
-SRCS=  book.sgml
-SRCS+= introduction/chapter.sgml
-SRCS+= ipv6/chapter.sgml
-SRCS+= kernelbuild/chapter.sgml
-SRCS+= kerneldebug/chapter.sgml
-SRCS+= l10n/chapter.sgml
-SRCS+= policies/chapter.sgml
-SRCS+= secure/chapter.sgml
-SRCS+= sockets/chapter.sgml
-SRCS+= testing/chapter.sgml
-SRCS+= tools/chapter.sgml
-SRCS+= x86/chapter.sgml
+SRCS=  book.xml
+SRCS+= introduction/chapter.xml
+SRCS+= ipv6/chapter.xml
+SRCS+= kernelbuild/chapter.xml
+SRCS+= kerneldebug/chapter.xml
+SRCS+= l10n/chapter.xml
+SRCS+= policies/chapter.xml
+SRCS+= secure/chapter.xml
+SRCS+= sockets/chapter.xml
+SRCS+= testing/chapter.xml
+SRCS+= tools/chapter.xml
+SRCS+= x86/chapter.xml
 
 # Entities
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/book.sgml b/en_US.ISO8859-1/books/developers-handbook/book.xml
index 841631dba8..841631dba8 100644
--- a/en_US.ISO8859-1/books/developers-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/book.xml
diff --git a/en_US.ISO8859-1/books/developers-handbook/chapters.ent b/en_US.ISO8859-1/books/developers-handbook/chapters.ent
index 936cb206c3..555d115d40 100644
--- a/en_US.ISO8859-1/books/developers-handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/developers-handbook/chapters.ent
@@ -3,7 +3,7 @@
      Creates entities for each chapter in the FreeBSD Developer's
      Handbook. Each entity is named chap.foo, where foo is the value
      of the id attribute on that chapter, and corresponds to the name of
-     the directory in which that chapter's .sgml file is stored.
+     the directory in which that chapter's .xml file is stored.
 
      Chapters should be listed in the order in which they are referenced.
 
@@ -13,26 +13,26 @@
 <!ENTITY % chap.index "IGNORE">
 
 <!-- Part one -->
-<!ENTITY chap.introduction		SYSTEM "introduction/chapter.sgml">
-<!ENTITY chap.tools			SYSTEM "tools/chapter.sgml">
-<!ENTITY chap.secure			SYSTEM "secure/chapter.sgml">
-<!ENTITY chap.l10n                      SYSTEM "l10n/chapter.sgml">
-<!ENTITY chap.policies                  SYSTEM "policies/chapter.sgml">
-<!ENTITY chap.testing                   SYSTEM "testing/chapter.sgml">
+<!ENTITY chap.introduction		SYSTEM "introduction/chapter.xml">
+<!ENTITY chap.tools			SYSTEM "tools/chapter.xml">
+<!ENTITY chap.secure			SYSTEM "secure/chapter.xml">
+<!ENTITY chap.l10n                      SYSTEM "l10n/chapter.xml">
+<!ENTITY chap.policies                  SYSTEM "policies/chapter.xml">
+<!ENTITY chap.testing                   SYSTEM "testing/chapter.xml">
 
 <!-- Part two - IPC -->
-<!ENTITY chap.sockets			SYSTEM "sockets/chapter.sgml">
-<!ENTITY chap.ipv6			SYSTEM "ipv6/chapter.sgml">
+<!ENTITY chap.sockets			SYSTEM "sockets/chapter.xml">
+<!ENTITY chap.ipv6			SYSTEM "ipv6/chapter.xml">
 
 <!-- Part three - Kernel -->
-<!ENTITY chap.kernelbuild		SYSTEM "kernelbuild/chapter.sgml">
-<!ENTITY chap.kerneldebug		SYSTEM "kerneldebug/chapter.sgml">
+<!ENTITY chap.kernelbuild		SYSTEM "kernelbuild/chapter.xml">
+<!ENTITY chap.kerneldebug		SYSTEM "kerneldebug/chapter.xml">
 
 <!-- Part five - Architectures -->
-<!ENTITY chap.x86			SYSTEM "x86/chapter.sgml">
+<!ENTITY chap.x86			SYSTEM "x86/chapter.xml">
 
 <!-- Part six - Appendices -->
 <![%chap.index;[
-  <!ENTITY chap.index			SYSTEM "index.sgml">
+  <!ENTITY chap.index			SYSTEM "index.xml">
 ]]>
 <!ENTITY chap.index			"">
diff --git a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
index 6c53a7d0ee..6c53a7d0ee 100644
--- a/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.xml
diff --git a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
index 15cfb17c23..15cfb17c23 100644
--- a/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
diff --git a/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
index 0857fc51d4..0857fc51d4 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
diff --git a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile
index a6d190e942..0f3b90b3e1 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile
+++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	kerneldebug/chapter.sgml
+CHAPTERS= 	kerneldebug/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
index 1f78263b6e..1f78263b6e 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
diff --git a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
index dd13a7a2fc..dd13a7a2fc 100644
--- a/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.xml
diff --git a/en_US.ISO8859-1/books/developers-handbook/policies/Makefile b/en_US.ISO8859-1/books/developers-handbook/policies/Makefile
index 0dd403f15f..771a262e60 100644
--- a/en_US.ISO8859-1/books/developers-handbook/policies/Makefile
+++ b/en_US.ISO8859-1/books/developers-handbook/policies/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	policies/chapter.sgml
+CHAPTERS= 	policies/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
index 01cb12ae08..01cb12ae08 100644
--- a/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
diff --git a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
index e35fe1afdd..e35fe1afdd 100644
--- a/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/secure/chapter.xml
diff --git a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
index 89b29f957a..89b29f957a 100644
--- a/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.xml
diff --git a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
index 9470863c45..9470863c45 100644
--- a/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
diff --git a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
index d1df3354ae..d1df3354ae 100644
--- a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
diff --git a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
index 65e17b742b..65e17b742b 100644
--- a/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/x86/chapter.xml
diff --git a/en_US.ISO8859-1/books/faq/Makefile b/en_US.ISO8859-1/books/faq/Makefile
index e6ce1b9f5f..e2e7548a0a 100644
--- a/en_US.ISO8859-1/books/faq/Makefile
+++ b/en_US.ISO8859-1/books/faq/Makefile
@@ -21,7 +21,7 @@ WITH_BIBLIOXREF_TITLE?=YES
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.xml
index ae014aba04..ae014aba04 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.xml
diff --git a/en_US.ISO8859-1/books/fdp-primer/Makefile b/en_US.ISO8859-1/books/fdp-primer/Makefile
index 81d365c81a..7e7f024e08 100644
--- a/en_US.ISO8859-1/books/fdp-primer/Makefile
+++ b/en_US.ISO8859-1/books/fdp-primer/Makefile
@@ -19,21 +19,21 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
-SRCS+= overview/chapter.sgml
-SRCS+= psgml-mode/chapter.sgml
-SRCS+= see-also/chapter.sgml
-SRCS+= sgml-markup/chapter.sgml
-SRCS+= sgml-primer/chapter.sgml
-SRCS+= stylesheets/chapter.sgml
-SRCS+= structure/chapter.sgml
-SRCS+= doc-build/chapter.sgml
-SRCS+= the-website/chapter.sgml
-SRCS+= tools/chapter.sgml
-SRCS+= translations/chapter.sgml
-SRCS+= writing-style/chapter.sgml
-
-SRCS+= examples/appendix.sgml
+SRCS=  book.xml
+SRCS+= overview/chapter.xml
+SRCS+= psgml-mode/chapter.xml
+SRCS+= see-also/chapter.xml
+SRCS+= sgml-markup/chapter.xml
+SRCS+= sgml-primer/chapter.xml
+SRCS+= stylesheets/chapter.xml
+SRCS+= structure/chapter.xml
+SRCS+= doc-build/chapter.xml
+SRCS+= the-website/chapter.xml
+SRCS+= tools/chapter.xml
+SRCS+= translations/chapter.xml
+SRCS+= writing-style/chapter.xml
+
+SRCS+= examples/appendix.xml
 
 # Images from the cross-document image library
 IMAGES_LIB=	callouts/1.png
diff --git a/en_US.ISO8859-1/books/fdp-primer/book.sgml b/en_US.ISO8859-1/books/fdp-primer/book.xml
index 1a9308e9e7..8f008f87f0 100644
--- a/en_US.ISO8859-1/books/fdp-primer/book.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/book.xml
@@ -4,7 +4,7 @@
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN" "../../share/sgml/entities.ent">
 %entities;
 <!ENTITY % chapters SYSTEM "chapters.ent"> %chapters;
-<!-- ENTITY index SYSTEM "index.sgml" -->
+<!-- ENTITY index SYSTEM "index.xml" -->
 ]>
 
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
@@ -247,8 +247,8 @@ Password:</screen></entry>
 
   &chap.overview;
   &chap.tools;
-  &chap.sgml-primer;
-  &chap.sgml-markup;
+  &chap.xml-primer;
+  &chap.xml-markup;
   &chap.stylesheets;
   &chap.structure;
   &chap.doc-build;
diff --git a/en_US.ISO8859-1/books/fdp-primer/chapters.ent b/en_US.ISO8859-1/books/fdp-primer/chapters.ent
index 88c3d22646..37c1e4f805 100644
--- a/en_US.ISO8859-1/books/fdp-primer/chapters.ent
+++ b/en_US.ISO8859-1/books/fdp-primer/chapters.ent
@@ -3,24 +3,24 @@
      Creates entities for each chapter in the Documentation Project Primer.
      Each entity is named chap.foo, where foo is the value of the id
      attribute on that chapter, and corresponds to the name of the
-      directory in which that chapter's .sgml file is stored.
+      directory in which that chapter's .xml file is stored.
 
      Chapters should be listed in the order in which they are referenced.
 
      $FreeBSD$
 -->
 
-<!ENTITY chap.overview		SYSTEM "overview/chapter.sgml">
-<!ENTITY chap.sgml-primer	SYSTEM "sgml-primer/chapter.sgml">
-<!ENTITY chap.tools		SYSTEM "tools/chapter.sgml">
-<!ENTITY chap.sgml-markup       SYSTEM "sgml-markup/chapter.sgml">
-<!ENTITY chap.stylesheets	SYSTEM "stylesheets/chapter.sgml">
-<!ENTITY chap.structure         SYSTEM "structure/chapter.sgml">
-<!ENTITY chap.the-website	SYSTEM "the-website/chapter.sgml">
-<!ENTITY chap.translations	SYSTEM "translations/chapter.sgml">
-<!ENTITY chap.writing-style	SYSTEM "writing-style/chapter.sgml">
-<!ENTITY chap.psgml-mode	SYSTEM "psgml-mode/chapter.sgml">
-<!ENTITY chap.see-also		SYSTEM "see-also/chapter.sgml">
-<!ENTITY chap.doc-build		SYSTEM "doc-build/chapter.sgml">
+<!ENTITY chap.overview		SYSTEM "overview/chapter.xml">
+<!ENTITY chap.xml-primer	SYSTEM "sgml-primer/chapter.xml">
+<!ENTITY chap.tools		SYSTEM "tools/chapter.xml">
+<!ENTITY chap.xml-markup       SYSTEM "sgml-markup/chapter.xml">
+<!ENTITY chap.stylesheets	SYSTEM "stylesheets/chapter.xml">
+<!ENTITY chap.structure         SYSTEM "structure/chapter.xml">
+<!ENTITY chap.the-website	SYSTEM "the-website/chapter.xml">
+<!ENTITY chap.translations	SYSTEM "translations/chapter.xml">
+<!ENTITY chap.writing-style	SYSTEM "writing-style/chapter.xml">
+<!ENTITY chap.psgml-mode	SYSTEM "psgml-mode/chapter.xml">
+<!ENTITY chap.see-also		SYSTEM "see-also/chapter.xml">
+<!ENTITY chap.doc-build		SYSTEM "doc-build/chapter.xml">
 
-<!ENTITY app.examples		SYSTEM "examples/appendix.sgml">
+<!ENTITY app.examples		SYSTEM "examples/appendix.xml">
diff --git a/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index 819dcef2b1..7b969da21a 100644
--- a/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -213,7 +213,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
@@ -226,7 +226,7 @@ DOC_PREFIX?= ${.CURDIR}/../../..
 	it.</para>
 
       <para><makevar>DOC</makevar> is the name (sans the
-	<filename>.sgml</filename> extension) of the main document
+	<filename>.xml</filename> extension) of the main document
 	created by this directory.  <makevar>SRCS</makevar> lists all
 	the individual files that make up the document.  This should
 	also include important files in which a change should result
diff --git a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
index 139877c415..32c29a9996 100644
--- a/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -176,7 +176,7 @@
     -c /usr/local/share/sgml/docbook/catalog \
     -c /usr/local/share/sgml/jade/catalog \
     -d /usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl \<co id="examples-co-jade-1-dsssl"/>
-    -t sgml <co id="examples-co-jade-1-transform"/> <replaceable>file</replaceable>.sgml &gt; <replaceable>file</replaceable>.html <co id="examples-co-jade-1-filename"/></userinput></screen>
+    -t sgml <co id="examples-co-jade-1-transform"/> <replaceable>file</replaceable>.xml &gt; <replaceable>file</replaceable>.html <co id="examples-co-jade-1-filename"/></userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-1-nochunks">
@@ -227,7 +227,7 @@
     -c /usr/local/share/sgml/docbook/catalog \
     -c /usr/local/share/sgml/jade/catalog \
     -d /usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl \<co id="examples-co-jade-2-dsssl"/>
-    -t sgml <co id="examples-co-jade-2-transform"/> <replaceable>file</replaceable>.sgml <co id="examples-co-jade-2-filename"/></userinput></screen>
+    -t sgml <co id="examples-co-jade-2-transform"/> <replaceable>file</replaceable>.xml <co id="examples-co-jade-2-filename"/></userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-2-catalog">
@@ -279,7 +279,7 @@
     -c /usr/local/share/sgml/docbook/catalog \
     -c /usr/local/share/sgml/jade/catalog \
     -d /usr/local/share/sgml/docbook/dsssl/modular/print/docbook.dsl \<co id="examples-co-jade-3-dsssl"/>
-    -t tex <co id="examples-co-jade-3-tex"/> <replaceable>file</replaceable>.sgml</userinput></screen>
+    -t tex <co id="examples-co-jade-3-tex"/> <replaceable>file</replaceable>.xml</userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-3-tex-backend">
diff --git a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
index 530402cf72..2930c47f9f 100644
--- a/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -252,7 +252,7 @@
       </step>
 
       <step>
-	<para>Edit the <filename>.sgml</filename> files using your
+	<para>Edit the <filename>.xml</filename> files using your
 	  editor of choice.</para>
       </step>
 
diff --git a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index e0e0c4dd60..f0c4e0db9e 100644
--- a/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -40,7 +40,7 @@
     Collection) contain a very useful package called PSGML (can be
     installed from <filename role="package">editors/psgml</filename>).
     Automatically invoked when a file with the
-    <filename>.sgml</filename> extension is loaded, or by typing
+    <filename>.xml</filename> extension is loaded, or by typing
     <command>M-x sgml-mode</command>, it is a major mode for dealing
     with SGML files, elements and attributes.</para>
 
diff --git a/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
index 64da1923c8..64da1923c8 100644
--- a/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 3d827e7730..5c77eea354 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -1849,7 +1849,7 @@ This is the file called 'foo2'</screen>
 
 	  <programlisting><![CDATA[<para>The SGML source for the Handbook in English can be
   found in <filename class="directory">/usr/doc/en_US.ISO8859-1/books/handbook/</filename>.  The first
-  file is called <filename>book.sgml</filename> in that
+  file is called <filename>book.xml</filename> in that
   directory.  You should also see a <filename>Makefile</filename>
   and a number of files with a <filename>.ent</filename>
   extension.</para>]]></programlisting>
@@ -1858,7 +1858,7 @@ This is the file called 'foo2'</screen>
 
 	  <para>The SGML source for the Handbook in English can be
 	    found in <filename>/usr/doc/en/handbook/</filename>.  The
-	    first file is called <filename>handbook.sgml</filename> in
+	    first file is called <filename>handbook.xml</filename> in
 	    that directory.  You should also see a
 	    <filename>Makefile</filename> and a number of files with a
 	    <filename>.ent</filename> extension.</para>
@@ -2511,9 +2511,9 @@ IMAGES+= fig3.png
 
 	<para>Suppose you have a book with three chapters, and the
 	  chapters are stored in their own directories, called
-	  <filename>chapter1/chapter.sgml</filename>,
-	  <filename>chapter2/chapter.sgml</filename>, and
-	  <filename>chapter3/chapter.sgml</filename>.  If each chapter
+	  <filename>chapter1/chapter.xml</filename>,
+	  <filename>chapter2/chapter.xml</filename>, and
+	  <filename>chapter3/chapter.xml</filename>.  If each chapter
 	  has images associated with it, it is suggested to place
 	  those images in each chapter's subdirectory
 	  (<filename>chapter1/</filename>,
@@ -2529,7 +2529,7 @@ IMAGES+= fig3.png
 
 	<para>For example, if you have
 	  <filename>chapter1/fig1.png</filename>, then
-	  <filename>chapter1/chapter.sgml</filename> should
+	  <filename>chapter1/chapter.xml</filename> should
 	  contain:</para>
 
 	<programlisting>&lt;mediaobject>
diff --git a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 325d88de4b..a9442789aa 100644
--- a/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -1135,9 +1135,9 @@ example.xml:5: element head: validity error : Element head content does not foll
 
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-<!ENTITY chapter.1 SYSTEM "chapter1.sgml">
-<!ENTITY chapter.2 SYSTEM "chapter2.sgml">
-<!ENTITY chapter.3 SYSTEM "chapter3.sgml">
+<!ENTITY chapter.1 SYSTEM "chapter1.xml">
+<!ENTITY chapter.2 SYSTEM "chapter2.xml">
+<!ENTITY chapter.3 SYSTEM "chapter3.xml">
 <!-- And so forth -->
 ]>
 
@@ -1153,8 +1153,8 @@ example.xml:5: element head: validity error : Element head content does not foll
       <warning>
 	<para>When using general entities to include other files
 	  within a document, the files being included
-	  (<filename>chapter1.sgml</filename>,
-	  <filename>chapter2.sgml</filename>, and so on)
+	  (<filename>chapter1.xml</filename>,
+	  <filename>chapter2.xml</filename>, and so on)
 	  <emphasis>must not</emphasis> start with a DOCTYPE
 	  declaration.  This is a syntax error because entities
 	  are low-level constructs and they are resolved before
diff --git a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
index ccb49a927b..deec9efd25 100644
--- a/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -204,7 +204,7 @@
 	</sect4>
 
 	<sect4>
-	  <title><filename>book.sgml</filename></title>
+	  <title><filename>book.xml</filename></title>
 
 	  <para>This is the top level document in the Handbook.  It
 	    contains the Handbook's <link
@@ -212,7 +212,7 @@
 	      declaration</link>, as well as the elements that
 	    describe the Handbook's structure.</para>
 
-	  <para><filename>book.sgml</filename> uses <link
+	  <para><filename>book.xml</filename> uses <link
 	      linkend="xml-primer-parameter-entities">parameter
 	      entities</link> to load in the files with the
 	    <filename>.ent</filename> extension.  These files
@@ -223,10 +223,10 @@
 	</sect4>
 
 	<sect4>
-	  <title><filename><replaceable>directory</replaceable>/chapter.sgml</filename></title>
+	  <title><filename><replaceable>directory</replaceable>/chapter.xml</filename></title>
 
 	  <para>Each chapter in the Handbook is stored in a file
-	    called <filename>chapter.sgml</filename> in a separate
+	    called <filename>chapter.xml</filename> in a separate
 	    directory from the other chapters.  Each directory is
 	    named after the value of the <literal>id</literal>
 	    attribute on the <sgmltag>chapter</sgmltag>
@@ -241,7 +241,7 @@
 </chapter>]]></programlisting>
 
 	  <para>Then it will be called
-	    <filename>chapter.sgml</filename> in the
+	    <filename>chapter.xml</filename> in the
 	    <filename>kernelconfig</filename> directory.  In general,
 	    the entire contents of the chapter will be held in this
 	    file.</para>
@@ -253,7 +253,7 @@
 
 	  <para>In earlier versions of the Handbook the files were
 	    stored in the same directory as
-	    <filename>book.sgml</filename>, and named after the value
+	    <filename>book.xml</filename>, and named after the value
 	    of the <literal>id</literal> attribute on the file's
 	    <sgmltag>chapter</sgmltag> element.  Now, it is possible
 	    to include images in each chapter.  Images for each
@@ -267,10 +267,10 @@
 	    has many files in it.</para>
 
 	  <para>A brief look will show that there are many directories
-	    with individual <filename>chapter.sgml</filename> files,
-	    including <filename>basics/chapter.sgml</filename>,
-	    <filename>introduction/chapter.sgml</filename>, and
-	    <filename>printing/chapter.sgml</filename>.</para>
+	    with individual <filename>chapter.xml</filename> files,
+	    including <filename>basics/chapter.xml</filename>,
+	    <filename>introduction/chapter.xml</filename>, and
+	    <filename>printing/chapter.xml</filename>.</para>
 
 	  <important>
 	    <para>Chapters and/or directories should not be named in a
@@ -282,7 +282,7 @@
 	      promoted or demoted within the hierarchy).</para>
 	  </important>
 
-	  <para>Each <filename>chapter.sgml</filename> file will not
+	  <para>Each <filename>chapter.xml</filename> file will not
 	    be a complete XML document.  In particular, they will not
 	    have their own DOCTYPE lines at the start of the
 	    files.</para>
diff --git a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
index 0d4153c004..0d4153c004 100644
--- a/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
diff --git a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
index 4a621e79b5..4a621e79b5 100644
--- a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
diff --git a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
index 979b907ffd..979b907ffd 100644
--- a/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
diff --git a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 4b9f17acf5..35a1e05b13 100644
--- a/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -152,10 +152,10 @@
 
 	<para>For example, to view the differences between revisions
 	  <literal>r33733</literal> and <literal>r33734</literal> of
-	  <filename>en_US.ISO8859-1/books/fdp-primer/book.sgml</filename>,
+	  <filename>en_US.ISO8859-1/books/fdp-primer/book.xml</filename>,
 	  run:</para>
 
-	<screen>&prompt.user; <userinput><command>svn</command> diff -r<replaceable>33733</replaceable>:<replaceable>33734</replaceable> <filename>en_US.ISO8859-1/books/fdp-primer/book.sgml</filename></userinput></screen>
+	<screen>&prompt.user; <userinput><command>svn</command> diff -r<replaceable>33733</replaceable>:<replaceable>33734</replaceable> <filename>en_US.ISO8859-1/books/fdp-primer/book.xml</filename></userinput></screen>
       </answer>
     </qandaentry>
 
@@ -278,7 +278,7 @@
                      books/
                            faq/
                                Makefile
-                               book.sgml</programlisting>
+                               book.xml</programlisting>
 
 	<para><literal>sv_SE.ISO8859-1</literal> is the name of the
 	  translation, in
@@ -450,7 +450,7 @@
 	<programlisting>&lt;!--
      The FreeBSD Documentation Project
 
-     &dollar;FreeBSD: head/en_US.ISO8859-1/books/faq/book.sgml 38674 2012-04-14 13:52:52Z &dollar;
+     &dollar;FreeBSD: head/en_US.ISO8859-1/books/faq/book.xml 38674 2012-04-14 13:52:52Z &dollar;
 --&gt;</programlisting>
 
 	<para>The exact boilerplate may change, but it will always
@@ -475,7 +475,7 @@
 	<programlisting>&lt;!--
      The FreeBSD Spanish Documentation Project
 
-     &dollar;FreeBSD: head/es_ES.ISO8859-1/books/faq/book.sgml 38826 2012-05-17 19:12:14Z hrs &dollar;
+     &dollar;FreeBSD: head/es_ES.ISO8859-1/books/faq/book.xml 38826 2012-05-17 19:12:14Z hrs &dollar;
      Original revision: r38674
 --&gt;</programlisting>
       </answer>
diff --git a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
index 3c4f95790d..3c4f95790d 100644
--- a/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 86042920b2..2e4d6116fc 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -16,7 +16,7 @@
 # Handbook-specific targets
 #
 #       pgpkeyring      This target will read the contents of
-#                       pgpkeys/chapter.sgml and will extract all of
+#                       pgpkeys/chapter.xml and will extract all of
 #                       the pgpkeys to standard out.  This output can then
 #                       be redirected into a file and distributed as a
 #                       public keyring of FreeBSD developers that can
@@ -26,8 +26,8 @@
 #
 # To add a new chapter to the Handbook:
 #
-# - Update this Makefile, chapters.ent and book.sgml
-# - Add a descriptive entry for the new chapter in preface/preface.sgml
+# - Update this Makefile, chapters.ent and book.xml
+# - Add a descriptive entry for the new chapter in preface/preface.xml
 #
 # ------------------------------------------------------------------------
 
@@ -248,45 +248,45 @@ IMAGES_LIB+= callouts/15.png
 #
 
 # SGML content
-SRCS+= audit/chapter.sgml
-SRCS+= book.sgml
-SRCS+= bsdinstall/chapter.sgml
-SRCS+= colophon.sgml
-SRCS+= dtrace/chapter.sgml
-SRCS+= advanced-networking/chapter.sgml
-SRCS+= basics/chapter.sgml
-SRCS+= bibliography/chapter.sgml
-SRCS+= boot/chapter.sgml
-SRCS+= config/chapter.sgml
-SRCS+= cutting-edge/chapter.sgml
-SRCS+= desktop/chapter.sgml
-SRCS+= disks/chapter.sgml
-SRCS+= eresources/chapter.sgml
-SRCS+= firewalls/chapter.sgml
-SRCS+= filesystems/chapter.sgml
-SRCS+= geom/chapter.sgml
-SRCS+= install/chapter.sgml
-SRCS+= introduction/chapter.sgml
-SRCS+= jails/chapter.sgml
-SRCS+= kernelconfig/chapter.sgml
-SRCS+= l10n/chapter.sgml
-SRCS+= linuxemu/chapter.sgml
-SRCS+= mac/chapter.sgml
-SRCS+= mail/chapter.sgml
-SRCS+= mirrors/chapter.sgml
-SRCS+= multimedia/chapter.sgml
-SRCS+= network-servers/chapter.sgml
-SRCS+= pgpkeys/chapter.sgml
-SRCS+= ports/chapter.sgml
-SRCS+= ppp-and-slip/chapter.sgml
-SRCS+= preface/preface.sgml
-SRCS+= printing/chapter.sgml
-SRCS+= security/chapter.sgml
-SRCS+= serialcomms/chapter.sgml
-SRCS+= users/chapter.sgml
-SRCS+= vinum/chapter.sgml
-SRCS+= virtualization/chapter.sgml
-SRCS+= x11/chapter.sgml
+SRCS+= audit/chapter.xml
+SRCS+= book.xml
+SRCS+= bsdinstall/chapter.xml
+SRCS+= colophon.xml
+SRCS+= dtrace/chapter.xml
+SRCS+= advanced-networking/chapter.xml
+SRCS+= basics/chapter.xml
+SRCS+= bibliography/chapter.xml
+SRCS+= boot/chapter.xml
+SRCS+= config/chapter.xml
+SRCS+= cutting-edge/chapter.xml
+SRCS+= desktop/chapter.xml
+SRCS+= disks/chapter.xml
+SRCS+= eresources/chapter.xml
+SRCS+= firewalls/chapter.xml
+SRCS+= filesystems/chapter.xml
+SRCS+= geom/chapter.xml
+SRCS+= install/chapter.xml
+SRCS+= introduction/chapter.xml
+SRCS+= jails/chapter.xml
+SRCS+= kernelconfig/chapter.xml
+SRCS+= l10n/chapter.xml
+SRCS+= linuxemu/chapter.xml
+SRCS+= mac/chapter.xml
+SRCS+= mail/chapter.xml
+SRCS+= mirrors/chapter.xml
+SRCS+= multimedia/chapter.xml
+SRCS+= network-servers/chapter.xml
+SRCS+= pgpkeys/chapter.xml
+SRCS+= ports/chapter.xml
+SRCS+= ppp-and-slip/chapter.xml
+SRCS+= preface/preface.xml
+SRCS+= printing/chapter.xml
+SRCS+= security/chapter.xml
+SRCS+= serialcomms/chapter.xml
+SRCS+= users/chapter.xml
+SRCS+= vinum/chapter.xml
+SRCS+= virtualization/chapter.xml
+SRCS+= x11/chapter.xml
 
 # Entities
 SRCS+= chapters.ent
@@ -294,12 +294,12 @@ SRCS+= chapters.ent
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Turn on all the chapters.
-CHAPTERS?= ${SRCS:M*chapter.sgml}
+CHAPTERS?= ${SRCS:M*chapter.xml}
 
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
+SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
 SGMLFLAGS+= -i chap.freebsd-glossary
 
-pgpkeyring: pgpkeys/chapter.sgml
+pgpkeyring: pgpkeys/chapter.xml
 	${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${XMLDECL} ${MASTERDOC}
 
 #
@@ -315,9 +315,9 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.sgml.ftp.inc \
-		mirrors-cvsup:::mirrors.sgml.cvsup.inc \
-		eresources:::eresources.sgml.www.inc
+XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc \
+		mirrors-cvsup:::mirrors.xml.cvsup.inc \
+		eresources:::eresources.xml.www.inc
 DEPENDSET.DEFAULT=	transtable mirror
 XSLT.DEFAULT=		${XSL_MIRRORS}
 XML.DEFAULT=		${XML_MIRRORS}
@@ -325,20 +325,20 @@ NO_TIDY.DEFAULT=	yes
 
 PARAMS.mirrors-ftp+=	--param 'type' "'ftp'" \
 			--param 'proto' "'ftp'" \
-			--param 'target' "'handbook/mirrors/chapter.sgml'"
+			--param 'target' "'handbook/mirrors/chapter.xml'"
 PARAMS.mirrors-cvsup+=	--param 'type' "'cvsup'" \
 			--param 'proto' "'cvsup'" \
-			--param 'target' "'handbook/mirrors/chapter.sgml'"
+			--param 'target' "'handbook/mirrors/chapter.xml'"
 PARAMS.eresources+=	--param 'type' "'www'" \
 			--param 'proto' "'http'" \
-			--param 'target' "'handbook/eresources/chapter.sgml'"
+			--param 'target' "'handbook/eresources/chapter.xml'"
 
-SRCS+=		mirrors.sgml.ftp.inc \
-		mirrors.sgml.cvsup.inc \
-		eresources.sgml.www.inc
+SRCS+=		mirrors.xml.ftp.inc \
+		mirrors.xml.cvsup.inc \
+		eresources.xml.www.inc
 
-CLEANFILES+=	mirrors.sgml.ftp.inc \
-		mirrors.sgml.cvsup.inc \
-		eresources.sgml.www.inc
+CLEANFILES+=	mirrors.xml.ftp.inc \
+		mirrors.xml.cvsup.inc \
+		eresources.xml.www.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile b/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile
index eb62e4335c..9bb05ff8f3 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	advanced-networking/chapter.sgml
+CHAPTERS= 	advanced-networking/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index de262b5ddf..de262b5ddf 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/audit/Makefile b/en_US.ISO8859-1/books/handbook/audit/Makefile
index 84cb9b04ee..0dd0e1e0c6 100644
--- a/en_US.ISO8859-1/books/handbook/audit/Makefile
+++ b/en_US.ISO8859-1/books/handbook/audit/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	audit/chapter.sgml
+CHAPTERS= 	audit/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/audit/chapter.sgml b/en_US.ISO8859-1/books/handbook/audit/chapter.xml
index be5714458e..be5714458e 100644
--- a/en_US.ISO8859-1/books/handbook/audit/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/audit/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/basics/Makefile b/en_US.ISO8859-1/books/handbook/basics/Makefile
index fea6942368..7b701a90e0 100644
--- a/en_US.ISO8859-1/books/handbook/basics/Makefile
+++ b/en_US.ISO8859-1/books/handbook/basics/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	basics/chapter.sgml
+CHAPTERS= 	basics/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.sgml b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
index 587749831b..587749831b 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/bibliography/Makefile b/en_US.ISO8859-1/books/handbook/bibliography/Makefile
index f926466a22..539b10a12f 100644
--- a/en_US.ISO8859-1/books/handbook/bibliography/Makefile
+++ b/en_US.ISO8859-1/books/handbook/bibliography/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	bibliography/chapter.sgml
+CHAPTERS= 	bibliography/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml b/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
index 03d8a27211..03d8a27211 100644
--- a/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/book.sgml b/en_US.ISO8859-1/books/handbook/book.xml
index b7da40cc74..b7da40cc74 100644
--- a/en_US.ISO8859-1/books/handbook/book.sgml
+++ b/en_US.ISO8859-1/books/handbook/book.xml
diff --git a/en_US.ISO8859-1/books/handbook/boot/Makefile b/en_US.ISO8859-1/books/handbook/boot/Makefile
index 92105efc40..3786930d1c 100644
--- a/en_US.ISO8859-1/books/handbook/boot/Makefile
+++ b/en_US.ISO8859-1/books/handbook/boot/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	boot/chapter.sgml
+CHAPTERS= 	boot/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
index ab2478c416..ab2478c416 100644
--- a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/boot/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/Makefile b/en_US.ISO8859-1/books/handbook/bsdinstall/Makefile
index b5f6bf3805..0ad1b83553 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/Makefile
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	bsdinstall/chapter.sgml
+CHAPTERS= 	bsdinstall/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
index 5cfcc52f2c..5cfcc52f2c 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/chapters.ent b/en_US.ISO8859-1/books/handbook/chapters.ent
index eecc4a2281..a2a9455f59 100644
--- a/en_US.ISO8859-1/books/handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/handbook/chapters.ent
@@ -3,7 +3,7 @@
      Creates entities for each chapter in the FreeBSD Handbook. Each entity
      is named chap.foo, where foo is the value of the id attribute on that
      chapter, and corresponds to the name of the directory in which that
-     chapter's .sgml file is stored.
+     chapter's .xml file is stored.
 
      Chapters should be listed in the order in which they are referenced.
 
@@ -53,143 +53,143 @@
 <!ENTITY % chap.filesystems "IGNORE">
 <!ENTITY % chap.dtrace "IGNORE">
 
-<!ENTITY chap.preface			SYSTEM "preface/preface.sgml">
+<!ENTITY chap.preface			SYSTEM "preface/preface.xml">
 <!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 
 <!-- Part One -->
 <![%chap.introduction;[
-  <!ENTITY chap.introduction	SYSTEM "introduction/chapter.sgml">
+  <!ENTITY chap.introduction	SYSTEM "introduction/chapter.xml">
 ]]>
 <![%chap.install;[
-  <!ENTITY chap.install		SYSTEM "install/chapter.sgml">
+  <!ENTITY chap.install		SYSTEM "install/chapter.xml">
 ]]>
 <![%chap.bsdinstall;[
-  <!ENTITY chap.bsdinstall	SYSTEM "bsdinstall/chapter.sgml">
+  <!ENTITY chap.bsdinstall	SYSTEM "bsdinstall/chapter.xml">
 ]]>
 <![%chap.basics;[
-  <!ENTITY chap.basics		SYSTEM "basics/chapter.sgml">
+  <!ENTITY chap.basics		SYSTEM "basics/chapter.xml">
 ]]>
 <![%chap.ports;[
-  <!ENTITY chap.ports		SYSTEM "ports/chapter.sgml">
+  <!ENTITY chap.ports		SYSTEM "ports/chapter.xml">
 ]]>
 <![%chap.x11;[
-  <!ENTITY chap.x11		SYSTEM "x11/chapter.sgml">
+  <!ENTITY chap.x11		SYSTEM "x11/chapter.xml">
 ]]>
 
 <!-- Part Two -->
 <![%chap.desktop;[
-  <!ENTITY chap.desktop		SYSTEM "desktop/chapter.sgml">
+  <!ENTITY chap.desktop		SYSTEM "desktop/chapter.xml">
 ]]>
 <![%chap.multimedia;[
-  <!ENTITY chap.multimedia	SYSTEM "multimedia/chapter.sgml">
+  <!ENTITY chap.multimedia	SYSTEM "multimedia/chapter.xml">
 ]]>
 <![%chap.kernelconfig;[
-  <!ENTITY chap.kernelconfig	SYSTEM "kernelconfig/chapter.sgml">
+  <!ENTITY chap.kernelconfig	SYSTEM "kernelconfig/chapter.xml">
 ]]>
 <![%chap.printing;[
-  <!ENTITY chap.printing	SYSTEM "printing/chapter.sgml">
+  <!ENTITY chap.printing	SYSTEM "printing/chapter.xml">
 ]]>
 <![%chap.linuxemu;[
-  <!ENTITY chap.linuxemu	SYSTEM "linuxemu/chapter.sgml">
+  <!ENTITY chap.linuxemu	SYSTEM "linuxemu/chapter.xml">
 ]]>
 
 <!-- Part Three -->
 <![%chap.config;[
-  <!ENTITY chap.config		SYSTEM "config/chapter.sgml">
+  <!ENTITY chap.config		SYSTEM "config/chapter.xml">
 ]]>
 <![%chap.boot;[
-  <!ENTITY chap.boot		SYSTEM "boot/chapter.sgml">
+  <!ENTITY chap.boot		SYSTEM "boot/chapter.xml">
 ]]>
 <![%chap.users;[
-  <!ENTITY chap.users		SYSTEM "users/chapter.sgml">
+  <!ENTITY chap.users		SYSTEM "users/chapter.xml">
 ]]>
 <![%chap.security;[
-  <!ENTITY chap.security	SYSTEM "security/chapter.sgml">
+  <!ENTITY chap.security	SYSTEM "security/chapter.xml">
 ]]>
 <![%chap.jails;[
-  <!ENTITY chap.jails		SYSTEM "jails/chapter.sgml">
+  <!ENTITY chap.jails		SYSTEM "jails/chapter.xml">
 ]]>
 <![%chap.mac;[
-  <!ENTITY chap.mac		SYSTEM "mac/chapter.sgml">
+  <!ENTITY chap.mac		SYSTEM "mac/chapter.xml">
 ]]>
 <![%chap.audit;[
-  <!ENTITY chap.audit		SYSTEM "audit/chapter.sgml">
+  <!ENTITY chap.audit		SYSTEM "audit/chapter.xml">
 ]]>
 <![%chap.disks;[
-  <!ENTITY chap.disks		SYSTEM "disks/chapter.sgml">
+  <!ENTITY chap.disks		SYSTEM "disks/chapter.xml">
 ]]>
 <![%chap.geom;[
-  <!ENTITY chap.geom		SYSTEM "geom/chapter.sgml">
+  <!ENTITY chap.geom		SYSTEM "geom/chapter.xml">
 ]]>
 <![%chap.filesystems;[
-  <!ENTITY chap.filesystems	SYSTEM "filesystems/chapter.sgml">
+  <!ENTITY chap.filesystems	SYSTEM "filesystems/chapter.xml">
 ]]>
 <![%chap.vinum;[
-  <!ENTITY chap.vinum		SYSTEM "vinum/chapter.sgml">
+  <!ENTITY chap.vinum		SYSTEM "vinum/chapter.xml">
 ]]>
 <![%chap.virtualization;[
-  <!ENTITY chap.virtualization	SYSTEM "virtualization/chapter.sgml">
+  <!ENTITY chap.virtualization	SYSTEM "virtualization/chapter.xml">
 ]]>
 <![%chap.l10n;[
-  <!ENTITY chap.l10n		SYSTEM "l10n/chapter.sgml">
+  <!ENTITY chap.l10n		SYSTEM "l10n/chapter.xml">
 ]]>
 <![%chap.cutting-edge;[
-  <!ENTITY chap.cutting-edge	SYSTEM "cutting-edge/chapter.sgml">
+  <!ENTITY chap.cutting-edge	SYSTEM "cutting-edge/chapter.xml">
 ]]>
 <![%chap.dtrace;[
-  <!ENTITY chap.dtrace		SYSTEM "dtrace/chapter.sgml">
+  <!ENTITY chap.dtrace		SYSTEM "dtrace/chapter.xml">
 ]]>
 
 <!-- Part Four -->
 <![%chap.serialcomms;[
-  <!ENTITY chap.serialcomms	SYSTEM "serialcomms/chapter.sgml">
+  <!ENTITY chap.serialcomms	SYSTEM "serialcomms/chapter.xml">
 ]]>
 <![%chap.ppp-and-slip;[
-  <!ENTITY chap.ppp-and-slip	SYSTEM "ppp-and-slip/chapter.sgml">
+  <!ENTITY chap.ppp-and-slip	SYSTEM "ppp-and-slip/chapter.xml">
 ]]>
 <![%chap.mail;[
-  <!ENTITY chap.mail		SYSTEM "mail/chapter.sgml">
+  <!ENTITY chap.mail		SYSTEM "mail/chapter.xml">
 ]]>
 <![%chap.network-servers;[
-  <!ENTITY chap.network-servers	SYSTEM "network-servers/chapter.sgml">
+  <!ENTITY chap.network-servers	SYSTEM "network-servers/chapter.xml">
 ]]>
 <![%chap.firewalls;[
-  <!ENTITY chap.firewalls	SYSTEM "firewalls/chapter.sgml">
+  <!ENTITY chap.firewalls	SYSTEM "firewalls/chapter.xml">
 ]]>
 <![%chap.advanced-networking;[
-  <!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.sgml">
+  <!ENTITY chap.advanced-networking	SYSTEM "advanced-networking/chapter.xml">
 ]]>
 
 <!-- Part Five (appendices) -->
 <![%chap.mirrors;[
-  <!ENTITY chap.mirrors		SYSTEM "mirrors/chapter.sgml">
+  <!ENTITY chap.mirrors		SYSTEM "mirrors/chapter.xml">
 ]]>
 <![%chap.mirrors.ftp.inc;[
-  <!ENTITY chap.mirrors.ftp.inc	SYSTEM "mirrors.sgml.ftp.inc">
+  <!ENTITY chap.mirrors.ftp.inc	SYSTEM "mirrors.xml.ftp.inc">
 ]]>
 <![%chap.mirrors.cvsup.inc;[
-  <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.sgml.cvsup.inc">
+  <!ENTITY chap.mirrors.cvsup.inc	SYSTEM "mirrors.xml.cvsup.inc">
 ]]>
 <![%chap.bibliography;[
-  <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.sgml">
+  <!ENTITY chap.bibliography	SYSTEM "bibliography/chapter.xml">
 ]]>
 <![%chap.eresources;[
-  <!ENTITY chap.eresources	SYSTEM "eresources/chapter.sgml">
+  <!ENTITY chap.eresources	SYSTEM "eresources/chapter.xml">
 ]]>
 <![%chap.eresources.www.inc;[
-  <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.sgml.www.inc">
+  <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
 ]]>
 <![%chap.pgpkeys;[
-  <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.sgml">
+  <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
 ]]>
 <![%chap.freebsd-glossary;[
   <!ENTITY chap.freebsd-glossary	"&freebsd-glossary;">
 ]]>
 <![%chap.index;[
-  <!ENTITY chap.index		SYSTEM "index.sgml">
+  <!ENTITY chap.index		SYSTEM "index.xml">
 ]]>
 
-<!ENTITY chap.colophon	SYSTEM "colophon.sgml">
+<!ENTITY chap.colophon	SYSTEM "colophon.xml">
 
 <!-- IGNORE cases -->
 
diff --git a/en_US.ISO8859-1/books/handbook/colophon.sgml b/en_US.ISO8859-1/books/handbook/colophon.xml
index 18d093364b..18d093364b 100644
--- a/en_US.ISO8859-1/books/handbook/colophon.sgml
+++ b/en_US.ISO8859-1/books/handbook/colophon.xml
diff --git a/en_US.ISO8859-1/books/handbook/config/Makefile b/en_US.ISO8859-1/books/handbook/config/Makefile
index 40c8e11572..0167936e03 100644
--- a/en_US.ISO8859-1/books/handbook/config/Makefile
+++ b/en_US.ISO8859-1/books/handbook/config/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	config/chapter.sgml
+CHAPTERS= 	config/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.sgml b/en_US.ISO8859-1/books/handbook/config/chapter.xml
index 8ba2d28e7f..43f5b1ebab 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.xml
@@ -929,7 +929,7 @@ dc1: [ITHREAD]</screen>
 	</indexterm>
 <!-- We should probably omit the expanded name, and add a <see> entry
 for it.  Whatever is done must also be done to the same indexterm in
-linuxemu/chapter.sgml -->
+linuxemu/chapter.xml -->
 
 	<para>Unfortunately, there are still many vendors that do not
 	  provide schematics for their drivers to the open source
diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile b/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile
index 29da7845dd..91cfee8044 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	cutting-edge/chapter.sgml
+CHAPTERS= 	cutting-edge/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index f32ff4680d..f32ff4680d 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/desktop/Makefile b/en_US.ISO8859-1/books/handbook/desktop/Makefile
index 6dd222f080..e8ccd090f7 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/Makefile
+++ b/en_US.ISO8859-1/books/handbook/desktop/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	desktop/chapter.sgml
+CHAPTERS= 	desktop/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
index c7b5e1ca4e..c7b5e1ca4e 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/disks/Makefile b/en_US.ISO8859-1/books/handbook/disks/Makefile
index 140975c79e..f685035ccc 100644
--- a/en_US.ISO8859-1/books/handbook/disks/Makefile
+++ b/en_US.ISO8859-1/books/handbook/disks/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	disks/chapter.sgml
+CHAPTERS= 	disks/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
index 99156deaa8..99156deaa8 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/dtrace/Makefile b/en_US.ISO8859-1/books/handbook/dtrace/Makefile
index 0a0e6e03dc..f766c4c4df 100644
--- a/en_US.ISO8859-1/books/handbook/dtrace/Makefile
+++ b/en_US.ISO8859-1/books/handbook/dtrace/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	dtrace/chapter.sgml
+CHAPTERS= 	dtrace/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml b/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
index 5bbc4a08de..5bbc4a08de 100644
--- a/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/eresources/Makefile b/en_US.ISO8859-1/books/handbook/eresources/Makefile
index cb030a0162..ecd3e9cff0 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/Makefile
+++ b/en_US.ISO8859-1/books/handbook/eresources/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	eresources/chapter.sgml
+CHAPTERS= 	eresources/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
index a9744a272c..a9744a272c 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/filesystems/Makefile b/en_US.ISO8859-1/books/handbook/filesystems/Makefile
index 499d815d22..81806c414c 100644
--- a/en_US.ISO8859-1/books/handbook/filesystems/Makefile
+++ b/en_US.ISO8859-1/books/handbook/filesystems/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	filesystems/chapter.sgml
+CHAPTERS= 	filesystems/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml b/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
index cf3ad85d5d..cf3ad85d5d 100644
--- a/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/Makefile b/en_US.ISO8859-1/books/handbook/firewalls/Makefile
index 331f5bf8ec..9320a51f68 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/Makefile
+++ b/en_US.ISO8859-1/books/handbook/firewalls/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	firewalls/chapter.sgml
+CHAPTERS= 	firewalls/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
index f84d9aaddf..f84d9aaddf 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/geom/Makefile b/en_US.ISO8859-1/books/handbook/geom/Makefile
index 59e5759cdc..f574c00011 100644
--- a/en_US.ISO8859-1/books/handbook/geom/Makefile
+++ b/en_US.ISO8859-1/books/handbook/geom/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	geom/chapter.sgml
+CHAPTERS= 	geom/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.sgml b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
index ff7ec9a29e..ff7ec9a29e 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/install/Makefile b/en_US.ISO8859-1/books/handbook/install/Makefile
index 738cdb647d..9ca79617b2 100644
--- a/en_US.ISO8859-1/books/handbook/install/Makefile
+++ b/en_US.ISO8859-1/books/handbook/install/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	install/chapter.sgml
+CHAPTERS= 	install/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.sgml b/en_US.ISO8859-1/books/handbook/install/chapter.xml
index 6e43a0518a..6e43a0518a 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/introduction/Makefile b/en_US.ISO8859-1/books/handbook/introduction/Makefile
index 4c22f7ce8a..db1a5173b2 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/Makefile
+++ b/en_US.ISO8859-1/books/handbook/introduction/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	introduction/chapter.sgml
+CHAPTERS= 	introduction/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
index c36ee52aa7..c36ee52aa7 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/jails/chapter.sgml b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
index 71cf55c7f3..71cf55c7f3 100644
--- a/en_US.ISO8859-1/books/handbook/jails/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/jails/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile b/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile
index 95839d340a..e2c2e5cdf0 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	kernelconfig/chapter.sgml
+CHAPTERS= 	kernelconfig/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 095e1a69dd..095e1a69dd 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/l10n/Makefile b/en_US.ISO8859-1/books/handbook/l10n/Makefile
index c6741a2341..45d3429ab1 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/Makefile
+++ b/en_US.ISO8859-1/books/handbook/l10n/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	l10n/chapter.sgml
+CHAPTERS= 	l10n/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
index 8fe790686f..8fe790686f 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/Makefile b/en_US.ISO8859-1/books/handbook/linuxemu/Makefile
index 37adfa9af6..a477216e72 100644
--- a/en_US.ISO8859-1/books/handbook/linuxemu/Makefile
+++ b/en_US.ISO8859-1/books/handbook/linuxemu/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	linuxemu/chapter.sgml
+CHAPTERS= 	linuxemu/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
index b9c42c0b42..b9c42c0b42 100644
--- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/mac/Makefile b/en_US.ISO8859-1/books/handbook/mac/Makefile
index 74aca4172f..ecd40cd7e2 100644
--- a/en_US.ISO8859-1/books/handbook/mac/Makefile
+++ b/en_US.ISO8859-1/books/handbook/mac/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mac/chapter.sgml
+CHAPTERS= 	mac/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/mac/chapter.sgml b/en_US.ISO8859-1/books/handbook/mac/chapter.xml
index f94e9d5aa1..f94e9d5aa1 100644
--- a/en_US.ISO8859-1/books/handbook/mac/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mac/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/mail/Makefile b/en_US.ISO8859-1/books/handbook/mail/Makefile
index 538dff091f..6138758090 100644
--- a/en_US.ISO8859-1/books/handbook/mail/Makefile
+++ b/en_US.ISO8859-1/books/handbook/mail/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mail/chapter.sgml
+CHAPTERS= 	mail/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
index 5a5c57de21..5a5c57de21 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/Makefile b/en_US.ISO8859-1/books/handbook/mirrors/Makefile
index ad5c0e2abe..9197ba315d 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/Makefile
+++ b/en_US.ISO8859-1/books/handbook/mirrors/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mirrors/chapter.sgml
+CHAPTERS= 	mirrors/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index f7421e5581..f7421e5581 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/multimedia/Makefile b/en_US.ISO8859-1/books/handbook/multimedia/Makefile
index f90e1cd2b0..d645e14d83 100644
--- a/en_US.ISO8859-1/books/handbook/multimedia/Makefile
+++ b/en_US.ISO8859-1/books/handbook/multimedia/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	multimedia/chapter.sgml
+CHAPTERS= 	multimedia/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
index 6856ac9abe..6856ac9abe 100644
--- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/Makefile b/en_US.ISO8859-1/books/handbook/network-servers/Makefile
index 150dbe3121..8f39ebad57 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/Makefile
+++ b/en_US.ISO8859-1/books/handbook/network-servers/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	network-servers/chapter.sgml
+CHAPTERS= 	network-servers/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index 44c3233cf4..44c3233cf4 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile b/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile
index 7c61203aff..caba57d9a4 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	pgpkeys/chapter.sgml
+CHAPTERS= 	pgpkeys/chapter.xml
 
 PGPKEYS!=	perl -ne 'm/\"([\w-]+.key)\"/ && print "$$1\n"' \
 		    ${DOC_PREFIX}/share/pgpkeys/pgpkeys.ent
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index ecd7b81155..ecd7b81155 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/ports/Makefile b/en_US.ISO8859-1/books/handbook/ports/Makefile
index 93280bcae8..f5ebfe0a14 100644
--- a/en_US.ISO8859-1/books/handbook/ports/Makefile
+++ b/en_US.ISO8859-1/books/handbook/ports/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	ports/chapter.sgml
+CHAPTERS= 	ports/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
index 05fe018a4b..05fe018a4b 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile b/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile
index 1a44fcbd0c..4026603f90 100644
--- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile
+++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	ppp-and-slip/chapter.sgml
+CHAPTERS= 	ppp-and-slip/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index 24ea0b2498..24ea0b2498 100644
--- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/preface/preface.sgml b/en_US.ISO8859-1/books/handbook/preface/preface.xml
index 1f9ecf4534..1f9ecf4534 100644
--- a/en_US.ISO8859-1/books/handbook/preface/preface.sgml
+++ b/en_US.ISO8859-1/books/handbook/preface/preface.xml
diff --git a/en_US.ISO8859-1/books/handbook/printing/Makefile b/en_US.ISO8859-1/books/handbook/printing/Makefile
index 72d9e9b80a..cbf5a174cc 100644
--- a/en_US.ISO8859-1/books/handbook/printing/Makefile
+++ b/en_US.ISO8859-1/books/handbook/printing/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	printing/chapter.sgml
+CHAPTERS= 	printing/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/printing/chapter.sgml b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
index 540f91c64d..540f91c64d 100644
--- a/en_US.ISO8859-1/books/handbook/printing/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/printing/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/security/Makefile b/en_US.ISO8859-1/books/handbook/security/Makefile
index bbf01aa7ab..3524819d48 100644
--- a/en_US.ISO8859-1/books/handbook/security/Makefile
+++ b/en_US.ISO8859-1/books/handbook/security/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	security/chapter.sgml
+CHAPTERS= 	security/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.sgml b/en_US.ISO8859-1/books/handbook/security/chapter.xml
index 7f6ff6cab4..7f6ff6cab4 100644
--- a/en_US.ISO8859-1/books/handbook/security/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/security/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/serialcomms/Makefile b/en_US.ISO8859-1/books/handbook/serialcomms/Makefile
index b83d9a27bb..3dbd97ce6d 100644
--- a/en_US.ISO8859-1/books/handbook/serialcomms/Makefile
+++ b/en_US.ISO8859-1/books/handbook/serialcomms/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	serialcomms/chapter.sgml
+CHAPTERS= 	serialcomms/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 5dc07269b4..5dc07269b4 100644
--- a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/users/Makefile b/en_US.ISO8859-1/books/handbook/users/Makefile
index dfa2918b7b..b44bd80628 100644
--- a/en_US.ISO8859-1/books/handbook/users/Makefile
+++ b/en_US.ISO8859-1/books/handbook/users/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	users/chapter.sgml
+CHAPTERS= 	users/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.sgml b/en_US.ISO8859-1/books/handbook/users/chapter.xml
index bad97251c8..bad97251c8 100644
--- a/en_US.ISO8859-1/books/handbook/users/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/users/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/vinum/Makefile b/en_US.ISO8859-1/books/handbook/vinum/Makefile
index eca585a9aa..b970524581 100644
--- a/en_US.ISO8859-1/books/handbook/vinum/Makefile
+++ b/en_US.ISO8859-1/books/handbook/vinum/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	vinum/chapter.sgml
+CHAPTERS= 	vinum/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
index a631b66326..a631b66326 100644
--- a/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/Makefile b/en_US.ISO8859-1/books/handbook/virtualization/Makefile
index 4c89488e9c..7f5a1fd58b 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/Makefile
+++ b/en_US.ISO8859-1/books/handbook/virtualization/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	virtualization/chapter.sgml
+CHAPTERS= 	virtualization/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
index 33fb8e1608..3960c880d8 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -1075,7 +1075,7 @@ EndSection</programlisting>
 &lt;!--
 # Sun VirtualBox
 # Hal driver description for the vboxmouse driver
-# $Id: chapter.sgml,v 1.33 2012-03-17 04:53:52 eadler Exp $
+# $Id: chapter.xml,v 1.33 2012-03-17 04:53:52 eadler Exp $
 
 	Copyright (C) 2008-2009 Sun Microsystems, Inc.
 
diff --git a/en_US.ISO8859-1/books/handbook/x11/Makefile b/en_US.ISO8859-1/books/handbook/x11/Makefile
index 06b452cd33..040a7ae2b2 100644
--- a/en_US.ISO8859-1/books/handbook/x11/Makefile
+++ b/en_US.ISO8859-1/books/handbook/x11/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	x11/chapter.sgml
+CHAPTERS= 	x11/chapter.xml
 
 VPATH=		..
 
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
index 188155f246..188155f246 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
diff --git a/en_US.ISO8859-1/books/pmake/Makefile b/en_US.ISO8859-1/books/pmake/Makefile
index 7083aa1814..c1c4e60a94 100644
--- a/en_US.ISO8859-1/books/pmake/Makefile
+++ b/en_US.ISO8859-1/books/pmake/Makefile
@@ -16,13 +16,13 @@ INSTALL_ONLY_COMPRESSED?=
 # Changes to any of these files will force a rebuild.
 
 # SGML content
-SRCS=	book.sgml
-SRCS+=	answers/chapter.sgml
-SRCS+=	basics/chapter.sgml
-SRCS+=	glossary/glossary.sgml
-SRCS+=	gods/chapter.sgml
-SRCS+=	intro/chapter.sgml
-SRCS+=	shortcuts/chapter.sgml
+SRCS=	book.xml
+SRCS+=	answers/chapter.xml
+SRCS+=	basics/chapter.xml
+SRCS+=	glossary/glossary.xml
+SRCS+=	gods/chapter.xml
+SRCS+=	intro/chapter.xml
+SRCS+=	shortcuts/chapter.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/pmake/answers/chapter.sgml b/en_US.ISO8859-1/books/pmake/answers/chapter.xml
index e3f96181fa..e3f96181fa 100644
--- a/en_US.ISO8859-1/books/pmake/answers/chapter.sgml
+++ b/en_US.ISO8859-1/books/pmake/answers/chapter.xml
diff --git a/en_US.ISO8859-1/books/pmake/basics/chapter.sgml b/en_US.ISO8859-1/books/pmake/basics/chapter.xml
index 12df062549..12df062549 100644
--- a/en_US.ISO8859-1/books/pmake/basics/chapter.sgml
+++ b/en_US.ISO8859-1/books/pmake/basics/chapter.xml
diff --git a/en_US.ISO8859-1/books/pmake/book.sgml b/en_US.ISO8859-1/books/pmake/book.xml
index ee8f643b11..ee8f643b11 100644
--- a/en_US.ISO8859-1/books/pmake/book.sgml
+++ b/en_US.ISO8859-1/books/pmake/book.xml
diff --git a/en_US.ISO8859-1/books/pmake/chapters.ent b/en_US.ISO8859-1/books/pmake/chapters.ent
index 85a641eda4..709d6a73f3 100644
--- a/en_US.ISO8859-1/books/pmake/chapters.ent
+++ b/en_US.ISO8859-1/books/pmake/chapters.ent
@@ -5,10 +5,10 @@
      $FreeBSD$
 -->
 
-<!ENTITY legalnotice      SYSTEM "legalnotice.sgml">
-<!ENTITY chap.intro       SYSTEM "intro/chapter.sgml">
-<!ENTITY chap.basics      SYSTEM "basics/chapter.sgml">
-<!ENTITY chap.shortcuts   SYSTEM "shortcuts/chapter.sgml">
-<!ENTITY chap.gods        SYSTEM "gods/chapter.sgml">
-<!ENTITY chap.answers     SYSTEM "answers/chapter.sgml">
-<!ENTITY glossary         SYSTEM "glossary/glossary.sgml">
+<!ENTITY legalnotice      SYSTEM "legalnotice.xml">
+<!ENTITY chap.intro       SYSTEM "intro/chapter.xml">
+<!ENTITY chap.basics      SYSTEM "basics/chapter.xml">
+<!ENTITY chap.shortcuts   SYSTEM "shortcuts/chapter.xml">
+<!ENTITY chap.gods        SYSTEM "gods/chapter.xml">
+<!ENTITY chap.answers     SYSTEM "answers/chapter.xml">
+<!ENTITY glossary         SYSTEM "glossary/glossary.xml">
diff --git a/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml b/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
index 9b59545ea8..9b59545ea8 100644
--- a/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml
+++ b/en_US.ISO8859-1/books/pmake/glossary/glossary.xml
diff --git a/en_US.ISO8859-1/books/pmake/gods/chapter.sgml b/en_US.ISO8859-1/books/pmake/gods/chapter.xml
index bc57aba8c9..bc57aba8c9 100644
--- a/en_US.ISO8859-1/books/pmake/gods/chapter.sgml
+++ b/en_US.ISO8859-1/books/pmake/gods/chapter.xml
diff --git a/en_US.ISO8859-1/books/pmake/intro/chapter.sgml b/en_US.ISO8859-1/books/pmake/intro/chapter.xml
index 39597afc0b..39597afc0b 100644
--- a/en_US.ISO8859-1/books/pmake/intro/chapter.sgml
+++ b/en_US.ISO8859-1/books/pmake/intro/chapter.xml
diff --git a/en_US.ISO8859-1/books/pmake/legalnotice.sgml b/en_US.ISO8859-1/books/pmake/legalnotice.xml
index d443019036..d443019036 100644
--- a/en_US.ISO8859-1/books/pmake/legalnotice.sgml
+++ b/en_US.ISO8859-1/books/pmake/legalnotice.xml
diff --git a/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml b/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
index 417e3b65a5..417e3b65a5 100644
--- a/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml
+++ b/en_US.ISO8859-1/books/pmake/shortcuts/chapter.xml
diff --git a/en_US.ISO8859-1/books/porters-handbook/Makefile b/en_US.ISO8859-1/books/porters-handbook/Makefile
index 3ea1b0637a..e90f27f118 100644
--- a/en_US.ISO8859-1/books/porters-handbook/Makefile
+++ b/en_US.ISO8859-1/books/porters-handbook/Makefile
@@ -19,7 +19,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 # Use the local DSSSL file
 DSLHTML?= 	${.CURDIR}/freebsd.dsl
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.xml
index 4f88188d97..4f88188d97 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.xml
diff --git a/en_US.ISO8859-1/htdocs/Makefile b/en_US.ISO8859-1/htdocs/Makefile
index 9611b39fde..ee360af9d6 100644
--- a/en_US.ISO8859-1/htdocs/Makefile
+++ b/en_US.ISO8859-1/htdocs/Makefile
@@ -9,22 +9,22 @@
 
 # These are turned into validated, normalized HTML files.
 
-DOCS=  about.sgml
-DOCS+= administration.sgml
-DOCS+= applications.sgml
-DOCS+= art.sgml
-DOCS+= availability.sgml
-DOCS+= docs.sgml
-DOCS+= features.sgml
-DOCS+= internet.sgml
-DOCS+= logo.sgml
-DOCS+= mailto.sgml
-DOCS+= privacy.sgml
-DOCS+= publish.sgml
-DOCS+= relnotes.sgml
-DOCS+= send-pr.sgml
-DOCS+= support.sgml
-DOCS+= where.sgml
+DOCS=  about.xml
+DOCS+= administration.xml
+DOCS+= applications.xml
+DOCS+= art.xml
+DOCS+= availability.xml
+DOCS+= docs.xml
+DOCS+= features.xml
+DOCS+= internet.xml
+DOCS+= logo.xml
+DOCS+= mailto.xml
+DOCS+= privacy.xml
+DOCS+= publish.xml
+DOCS+= relnotes.xml
+DOCS+= send-pr.xml
+DOCS+= support.xml
+DOCS+= where.xml
 
 XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
 DEPENDSET.index=transtable mirrors news press events \
diff --git a/en_US.ISO8859-1/htdocs/about.sgml b/en_US.ISO8859-1/htdocs/about.xml
index 53cbb4c593..53cbb4c593 100644
--- a/en_US.ISO8859-1/htdocs/about.sgml
+++ b/en_US.ISO8859-1/htdocs/about.xml
diff --git a/en_US.ISO8859-1/htdocs/administration.sgml b/en_US.ISO8859-1/htdocs/administration.xml
index 37e4032e73..37e4032e73 100644
--- a/en_US.ISO8859-1/htdocs/administration.sgml
+++ b/en_US.ISO8859-1/htdocs/administration.xml
diff --git a/en_US.ISO8859-1/htdocs/advocacy/Makefile b/en_US.ISO8859-1/htdocs/advocacy/Makefile
index f0b7db1329..bab4fe2d5b 100644
--- a/en_US.ISO8859-1/htdocs/advocacy/Makefile
+++ b/en_US.ISO8859-1/htdocs/advocacy/Makefile
@@ -9,7 +9,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   index.sgml
-DOCS+=	myths.sgml
-DOCS+=	whyusefreebsd.sgml
+DOCS=   index.xml
+DOCS+=	myths.xml
+DOCS+=	whyusefreebsd.xml
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/advocacy/index.sgml b/en_US.ISO8859-1/htdocs/advocacy/index.xml
index bff706bb2c..bff706bb2c 100644
--- a/en_US.ISO8859-1/htdocs/advocacy/index.sgml
+++ b/en_US.ISO8859-1/htdocs/advocacy/index.xml
diff --git a/en_US.ISO8859-1/htdocs/advocacy/myths.sgml b/en_US.ISO8859-1/htdocs/advocacy/myths.xml
index d1f7846837..d1f7846837 100644
--- a/en_US.ISO8859-1/htdocs/advocacy/myths.sgml
+++ b/en_US.ISO8859-1/htdocs/advocacy/myths.xml
diff --git a/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.sgml b/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml
index f72be7d167..f72be7d167 100644
--- a/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.sgml
+++ b/en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.xml
diff --git a/en_US.ISO8859-1/htdocs/applications.sgml b/en_US.ISO8859-1/htdocs/applications.xml
index 2a89fb4e27..2a89fb4e27 100644
--- a/en_US.ISO8859-1/htdocs/applications.sgml
+++ b/en_US.ISO8859-1/htdocs/applications.xml
diff --git a/en_US.ISO8859-1/htdocs/art.sgml b/en_US.ISO8859-1/htdocs/art.xml
index a9926a7de0..a9926a7de0 100644
--- a/en_US.ISO8859-1/htdocs/art.sgml
+++ b/en_US.ISO8859-1/htdocs/art.xml
diff --git a/en_US.ISO8859-1/htdocs/availability.sgml b/en_US.ISO8859-1/htdocs/availability.xml
index fefd29c072..fefd29c072 100644
--- a/en_US.ISO8859-1/htdocs/availability.sgml
+++ b/en_US.ISO8859-1/htdocs/availability.xml
diff --git a/en_US.ISO8859-1/htdocs/commercial/Makefile b/en_US.ISO8859-1/htdocs/commercial/Makefile
index f7dbc41c84..85931b10c4 100644
--- a/en_US.ISO8859-1/htdocs/commercial/Makefile
+++ b/en_US.ISO8859-1/htdocs/commercial/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=		commercial.sgml
+DOCS=		commercial.xml
 INDEXLINK=	commercial.html
 
 XSLT.DEFAULT=		${XSL_ENTRIES}
diff --git a/en_US.ISO8859-1/htdocs/commercial/commercial.sgml b/en_US.ISO8859-1/htdocs/commercial/commercial.xml
index 5a64d51437..5a64d51437 100644
--- a/en_US.ISO8859-1/htdocs/commercial/commercial.sgml
+++ b/en_US.ISO8859-1/htdocs/commercial/commercial.xml
diff --git a/en_US.ISO8859-1/htdocs/community/Makefile b/en_US.ISO8859-1/htdocs/community/Makefile
index 3e223c07f2..252dcebfca 100644
--- a/en_US.ISO8859-1/htdocs/community/Makefile
+++ b/en_US.ISO8859-1/htdocs/community/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   irc.sgml mailinglists.sgml newsgroups.sgml social.sgml webresources.sgml
+DOCS=   irc.xml mailinglists.xml newsgroups.xml social.xml webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/community/irc.sgml b/en_US.ISO8859-1/htdocs/community/irc.xml
index 67f196447e..67f196447e 100644
--- a/en_US.ISO8859-1/htdocs/community/irc.sgml
+++ b/en_US.ISO8859-1/htdocs/community/irc.xml
diff --git a/en_US.ISO8859-1/htdocs/community/mailinglists.sgml b/en_US.ISO8859-1/htdocs/community/mailinglists.xml
index be90472f15..be90472f15 100644
--- a/en_US.ISO8859-1/htdocs/community/mailinglists.sgml
+++ b/en_US.ISO8859-1/htdocs/community/mailinglists.xml
diff --git a/en_US.ISO8859-1/htdocs/community/newsgroups.sgml b/en_US.ISO8859-1/htdocs/community/newsgroups.xml
index 62e04e1d5d..62e04e1d5d 100644
--- a/en_US.ISO8859-1/htdocs/community/newsgroups.sgml
+++ b/en_US.ISO8859-1/htdocs/community/newsgroups.xml
diff --git a/en_US.ISO8859-1/htdocs/community/social.sgml b/en_US.ISO8859-1/htdocs/community/social.xml
index 0393e888a4..0393e888a4 100644
--- a/en_US.ISO8859-1/htdocs/community/social.sgml
+++ b/en_US.ISO8859-1/htdocs/community/social.xml
diff --git a/en_US.ISO8859-1/htdocs/community/webresources.sgml b/en_US.ISO8859-1/htdocs/community/webresources.xml
index 2c9190d5b0..2c9190d5b0 100644
--- a/en_US.ISO8859-1/htdocs/community/webresources.sgml
+++ b/en_US.ISO8859-1/htdocs/community/webresources.xml
diff --git a/en_US.ISO8859-1/htdocs/copyright/Makefile b/en_US.ISO8859-1/htdocs/copyright/Makefile
index 8c90f7d2e8..d413430158 100644
--- a/en_US.ISO8859-1/htdocs/copyright/Makefile
+++ b/en_US.ISO8859-1/htdocs/copyright/Makefile
@@ -7,12 +7,12 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	copyright.sgml
-DOCS+=	daemon.sgml
-DOCS+=	freebsd-doc-license.sgml
-DOCS+=	freebsd-license.sgml
-DOCS+=	license.sgml
-DOCS+=	trademarks.sgml
+DOCS=	copyright.xml
+DOCS+=	daemon.xml
+DOCS+=	freebsd-doc-license.xml
+DOCS+=	freebsd-license.xml
+DOCS+=	license.xml
+DOCS+=	trademarks.xml
 
 INDEXLINK= copyright.html
 
diff --git a/en_US.ISO8859-1/htdocs/copyright/copyright.sgml b/en_US.ISO8859-1/htdocs/copyright/copyright.xml
index d0baad6329..d0baad6329 100644
--- a/en_US.ISO8859-1/htdocs/copyright/copyright.sgml
+++ b/en_US.ISO8859-1/htdocs/copyright/copyright.xml
diff --git a/en_US.ISO8859-1/htdocs/copyright/daemon.sgml b/en_US.ISO8859-1/htdocs/copyright/daemon.xml
index 46613bcc0e..46613bcc0e 100644
--- a/en_US.ISO8859-1/htdocs/copyright/daemon.sgml
+++ b/en_US.ISO8859-1/htdocs/copyright/daemon.xml
diff --git a/en_US.ISO8859-1/htdocs/copyright/freebsd-doc-license.sgml b/en_US.ISO8859-1/htdocs/copyright/freebsd-doc-license.xml
index 70c7b2dfe4..70c7b2dfe4 100644
--- a/en_US.ISO8859-1/htdocs/copyright/freebsd-doc-license.sgml
+++ b/en_US.ISO8859-1/htdocs/copyright/freebsd-doc-license.xml
diff --git a/en_US.ISO8859-1/htdocs/copyright/freebsd-license.sgml b/en_US.ISO8859-1/htdocs/copyright/freebsd-license.xml
index bfeea6d134..bfeea6d134 100644
--- a/en_US.ISO8859-1/htdocs/copyright/freebsd-license.sgml
+++ b/en_US.ISO8859-1/htdocs/copyright/freebsd-license.xml
diff --git a/en_US.ISO8859-1/htdocs/copyright/license.sgml b/en_US.ISO8859-1/htdocs/copyright/license.xml
index 1d6f9f4b1c..1d6f9f4b1c 100644
--- a/en_US.ISO8859-1/htdocs/copyright/license.sgml
+++ b/en_US.ISO8859-1/htdocs/copyright/license.xml
diff --git a/en_US.ISO8859-1/htdocs/copyright/trademarks.sgml b/en_US.ISO8859-1/htdocs/copyright/trademarks.xml
index 2bffc77f06..2bffc77f06 100644
--- a/en_US.ISO8859-1/htdocs/copyright/trademarks.sgml
+++ b/en_US.ISO8859-1/htdocs/copyright/trademarks.xml
diff --git a/en_US.ISO8859-1/htdocs/developers/Makefile b/en_US.ISO8859-1/htdocs/developers/Makefile
index 51f47e016e..53ec6af133 100644
--- a/en_US.ISO8859-1/htdocs/developers/Makefile
+++ b/en_US.ISO8859-1/htdocs/developers/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   cvs.sgml
+DOCS=   cvs.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/developers/cvs.sgml b/en_US.ISO8859-1/htdocs/developers/cvs.xml
index 627e209852..627e209852 100644
--- a/en_US.ISO8859-1/htdocs/developers/cvs.sgml
+++ b/en_US.ISO8859-1/htdocs/developers/cvs.xml
diff --git a/en_US.ISO8859-1/htdocs/docproj/Makefile b/en_US.ISO8859-1/htdocs/docproj/Makefile
index 6a61571c35..8757e591e4 100644
--- a/en_US.ISO8859-1/htdocs/docproj/Makefile
+++ b/en_US.ISO8859-1/htdocs/docproj/Makefile
@@ -7,16 +7,16 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   current.sgml
-DOCS+=	doc-set.sgml
-DOCS+=	handbook.sgml
-DOCS+=	handbook3.sgml
-DOCS+=  sgml.sgml
-DOCS+=  submitting.sgml
-DOCS+=  who.sgml
-DOCS+=  translations.sgml
-DOCS+=	docproj.sgml
-DOCS+=	todo.sgml
+DOCS=   current.xml
+DOCS+=	doc-set.xml
+DOCS+=	handbook.xml
+DOCS+=	handbook3.xml
+DOCS+=  sgml.xml
+DOCS+=  submitting.xml
+DOCS+=  who.xml
+DOCS+=  translations.xml
+DOCS+=	docproj.xml
+DOCS+=	todo.xml
 
 INDEXLINK= docproj.html
 
diff --git a/en_US.ISO8859-1/htdocs/docproj/current.sgml b/en_US.ISO8859-1/htdocs/docproj/current.xml
index bafcf569e8..91e2036a81 100644
--- a/en_US.ISO8859-1/htdocs/docproj/current.sgml
+++ b/en_US.ISO8859-1/htdocs/docproj/current.xml
@@ -86,7 +86,7 @@
       task is highly encouraged to carefully read through the existing
       (print-output) index, and to have read the Chicago Manual of
       Style or other style books that deal with indexing.  Please see
-      the CVS history of some of the chapter.sgml files to see some of
+      the CVS history of some of the chapter.xml files to see some of
       the indexing errors that have been corrected in the past.
       It is imperative to view the PostScript version of the Handbook
       after making any changes to indexterms as many errors, such as
diff --git a/en_US.ISO8859-1/htdocs/docproj/doc-set.sgml b/en_US.ISO8859-1/htdocs/docproj/doc-set.xml
index 0cdc648a68..0cdc648a68 100644
--- a/en_US.ISO8859-1/htdocs/docproj/doc-set.sgml
+++ b/en_US.ISO8859-1/htdocs/docproj/doc-set.xml
diff --git a/en_US.ISO8859-1/htdocs/docproj/docproj.sgml b/en_US.ISO8859-1/htdocs/docproj/docproj.xml
index 078eb99349..078eb99349 100644
--- a/en_US.ISO8859-1/htdocs/docproj/docproj.sgml
+++ b/en_US.ISO8859-1/htdocs/docproj/docproj.xml
diff --git a/en_US.ISO8859-1/htdocs/docproj/handbook.sgml b/en_US.ISO8859-1/htdocs/docproj/handbook.xml
index 3e7d27c0fa..3e7d27c0fa 100644
--- a/en_US.ISO8859-1/htdocs/docproj/handbook.sgml
+++ b/en_US.ISO8859-1/htdocs/docproj/handbook.xml
diff --git a/en_US.ISO8859-1/htdocs/docproj/handbook3.sgml b/en_US.ISO8859-1/htdocs/docproj/handbook3.xml
index 0036455a70..0036455a70 100644
--- a/en_US.ISO8859-1/htdocs/docproj/handbook3.sgml
+++ b/en_US.ISO8859-1/htdocs/docproj/handbook3.xml
diff --git a/en_US.ISO8859-1/htdocs/docproj/sgml.sgml b/en_US.ISO8859-1/htdocs/docproj/sgml.xml
index c19b6d4074..c19b6d4074 100644
--- a/en_US.ISO8859-1/htdocs/docproj/sgml.sgml
+++ b/en_US.ISO8859-1/htdocs/docproj/sgml.xml
diff --git a/en_US.ISO8859-1/htdocs/docproj/submitting.sgml b/en_US.ISO8859-1/htdocs/docproj/submitting.xml
index e5c41a2a5b..626d41b428 100644
--- a/en_US.ISO8859-1/htdocs/docproj/submitting.sgml
+++ b/en_US.ISO8859-1/htdocs/docproj/submitting.xml
@@ -105,16 +105,16 @@
 
     <ol>
       <li><p>Make a copy of the file you are going to change. If you are
-	  changing <tt>foo.sgml</tt>, do</p>
+	  changing <tt>foo.xml</tt>, do</p>
 
 	<pre>
-    % <b>cp foo.sgml foo.sgml.old</b>
+    % <b>cp foo.xml foo.xml.old</b>
 	</pre></li>
 
-      <li><p>Then, make your changes to foo.sgml</p>
+      <li><p>Then, make your changes to foo.xml</p>
 
 	<pre>
-    % <b>vi foo.sgml</b>
+    % <b>vi foo.xml</b>
     ... tap tap tap ...
 
     ... test the changes, read them for typos and so on ...
@@ -123,7 +123,7 @@
       <li><p>Make the diff. The command to do this is</p>
 
 	<pre>
-    % <b>diff -u foo.sgml.old foo.sgml > foo.diff</b>
+    % <b>diff -u foo.xml.old foo.xml > foo.diff</b>
 	</pre>
 
 	<p>This looks at the difference between the two files, and writes them
diff --git a/en_US.ISO8859-1/htdocs/docproj/todo.sgml b/en_US.ISO8859-1/htdocs/docproj/todo.xml
index 0b03166767..0b03166767 100644
--- a/en_US.ISO8859-1/htdocs/docproj/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/docproj/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/docproj/translations.sgml b/en_US.ISO8859-1/htdocs/docproj/translations.xml
index ab5048c0c2..ab5048c0c2 100644
--- a/en_US.ISO8859-1/htdocs/docproj/translations.sgml
+++ b/en_US.ISO8859-1/htdocs/docproj/translations.xml
diff --git a/en_US.ISO8859-1/htdocs/docproj/who.sgml b/en_US.ISO8859-1/htdocs/docproj/who.xml
index 9bceec5002..9bceec5002 100644
--- a/en_US.ISO8859-1/htdocs/docproj/who.sgml
+++ b/en_US.ISO8859-1/htdocs/docproj/who.xml
diff --git a/en_US.ISO8859-1/htdocs/docs.sgml b/en_US.ISO8859-1/htdocs/docs.xml
index 69bb5ae489..69bb5ae489 100644
--- a/en_US.ISO8859-1/htdocs/docs.sgml
+++ b/en_US.ISO8859-1/htdocs/docs.xml
diff --git a/en_US.ISO8859-1/htdocs/docs/Makefile b/en_US.ISO8859-1/htdocs/docs/Makefile
index 3ae0c41105..fe5bc9eb24 100644
--- a/en_US.ISO8859-1/htdocs/docs/Makefile
+++ b/en_US.ISO8859-1/htdocs/docs/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   books.sgml webresources.sgml
+DOCS=   books.xml webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/docs/books.sgml b/en_US.ISO8859-1/htdocs/docs/books.xml
index 12dad2cb08..12dad2cb08 100644
--- a/en_US.ISO8859-1/htdocs/docs/books.sgml
+++ b/en_US.ISO8859-1/htdocs/docs/books.xml
diff --git a/en_US.ISO8859-1/htdocs/docs/webresources.sgml b/en_US.ISO8859-1/htdocs/docs/webresources.xml
index f8e4702bce..f8e4702bce 100644
--- a/en_US.ISO8859-1/htdocs/docs/webresources.sgml
+++ b/en_US.ISO8859-1/htdocs/docs/webresources.xml
diff --git a/en_US.ISO8859-1/htdocs/donations/Makefile b/en_US.ISO8859-1/htdocs/donations/Makefile
index fa12dccc7b..81d5dd75a3 100644
--- a/en_US.ISO8859-1/htdocs/donations/Makefile
+++ b/en_US.ISO8859-1/htdocs/donations/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   index.sgml wantlist.sgml donors.sgml
+DOCS=   index.xml wantlist.xml donors.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/donations/donors.sgml b/en_US.ISO8859-1/htdocs/donations/donors.xml
index a576edce95..a576edce95 100644
--- a/en_US.ISO8859-1/htdocs/donations/donors.sgml
+++ b/en_US.ISO8859-1/htdocs/donations/donors.xml
diff --git a/en_US.ISO8859-1/htdocs/donations/index.sgml b/en_US.ISO8859-1/htdocs/donations/index.xml
index 63bd943e6f..63bd943e6f 100644
--- a/en_US.ISO8859-1/htdocs/donations/index.sgml
+++ b/en_US.ISO8859-1/htdocs/donations/index.xml
diff --git a/en_US.ISO8859-1/htdocs/donations/wantlist.sgml b/en_US.ISO8859-1/htdocs/donations/wantlist.xml
index 94e6d7cec7..94e6d7cec7 100644
--- a/en_US.ISO8859-1/htdocs/donations/wantlist.sgml
+++ b/en_US.ISO8859-1/htdocs/donations/wantlist.xml
diff --git a/en_US.ISO8859-1/htdocs/events/2002/Makefile b/en_US.ISO8859-1/htdocs/events/2002/Makefile
index 31cabba904..275c124d80 100644
--- a/en_US.ISO8859-1/htdocs/events/2002/Makefile
+++ b/en_US.ISO8859-1/htdocs/events/2002/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	bsdcon-devsummit.sgml usenix-devsummit.sgml
+DOCS?=	bsdcon-devsummit.xml usenix-devsummit.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/events/2002/bsdcon-devsummit.sgml b/en_US.ISO8859-1/htdocs/events/2002/bsdcon-devsummit.xml
index 58934503b6..58934503b6 100644
--- a/en_US.ISO8859-1/htdocs/events/2002/bsdcon-devsummit.sgml
+++ b/en_US.ISO8859-1/htdocs/events/2002/bsdcon-devsummit.xml
diff --git a/en_US.ISO8859-1/htdocs/events/2002/usenix-devsummit.sgml b/en_US.ISO8859-1/htdocs/events/2002/usenix-devsummit.xml
index 348a2349f3..348a2349f3 100644
--- a/en_US.ISO8859-1/htdocs/events/2002/usenix-devsummit.sgml
+++ b/en_US.ISO8859-1/htdocs/events/2002/usenix-devsummit.xml
diff --git a/en_US.ISO8859-1/htdocs/events/2003/Makefile b/en_US.ISO8859-1/htdocs/events/2003/Makefile
index 838bb85fe7..6f2c91e5b3 100644
--- a/en_US.ISO8859-1/htdocs/events/2003/Makefile
+++ b/en_US.ISO8859-1/htdocs/events/2003/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	bsdcon-devsummit.sgml
+DOCS?=	bsdcon-devsummit.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/events/2003/bsdcon-devsummit.sgml b/en_US.ISO8859-1/htdocs/events/2003/bsdcon-devsummit.xml
index b03359ae04..b03359ae04 100644
--- a/en_US.ISO8859-1/htdocs/events/2003/bsdcon-devsummit.sgml
+++ b/en_US.ISO8859-1/htdocs/events/2003/bsdcon-devsummit.xml
diff --git a/en_US.ISO8859-1/htdocs/features.sgml b/en_US.ISO8859-1/htdocs/features.xml
index 7396d2efd6..7396d2efd6 100644
--- a/en_US.ISO8859-1/htdocs/features.sgml
+++ b/en_US.ISO8859-1/htdocs/features.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/Makefile b/en_US.ISO8859-1/htdocs/gnome/Makefile
index 2b347cc9ce..caf7c5dbe1 100644
--- a/en_US.ISO8859-1/htdocs/gnome/Makefile
+++ b/en_US.ISO8859-1/htdocs/gnome/Makefile
@@ -10,8 +10,8 @@
 SUBDIR=		docs
 SUBDIR+=	images
 
-DOCS=	screenshots.sgml
-DOCS+=	contact.sgml
+DOCS=	screenshots.xml
+DOCS+=	contact.xml
 
 DATA=	gnomelogalyzer.sh
 DATA+=	gnome_prefix.sh
diff --git a/en_US.ISO8859-1/htdocs/gnome/contact.sgml b/en_US.ISO8859-1/htdocs/gnome/contact.xml
index 1810ee36ff..1810ee36ff 100644
--- a/en_US.ISO8859-1/htdocs/gnome/contact.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/contact.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/Makefile b/en_US.ISO8859-1/htdocs/gnome/docs/Makefile
index 13345e7af5..b3a7bc68e1 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/Makefile
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/Makefile
@@ -7,28 +7,28 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	faq2.sgml
-DOCS+=	faq28.sgml
-DOCS+=	faq210.sgml
-DOCS+=	faq212.sgml
-DOCS+=	faq214.sgml
-DOCS+=	faq216.sgml
-DOCS+=	faq218.sgml
-DOCS+=	faq220.sgml
-DOCS+=	faq222.sgml
-DOCS+=	faq224.sgml
-DOCS+=	faq226.sgml
-DOCS+=	faq228.sgml
-DOCS+=	faq230.sgml
-DOCS+=	faq232.sgml
-DOCS+=	gnome_porting.sgml
-DOCS+=	gnome1_porting.sgml
-DOCS+=	gnome2_porting.sgml
-DOCS+=	porting.sgml
-DOCS+=	bugging.sgml
-DOCS+=  volunteer.sgml
-DOCS+=	develfaq.sgml
-DOCS+=	example-Makefile.sgml
-DOCS+=	halfaq.sgml
+DOCS=	faq2.xml
+DOCS+=	faq28.xml
+DOCS+=	faq210.xml
+DOCS+=	faq212.xml
+DOCS+=	faq214.xml
+DOCS+=	faq216.xml
+DOCS+=	faq218.xml
+DOCS+=	faq220.xml
+DOCS+=	faq222.xml
+DOCS+=	faq224.xml
+DOCS+=	faq226.xml
+DOCS+=	faq228.xml
+DOCS+=	faq230.xml
+DOCS+=	faq232.xml
+DOCS+=	gnome_porting.xml
+DOCS+=	gnome1_porting.xml
+DOCS+=	gnome2_porting.xml
+DOCS+=	porting.xml
+DOCS+=	bugging.xml
+DOCS+=  volunteer.xml
+DOCS+=	develfaq.xml
+DOCS+=	example-Makefile.xml
+DOCS+=	halfaq.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/bugging.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/bugging.xml
index 933c9c8386..933c9c8386 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/bugging.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/bugging.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml
index 7adcd30487..7adcd30487 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/example-Makefile.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/example-Makefile.xml
index 387ba69909..387ba69909 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/example-Makefile.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/example-Makefile.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq2.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq2.xml
index 1cc3f4c032..1cc3f4c032 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq2.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq2.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq210.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq210.xml
index af1957ef60..af1957ef60 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq210.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq210.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq212.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq212.xml
index 414cc38551..414cc38551 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq212.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq212.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq214.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq214.xml
index a5cf75166c..a5cf75166c 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq214.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq214.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq216.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq216.xml
index f9ffaa1f68..f9ffaa1f68 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq216.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq216.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq218.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq218.xml
index ec057d7756..ec057d7756 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq218.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq218.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq220.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq220.xml
index 5e996940b7..5e996940b7 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq220.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq220.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq222.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq222.xml
index 5ebff3019e..5ebff3019e 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq222.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq222.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq224.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq224.xml
index a61fc264f9..a61fc264f9 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq224.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq224.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq226.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq226.xml
index 6318e55216..6318e55216 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq226.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq226.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq228.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq228.xml
index db12454cd1..db12454cd1 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq228.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq228.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq230.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq230.xml
index 50ff1b26c9..50ff1b26c9 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq230.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq230.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq232.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq232.xml
index 7736f25cfb..7736f25cfb 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq232.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq232.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/faq28.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/faq28.xml
index 1fa345bcec..1fa345bcec 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/faq28.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/faq28.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/gnome1_porting.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/gnome1_porting.xml
index 0a134679ca..0a134679ca 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/gnome1_porting.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/gnome1_porting.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/gnome2_porting.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/gnome2_porting.xml
index af4785c196..af4785c196 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/gnome2_porting.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/gnome2_porting.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/gnome_porting.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/gnome_porting.xml
index 2ae6a27c4a..2ae6a27c4a 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/gnome_porting.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/gnome_porting.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/halfaq.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/halfaq.xml
index eb881053dc..eb881053dc 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/halfaq.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/halfaq.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/porting.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/porting.xml
index 9b11adfff1..9b11adfff1 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/porting.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/porting.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/docs/volunteer.sgml b/en_US.ISO8859-1/htdocs/gnome/docs/volunteer.xml
index 62b4f81a77..62b4f81a77 100644
--- a/en_US.ISO8859-1/htdocs/gnome/docs/volunteer.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/docs/volunteer.xml
diff --git a/en_US.ISO8859-1/htdocs/gnome/screenshots.sgml b/en_US.ISO8859-1/htdocs/gnome/screenshots.xml
index 36d9bd4256..36d9bd4256 100644
--- a/en_US.ISO8859-1/htdocs/gnome/screenshots.sgml
+++ b/en_US.ISO8859-1/htdocs/gnome/screenshots.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/Makefile b/en_US.ISO8859-1/htdocs/internal/Makefile
index ec16654774..b6c12264ce 100644
--- a/en_US.ISO8859-1/htdocs/internal/Makefile
+++ b/en_US.ISO8859-1/htdocs/internal/Makefile
@@ -7,25 +7,25 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS= 	about.sgml
-DOCS+=	bylaws.sgml
-DOCS+=	core-vote.sgml
-DOCS+= 	data.sgml
-DOCS+= 	developer.sgml
-DOCS+=	doceng.sgml
-DOCS+=	expire-bits.sgml
-DOCS+=	fortunes.sgml
-DOCS+=	hats.sgml
-DOCS+=	i18n.sgml
-DOCS+=	internal.sgml
-DOCS+= 	machines.sgml
-DOCS+= 	mirror.sgml
-DOCS+=	new-account.sgml
-DOCS+=	policies.sgml
-DOCS+=  releng.sgml
-DOCS+=  resources.sgml
-DOCS+=	statistic.sgml
-DOCS+=	working-with-hats.sgml
+DOCS= 	about.xml
+DOCS+=	bylaws.xml
+DOCS+=	core-vote.xml
+DOCS+= 	data.xml
+DOCS+= 	developer.xml
+DOCS+=	doceng.xml
+DOCS+=	expire-bits.xml
+DOCS+=	fortunes.xml
+DOCS+=	hats.xml
+DOCS+=	i18n.xml
+DOCS+=	internal.xml
+DOCS+= 	machines.xml
+DOCS+= 	mirror.xml
+DOCS+=	new-account.xml
+DOCS+=	policies.xml
+DOCS+=  releng.xml
+DOCS+=  resources.xml
+DOCS+=	statistic.xml
+DOCS+=	working-with-hats.xml
 
 INDEXLINK=	internal.html
 
@@ -33,7 +33,7 @@ INDEXLINK=	internal.html
 # on the main FreeBSD machines
 hostname!= hostname
 .if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org" || ${hostname} == "www.freebsd.org"
-DOCS+=	homepage.sgml
+DOCS+=	homepage.xml
 
 .if !make(install)
 .PHONY: homepage.inc
diff --git a/en_US.ISO8859-1/htdocs/internal/about.sgml b/en_US.ISO8859-1/htdocs/internal/about.xml
index e11a469939..e11a469939 100644
--- a/en_US.ISO8859-1/htdocs/internal/about.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/about.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/bylaws.sgml b/en_US.ISO8859-1/htdocs/internal/bylaws.xml
index 9d9d0ff8e9..9d9d0ff8e9 100644
--- a/en_US.ISO8859-1/htdocs/internal/bylaws.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/bylaws.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/core-vote.sgml b/en_US.ISO8859-1/htdocs/internal/core-vote.xml
index b0bb52ac8a..b0bb52ac8a 100644
--- a/en_US.ISO8859-1/htdocs/internal/core-vote.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/core-vote.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/data.sgml b/en_US.ISO8859-1/htdocs/internal/data.xml
index d1fcf3b12c..d1fcf3b12c 100644
--- a/en_US.ISO8859-1/htdocs/internal/data.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/data.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/developer.sgml b/en_US.ISO8859-1/htdocs/internal/developer.xml
index 4adcb71cf6..4adcb71cf6 100644
--- a/en_US.ISO8859-1/htdocs/internal/developer.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/developer.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/doceng.sgml b/en_US.ISO8859-1/htdocs/internal/doceng.xml
index c95d0a5075..c95d0a5075 100644
--- a/en_US.ISO8859-1/htdocs/internal/doceng.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/doceng.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/expire-bits.sgml b/en_US.ISO8859-1/htdocs/internal/expire-bits.xml
index 9748ffe28f..9748ffe28f 100644
--- a/en_US.ISO8859-1/htdocs/internal/expire-bits.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/expire-bits.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/fortunes.sgml b/en_US.ISO8859-1/htdocs/internal/fortunes.xml
index de103bf4f0..de103bf4f0 100644
--- a/en_US.ISO8859-1/htdocs/internal/fortunes.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/fortunes.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/hats.sgml b/en_US.ISO8859-1/htdocs/internal/hats.xml
index 6756399b3f..6756399b3f 100644
--- a/en_US.ISO8859-1/htdocs/internal/hats.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/hats.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/homepage.sgml b/en_US.ISO8859-1/htdocs/internal/homepage.xml
index 82578dc35c..82578dc35c 100644
--- a/en_US.ISO8859-1/htdocs/internal/homepage.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/homepage.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/i18n.sgml b/en_US.ISO8859-1/htdocs/internal/i18n.xml
index 1de413b816..1de413b816 100644
--- a/en_US.ISO8859-1/htdocs/internal/i18n.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/i18n.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/internal.sgml b/en_US.ISO8859-1/htdocs/internal/internal.xml
index 282dbef7ac..282dbef7ac 100644
--- a/en_US.ISO8859-1/htdocs/internal/internal.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/internal.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/machines.sgml b/en_US.ISO8859-1/htdocs/internal/machines.xml
index 83ced05141..83ced05141 100644
--- a/en_US.ISO8859-1/htdocs/internal/machines.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/machines.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/mirror.sgml b/en_US.ISO8859-1/htdocs/internal/mirror.xml
index 276e3c3dc4..276e3c3dc4 100644
--- a/en_US.ISO8859-1/htdocs/internal/mirror.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/mirror.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/new-account.sgml b/en_US.ISO8859-1/htdocs/internal/new-account.xml
index b2fa9f426d..b2fa9f426d 100644
--- a/en_US.ISO8859-1/htdocs/internal/new-account.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/new-account.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/policies.sgml b/en_US.ISO8859-1/htdocs/internal/policies.xml
index f7ecd975cf..f7ecd975cf 100644
--- a/en_US.ISO8859-1/htdocs/internal/policies.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/policies.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/releng.sgml b/en_US.ISO8859-1/htdocs/internal/releng.xml
index 560ddf7fb6..560ddf7fb6 100644
--- a/en_US.ISO8859-1/htdocs/internal/releng.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/releng.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/resources.sgml b/en_US.ISO8859-1/htdocs/internal/resources.xml
index fc1fcc94ef..fc1fcc94ef 100644
--- a/en_US.ISO8859-1/htdocs/internal/resources.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/resources.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/statistic.sgml b/en_US.ISO8859-1/htdocs/internal/statistic.xml
index 5c38754b5c..5c38754b5c 100644
--- a/en_US.ISO8859-1/htdocs/internal/statistic.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/statistic.xml
diff --git a/en_US.ISO8859-1/htdocs/internal/working-with-hats.sgml b/en_US.ISO8859-1/htdocs/internal/working-with-hats.xml
index d7a507a27a..d7a507a27a 100644
--- a/en_US.ISO8859-1/htdocs/internal/working-with-hats.sgml
+++ b/en_US.ISO8859-1/htdocs/internal/working-with-hats.xml
diff --git a/en_US.ISO8859-1/htdocs/internet.sgml b/en_US.ISO8859-1/htdocs/internet.xml
index e05a4de53a..e05a4de53a 100644
--- a/en_US.ISO8859-1/htdocs/internet.sgml
+++ b/en_US.ISO8859-1/htdocs/internet.xml
diff --git a/en_US.ISO8859-1/htdocs/ipv6/Makefile b/en_US.ISO8859-1/htdocs/ipv6/Makefile
index 309e84042c..2a660fcdea 100644
--- a/en_US.ISO8859-1/htdocs/ipv6/Makefile
+++ b/en_US.ISO8859-1/htdocs/ipv6/Makefile
@@ -7,11 +7,11 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+=		index.sgml
-DOCS+=		ipv6only.sgml
-DOCS+=		w6d.sgml
-DOCS+=		w6l.sgml
-DOCS+=		w6d-www-stats.sgml
+DOCS+=		index.xml
+DOCS+=		ipv6only.xml
+DOCS+=		w6d.xml
+DOCS+=		w6l.xml
+DOCS+=		w6d-www-stats.xml
 
 DATA+=		IPv6-badge-blue-256-trans.png	\
 		IPv6-badge-blue-128-trans.png
diff --git a/en_US.ISO8859-1/htdocs/ipv6/index.sgml b/en_US.ISO8859-1/htdocs/ipv6/index.xml
index c1c6c35704..c1c6c35704 100644
--- a/en_US.ISO8859-1/htdocs/ipv6/index.sgml
+++ b/en_US.ISO8859-1/htdocs/ipv6/index.xml
diff --git a/en_US.ISO8859-1/htdocs/ipv6/ipv6only.sgml b/en_US.ISO8859-1/htdocs/ipv6/ipv6only.xml
index 2d1b298eec..2d1b298eec 100644
--- a/en_US.ISO8859-1/htdocs/ipv6/ipv6only.sgml
+++ b/en_US.ISO8859-1/htdocs/ipv6/ipv6only.xml
diff --git a/en_US.ISO8859-1/htdocs/ipv6/w6d-www-stats.sgml b/en_US.ISO8859-1/htdocs/ipv6/w6d-www-stats.xml
index 603b3259c7..603b3259c7 100644
--- a/en_US.ISO8859-1/htdocs/ipv6/w6d-www-stats.sgml
+++ b/en_US.ISO8859-1/htdocs/ipv6/w6d-www-stats.xml
diff --git a/en_US.ISO8859-1/htdocs/ipv6/w6d.sgml b/en_US.ISO8859-1/htdocs/ipv6/w6d.xml
index 5b6d0464d1..5b6d0464d1 100644
--- a/en_US.ISO8859-1/htdocs/ipv6/w6d.sgml
+++ b/en_US.ISO8859-1/htdocs/ipv6/w6d.xml
diff --git a/en_US.ISO8859-1/htdocs/ipv6/w6l.sgml b/en_US.ISO8859-1/htdocs/ipv6/w6l.xml
index 06f1d8c6c0..06f1d8c6c0 100644
--- a/en_US.ISO8859-1/htdocs/ipv6/w6l.sgml
+++ b/en_US.ISO8859-1/htdocs/ipv6/w6l.xml
diff --git a/en_US.ISO8859-1/htdocs/java/Makefile b/en_US.ISO8859-1/htdocs/java/Makefile
index 6bfb759b6a..df0f8e8ba8 100644
--- a/en_US.ISO8859-1/htdocs/java/Makefile
+++ b/en_US.ISO8859-1/htdocs/java/Makefile
@@ -11,10 +11,10 @@ SUBDIR =	dists
 SUBDIR+=	docs
 SUBDIR+=	links
 
-DOCS =  advocacy.sgml
-DOCS+=  howhelp.sgml
-DOCS+=  index.sgml
-DOCS+=  install.sgml
+DOCS =  advocacy.xml
+DOCS+=  howhelp.xml
+DOCS+=  index.xml
+DOCS+=  install.xml
 
 DATA=	j2j.gif
 
diff --git a/en_US.ISO8859-1/htdocs/java/advocacy.sgml b/en_US.ISO8859-1/htdocs/java/advocacy.xml
index 5b1470eaad..5b1470eaad 100644
--- a/en_US.ISO8859-1/htdocs/java/advocacy.sgml
+++ b/en_US.ISO8859-1/htdocs/java/advocacy.xml
diff --git a/en_US.ISO8859-1/htdocs/java/dists/15.sgml b/en_US.ISO8859-1/htdocs/java/dists/15.xml
index 2d1fb1c465..2d1fb1c465 100644
--- a/en_US.ISO8859-1/htdocs/java/dists/15.sgml
+++ b/en_US.ISO8859-1/htdocs/java/dists/15.xml
diff --git a/en_US.ISO8859-1/htdocs/java/dists/16.sgml b/en_US.ISO8859-1/htdocs/java/dists/16.xml
index a499ea9533..a499ea9533 100644
--- a/en_US.ISO8859-1/htdocs/java/dists/16.sgml
+++ b/en_US.ISO8859-1/htdocs/java/dists/16.xml
diff --git a/en_US.ISO8859-1/htdocs/java/dists/17.sgml b/en_US.ISO8859-1/htdocs/java/dists/17.xml
index 398c28b18c..398c28b18c 100644
--- a/en_US.ISO8859-1/htdocs/java/dists/17.sgml
+++ b/en_US.ISO8859-1/htdocs/java/dists/17.xml
diff --git a/en_US.ISO8859-1/htdocs/java/dists/Makefile b/en_US.ISO8859-1/htdocs/java/dists/Makefile
index e3ddc00604..8ebc2d156d 100644
--- a/en_US.ISO8859-1/htdocs/java/dists/Makefile
+++ b/en_US.ISO8859-1/htdocs/java/dists/Makefile
@@ -7,9 +7,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	15.sgml
-DOCS+=	16.sgml
-DOCS+=	17.sgml
-DOCS+=	index.sgml
+DOCS=	15.xml
+DOCS+=	16.xml
+DOCS+=	17.xml
+DOCS+=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/java/dists/index.sgml b/en_US.ISO8859-1/htdocs/java/dists/index.xml
index 6f59fcd136..6f59fcd136 100644
--- a/en_US.ISO8859-1/htdocs/java/dists/index.sgml
+++ b/en_US.ISO8859-1/htdocs/java/dists/index.xml
diff --git a/en_US.ISO8859-1/htdocs/java/docs/Makefile b/en_US.ISO8859-1/htdocs/java/docs/Makefile
index f2a834034b..b53c681cf9 100644
--- a/en_US.ISO8859-1/htdocs/java/docs/Makefile
+++ b/en_US.ISO8859-1/htdocs/java/docs/Makefile
@@ -7,10 +7,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS =	faq.sgml
-DOCS+=	howtoports.sgml
-DOCS+=	newbies.sgml
-DOCS+=	tutorials.sgml
-DOCS+=	performance.sgml
+DOCS =	faq.xml
+DOCS+=	howtoports.xml
+DOCS+=	newbies.xml
+DOCS+=	tutorials.xml
+DOCS+=	performance.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/java/docs/faq.sgml b/en_US.ISO8859-1/htdocs/java/docs/faq.xml
index f8857d9bc8..f8857d9bc8 100644
--- a/en_US.ISO8859-1/htdocs/java/docs/faq.sgml
+++ b/en_US.ISO8859-1/htdocs/java/docs/faq.xml
diff --git a/en_US.ISO8859-1/htdocs/java/docs/howtoports.sgml b/en_US.ISO8859-1/htdocs/java/docs/howtoports.xml
index 655b18a3b2..655b18a3b2 100644
--- a/en_US.ISO8859-1/htdocs/java/docs/howtoports.sgml
+++ b/en_US.ISO8859-1/htdocs/java/docs/howtoports.xml
diff --git a/en_US.ISO8859-1/htdocs/java/docs/newbies.sgml b/en_US.ISO8859-1/htdocs/java/docs/newbies.xml
index 91d07cb5ed..91d07cb5ed 100644
--- a/en_US.ISO8859-1/htdocs/java/docs/newbies.sgml
+++ b/en_US.ISO8859-1/htdocs/java/docs/newbies.xml
diff --git a/en_US.ISO8859-1/htdocs/java/docs/performance.sgml b/en_US.ISO8859-1/htdocs/java/docs/performance.xml
index 0c270824e0..0c270824e0 100644
--- a/en_US.ISO8859-1/htdocs/java/docs/performance.sgml
+++ b/en_US.ISO8859-1/htdocs/java/docs/performance.xml
diff --git a/en_US.ISO8859-1/htdocs/java/docs/tutorials.sgml b/en_US.ISO8859-1/htdocs/java/docs/tutorials.xml
index d04e86a74b..d04e86a74b 100644
--- a/en_US.ISO8859-1/htdocs/java/docs/tutorials.sgml
+++ b/en_US.ISO8859-1/htdocs/java/docs/tutorials.xml
diff --git a/en_US.ISO8859-1/htdocs/java/howhelp.sgml b/en_US.ISO8859-1/htdocs/java/howhelp.xml
index fbd3e3c33a..fbd3e3c33a 100644
--- a/en_US.ISO8859-1/htdocs/java/howhelp.sgml
+++ b/en_US.ISO8859-1/htdocs/java/howhelp.xml
diff --git a/en_US.ISO8859-1/htdocs/java/index.sgml b/en_US.ISO8859-1/htdocs/java/index.xml
index 9a9b07076d..9a9b07076d 100644
--- a/en_US.ISO8859-1/htdocs/java/index.sgml
+++ b/en_US.ISO8859-1/htdocs/java/index.xml
diff --git a/en_US.ISO8859-1/htdocs/java/install.sgml b/en_US.ISO8859-1/htdocs/java/install.xml
index db0dfc9a81..db0dfc9a81 100644
--- a/en_US.ISO8859-1/htdocs/java/install.sgml
+++ b/en_US.ISO8859-1/htdocs/java/install.xml
diff --git a/en_US.ISO8859-1/htdocs/java/links/Makefile b/en_US.ISO8859-1/htdocs/java/links/Makefile
index 57f5e78e5f..4dfd882d24 100644
--- a/en_US.ISO8859-1/htdocs/java/links/Makefile
+++ b/en_US.ISO8859-1/htdocs/java/links/Makefile
@@ -7,15 +7,15 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS =	freebsd.sgml
-DOCS+=	tools.sgml
-DOCS+=	api.sgml
-DOCS+=	index.sgml
-DOCS+=	tutorials.sgml
-DOCS+=	development.sgml
-DOCS+=	resources.sgml
-DOCS+=	vendor.sgml
-DOCS+=	documentation.sgml
-DOCS+=	servlets.sgml
+DOCS =	freebsd.xml
+DOCS+=	tools.xml
+DOCS+=	api.xml
+DOCS+=	index.xml
+DOCS+=	tutorials.xml
+DOCS+=	development.xml
+DOCS+=	resources.xml
+DOCS+=	vendor.xml
+DOCS+=	documentation.xml
+DOCS+=	servlets.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/java/links/api.sgml b/en_US.ISO8859-1/htdocs/java/links/api.xml
index 5cc845e12f..5cc845e12f 100644
--- a/en_US.ISO8859-1/htdocs/java/links/api.sgml
+++ b/en_US.ISO8859-1/htdocs/java/links/api.xml
diff --git a/en_US.ISO8859-1/htdocs/java/links/development.sgml b/en_US.ISO8859-1/htdocs/java/links/development.xml
index 53ee17e403..53ee17e403 100644
--- a/en_US.ISO8859-1/htdocs/java/links/development.sgml
+++ b/en_US.ISO8859-1/htdocs/java/links/development.xml
diff --git a/en_US.ISO8859-1/htdocs/java/links/documentation.sgml b/en_US.ISO8859-1/htdocs/java/links/documentation.xml
index 37af329e52..37af329e52 100644
--- a/en_US.ISO8859-1/htdocs/java/links/documentation.sgml
+++ b/en_US.ISO8859-1/htdocs/java/links/documentation.xml
diff --git a/en_US.ISO8859-1/htdocs/java/links/freebsd.sgml b/en_US.ISO8859-1/htdocs/java/links/freebsd.xml
index 87d9f002c2..87d9f002c2 100644
--- a/en_US.ISO8859-1/htdocs/java/links/freebsd.sgml
+++ b/en_US.ISO8859-1/htdocs/java/links/freebsd.xml
diff --git a/en_US.ISO8859-1/htdocs/java/links/index.sgml b/en_US.ISO8859-1/htdocs/java/links/index.xml
index 41b9210a95..41b9210a95 100644
--- a/en_US.ISO8859-1/htdocs/java/links/index.sgml
+++ b/en_US.ISO8859-1/htdocs/java/links/index.xml
diff --git a/en_US.ISO8859-1/htdocs/java/links/resources.sgml b/en_US.ISO8859-1/htdocs/java/links/resources.xml
index 175b61a92a..175b61a92a 100644
--- a/en_US.ISO8859-1/htdocs/java/links/resources.sgml
+++ b/en_US.ISO8859-1/htdocs/java/links/resources.xml
diff --git a/en_US.ISO8859-1/htdocs/java/links/servlets.sgml b/en_US.ISO8859-1/htdocs/java/links/servlets.xml
index e2d321aa50..e2d321aa50 100644
--- a/en_US.ISO8859-1/htdocs/java/links/servlets.sgml
+++ b/en_US.ISO8859-1/htdocs/java/links/servlets.xml
diff --git a/en_US.ISO8859-1/htdocs/java/links/tools.sgml b/en_US.ISO8859-1/htdocs/java/links/tools.xml
index 6f927c28b5..6f927c28b5 100644
--- a/en_US.ISO8859-1/htdocs/java/links/tools.sgml
+++ b/en_US.ISO8859-1/htdocs/java/links/tools.xml
diff --git a/en_US.ISO8859-1/htdocs/java/links/tutorials.sgml b/en_US.ISO8859-1/htdocs/java/links/tutorials.xml
index a141b5a8d1..a141b5a8d1 100644
--- a/en_US.ISO8859-1/htdocs/java/links/tutorials.sgml
+++ b/en_US.ISO8859-1/htdocs/java/links/tutorials.xml
diff --git a/en_US.ISO8859-1/htdocs/java/links/vendor.sgml b/en_US.ISO8859-1/htdocs/java/links/vendor.xml
index 8089b022ad..8089b022ad 100644
--- a/en_US.ISO8859-1/htdocs/java/links/vendor.sgml
+++ b/en_US.ISO8859-1/htdocs/java/links/vendor.xml
diff --git a/en_US.ISO8859-1/htdocs/logo.sgml b/en_US.ISO8859-1/htdocs/logo.xml
index e078667b6e..e078667b6e 100644
--- a/en_US.ISO8859-1/htdocs/logo.sgml
+++ b/en_US.ISO8859-1/htdocs/logo.xml
diff --git a/en_US.ISO8859-1/htdocs/mailto.sgml b/en_US.ISO8859-1/htdocs/mailto.xml
index 9d6e9113ed..9d6e9113ed 100644
--- a/en_US.ISO8859-1/htdocs/mailto.sgml
+++ b/en_US.ISO8859-1/htdocs/mailto.xml
diff --git a/en_US.ISO8859-1/htdocs/marketing/Makefile b/en_US.ISO8859-1/htdocs/marketing/Makefile
index e832717d87..7f5eb393bb 100644
--- a/en_US.ISO8859-1/htdocs/marketing/Makefile
+++ b/en_US.ISO8859-1/htdocs/marketing/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml
+DOCS?=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/marketing/index.sgml b/en_US.ISO8859-1/htdocs/marketing/index.xml
index 808ac771aa..808ac771aa 100644
--- a/en_US.ISO8859-1/htdocs/marketing/index.sgml
+++ b/en_US.ISO8859-1/htdocs/marketing/index.xml
diff --git a/en_US.ISO8859-1/htdocs/news/1993/Makefile b/en_US.ISO8859-1/htdocs/news/1993/Makefile
index 95982b4630..f02445d071 100644
--- a/en_US.ISO8859-1/htdocs/news/1993/Makefile
+++ b/en_US.ISO8859-1/htdocs/news/1993/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	freebsd-coined.sgml
+DOCS=	freebsd-coined.xml
 
 XMLDOCS+=	index:${XSL_NEWS_NEWSFLASH_OLD}:news.xml:
 DEPENDSET.index=transtable news
diff --git a/en_US.ISO8859-1/htdocs/news/1993/freebsd-coined.sgml b/en_US.ISO8859-1/htdocs/news/1993/freebsd-coined.xml
index 18b4c13773..18b4c13773 100644
--- a/en_US.ISO8859-1/htdocs/news/1993/freebsd-coined.sgml
+++ b/en_US.ISO8859-1/htdocs/news/1993/freebsd-coined.xml
diff --git a/en_US.ISO8859-1/htdocs/news/1996/Makefile b/en_US.ISO8859-1/htdocs/news/1996/Makefile
index b6864697dd..a614eed261 100644
--- a/en_US.ISO8859-1/htdocs/news/1996/Makefile
+++ b/en_US.ISO8859-1/htdocs/news/1996/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/news/1996/index.sgml b/en_US.ISO8859-1/htdocs/news/1996/index.xml
index 5a818cf317..5a818cf317 100644
--- a/en_US.ISO8859-1/htdocs/news/1996/index.sgml
+++ b/en_US.ISO8859-1/htdocs/news/1996/index.xml
diff --git a/en_US.ISO8859-1/htdocs/news/1997/Makefile b/en_US.ISO8859-1/htdocs/news/1997/Makefile
index b6864697dd..a614eed261 100644
--- a/en_US.ISO8859-1/htdocs/news/1997/Makefile
+++ b/en_US.ISO8859-1/htdocs/news/1997/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/news/1997/index.sgml b/en_US.ISO8859-1/htdocs/news/1997/index.xml
index bfcecfb57b..bfcecfb57b 100644
--- a/en_US.ISO8859-1/htdocs/news/1997/index.sgml
+++ b/en_US.ISO8859-1/htdocs/news/1997/index.xml
diff --git a/en_US.ISO8859-1/htdocs/news/1998/Makefile b/en_US.ISO8859-1/htdocs/news/1998/Makefile
index 895b80f0dc..791b9195c8 100644
--- a/en_US.ISO8859-1/htdocs/news/1998/Makefile
+++ b/en_US.ISO8859-1/htdocs/news/1998/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
 DEPENDSET.press=transtable press
diff --git a/en_US.ISO8859-1/htdocs/news/1998/index.sgml b/en_US.ISO8859-1/htdocs/news/1998/index.xml
index 0dde11a069..0dde11a069 100644
--- a/en_US.ISO8859-1/htdocs/news/1998/index.sgml
+++ b/en_US.ISO8859-1/htdocs/news/1998/index.xml
diff --git a/en_US.ISO8859-1/htdocs/news/1999/Makefile b/en_US.ISO8859-1/htdocs/news/1999/Makefile
index 895b80f0dc..791b9195c8 100644
--- a/en_US.ISO8859-1/htdocs/news/1999/Makefile
+++ b/en_US.ISO8859-1/htdocs/news/1999/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
 DEPENDSET.press=transtable press
diff --git a/en_US.ISO8859-1/htdocs/news/1999/index.sgml b/en_US.ISO8859-1/htdocs/news/1999/index.xml
index 266e43e81c..266e43e81c 100644
--- a/en_US.ISO8859-1/htdocs/news/1999/index.sgml
+++ b/en_US.ISO8859-1/htdocs/news/1999/index.xml
diff --git a/en_US.ISO8859-1/htdocs/news/2000/Makefile b/en_US.ISO8859-1/htdocs/news/2000/Makefile
index 895b80f0dc..791b9195c8 100644
--- a/en_US.ISO8859-1/htdocs/news/2000/Makefile
+++ b/en_US.ISO8859-1/htdocs/news/2000/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
 DEPENDSET.press=transtable press
diff --git a/en_US.ISO8859-1/htdocs/news/2000/index.sgml b/en_US.ISO8859-1/htdocs/news/2000/index.xml
index 7f19016175..7f19016175 100644
--- a/en_US.ISO8859-1/htdocs/news/2000/index.sgml
+++ b/en_US.ISO8859-1/htdocs/news/2000/index.xml
diff --git a/en_US.ISO8859-1/htdocs/news/Makefile b/en_US.ISO8859-1/htdocs/news/Makefile
index 0e9b5b6d9f..08fafe3361 100644
--- a/en_US.ISO8859-1/htdocs/news/Makefile
+++ b/en_US.ISO8859-1/htdocs/news/Makefile
@@ -7,22 +7,22 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+= news.sgml
+DOCS+= news.xml
 
 # press releases
-DOCS+= pressreleases.sgml
-DOCS+= press-rel-1.sgml
-DOCS+= press-rel-2.sgml
-DOCS+= press-rel-3.sgml
-DOCS+= press-rel-4.sgml
-DOCS+= press-rel-5.sgml
-DOCS+= press-rel-6.sgml
-DOCS+= press-rel-7.sgml
-DOCS+= press-rel-8.sgml
-DOCS+= press-rel-9.sgml
+DOCS+= pressreleases.xml
+DOCS+= press-rel-1.xml
+DOCS+= press-rel-2.xml
+DOCS+= press-rel-3.xml
+DOCS+= press-rel-4.xml
+DOCS+= press-rel-5.xml
+DOCS+= press-rel-6.xml
+DOCS+= press-rel-7.xml
+DOCS+= press-rel-8.xml
+DOCS+= press-rel-9.xml
 
 # The yearly State of the Union address
-DOCS+= sou1999.sgml
+DOCS+= sou1999.xml
 
 INDEXLINK= news.html
 
diff --git a/en_US.ISO8859-1/htdocs/news/news.sgml b/en_US.ISO8859-1/htdocs/news/news.xml
index 643dea1548..643dea1548 100644
--- a/en_US.ISO8859-1/htdocs/news/news.sgml
+++ b/en_US.ISO8859-1/htdocs/news/news.xml
diff --git a/en_US.ISO8859-1/htdocs/news/press-rel-1.sgml b/en_US.ISO8859-1/htdocs/news/press-rel-1.xml
index ebf2fe686f..ebf2fe686f 100644
--- a/en_US.ISO8859-1/htdocs/news/press-rel-1.sgml
+++ b/en_US.ISO8859-1/htdocs/news/press-rel-1.xml
diff --git a/en_US.ISO8859-1/htdocs/news/press-rel-2.sgml b/en_US.ISO8859-1/htdocs/news/press-rel-2.xml
index e9a2ada1da..e9a2ada1da 100644
--- a/en_US.ISO8859-1/htdocs/news/press-rel-2.sgml
+++ b/en_US.ISO8859-1/htdocs/news/press-rel-2.xml
diff --git a/en_US.ISO8859-1/htdocs/news/press-rel-3.sgml b/en_US.ISO8859-1/htdocs/news/press-rel-3.xml
index 9a15759bce..9a15759bce 100644
--- a/en_US.ISO8859-1/htdocs/news/press-rel-3.sgml
+++ b/en_US.ISO8859-1/htdocs/news/press-rel-3.xml
diff --git a/en_US.ISO8859-1/htdocs/news/press-rel-4.sgml b/en_US.ISO8859-1/htdocs/news/press-rel-4.xml
index 7f2a0ad93e..7f2a0ad93e 100644
--- a/en_US.ISO8859-1/htdocs/news/press-rel-4.sgml
+++ b/en_US.ISO8859-1/htdocs/news/press-rel-4.xml
diff --git a/en_US.ISO8859-1/htdocs/news/press-rel-5.sgml b/en_US.ISO8859-1/htdocs/news/press-rel-5.xml
index b1101bede4..b1101bede4 100644
--- a/en_US.ISO8859-1/htdocs/news/press-rel-5.sgml
+++ b/en_US.ISO8859-1/htdocs/news/press-rel-5.xml
diff --git a/en_US.ISO8859-1/htdocs/news/press-rel-6.sgml b/en_US.ISO8859-1/htdocs/news/press-rel-6.xml
index d4512fc591..d4512fc591 100644
--- a/en_US.ISO8859-1/htdocs/news/press-rel-6.sgml
+++ b/en_US.ISO8859-1/htdocs/news/press-rel-6.xml
diff --git a/en_US.ISO8859-1/htdocs/news/press-rel-7.sgml b/en_US.ISO8859-1/htdocs/news/press-rel-7.xml
index 9e7fc969e8..9e7fc969e8 100644
--- a/en_US.ISO8859-1/htdocs/news/press-rel-7.sgml
+++ b/en_US.ISO8859-1/htdocs/news/press-rel-7.xml
diff --git a/en_US.ISO8859-1/htdocs/news/press-rel-8.sgml b/en_US.ISO8859-1/htdocs/news/press-rel-8.xml
index 506d168999..506d168999 100644
--- a/en_US.ISO8859-1/htdocs/news/press-rel-8.sgml
+++ b/en_US.ISO8859-1/htdocs/news/press-rel-8.xml
diff --git a/en_US.ISO8859-1/htdocs/news/press-rel-9.sgml b/en_US.ISO8859-1/htdocs/news/press-rel-9.xml
index 28521e8309..28521e8309 100644
--- a/en_US.ISO8859-1/htdocs/news/press-rel-9.sgml
+++ b/en_US.ISO8859-1/htdocs/news/press-rel-9.xml
diff --git a/en_US.ISO8859-1/htdocs/news/pressreleases.sgml b/en_US.ISO8859-1/htdocs/news/pressreleases.xml
index d53cfac9f7..d53cfac9f7 100644
--- a/en_US.ISO8859-1/htdocs/news/pressreleases.sgml
+++ b/en_US.ISO8859-1/htdocs/news/pressreleases.xml
diff --git a/en_US.ISO8859-1/htdocs/news/sou1999.sgml b/en_US.ISO8859-1/htdocs/news/sou1999.xml
index 657b5151b6..657b5151b6 100644
--- a/en_US.ISO8859-1/htdocs/news/sou1999.sgml
+++ b/en_US.ISO8859-1/htdocs/news/sou1999.xml
diff --git a/en_US.ISO8859-1/htdocs/news/status/Makefile b/en_US.ISO8859-1/htdocs/news/status/Makefile
index 26ecddec66..c595fc42bf 100644
--- a/en_US.ISO8859-1/htdocs/news/status/Makefile
+++ b/en_US.ISO8859-1/htdocs/news/status/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	status.sgml
+DOCS=	status.xml
 
 XMLDOCS=	report-2001-06
 XMLDOCS+=	report-2001-07
diff --git a/en_US.ISO8859-1/htdocs/news/status/report-2006-10-2006-12.xml b/en_US.ISO8859-1/htdocs/news/status/report-2006-10-2006-12.xml
index 1bc9ad60a0..970d7ed27a 100644
--- a/en_US.ISO8859-1/htdocs/news/status/report-2006-10-2006-12.xml
+++ b/en_US.ISO8859-1/htdocs/news/status/report-2006-10-2006-12.xml
@@ -621,7 +621,7 @@ Report//EN"
       <url href="http://sourceforge.net/projects/mpd/">Project home</url>
 
       <url
-      href="http://mpd.cvs.sourceforge.net/*checkout*/mpd/mpd/doc/changes.sgml">
+      href="http://mpd.cvs.sourceforge.net/*checkout*/mpd/mpd/doc/changes.xml">
       ChangeLog</url>
     </links>
 
diff --git a/en_US.ISO8859-1/htdocs/news/status/status.sgml b/en_US.ISO8859-1/htdocs/news/status/status.xml
index 709eae0847..709eae0847 100644
--- a/en_US.ISO8859-1/htdocs/news/status/status.sgml
+++ b/en_US.ISO8859-1/htdocs/news/status/status.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/Makefile b/en_US.ISO8859-1/htdocs/platforms/Makefile
index a7e066260a..02b1715691 100644
--- a/en_US.ISO8859-1/htdocs/platforms/Makefile
+++ b/en_US.ISO8859-1/htdocs/platforms/Makefile
@@ -7,19 +7,19 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	alpha.sgml
-DOCS+=	amd64.sgml
-DOCS+=	arm.sgml
-DOCS+=	i386.sgml
-DOCS+=	ia64.sgml
-DOCS+=	index.sgml
-DOCS+=	mips.sgml
-DOCS+=	pc98.sgml
-DOCS+=	ppc.sgml
-DOCS+=	sparc.sgml
-DOCS+=	sun4v.sgml
-DOCS+=	x86-64.sgml
-DOCS+=	xbox.sgml
+DOCS=	alpha.xml
+DOCS+=	amd64.xml
+DOCS+=	arm.xml
+DOCS+=	i386.xml
+DOCS+=	ia64.xml
+DOCS+=	index.xml
+DOCS+=	mips.xml
+DOCS+=	pc98.xml
+DOCS+=	ppc.xml
+DOCS+=	sparc.xml
+DOCS+=	sun4v.xml
+DOCS+=	x86-64.xml
+DOCS+=	xbox.xml
 
 SUBDIR=	ia64
 
diff --git a/en_US.ISO8859-1/htdocs/platforms/alpha.sgml b/en_US.ISO8859-1/htdocs/platforms/alpha.xml
index c0df267cfc..c0df267cfc 100644
--- a/en_US.ISO8859-1/htdocs/platforms/alpha.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/alpha.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/amd64.sgml b/en_US.ISO8859-1/htdocs/platforms/amd64.xml
index 5a0d1de2ca..5a0d1de2ca 100644
--- a/en_US.ISO8859-1/htdocs/platforms/amd64.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/amd64.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/arm.sgml b/en_US.ISO8859-1/htdocs/platforms/arm.xml
index 2d291f614d..2d291f614d 100644
--- a/en_US.ISO8859-1/htdocs/platforms/arm.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/arm.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/i386.sgml b/en_US.ISO8859-1/htdocs/platforms/i386.xml
index d76cd41a6d..d76cd41a6d 100644
--- a/en_US.ISO8859-1/htdocs/platforms/i386.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/i386.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/ia64.sgml b/en_US.ISO8859-1/htdocs/platforms/ia64.xml
index c9addc1335..c9addc1335 100644
--- a/en_US.ISO8859-1/htdocs/platforms/ia64.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/ia64.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/ia64/Makefile b/en_US.ISO8859-1/htdocs/platforms/ia64/Makefile
index 089e3d62c9..c89b8bf4c4 100644
--- a/en_US.ISO8859-1/htdocs/platforms/ia64/Makefile
+++ b/en_US.ISO8859-1/htdocs/platforms/ia64/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml machines.sgml refs.sgml todo.sgml
+DOCS=	index.xml machines.xml refs.xml todo.xml
 DATA=	i2inside.png mckinley-die.png merced-die.png montecito-die.png
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/platforms/ia64/index.sgml b/en_US.ISO8859-1/htdocs/platforms/ia64/index.xml
index 921b6c1a40..921b6c1a40 100644
--- a/en_US.ISO8859-1/htdocs/platforms/ia64/index.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/ia64/index.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/ia64/machines.sgml b/en_US.ISO8859-1/htdocs/platforms/ia64/machines.xml
index 34cf0cbdc0..34cf0cbdc0 100644
--- a/en_US.ISO8859-1/htdocs/platforms/ia64/machines.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/ia64/machines.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/ia64/refs.sgml b/en_US.ISO8859-1/htdocs/platforms/ia64/refs.xml
index 8950906cf2..8950906cf2 100644
--- a/en_US.ISO8859-1/htdocs/platforms/ia64/refs.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/ia64/refs.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/ia64/todo.sgml b/en_US.ISO8859-1/htdocs/platforms/ia64/todo.xml
index 8d826cc1b3..8d826cc1b3 100644
--- a/en_US.ISO8859-1/htdocs/platforms/ia64/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/ia64/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/index.sgml b/en_US.ISO8859-1/htdocs/platforms/index.xml
index 4a2bf0745c..4a2bf0745c 100644
--- a/en_US.ISO8859-1/htdocs/platforms/index.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/index.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/mips.sgml b/en_US.ISO8859-1/htdocs/platforms/mips.xml
index eb738077e7..eb738077e7 100644
--- a/en_US.ISO8859-1/htdocs/platforms/mips.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/mips.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/pc98.sgml b/en_US.ISO8859-1/htdocs/platforms/pc98.xml
index e198e1efc8..e198e1efc8 100644
--- a/en_US.ISO8859-1/htdocs/platforms/pc98.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/pc98.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/ppc.sgml b/en_US.ISO8859-1/htdocs/platforms/ppc.xml
index 7079f74140..7079f74140 100644
--- a/en_US.ISO8859-1/htdocs/platforms/ppc.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/ppc.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/sparc.sgml b/en_US.ISO8859-1/htdocs/platforms/sparc.xml
index 4bda82bec7..4bda82bec7 100644
--- a/en_US.ISO8859-1/htdocs/platforms/sparc.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/sparc.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/sun4v.sgml b/en_US.ISO8859-1/htdocs/platforms/sun4v.xml
index 23a80dc136..23a80dc136 100644
--- a/en_US.ISO8859-1/htdocs/platforms/sun4v.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/sun4v.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/x86-64.sgml b/en_US.ISO8859-1/htdocs/platforms/x86-64.xml
index 0539076acc..0539076acc 100644
--- a/en_US.ISO8859-1/htdocs/platforms/x86-64.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/x86-64.xml
diff --git a/en_US.ISO8859-1/htdocs/platforms/xbox.sgml b/en_US.ISO8859-1/htdocs/platforms/xbox.xml
index 0d8295d8ca..0d8295d8ca 100644
--- a/en_US.ISO8859-1/htdocs/platforms/xbox.sgml
+++ b/en_US.ISO8859-1/htdocs/platforms/xbox.xml
diff --git a/en_US.ISO8859-1/htdocs/portmgr/Makefile b/en_US.ISO8859-1/htdocs/portmgr/Makefile
index 413b83e3fb..fc0c5204da 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/Makefile
+++ b/en_US.ISO8859-1/htdocs/portmgr/Makefile
@@ -7,13 +7,13 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml
-DOCS+=	charter.sgml
-DOCS+=	implementation.sgml
-DOCS+=	policies.sgml
-DOCS+=	policies_committing.sgml
-DOCS+=	policies_contributors.sgml
-DOCS+=	policies_eol.sgml
-DOCS+=	qa.sgml
+DOCS?=	index.xml
+DOCS+=	charter.xml
+DOCS+=	implementation.xml
+DOCS+=	policies.xml
+DOCS+=	policies_committing.xml
+DOCS+=	policies_contributors.xml
+DOCS+=	policies_eol.xml
+DOCS+=	qa.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/portmgr/charter.sgml b/en_US.ISO8859-1/htdocs/portmgr/charter.xml
index edaa953954..edaa953954 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/charter.sgml
+++ b/en_US.ISO8859-1/htdocs/portmgr/charter.xml
diff --git a/en_US.ISO8859-1/htdocs/portmgr/implementation.sgml b/en_US.ISO8859-1/htdocs/portmgr/implementation.xml
index 0798c85af3..0798c85af3 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/implementation.sgml
+++ b/en_US.ISO8859-1/htdocs/portmgr/implementation.xml
diff --git a/en_US.ISO8859-1/htdocs/portmgr/index.sgml b/en_US.ISO8859-1/htdocs/portmgr/index.xml
index 64b58c1081..64b58c1081 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/index.sgml
+++ b/en_US.ISO8859-1/htdocs/portmgr/index.xml
diff --git a/en_US.ISO8859-1/htdocs/portmgr/policies.sgml b/en_US.ISO8859-1/htdocs/portmgr/policies.xml
index bdd6976018..bdd6976018 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/policies.sgml
+++ b/en_US.ISO8859-1/htdocs/portmgr/policies.xml
diff --git a/en_US.ISO8859-1/htdocs/portmgr/policies_committing.sgml b/en_US.ISO8859-1/htdocs/portmgr/policies_committing.xml
index 71d9b1031a..71d9b1031a 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/policies_committing.sgml
+++ b/en_US.ISO8859-1/htdocs/portmgr/policies_committing.xml
diff --git a/en_US.ISO8859-1/htdocs/portmgr/policies_contributors.sgml b/en_US.ISO8859-1/htdocs/portmgr/policies_contributors.xml
index e92ee45dc5..e92ee45dc5 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/policies_contributors.sgml
+++ b/en_US.ISO8859-1/htdocs/portmgr/policies_contributors.xml
diff --git a/en_US.ISO8859-1/htdocs/portmgr/policies_eol.sgml b/en_US.ISO8859-1/htdocs/portmgr/policies_eol.xml
index 2976d3e672..2976d3e672 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/policies_eol.sgml
+++ b/en_US.ISO8859-1/htdocs/portmgr/policies_eol.xml
diff --git a/en_US.ISO8859-1/htdocs/portmgr/qa.sgml b/en_US.ISO8859-1/htdocs/portmgr/qa.xml
index aa0b6e417a..aa0b6e417a 100644
--- a/en_US.ISO8859-1/htdocs/portmgr/qa.sgml
+++ b/en_US.ISO8859-1/htdocs/portmgr/qa.xml
diff --git a/en_US.ISO8859-1/htdocs/ports/Makefile b/en_US.ISO8859-1/htdocs/ports/Makefile
index b9715e4c74..ec6383acc2 100644
--- a/en_US.ISO8859-1/htdocs/ports/Makefile
+++ b/en_US.ISO8859-1/htdocs/ports/Makefile
@@ -43,18 +43,18 @@ packages.exists:
 	${TOUCH} ${.TARGET}
 .endif
 
-Makefile.gen: categories-alpha.sgml categories-grouped.sgml index.sgml \
-	installing.sgml master-index.sgml references.sgml searching.sgml \
-	statistics.ent updating.sgml .NOTMAIN
-	(	${ECHO_CMD} DOCS= *.sgml;\
+Makefile.gen: categories-alpha.xml categories-grouped.xml index.xml \
+	installing.xml master-index.xml references.xml searching.xml \
+	statistics.ent updating.xml .NOTMAIN
+	(	${ECHO_CMD} DOCS= *.xml;\
 		${ECHO_CMD} -n "DYNAMIC_DOCS= ";\
-		${ECHO_CMD} -n " categories-alpha.sgml";\
-		${ECHO_CMD} -n " categories-grouped.sgml";\
-		${ECHO_CMD} -n " master-index.sgml";\
+		${ECHO_CMD} -n " categories-alpha.xml";\
+		${ECHO_CMD} -n " categories-grouped.xml";\
+		${ECHO_CMD} -n " master-index.xml";\
 		${ECHO_CMD} -n " statistics.ent";\
 	) > Makefile.gen
 	for categoryfile in ${CATEGORYLIST}; do \
-		${ECHO_CMD} -n " $$categoryfile.sgml" >> Makefile.gen; \
+		${ECHO_CMD} -n " $$categoryfile.xml" >> Makefile.gen; \
 	done
 	${ECHO_CMD} >> Makefile.gen
 
@@ -72,15 +72,15 @@ ports.size:
 	${FETCH} -s ${PORTS_TARGZ_URL} > ${.TARGET}
 .endif
 
-# this builds: categories-alpha.sgml, categories-grouped.sgml,
-# master-index.sgml, statistics.ent, <category>.sgml
+# this builds: categories-alpha.xml, categories-grouped.xml,
+# master-index.xml, statistics.ent, <category>.xml
 CATEGORYLIST=`grep "^[a-z]" categories | sed -e s"/,.*//"`
-categories-alpha.sgml: ${INDEX} categories categories.descriptions \
+categories-alpha.xml: ${INDEX} categories categories.descriptions \
 	packages.exists portindex ports.ent ports.size .NOTMAIN
-	${RM} -f categories-alpha.sgml categories-grouped.sgml \
-		master-index.sgml statistics.ent
+	${RM} -f categories-alpha.xml categories-grouped.xml \
+		master-index.xml statistics.ent
 	for categoryfile in ${CATEGORYLIST}; do \
-		rm -f "$$categoryfile.sgml"; \
+		rm -f "$$categoryfile.xml"; \
 	done
 	${PORTINDEX} ${INDEX} ${.CURDIR}
 
diff --git a/en_US.ISO8859-1/htdocs/ports/index.sgml b/en_US.ISO8859-1/htdocs/ports/index.xml
index 46711a9a9f..46711a9a9f 100644
--- a/en_US.ISO8859-1/htdocs/ports/index.sgml
+++ b/en_US.ISO8859-1/htdocs/ports/index.xml
diff --git a/en_US.ISO8859-1/htdocs/ports/installing.sgml b/en_US.ISO8859-1/htdocs/ports/installing.xml
index e7dbdb3b65..e7dbdb3b65 100644
--- a/en_US.ISO8859-1/htdocs/ports/installing.sgml
+++ b/en_US.ISO8859-1/htdocs/ports/installing.xml
diff --git a/en_US.ISO8859-1/htdocs/ports/portindex b/en_US.ISO8859-1/htdocs/ports/portindex
index 86103305c3..f76b28ad36 100755
--- a/en_US.ISO8859-1/htdocs/ports/portindex
+++ b/en_US.ISO8859-1/htdocs/ports/portindex
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# convert a ports INDEX file to SGML files
+# convert a ports INDEX file to XML files
 #
 # by John Fieber <jfieber@FreeBSD.org>
 # Mon May 13 10:31:58 EST 1996
@@ -273,7 +273,7 @@ sub main {
 
     	# Add an entry to the master index
 
-	# workaround for SGML bug, `--' is not allowed in comments
+	# workaround XML syntax, `--' is not allowed in comments
 	my $sname = $name; 
 	$sname =~ s/--/-=/g;
     	$master[$portnumber] = 
@@ -282,9 +282,9 @@ sub main {
 	$portnumber++;
     }
 
-    # create categories-grouped.sgml and <category>.sgml
+    # create categories-grouped.xml and <category>.xml
 
-    $moutf->open(">categories-grouped.sgml");
+    $moutf->open(">categories-grouped.xml");
     header($moutf, "FreeBSD Ports Categories Listed By Groups");
 
     print $moutf <<EOF;
@@ -316,7 +316,7 @@ EOF
 	    print $moutf "</li>\n";
 
 	    # Create the category file
-	    $outf->open(">$key.sgml");
+	    $outf->open(">$key.xml");
 	    header($outf, "FreeBSD Ports: \u$key");
 	    if ($category_description{$key}{desc}) {
 		print $outf "<h3>", $category_description{$key}{desc}, "</h3>\n";
@@ -337,9 +337,9 @@ EOF
     footer($moutf, "");
     $moutf->close;
 
-    # create categories-alpha.sgml
+    # create categories-alpha.xml
 
-    $moutf->open(">categories-alpha.sgml");
+    $moutf->open(">categories-alpha.xml");
     header($moutf, "FreeBSD Ports Categories Listed Alphabetically");
 
     print $moutf <<EOF;
@@ -364,9 +364,9 @@ EOF
     footer($moutf, "");
     $moutf->close;
 
-    # Create master-index.sgml
+    # Create master-index.xml
 
-    $mindex->open(">master-index.sgml");
+    $mindex->open(">master-index.xml");
     header($mindex, "FreeBSD Ports Collection Index");
     print $mindex "<p>\n";
     print $mindex sort @master;
diff --git a/en_US.ISO8859-1/htdocs/ports/references.sgml b/en_US.ISO8859-1/htdocs/ports/references.xml
index a5ce88db07..a5ce88db07 100644
--- a/en_US.ISO8859-1/htdocs/ports/references.sgml
+++ b/en_US.ISO8859-1/htdocs/ports/references.xml
diff --git a/en_US.ISO8859-1/htdocs/ports/searching.sgml b/en_US.ISO8859-1/htdocs/ports/searching.xml
index 21f68f69dc..21f68f69dc 100644
--- a/en_US.ISO8859-1/htdocs/ports/searching.sgml
+++ b/en_US.ISO8859-1/htdocs/ports/searching.xml
diff --git a/en_US.ISO8859-1/htdocs/ports/updating.sgml b/en_US.ISO8859-1/htdocs/ports/updating.xml
index a83dceeaeb..a83dceeaeb 100644
--- a/en_US.ISO8859-1/htdocs/ports/updating.sgml
+++ b/en_US.ISO8859-1/htdocs/ports/updating.xml
diff --git a/en_US.ISO8859-1/htdocs/privacy.sgml b/en_US.ISO8859-1/htdocs/privacy.xml
index fd0eb08a11..fd0eb08a11 100644
--- a/en_US.ISO8859-1/htdocs/privacy.sgml
+++ b/en_US.ISO8859-1/htdocs/privacy.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/Makefile b/en_US.ISO8859-1/htdocs/projects/Makefile
index 69a64b4a7f..abddbd6dff 100644
--- a/en_US.ISO8859-1/htdocs/projects/Makefile
+++ b/en_US.ISO8859-1/htdocs/projects/Makefile
@@ -7,14 +7,14 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	projects.sgml
-DOCS+=	newbies.sgml
-DOCS+=	cvsweb.sgml
-DOCS+=	summerofcode.sgml
-DOCS+=	summerofcode-2005.sgml
-DOCS+=	summerofcode-2006.sgml
-DOCS+=	summerofcode-2007.sgml
-DOCS+=	summerofcode-2008.sgml
+DOCS=	projects.xml
+DOCS+=	newbies.xml
+DOCS+=	cvsweb.xml
+DOCS+=	summerofcode.xml
+DOCS+=	summerofcode-2005.xml
+DOCS+=	summerofcode-2006.xml
+DOCS+=	summerofcode-2007.xml
+DOCS+=	summerofcode-2008.xml
 
 DATA=	2009-freebsd-gsoc-thumbnail.jpg
 DATA+=	2009-freebsd-gsoc.pdf
diff --git a/en_US.ISO8859-1/htdocs/projects/acpi/Makefile b/en_US.ISO8859-1/htdocs/projects/acpi/Makefile
index 0278b6ab73..8a091eb4ce 100644
--- a/en_US.ISO8859-1/htdocs/projects/acpi/Makefile
+++ b/en_US.ISO8859-1/htdocs/projects/acpi/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	marks
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
-DOCS+=	completed.sgml
+DOCS=	index.xml
+DOCS+=	completed.xml
 DATA=	style.css
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/projects/acpi/completed.sgml b/en_US.ISO8859-1/htdocs/projects/acpi/completed.xml
index 46067c5b3d..46067c5b3d 100644
--- a/en_US.ISO8859-1/htdocs/projects/acpi/completed.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/acpi/completed.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/acpi/index.sgml b/en_US.ISO8859-1/htdocs/projects/acpi/index.xml
index 564f60a52c..564f60a52c 100644
--- a/en_US.ISO8859-1/htdocs/projects/acpi/index.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/acpi/index.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/bigdisk/Makefile b/en_US.ISO8859-1/htdocs/projects/bigdisk/Makefile
index bb9b99dad5..e396c066df 100644
--- a/en_US.ISO8859-1/htdocs/projects/bigdisk/Makefile
+++ b/en_US.ISO8859-1/htdocs/projects/bigdisk/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	scottl
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 DATA=	style.css
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/projects/bigdisk/index.sgml b/en_US.ISO8859-1/htdocs/projects/bigdisk/index.xml
index 4eaecc32de..4eaecc32de 100644
--- a/en_US.ISO8859-1/htdocs/projects/bigdisk/index.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/bigdisk/index.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/busdma/Makefile b/en_US.ISO8859-1/htdocs/projects/busdma/Makefile
index a87806a4ac..6bcb5cdeef 100644
--- a/en_US.ISO8859-1/htdocs/projects/busdma/Makefile
+++ b/en_US.ISO8859-1/htdocs/projects/busdma/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	rwatson
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 DATA=	style.css
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/projects/busdma/index.sgml b/en_US.ISO8859-1/htdocs/projects/busdma/index.xml
index 02e3a8567e..02e3a8567e 100644
--- a/en_US.ISO8859-1/htdocs/projects/busdma/index.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/busdma/index.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/c99/Makefile b/en_US.ISO8859-1/htdocs/projects/c99/Makefile
index d47e85b615..2b26d9dbe3 100644
--- a/en_US.ISO8859-1/htdocs/projects/c99/Makefile
+++ b/en_US.ISO8859-1/htdocs/projects/c99/Makefile
@@ -9,7 +9,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 DATA=	style.css
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/projects/c99/index.sgml b/en_US.ISO8859-1/htdocs/projects/c99/index.xml
index e1ec48b397..e1ec48b397 100644
--- a/en_US.ISO8859-1/htdocs/projects/c99/index.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/c99/index.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/cvsweb.sgml b/en_US.ISO8859-1/htdocs/projects/cvsweb.xml
index 8ccb4b688f..8ccb4b688f 100644
--- a/en_US.ISO8859-1/htdocs/projects/cvsweb.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/cvsweb.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/ideas/Makefile b/en_US.ISO8859-1/htdocs/projects/ideas/Makefile
index fe3cda9cb9..912983613d 100644
--- a/en_US.ISO8859-1/htdocs/projects/ideas/Makefile
+++ b/en_US.ISO8859-1/htdocs/projects/ideas/Makefile
@@ -13,6 +13,6 @@ MAINTAINER=	joel
 
 DATA=	style.css
 
-DOCS=	ideas.sgml
+DOCS=	ideas.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/projects/ideas/ideas.sgml b/en_US.ISO8859-1/htdocs/projects/ideas/ideas.sgml
deleted file mode 100644
index d66b1aa150..0000000000
--- a/en_US.ISO8859-1/htdocs/projects/ideas/ideas.sgml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
-<!ENTITY title "The &os; list of projects and ideas for volunteers">
-<!ENTITY email "freebsd-www">
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-      <title>&title;</title>
-
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
-
-  <body class="navinclude.developers">
-
-<p>The ideas page has moved to the <a
-  href="http://wiki.freebsd.org/IdeasPage">FreeBSD wiki</a>.</p>
-
-  </body>
-</html>
diff --git a/en_US.ISO8859-1/htdocs/projects/ideas/ideas.xml b/en_US.ISO8859-1/htdocs/projects/ideas/ideas.xml
index ab7a45ac89..d66b1aa150 100644
--- a/en_US.ISO8859-1/htdocs/projects/ideas/ideas.xml
+++ b/en_US.ISO8859-1/htdocs/projects/ideas/ideas.xml
@@ -1,2182 +1,21 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE news PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for
-Ideas//EN"
-"http://www.FreeBSD.org/XML/www/share/sgml/ideas.dtd">
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
+<!ENTITY title "The &os; list of projects and ideas for volunteers">
+<!ENTITY email "freebsd-www">
+]>
 
-<!-- Simple schema for FreeBSD Project feature request ideas.
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+      <title>&title;</title>
 
-     Top level element is <ideas>, which contains a collection of
-     <category>s.  Each category contains a <title> element, and a
-     collection of <idea> elements.
+      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+    </head>
 
-     Each <idea> contains a <title>, <desc>, and <requirements>.
--->
+  <body class="navinclude.developers">
 
-<ideas>
-    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
-      $FreeBSD$
-    </cvs:keyword>
+<p>The ideas page has moved to the <a
+  href="http://wiki.freebsd.org/IdeasPage">FreeBSD wiki</a>.</p>
 
-  <category>
-    <title>Embedded</title>
-
-    <idea id="reduced-size-kernel">
-      <title>Reduced FreeBSD kernel size for embedded</title>
-      <desc><p><strong>Technical Contact</strong>: <a
-	href="mailto:imp@FreeBSD.org">Warner Losh</a></p>
-
-      <p>The FreeBSD kernel has been optimized over the years for a
-	server or workstation environment.  Memory is plentiful in these
-	environments, so little attention was given to the size of the
-	kernel.  There's a number items in the kernel that can be made
-	optional without reducing affecting the functionality needed in
-	an embedded environment.  These include things like not
-	compiling in strings into the kernel, less aggressively inlining
-	code, making some non-optional features optional and investigating
-	compile time flags.  This task requires identifying potentially
-	optional kernel content and building the infrastructure to make
-	that content optional.</p>
-      <p><strong>requirements</strong>:</p>
-      <ul>
-	<li>Strong C language programming skills.</li>
-	<li>Understanding of system calls and general kernel architecture.</li>
-      </ul>
-      </desc>
-    </idea>
-
-    <idea id="bus-abstraction">
-      <title>Make creating a bus easier</title>
-      <desc><p><strong>Technical Contact</strong>: <a
-  href="mailto:imp@FreeBSD.org">Warner Losh</a></p>
-      <p>There's about a dozen busses in the tree now that manage resources and
-activate children.  They are far too hard to create.  We need to
-abstract out the basics for these buses and provide a way to allow
-these buses to be a subclass of this new base class.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good C programming skills</li>
-  <li>Good knowledge of the NewBus configuration system in FreeBSD</li>
-</ul>
-      </desc>
-    </idea>
-
-    <idea id="arm-cleanup">
-      <title>ARM cleanup</title>
-      <desc><p><strong>Technical Contact</strong>: <a
-  href="mailto:imp@FreeBSD.org">Warner Losh</a></p>
-
-      <p>Adding a new board to the arm code is a lot harder than it
-        needs to be.  A lot of benefit could be had by creating tables
-        for memory ranges, etc, and having more generic initialization
-        code.  Much of this can also be Machine Independent (MI).</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good C programming skills</li>
-  <li>Good refactoring skills</li>
-</ul>
-      </desc>
-    </idea>
-
-    <idea id="ppc-bringup">
-      <title>PPC/ARM/MIPS bring up</title>
-
-      <desc><p><strong>Technical Contact</strong>: <a
-  href="mailto:imp@FreeBSD.org">Warner Losh</a></p>
-
-      <p>There's a number of SoCs that are in consumer grade routers,
-        etc that have chips that are supported by FreeBSD, or nearly
-        supported by FreeBSD.  Pick one and bring FreeBSD up on it.
-        Integrate it into the tree.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good C programming skills</li>
-  <li>Good kernel debugging skills</li>
-</ul>
-      </desc>
-    </idea>
-
-    <idea id="mips-superpages">
-      <title>Add super page support to MIPS</title>
-
-      <desc><p><strong>Technical Contact</strong>: <a
-  href="mailto:imp@FreeBSD.org">Warner Losh</a></p>
-
-      <p>Superpage support exists only for x86-based architectures at the
-        moment.  MIPS hardware supports a number of different page sizes
-        on a per page basis.  This could be used to implement superpages
-        for MIPS(which just uses two sizes: 4k chunks and 4M chunks).  The
-        vm system supports it generically for all platforms, but the pmap
-        for each platform must complete the implementation.  Fortunately,
-        superpages were MFC'd as one huge commit into FreeBSD 7.x, so
-        finding the relevant changes that need to be made to the mips pmap
-        won't be starting from scratch.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Strong C programming skills</li>
-  <li>Strong kernel skills</li>
-  <li>Strong VM skills</li>
-</ul>
-      </desc>
-    </idea>
-
-    <idea id="overhaul-config">
-      <title>Overhaul the config system</title>
-
-      <desc><p><strong>Technical Contact</strong>: <a
-  href="mailto:imp@FreeBSD.org">Warner Losh</a></p>
-
-      <p>Right now the kernel is built twice: once for the static
-        modules in the kernel, and once for the dynamically loaded.
-        There's also inconsistent dependency tracking.  We should fix
-        this.  Bikeshed included, along with three colors of
-        paint.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good C programming skills</li>
-  <li>Good kernel debugging skills</li>
-  <li>Ability to withstand Bikesheds</li>
-</ul>
-      </desc>
-    </idea>
-
-  </category>
-
-  <category>
-    <title>File System</title>
-
-    <idea id="extenddump">
-      <title>Improve the performance of dump/restore</title>
-
-      <desc><p>A performance evaluation of the split cache (as is) and an unified cache
-  (like e.g. NetBSD) would be interesting.  More details in <a
-    href="http://lists.freebsd.org/pipermail/freebsd-hackers/2007-February/019666.html">
-  this</a> mail to the hackers mailing list.  Additional improvements are
-  welcome too.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Knowledge of C programming.</li>
-  <li>Basic understanding of backup/restore procedures.</li>
-</ul>
-      </desc>
-    </idea>
-
-    <idea id="portext2fs" class="soc2009">
-      <title>Analyze NetBSD's ext2fs regarding valuable improvements</title>
-
-      <desc><p>FreeBSD has an implementation of the ext2fs filesystems
-        but it contains some files under the GPL which make it undesirable,
-        among other things, to use it in the GENERIC kernel. Ext2fs is a rather
-        simple but practical filesystem and NetBSD has had for <a
-        href="http://ezine.daemonnews.org/200006/ext2fs.html">a while</a>
-        an <a href="http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/ufs/ext2fs/">
-        implementation</a> based on UFS1 sources. The NetBSD implementation
-        needs to be analyzed regarding features and performance. If it is
-        on par or better with our GPLed implementation, it should be
-        ported to FreeBSD.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Knowledge of C programming.</li>
-  <li>Basic understanding of filesystems.</li>
-</ul>
-      </desc>
-    </idea>
-
-    <idea id="ext34fs" class="soc">
-      <title>Enhance FreeBSD ext2fs to support preallocation, ext3, and
-	ext4</title>
-
-      <desc><p><strong>Technical contact</strong>: <a
-	href="mailto:lulf@FreeBSD.org">Ulf Lilleengen</a></p>
-
-      <p>During Google Summer of Code, Aditya Sarawgi created a GPL-free
-	implementation of ext2fs for FreeBSD, which has now been completed.
-	However, there are several avenues for potential further work:</p>
-
-      <ul>
-	<li>Implement preallocation in ext2fs; the GPL-licensed preallocation
-	  code present in the previous implementation was removed, but it may
-	  well be desirable to add it back.  This should be driven by
-	  benchmarking and performance analysis.</li>
-	<li>Update ext2fs to be able to read ext4 file systems, and possibly
-	  add other functionality from newer ext file system versions.</li>
-      </ul>
-      </desc>
-    </idea>
-
-    <idea id="portntfs" class="soc">
-      <title>Port Darwin's NTFS implementation</title>
-
-      <desc>
-	<p>The <a href="http://www.opensource.apple.com/source/ntfs/ntfs-65.2/kext/">Kernel</a>
-	  part of NTFS implementation on Mac OS X is dual licensed under both a
-	  3-clause BSD and GPL license, and supports writing.</p>
-      </desc>
-    </idea>
-
-    <idea id="portudf" class="soc">
-      <title>Port NetBSD's UDF implementation</title>
-
-      <desc><p><strong>Technical Contact</strong>: <a
-	href="mailto:avg@FreeBSD.org">Andriy Gapon</a></p>
-
-      <p><strong>Technical references</strong>:
-        M. McKusick, G. Neville-Neil, <a
-	href="http://www.awprofessional.com/titles/0201702452">
-	The Design and Implementation of the FreeBSD Operating System
-	</a>
-	(ISBN 0-201-70245-2), <a
-        href="http://www.osta.org/specs/pdf/udf260.pdf">UDF 2.60 OSTA
-	Specification </a>
-	, <a
-	href="http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-167.pdf">
-	Volume and File Structure for Write-Once and Rewritable Media
-	using Non-Sequential Recording for Information Interchange
-	</a></p>
-
-      <p>FreeBSD has an implementation of the UDF filesystem
-        but it is quite aged and doesn't support many features from newer UDF
-	revisions (&gt;=2.01), it's also readonly.
-	NetBSD implementation by Reinoud Zandijk supports most of UDF features
-	and has write support too. Initial port could be readonly so that
-	at least newer pre-authored media (e.g. BD) is accessible.
-	Porting write support is a bit trickier.
-        </p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good knowledge of C programming.</li>
-  <li>Basic understanding of VFS, buffer cache and filesystem implementation.</li>
-</ul>
-      </desc>
-    </idea>
-
-    <idea id="colocation">
-      <title>Implement co-location for UFS2</title>
-
-      <desc><p>While FreeBSD's FFS includes many advanced features, such as
-	snapshots and soft updates, Greg Granger <a
-        href="http://www.ece.cmu.edu/~ganger/papers/cffs.html">has proposed</a>
-        other strategies that would be useful, especially when working
-        with small files. Quoting Greg Ganger: "The key insight for why
-        current file systems perform poorly is that locality is insufficient
-        - exploiting disk bandwidth for small data objects requires that
-        they be placed adjacently". Explicit grouping, in particular, seems
-        to provide important performance improvements without less
-        implementation complexity than embedded inodes. As this changes
-        the on-disk structure, care needs to be taken that the
-        implementation is backwards compatible.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Ability to read and understand foreign C code.</li>
-  <li>Ability to write C code.</li>
-  <li>Knowledge of the UFS2 filesystem.</li>
-</ul>
-      </desc>
-    </idea>
-
-    <idea id="mdfs">
-      <title>MDFS lockups</title>
-
-      <desc><p>Fix MDFS lockups when using async operation modes.  <a
-  href="&cgibase;/cvsweb.cgi/sys/dev/md/md.c#rev1.115">Revision 1.115 of
-  md.c</a> has a discussion of the problem.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Ability to read and understand foreign C code.</li>
-  <li>Ability to write C code.</li>
-  <li>Knowledge of the VFS and VMA subsystems.</li>
-</ul>
-      </desc>
-    </idea>
-
-    <idea id="mpsafe-filesystem-work" class="soc">
-      <title>MPSAFE filesystem work</title>
-
-      <desc>
-        <p><strong>Technical contact</strong>: <a href="mailto:kib@FreeBSD.org">Konstantin Belousov</a></p>
-
-	<p>FreeBSD 6.0 introduced an multi-processor scalable Virtual File
-	  System (VFS) Framework, allowing file systems to operate without the
-	  Giant lock.  Many of the most commonly used file systems have been
-	  adapted to be MPSAFE (i.e., not reliant on Giant), such as UFS, the
-	  NFS client and server, UDF, cd9660, ZFS, and most recently the
-	  msdosfs (FAT) file system.  However, in order to remove the
-	  compatibility shims permitting a file system to declare itself
-	  non-MPSAFE, all file systems must be converted.  The list of
-	  remaining file systems includes ntfs, hpfs, coda, smbfs, and ncpfs.
-	  This project idea is to take one or more file systems and convert
-	  them to use their own locking, rather than relying on the Giant
-	  lock.  In some cases, this requires also adapting underlying
-	  infrastructure: for example, smbfs relies on the netsmb RPC
-	  framework, and ncpfs on the netcp RPC framework, both of which will
-	  also require conversion.</p>
-      </desc>
-    </idea>
-
-  </category>
-
-  <category>
-    <title>Kernel</title>
-
-    <idea id="fifo-optimizations" class="soc2009">
-      <title>FIFO optimizations</title>
-
-      <desc><p><strong>Technical contact</strong>: <a href="mailto:kris@FreeBSD.org">Kris Kennaway</a></p>
-
-      <p>Evaluate the possibility of merging the FIFO implementation
-        with the pipe implementation for improved performance.  Care
-        would need to be taken to avoid regressions, so part of this
-        project should be attention to previous and existing FIFO bug
-        reports, and writing of conformance testing to verify correct
-        behaviour.  Possible extensions might include a re-evaluation
-        of some of the performance tradeoffs made in the pipe code in
-        light of modern CPUs.</p>
-      </desc>
-    </idea>
-
-    <!--
-    <idea id="pmc-modern-cpus" class="soc">
-      <title>PMC support for modern CPUs</title>
-
-      <desc><p><strong>Technical contact</strong>: <a
-	href="mailto:jkoshy@FreeBSD.org">Joseph Koshy</a>,
-	href="mailto:gnn@FreeBSD.org">George Neville-Neil</a></p>
-
-      <p>Part of this project would be to add support to PMC for
-        running on modern x86 CPUs.  This is a relatively
-        self-contained project but requires a bit of immersion in the
-        code and the CPU manuals.</p>
-
-      </desc>
-    </idea>
-    -->
-
-    <idea id="timecounter-perf" class="soc">
-      <title>Timecounter Performance Improvements</title>
-
-      <desc>
-        <p><strong>Technical contact</strong>: <a href="mailto:kris@FreeBSD.org">Kris Kennaway</a></p>
-
-	<p>The gettimeofday syscall is a performance bottleneck in
-	  certain applications.  An approach taken by other operating
-	  systems is to export the time counter to userland via a
-	  shared page, and to update it periodically (a prototype
-	  implementation is available).  For some time consumers this
-	  is sufficient resolution.  Other consumers need higher
-	  resolution.  On the x86 architecture the TSC timecounter can
-	  be read from userland.  However depending on the hardware
-	  there may be issues with synchronization between CPUs, as
-	  well as interaction with CPU frequency changes.  With care
-	  it can be used as a delta against the timestamp updated by
-	  the kernel to provide improved resolution and avoid the need
-	  for the syscall.</p>
-      </desc>
-    </idea>
-
-    <idea id="autoreport" class="soc">
-      <title>Automated kernel crash reporting system</title>
-
-      <desc>
-<p><strong>Technical contact</strong>: <a href="mailto:delphij@FreeBSD.org">Xin LI</a>, <a
-  href="mailto:howardsu@FreeBSD.org">Howard SU</a></p>
-
-<p>In some recent operating systems, it is common that crashes are
-  automatically reported to its vendor, which is very helpful for
-  finding hidden problems that can not be easily triggered by usual
-  test cases.  Newer GNOME applications also have similar functionalities.</p>
-
-<p>This project would consist two parts.  One is some improvements over
-  the current savecore rc.d script to teach it how to collect necessary
-  information (of course, automatic reporting has to be explicitly enabled
-  by individual system administrators, and should have at least three
-  options: not to send out anything at all as a default, send out after
-  administrator confirmation, and automatically send all necessary information).
-  The FreeBSD kernel in 8-current has the textdump feature which may
-  be interesting to use for this part</p>
-
-<p>Another part after the first one is finished is the server side one,
-  which will keep a database of backtraces where similar (call stack
-  minus addresses) reports are kept together and be considered as a
-  "vote", to make it possible for developers and release engineers
-  to focus on the most commonly triggered issues.</p>
-
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Strong knowledge of C.</li>
-  <li>Understanding of kernel debugging.</li>
-  <li>Knowledge about web application as well as database.</li>
-  <li>Understanding of user privacy protection.</li>
-</ul>
-      </desc>
-    </idea>
-
-    <idea id="setproctitle" class="soc2007">
-      <title>Avoiding syscall overhead</title>
-
-      <desc>
-<p><strong>Technical contact</strong>:
-  <a href="mailto:attilio@freebsd.org">Attilio Rao</a>,
-  <a href="mailto:kris@FreeBSD.org">Kris Kennaway</a></p>
-
-<p>setproctitle() calls are a serious
-  performance bottleneck in a default pgsql configuration (they are
-  called at least once per query, which might be thousands of times per
-  second - I measured a performance impact of about 33% on sysbench).</p>
-
-<p>One idea for avoiding the syscall (and global sysctl lock) overhead
-  for this kind of thing would be a memory page shared between kernel
-  and userland which libc could read/write to access things like the
-  process title.  There are potentially many other data values that
-  could be optimized by a similar method.  This is presumably a well
-  established technique in other OSes.</p>
-
-<p>This project requires mentoring/review/planning with someone with
-  significant VM experience to make sure this approach
-  works properly.  Done incorrectly, this could result in fairly
-  massive security holes, performance issues (perhaps not visible in
-  simple benchmarks), etc.</p>
-
-<p>Work is currently in progress on this and is undergoing review.
-  It is not complete, but interested parties should contact Attilio
-  before beginning work.</p>
-
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Strong knowledge of C.</li>
-  <li>Understanding of kernel VM.</li>
-</ul>
-      </desc>
-    </idea>
-
-    <idea id="dynamiccpu" class="soc">
-      <title>CPU online/offline project</title>
-      <desc>
-	<p><strong>Technical contact</strong>: <a
-	  href="mailto:jhb@FreeBSD.org">John Baldwin</a>, <a
-	  href="mailto:attilio@FreeBSD.org">Attilio Rao</a></p>
-
-	<p>The project would need to extend the current CPU states of
-	  absent and present to include absent, offline, and online.  A
-	  set of event handlers (probably using EVENTHANDLER(9)) will
-	  need to be created to allow subsystems to be notified of CPU
-	  state changes.  At a minimum, the functionality of the
-	  current 'hlt_cpus_mask' should be reimplemented in both the
-	  4BSD and ULE schedulers using this mechanism.  Note that the
-	  ability to disable all but one thread within a core must
-	  still be supported easily.  (This is currently done on x86
-	  via the machdep.hyperthreading_allowed sysctl.)  Each
-	  subsystem that uses CPU_ABSENT() will need to be evaluated to
-	  see if it needs updating to handle online vs offline CPUs.
-	  Further improvements may include teaching UMA to free per-CPU
-	  buckets when a CPU is taken offline.</p>
-	<p><strong>Requirements</strong>:</p>
-	<ul>
-	  <li>Strong knowledge of C.</li>
-	  <li>Experience with multi-threaded programming.</li>
-	  <li>Experience with kernel programming.</li>
-	</ul>
-      </desc>
-    </idea>
-
-    <idea id="scalableprimitives" class="soc">
-      <title>SMP scalability improvements for core primitives</title>
-      <desc>
-	<p><strong>Technical contact</strong>: <a
-	  href="mailto:attilio@FreeBSD.org">Attilio Rao</a>, <a
-	  href="mailto:jhb@FreeBSD.org">John Baldwin</a>.</p>
-
-	<p>FreeBSD SMP scalability has improved dramatically over the last
-	  ten years as a result of the now-complete SMPng project, which
-	  converted FreeBSD from a single Giant kernel lock to fine-grained
-	  locking and strong 8-core scalability.  As commodity hardware is
-	  now reaching 16-24 cores, some low-level primitives in the SMP
-	  implementation must be revisited.  In particular, 32 or 64-CPU
-	  limits are encoded in the CPU mask primitive (cpumask_t), and
-	  spin locks offer higher than desired cache line contention as well
-	  as unfairness.  This project would combine these two related tasks
-	  by improving the expressibility of CPU masks and per-CPU objects
-	  and improving the scalability of the spinlock implementation.  It
-	  is especially important that the latter portion of the work be
-	  driven by real-world measurement using workloads that trigger the
-	  specific problem, and experimentation with primitives across
-	  several types of hardware.</p>
-
-	<p>Note: a spinlock backoff patch has already been proposed, but not
-	  yet properly evaluated, and would make a good starting point for
-	  this work.</p>
-
-	<p><strong>Requirements</strong>:</p>
-	<ul>
-	  <li>Strong knowledge of C.</li>
-	  <li>Experience with multi-threaded programming.</li>
-	  <li>Experience with kernel programming.</li>
-	</ul>
-      </desc>
-    </idea>
-
-    <idea id="umtx">
-      <title>Rewrite umtx - userspace mutex system calls</title>
-      <desc>
-	<p><strong>Technical contact</strong>: <a
-	  href="mailto:attilio@FreeBSD.org">Attilio Rao</a></p>
-
-	<p>umtx is the underbelly of the FreeBSD pthreads synchronization
-	  primitives, allowing kernel-assisted sleeping, wakeups, priority
-	  propagation, and other features supporting efficient mutexes and
-	  reader-writer locks in userspace.  As kernel features have evolved
-	  (such as the addition of a sleepqueue primitive), hardware
-	  scalability has grown, and application-writer expectations have
-	  changed, some weaknesses have come to light.  In particular, there
-	  are concerns about overhead and scalability with highly-threaded
-	  applications.  This project would profile and evaluate the existing
-	  system call service provided by umtex, and consider cleanups,
-	  optimizations, and the application of newer algorithms to improve
-	  functionality and performance.  The effectiveness of the rewrite
-	  would be demonstrated through careful testing with sensitive
-	  workloads, such as MySQL on 16-core systems.</p>
-
-	<p><strong>Requirements</strong>:</p>
-	<ul>
-	  <li>Strong knowledge of C.</li>
-	  <li>Experience with multi-threaded programming.</li>
-	  <li>Experience with kernel programming.</li>
-	</ul>
-      </desc>
-    </idea>
-
-      <idea id="docsysctl">
-        <title>Document all sysctls</title>
-        <desc>
-<p><strong>Technical contacts</strong>: <a
-  href="mailto:mat@FreeBSD.org">Mathieu Arnold</a>, <a
-  href="mailto:brd@FreeBSD.org">Brad Davis</a></p>
-<p>The sysctl(8) utility retrieves kernel states and allows processes with
-  appropriate privilege to change kernel states.  On request it is able to
-  display description lines which document the kernel state.  Unfortunately
-  not every sysctl is documented.  This task is possible to share with other
-  volunteers.  mat has done some development in Perforce, in the
-  mat_sysctl_cleanup branch.</p>
-<ul>
-  <li>Find every undocumented sysctl in the kernel.</li>
-  <li>Try to determine what this sysctl is for and document it.</li>
-</ul>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Ability to read and understand foreign C code.</li>
-</ul>
-        </desc>
-      </idea>
-
-      <idea id="docsound">
-	<title>Document the sound subsystem</title>
-
-	<desc>
-<p><strong>Technical contacts</strong>: <a
-  href="mailto:netchild@FreeBSD.org">Alexander Leidinger</a>, <a
-  href="mailto:ariff@FreeBSD.org">Ariff Abdullah</a></p>
-<ul>
-  <li>Add sound subsystem related section 9 manual pages, so far no sound
-    subsystem related manual pages exists.</li>
-  <li>Add an example driver in share/examples which allows to write a new
-    driver. For this purpose the example driver should contain enough
-    documentation as comments and/or pointers to documentation in man-section
-    9. This work can be based upon <a
-    href="http://people.FreeBSD.org/~cg/template.c">this template.</a></li>
-  <li>Rewrite the sound subsystem chapter in the FreeBSD Architecture Handbook.
-    The rewrite should contain an overview of the available parts in the sound
-    subsystem and how they interact (data flow, dependencies, ...) and fit
-    together. Additionally it should contain links to already available
-    documentation (official standards, section 9 manual pages, ...).</li>
-  <li>A <a href="http://wiki.freebsd.org/soundsystem">wiki page</a>
-    documenting everything related to the sound subsystem in FreeBSD has been
-    created.</li>
-</ul>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Ability to read and understand foreign C code.</li>
-  <li>Documentation writing skills.</li>
-</ul>
-
-        </desc>
-      </idea>
-
-      <idea id="dtrace" class="soc">
-	<title>DTrace</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:sson@FreeBSD.org">Stacey Son</a>, <a
-  href="mailto:rwatson@FreeBSD.org">Robert Watson</a></p>
-<p><strong>URL</strong>: <a
-  href="http://perforce.freebsd.org/depotTreeBrowser.cgi?FSPC=//depot/projects/dtrace">Perforce
-  repository</a>, <a
-  href="http://people.freebsd.org/~jb/dtrace/index.html">DTrace for
-  FreeBSD</a></p>
-<p>DTrace is a dynamic tracing facility designed by Sun Microsystems and
-  released in Solaris 10.  They have since released the major part of
-  Solaris under the banner of OpenSolaris and the Common Development and
-  Distribution License (CDDL) 1.0.  John Birrell has created an initial port
-  provides strong kernel functionality, but significant work remains to be
-  done.  Some ideas for projects:</p>
-<ul>
-  <li>It would be preferable to have a BSD-licensed CTF implementation, but
-    this requires careful documentation of the specification and a clean-room
-    implementation.</li>
-  <li>Tracing of user processes is not supported, and is a highly desirable
-    feature.</li>
-  <li>It would be quite useful to track changes to DTrace in OpenSolaris since
-    the initial port, merging enhancements and bug fixes that apply to
-    FreeBSD.</li>
-  <li>There has been some work to add static trace points for kernel
-    subsystems, such as VFS, the MAC Framework, privilege checking, etc.
-    However, it would be useful to add further static trace points to the
-    network stack, disk I/O subsystems, GEOM, etc.  It would be useful to do
-    this in a similar way to Solaris so that Solaris monitoring scripts could
-    be used in FreeBSD.</li>
-</ul>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Ability to read and understand foreign C code.</li>
-  <li>Ability to write C code.</li>
-  <li>A good understanding of the FreeBSD kernel.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="assembler">
-	<title>DWARF2 call frame information</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:kib@FreeBSD.org">Konstantin Belousov</a></p>
-<p>A debug kernel is not able to show stack traces with cross exceptions
-  anymore.  This is because we do not emit any dwarf2 call frame information
-  for any assembler code, since gdb switched to the dwarf2 format.  A volunteer
-  should annotate every assembler file [*.[sS]] with dwarf2 call frame
-  information.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Knowledge of assembly code.</li>
-  <li>Knowledge of ".cfi_*" pseudo-ops to insert dwarf2 frame descriptors.</li>
-</ul>
-	</desc>
-      </idea>
-
-    <idea id="kernel-dvb" class="soc">
-      <title>Kernel support for linux DVB device drivers</title>
-
-      <desc>
-<p><strong>Technical contact</strong>: <a href="mailto:luigi@FreeBSD.org">Luigi Rizzo</a></p>
-
-<p>In early 2007 we started a project to support
-  building Linux device drivers on FreeBSD.
-  This was done through an in-kernel emulation layer, which
-  implements part of the linux kernel API on top of the FreeBSD
-  kernel API.  The initial implementation was good enough to
-  support a few USB webcam drivers, and is documented
-  <a
-href="http://info.iet.unipi.it/~luigi/FreeBSD/linux_bsd_kld.html">here</a>.
-  The code is actually available as a port, devel/linux-kmod-compat,
-  and a popular driver that uses this infrastructure is
-  multimedia/linux-gspca-kmod.
-</p>
-<p>We would like to use a similar approach to add support
-  for DVB devices, which are widely supported in Linux
-  but not in FreeBSD. In particular we expect the project to provide,
-  within the FreeBSD kernel, enough of linux compatibility to build
-  the core components of the drivers/media/ linux kernel, and then
-  a few device drivers including one for a PCI DVB card (e.g.
-  saa7134-based).
-</p>
-
-<p>Before the start of the project, a Summer of Code applicant is expected to
-  i) become familiar with the approach used by linux-kmod-compat;
-  ii) set up a proper test environment, with a couple of DVB devices
-  supported by linux, and a working linux installation so that
-  one can compare results;
-  iii) become familiar with the architecture of the linux code in
-  drivers/media.
-<br/>
-  Probably the attention should be focused in PCI devices, because
-  at this stage the USB stack is in a transition phase and would
-  pose some additional difficulties.
-</p>
-<p>
-  Expected results are a working porting infrastructure, a working
-  linux-dvb-kmod device driver, and a working application to demonstrate
-  that the driver is working as expected. We suggest to look at
-  "kaffeine" for which a FreeBSD port already exists.
-</p>
-      </desc>
-    </idea>
-
-      <idea id="ktrace">
-	<title>Extend ktrace/kdump output</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:netchild@FreeBSD.org">Alexander Leidinger</a></p>
-<p>The ktrace(1) facility allows to monitor what running processes do.  It
-  allows to determine if a process is stuck or if it still does useful work.
-  The goal of this item is to look at the kernel interfaces, add missing
-  "pieces" (e.g. syscall's) to the ktrace output and to extend the output
-  with "decoded" (translating hex/dec values into human readable
-  information, e.g. O_RDONLY in the case of open(2)) information.  Some work
-  has been completed and committed, but a few parts still remains.  More
-  information is available <a
-  href="http://lists.freebsd.org/pipermail/freebsd-arch/2006-April/005107.html">here</a>.</p>
-<p>Also, a related project would be to modify ktrace to write to pipes.
-  Currently the ktrace infrastructure requires the dump output go to a file.
-  It would be useful to be able to instead have it write to pipe, or in fact
-  any type of file descriptor.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Knowledge of C.</li>
-  <li>Good knowledge of POSIX interfaces or how to use man(1).</li>
-  <li>No fear to look into the kernel sources.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="fastcall" class="notsoc">
-	<title>Fast syscall support for FreeBSD/i386</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:attilio@FreeBSD.org">Attilio Rao</a>, <a
-  href="mailto:jeff@FreeBSD.org">Jeff Roberson</a></p>
-<p>The instruction pair sysenter and sysexit can contribute to certain
-  performance improvements when a syscall is made on IA32.  There is however
-  no implementation of this available for FreeBSD, so a volunteer
-  would have to add sysenter/sysexit support to the kernel.  This
-  needs to be properly evaluated and benchmarked though, so a complete
-  implementation should therefore also contain informative benchmarks which
-  shows a clear improvement in performance.  It is also important to stress
-  the fact that this project is of research quality and measures should be
-  taken to ensure that no regressions are introduced.  Another interesting
-  extension to this project would be to investigate and evaluate the
-  possibility to use mmx/xmm registers to gather syscalls arguments.
-  <a href="mailto:davidxu@FreeBSD.org">David Xu</a> has some <a
-  href="http://lists.freebsd.org/pipermail/freebsd-current/2006-July/064403.html">work
-  in progress</a> in his <a
-  href="http://perforce.freebsd.org/depotTreeBrowser.cgi?FSPC=//depot/user/davidxu/sysenter">sysenter</a>
-  branch in the perforce repository.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Ability to read and understand foreign C code.</li>
-  <li>Ability to write C code.</li>
-  <li>Ability to write and understand x86 assembly.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="geninput" class="soc2007">
-	<title>Generic input device layer</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:philip@FreeBSD.org">Philip Paeps</a></p>
-<p><strong>WIP</strong>: <a href="http://wiki.freebsd.org/GenericInputDeviceLayer">http://wiki.freebsd.org/GenericInputDeviceLayer</a></p>
-<p>The kernel is lacking a generic input device layer analogous to the Linux
-  'input core' layer.  Having such a layer would make it easy to write e.g.
-  touchscreen support (Philip Paeps has some work-in-progress regarding pointer
-  devices and touchscreen support, but not enough time to also cover keyboard
-  support or other generic features).  This project was worked on as part of
-  Google Summer of Code 2007, and you can find <a
-  href="http://wiki.freebsd.org/GenericInputDeviceLayer">more information on
-  the FreeBSD.org wiki</a></p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Ability to read and understand foreign C code.</li>
-  <li>Ability to write C code.</li>
-</ul>
-	</desc>
-      </idea>
-
-    <idea id="interactive-splash">
-      <title>Interactive Splash Screen</title>
-
-      <desc><p>Improve upon / replace the existing static VESA splash
-        screen support in FreeBSD, with a script-driven back-end,
-        which allows animation in the loading graphics. This would
-        greatly improve the bootup experience for desktop users, while
-        providing graphical feedback to the startup of the kernel /
-        system services. Additionally this could be used to replace
-        the beastie.4th menu, with a VESA driven graphical loader
-        screen.</p></desc>
-    </idea>
-
-      <idea id="pcihotplug">
-	<title>PCI-Hotplug support</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:bms@FreeBSD.org">Bruce M. Simpson</a></p>
-<p><!-- Description needed --></p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Ability to read and understand foreign C code.</li>
-  <li>Ability to write C code.</li>
-  <li>A good understanding of low-level access of the hardware.</li>
-  <li>A good understanding of FreeBSD device drivers.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="per-job-limits" class="soc">
-	<title>Collective limits on set of processes (a.k.a. jobs)</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:brooks@freebsd.org">Brooks Davis</a></p>
-
-<p>In SGI's Irix operating system, there is a concept of a job which is
-  a collection of processes.  These processes share a set of resource
-  limits similar to those accessible through the set/getrlimit and
-  getrusage system calls.  Schedulers such as Sun Grid Engine currently
-  implement tracking the processes that make up a job and enforcing
-  collective limits on them in an adhoc manner.  Having first class
-  kernel support would be useful.</p>
-
-<p>It seems most likely that implementing something like the Irix
-  interface would be the most useful approach since that would enable us
-  to leverage existing code.  Implementers will need to make sure that
-  the job construct has no negative performance implications when not
-  enabled (ideally, processes that are not part of jobs should be
-  unaffected) and quantify the impact on performance when enabled.</p>
-
-<p><strong>References</strong>: <a
-  href="http://techpubs.sgi.com/library/tpl/cgi-bin/browse.cgi?cmd=search&amp;coll=0650&amp;db=man&amp;pth=&amp;srch=jid_t&amp;searchpth=man&amp;rpt=20">Irix
-  Man Pages mentioning jid_t</a></p>
-
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good knowledge of C.</li>
-  <li>Kernel awareness.</li>
-  <li>Ability to implement functionality from interface specifications.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="psched" class="soc2009">
-	<title>Geom-based Disk Schedulers</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:luigi@freebsd.org">Luigi Rizzo</a></p>
-<p>In a 2005 GSoC project, "Pluggable Disk Schedulers", Emiliano
-  Mennucci explored the feasibility of pluggable disk schedulers
-  for FreeBSD. The project was successful, but we could not explore
-  certain approaches (e.g. "anticipation", where requests are delayed
-  hoping that some future ones can served without a seek) due to
-  architectural limitations the kernel had at the time.
-</p>
-<p>
-  Since then, the GEOM infrastructure has become available on FreeBSD
-  for interacting with disk I/O requests. GEOM has enabled us to
-  work on disk schedulers in a much more flexible way, allowing a
-  much faster development of disk scheduling algorithms. With
-  Fabio Checconi, we have developed a prototype
-  implementation of some anticipatory schedulers, see
-  <a href="http://info.iet.unipi.it/~luigi/FreeBSD/#geom_sched">GEOM_SCHED</a>.
-</p>
-<p>
-  GEOM_SCHED works within the geom layer, i.e. above the device driver
-  where queueing of requests may actually occur. The way GEOM_SCHED
-  does scheduling is by limiting the number of outstanding requests
-  to the device, and the performance implications of this approach
-  need to be measured. An alternative approach is to push the
-  scheduler (using the same algorithms developed in GEOM_SCHED,
-  and most likely the same code) within the device drivers. This less general
-  (as it needs to be replicated in all drivers) but it may be
-  an interesting thing to do e.g. for some popular device drivers
-  such as ATA.
-</p>
-<p>
-  The proposed SoC work can address one or more of the following
-  aspects:
-<ul>
-<li>implement suitable classifiers for disk requests;</li>
-<li>implement techniques for the auto-tuning of
-  the scheduler parameters;</li>
-<li>measure the performance implications
-  of doing scheduling above the device driver, and possibly design
-  and implement a suitable mechanism to push the GEOM_SCHED
-  module within the device driver itself.</li>
-</ul>
-  Ultimately, we expect to end up with a production quality subsystem
-  for use in FreeBSD.
-</p>
-<p><strong>References</strong>: <a
-  href="http://wiki.freebsd.org/moin.cgi/Hybrid">The Pluggable Disk
-  Schedulers SoC project</a>, <a
-  href="http://www.happyemi.org/hybrid/">Patches</a></p>
-
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Ability to read and understand foreign C code.</li>
-  <li>Ability to write C code.</li>
-  <li>Knowledge of GEOM (or interest in getting familiar with it).</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="suspend">
-	<title>Suspend to disk</title>
-
-	<desc>
-<p>Implement a suspend/resume from disk mechanism.  Possibly use the dump
-  functions to dump pages to disk, then use ACPI to put the system in S4 or
-  power-off.  Resume would require changes to the loader to load the memory
-  image directly and then begin executing again.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good knowledge of C.</li>
-  <li>Understanding of the hardware/software interface.</li>
-  <li>A laptop that works with ACPI.</li>
-  <li>Kernel awareness.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="bootcode">
-	<title>Sync FreeBSD i386 boot code with DragonFly</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:jhb@FreeBSD.org">John Baldwin</a></p>
-<p>DragonFly invested a lot of time to clean up and document it.  Additionally
-  they fixed some bugs.  Interesting files in the DragonFly CVS are
-  sys/boot/i386/bootasm.h, sys/boot/i386/bootasmdef.c, sys/boot/boot0/*,
-  sys/boot/boot2/*, sys/boot/i386/btx/*, sys/boot/i386/cdboot/*,
-  sys/boot/i386/libi386/amd64_tramp.S, sys/boot/i386/libi386/biosdisk.c and
-  sys/boot/i386/loader/main.c.  An interested volunteer has to compare and
-  evaluate both implementations and port interesting/good parts.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Ability to read and understand foreign C code.</li>
-  <li>Ability to write C code.</li>
-  <li>Knowledge of i386 assembly.</li>
-  <li>Knowledge of BIOS interfaces.</li>
-  <li>Knowledge of low-level boot behavior.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="optreg">
-	<title>Make optional kernel subsystems register themselves via sysctl</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:kris@FreeBSD.org">Kris Kennaway</a></p>
-<p>Currently there is no way for e.g., a port makefile to tell whether
-  things like FreeBSD 5.x compatibility are present on the system (just
-  installing the compat5x port is not enough, you need a kernel built
-  with COMPAT_FREEBSD5).  All such optional kernel features need to
-  register themselves with the <a
-  href="http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/sysctl.h.diff?r1=1.154;r2=1.155;f=h">FEATURE
-  macro</a> so that the userland can easily query whether a given
-  feature is present. So far not all kernel features are using this
-  infrastructure.</p>
-<p>There needs also to be a way to spoof those values, e.g., when the
-  ports build cluster is building for older FreeBSD versions in a jail.
-  Suport for this is not available in the FEATURE macro.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good knowledge of C.</li>
-  <li>Kernel awareness.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="efi">
-	<title>EFI support for FreeBSD/i386 and FreeBSD/amd64</title>
-	<desc>
-	  <p><strong>Technical contact</strong>: <a
-	    href="mailto:rpaulo@FreeBSD.org">Rui Paulo</a></p>
-	  <p>Finish EFI support on the i386/amd64 ports. Final work
-	    should be able to boot a FreeBSD kernel into single user
-	    mode, at least.</p>
-
-	  <p><strong>Requirements</strong>:</p>
-	  <ul>
-	    <li>Good knowledge of C.</li>
-	    <li>Deep understanding of the boot process and EFI.</li>
-	    <li>A system running EFI 1.0 (Intel Macs, for example)</li>
-	  </ul>
-
-	</desc>
-
-      </idea>
-
-  </category>
-
-  <category>
-    <title>Networking</title>
-
-      <idea id="csup">
-	<title>csup improvements</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:lulf@FreeBSD.org">Ulf Lilleengen</a></p>
-<p><strong>URL's</strong>: <a
-  href="http://mu.org/~mux/csup.html">csup homepage</a>, <a
-  href="http://www.freebsd.org/cgi/cvsweb.cgi/projects/csup/">CVSweb</a>
-  </p>
-<p>csup is a port of the cvsup high-speed CVS repository replication
-  application from the original Modula-3 to the C language.  It is now
-  distributed with FreeBSD, but is missing some important features that would
-  make useful projects to work on:</p>
-<ul>
-  <li>Working rsync support.</li>
-  <li>Optimize rcsfile handling.</li>
-  <li>Create a library out of the ports that might be of use in a C language
-    csupd.</li>
-  <li>Add support for shell commands sent by the server.</li>
-  <li>Add missing support for various CVSup options: -D, -e and -E (requires
-    shell commands support) and the destDir parameter.</li>
-  <li>Work on a new csupd.</li>
-</ul>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Strong knowledge of C.</li>
-  <li>Good knowledge of POSIX standards.</li>
-  <li>Ability to work with multi-threaded applications.</li>
-</ul>
-
-	</desc>
-      </idea>
-
-      <idea class="soc" id="tcpipreg">
-	<title>TCP/IP regression test suite</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:rwatson@FreeBSD.org">Robert Watson</a>, <a
-  href="mailto:gnn@FreeBSD.org">George V. Neville-Neil</a></p>
-
-<p>Design and implement a wire level regression test suite to exercise
-  various states in the TCP/IP protocol suite.  Ideally with both IPv4
-  and IPv6 support.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Strong TCP/IP knowledge.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea class="soc2008" id="passivelibpcapdetector">
-	<title>Passive libpcap based TCP session anomaly detector</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a href="mailto:andre@FreeBSD.org">Andre Opperman</a>.</p>
-
-<p>Listens on an interface and tracks all TCP sessions it sees.  In the
-  normal case only general information is carried forward (seq#/ack#,
-  negotiated SYN/ACK features, etc).  Whenever an anomaly happens -
-  that is a duplicate ACK, SACK response, out-of-order segment,
-  retransmission or others; it captures those packets into a tcpdump
-  file for later deep inspection with Wireshark or other tools.  This
-  tool is to be deployed on live hosts and passive monitors to collect
-  reliable condensed data about real-world behavior of TCP on the
-  global Internet.  Currently no such quantitative data exist and
-  contribution of such a tool that can be easily run is a significant
-  step in helping further development of TCP algorithms.</p>
-
-<p><strong>Difficulty</strong>: Medium, good familiarity with the TCP RFCs is
-  necessary and detection of many edge cases has to be implemented correctly.</p>
-       </desc>
-      </idea>
-
-      <idea id="wpa2preauth" class="soc">
-	<title>WPA2 preauthentication in hostapd</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:sam@FreeBSD.org">Sam Leffler</a>, <a
-  href="mailto:rpaulo@FreeBSD.org">Rui Paulo</a></p>
-<p>WPA2 is the authentication protocol defined as part of the IEEE 802.11i
-  specification.  This protocol is now commonly used to authenticate
-  wireless stations to access points.  Part of this protocol is the
-  ability to pre-authenticate a station with one or more access points
-  so that roaming can happen quickly.  FreeBSD lacks support for this
-  aspect of the protocol in the hostapd program used to construct a
-  WPA-enabled access point.  This task would port the Linux code that
-  exists to support pre-authentication in hostapd.  This mostly involves
-  rewriting some user-mode multicast code and testing the result.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good knowledge of C.</li>
-  <li>Wireless networking fundamentals.</li>
-  <li>WPA-capable wireless network setup.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="80211testing" class="soc">
-	<title>802.11 Fuzzing and Testing</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:sam@FreeBSD.org">Sam Leffler</a>,<a
-  href="mailto:rpaulo@FreeBSD.org">Rui Paulo</a></p>
-<p>Build a "packet fuzzer" tool that can be used to build test suites to
-  improve reliability of the 802.11 code against garbage data.  There are
-  various tools out but we're not aware of any good ones that work with 802.11
-  and are generally available.  The basic idea is to write a packet
-  injector/playback tool that's driven by a scripting language.  Then you
-  need to build up a database of test cases.  It's also possibly important
-  to do time-based playback.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good knowledge of C.</li>
-  <li>Wireless networking fundamentals.</li>
-  <li>WPA-capable wireless network setup.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="sctp">
-        <title>SCPS, Space Communication Protocol Standards</title>
-
-        <desc><p><a href="http://www.scps.org">SCPS</a> is a protocol suite
-          designed to allow communication over challenging
-          environments.  Originally developed jointly by NASA and
-          DoD's USSPACECOM, these protocols are used for commercial,
-          educational, and military environments.  A student project
-          in this area would involve implementing various network
-          protocols according to specification (SCPS File Protocol,
-          similar to FTP; SCPS-Transport Protocol, based on TCP; and
-	  others.)</p>
-        </desc>
-      </idea>
-
-      <idea id="tcp-uto" class="soc2009">
-	<title>Implement TCP UTO</title>
-	<desc>
-	  <p><strong>Technical contact</strong>: <a
-	    href="mailto:rpaulo@FreeBSD.org">Rui Paulo</a></p>
-
-	<p>Implement TCP UTO (User Timeout Option) as defined by RFC
-	5482.</p>
-
-	<p><strong>Requirements</strong>:</p>
-	<ul>
-	  <li>Good knowledge of C and TCP.</li>
-	  <li>Able to understand the FreeBSD TCP/IP stack.</li>
-	  <li>A testbed with at least two machines.</li>
-	</ul>
-
-	</desc>
-      </idea>
-
-
-    <idea id="multiqbpf" class="soc">
-      <title>Multiqueue BPF support and other BPF features</title>
-
-      <desc><p><strong>Technical contact</strong>: <a
-	href="mailto:rwatson@FreeBSD.org">Robert Watson</a></p>
-
-	<p>The Berkeley Packet Filter (BPF) allows packet capture filters to
-	  be compiled into a bytecode that is either interpreted by a kernel
-	  virtual machine, or compiled into native machine code via a JIT and
-	  executed in in-kernel.  Historically, the origin of packets has
-	  been the network interface, with each (synthetic) BPF device
-	  attached to exactly one NIC as requested by the application (for
-	  example, tcpdump).  However, network interfaces have become
-	  significantly more complicated, and BPF has had to grow to support
-	  new features, such as Data Link Types (DLTs), in which BPF devices
-	  can tap network processing at different layers.  This task would
-	  involve teaching BPF about a further dimension in network interface
-	  complexity: multiple input and output queues.</p>
-
-	<p>Modern 10gbps, and even 1gbps, network cards support multiple
-	  queues for various reasons: at first quality of service (QoS)
-	  differentiation in processing, but now especially to improve
-	  parallelism in network processing by distributing work to many CPUs
-	  on input.  This same technica can also accelerate packet capture,
-	  but BPF currently doesn't know this.  In this project, BPF would be
-	  enhanced to be aware of individual input and output queues on a NIC,
-	  which means providing network stack abstractions for these concepts,
-	  visible today only within device drivers.  Userspace threads might
-	  then use enhanced ioctl(2)s to query the set of available queues
-	  and attach to one or more.  Applications seeking maximum parallelism
-	  could open (n) devices, attaching each to a queue, and executing
-	  with appropriate CPU affinity.  Ideally this would involve neither
-	  lock nor cache line contention throughout the entire stack, from
-	  device driver to userspace delivery.</p>
-
-	<p><strong>Requirements</strong>:</p>
-	<ul>
-	  <li>Strong knowledge of C.</li>
-	  <li>Experience with multi-threaded programming.</li>
-	  <li>Experience with kernel programming.</li>
-	  <li>Familiarity with the TCP/IP protocol suite.</li>
-	</ul>
-      </desc>
-    </idea>
-
-    <idea id="80211sim" class="soc">
-      <title>Implement a simulated 802.11 wireless radio</title>
-      <desc>
-	<p><strong>Technical contact</strong>: <a
-	  href="mailto:rpaulo@FreeBSD.org">Rui Paulo</a></p>
-
-	<p>The FreeBSD 802.11 layer, net80211, implements a broad range of
-	  advanced functionality: station, access point, virtual access
-	  point, mesh networking, authentication/encryption, and more.  This
-	  task implements a net80211 driver simulating a wireless radio in
-	  order to allow protocol-layer testing without the hassle of real
-	  live hardware limitations: interference, signal propagation, and
-	  regulatory domains.  The driver should let the user specify a
-	  number of radios to be simulated, with an eye towards future work
-	  to simulate physical properties.</p>
-
-	<p>A useful reference for this work would be the notionally similar
-	  mac80211_hwsim driver in Linux
-	  (http://linuxwireless.org/en/users/Drivers/mac80211_hwsim), which
-	  might provide a model in some areas of the work, and has similarly
-	  been used on that platform to test hostapd/wpa_supplication.</p>
-
-	<p><strong>Requirements</strong>:</p>
-	<ul>
-	  <li>Good knowledge of C.</li>
-	  <li>Wireless networking fundamentals.</li>
-	</ul>
-      </desc>
-    </idea>
-
-  </category>
-
-  <category>
-    <title>Ports</title>
-      <idea id="ports-pkgtools">
-	<title>Package tools improvements</title>
-
-	<desc>
-<p>The pkg_* tools, which deal with the installation of pre-build binary package
-  of ports, could do with a code cleanup or maybe even a rewrite from
-  scratch.  Some features of the ports tree are not supported by the pkg_* tools,
-  e.g. versioned dependencies.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Strong knowledge of C code.</li>
-  <li>A basic understanding of the inner workings of the ports tree.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="fat-pkgs" class="soc">
-	<title>Complete (a.k.a. Fat) packages</title>
-	<desc>
-	  <p><strong>Technical contact</strong>: <a
-	    href="mailto:brooks@FreeBSD.org">Brooks Davis</a></p>
-	  <p>When bootstrapping systems it would be useful to be able to
-	    create a single package file that contains one or more packages
-	    and all the required dependent packages.  This is conceptually
-	    similar to, but different from PC-BSD's PBI package format.
-	    PBI's contain a private copy of all dependencies, fat packages
-	    would contain each individual package and once installed it would
-	    be as though each package was individually installed in the usual
-	    manner.</p>
-	  <p>This project would consist of additions to the pkg_tools
-	    to support creation and installation of a new package file format
-	    and to ports to build these packages.</p>
-	  <p><strong>Requirements</strong>:</p>
-          <ul>
-	    <li>Strong knowledge of C code.</li>
-	    <li>A basic understanding of the inner workings of the ports tree.</li>
-	  </ul>
-	</desc>
-      </idea>
-
-      <idea id="ports-performance" class="soc">
-      	<title>Performance improvement of the Ports system</title>
-
-	<desc>
-	  <p>A number of tasks of the Ports system can take quite a long time
-	    to perform.  Some are well known for traversing each and every port
-	    in the tree, e.g. building INDEX, which does not scale well with
-	    the number of ports being added to the collection.</p>
-	  <p>Detailed profiling of the most used commands in the ports
-	    framework needs to be done to analyze the bottlenecks and identify
-	    possible solutions.  Refactoring of the main file bsd.ports.mk
-	    is also necessary to improve code readability, but not at the
-	    cost of performance.</p>
-	  <p><strong>Requirements</strong>:</p>
-	  <ul>
-	    <li>Strong knowledge of make and shell code.</li>
-	    <li>Good understanding of the inner design of the Ports Collection.</li>
-	  </ul>
-	</desc>
-      </idea>
-
-  </category>
-
-  <category>
-    <title>Security</title>
-      <idea id="auditkernel" class="soc">
-	<title>Audit kernel event sources</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:rwatson@FreeBSD.org">Robert Watson</a></p>
-<p>
-A number of kernel security subsystems, such as IPFW and pf, generate
-security log data.  This task involves identifying potential sources of
-security event information in the kernel and modifying kernel subsystems to
-log that information using the kernel security event auditing system.
-User and programmer documentation of audit may be found on the <a
-href="http://www.trustedbsd.org/docs.html">TrustedBSD Documentation Page</a>.
-There are also extensive manual pages relating to audit in FreeBSD.  This
-project will require careful security analysis and kernel programming, and
-will likely need some re-working of the kernel audit framework (which is
-currently entirely focused on gathering user and kernel system call audit
-data).
-</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Strong C programming skills.</li>
-  <li>Familiarity with concurrent programming techniques.</li>
-  <li>General understanding of TCP/IP firewalls.</li>
-  <li>Willingness to read the CC/CAPP specification.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="distribaudit" class="soc">
-	<title>Distributed audit / log shipping daemon</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:rwatson@FreeBSD.org">Robert Watson</a>, <a
-  href="mailto:simon@FreeBSD.org">Simon Nielsen</a><br />
-<strong>WIP</strong>: <a
-href="http://wiki.freebsd.org/DistributedAuditDaemon">http://wiki.freebsd.org/DistributedAuditDaemon</a></p>
-<p>Create a tool to securely and reliably ship log files to remote hosts.
-The main focus is to manage per-machine audit records and submit them
-to a central site for processing and long-term archiving/management.
-Ideally with support for SSL (or the like) so they do not travel on
-the wire in the clear.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Strong (portable) C programming skills.</li>
-  <li>Knowledge of the audit subsystem.</li>
-  <li>OpenSSL knowledge a plus.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="mac" class="soc">
-	<title>Mandatory Access Control</title>
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:rwatson@FreeBSD.org">Robert Watson</a></p>
-<p>
-FreeBSD 5.0 was the first FreeBSD release to ship with support for Mandatory
-Access Control (MAC), an access control technology allowing system
-administrators to implement multi-level security, integrity protection, and
-other "mandatory" policies.  Policies may be compiled into the kernel, or
-loaded as loadable kernel modules.
-Later revisions of FreeBSD and the MAC Framework enhanced MAC support,
-and additional policy modules were made available, such as a port of the
-SELinux FLASK/TE framework available as a third party policy module.
-However, many of the sample MAC modules included with FreeBSD are considered
-experimental examples of what the technology can be used for, rather than
-production policies.
-For example, the Biba integrity policy can be deployed in production, but
-requires significant tuning to do so effectively.
-</p>
-<p>
-This task involves a general review of the MAC Framework and Policy modules,
-with the goal of identifying improvement areas.  It also involves specific
-cleanups, optimizations, and completeness work on specific policy modules --
-most importantly, the Biba and MLS sample labeled policy modules.  Work there
-includes improving memory overhead and efficiency; for example, moving from
-allocating complete labels for every labeled object to referencing common
-label storage where labels are identical, which occurs a great deal of the
-time in most systems.
-Other cleanups include moving towards a canonical/extensible on-disk label
-storage format, adding regression tests, investigating interactions with user
-applications, and writing documentation.
-</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Strong C programming skills.</li>
-  <li>Familiarity with OS security policies, including discretionary and
-    mandatory access control.</li>
-  <li>Familiarity with concurrent programming techniques.</li>
-  <li>Willingness to read the CC/CAPP specification.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="mac_policy" class="soc">
-	<title>Path-based file system MAC policy</title>
-	<desc>
-	  <p><strong>Technical contact</strong>: <a
-	    href="mailto:rwatson@FreeBSD.org">Robert Watson</a>, <a
-	  href="mailto:trustedbsd-discuss@TrustedBSD.org">TrustedBSD discuss
-	  mailing list</a></p>
-	  <p>The TrustedBSD MAC Framework makes it easy to extend the FreeBSD
-	    kernel security model using pluggable modules, which has provided
-	    support for "traditional" mandatory access control, as well as
-	    allowed a number of companies to build local security policy
-	    extensions for workstation, server, and appliance products; one
-	    such example is Apple's "Seatbelt" policy for Mac OS X.  However,
-	    the base system MAC policies are difficult to use, primarily
-	    because they either don't extend security meta-data (ugidfw) or
-	    they require extensive labeling (Biba, MLS).  This project idea
-	    involves crafting a new OS security policy extension along the
-	    lines of ugidfw, the file system firewall, but using path names
-	    instead of existing file properties to manage protection.  This
-	    requires careful thinking about what a file system path "is" in
-	    the UNIX environment, as well as regarding what sorts of
-	    policies would be useful.</p>
-	  <p><strong>Requirements</strong>:</p>
-	  <ul>
-	    <li>Strong C programming skills.</li>
-	    <li>Familiarity with OS security policies, including
-	      discretionary and mandatory access control.</li>
-	  </ul>
-	</desc>
-      </idea>
-
-      <idea id="securityregression" class="soc">
-	<title>Security regression tests</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:rwatson@FreeBSD.org">Robert Watson</a></p>
-<p>
-FreeBSD is undergoing constant and active improvement to all of its critical
-subsystems, from file systems to the network stack.  With any change, there
-is a risk of introducing bugs or regressions.  The goal of this task is to
-produce a security regression test suite, which encapsulates requirements
-regarding system security properties and tests that they (still) hold.  Areas
-to test include file system access control, privilege, authentication,
-cryptography, process containment, and more.  There are some current tests
-along these lines in the <a
-href="http://www.freebsd.org/cgi/cvsweb.cgi/src/tools/regression/">FreeBSD
-regression test tree</a>, but they are both incomplete and inadequate.
-New tests must be created; existing tests must be completed and updated.
-</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Strong C programming skills.</li>
-  <li>High tolerance for writing test code.</li>
-  <li>High tolerance for reading API specifications.</li>
-  <li>Rigorous and devious mindset.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="auditparse" class="soc">
-	<title>A New Audit Parsing API</title>
-
-	<desc>
-	<p><strong>Technical contact</strong>: <a
-	  href="mailto:rwatson@FreeBSD.org">Robert Watson</a>, <a
-	  href="mailto:trustedbsd-audit@TrustedBSD.org">TrustedBSD audit
-	  mailing list</a></p>
-
-	<p>The current OpenBSM audit parsing API has a number of limitations,
-	  not least that it can't handle little endian BSM records that may
-	  come from Solaris x86 systems, in terms of ABI robustness in the
-	  presence of new record types, ability to process trails generated
-	  non-locally in terms of supporting uid/gid->name translation, and
-	  in terms of incrementally processing a byte stream from, for
-	  example, socket sources without using the C FILE API.</p>
-
-	<p>This task would consider existing audit parsing APIs in the
-	  industry, including POSIX.1e, relevant Open Group specs, and in-use
-	  APIs on other systems such as Solaris, Linux, Windows NT, and
-	  others, in order to first identify an existing candidate API or
-	  design a new candidate API, then implement the API and adapt
-	  existing audit applications to use it.  The task would also
-	  document the API using man pages, create an audit parsing tutorial
-	  document, create a test suites, and require interaction with the
-	  OpenBSM and FreeBSD communities to identify audit parsing
-	  requirements.</p>
-
-	<p>If successful, the results of this work would be integrated into
-	  OpenBSM, the open source BSD-licensed audit framework shipped with
-	  FreeBSD and Mac OS X.</p>
-
-	<p><strong>Requirements</strong>:</p>
-	<ul>
-	  <li>Strong C programming skills.</li>
-	  <li>Past coursework or reading in the area of computer security.</li>
-	</ul>
-	</desc>
-      </idea>
-
-      <idea id="bsmconvert" class="soc">
-	<title>NT/Linux to BSM Conversion Tool</title>
-
-	<desc>
-	<p><strong>Technical contact</strong>: <a
-	  href="mailto:rwatson@FreeBSD.org">Robert Watson</a>, <a
-	  href="mailto:trustedbsd-audit@TrustedBSD.org">TrustedBSD audit
-	  mailing list</a></p>
-
-	<p>The BSM (Basic Security Framework) audit trail format is the de
-	  facto industry standard for portable operating system audit trails,
-	  being supported on Solaris, FreeBSD, and Mac OS X.  However, many
-	  other audit trail formats exist that are less portable, including
-	  audit trail formats local to Windows NT and Linux.</p>
-
-	<p>This task would create BSD-licensed conversion tools to import
-	  audit trails from other systems and convert them to BSM format so
-	  that they can be inspected and managed using the OpenBSM tool set.
-	  This would require the creation of BSD-licensed parsers for audit
-	  trail formats of interest, designing and documenting a semantic
-	  mapping to the BSM trail format, and writing conversion utilities
-	  using the new parsers, semantic mapping, and BSM generation
-	  routines in OpenBSM.  A key part of this work would be to
-	  rigorously understand and document the mapping and its limitations
-	  (for example, perhaps some Windows NT concepts can't be represented
-	  in BSM in a natural way, such as larger SID than UID fields, which
-	  is important information for anyone using BSM trails from NT
-	  systems).  A test suite is also required.</p>
-
-	<p>If successful, the results of this work would be integrated into
-	  OpenBSM, the open source BSD-licensed audit framework shipped with
-	  FreeBSD and Mac OS X.</p>
-
-	<p><strong>Requirements</strong>:</p>
-	<ul>
-	  <li>Strong C programming skills.</li>
-	  <li>Past coursework or reading in the area of computer security.</li>
-	</ul>
-	</desc>
-      </idea>
-
-      <idea id="appaudit" class="soc2009">
-	<title>Application-Specific Audit Trails</title>
-
-	<desc>
-	<p><strong>Technical contact</strong>: <a
-	  href="mailto:rwatson@FreeBSD.org">Robert Watson</a>, <a
-	  href="mailto:trustedbsd-audit@TrustedBSD.org">TrustedBSD audit
-	  mailing list</a></p>
-
-	<p>Currently, FreeBSD's audit trail support is a system-level
-	  facility, intended to track system-level security events.  However,
-	  as the affordability of computers has gone up, they are
-	  increasingly single-application systems, and applications are
-	  increasingly playing a role in the Trusted Code Base (TCB) of
-	  larger integrated computing systems.  As such, it is desirable to
-	  support reliable and secure auditing of application events that do
-	  not correspond to the traditional TCB components, such as events
-	  from databases, web servers, or virtual machines.  However, these
-	  events need to be handled separately, as they have quite different
-	  security and selection requirements.</p>
-
-	<p>This task would extend the FreeBSD kernel's audit framework to
-	  allow multiple concurrent audit trails to be maintained, reflecting
-	  different "slices" of the system.  The base slice would be the
-	  existing system audit trail, submitted to by the kernel itself, as
-	  well as using the audit(2) system call, and stored in /var/audit.
-	  New slices would be represented by named special devices in /dev,
-	  with ownership and permissions reflecting their desired application
-	  security properties; each slice would have its own audit worker and
-	  queue, with its own pipe reliability properties and target trail
-	  files.  This would require extending OpenBSM's auditd and libbsm to
-	  support multiple trails as well.  Finally, two or more sample
-	  applications would be modified to submit application-level
-	  auditing, such as the authentication routines in Apache and
-	  PostgreSQL.  This design would have several interesting properties,
-	  not least that audit trails submitted by applications would be
-	  protected from application tampering after submission, as the
-	  kernel would mediate access using the TCB.  Analysis of potential
-	  designs, security issues, documentation, and a test suite are
-	  required.</p>
-
-	<p>If successful, the results of this work would be integrated into
-	  the FreeBSD kernel and OpenBSM.</p>
-
-	<p><strong>Requirements</strong></p>
-	<ul>
-	  <li>Strong C programming skills.</li>
-	  <li>Past coursework or reading in the area of computer security.</li>
-	  <li>Past coursework in the area of operating system kernels.</li>
-	</ul>
-	</desc>
-      </idea>
-
-      <idea id="privmodel" class="soc">
-	<title>New kernel privilege model</title>
-
-	<desc>
-	  <p><strong>Technical contact</strong>: <a
-	    href="mailto:rwatson@FreeBSD.org">Robert Watson</a></p>
-
-	  <p>FreeBSD uses a largely standard UNIX privilege model, granting
-	    special OS rights to processes with an effective uid of 0.
-	    Exceptional behavior lies in securelevel (restricting root based
-	    on a global or per-jail level), Jail (limiting certain rights to
-	    ensure safe containment for a jailed root user), and the ability
-	    for the MAC Framework to augment privilege decisions.  However,
-	    as of FreeBSD 7.0, privilege decisions internal to the kernel
-	    have been made with respect to a large set of named privileges
-	    (priv.h).  This project idea is to create a new privilege model,
-	    similar perhaps to POSIX.1e or the Solaris privilege model,
-	    allowing masks of privileges to be associated with process
-	    credentials and managed with system calls.  Of particular
-	    interest is supporting the assignment of privileges to users or
-	    roles -- such as the right to bind low port numbers, use DTrace,
-	    etc.
-	  </p>
-	</desc>
-      </idea>
-
-  </category>
-
-  <category>
-    <title>Userland / Installation Tools</title>
-
-      <idea id="bsdelftools">
-	<title>BSD-licensed ELF Tools</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:jkoshy@FreeBSD.org">Joseph Koshy</a>, <a
-  href="mailto:kaiw@FreeBSD.org">Kai Wang</a></p>
-<p>Create BSD-licensed versions of ELF processing tools (e.g., <strong>ld</strong>,
-  <strong>dbx</strong>, <strong>as</strong> and others) using the ELF(3) and GELF(3)
-  API set. Identify overlapping functions in those tools and
-  create a library out of the common functions. Identify parts which can be
-  generated by tools (e.g., machine code parser generators) to support our Tier-1
-  and Tier-2 architectures.</p>
-<p><strong>References</strong>:</p>
-<ul>
-  <li><a href="http://elftoolchain.sourceforge.net/">The ELF
-    Toolchain Project on SourceForge.Net</a></li>
-</ul>
-<p><strong>Requirements</strong>:</p>
-<ul>
- <li>Knowledge of C.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="bsdtexttools" class="soc2008">
-	<title>BSD-licensed Text-Processing Tools</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:dds@FreeBSD.org">Diomidis Spinellis</a>,
-  <a href="mailto:gabor@FreeBSD.org">G&aacute;bor K&ouml;vesd&aacute;n</a></p>
-<p>Create/port BSD-licensed versions of one or more of the text processing
-   tools that are currently missing from the FreeBSD distribution:
-   <strong>sort</strong>,
-   <strong>diff</strong>,
-   <strong>groff/troff</strong> and the
-   <strong>grep</strong> family.
-   Licensed versions of some or all of these tools are already included
-   in OpenBSD, so this task involves more porting and feature completion
-   than development from scratch.
-   Emphasis should be placed on performance, standards-compliance, and support
-   for handling wide character sets.
-</p>
-<p>Regarding groff/troff, there exist the <a
-   href="http://heirloom.sourceforge.net/doctools.html">OpenSolaris
-   versions</a> at SourceForge which at least do not come with a viral license
-   like the current GNU versions we use. Additionally this implementation has
-   support for common vector fonts and unicode. If those utilities are
-   option-compatible or not has to be analyzed. A port of this is already
-   available as textproc/heirloom-doctools.  Alternatively, OpenBSD's
-   <a href="http://mdocml.bsd.lv/">mdocml</a> can replace groff's mdoc
-   functionality and may be sufficient for our purposes.
-</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
- <li>Knowledge of C.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="noswitches">
-	<title>Build options improvements</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:netchild@FreeBSD.org">Alexander Leidinger</a>, <a href="mailto:gbell72@rogers.com">Gardner Bell</a></p>
-<p>The new "delete-old" and "delete-old-libs" target in /usr/src for 6.1 and
-  -CURRENT should be extended to support the WITHOUT_* knobs, e.g.
-  WITHOUT_RESCUE or WITHOUT_CRYPT, and delete files which are covered by those
-  knobs.  Some switches have already been <a
-  href="http://cvsweb.freebsd.org/src/tools/build/mk/OptionalObsoleteFiles.inc">covered</a>.
-  You can view a list of all switches and what effect they have <a
-  href="http://phk.freebsd.dk/misc/build_options/">here</a>.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Time to build and install the world several times.</li>
-  <li>A way to determine which files were not touched by an installworld.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="kde-freebsd-update" class="soc2007">
-	<title>KDE front-ends to the freebsd-update(8)utility</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:cperciva@FreeBSD.org">Colin Percival</a></p>
-<p>The freebsd-update(8) utility is used to fetch, install, and rollback
-  binary updates to the FreeBSD base system.  A nice project would be to
-  develop a graphical front-end for freebsd-update(8), using the QT toolkit.
-  A GTK frontend was developed as part of GSoC 2007 and exists at <a
-  href="http://developer.berlios.de/projects/facund">berlios</a>; the QT
-  frontend could maybe share common functions/classes and design ideas.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Experience writing KDE applications</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="ipv6-userland" class="soc">
-        <title>IPv6 User Land Cleanup</title>
-
-        <desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:gnn@FreeBSD.org">George V. Neville-Neil</a></p>
-
-<p>Many userland network utilities do not work correctly with IPv6.</p>
-  <ul>
-    <li>rpc.statd(8) is not IPv6 clean.</li>
-    <li>rpc.rquotad(8) is not IPv6 clean.</li>
-    <li>who(1) truncates IPv6 addresses in its output.</li>
-  </ul>
-
-<p>This project could also include a broader survey of other network
-services in /usr/bin and /usr/sbin to make sure they're all IPv6
-clean.</p>
-        </desc>
-      </idea>
-
-      <idea id="lint">
-	<title>lint(1) improvements from OpenBSD</title>
-
-	<desc>
-<p>OpenBSD has some improvements to lint(1) which may be beneficial to
-  have.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good knowledge of C.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="libprocnet" class="soc2009">
-	<title>Libprocstat and libnetstat</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:rwatson@FreeBSD.org">Robert Watson</a></p>
-<p>Create, similar to libmemstat, wrapper libraries to support monitoring and
-  management applications to avoid direct use of kvm.  Three parts to the
-  project: for each of the above, add kernel support to export data in a less
-  ABI-sensitive way using sysctl, write a library to present the information
-  in an extensible way to applications, and update applications to use the
-  library instead of reaching directly into kernel memory / consuming sysctls.
-  The goal is to allow the kernel implementation to change without breaking
-  applications and requiring them to be recompiled, and to allow monitoring
-  functions to be extended without breaking applications.  This should also
-  facilitate writing new classes of monitoring and profiling tools.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good knowledge of C.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="ndmp">
-	<title>NDMP data server</title>
-
-	<desc>
-<p><strong>URL</strong>: <a
-  href="http://www.ndmp.org/">The NDMP Initiative</a></p>
-<p>The NDMP initiative was launched to create an open
-  standard protocol for network-based backup for network-attached storage.
-  Major commercial storage systems come with a compliant service. This allows
-  major commercial backup systems to backup such NAS devices. Including a NDMP
-  disk server into FreeBSD would allow to play nice out of the box (modulo some
-  configuring) regarding backups in a corporate environment.</p>
-<ul>
-  <li>Evaluate the existing revisions of the NDMP standard.</li>
-  <li>Choose an appropriate revision (after checking of supported versions in
-    commercial backup systems).</li>
-  <li>Implement at least a NDMP data server.</li>
-  <li>Bonus: implement a NDMP tape server (to allow attached tapes to be
-    used).</li>
-</ul>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Access to a commercial backup system with NDMP support
-    (mostly for interoperability testing; since a NDMPcopy
-    application seems to be available, this is not a hard requirement).</li>
-  <li>Good knowledge of a programming language which is included in
-    the base system.</li>
-  <li>Knowledge about UFS snapshots.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="prebind">
-	<title>Port prebind from OpenBSD</title>
-
-	<desc>
-<p>The OpenBSD prebind is a secure implementation of prelinking that
-  is compatible with address space randomization.  Prelinking allows to
-  speed up application startup when a lot of libraries are involved.
-  This should show a noticeable effect with e.g. GNOME/KDE.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good C knowledge (reading and writing).</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="pacfile">
-	<title>Proxy auto-config file support for libfetch</title>
-
-	<desc>
-<p>A proxy auto-config (PAC) file contains a JavaScript function
-  "FindProxyForURL(url, host)" that determines which HTTP or SOCKS
-  proxy, if any, to use to access a given URL.  In most application the
-  file may be specified manually or discovered using the Web Proxy
-  Autodiscovery Protocol.  Support for PAC files in libfetch would make
-  fetch more versatile.</p>
-
-<p>Supporting PAC files nominally requires a fairly complete JavaScript
-  implementation.  There appear to be no BSD Licensed JavaScript
-  implementations so one will likely need to be written.  A minimalist
-  implementation of the language with commonly used constructs such as
-  if/else, string comparison, and functions would be sufficient in many
-  cases.</p>
-
-<p><strong>References</strong>:</p>
-<ul>
-  <li><a href="http://en.wikipedia.org/wiki/Proxy_auto-config">Wikipedia
-    Article on Proxy auto-config</a></li>
-  <li><a href="http://wp.netscape.com/eng/mozilla/2.0/relnotes/demo/proxy-live.html">Proxy
-    Auto-Config File Format</a></li>
-</ul>
-
-<p><strong>Requirements</strong>:</p>
-<ul>
-	<li>Strong knowledge of secure C programming.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="pxeinstaller">
-	<title>PXE Installer</title>
-
-	<desc>
-<p>It would be great to have a bundled PXE installer.  This would allow one to
-  boot an install server from a FreeSBIE live CD-ROM on one box, set the BIOS
-  on subsequent boxes to PXE boot, and then have the rest happen by magic.
-  This would be very helpful for installing cluster nodes, etc.</p>
-<p><a href="mailto:m@FreeBSD.org">Markus Boelter</a> is <a
-  href="http://wiki.freebsd.org/MarkusBoelter">working</a> on a bundled
-  PXE installer as part of his BSDInstaller project within the Google Summer
-  of Code 2006. The PXE Installer is working but some non-PXE related issues
-  have to be solved before it can enter the tree.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good PXE knowledge.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="regression">
-	<title>Regression testing system</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:netchild@FreeBSD.org">Alexander Leidinger</a>, <a
-  href="mailto:nik@FreeBSD.org">Nik Clayton</a></p>
-<p>Nik has written a regression test infrastructure using Perl.  More of
-  the regression tests should be made to work with libtap.</p>
-<ul>
-  <li>Many of the existing tests should be moved from using assert() to using
-    ok() and friends from libtap.</li>
-  <li>More regression tests should be written.</li>
-</ul>
-<p>Porting <a href="http://ltp.sf.net/">LTP</a> might also be a good idea.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good knowledge of scripting languages (Perl preferred).</li>
-  <li>Good knowledge of software testing.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="sysinstall">
-	<title>Sysinstall</title>
-
-	<desc>
-<ul>
-  <li>Ask for network configuration before install - so you do not have to
-    configure the net twice.</li>
-  <li>Make a guess of the timezone based upon country and keyboard.</li>
-</ul>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Good C knowledge (reading and writing).</li>
-  <li>No fear regarding "naturally grown" code.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="taroutmode">
-	<title>Tar output mode for installworld</title>
-
-	<desc>
-<p><strong>Technical contact</strong>: <a
-  href="mailto:cperciva@FreeBSD.org">Colin Percival</a>, <a
-  href="mailto:kientzle@FreeBSD.org">Tim Kientzle</a></p>
-
-<p>Instead of installing using install, mkdir, mtree, etc, directly construct
-  a tarball.  This would allow creating install distributions without root
-  access, as setuid etc would never hit the local disk.  This would require
-  some retrofitting of our installation mechanisms.</p>
-<p>Bsdtar now (8-current, 20080101) has a feature that allows it to create
-  a tar archive from a description provided in the form of an mtree file.
-  This description can specify owner, permissions, and
-  contents for each entry and does not require the files
-  on disk to already have correct ownership.  This should
-  make it possible to build a FreeBSD distribution as a
-  non-root user. Talk to Tim Kientzle for details of the new bsdtar
-  features and look at NetBSD, which has a similar facility, for
-  ideas about how to proceed.</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>No fear regarding our installation system.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="vi-utf8">
-	<title>Unicode support in vi</title>
-
-	<desc>
-<p><strong>Technical info:</strong>: on J.R. Oldroyd's
-    <a href="http://opal.com/jr/freebsd/unicode/">Unicode Support on
-    FreeBSD</a> page</p>
-<p>Many base system utilities grew multibyte support in 2004.  It would be
-  nice to continue this trend by teaching vi(1) to display and edit
-  documents in UTF-8 encoding.  The above referenced page contains info of
-  what is needed to improve the Unicode support in vi(1).</p>
-<p><strong>Requirements</strong>:</p>
-<ul>
-  <li>Knowledge of C.</li>
-</ul>
-	</desc>
-      </idea>
-
-      <idea id="cron-and-atrun">
-        <title>Improve cron(8) and atrun(8)</title>
-
-        <desc>
-  <p>Currently, cron(8) and atrun(8) are outdated in their implementation.
-    Here are some directions for improvement:</p>
-  <ul>
-    <li>Update cron(8) to ISC cron with security fixes from OpenBSD.</li>
-    <li>Integrate the atrun(8) functionality into cron(8),
-      as it was done in NetBSD.</li>
-  </ul>
-
-  <p><strong>Requirements</strong>:</p>
-  <ul>
-    <li>Strong knowledge of the C language and Unix API.</li>
-  </ul>
-        </desc>
-     </idea>
-
-     <idea class="soc" id="wine">
-       <title>Improve Wine support in FreeBSD</title>
-
-       <desc><p><strong>Technical contact</strong>:
-        <a href="mailto:kris@pcbsd.com">Kris Moore</a></p>
-
-       <p>In 2008, Tijl Coosemans did excellent work
-         getting wine to a very usable point on FreeBSD. However,
-         there are some issues which still need to be addressed at <a
-         href="http://wiki.freebsd.org/Wine">http://wiki.freebsd.org/Wine</a>.
-         This would be a big improvement for our desktop users.</p></desc>
-     </idea>
-
-      <idea id="bsnmp" class="soc">
-	<title>BSNMP enhancements</title>
-
-	<desc><p><strong>Technical contact</strong>:
-	  <a href="mailto:syrinx@FreeBSD.org">Shteryana Shopova</a></p>
-
-	<p>BSNMP is a portable SNMP framework consisting of a daemon,
-	  modules and tools. It includes libraries that ease
-	  the development of loadable modules for configuring and
-	  monitoring various subsystems.
-	  You can find more information about BSNMP
-	  <a href="http://wiki.freebsd.org/Bsnmp">on the wiki</a>.
-	  Some project ideas, but not limited to that list, can be found
-	  <a href="http://wiki.freebsd.org/BsnmpTODO">here.</a>.</p>
-
-	<p><strong>Requirements</strong>:</p>
-	<ul>
-	  <li>Knowledge of C.</li>
-	  <li>Some familiarity with SNMP/MIBs desirable.</li>
-	</ul>
-	</desc>
-      </idea>
-
-      <idea class="soc" id="pthread-profile">
-	<title>Userspace pthread mutex lock contention profiling and lock
-	  order verification tool</title>
-
-	<desc><p><strong>Technical contact</strong>: <a
-	  href="mailto:jeff@FreeBSD.org">Jeff Roberson</a></p>
-
-	<p>This task would create an extension to the threading library
-	  that would allow application developers to measure and locate lock
-	  ordering and lock contention problems within their application.
-	  Such a tool is invaluable in debugging application deadlocks and
-	  creating high-performance multithreaded software.  Existing lock
-	  ordering and profiling tools exist in the FreeBSD kernel, and
-	  could be used as the model for the userspace implementation.  We
-	  would recommend beginning with profiling due to its immediate
-	  usefulness in optimizing performance, and to allow improvements
-	  in kernel scheduling to better manage user application lock
-	  contention.</p>
-
-	<p><strong>Requirements</strong>:</p>
-	<ul>
-	  <li>Strong knowledge of C.</li>
-	  <li>Threading experience.</li>
-	  <li>Strong debugging skills.</li>
-	</ul>
-	</desc>
-      </idea>
-
-      <idea class="soc" id="freebsd-gnome-networkmanager">
-	<title>FreeBSD port of NetworkManager</title>
-
-	<desc><p><strong>Technical contact</strong>: <a
-	  href="mailto:marcus@FreeBSD.org">Joe Marcus Clarke</a></p>
-
-    	  <p>This task is to port
-	    <a href="http://www.gnome.org/projects/NetworkManager/">
-	      NetworkManager</a> to FreeBSD.  Porting NetworkManager
-	    will also require some core userland changes to FreeBSD,
-	    especially to ifconfig.</p>
-
-	  <p><strong>Requirements</strong>:</p>
-	  <ul>
-	    <li>C programming skills</li>
-	    <li>Knowledge of the FreeBSD net80211 wireless stack</li>
-          </ul>
-	</desc>
-      </idea>
-
-      <idea class="soc" id="freebsd-gnome-systemtools">
-	<title>Fix FreeBSD support in GNOME's system-tools-backends</title>
-
-	<desc><p><strong>Technical contact</strong>: <a
-	  href="mailto:marcus@FreeBSD.org">Joe Marcus Clarke</a></p>
-
-  	  <p>This task is to fix FreeBSD support in
-	      sysutils/system-tools-backends.</p>
-
-	  <p><strong>Requirements</strong>:</p>
-	  <ul>
-	    <li>Perl programming skills</li>
-	    <li>Knowledge of the FreeBSD system configuration</li>
-          </ul>
-	</desc>
-      </idea>
-
-      <idea class="soc" id="freebsd-gnome-hal">
-	  <title>Extend hal support on FreeBSD</title>
-
-	<desc><p><strong>Technical contact</strong>: <a
-	  href="mailto:marcus@FreeBSD.org">Joe Marcus Clarke</a></p>
-
-  	  <p>This task is to add hal support for some additional
-	    subsystems.  In particular FreeBSD is lacking support for the
-	    ieee1394 (i.e. Firewire), bluetooth, and printer.  Adding
-	    support for these subsystems will require changes to the
-	    FreeBSD kernel.  Those interested should use the latest
-	    <a href="http://www.marcuscom.com/hal-spec/hal-spec.html">
-	      HAL Specification</a> as a guide.</p>
-
-	  <p><strong>Requirements</strong>:</p>
-	  <ul>
-	    <li>C programming skills</li>
-	    <li>Knowledge of the FreeBSD system internals</li>
-          </ul>
-	</desc>
-      </idea>
-
-      <idea class="soc" id="freebsd-amd64-gcc-m32">
-	  <title>Finish support for compilation of i386 binaries on amd64</title>
-
-	<desc><p><strong>Technical contact</strong>: <a
-	  href="mailto:kib@FreeBSD.org">Konstantin Belousov</a></p>
-
-  	  <p>The FreeBSD binutils and gcc on amd64 are capable to build
-	    32bit binaries. What we miss is the proper includes for
-	    i386 accessed when #include &lt;machine/some.h&gt; is used,
-	    for the -m32 invocation of the cc. Project would provide
-	    an installation of both amd64 and i386 includes in
-	    non-conflicting way, and changes to the gcc to select
-	    proper location for machine/ based on the compilation target
-	    architecture.</p>
-
-	  <p><strong>Requirements</strong>:</p>
-	  <ul>
-	    <li>C and shell programming skills</li>
-	    <li>Knowledge of the FreeBSD build and installation infrastructure</li>
-	    <li>Some knowledge of the gcc internals</li>
-          </ul>
-	</desc>
-      </idea>
-
-    <idea id="jailinit" class="soc">
-      <title>Jail init and management</title>
-      <desc>
-	<p><strong>Technical contact</strong>: <a
-	  href="mailto:bz@FreeBSD.org">Bjoern Zeeb</a>, <a
-	  href="mailto:imp@FreeBSD.org">Warner Losh</a>, <a
-	  href="mailto:rwatson@FreeBSD.org">Robert Watson</a></p>
-
-	<p>FreeBSD's jail(8) facility provides lightweight operating system
-	  virtualization; with the addition of experimental virtual network
-	  stacks, ISPs are able to efficiently host thousands of FreeBSD
-	  instances on a single machine.  This task improves FreeBSD's
-	  userspace management of jails by introducing jailinit(8), an
-	  enhancement to the init(8) utility responsible for starting up and
-	  shutting down the operating system.  Currently, jails are started
-	  by executing their /etc/rc script directly using jail(8); in the
-	  proposed new world order, init(8) would have a jail start mode,
-	  and would continue running throughout the lifetime of the jail to
-	  manage services and eventually shut down the jail.  This might
-	  require minor kernel changes in order to let jailinit perform some
-	  of the same functions for jails as it does for normal userspace.
-	  jailinit could also be responsible for setting up and managing
-	  console logging, launching tty-attached services such as getty
-	  within a jail, and other jail properties.</p>
-
-	<p><strong>Requirements</strong></p>
-	<ul>
-	  <li>C and shell programming skills</li>
-	  <li>Interest in virtualization</li>
-	</ul>
-      </desc>
-    </idea>
-
-  </category>
-</ideas>
+  </body>
+</html>
diff --git a/en_US.ISO8859-1/htdocs/projects/mac/Makefile b/en_US.ISO8859-1/htdocs/projects/mac/Makefile
index ca0bf8550c..026edd324a 100644
--- a/en_US.ISO8859-1/htdocs/projects/mac/Makefile
+++ b/en_US.ISO8859-1/htdocs/projects/mac/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 DATA=	docbook.css
 
diff --git a/en_US.ISO8859-1/htdocs/projects/mac/index.sgml b/en_US.ISO8859-1/htdocs/projects/mac/index.xml
index f3c358889d..f3c358889d 100644
--- a/en_US.ISO8859-1/htdocs/projects/mac/index.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/mac/index.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/mips/Makefile b/en_US.ISO8859-1/htdocs/projects/mips/Makefile
index 29469c3ac5..3175513029 100644
--- a/en_US.ISO8859-1/htdocs/projects/mips/Makefile
+++ b/en_US.ISO8859-1/htdocs/projects/mips/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	jmallett
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 DATA=	style.css
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/projects/mips/index.sgml b/en_US.ISO8859-1/htdocs/projects/mips/index.xml
index 7d74c77c58..7d74c77c58 100644
--- a/en_US.ISO8859-1/htdocs/projects/mips/index.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/mips/index.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/netperf/Makefile b/en_US.ISO8859-1/htdocs/projects/netperf/Makefile
index 55b9965eba..8626e386b2 100644
--- a/en_US.ISO8859-1/htdocs/projects/netperf/Makefile
+++ b/en_US.ISO8859-1/htdocs/projects/netperf/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	rwatson
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
-DOCS+=	cluster.sgml
+DOCS=	index.xml
+DOCS+=	cluster.xml
 DATA=	style.css
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/projects/netperf/cluster.sgml b/en_US.ISO8859-1/htdocs/projects/netperf/cluster.xml
index 69539c95a2..69539c95a2 100644
--- a/en_US.ISO8859-1/htdocs/projects/netperf/cluster.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/netperf/cluster.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/netperf/index.sgml b/en_US.ISO8859-1/htdocs/projects/netperf/index.xml
index e7c57da53c..e7c57da53c 100644
--- a/en_US.ISO8859-1/htdocs/projects/netperf/index.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/netperf/index.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/newbies.sgml b/en_US.ISO8859-1/htdocs/projects/newbies.xml
index 6a25db21ce..6a25db21ce 100644
--- a/en_US.ISO8859-1/htdocs/projects/newbies.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/newbies.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/projects.sgml b/en_US.ISO8859-1/htdocs/projects/projects.xml
index 0225df721d..0225df721d 100644
--- a/en_US.ISO8859-1/htdocs/projects/projects.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/projects.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/summerofcode-2005.sgml b/en_US.ISO8859-1/htdocs/projects/summerofcode-2005.xml
index 758175326f..758175326f 100644
--- a/en_US.ISO8859-1/htdocs/projects/summerofcode-2005.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/summerofcode-2005.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/summerofcode-2006.sgml b/en_US.ISO8859-1/htdocs/projects/summerofcode-2006.xml
index ea1d87c015..ea1d87c015 100644
--- a/en_US.ISO8859-1/htdocs/projects/summerofcode-2006.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/summerofcode-2006.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/summerofcode-2007.sgml b/en_US.ISO8859-1/htdocs/projects/summerofcode-2007.xml
index 183bab66d1..183bab66d1 100644
--- a/en_US.ISO8859-1/htdocs/projects/summerofcode-2007.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/summerofcode-2007.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/summerofcode-2008.sgml b/en_US.ISO8859-1/htdocs/projects/summerofcode-2008.xml
index 0a3a14a556..0a3a14a556 100644
--- a/en_US.ISO8859-1/htdocs/projects/summerofcode-2008.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/summerofcode-2008.xml
diff --git a/en_US.ISO8859-1/htdocs/projects/summerofcode.sgml b/en_US.ISO8859-1/htdocs/projects/summerofcode.xml
index 3525189c8a..3525189c8a 100644
--- a/en_US.ISO8859-1/htdocs/projects/summerofcode.sgml
+++ b/en_US.ISO8859-1/htdocs/projects/summerofcode.xml
diff --git a/en_US.ISO8859-1/htdocs/prstats/Makefile b/en_US.ISO8859-1/htdocs/prstats/Makefile
index b6864697dd..a614eed261 100644
--- a/en_US.ISO8859-1/htdocs/prstats/Makefile
+++ b/en_US.ISO8859-1/htdocs/prstats/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/prstats/index.sgml b/en_US.ISO8859-1/htdocs/prstats/index.xml
index 63f3eb72a8..63f3eb72a8 100644
--- a/en_US.ISO8859-1/htdocs/prstats/index.sgml
+++ b/en_US.ISO8859-1/htdocs/prstats/index.xml
diff --git a/en_US.ISO8859-1/htdocs/publish.sgml b/en_US.ISO8859-1/htdocs/publish.xml
index bd9760de55..bd9760de55 100644
--- a/en_US.ISO8859-1/htdocs/publish.sgml
+++ b/en_US.ISO8859-1/htdocs/publish.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.0.5R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.0.5R/Makefile
index ed926a085d..e27ec7c43f 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.0.5R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.0.5R/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.0.5R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/2.0.5R/announce.xml
index 3d5652a394..3d5652a394 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.0.5R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.0.5R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.0.5R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.0.5R/notes.xml
index c3ff3660b5..c3ff3660b5 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.0.5R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.0.5R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.0/Makefile b/en_US.ISO8859-1/htdocs/releases/2.0/Makefile
index 2d9f1fb404..321511f58a 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.0/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.0/Makefile
@@ -7,9 +7,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	credits.sgml
-DOCS+=	install.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	credits.xml
+DOCS+=	install.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.0/announce.sgml b/en_US.ISO8859-1/htdocs/releases/2.0/announce.xml
index 6ce380b3e1..6ce380b3e1 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.0/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.0/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.0/credits.sgml b/en_US.ISO8859-1/htdocs/releases/2.0/credits.xml
index f62a8a37db..f62a8a37db 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.0/credits.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.0/credits.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.0/install.sgml b/en_US.ISO8859-1/htdocs/releases/2.0/install.xml
index e532380ba9..e532380ba9 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.0/install.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.0/install.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.0/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.0/notes.xml
index 451021dc03..451021dc03 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.0/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.0/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1.5R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.1.5R/Makefile
index ed926a085d..e27ec7c43f 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1.5R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.1.5R/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1.5R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/2.1.5R/announce.xml
index 3870cb9aa8..3870cb9aa8 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1.5R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.1.5R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1.5R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.1.5R/notes.xml
index 9313a77bb2..9313a77bb2 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1.5R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.1.5R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1.6R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.1.6R/Makefile
index 4a828285c5..c51c4c80cd 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1.6R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.1.6R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	notes.sgml
-DOCS+=	security.sgml
+DOCS=	announce.xml
+DOCS+=	notes.xml
+DOCS+=	security.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1.6R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/2.1.6R/announce.xml
index 6c81d36351..6c81d36351 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1.6R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.1.6R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1.6R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.1.6R/notes.xml
index f028a69e43..f028a69e43 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1.6R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.1.6R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1.6R/security.sgml b/en_US.ISO8859-1/htdocs/releases/2.1.6R/security.xml
index 28eb2f9ce8..28eb2f9ce8 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1.6R/security.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.1.6R/security.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1.7R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.1.7R/Makefile
index ed926a085d..e27ec7c43f 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1.7R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.1.7R/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1.7R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/2.1.7R/announce.xml
index 68f404183c..68f404183c 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1.7R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.1.7R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1.7R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.1.7R/notes.xml
index 7d7a145997..7d7a145997 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1.7R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.1.7R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.1R/Makefile
index ed926a085d..e27ec7c43f 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.1R/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/2.1R/announce.xml
index 726a92fc18..726a92fc18 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.1R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.1R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.1R/notes.xml
index 1990c2da20..1990c2da20 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.1R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.1R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.2.1R/Makefile
index 9da9de9418..c479214113 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.1R/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	notes.sgml
+DOCS=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.1R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.1R/notes.xml
index 7ba1394a9d..7ba1394a9d 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.1R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.1R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.2R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.2.2R/Makefile
index d3e63c02d6..7bcd18af40 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.2R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.2R/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	notes.sgml
-DOCS+=	errata.sgml
+DOCS=	notes.xml
+DOCS+=	errata.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.2R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.2R/errata.xml
index 603e8cb0b1..603e8cb0b1 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.2R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.2R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.2R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.2R/notes.xml
index f97a7e6b67..f97a7e6b67 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.2R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.2R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.5R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.2.5R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.5R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.5R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.5R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.5R/announce.xml
index 4432557d41..4432557d41 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.5R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.5R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.5R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.5R/errata.xml
index 024abb34a6..024abb34a6 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.5R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.5R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.5R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.5R/notes.xml
index ac7bc3264f..ac7bc3264f 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.5R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.5R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.6R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.2.6R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.6R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.6R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.6R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.6R/announce.xml
index 35cb6c1211..35cb6c1211 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.6R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.6R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.6R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.6R/errata.xml
index c8d911a8c8..c8d911a8c8 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.6R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.6R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.6R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.6R/notes.xml
index 339d50b954..339d50b954 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.6R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.6R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.7R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.2.7R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.7R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.7R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.7R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.7R/announce.xml
index c5a83929ba..c5a83929ba 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.7R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.7R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.7R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.7R/errata.xml
index 85771b9217..85771b9217 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.7R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.7R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.7R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.7R/notes.xml
index 7daccdead2..7daccdead2 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.7R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.7R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.8R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.2.8R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.8R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.8R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.8R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.8R/announce.xml
index 528fe4a11f..528fe4a11f 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.8R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.8R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.8R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.8R/errata.xml
index d17f7747fd..d17f7747fd 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.8R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.8R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2.8R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.2.8R/notes.xml
index d111e2fa10..d111e2fa10 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2.8R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2.8R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2R/Makefile b/en_US.ISO8859-1/htdocs/releases/2.2R/Makefile
index e0136a4d37..f928c53e7a 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/2.2R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	install-media.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	install-media.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/2.2R/announce.xml
index a4d1ce2761..a4d1ce2761 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2R/install-media.sgml b/en_US.ISO8859-1/htdocs/releases/2.2R/install-media.xml
index b902e85a9a..b902e85a9a 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2R/install-media.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2R/install-media.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/2.2R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/2.2R/notes.xml
index 1d4b54445c..1d4b54445c 100644
--- a/en_US.ISO8859-1/htdocs/releases/2.2R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/2.2R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.0R/Makefile b/en_US.ISO8859-1/htdocs/releases/3.0R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.0R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/3.0R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/3.0R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/3.0R/announce.xml
index 91252353f4..91252353f4 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.0R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.0R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.0R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/3.0R/errata.xml
index 2d66295078..2d66295078 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.0R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.0R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.0R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/3.0R/notes.xml
index b6eb79189d..b6eb79189d 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.0R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.0R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/3.1R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/3.1R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/3.1R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/3.1R/announce.xml
index 03ff496fd4..03ff496fd4 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.1R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.1R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.1R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/3.1R/errata.xml
index 7bcdaf310a..7bcdaf310a 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.1R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.1R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.1R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/3.1R/notes.xml
index 6c58a97e2c..6c58a97e2c 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.1R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.1R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.2R/Makefile b/en_US.ISO8859-1/htdocs/releases/3.2R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.2R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/3.2R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/3.2R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/3.2R/announce.xml
index c0104656c4..c0104656c4 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.2R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.2R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.2R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/3.2R/errata.xml
index e972a09300..e972a09300 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.2R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.2R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.2R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/3.2R/notes.xml
index 7c985f4db5..7c985f4db5 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.2R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.2R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.3R/Makefile b/en_US.ISO8859-1/htdocs/releases/3.3R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.3R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/3.3R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/3.3R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/3.3R/announce.xml
index df5d67309c..df5d67309c 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.3R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.3R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.3R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/3.3R/errata.xml
index 2b5a30a614..2b5a30a614 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.3R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.3R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.3R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/3.3R/notes.xml
index f1f41e0e93..f1f41e0e93 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.3R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.3R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.4R/Makefile b/en_US.ISO8859-1/htdocs/releases/3.4R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.4R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/3.4R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/3.4R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/3.4R/announce.xml
index 54ad2f66bd..54ad2f66bd 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.4R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.4R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.4R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/3.4R/errata.xml
index db4243ee2d..db4243ee2d 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.4R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.4R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.4R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/3.4R/notes.xml
index 0a23c83550..0a23c83550 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.4R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.4R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.5R/Makefile b/en_US.ISO8859-1/htdocs/releases/3.5R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.5R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/3.5R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/3.5R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/3.5R/announce.xml
index 9e97cabc96..9e97cabc96 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.5R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.5R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.5R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/3.5R/errata.xml
index 748403f900..748403f900 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.5R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.5R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/3.5R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/3.5R/notes.xml
index fc0f4dc673..fc0f4dc673 100644
--- a/en_US.ISO8859-1/htdocs/releases/3.5R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/3.5R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.0R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.0R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.0R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.0R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/4.0R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.0R/announce.xml
index 6afb33c8fe..6afb33c8fe 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.0R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.0R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.0R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/4.0R/errata.xml
index adc9c8975c..adc9c8975c 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.0R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.0R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.0R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/4.0R/notes.xml
index a4ceadf484..a4ceadf484 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.0R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.0R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.1.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.1.1R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.1.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.1.1R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/4.1.1R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.1.1R/announce.xml
index 5bb69ce28c..5bb69ce28c 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.1.1R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.1.1R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.1.1R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/4.1.1R/errata.xml
index cd2cfe23d1..cd2cfe23d1 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.1.1R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.1.1R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.1.1R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/4.1.1R/notes.xml
index ca19855b11..ca19855b11 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.1.1R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.1.1R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.10R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.10R/Makefile
index 0850e1b780..8975dca165 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.10R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.10R/Makefile
@@ -7,13 +7,13 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	qa.sgml
-DOCS+=	schedule.sgml
-DOCS+=	todo.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
+DOCS+=	qa.xml
+DOCS+=	schedule.xml
+DOCS+=	todo.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/4.10R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.10R/announce.xml
index d1acd416d5..d1acd416d5 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.10R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.10R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.10R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/4.10R/hardware.xml
index d20172caf8..d20172caf8 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.10R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.10R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.10R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/4.10R/installation.xml
index 78013f7c2b..78013f7c2b 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.10R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.10R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.10R/qa.sgml b/en_US.ISO8859-1/htdocs/releases/4.10R/qa.xml
index 2e99339bbc..2e99339bbc 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.10R/qa.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.10R/qa.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.10R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/4.10R/relnotes.xml
index 4287e07c1d..4287e07c1d 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.10R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.10R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.10R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/4.10R/schedule.xml
index 3fb918862f..4c4aa93308 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.10R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.10R/schedule.xml
@@ -245,7 +245,7 @@
     <td>25&nbsp;May&nbsp;2004</td>
     <td>Make sure the &local.rel; manual pages are being displayed by default
       for the man->web gateway.  Also make sure these man pages are
-      pointed to by docs.sgml.</td>
+      pointed to by docs.xml.</td>
   </tr>
 
   <tr>
diff --git a/en_US.ISO8859-1/htdocs/releases/4.10R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/4.10R/todo.xml
index 5ed25680fc..5ed25680fc 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.10R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.10R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.11R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.11R/Makefile
index 6dfd60242f..f2f9d02925 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.11R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.11R/Makefile
@@ -7,13 +7,13 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	schedule.sgml
-DOCS+=	todo.sgml
-DOCS+=	errata_policy.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
+DOCS+=	schedule.xml
+DOCS+=	todo.xml
+DOCS+=	errata_policy.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/4.11R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.11R/announce.xml
index 98de079616..98de079616 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.11R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.11R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.11R/errata_policy.sgml b/en_US.ISO8859-1/htdocs/releases/4.11R/errata_policy.xml
index 61e32ded35..61e32ded35 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.11R/errata_policy.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.11R/errata_policy.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.11R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/4.11R/hardware.xml
index 87cc4a5d0b..87cc4a5d0b 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.11R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.11R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.11R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/4.11R/installation.xml
index 82bb77061c..82bb77061c 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.11R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.11R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.11R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/4.11R/relnotes.xml
index 4b3c119cc9..4b3c119cc9 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.11R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.11R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.11R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/4.11R/schedule.xml
index b1f04b37f5..7137debe95 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.11R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.11R/schedule.xml
@@ -276,7 +276,7 @@
     <td>25&nbsp;Jan&nbsp;2005</td>
     <td>Make sure the &local.rel; manual pages are being displayed by default
       for the man->web gateway.  Also make sure these man pages are
-      pointed to by docs.sgml.</td>
+      pointed to by docs.xml.</td>
   </tr>
 
   <tr>
diff --git a/en_US.ISO8859-1/htdocs/releases/4.11R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/4.11R/todo.xml
index a9f9fc0250..a9f9fc0250 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.11R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.11R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.1R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.1R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/4.1R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.1R/announce.xml
index 07420b7993..07420b7993 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.1R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.1R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.1R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/4.1R/errata.xml
index b06c1981f9..b06c1981f9 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.1R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.1R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.1R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/4.1R/notes.xml
index 515ced6dbe..515ced6dbe 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.1R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.1R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.2R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.2R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.2R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.2R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/4.2R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.2R/announce.xml
index 57aaac9f00..57aaac9f00 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.2R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.2R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.2R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/4.2R/errata.xml
index 023fd9080c..023fd9080c 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.2R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.2R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.2R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/4.2R/notes.xml
index 4c5d0462a4..4c5d0462a4 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.2R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.2R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.3R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.3R/Makefile
index 434caaa026..e465bb62e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.3R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.3R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	errata.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	errata.xml
+DOCS+=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releases/4.3R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.3R/announce.xml
index 39cd6036c3..39cd6036c3 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.3R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.3R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.3R/errata.sgml b/en_US.ISO8859-1/htdocs/releases/4.3R/errata.xml
index 2553f08874..2553f08874 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.3R/errata.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.3R/errata.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.3R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/4.3R/notes.xml
index 759868b957..759868b957 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.3R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.3R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.4R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.4R/Makefile
index 5edfa33e82..08797f937c 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.4R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.4R/Makefile
@@ -7,9 +7,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	notes.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	notes.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/4.4R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.4R/announce.xml
index b23197cb5a..b23197cb5a 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.4R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.4R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.4R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/4.4R/hardware.xml
index 5fb0915872..5fb0915872 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.4R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.4R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.4R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/4.4R/notes.xml
index 63d424444b..63d424444b 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.4R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.4R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.5R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.5R/Makefile
index 238a45b69d..883889dcad 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.5R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.5R/Makefile
@@ -7,12 +7,12 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	contents.sgml
-DOCS+=	hardware.sgml
-DOCS+=	notes.sgml
-DOCS+=	qa.sgml
-DOCS+=	schedule.sgml
+DOCS=	announce.xml
+DOCS+=	contents.xml
+DOCS+=	hardware.xml
+DOCS+=	notes.xml
+DOCS+=	qa.xml
+DOCS+=	schedule.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/4.5R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.5R/announce.xml
index fcbb48c9f4..fcbb48c9f4 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.5R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.5R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.5R/contents.sgml b/en_US.ISO8859-1/htdocs/releases/4.5R/contents.xml
index 0e6aa906b9..0e6aa906b9 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.5R/contents.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.5R/contents.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.5R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/4.5R/hardware.xml
index f498e910cb..f498e910cb 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.5R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.5R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.5R/notes.sgml b/en_US.ISO8859-1/htdocs/releases/4.5R/notes.xml
index fbc3758c8f..fbc3758c8f 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.5R/notes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.5R/notes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.5R/qa.sgml b/en_US.ISO8859-1/htdocs/releases/4.5R/qa.xml
index a3d235c557..a3d235c557 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.5R/qa.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.5R/qa.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.5R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/4.5R/schedule.xml
index c61aa171ea..c61aa171ea 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.5R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.5R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6.2R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.6.2R/Makefile
index e98797c606..27a2ecc5cb 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6.2R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.6.2R/Makefile
@@ -7,9 +7,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	relnotes.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	relnotes.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6.2R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.6.2R/announce.xml
index cb65fee9c3..cb65fee9c3 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6.2R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.6.2R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6.2R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/4.6.2R/hardware.xml
index 5c7006471f..5c7006471f 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6.2R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.6.2R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6.2R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/4.6.2R/relnotes.xml
index eac330470e..eac330470e 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6.2R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.6.2R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.6R/Makefile
index 4835219bc1..ea2f6b187d 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.6R/Makefile
@@ -7,13 +7,13 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	contents.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	qa.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	schedule.sgml
+DOCS=	announce.xml
+DOCS+=	contents.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	qa.xml
+DOCS+=	relnotes.xml
+DOCS+=	schedule.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.6R/announce.xml
index 669393d49b..669393d49b 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.6R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6R/contents.sgml b/en_US.ISO8859-1/htdocs/releases/4.6R/contents.xml
index 3cb41366b8..3cb41366b8 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6R/contents.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.6R/contents.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/4.6R/hardware.xml
index b6c92007d7..b6c92007d7 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.6R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/4.6R/installation.xml
index 4226c2d4f6..4226c2d4f6 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.6R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6R/qa.sgml b/en_US.ISO8859-1/htdocs/releases/4.6R/qa.xml
index 65febf87b9..65febf87b9 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6R/qa.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.6R/qa.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/4.6R/relnotes.xml
index 22387a751d..22387a751d 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.6R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.6R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/4.6R/schedule.xml
index 9f449e4ef4..23e4a1c2b2 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.6R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.6R/schedule.xml
@@ -236,7 +236,7 @@
     <td>3 June 2002</td>
     <td>Make sure the 4.6 manual pages are being displayed by default
       for the man->web gateway.  Also make sure these man pages are
-      pointed to by docs.sgml.</td>
+      pointed to by docs.xml.</td>
   </tr>
 
   <tr>
diff --git a/en_US.ISO8859-1/htdocs/releases/4.7R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.7R/Makefile
index 90bd3fcb76..2a4416534f 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.7R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.7R/Makefile
@@ -7,12 +7,12 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	qa.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	schedule.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	qa.xml
+DOCS+=	relnotes.xml
+DOCS+=	schedule.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/4.7R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.7R/announce.xml
index 2be1359ae2..2be1359ae2 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.7R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.7R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.7R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/4.7R/hardware.xml
index 35368eb976..35368eb976 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.7R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.7R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.7R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/4.7R/installation.xml
index d978976a17..d978976a17 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.7R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.7R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.7R/qa.sgml b/en_US.ISO8859-1/htdocs/releases/4.7R/qa.xml
index 3e1cba0369..3e1cba0369 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.7R/qa.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.7R/qa.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.7R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/4.7R/relnotes.xml
index c047a7b433..c047a7b433 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.7R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.7R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.7R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/4.7R/schedule.xml
index d1cd7bac8c..c59f9ab118 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.7R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.7R/schedule.xml
@@ -223,7 +223,7 @@
     <td>06 Oct 2002</td>
     <td>Make sure the 4.7 manual pages are being displayed by default
     for the man->web gateway.  Also make sure these man pages are
-    pointed to by docs.sgml.</td>
+    pointed to by docs.xml.</td>
   </tr>
 
   <tr>
diff --git a/en_US.ISO8859-1/htdocs/releases/4.8R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.8R/Makefile
index 91a1933282..574f5f6297 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.8R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.8R/Makefile
@@ -7,12 +7,12 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	qa.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	schedule.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	qa.xml
+DOCS+=	relnotes.xml
+DOCS+=	schedule.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/4.8R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.8R/announce.xml
index 116e29c898..116e29c898 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.8R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.8R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.8R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/4.8R/hardware.xml
index b76484a265..b76484a265 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.8R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.8R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.8R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/4.8R/installation.xml
index e089860652..e089860652 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.8R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.8R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.8R/qa.sgml b/en_US.ISO8859-1/htdocs/releases/4.8R/qa.xml
index 55205b018e..55205b018e 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.8R/qa.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.8R/qa.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.8R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/4.8R/relnotes.xml
index 9720fc6da1..9720fc6da1 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.8R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.8R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.8R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/4.8R/schedule.xml
index 9776eebe20..dfcae04246 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.8R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.8R/schedule.xml
@@ -236,7 +236,7 @@
     <td>28 Mar 2003</td>
     <td>Make sure the &local.rel; manual pages are being displayed by default
     for the man->web gateway.  Also make sure these man pages are
-    pointed to by docs.sgml.</td>
+    pointed to by docs.xml.</td>
   </tr>
 
   <tr>
diff --git a/en_US.ISO8859-1/htdocs/releases/4.9R/Makefile b/en_US.ISO8859-1/htdocs/releases/4.9R/Makefile
index 0850e1b780..8975dca165 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.9R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/4.9R/Makefile
@@ -7,13 +7,13 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	qa.sgml
-DOCS+=	schedule.sgml
-DOCS+=	todo.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
+DOCS+=	qa.xml
+DOCS+=	schedule.xml
+DOCS+=	todo.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/4.9R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/4.9R/announce.xml
index b2e5b588bc..b2e5b588bc 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.9R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.9R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.9R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/4.9R/hardware.xml
index 8ffd8d366f..8ffd8d366f 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.9R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.9R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.9R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/4.9R/installation.xml
index ce2a4d0abc..ce2a4d0abc 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.9R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.9R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.9R/qa.sgml b/en_US.ISO8859-1/htdocs/releases/4.9R/qa.xml
index 84afd23312..84afd23312 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.9R/qa.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.9R/qa.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.9R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/4.9R/relnotes.xml
index 9972509588..9972509588 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.9R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.9R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/4.9R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/4.9R/schedule.xml
index e4bea9bfd7..df81df65b4 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.9R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.9R/schedule.xml
@@ -240,7 +240,7 @@
     <td>19 Oct 2003</td>
     <td>Make sure the &local.rel; manual pages are being displayed by default
     for the man->web gateway.  Also make sure these man pages are
-    pointed to by docs.sgml.</td>
+    pointed to by docs.xml.</td>
   </tr>
 
   <tr>
diff --git a/en_US.ISO8859-1/htdocs/releases/4.9R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/4.9R/todo.xml
index bd21f75088..bd21f75088 100644
--- a/en_US.ISO8859-1/htdocs/releases/4.9R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/4.9R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/Makefile b/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/Makefile
index c3548b13fb..bb08b9fd7d 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/Makefile
@@ -7,10 +7,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/announce.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/announce.xml
index 807ca3473d..807ca3473d 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/hardware.xml
index 46196db063..46196db063 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/installation.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/installation.xml
index 9b0df244ca..9b0df244ca 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/relnotes.xml
index c00662d167..c00662d167 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/DP1/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/Makefile b/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/Makefile
index ccea8f7d8e..54d43d14ae 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/Makefile
@@ -7,10 +7,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/announce.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/announce.xml
index 971ca4f261..971ca4f261 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/hardware.xml
index c663f3fd92..c663f3fd92 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/installation.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/installation.xml
index 36925db0cf..36925db0cf 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/relnotes.xml
index 0ad5c8d9bc..0ad5c8d9bc 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/DP2/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/Makefile b/en_US.ISO8859-1/htdocs/releases/5.0R/Makefile
index cebd5e1927..f0fc7cac95 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/Makefile
@@ -10,12 +10,12 @@
 SUBDIR=  DP1
 SUBDIR+= DP2
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	schedule.sgml
-DOCS+=	todo.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
+DOCS+=	schedule.xml
+DOCS+=	todo.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/announce.xml
index e84a88a734..e84a88a734 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/hardware.xml
index 8104ad1f70..8104ad1f70 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/installation.xml
index bd5c4964f2..bd5c4964f2 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/relnotes.xml
index aeb35948af..aeb35948af 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/schedule.xml
index f0e33a9aa7..f0e33a9aa7 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.0R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/5.0R/todo.xml
index ad10945ede..ad10945ede 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.0R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.0R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/5.1R/Makefile
index e0f6d4af67..70e36fdc7e 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/5.1R/Makefile
@@ -7,12 +7,12 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	schedule.sgml
-DOCS+=	todo.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
+DOCS+=	schedule.xml
+DOCS+=	todo.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/5.1R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/5.1R/announce.xml
index e0924cec4f..e0924cec4f 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.1R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.1R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.1R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/5.1R/hardware.xml
index eaaee8ca07..eaaee8ca07 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.1R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.1R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.1R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/5.1R/installation.xml
index 5e639a32ac..5e639a32ac 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.1R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.1R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.1R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/5.1R/relnotes.xml
index 52d2f1e93d..52d2f1e93d 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.1R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.1R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.xml
index 4e0bc76336..4e0bc76336 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.1R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.1R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/5.1R/todo.xml
index 7108606e93..7108606e93 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.1R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.1R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/5.2.1R/Makefile
index 29090b6cb0..761d1fbd67 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/5.2.1R/Makefile
@@ -7,10 +7,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
 
 DATA=	docbook.css
 DATA+=  errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2.1R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/5.2.1R/announce.xml
index 72eca72fbd..72eca72fbd 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2.1R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.2.1R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2.1R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/5.2.1R/hardware.xml
index 8d6c9c0d42..8d6c9c0d42 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2.1R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.2.1R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2.1R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/5.2.1R/installation.xml
index f50f0b3aaa..f50f0b3aaa 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2.1R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.2.1R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2.1R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/5.2.1R/relnotes.xml
index a9601e59d9..a9601e59d9 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2.1R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.2.1R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2R/Makefile b/en_US.ISO8859-1/htdocs/releases/5.2R/Makefile
index b610239f75..4341c069c5 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/5.2R/Makefile
@@ -7,12 +7,12 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	schedule.sgml
-DOCS+=	todo.sgml
+DOCS=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
+DOCS+=	schedule.xml
+DOCS+=	todo.xml
 
 DATA=	docbook.css
 DATA+=  errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/5.2R/announce.xml
index 4a66ea3271..4a66ea3271 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.2R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/5.2R/hardware.xml
index e1114e2d05..e1114e2d05 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.2R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/5.2R/installation.xml
index a22d066507..a22d066507 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.2R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/5.2R/relnotes.xml
index e879ae8add..e879ae8add 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.2R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/5.2R/schedule.xml
index 6860147792..6860147792 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.2R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.2R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/5.2R/todo.xml
index 6fdfee5768..6fdfee5768 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.2R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.2R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.3R/Makefile b/en_US.ISO8859-1/htdocs/releases/5.3R/Makefile
index 6e0c04207c..785fb7a3f4 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.3R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/5.3R/Makefile
@@ -7,11 +7,11 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	todo.sgml schedule.sgml policy.sgml errata_policy.sgml
-DOCS+=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
+DOCS=	todo.xml schedule.xml policy.xml errata_policy.xml
+DOCS+=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/5.3R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/5.3R/announce.xml
index f0c8c3c1f0..f0c8c3c1f0 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.3R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.3R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.3R/errata_policy.sgml b/en_US.ISO8859-1/htdocs/releases/5.3R/errata_policy.xml
index 3587d701d4..3587d701d4 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.3R/errata_policy.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.3R/errata_policy.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.3R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/5.3R/hardware.xml
index 1b104c909f..1b104c909f 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.3R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.3R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.3R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/5.3R/installation.xml
index 46bfd40d0d..46bfd40d0d 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.3R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.3R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.3R/policy.sgml b/en_US.ISO8859-1/htdocs/releases/5.3R/policy.xml
index 8dc19beee1..8dc19beee1 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.3R/policy.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.3R/policy.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.3R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/5.3R/relnotes.xml
index d4553bca6a..d4553bca6a 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.3R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.3R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.3R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/5.3R/schedule.xml
index 4a1f21b739..4a1f21b739 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.3R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.3R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.3R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/5.3R/todo.xml
index 53c8526cd8..2f287ac4c4 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.3R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.3R/todo.xml
@@ -251,7 +251,7 @@
       5.3-RELEASE.<br/>
 	    <b>References:</b><br/>
 	    <a
-	    href="&url.cvsweb;/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml?rev=1.94&amp;content-type=text/x-cvsweb-markup">doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
+	    href="&url.cvsweb;/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml?rev=1.94&amp;content-type=text/x-cvsweb-markup">doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
 	    rev.1.94</a><br/>
 	  </td>
   </tr>
@@ -302,7 +302,7 @@
     <td>Update the X11 chapter of the Handbook for X.Org's X11
       server.<br/>
 	    <b>References:</b><br/>
-	    <a href="&url.cvsweb;/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml?rev=1.147&amp;content-type=text/x-cvsweb-markup">books/handbook/config/chapter.sgml rev.1.147</a><br/>
+	    <a href="&url.cvsweb;/doc/en_US.ISO8859-1/books/handbook/x11/chapter.xml?rev=1.147&amp;content-type=text/x-cvsweb-markup">books/handbook/config/chapter.xml rev.1.147</a><br/>
 	  </td>
   </tr>
 
@@ -314,8 +314,8 @@
       the new rc.d scripts and some ports use /etc/rc.conf for their
       configuration.<br/>
 	    <b>References:</b><br/>
-	    <a href="&url.cvsweb;/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml?rev=1.170&amp;content-type=text/x-cvsweb-markup">books/handbook/config/chapter.sgml rev.1.170</a><br/>
-	    <a href="&url.cvsweb;/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml?rev=1.172&amp;content-type=text/x-cvsweb-markup">books/handbook/config/chapter.sgml rev.1.172</a><br/>
+	    <a href="&url.cvsweb;/doc/en_US.ISO8859-1/books/handbook/config/chapter.xml?rev=1.170&amp;content-type=text/x-cvsweb-markup">books/handbook/config/chapter.xml rev.1.170</a><br/>
+	    <a href="&url.cvsweb;/doc/en_US.ISO8859-1/books/handbook/config/chapter.xml?rev=1.172&amp;content-type=text/x-cvsweb-markup">books/handbook/config/chapter.xml rev.1.172</a><br/>
 	  </td>
   </tr>
 
@@ -326,7 +326,7 @@
     <td>Chapter 8 must be updated to match 5.3-RELEASE.<br/>
 	    <b>References:</b><br/>
 	    <a href="&url.pr;pr=70674">docs/70674 (closed)</a><br/>
-	    <a href="&url.cvsweb;/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml?rev=1.135&amp;content-type=text/x-cvsweb-markup">books/handbook/kernelconfig/chapter.sgml rev.1.135</a><br/>
+	    <a href="&url.cvsweb;/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml?rev=1.135&amp;content-type=text/x-cvsweb-markup">books/handbook/kernelconfig/chapter.xml rev.1.135</a><br/>
 	  </td>
   </tr>
 
diff --git a/en_US.ISO8859-1/htdocs/releases/5.4R/Makefile b/en_US.ISO8859-1/htdocs/releases/5.4R/Makefile
index 560ed79be0..6e51ad1da8 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.4R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/5.4R/Makefile
@@ -7,11 +7,11 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	todo.sgml schedule.sgml errata_policy.sgml
-DOCS+=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
+DOCS=	todo.xml schedule.xml errata_policy.xml
+DOCS+=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
 
 DATA=	docbook.css
 
diff --git a/en_US.ISO8859-1/htdocs/releases/5.4R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/5.4R/announce.xml
index 9018e214f4..9018e214f4 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.4R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.4R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.4R/errata_policy.sgml b/en_US.ISO8859-1/htdocs/releases/5.4R/errata_policy.xml
index 0d8f47a072..0d8f47a072 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.4R/errata_policy.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.4R/errata_policy.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.4R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/5.4R/hardware.xml
index 405a57d3d2..405a57d3d2 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.4R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.4R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.4R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/5.4R/installation.xml
index f39d979019..f39d979019 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.4R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.4R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.4R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/5.4R/relnotes.xml
index 79a397f699..79a397f699 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.4R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.4R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.4R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/5.4R/schedule.xml
index cf234d3b32..0f4b9f3cb4 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.4R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.4R/schedule.xml
@@ -304,7 +304,7 @@
     <td>--</td>
     <td>Make sure the &local.rel; manual pages are being displayed by default
       for the man->web gateway.  Also make sure these man pages are
-      pointed to by docs.sgml.</td>
+      pointed to by docs.xml.</td>
   </tr>
 
   <tr>
diff --git a/en_US.ISO8859-1/htdocs/releases/5.4R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/5.4R/todo.xml
index 16a37cb7ba..16a37cb7ba 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.4R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.4R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.5R/Makefile b/en_US.ISO8859-1/htdocs/releases/5.5R/Makefile
index 7243fd56ca..a2f05d2a2c 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.5R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/5.5R/Makefile
@@ -7,12 +7,12 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	todo.sgml approvals.sgml
-DOCS+=	schedule.sgml
-DOCS+=	announce.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
+DOCS=	todo.xml approvals.xml
+DOCS+=	schedule.xml
+DOCS+=	announce.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
 
 DATA=	docbook.css
 
diff --git a/en_US.ISO8859-1/htdocs/releases/5.5R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/5.5R/announce.xml
index da9912b625..da9912b625 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.5R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.5R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.5R/approvals.sgml b/en_US.ISO8859-1/htdocs/releases/5.5R/approvals.xml
index 60f4c2ebd2..60f4c2ebd2 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.5R/approvals.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.5R/approvals.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.5R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/5.5R/hardware.xml
index 3094f0853e..3094f0853e 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.5R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.5R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.5R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/5.5R/installation.xml
index 97a269fe87..97a269fe87 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.5R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.5R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.5R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/5.5R/relnotes.xml
index 773b0eff6e..773b0eff6e 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.5R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.5R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.5R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/5.5R/schedule.xml
index 56d2a3f44f..56d2a3f44f 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.5R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.5R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/5.5R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/5.5R/todo.xml
index 4c60cd3125..4c60cd3125 100644
--- a/en_US.ISO8859-1/htdocs/releases/5.5R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/5.5R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.0R/Makefile b/en_US.ISO8859-1/htdocs/releases/6.0R/Makefile
index e0114d12bc..d69f6a7ec1 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.0R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/6.0R/Makefile
@@ -7,11 +7,11 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	todo.sgml schedule.sgml approvals.sgml
-DOCS+=	announce.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
+DOCS=	todo.xml schedule.xml approvals.xml
+DOCS+=	announce.xml
+DOCS+=	relnotes.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
 
 DATA+=	errata.html
 DATA+=	hardware-alpha.html
diff --git a/en_US.ISO8859-1/htdocs/releases/6.0R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/6.0R/announce.xml
index 70b274c0da..70b274c0da 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.0R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.0R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.0R/approvals.sgml b/en_US.ISO8859-1/htdocs/releases/6.0R/approvals.xml
index d7d973d112..d7d973d112 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.0R/approvals.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.0R/approvals.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.0R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/6.0R/hardware.xml
index fefde6ec7a..fefde6ec7a 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.0R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.0R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.0R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/6.0R/installation.xml
index 6315dd68a0..6315dd68a0 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.0R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.0R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.0R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/6.0R/relnotes.xml
index 5be3097c48..5be3097c48 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.0R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.0R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.0R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/6.0R/schedule.xml
index 9d3f781d1c..9d3f781d1c 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.0R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.0R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.0R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/6.0R/todo.xml
index f532442bb7..f532442bb7 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.0R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.0R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/6.1R/Makefile
index a1725ab154..fa90d260b8 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/6.1R/Makefile
@@ -7,11 +7,11 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	todo.sgml schedule.sgml approvals.sgml
-DOCS+=	announce.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
+DOCS=	todo.xml schedule.xml approvals.xml
+DOCS+=	announce.xml
+DOCS+=	relnotes.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
 
 DATA+= errata.html
 DATA+= hardware-alpha.html
diff --git a/en_US.ISO8859-1/htdocs/releases/6.1R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/6.1R/announce.xml
index 3841836043..3841836043 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.1R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.1R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.1R/approvals.sgml b/en_US.ISO8859-1/htdocs/releases/6.1R/approvals.xml
index 989b68dff1..989b68dff1 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.1R/approvals.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.1R/approvals.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.1R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/6.1R/hardware.xml
index 8622a1a789..8622a1a789 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.1R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.1R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.1R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/6.1R/installation.xml
index 6e8daf829d..6e8daf829d 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.1R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.1R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.1R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/6.1R/relnotes.xml
index a8092950d6..a8092950d6 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.1R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.1R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.1R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/6.1R/schedule.xml
index 2e9280e327..2e9280e327 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.1R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.1R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.1R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/6.1R/todo.xml
index 830a56cff0..830a56cff0 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.1R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.1R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.2R/Makefile b/en_US.ISO8859-1/htdocs/releases/6.2R/Makefile
index a1725ab154..fa90d260b8 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.2R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/6.2R/Makefile
@@ -7,11 +7,11 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	todo.sgml schedule.sgml approvals.sgml
-DOCS+=	announce.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
+DOCS=	todo.xml schedule.xml approvals.xml
+DOCS+=	announce.xml
+DOCS+=	relnotes.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
 
 DATA+= errata.html
 DATA+= hardware-alpha.html
diff --git a/en_US.ISO8859-1/htdocs/releases/6.2R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/6.2R/announce.xml
index e2571ee15f..e2571ee15f 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.2R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.2R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.2R/approvals.sgml b/en_US.ISO8859-1/htdocs/releases/6.2R/approvals.xml
index 83105acb75..83105acb75 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.2R/approvals.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.2R/approvals.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.2R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/6.2R/hardware.xml
index b6886ca887..b6886ca887 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.2R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.2R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.2R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/6.2R/installation.xml
index 9d47ca249f..9d47ca249f 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.2R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.2R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.2R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/6.2R/relnotes.xml
index cc1db3c695..cc1db3c695 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.2R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.2R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.2R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/6.2R/schedule.xml
index bb9b587731..bb9b587731 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.2R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.2R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.2R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/6.2R/todo.xml
index 61242a2b06..61242a2b06 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.2R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.2R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.3R/Makefile b/en_US.ISO8859-1/htdocs/releases/6.3R/Makefile
index a071c050e2..d83fd215f3 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.3R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/6.3R/Makefile
@@ -7,11 +7,11 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	schedule.sgml
+DOCS=	announce.xml
+DOCS+=	relnotes.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	schedule.xml
 
 #FETCHFILE= http://people.freebsd.org/~pho/stress/log/news.rss
 #FETCHCMD=  /usr/bin/fetch
diff --git a/en_US.ISO8859-1/htdocs/releases/6.3R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/6.3R/announce.xml
index 223f706ff9..223f706ff9 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.3R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.3R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.3R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/6.3R/hardware.xml
index 280a06b4a4..280a06b4a4 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.3R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.3R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.3R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/6.3R/installation.xml
index 5375c27e60..5375c27e60 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.3R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.3R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.3R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/6.3R/relnotes.xml
index 0550965923..0550965923 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.3R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.3R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.3R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/6.3R/schedule.xml
index 0bf4a2f945..0bf4a2f945 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.3R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.3R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.4R/Makefile b/en_US.ISO8859-1/htdocs/releases/6.4R/Makefile
index 0cccaf50e6..e93425624c 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.4R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/6.4R/Makefile
@@ -7,11 +7,11 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	schedule.sgml
+DOCS=	announce.xml
+DOCS+=	relnotes.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	schedule.xml
 
 DATA=	errata.html
 DATA+=	hardware-alpha.html
diff --git a/en_US.ISO8859-1/htdocs/releases/6.4R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/6.4R/announce.xml
index 97f7283db4..97f7283db4 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.4R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.4R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.4R/hardware.sgml b/en_US.ISO8859-1/htdocs/releases/6.4R/hardware.xml
index 2d18cdb5e6..2d18cdb5e6 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.4R/hardware.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.4R/hardware.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.4R/installation.sgml b/en_US.ISO8859-1/htdocs/releases/6.4R/installation.xml
index 63cb7e5480..63cb7e5480 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.4R/installation.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.4R/installation.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.4R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/6.4R/relnotes.xml
index ceddf26a51..ceddf26a51 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.4R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.4R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/6.4R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/6.4R/schedule.xml
index 96348f3eab..96348f3eab 100644
--- a/en_US.ISO8859-1/htdocs/releases/6.4R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/6.4R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.0R/Makefile b/en_US.ISO8859-1/htdocs/releases/7.0R/Makefile
index 4bacfd8b5b..8cf046a3ea 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.0R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/7.0R/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml todo.sgml schedule.sgml approvals.sgml
+DOCS=	announce.xml todo.xml schedule.xml approvals.xml
 
 FETCHFILE= http://people.freebsd.org/~pho/stress/log/news.rss
 FETCHCMD=  /usr/bin/fetch
diff --git a/en_US.ISO8859-1/htdocs/releases/7.0R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/7.0R/announce.xml
index 87a87286a9..87a87286a9 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.0R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.0R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.0R/approvals.sgml b/en_US.ISO8859-1/htdocs/releases/7.0R/approvals.xml
index 72d5ea7aee..72d5ea7aee 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.0R/approvals.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.0R/approvals.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.0R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/7.0R/schedule.xml
index 808f18e7c4..808f18e7c4 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.0R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.0R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.0R/todo.sgml b/en_US.ISO8859-1/htdocs/releases/7.0R/todo.xml
index 756fc2b906..756fc2b906 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.0R/todo.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.0R/todo.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/7.1R/Makefile
index 1d7d9c6078..b85d9a9f8e 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/7.1R/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml schedule.sgml
+DOCS=	announce.xml schedule.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/7.1R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/7.1R/announce.xml
index 35dcf8bac0..35dcf8bac0 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.1R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.1R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.1R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/7.1R/schedule.xml
index c9f7960c36..c9f7960c36 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.1R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.1R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.2R/Makefile b/en_US.ISO8859-1/htdocs/releases/7.2R/Makefile
index 078d750a07..580913275b 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.2R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/7.2R/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml relnotes.sgml schedule.sgml
+DOCS=	announce.xml relnotes.xml schedule.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/en_US.ISO8859-1/htdocs/releases/7.2R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/7.2R/announce.xml
index 618d1f519e..618d1f519e 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.2R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.2R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.2R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/7.2R/relnotes.xml
index 78c10b6a3c..78c10b6a3c 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.2R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.2R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.2R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/7.2R/schedule.xml
index 3d99ac4bf7..3d99ac4bf7 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.2R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.2R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.2R/status.sgml b/en_US.ISO8859-1/htdocs/releases/7.2R/status.xml
index 69aaacf94e..69aaacf94e 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.2R/status.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.2R/status.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.3R/Makefile b/en_US.ISO8859-1/htdocs/releases/7.3R/Makefile
index 1694f57580..872e97cd75 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.3R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/7.3R/Makefile
@@ -7,9 +7,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	schedule.sgml \
-	relnotes.sgml \
-	announce.sgml
+DOCS=	schedule.xml \
+	relnotes.xml \
+	announce.xml
 
 DATA=	docbook.css \
 	errata.html \
diff --git a/en_US.ISO8859-1/htdocs/releases/7.3R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/7.3R/announce.xml
index 7d97abf62d..7d97abf62d 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.3R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.3R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.3R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/7.3R/relnotes.xml
index 9a0cb2a01f..9a0cb2a01f 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.3R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.3R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.3R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/7.3R/schedule.xml
index 3b70b0d44a..3b70b0d44a 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.3R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.3R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.4R/Makefile b/en_US.ISO8859-1/htdocs/releases/7.4R/Makefile
index 9a1568f736..e0d0c2fabc 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.4R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/7.4R/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml \
-	schedule.sgml
+DOCS=	announce.xml \
+	schedule.xml
 
 DATA=	docbook.css \
 	errata.html \
diff --git a/en_US.ISO8859-1/htdocs/releases/7.4R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/7.4R/announce.xml
index beee831f71..beee831f71 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.4R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.4R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/7.4R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/7.4R/schedule.xml
index 37387fa70b..37387fa70b 100644
--- a/en_US.ISO8859-1/htdocs/releases/7.4R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/7.4R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.0R/Makefile b/en_US.ISO8859-1/htdocs/releases/8.0R/Makefile
index 3bc5537bca..e255c540cf 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.0R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/8.0R/Makefile
@@ -7,10 +7,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	pressrelease.sgml
-DOCS+=	relnotes.sgml
-DOCS+=	schedule.sgml
+DOCS=	announce.xml
+DOCS+=	pressrelease.xml
+DOCS+=	relnotes.xml
+DOCS+=	schedule.xml
 
 DATA=	docbook.css \
 	errata.html \
diff --git a/en_US.ISO8859-1/htdocs/releases/8.0R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/8.0R/announce.xml
index 8270cd4d62..8270cd4d62 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.0R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.0R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.0R/pressrelease.sgml b/en_US.ISO8859-1/htdocs/releases/8.0R/pressrelease.xml
index 9f95ce3e20..9f95ce3e20 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.0R/pressrelease.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.0R/pressrelease.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.0R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/8.0R/relnotes.xml
index 004750feea..004750feea 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.0R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.0R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.0R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/8.0R/schedule.xml
index 985189ae7c..985189ae7c 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.0R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.0R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/8.1R/Makefile
index 73c2974aa7..57e2d9dc62 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/8.1R/Makefile
@@ -7,9 +7,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml \
-	schedule.sgml \
-	relnotes.sgml
+DOCS=	announce.xml \
+	schedule.xml \
+	relnotes.xml
 
 DATA=	docbook.css \
 	errata.html \
diff --git a/en_US.ISO8859-1/htdocs/releases/8.1R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/8.1R/announce.xml
index 010a4836a7..010a4836a7 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.1R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.1R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.1R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/8.1R/relnotes.xml
index 1ce9478d39..1ce9478d39 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.1R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.1R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.1R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/8.1R/schedule.xml
index 25cc73be0d..25cc73be0d 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.1R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.1R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.2R/Makefile b/en_US.ISO8859-1/htdocs/releases/8.2R/Makefile
index 73c2974aa7..57e2d9dc62 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.2R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/8.2R/Makefile
@@ -7,9 +7,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml \
-	schedule.sgml \
-	relnotes.sgml
+DOCS=	announce.xml \
+	schedule.xml \
+	relnotes.xml
 
 DATA=	docbook.css \
 	errata.html \
diff --git a/en_US.ISO8859-1/htdocs/releases/8.2R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/8.2R/announce.xml
index 46d692e19e..46d692e19e 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.2R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.2R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.2R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/8.2R/relnotes.xml
index d6540a1ce9..d6540a1ce9 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.2R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.2R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.2R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/8.2R/schedule.xml
index 32f0fd20a1..32f0fd20a1 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.2R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.2R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.3R/Makefile b/en_US.ISO8859-1/htdocs/releases/8.3R/Makefile
index 9c7de500db..32c64f393d 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.3R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/8.3R/Makefile
@@ -7,9 +7,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+=	announce.sgml \
-	relnotes.sgml \
-	schedule.sgml
+DOCS+=	announce.xml \
+	relnotes.xml \
+	schedule.xml
 
 DATA=	docbook.css \
 	errata.html \
diff --git a/en_US.ISO8859-1/htdocs/releases/8.3R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/8.3R/announce.xml
index 0a2cf329e1..0a2cf329e1 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.3R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.3R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.3R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/8.3R/relnotes.xml
index 46ef5a133d..46ef5a133d 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.3R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.3R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/8.3R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/8.3R/schedule.xml
index bacf1b0428..bacf1b0428 100644
--- a/en_US.ISO8859-1/htdocs/releases/8.3R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/8.3R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/9.0R/Makefile b/en_US.ISO8859-1/htdocs/releases/9.0R/Makefile
index 846157add6..5a6d2388fe 100644
--- a/en_US.ISO8859-1/htdocs/releases/9.0R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/9.0R/Makefile
@@ -7,9 +7,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	schedule.sgml \
-	relnotes.sgml \
-	announce.sgml
+DOCS=	schedule.xml \
+	relnotes.xml \
+	announce.xml
 
 DATA=	docbook.css \
 	hardware.html \
diff --git a/en_US.ISO8859-1/htdocs/releases/9.0R/announce.sgml b/en_US.ISO8859-1/htdocs/releases/9.0R/announce.xml
index 05b4e28a26..05b4e28a26 100644
--- a/en_US.ISO8859-1/htdocs/releases/9.0R/announce.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/9.0R/announce.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/9.0R/relnotes.sgml b/en_US.ISO8859-1/htdocs/releases/9.0R/relnotes.xml
index 751b591b2d..751b591b2d 100644
--- a/en_US.ISO8859-1/htdocs/releases/9.0R/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/9.0R/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/9.0R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/9.0R/schedule.xml
index b8c10fb87a..b8c10fb87a 100644
--- a/en_US.ISO8859-1/htdocs/releases/9.0R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/9.0R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/9.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/9.1R/Makefile
index f3091e87da..6d28114b16 100644
--- a/en_US.ISO8859-1/htdocs/releases/9.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/9.1R/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	schedule.sgml
+DOCS=	schedule.xml
 
 DATA=	docbook.css
 
diff --git a/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml b/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.xml
index 2b4e510d90..2b4e510d90 100644
--- a/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.xml
diff --git a/en_US.ISO8859-1/htdocs/releases/Makefile b/en_US.ISO8859-1/htdocs/releases/Makefile
index 5d58adee28..34c0cdae84 100644
--- a/en_US.ISO8859-1/htdocs/releases/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml
+DOCS?=	index.xml
 
 SUBDIR=		1.1 1.1.5 2.0 2.0.5R 2.1R 2.1.5R 2.1.6R 2.1.7R 2.2R
 SUBDIR+=	2.2.1R 2.2.2R 2.2.5R 2.2.6R 2.2.7R 2.2.8R 3.0R 3.1R 3.2R
diff --git a/en_US.ISO8859-1/htdocs/releases/index.sgml b/en_US.ISO8859-1/htdocs/releases/index.xml
index 42d3785e91..42d3785e91 100644
--- a/en_US.ISO8859-1/htdocs/releases/index.sgml
+++ b/en_US.ISO8859-1/htdocs/releases/index.xml
diff --git a/en_US.ISO8859-1/htdocs/releng/Makefile b/en_US.ISO8859-1/htdocs/releng/Makefile
index 07614ad10e..2fd8afb7a3 100644
--- a/en_US.ISO8859-1/htdocs/releng/Makefile
+++ b/en_US.ISO8859-1/htdocs/releng/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml charter.sgml dst_info.sgml
+DOCS?=	index.xml charter.xml dst_info.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/releng/charter.sgml b/en_US.ISO8859-1/htdocs/releng/charter.xml
index 6da883f57f..6da883f57f 100644
--- a/en_US.ISO8859-1/htdocs/releng/charter.sgml
+++ b/en_US.ISO8859-1/htdocs/releng/charter.xml
diff --git a/en_US.ISO8859-1/htdocs/releng/dst_info.sgml b/en_US.ISO8859-1/htdocs/releng/dst_info.xml
index 07f3c9d8d4..07f3c9d8d4 100644
--- a/en_US.ISO8859-1/htdocs/releng/dst_info.sgml
+++ b/en_US.ISO8859-1/htdocs/releng/dst_info.xml
diff --git a/en_US.ISO8859-1/htdocs/releng/index.sgml b/en_US.ISO8859-1/htdocs/releng/index.xml
index b9a25fb59d..b9a25fb59d 100644
--- a/en_US.ISO8859-1/htdocs/releng/index.sgml
+++ b/en_US.ISO8859-1/htdocs/releng/index.xml
diff --git a/en_US.ISO8859-1/htdocs/relnotes.sgml b/en_US.ISO8859-1/htdocs/relnotes.xml
index d7985c547a..d7985c547a 100644
--- a/en_US.ISO8859-1/htdocs/relnotes.sgml
+++ b/en_US.ISO8859-1/htdocs/relnotes.xml
diff --git a/en_US.ISO8859-1/htdocs/search/Makefile b/en_US.ISO8859-1/htdocs/search/Makefile
index 634661661c..e0650629b0 100644
--- a/en_US.ISO8859-1/htdocs/search/Makefile
+++ b/en_US.ISO8859-1/htdocs/search/Makefile
@@ -7,9 +7,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+= search.sgml
-DOCS+= searchhints.sgml
-DOCS+=	search-mid.sgml
+DOCS+= search.xml
+DOCS+= searchhints.xml
+DOCS+=	search-mid.xml
 
 SUBDIR+= opensearch
 
diff --git a/en_US.ISO8859-1/htdocs/search/opensearch/Makefile b/en_US.ISO8859-1/htdocs/search/opensearch/Makefile
index 074f6f9c10..b7dc7113e2 100644
--- a/en_US.ISO8859-1/htdocs/search/opensearch/Makefile
+++ b/en_US.ISO8859-1/htdocs/search/opensearch/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+= 		opensearch.sgml
+DOCS+= 		opensearch.xml
 INDEXLINK=	opensearch.html
 
 DATA=
diff --git a/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.sgml b/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.xml
index 3ab971c4c8..3ab971c4c8 100644
--- a/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.sgml
+++ b/en_US.ISO8859-1/htdocs/search/opensearch/opensearch.xml
diff --git a/en_US.ISO8859-1/htdocs/search/search-mid.sgml b/en_US.ISO8859-1/htdocs/search/search-mid.xml
index 0db7260c70..0db7260c70 100644
--- a/en_US.ISO8859-1/htdocs/search/search-mid.sgml
+++ b/en_US.ISO8859-1/htdocs/search/search-mid.xml
diff --git a/en_US.ISO8859-1/htdocs/search/search.sgml b/en_US.ISO8859-1/htdocs/search/search.xml
index b5bc35bf85..b5bc35bf85 100644
--- a/en_US.ISO8859-1/htdocs/search/search.sgml
+++ b/en_US.ISO8859-1/htdocs/search/search.xml
diff --git a/en_US.ISO8859-1/htdocs/search/searchhints.sgml b/en_US.ISO8859-1/htdocs/search/searchhints.xml
index 519fdb8212..519fdb8212 100644
--- a/en_US.ISO8859-1/htdocs/search/searchhints.sgml
+++ b/en_US.ISO8859-1/htdocs/search/searchhints.xml
diff --git a/en_US.ISO8859-1/htdocs/security/Makefile b/en_US.ISO8859-1/htdocs/security/Makefile
index 8bbf737b70..deec241b2b 100644
--- a/en_US.ISO8859-1/htdocs/security/Makefile
+++ b/en_US.ISO8859-1/htdocs/security/Makefile
@@ -11,14 +11,14 @@ SUBDIR=		advisories
 SUBDIR+=	patches
 
 DATA=	so_public_key.asc
-DOCS=	charter.sgml
-DOCS+=	security.sgml
-DOCS+=	advisories.sgml
-DOCS+=  notices.sgml
+DOCS=	charter.xml
+DOCS+=	security.xml
+DOCS+=	advisories.xml
+DOCS+=  notices.xml
 
-advisories.sgml: advisories.html.inc
+advisories.xml: advisories.html.inc
 
-notices.sgml: notices.html.inc
+notices.xml: notices.html.inc
 
 INDEXLINK=	security.html
 
diff --git a/en_US.ISO8859-1/htdocs/security/advisories.sgml b/en_US.ISO8859-1/htdocs/security/advisories.xml
index e655788716..e655788716 100644
--- a/en_US.ISO8859-1/htdocs/security/advisories.sgml
+++ b/en_US.ISO8859-1/htdocs/security/advisories.xml
diff --git a/en_US.ISO8859-1/htdocs/security/charter.sgml b/en_US.ISO8859-1/htdocs/security/charter.xml
index 1c99142a27..1c99142a27 100644
--- a/en_US.ISO8859-1/htdocs/security/charter.sgml
+++ b/en_US.ISO8859-1/htdocs/security/charter.xml
diff --git a/en_US.ISO8859-1/htdocs/security/notices.sgml b/en_US.ISO8859-1/htdocs/security/notices.xml
index a755eff025..a755eff025 100644
--- a/en_US.ISO8859-1/htdocs/security/notices.sgml
+++ b/en_US.ISO8859-1/htdocs/security/notices.xml
diff --git a/en_US.ISO8859-1/htdocs/security/security.sgml b/en_US.ISO8859-1/htdocs/security/security.xml
index aa3402c83c..37d4805769 100644
--- a/en_US.ISO8859-1/htdocs/security/security.sgml
+++ b/en_US.ISO8859-1/htdocs/security/security.xml
@@ -238,7 +238,7 @@
     date listed.</p>
 
   <!--
-      Please also update www/en/releng/index.sgml when updating this
+      Please also update www/en/releng/index.xml when updating this
       list of supported branches.
   -->
   <table class="tblbasic">
diff --git a/en_US.ISO8859-1/htdocs/send-pr.sgml b/en_US.ISO8859-1/htdocs/send-pr.xml
index 0cdf37c126..0cdf37c126 100644
--- a/en_US.ISO8859-1/htdocs/send-pr.sgml
+++ b/en_US.ISO8859-1/htdocs/send-pr.xml
diff --git a/en_US.ISO8859-1/htdocs/snapshots/Makefile b/en_US.ISO8859-1/htdocs/snapshots/Makefile
index e832717d87..7f5eb393bb 100644
--- a/en_US.ISO8859-1/htdocs/snapshots/Makefile
+++ b/en_US.ISO8859-1/htdocs/snapshots/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml
+DOCS?=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/snapshots/index.sgml b/en_US.ISO8859-1/htdocs/snapshots/index.xml
index 8f3f00b6a6..8f3f00b6a6 100644
--- a/en_US.ISO8859-1/htdocs/snapshots/index.sgml
+++ b/en_US.ISO8859-1/htdocs/snapshots/index.xml
diff --git a/en_US.ISO8859-1/htdocs/support.sgml b/en_US.ISO8859-1/htdocs/support.xml
index 59f41fafe2..59f41fafe2 100644
--- a/en_US.ISO8859-1/htdocs/support.sgml
+++ b/en_US.ISO8859-1/htdocs/support.xml
diff --git a/en_US.ISO8859-1/htdocs/support/Makefile b/en_US.ISO8859-1/htdocs/support/Makefile
index f289e8e059..b183985b82 100644
--- a/en_US.ISO8859-1/htdocs/support/Makefile
+++ b/en_US.ISO8859-1/htdocs/support/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   bugreports.sgml webresources.sgml
+DOCS=   bugreports.xml webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/support/bugreports.sgml b/en_US.ISO8859-1/htdocs/support/bugreports.xml
index 67128ba6c1..67128ba6c1 100644
--- a/en_US.ISO8859-1/htdocs/support/bugreports.sgml
+++ b/en_US.ISO8859-1/htdocs/support/bugreports.xml
diff --git a/en_US.ISO8859-1/htdocs/support/webresources.sgml b/en_US.ISO8859-1/htdocs/support/webresources.xml
index 185a2450a9..185a2450a9 100644
--- a/en_US.ISO8859-1/htdocs/support/webresources.sgml
+++ b/en_US.ISO8859-1/htdocs/support/webresources.xml
diff --git a/en_US.ISO8859-1/htdocs/tutorials/Makefile b/en_US.ISO8859-1/htdocs/tutorials/Makefile
index b6964bdc55..e529271127 100644
--- a/en_US.ISO8859-1/htdocs/tutorials/Makefile
+++ b/en_US.ISO8859-1/htdocs/tutorials/Makefile
@@ -11,6 +11,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS = index.sgml
+DOCS = index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/en_US.ISO8859-1/htdocs/tutorials/index.sgml b/en_US.ISO8859-1/htdocs/tutorials/index.xml
index 2b539489ca..2b539489ca 100644
--- a/en_US.ISO8859-1/htdocs/tutorials/index.sgml
+++ b/en_US.ISO8859-1/htdocs/tutorials/index.xml
diff --git a/en_US.ISO8859-1/htdocs/where.sgml b/en_US.ISO8859-1/htdocs/where.xml
index b6592f77c3..b6592f77c3 100644
--- a/en_US.ISO8859-1/htdocs/where.sgml
+++ b/en_US.ISO8859-1/htdocs/where.xml