diff --git a/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile b/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile
index 5866fe5021..815f5d9a8d 100644
--- a/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile
+++ b/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile
@@ -12,7 +12,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS=	article.sgml
+SRCS=	article.xml
 
 DOC_PREFIX?=	${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml b/bn_BD.ISO10646-1/articles/explaining-bsd/article.xml
similarity index 100%
rename from bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml
rename to bn_BD.ISO10646-1/articles/explaining-bsd/article.xml
diff --git a/bn_BD.ISO10646-1/articles/new-users/Makefile b/bn_BD.ISO10646-1/articles/new-users/Makefile
index daeff6a58b..e41ad020bc 100644
--- a/bn_BD.ISO10646-1/articles/new-users/Makefile
+++ b/bn_BD.ISO10646-1/articles/new-users/Makefile
@@ -9,7 +9,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/bn_BD.ISO10646-1/articles/new-users/article.sgml b/bn_BD.ISO10646-1/articles/new-users/article.xml
similarity index 100%
rename from bn_BD.ISO10646-1/articles/new-users/article.sgml
rename to bn_BD.ISO10646-1/articles/new-users/article.xml
diff --git a/da_DK.ISO8859-1/articles/ipsec-must/Makefile b/da_DK.ISO8859-1/articles/ipsec-must/Makefile
index 3e955dce2e..11f375cee1 100644
--- a/da_DK.ISO8859-1/articles/ipsec-must/Makefile
+++ b/da_DK.ISO8859-1/articles/ipsec-must/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/da_DK.ISO8859-1/articles/ipsec-must/article.sgml b/da_DK.ISO8859-1/articles/ipsec-must/article.xml
similarity index 100%
rename from da_DK.ISO8859-1/articles/ipsec-must/article.sgml
rename to da_DK.ISO8859-1/articles/ipsec-must/article.xml
diff --git a/da_DK.ISO8859-1/articles/pxe/Makefile b/da_DK.ISO8859-1/articles/pxe/Makefile
index 6fb7f80435..87638e349a 100644
--- a/da_DK.ISO8859-1/articles/pxe/Makefile
+++ b/da_DK.ISO8859-1/articles/pxe/Makefile
@@ -7,7 +7,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/da_DK.ISO8859-1/articles/pxe/article.sgml b/da_DK.ISO8859-1/articles/pxe/article.xml
similarity index 100%
rename from da_DK.ISO8859-1/articles/pxe/article.sgml
rename to da_DK.ISO8859-1/articles/pxe/article.xml
diff --git a/da_DK.ISO8859-1/share/sgml/disclaimer.sgml b/da_DK.ISO8859-1/share/sgml/disclaimer.xml
similarity index 100%
rename from da_DK.ISO8859-1/share/sgml/disclaimer.sgml
rename to da_DK.ISO8859-1/share/sgml/disclaimer.xml
diff --git a/de_DE.ISO8859-1/articles/contributing-ports/Makefile b/de_DE.ISO8859-1/articles/contributing-ports/Makefile
index fc1c040246..a6ed5c6c99 100644
--- a/de_DE.ISO8859-1/articles/contributing-ports/Makefile
+++ b/de_DE.ISO8859-1/articles/contributing-ports/Makefile
@@ -16,7 +16,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/de_DE.ISO8859-1/articles/contributing-ports/article.sgml b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
similarity index 99%
rename from de_DE.ISO8859-1/articles/contributing-ports/article.sgml
rename to de_DE.ISO8859-1/articles/contributing-ports/article.xml
index f4059c5993..e7da35dd39 100644
--- a/de_DE.ISO8859-1/articles/contributing-ports/article.sgml
+++ b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
@@ -10,7 +10,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/articles/contributing-ports/article.sgml,v 1.11 2011/12/24 14:32:22 bcr Exp $
+     $FreeBSDde: de-docproj/articles/contributing-ports/article.xml,v 1.11 2011/12/24 14:32:22 bcr Exp $
      basiert auf: 1.9
      -->
 
diff --git a/de_DE.ISO8859-1/articles/contributing/Makefile b/de_DE.ISO8859-1/articles/contributing/Makefile
index ce67cb7a4b..ba74deefb7 100644
--- a/de_DE.ISO8859-1/articles/contributing/Makefile
+++ b/de_DE.ISO8859-1/articles/contributing/Makefile
@@ -16,7 +16,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/de_DE.ISO8859-1/articles/contributing/article.sgml b/de_DE.ISO8859-1/articles/contributing/article.xml
similarity index 99%
rename from de_DE.ISO8859-1/articles/contributing/article.sgml
rename to de_DE.ISO8859-1/articles/contributing/article.xml
index 9ed7fd21e2..f0ddae98cb 100644
--- a/de_DE.ISO8859-1/articles/contributing/article.sgml
+++ b/de_DE.ISO8859-1/articles/contributing/article.xml
@@ -11,7 +11,7 @@
       The FreeBSD German Documentation Project
 
       $FreeBSD$
-      $FreeBSDde: de-docproj/articles/contributing/article.sgml,v 1.12 2012/03/25 14:15:57 bcr Exp $
+      $FreeBSDde: de-docproj/articles/contributing/article.xml,v 1.12 2012/03/25 14:15:57 bcr Exp $
       basiert auf:  1.512
 -->
 
diff --git a/de_DE.ISO8859-1/articles/explaining-bsd/Makefile b/de_DE.ISO8859-1/articles/explaining-bsd/Makefile
index d4a9945a43..e8c0bf5df7 100644
--- a/de_DE.ISO8859-1/articles/explaining-bsd/Makefile
+++ b/de_DE.ISO8859-1/articles/explaining-bsd/Makefile
@@ -16,7 +16,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/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml b/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
similarity index 99%
rename from de_DE.ISO8859-1/articles/explaining-bsd/article.sgml
rename to de_DE.ISO8859-1/articles/explaining-bsd/article.xml
index 50c7c7b789..81012e3e5e 100644
--- a/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml
+++ b/de_DE.ISO8859-1/articles/explaining-bsd/article.xml
@@ -9,7 +9,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/articles/explaining-bsd/article.sgml,v 1.16 2012/03/25 14:11:01 bcr Exp $
+     $FreeBSDde: de-docproj/articles/explaining-bsd/article.xml,v 1.16 2012/03/25 14:11:01 bcr Exp $
      basiert auf: 1.28
 -->
 
diff --git a/de_DE.ISO8859-1/articles/laptop/Makefile b/de_DE.ISO8859-1/articles/laptop/Makefile
index d5709dbac4..3d65505988 100644
--- a/de_DE.ISO8859-1/articles/laptop/Makefile
+++ b/de_DE.ISO8859-1/articles/laptop/Makefile
@@ -16,7 +16,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/de_DE.ISO8859-1/articles/laptop/article.sgml b/de_DE.ISO8859-1/articles/laptop/article.xml
similarity index 99%
rename from de_DE.ISO8859-1/articles/laptop/article.sgml
rename to de_DE.ISO8859-1/articles/laptop/article.xml
index c9009a696e..032b16bacb 100644
--- a/de_DE.ISO8859-1/articles/laptop/article.sgml
+++ b/de_DE.ISO8859-1/articles/laptop/article.xml
@@ -9,7 +9,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/articles/laptop/article.sgml,v 1.6 2007/01/16 18:56:31 jkois Exp $
+     $FreeBSDde: de-docproj/articles/laptop/article.xml,v 1.6 2007/01/16 18:56:31 jkois Exp $
      basiert auf: 1.25
 -->
 
diff --git a/de_DE.ISO8859-1/articles/linux-comparison/Makefile b/de_DE.ISO8859-1/articles/linux-comparison/Makefile
index 33e518932b..89e28e82b9 100644
--- a/de_DE.ISO8859-1/articles/linux-comparison/Makefile
+++ b/de_DE.ISO8859-1/articles/linux-comparison/Makefile
@@ -16,7 +16,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/de_DE.ISO8859-1/articles/linux-comparison/article.sgml b/de_DE.ISO8859-1/articles/linux-comparison/article.xml
similarity index 99%
rename from de_DE.ISO8859-1/articles/linux-comparison/article.sgml
rename to de_DE.ISO8859-1/articles/linux-comparison/article.xml
index 621a53c81a..0da6829e3b 100644
--- a/de_DE.ISO8859-1/articles/linux-comparison/article.sgml
+++ b/de_DE.ISO8859-1/articles/linux-comparison/article.xml
@@ -39,7 +39,7 @@ Copyright (c) 2005 Dru Lavigne
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
      $FreeBSD$
-     $FreeBSDde: de-docproj/articles/linux-comparison/article.sgml,v 1.9 2011/12/24 13:15:56 bcr Exp $
+     $FreeBSDde: de-docproj/articles/linux-comparison/article.xml,v 1.9 2011/12/24 13:15:56 bcr Exp $
      basiert auf: 1.12
 -->
 
diff --git a/de_DE.ISO8859-1/articles/new-users/Makefile b/de_DE.ISO8859-1/articles/new-users/Makefile
index d0e17781ef..8772d2ee2b 100644
--- a/de_DE.ISO8859-1/articles/new-users/Makefile
+++ b/de_DE.ISO8859-1/articles/new-users/Makefile
@@ -16,7 +16,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/de_DE.ISO8859-1/articles/new-users/article.sgml b/de_DE.ISO8859-1/articles/new-users/article.xml
similarity index 99%
rename from de_DE.ISO8859-1/articles/new-users/article.sgml
rename to de_DE.ISO8859-1/articles/new-users/article.xml
index c1f64afdfa..f856e3c5d6 100644
--- a/de_DE.ISO8859-1/articles/new-users/article.sgml
+++ b/de_DE.ISO8859-1/articles/new-users/article.xml
@@ -9,7 +9,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/articles/new-users/article.sgml,v 1.7 2009/04/14 18:23:35 bcr Exp $
+     $FreeBSDde: de-docproj/articles/new-users/article.xml,v 1.7 2009/04/14 18:23:35 bcr Exp $
      basiert auf: 1.51
 -->
 
diff --git a/de_DE.ISO8859-1/articles/solid-state/Makefile b/de_DE.ISO8859-1/articles/solid-state/Makefile
index c56ffa7d02..e24cd4f3db 100644
--- a/de_DE.ISO8859-1/articles/solid-state/Makefile
+++ b/de_DE.ISO8859-1/articles/solid-state/Makefile
@@ -16,7 +16,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/de_DE.ISO8859-1/articles/solid-state/article.sgml b/de_DE.ISO8859-1/articles/solid-state/article.xml
similarity index 99%
rename from de_DE.ISO8859-1/articles/solid-state/article.sgml
rename to de_DE.ISO8859-1/articles/solid-state/article.xml
index 58bf9cf5fc..5986fb79d3 100644
--- a/de_DE.ISO8859-1/articles/solid-state/article.sgml
+++ b/de_DE.ISO8859-1/articles/solid-state/article.xml
@@ -35,7 +35,7 @@
      POSSIBILITY OF SUCH DAMAGE.
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/articles/solid-state/article.sgml,v 1.2 2010/09/18 21:55:49 jkois Exp $
+     $FreeBSDde: de-docproj/articles/solid-state/article.xml,v 1.2 2010/09/18 21:55:49 jkois Exp $
      basiert auf: 1.18
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/Makefile b/de_DE.ISO8859-1/books/developers-handbook/Makefile
index fb2de5d868..d95d600e9a 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/Makefile
+++ b/de_DE.ISO8859-1/books/developers-handbook/Makefile
@@ -28,18 +28,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/de_DE.ISO8859-1/books/developers-handbook/book.sgml b/de_DE.ISO8859-1/books/developers-handbook/book.xml
similarity index 98%
rename from de_DE.ISO8859-1/books/developers-handbook/book.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/book.xml
index facd65396e..c633229b6f 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/book.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/book.xml
@@ -11,7 +11,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/developers-handbook/book.sgml,v 1.15 2010/12/18 13:28:29 jkois Exp $
+     $FreeBSDde: de-docproj/books/developers-handbook/book.xml,v 1.15 2010/12/18 13:28:29 jkois Exp $
      basiert auf: 1.58
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/chapters.ent b/de_DE.ISO8859-1/books/developers-handbook/chapters.ent
index 57ce2bac8d..7b1ed4db4c 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/chapters.ent
+++ b/de_DE.ISO8859-1/books/developers-handbook/chapters.ent
@@ -6,7 +6,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.
 
@@ -18,26 +18,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/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
index 1ca29fdd6f..dd7ef91614 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/developers-handbook/introduction/chapter.sgml,v 1.12 2012/04/22 20:07:16 bcr Exp $
+     $FreeBSDde: de-docproj/books/developers-handbook/introduction/chapter.xml,v 1.12 2012/04/22 20:07:16 bcr Exp $
      basiert auf: 1.21
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
index 609f8add42..d6fc6e55a1 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.xml
@@ -4,7 +4,7 @@
     The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/developers-handbook/ipv6/chapter.sgml,v 1.8 2010/12/15 19:03:49 bcr Exp $
+     $FreeBSDde: de-docproj/books/developers-handbook/ipv6/chapter.xml,v 1.8 2010/12/15 19:03:49 bcr Exp $
      basiert auf: 1.19
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
similarity index 98%
rename from de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
index 120f039c1b..1aef995166 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/developers-handbook/kernelbuild/chapter.sgml,v 1.5 2009/02/21 19:22:07 jkois Exp $
+     $FreeBSDde: de-docproj/books/developers-handbook/kernelbuild/chapter.xml,v 1.5 2009/02/21 19:22:07 jkois Exp $
      basiert auf: 1.3
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/Makefile b/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/Makefile
index b0892452e8..d841c5bdaf 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/Makefile
+++ b/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/Makefile
@@ -8,7 +8,7 @@
 # basiert auf: 1.1
 #
 
-CHAPTERS= 	kerneldebug/chapter.sgml
+CHAPTERS= 	kerneldebug/chapter.xml
 
 VPATH=		..
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
index d74e2a7aa6..4202d00db7 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
@@ -4,7 +4,7 @@
       The FreeBSD German Documentation Project
 
       $FreeBSD$
-      $FreeBSDde: de-docproj/books/developers-handbook/kerneldebug/chapter.sgml,v 1.16 2012/03/25 14:33:52 bcr Exp $
+      $FreeBSDde: de-docproj/books/developers-handbook/kerneldebug/chapter.xml,v 1.16 2012/03/25 14:33:52 bcr Exp $
       basiert auf: 1.81
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
index 16d6f88512..4974cee9ff 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/developers-handbook/l10n/chapter.sgml,v 1.15 2010/12/15 19:03:51 bcr Exp $
+     $FreeBSDde: de-docproj/books/developers-handbook/l10n/chapter.xml,v 1.15 2010/12/15 19:03:51 bcr Exp $
      basiert auf: 1.14
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/policies/Makefile b/de_DE.ISO8859-1/books/developers-handbook/policies/Makefile
index b27ef581cd..fe531afe88 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/policies/Makefile
+++ b/de_DE.ISO8859-1/books/developers-handbook/policies/Makefile
@@ -6,7 +6,7 @@
 # basiert auf: 1.1
 #
 
-CHAPTERS= 	policies/chapter.sgml
+CHAPTERS= 	policies/chapter.xml
 
 VPATH=		..
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/developers-handbook/policies/chapter.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
index e60a45f5a7..07abb8ee37 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/developers-handbook/policies/chapter.sgml,v 1.14 2011/12/24 13:42:24 bcr Exp $
+     $FreeBSDde: de-docproj/books/developers-handbook/policies/chapter.xml,v 1.14 2011/12/24 13:42:24 bcr Exp $
      basiert auf: 1.38
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/developers-handbook/secure/chapter.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
index 916a3bec31..1d2db0a404 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/developers-handbook/secure/chapter.sgml,v 1.16 2010/12/18 13:28:29 jkois Exp $
+     $FreeBSDde: de-docproj/books/developers-handbook/secure/chapter.xml,v 1.16 2010/12/18 13:28:29 jkois Exp $
      basiert auf: 1.30
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
similarity index 93%
rename from de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
index 4d9c77c798..86f9d1e35d 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/developers-handbook/sockets/chapter.sgml,v 1.5 2010/12/23 18:23:30 bcr Exp $
+     $FreeBSDde: de-docproj/books/developers-handbook/sockets/chapter.xml,v 1.5 2010/12/23 18:23:30 bcr Exp $
      basiert auf: 1.16
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/developers-handbook/testing/chapter.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
index 2ff2aebd54..22984d8345 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/developers-handbook/testing/chapter.sgml,v 1.10 2010/12/18 13:28:29 jkois Exp $
+     $FreeBSDde: de-docproj/books/developers-handbook/testing/chapter.xml,v 1.10 2010/12/18 13:28:29 jkois Exp $
      basiert auf: 1.3
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/developers-handbook/tools/chapter.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
index 9366267375..f70bf8d3c0 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/developers-handbook/tools/chapter.sgml,v 1.11 2011/05/12 17:36:17 bcr Exp $
+     $FreeBSDde: de-docproj/books/developers-handbook/tools/chapter.xml,v 1.11 2011/05/12 17:36:17 bcr Exp $
      basiert auf: 1.52
 -->
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml b/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml
rename to de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
index 524015a05b..ec6f4b3391 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml
+++ b/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.xml
@@ -18,7 +18,7 @@
      content so it should stay.
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/developers-handbook/x86/chapter.sgml,v 1.24 2010/12/15 19:03:52 bcr Exp $
+     $FreeBSDde: de-docproj/books/developers-handbook/x86/chapter.xml,v 1.24 2010/12/15 19:03:52 bcr Exp $
      basiert auf: 1.19
 -->
 
diff --git a/de_DE.ISO8859-1/books/faq/Makefile b/de_DE.ISO8859-1/books/faq/Makefile
index bcbccb7a8d..ab4bd96f55 100644
--- a/de_DE.ISO8859-1/books/faq/Makefile
+++ b/de_DE.ISO8859-1/books/faq/Makefile
@@ -25,7 +25,7 @@ WITH_BIBLIOXREF_TITLE?=YES
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/de_DE.ISO8859-1/books/faq/book.sgml b/de_DE.ISO8859-1/books/faq/book.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/faq/book.sgml
rename to de_DE.ISO8859-1/books/faq/book.xml
index bac5de6098..404c1e8343 100644
--- a/de_DE.ISO8859-1/books/faq/book.sgml
+++ b/de_DE.ISO8859-1/books/faq/book.xml
@@ -3,7 +3,7 @@
 	"../../../share/sgml/freebsd42.dtd" [
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//DE" "../../share/sgml/entities.ent">
 %entities;
-<!ENTITY bibliography SYSTEM "../../share/sgml/bibliography.sgml">
+<!ENTITY bibliography SYSTEM "../../share/sgml/bibliography.xml">
 <!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
 <!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
 <!ENTITY rel.head.releng "<symbol>HEAD</symbol>">
diff --git a/de_DE.ISO8859-1/books/fdp-primer/Makefile b/de_DE.ISO8859-1/books/fdp-primer/Makefile
index 83b9f73b3c..e65b36fd2a 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/Makefile
+++ b/de_DE.ISO8859-1/books/fdp-primer/Makefile
@@ -20,21 +20,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=  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.sgml
+SRCS+= examples/appendix.xml
 
 # Images from the cross-document image library
 IMAGES_LIB=	callouts/1.png
diff --git a/de_DE.ISO8859-1/books/fdp-primer/book.sgml b/de_DE.ISO8859-1/books/fdp-primer/book.xml
similarity index 98%
rename from de_DE.ISO8859-1/books/fdp-primer/book.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/book.xml
index 3c1d11b32b..35e1bb982a 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/book.sgml
+++ b/de_DE.ISO8859-1/books/fdp-primer/book.xml
@@ -37,7 +37,7 @@
      POSSIBILITY OF SUCH DAMAGE.
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/fdp-primer/book.sgml,v 1.24 2012/03/25 14:39:26 bcr Exp $
+     $FreeBSDde: de-docproj/books/fdp-primer/book.xml,v 1.24 2012/03/25 14:39:26 bcr Exp $
      basiert auf: r38826
 -->
 
@@ -256,8 +256,8 @@
 
   &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/de_DE.ISO8859-1/books/fdp-primer/chapters.ent b/de_DE.ISO8859-1/books/fdp-primer/chapters.ent
index ff2a4e34b5..c98b7ac7c0 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/chapters.ent
+++ b/de_DE.ISO8859-1/books/fdp-primer/chapters.ent
@@ -3,7 +3,7 @@
      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.
 
@@ -12,17 +12,17 @@
      basiert auf: r38826
 -->
 
-<!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/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index c7cf12b80f..b2beceeb2d 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml
+++ b/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -233,7 +233,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
@@ -245,7 +245,7 @@ DOC_PREFIX?= ${.CURDIR}/../../..
 	verantwortlich ist.</para>
 
       <para><makevar>DOC</makevar> (ohne die Erweiterung
-	<filename>.sgml</filename>) ist der Name des Hauptdokuments des
+	<filename>.xml</filename>) ist der Name des Hauptdokuments des
 	Verzeichnisses, in dem sich das Makefile befindet.  Mit
 	<makevar>SRCS</makevar>-Anweisungen geben Sie alle Dokumente an,
 	aus denen das Dokument besteht.  Zus�tzlich binden Sie
diff --git a/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml b/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
similarity index 98%
rename from de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
index 57c47679f9..cfeb443333 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml
+++ b/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -182,7 +182,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>datei</replaceable>.sgml &gt; <replaceable>datei</replaceable>.html <co id="examples-co-jade-1-filename"/></userinput></screen>
+-t sgml <co id="examples-co-jade-1-transform"/> <replaceable>datei</replaceable>.xml &gt; <replaceable>datei</replaceable>.html <co id="examples-co-jade-1-filename"/></userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-1-nochunks">
@@ -231,7 +231,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>datei</replaceable>.sgml <co id="examples-co-jade-2-filename"/></userinput></screen>
+-t sgml <co id="examples-co-jade-2-transform"/> <replaceable>datei</replaceable>.xml <co id="examples-co-jade-2-filename"/></userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-2-catalog">
@@ -281,7 +281,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>datei</replaceable>.sgml</userinput></screen>
+    -t tex <co id="examples-co-jade-3-tex"/> <replaceable>datei</replaceable>.xml</userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-3-tex-backend">
diff --git a/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
index c17fa7d0e9..c15db733fb 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml
+++ b/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -279,7 +279,7 @@
       </step>
 
       <step>
-        <para>Jetzt k�nnen die <filename>.sgml</filename> Dateien
+        <para>Jetzt k�nnen die <filename>.xml</filename> Dateien
           mit einem beliebigen Texteditor bearbeitet werden.</para>
       </step>
 
diff --git a/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 1614e0fc67..f664320289 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml
+++ b/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -51,7 +51,7 @@
     Funktionen speziell f�r den Umgang mit SGML-Dateien,
     -Elementen und deren Attributen bereit stellt. Emacs aktiviert
     PSGML automatisch, wenn eine Datei mit der Endung
-    <filename>.sgml</filename> geladen oder der Befehl <command>M-X
+    <filename>.xml</filename> geladen oder der Befehl <command>M-X
       sgml-mode</command> eingegeben wird.</para>
 
   <para>Die Arbeit an SGML-Dokumenten wie dem FreeBSD-Handbuch kann
diff --git a/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml
similarity index 100%
rename from de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.xml
diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index aeccc4f4c0..bb89cc89b4 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -2008,7 +2008,7 @@ This is the file called 'foo2'</screen>
 	    <filename
 	    class="directory">/usr/doc/en/handbook/</filename>. In
 	    diesem Verzeichnis befindet sich eine Datei
-	    <filename>handbook.sgml</filename>. Desweiteren sollte
+	    <filename>handbook.xml</filename>. Desweiteren sollte
 	    sich eine Datei mit dem Namen
 	    <filenname>Makefile</filename> zusammen mit mehreren
 	    Dateien mit der Endung <filename>.ent</filename> in diesem
@@ -2020,7 +2020,7 @@ This is the file called 'foo2'</screen>
             sich im Verzeichnis
             <filename>/usr/doc/en/handbook/</filename>. In diesem
             Verzeichnis befindet sich eine Datei
-            <filename>handbook.sgml</filename>. Desweiteren sollte
+            <filename>handbook.xml</filename>. Desweiteren sollte
             sich eine Datei mit dem Namen
             <filename>Makefile</filename> zusammen mit mehreren
             Dateien mit der Endung <filename>.ent</filename> in diesem
@@ -2713,9 +2713,9 @@ IMAGES+= bild3.png
 
         <para>Angenommen es handelt sich um ein Buch, dessen drei
           Kapitel in separaten Verzeichnissen angelegt wurden
-          (<filename>kapitel1/kapitel.sgml</filename>,
-          <filename>kapitel2/kapitel.sgml</filename> und
-          <filename>kapitel3/kapitel.sgml</filename>). Enthalten die
+          (<filename>kapitel1/kapitel.xml</filename>,
+          <filename>kapitel2/kapitel.xml</filename> und
+          <filename>kapitel3/kapitel.xml</filename>). Enthalten die
           Kapitel Grafiken, empfiehlt es sich, diese in den gleichen
           Verzeichnisses abzulegen, wie die Kapitel selbst. In diesem
           Falle gilt es jedoch zu beachten, dass die Pfade der
@@ -2725,7 +2725,7 @@ IMAGES+= bild3.png
 
         <para>Soll beispielsweise die Datei
           <filename>kapitel1/bild1.png</filename> in das in
-          <filename>kapitel1/kapitel.sgml</filename> enthaltene
+          <filename>kapitel1/kapitel.xml</filename> enthaltene
           Kapitel eingebunden werden, sollte dies so erfolgen:</para>
 
 	<programlisting>&lt;mediaobject>
diff --git a/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
similarity index 97%
rename from de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index 95c99ffd31..1b4be7dd87 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml
+++ b/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -529,7 +529,7 @@ setenv SGML_CATALOG_FILES /usr/doc/de_DE.ISO8859-1/share/sgml/catalog:$SGML_CATA
       <procedure>
         <step>
           <para>Nun sollte man eine Datei
-            <filename>beispiel.sgml</filename> anlegen, die den
+            <filename>beispiel.xml</filename> anlegen, die den
             folgenden Text enth�lt:</para>
 
             <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -570,7 +570,7 @@ setenv SGML_CATALOG_FILES /usr/doc/de_DE.ISO8859-1/share/sgml/catalog:$SGML_CATA
           <para>So pr�ft man mit <command>onsgmls</command>, ob die neuangelegte
             Beispieldatei g�ltig ist:</para>
 
-            <screen>&prompt.user; <userinput>onsgmls -s beispiel.sgml</userinput></screen>
+            <screen>&prompt.user; <userinput>onsgmls -s beispiel.xml</userinput></screen>
 
           <para>Sofern das Beispiel korrekt abgetippt wurde, wird sich
             <command>onsgmls</command> ohne jegliche Ausgabe beenden. Das bedeutet,
@@ -583,9 +583,9 @@ setenv SGML_CATALOG_FILES /usr/doc/de_DE.ISO8859-1/share/sgml/catalog:$SGML_CATA
             <sgmltag>/title</sgmltag> aus dem Dokument gel�scht
             und das Dokument erneut validiert werden:</para>
 
-            <screen>&prompt.user; <userinput>onsgmls -s beispiel.sgml</userinput>
-onsgmls:beispiel.sgml:5:4:E: character data is not allowed here
-onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
+            <screen>&prompt.user; <userinput>onsgmls -s beispiel.xml</userinput>
+onsgmls:beispiel.xml:5:4:E: character data is not allowed here
+onsgmls:beispiel.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
           <para>Die Fehlermeldungen, die von <command>onsgmls</command>
 	    ausgegeben werden, sind in durch Doppelpunkte getrennte
@@ -1146,7 +1146,7 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <procedure>
         <step>
           <para>Zur �bung k�nnen Sie einige Kommentare in
-            die Datei <filename>beispiel.sgml</filename> einf�gen
+            die Datei <filename>beispiel.xml</filename> einf�gen
             und �berpr�fen, ob die Datei nun noch erfolgreich
             von <command>onsgmls</command> validiert werden kann.</para>
         </step>
@@ -1314,7 +1314,7 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
       <procedure>
         <step>
-          <para>F�gen Sie in <filename>beispiel.sgml</filename>
+          <para>F�gen Sie in <filename>beispiel.xml</filename>
             eine Allgemeine Entit�t ein.</para>
 
             <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
@@ -1345,7 +1345,7 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
         </step>
 
         <step>
-          <para>�ffnen Sie nun <filename>beispiel.sgml</filename>
+          <para>�ffnen Sie nun <filename>beispiel.xml</filename>
             mit Ihrem Webbrowser. Es kann notwendig sein, dass
             Sie die Datei vorher in <filename>beispiel.html</filename>
             umbenennen m�ssen, damit die Datei auch als
@@ -1378,7 +1378,7 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
           <para>Versuchen Sie, die Beispieldatei mittels
             <command>osgmlnorm</command> zu normalisieren:</para>
 
-            <screen>&prompt.user; <userinput>osgmlnorm beispiel.sgml > beispiel.html</userinput></screen>
+            <screen>&prompt.user; <userinput>osgmlnorm beispiel.xml > beispiel.html</userinput></screen>
 
           <para>Anschlie�end sollten Sie eine normalisierte
             Version, dass hei�t eine, bei der die
@@ -1397,7 +1397,7 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
             muss <command>osgmlnorm</command> mit der Option
             <option>-d</option> aufrufen werden:</para>
 
-          <screen>&prompt.user; <userinput>osgmlnorm -d beispiel.sgml > beispiel.html</userinput></screen>
+          <screen>&prompt.user; <userinput>osgmlnorm -d beispiel.xml > beispiel.html</userinput></screen>
         </step>
       </procedure>
     </sect2>
@@ -1424,9 +1424,9 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <para>Angenommen man hat ein Buch geschrieben, dessen Inhalt
         auf mehrere Dateien aufgeteilt und mittels SGML
         ausgezeichnet. Jedes Kapitel wurde dazu in einer eigenen Datei
-        (<filename>kapitel1.sgml</filename>,
-        <filename>kapitel2.sgml</filename> usw.) abgelegt und
-        �ber eine Datei <filename>buch.sgml</filename> sollen
+        (<filename>kapitel1.xml</filename>,
+        <filename>kapitel2.xml</filename> usw.) abgelegt und
+        �ber eine Datei <filename>buch.xml</filename> sollen
         alle physischen Dateien wieder mit der Hilfe von
         Entit�ten zu einem logischen Dokument
         zusammengef�hrt werden.</para>
@@ -1442,9 +1442,9 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
         <title>Dateien mit Allgemeinen Entit�ten einbinden</title>
 
         <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!ENTITY kapitel.1 SYSTEM "kapitel1.sgml">
-<!ENTITY kapitel.2 SYSTEM "kapitel2.sgml">
-<!ENTITY kapitel.3 SYSTEM "kapitel3.sgml">
+<!ENTITY kapitel.1 SYSTEM "kapitel1.xml">
+<!ENTITY kapitel.2 SYSTEM "kapitel2.xml">
+<!ENTITY kapitel.3 SYSTEM "kapitel3.xml">
 <!-- Und so weiter... -->
 ]>
 
@@ -1460,8 +1460,8 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <warning>
         <para>Wenn man Allgemeine Entit�ten benutzt, um andere
           Dateien einzubinden, d�rfen diese Dateien
-          (<filename>kapitel1.sgml</filename>,
-          <filename>kapitel2.sgml</filename>, ...)
+          (<filename>kapitel1.xml</filename>,
+          <filename>kapitel2.xml</filename>, ...)
           <emphasis>keine</emphasis> eigene DOCTYPE-Deklaration
           haben.</para>
       </warning>
@@ -1499,9 +1499,9 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
           <filename>kapitel.ent</filename> enth�lt f�r
           dieses Beispiel die folgenden Zeilen:</para>
 
-        <programlisting><![CDATA[<!ENTITY kapitel.1 SYSTEM "kapitel1.sgml">
-<!ENTITY kapitel.2 SYSTEM "kapitel2.sgml">
-<!ENTITY kapitel.3 SYSTEM "kapitel3.sgml">]]></programlisting>
+        <programlisting><![CDATA[<!ENTITY kapitel.1 SYSTEM "kapitel1.xml">
+<!ENTITY kapitel.2 SYSTEM "kapitel2.xml">
+<!ENTITY kapitel.3 SYSTEM "kapitel3.xml">]]></programlisting>
 
         <para>Im zweiten Schritt f�gt man in beide B�cher
           eine Parameterentit�t ein, die den Inhalt von
@@ -1535,13 +1535,13 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
           <procedure>
             <step>
-              <para>Legen Sie drei Dateien (<filename>absatz1.sgml</filename>,
-                <filename>absatz2.sgml</filename> und <filename>absatz3.sgml</filename>)
+              <para>Legen Sie drei Dateien (<filename>absatz1.xml</filename>,
+                <filename>absatz2.xml</filename> und <filename>absatz3.xml</filename>)
                 mit jeweils einer Zeile wie
 
-                <!--     <para>Create three files, <filename>para1.sgml</filename>,
-                <filename>para2.sgml</filename>, and
-                <filename>para3.sgml</filename>.</para>-->
+                <!--     <para>Create three files, <filename>para1.xml</filename>,
+                <filename>para2.xml</filename>, and
+                <filename>para3.xml</filename>.</para>-->
 
                 <!--<para>Put content similar to the following in each file;</para>-->
 
@@ -1550,14 +1550,14 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  </step>
 
 	  <step>
-	    <para>�ndern Sie <filename>beispiel.sgml</filename> so
+	    <para>�ndern Sie <filename>beispiel.xml</filename> so
               ab, dass sie wie folgt aussieht:</para>
 
               <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY version "1.1">
-<!ENTITY absatz1 SYSTEM "absatz1.sgml">
-<!ENTITY absatz2 SYSTEM "absatz2.sgml">
-<!ENTITY absatz3 SYSTEM "absatz3.sgml">
+<!ENTITY absatz1 SYSTEM "absatz1.xml">
+<!ENTITY absatz2 SYSTEM "absatz2.xml">
+<!ENTITY absatz3 SYSTEM "absatz3.xml">
 ]>
 
 <html>
@@ -1578,16 +1578,16 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  <step>
 	    <para>Erzeugen Sie nun die Datei
               <filename>beispiel.html</filename>, indem Sie
-              <filename>beispiel.sgml</filename> normalisieren:</para>
+              <filename>beispiel.xml</filename> normalisieren:</para>
 
-            <screen>&prompt.user; <userinput>osgmlnorm -d beispiel.sgml > beispiel.html</userinput></screen>
+            <screen>&prompt.user; <userinput>osgmlnorm -d beispiel.xml > beispiel.html</userinput></screen>
           </step>
 
           <step>
             <para>�ffnen Sie <filename>beispiel.html</filename>
               nun mit einem Webbrowser und vergewissern Sie sich,
               dass der Inhalt der Dateien
-              <filename>absatz<replaceable>N</replaceable>.sgml</filename>
+              <filename>absatz<replaceable>N</replaceable>.xml</filename>
               in <filename>beispiel.html</filename> �bernommen
               wurde.</para>
           </step>
@@ -1603,11 +1603,11 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
 	<procedure>
 	  <step>
-	    <para>�ndern Sie <filename>beispiel.sgml</filename> so
+	    <para>�ndern Sie <filename>beispiel.xml</filename> so
               ab, dass es wie folgt aussieht:</para>
 
 	    <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!ENTITY % entitaeten SYSTEM "entitaeten.sgml"> %entitaeten;
+<!ENTITY % entitaeten SYSTEM "entitaeten.xml"> %entitaeten;
 ]>
 
 <html>
@@ -1626,28 +1626,28 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  </step>
 
           <step>
-            <para>Legen Sie eine weitere Datei <filename>entitaeten.sgml</filename> an,
+            <para>Legen Sie eine weitere Datei <filename>entitaeten.xml</filename> an,
                 die folgenden Inhalt hat:</para>
 
             <programlisting><![CDATA[<!ENTITY version "1.1">
-<!ENTITY absatz1 SYSTEM "absatz1.sgml">
-<!ENTITY absatz2 SYSTEM "absatz2.sgml">
-<!ENTITY absatz3 SYSTEM "absatz3.sgml">]]></programlisting>
+<!ENTITY absatz1 SYSTEM "absatz1.xml">
+<!ENTITY absatz2 SYSTEM "absatz2.xml">
+<!ENTITY absatz3 SYSTEM "absatz3.xml">]]></programlisting>
           </step>
 
           <step>
             <para>Erzeugen Sie die Datei
               <filename>beispiel.html</filename>, indem Sie
-              <filename>beispiel.sgml</filename> normalisieren:</para>
+              <filename>beispiel.xml</filename> normalisieren:</para>
 
-            <screen>&prompt.user; <userinput>osgmlnorm -d beispiel.sgml > beispiel.html</userinput></screen>
+            <screen>&prompt.user; <userinput>osgmlnorm -d beispiel.xml > beispiel.html</userinput></screen>
           </step>
 
           <step>
             <para>�ffnen Sie <filename>beispiel.html</filename>
               nun mit einem Webbrowser und vergewissern Sie sich,
               dass der Inhalt der Dateien
-              <filename>absatz<replaceable>N</replaceable>.sgml</filename>
+              <filename>absatz<replaceable>N</replaceable>.xml</filename>
               in <filename>beispiel.html</filename> �bernommen
               wurde.</para>
           </step>
@@ -1895,7 +1895,7 @@ onsgmls:beispiel.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <procedure>
 	<step>
           <para>Legen Sie eine neue Datei
-            <filename>abschnitt.sgml</filename> an, die folgenden
+            <filename>abschnitt.xml</filename> an, die folgenden
             Inhalt hat:</para>
 
 	  <programlisting>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
diff --git a/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
similarity index 95%
rename from de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
index 1d7028b78b..f94e954e4c 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml
+++ b/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -225,7 +225,7 @@
 	</sect4>
 
 	<sect4>
-	  <title><filename>book.sgml</filename></title>
+	  <title><filename>book.xml</filename></title>
 
 	  <para>Das Hauptdokument innerhalb des Handbuchs.  Neben der
 	    <link linkend="sgml-primer-doctype-declaration">
@@ -233,7 +233,7 @@
 	    die Elemente aufgelistet, die die Struktur des Handbuchs
 	    definieren.</para>
 
-	  <para><filename>book.sgml</filename> verwendet <link
+	  <para><filename>book.xml</filename> verwendet <link
 	    linkend="sgml-primer-parameter-entities">
 	    Parameterentit�ten</link>, um Dateien mit der
 	    Endung <filename>.ent</filename> zu laden.  Diese
@@ -244,10 +244,10 @@
 	</sect4>
 
 	<sect4>
-	  <title><filename><replaceable>Verzeichnis</replaceable>/chapter.sgml</filename></title>
+	  <title><filename><replaceable>Verzeichnis</replaceable>/chapter.xml</filename></title>
 
 	  <para>Jedes Kapitel des Handbuchs wird in einer
-	    <filename>chapter.sgml</filename> genannten Datei
+	    <filename>chapter.xml</filename> genannten Datei
 	    gespeichert.  Jedes Verzeichnis erh�lt den Namen
 	    des <literal>id</literal>-Attributs des
 	    <sgmltag>chapter</sgmltag>-Elements.</para>
@@ -261,7 +261,7 @@
 </chapter>]]></programlisting>
 
 	  <para>so handelt es sich um die Datei
-	    <filename>chapter.sgml</filename> im Verzeichnis
+	    <filename>chapter.xml</filename> im Verzeichnis
 	    <filename>kernelconfig</filename>.  Im Allgemeinen
 	    enth�lt diese Datei das komplette Kapitel.</para>
 
@@ -274,7 +274,7 @@
 
 	  <para>In fr�heren Versionen des Handbuchs wurden all
 	    diese Dateien im gleichen Verzeichnis wie die Datei
-	    <filename>book.sgml</filename> gespeichert und nach dem
+	    <filename>book.xml</filename> gespeichert und nach dem
 	    Wert des <literal>id</literal>-Attributs der
 	    <sgmltag>chapter</sgmltag>-Elemente benannt.  Durch die
 	    Verwendung von eigenen Verzeichnissen f�r die
@@ -295,10 +295,10 @@
 	    enth�lt.</para>
 
 	  <para>Durch dieses Vorgehen entstanden viele Verzeichnisse,
-	    die jeweils eine <filename>chapter.sgml</filename> enhalten,
-	    beispielsweise <filename>basics/chapter.sgml</filename>,
-	    <filename>introduction/chapter.sgml</filename> oder
-	    <filename>printing/chapter.sgml</filename>.</para>
+	    die jeweils eine <filename>chapter.xml</filename> enhalten,
+	    beispielsweise <filename>basics/chapter.xml</filename>,
+	    <filename>introduction/chapter.xml</filename> oder
+	    <filename>printing/chapter.xml</filename>.</para>
 
 	  <important>
 	    <para>Im Normalfall sollte ein Umstrukturierung des
@@ -312,7 +312,7 @@
 	      k�nnte.</para>
 	  </important>
 
-	  <para>Die Datei <filename>chapter.sgml</filename> ist keine
+	  <para>Die Datei <filename>chapter.xml</filename> ist keine
 	    komplette SGML-Datei, da unter anderem die Zeilen mit
 	    der DOCTYPE-Deklaration am Beginn der Datei nicht
 	    vorhanden sind.</para>
diff --git a/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
similarity index 100%
rename from de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
diff --git a/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml
similarity index 100%
rename from de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.xml
diff --git a/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
similarity index 100%
rename from de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/tools/chapter.xml
diff --git a/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
similarity index 97%
rename from de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 657af0e320..1adee410f0 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml
+++ b/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -170,10 +170,10 @@
 	<para>Wenn Sie beispielsweise wissen wollen, was sich zwischen
 	  den Revisionen <literal>r33733</literal> und
 	  <literal>r33734</literal> der Datei
-	  <filename>en_US.ISO8859-1/books/fdp-primer/book.sgml</filename>
+	  <filename>en_US.ISO8859-1/books/fdp-primer/book.xml</filename>
 	  ge�ndert hat, geben Sie den folgenden Befehl ein:</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>
 
@@ -302,7 +302,7 @@
                      books/
                            faq/
                                Makefile
-                               book.sgml</programlisting>
+                               book.xml</programlisting>
 
 	<para>Bei <literal>sv_SE.ISO8859-1</literal> handelt es sich um
 	  den Namen der �bersetzung in der
@@ -479,7 +479,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;</programlisting>
+     &dollar;FreeBSD: head/en_US.ISO8859-1/books/faq/book.xml 38674 2012-04-14 13:52:52Z &dollar;</programlisting>
 
 	<para>Das exakte Aussehen kann unterschiedlich sein,  die Zeile
 	  mit &dollar;FreeBSD&dollar; sowie der Ausdruck <literal>The
@@ -506,7 +506,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/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml b/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
similarity index 100%
rename from de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml
rename to de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index b9845409e8..be2d13d594 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -9,8 +9,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
 #
 # ------------------------------------------------------------------------
 
@@ -229,56 +229,56 @@ IMAGES_LIB+= callouts/15.png
 #
 
 # SGML content
-SRCS+= audit/chapter.sgml
-SRCS+= book.sgml
-SRCS+= bsdinstall/chapter.sgml
-SRCS+= colophon.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+= dtrace/chapter.sgml
-SRCS+= eresources/chapter.sgml
-SRCS+= filesystems/chapter.sgml
-SRCS+= firewalls/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+= 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+= dtrace/chapter.xml
+SRCS+= eresources/chapter.xml
+SRCS+= filesystems/chapter.xml
+SRCS+= firewalls/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
 
 # alle Kapitel bauen
-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 ${MASTERDOC}
 
 URL_RELPREFIX?=	../../../..
@@ -287,9 +287,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}
@@ -297,19 +297,19 @@ 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
-CLEANFILES+=	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.xml.ftp.inc \
+		mirrors.xml.cvsup.inc \
+		eresources.xml.www.inc
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 4e26081115..a673e9f97b 100644
--- a/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/advanced-networking/chapter.sgml,v 1.195 2011/02/23 12:30:43 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/advanced-networking/chapter.xml,v 1.195 2011/02/23 12:30:43 jkois Exp $
      basiert auf: 1.436
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml b/de_DE.ISO8859-1/books/handbook/audit/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/audit/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/audit/chapter.xml
index db87fe7759..b5aac5a9e5 100644
--- a/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/audit/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/audit/chapter.sgml,v 1.14 2012/02/16 20:28:26 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/audit/chapter.xml,v 1.14 2012/02/16 20:28:26 bcr Exp $
      basiert auf: 1.36
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/basics/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/basics/chapter.xml
index 0ce777d31e..afde1bfbd5 100644
--- a/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/basics/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/basics/chapter.sgml,v 1.112 2012/02/16 20:26:02 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/basics/chapter.xml,v 1.112 2012/02/16 20:26:02 bcr Exp $
      basiert auf: 1.159
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml b/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
index be90a67c53..aadbd720d3 100644
--- a/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/bibliography/chapter.sgml,v 1.49 2012/04/25 18:19:44 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/bibliography/chapter.xml,v 1.49 2012/04/25 18:19:44 bcr Exp $
      basiert auf: 1.92
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/book.sgml b/de_DE.ISO8859-1/books/handbook/book.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/book.sgml
rename to de_DE.ISO8859-1/books/handbook/book.xml
index 17652a6364..66ab08c66f 100644
--- a/de_DE.ISO8859-1/books/handbook/book.sgml
+++ b/de_DE.ISO8859-1/books/handbook/book.xml
@@ -13,7 +13,7 @@
     The FreeBSD German Documentation Project
 
     $FreeBSD$
-    $FreeBSDde: de-docproj/books/handbook/book.sgml,v 1.91 2012/03/27 19:32:11 bcr Exp $
+    $FreeBSDde: de-docproj/books/handbook/book.xml,v 1.91 2012/03/27 19:32:11 bcr Exp $
     basiert auf: 1.180
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml b/de_DE.ISO8859-1/books/handbook/boot/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/boot/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/boot/chapter.xml
index cb23f02c4c..a6bb602c7b 100644
--- a/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/boot/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/boot/chapter.sgml,v 1.63 2012/04/22 20:05:15 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/boot/chapter.xml,v 1.63 2012/04/22 20:05:15 bcr Exp $
      basiert auf: 1.76
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.sgml b/de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
similarity index 100%
rename from de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/bsdinstall/chapter.xml
diff --git a/de_DE.ISO8859-1/books/handbook/chapters.ent b/de_DE.ISO8859-1/books/handbook/chapters.ent
index 0270fe996e..b9a3d52402 100644
--- a/de_DE.ISO8859-1/books/handbook/chapters.ent
+++ b/de_DE.ISO8859-1/books/handbook/chapters.ent
@@ -3,7 +3,7 @@
      Die Entities fuer jedes Kapitel im FreeBSD Handbuch.
      Jede Entity heisst chap.foo, wobei foo der Name des ID-Attributes
      dieses Kapitels ist und dem Verzeichnis, in dem die entsprechende
-     .sgml Datei liegt, entspricht.
+     .xml Datei liegt, entspricht.
 
      Kapitel sollten in der Reihenfolge aufgelistet sein, in der auf sie
      referenziert wird.
@@ -57,143 +57,143 @@
 <!ENTITY % chap.dtrace "IGNORE">
 <!ENTITY % chap.colophon "IGNORE">
 
-<!ENTITY chap.preface		SYSTEM "preface/preface.sgml">
+<!ENTITY chap.preface		SYSTEM "preface/preface.xml">
 <!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 
 <!-- Teil Eins -->
 <![%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">
 ]]>
 
 <!-- Teil Zwei -->
 <![%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">
 ]]>
 
 <!-- Teil Drei -->
 <![%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">
 ]]>
 
 <!-- Teil Vier -->
 <![%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">
 ]]>
 
 <!-- Teil Fuenf (Anhang) -->
 <![%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/de_DE.ISO8859-1/books/handbook/colophon.sgml b/de_DE.ISO8859-1/books/handbook/colophon.xml
similarity index 90%
rename from de_DE.ISO8859-1/books/handbook/colophon.sgml
rename to de_DE.ISO8859-1/books/handbook/colophon.xml
index 711860c532..be6a7ac978 100644
--- a/de_DE.ISO8859-1/books/handbook/colophon.sgml
+++ b/de_DE.ISO8859-1/books/handbook/colophon.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/colophon.sgml,v 1.7 2007/11/10 16:08:46 miwi Exp $
+     $FreeBSDde: de-docproj/books/handbook/colophon.xml,v 1.7 2007/11/10 16:08:46 miwi Exp $
      basiert auf: 1.9
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/config/chapter.sgml b/de_DE.ISO8859-1/books/handbook/config/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/config/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/config/chapter.xml
index 888343cc26..8d32c66931 100644
--- a/de_DE.ISO8859-1/books/handbook/config/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/config/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.151 2011/12/19 14:55:31 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/config/chapter.xml,v 1.151 2011/12/19 14:55:31 bcr Exp $
      basiert auf: 1.248
 -->
 
@@ -949,7 +949,7 @@ dc1: [ITHREAD]</screen>
 
         <!-- Hm.  Soll man den letzten Indexterm abwandeln, d.h. die
           Langversion weglassen?  Keine Ahnung.  Wenn ja, dann muss das
-          auch in handbook/linuxemu/chapter.sgml passieren! -->
+          auch in handbook/linuxemu/chapter.xml passieren! -->
 
         <para>Leider stellen nach wie vor viele Unternehmen die
           Spezifikationen ihrer Treiber der Open Source Gemeinde
diff --git a/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
similarity index 100%
rename from de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
diff --git a/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml b/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
index bfa67f195d..8d09183488 100644
--- a/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/desktop/chapter.sgml,v 1.92 2012/04/30 17:27:56 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/desktop/chapter.xml,v 1.92 2012/04/30 17:27:56 bcr Exp $
      basiert auf: 1.129
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/disks/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/disks/chapter.xml
index 547ee98912..af06f36a2d 100644
--- a/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/disks/chapter.sgml,v 1.187 2012/04/26 19:32:48 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/disks/chapter.xml,v 1.187 2012/04/26 19:32:48 bcr Exp $
      basiert auf: 1.315
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/dtrace/chapter.sgml b/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/dtrace/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
index a02c70040f..e7f3807937 100644
--- a/de_DE.ISO8859-1/books/handbook/dtrace/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/dtrace/chapter.xml
@@ -10,7 +10,7 @@ that might make this chapter too large.
 <!--
      The FreeBSD Documentation Project
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/dtrace/chapter.sgml,v 1.4 2009/08/22 18:54:15 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/dtrace/chapter.xml,v 1.4 2009/08/22 18:54:15 bcr Exp $
      basiert auf: 1.8
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml b/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
index 8c09e6a7ac..4e8b4fc0be 100644
--- a/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/eresources/chapter.sgml,v 1.102 2012/04/25 19:11:39 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/eresources/chapter.xml,v 1.102 2012/04/25 19:11:39 bcr Exp $
      basiert auf: 1.221
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/filesystems/chapter.sgml b/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/filesystems/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
index b350825fb8..5dba58b61e 100644
--- a/de_DE.ISO8859-1/books/handbook/filesystems/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/filesystems/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/filesystems/chapter.sgml,v 1.7 2011/05/25 20:31:26 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/filesystems/chapter.xml,v 1.7 2011/05/25 20:31:26 jkois Exp $
      basiert auf: 1.10
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
index 492625e92a..f77ee1b386 100644
--- a/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/firewalls/chapter.sgml,v 1.53 2012/04/30 16:15:52 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/firewalls/chapter.xml,v 1.53 2012/04/30 16:15:52 bcr Exp $
      basiert auf:  1.100
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/geom/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/geom/chapter.xml
index ca088459ff..ad61804881 100644
--- a/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/geom/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/geom/chapter.sgml,v 1.20 2011/12/19 15:25:08 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/geom/chapter.xml,v 1.20 2011/12/19 15:25:08 bcr Exp $
      basiert auf: 1.51
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/install/chapter.sgml b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/install/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/install/chapter.xml
index 5cb67485fe..996c9b6359 100644
--- a/de_DE.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/install/chapter.sgml,v 1.106 2011/12/24 16:11:11 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/install/chapter.xml,v 1.106 2011/12/24 16:11:11 bcr Exp $
      basiert auf: 1.434
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml b/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
index 6f28fb3f34..917deaae84 100644
--- a/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/introduction/chapter.sgml,v 1.67 2011/03/27 15:44:48 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/introduction/chapter.xml,v 1.67 2011/03/27 15:44:48 bcr Exp $
      basiert auf: 1.140
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/jails/chapter.sgml b/de_DE.ISO8859-1/books/handbook/jails/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/jails/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/jails/chapter.xml
index af6e91bbef..e3790afe6d 100644
--- a/de_DE.ISO8859-1/books/handbook/jails/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/jails/chapter.xml
@@ -4,7 +4,7 @@
     The FreeBSD German Documentation Project
 
     $FreeBSD$
-    $FreeBSDde: de-docproj/books/handbook/jails/chapter.sgml,v 1.23 2011/05/25 20:42:25 jkois Exp $
+    $FreeBSDde: de-docproj/books/handbook/jails/chapter.xml,v 1.23 2011/05/25 20:42:25 jkois Exp $
     basiert auf: 1.27
 -->
 <chapter id="jails">
diff --git a/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index a984929aa8..91a804a89c 100644
--- a/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/kernelconfig/chapter.sgml,v 1.117 2012/04/30 17:31:07 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/kernelconfig/chapter.xml,v 1.117 2012/04/30 17:31:07 bcr Exp $
      basiert auf: 1.205
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml b/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
index 262d024c2f..2f786cb223 100644
--- a/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/l10n/chapter.sgml,v 1.69 2012/04/30 17:09:32 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/l10n/chapter.xml,v 1.69 2012/04/30 17:09:32 bcr Exp $
      basiert auf: 1.138
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml b/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
index 15c6996acc..6faf4ab1d7 100644
--- a/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/linuxemu/chapter.sgml,v 1.94 2012/04/30 17:13:51 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/linuxemu/chapter.xml,v 1.94 2012/04/30 17:13:51 bcr Exp $
      basiert auf: 1.147
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml b/de_DE.ISO8859-1/books/handbook/mac/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/mac/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/mac/chapter.xml
index 4c0967349c..6fb2a6b88d 100644
--- a/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/mac/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/mac/chapter.sgml,v 1.8 2010/12/18 09:58:33 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/mac/chapter.xml,v 1.8 2010/12/18 09:58:33 jkois Exp $
      basiert auf: 1.80
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/mail/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/mail/chapter.xml
index 38267a32e3..5d74286666 100644
--- a/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
@@ -6,7 +6,7 @@
      Original Revision der ersten Uebersetzung: 1.20
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/mail/chapter.sgml,v 1.68 2011/07/25 15:00:09 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/mail/chapter.xml,v 1.68 2011/07/25 15:00:09 bcr Exp $
      basiert auf: 1.146
 -->
 <!--
diff --git a/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml b/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
index fd45c658e8..9bd6352d33 100644
--- a/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.sgml,v 1.174 2011/07/25 14:45:12 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/mirrors/chapter.xml,v 1.174 2011/07/25 14:45:12 bcr Exp $
      basiert auf: 1.497
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml b/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
index cfd9ff100d..ea7f6ef88e 100644
--- a/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/multimedia/chapter.sgml,v 1.100 2012/04/22 20:49:51 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/multimedia/chapter.xml,v 1.100 2012/04/22 20:49:51 bcr Exp $
      basiert auf: 1.144
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml b/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
index c013a6fc87..27724ca3d8 100644
--- a/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/network-servers/chapter.sgml,v 1.103 2011/12/24 15:51:18 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/network-servers/chapter.xml,v 1.103 2011/12/24 15:51:18 bcr Exp $
      basiert auf: 1.138
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
similarity index 91%
rename from de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index 94b27cac48..d18e5f1b30 100644
--- a/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/pgpkeys/chapter.sgml,v 1.43 2006/01/12 18:54:54 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/pgpkeys/chapter.xml,v 1.43 2006/01/12 18:54:54 jkois Exp $
      basiert auf: 1.286
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml b/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/ports/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/ports/chapter.xml
index d45e615542..48fb4648be 100644
--- a/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/ports/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/ports/chapter.sgml,v 1.111 2011/12/19 17:13:33 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/ports/chapter.xml,v 1.111 2011/12/19 17:13:33 bcr Exp $
      basiert auf: 1.293
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index a7808bdfd0..f8683e8a70 100644
--- a/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/ppp-and-slip/chapter.sgml,v 1.94 2012/02/16 20:12:54 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/ppp-and-slip/chapter.xml,v 1.94 2012/02/16 20:12:54 bcr Exp $
      basiert auf: 1.197
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/preface/preface.sgml b/de_DE.ISO8859-1/books/handbook/preface/preface.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/preface/preface.sgml
rename to de_DE.ISO8859-1/books/handbook/preface/preface.xml
index 815f068b2d..55949300e9 100644
--- a/de_DE.ISO8859-1/books/handbook/preface/preface.sgml
+++ b/de_DE.ISO8859-1/books/handbook/preface/preface.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/preface/preface.sgml,v 1.36 2011/12/24 13:06:39 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/preface/preface.xml,v 1.36 2011/12/24 13:06:39 bcr Exp $
      basiert auf: 1.50
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml b/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/printing/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/printing/chapter.xml
index 65158b9052..c4ec2b2043 100644
--- a/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/printing/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD German Documentation Project
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/printing/chapter.sgml,v 1.56 2012/02/16 20:07:18 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/printing/chapter.xml,v 1.56 2012/02/16 20:07:18 bcr Exp $
      basiert auf: 1.124
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/security/chapter.sgml b/de_DE.ISO8859-1/books/handbook/security/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/security/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/security/chapter.xml
index f0f27f6f92..da19ec5b67 100644
--- a/de_DE.ISO8859-1/books/handbook/security/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/security/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/security/chapter.sgml,v 1.178 2012/04/30 17:07:41 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/security/chapter.xml,v 1.178 2012/04/30 17:07:41 bcr Exp $
      basiert auf: 1.348
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml b/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 681a1244ee..c78f38d11b 100644
--- a/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/serialcomms/chapter.sgml,v 1.89 2012/04/30 16:20:14 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/serialcomms/chapter.xml,v 1.89 2012/04/30 16:20:14 bcr Exp $
      basiert auf: 1.139
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/users/chapter.sgml b/de_DE.ISO8859-1/books/handbook/users/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/users/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/users/chapter.xml
index 6a122db525..eda4969f05 100644
--- a/de_DE.ISO8859-1/books/handbook/users/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/users/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/users/chapter.sgml,v 1.47 2012/04/30 16:19:09 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/users/chapter.xml,v 1.47 2012/04/30 16:19:09 bcr Exp $
      basiert auf: 1.63
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
index 02a678791f..4784c0247d 100644
--- a/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -10,7 +10,7 @@
 	The FreeBSD German Documentation Project
 
 	$FreeBSD$
-	$FreeBSDde: de-docproj/books/handbook/vinum/chapter.sgml,v 1.19 2011/01/30 13:27:20 bcr Exp $
+	$FreeBSDde: de-docproj/books/handbook/vinum/chapter.xml,v 1.19 2011/01/30 13:27:20 bcr Exp $
 	basiert auf: 1.49
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
index 5fbdf42223..95c771c026 100644
--- a/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD German Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/virtualization/chapter.sgml,v 1.14 2010/07/03 14:29:30 jkois Exp $
+     $FreeBSDde: de-docproj/books/handbook/virtualization/chapter.xml,v 1.14 2010/07/03 14:29:30 jkois Exp $
      basiert auf: 1.25
 -->
 
diff --git a/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml b/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/handbook/x11/chapter.sgml
rename to de_DE.ISO8859-1/books/handbook/x11/chapter.xml
index d5e3f1ef59..2bc9464905 100644
--- a/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml
+++ b/de_DE.ISO8859-1/books/handbook/x11/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      $FreeBSD$
-     $FreeBSDde: de-docproj/books/handbook/x11/chapter.sgml,v 1.79 2012/04/30 16:18:12 bcr Exp $
+     $FreeBSDde: de-docproj/books/handbook/x11/chapter.xml,v 1.79 2012/04/30 16:18:12 bcr Exp $
      basiert auf: 1.212
 -->
 
diff --git a/de_DE.ISO8859-1/books/porters-handbook/Makefile b/de_DE.ISO8859-1/books/porters-handbook/Makefile
index 2baebb1b1d..06df80a74d 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/Makefile
+++ b/de_DE.ISO8859-1/books/porters-handbook/Makefile
@@ -20,7 +20,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 # Use the local DSSSL file
 DSLHTML?= 	${.CURDIR}/freebsd.dsl
diff --git a/de_DE.ISO8859-1/books/porters-handbook/book.sgml b/de_DE.ISO8859-1/books/porters-handbook/book.xml
similarity index 99%
rename from de_DE.ISO8859-1/books/porters-handbook/book.sgml
rename to de_DE.ISO8859-1/books/porters-handbook/book.xml
index e951bde44e..19c13e1ad3 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/book.sgml
+++ b/de_DE.ISO8859-1/books/porters-handbook/book.xml
@@ -10,7 +10,7 @@
     The FreeBSD German Documentation Project
 
     $FreeBSD$
-    $FreeBSDde: de-docproj/books/porters-handbook/book.sgml,v 1.241 2011/10/08 16:18:17 jkois Exp $
+    $FreeBSDde: de-docproj/books/porters-handbook/book.xml,v 1.241 2011/10/08 16:18:17 jkois Exp $
     basiert auf: 1.1117
 -->
 
diff --git a/de_DE.ISO8859-1/htdocs/Makefile b/de_DE.ISO8859-1/htdocs/Makefile
index b98682bfd9..8ac43c6614 100644
--- a/de_DE.ISO8859-1/htdocs/Makefile
+++ b/de_DE.ISO8859-1/htdocs/Makefile
@@ -13,20 +13,20 @@
 
 # These are turned into validated, normalized HTML files.
 
-DOCS= about.sgml
-DOCS+= administration.sgml
-DOCS+= applications.sgml
-DOCS+= availability.sgml
-DOCS+= art.sgml
-DOCS+= docs.sgml
-DOCS+= features.sgml
-DOCS+= internet.sgml
-DOCS+= logo.sgml
-DOCS+= mailto.sgml
-DOCS+= relnotes.sgml
-DOCS+= send-pr.sgml
-DOCS+= support.sgml
-DOCS+= where.sgml
+DOCS= about.xml
+DOCS+= administration.xml
+DOCS+= applications.xml
+DOCS+= availability.xml
+DOCS+= art.xml
+DOCS+= docs.xml
+DOCS+= features.xml
+DOCS+= internet.xml
+DOCS+= logo.xml
+DOCS+= mailto.xml
+DOCS+= relnotes.xml
+DOCS+= send-pr.xml
+DOCS+= support.xml
+DOCS+= where.xml
 
 # These will be directly installed.
 
diff --git a/de_DE.ISO8859-1/htdocs/about.sgml b/de_DE.ISO8859-1/htdocs/about.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/about.sgml
rename to de_DE.ISO8859-1/htdocs/about.xml
index ccca09c32c..ecb54721b0 100644
--- a/de_DE.ISO8859-1/htdocs/about.sgml
+++ b/de_DE.ISO8859-1/htdocs/about.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/about.sgml,v 1.13 2008/03/24 15:33:41 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/about.xml,v 1.13 2008/03/24 15:33:41 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.13">
 <!ENTITY title "�ber FreeBSD">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/administration.sgml b/de_DE.ISO8859-1/htdocs/administration.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/administration.sgml
rename to de_DE.ISO8859-1/htdocs/administration.xml
diff --git a/de_DE.ISO8859-1/htdocs/applications.sgml b/de_DE.ISO8859-1/htdocs/applications.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/applications.sgml
rename to de_DE.ISO8859-1/htdocs/applications.xml
index 9ad7a66fef..9d97ac34e0 100644
--- a/de_DE.ISO8859-1/htdocs/applications.sgml
+++ b/de_DE.ISO8859-1/htdocs/applications.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/applications.sgml,v 1.22 2011/09/16 08:36:13 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/applications.xml,v 1.22 2011/09/16 08:36:13 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.35">
 <!ENTITY title "Anwendungen f�r FreeBSD">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/art.sgml b/de_DE.ISO8859-1/htdocs/art.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/art.sgml
rename to de_DE.ISO8859-1/htdocs/art.xml
index 83fa41c1a5..757c5ab284 100644
--- a/de_DE.ISO8859-1/htdocs/art.sgml
+++ b/de_DE.ISO8859-1/htdocs/art.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/art.sgml,v 1.3 2010/08/17 10:36:58 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/art.xml,v 1.3 2010/08/17 10:36:58 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.9">
 <!ENTITY title "FreeBSD&nbsp;&ndash;&nbsp;Kunst">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/availability.sgml b/de_DE.ISO8859-1/htdocs/availability.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/availability.sgml
rename to de_DE.ISO8859-1/htdocs/availability.xml
index f48393a57a..699c88f22d 100644
--- a/de_DE.ISO8859-1/htdocs/availability.sgml
+++ b/de_DE.ISO8859-1/htdocs/availability.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/availability.sgml,v 1.12 2006/10/19 19:25:59 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/availability.xml,v 1.12 2006/10/19 19:25:59 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.35">
 <!ENTITY title "Bezugsquellen von FreeBSD">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/community/Makefile b/de_DE.ISO8859-1/htdocs/community/Makefile
index f15dabd61b..e1fe2b15a9 100644
--- a/de_DE.ISO8859-1/htdocs/community/Makefile
+++ b/de_DE.ISO8859-1/htdocs/community/Makefile
@@ -9,9 +9,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	irc.sgml
-DOCS+=	mailinglists.sgml
-DOCS+=	newsgroups.sgml
-DOCS+=	webresources.sgml
+DOCS=	irc.xml
+DOCS+=	mailinglists.xml
+DOCS+=	newsgroups.xml
+DOCS+=	webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/de_DE.ISO8859-1/htdocs/community/irc.sgml b/de_DE.ISO8859-1/htdocs/community/irc.xml
similarity index 93%
rename from de_DE.ISO8859-1/htdocs/community/irc.sgml
rename to de_DE.ISO8859-1/htdocs/community/irc.xml
index d6c32e44d7..73b2e2a5db 100644
--- a/de_DE.ISO8859-1/htdocs/community/irc.sgml
+++ b/de_DE.ISO8859-1/htdocs/community/irc.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/community/irc.sgml,v 1.4 2008/07/12 15:51:31 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/community/irc.xml,v 1.4 2008/07/12 15:51:31 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.4">
 <!ENTITY title "IRC">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/community/mailinglists.sgml b/de_DE.ISO8859-1/htdocs/community/mailinglists.xml
similarity index 97%
rename from de_DE.ISO8859-1/htdocs/community/mailinglists.sgml
rename to de_DE.ISO8859-1/htdocs/community/mailinglists.xml
index 42cf8a1400..901be8d449 100644
--- a/de_DE.ISO8859-1/htdocs/community/mailinglists.sgml
+++ b/de_DE.ISO8859-1/htdocs/community/mailinglists.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/community/mailinglists.sgml,v 1.11 2009/05/10 12:21:53 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/community/mailinglists.xml,v 1.11 2009/05/10 12:21:53 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.18">
 <!ENTITY title "Mailinglisten">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/community/newsgroups.sgml b/de_DE.ISO8859-1/htdocs/community/newsgroups.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/community/newsgroups.sgml
rename to de_DE.ISO8859-1/htdocs/community/newsgroups.xml
index 2f2a4c5ef6..eaf6b37587 100644
--- a/de_DE.ISO8859-1/htdocs/community/newsgroups.sgml
+++ b/de_DE.ISO8859-1/htdocs/community/newsgroups.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/community/newsgroups.sgml,v 1.3 2006/10/19 19:26:00 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/community/newsgroups.xml,v 1.3 2006/10/19 19:26:00 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.5">
 <!ENTITY title "Newsgroups">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/community/webresources.sgml b/de_DE.ISO8859-1/htdocs/community/webresources.xml
similarity index 95%
rename from de_DE.ISO8859-1/htdocs/community/webresources.sgml
rename to de_DE.ISO8859-1/htdocs/community/webresources.xml
index fc2a6cabec..e5a2d184a2 100644
--- a/de_DE.ISO8859-1/htdocs/community/webresources.sgml
+++ b/de_DE.ISO8859-1/htdocs/community/webresources.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/community/webresources.sgml,v 1.4 2006/10/19 19:26:00 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/community/webresources.xml,v 1.4 2006/10/19 19:26:00 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.4">
 <!ENTITY title "Internetressourcen">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/developers/Makefile b/de_DE.ISO8859-1/htdocs/developers/Makefile
index e9b07b8be1..e5f08bfbad 100644
--- a/de_DE.ISO8859-1/htdocs/developers/Makefile
+++ b/de_DE.ISO8859-1/htdocs/developers/Makefile
@@ -9,6 +9,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   cvs.sgml
+DOCS=   cvs.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/de_DE.ISO8859-1/htdocs/developers/cvs.sgml b/de_DE.ISO8859-1/htdocs/developers/cvs.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/developers/cvs.sgml
rename to de_DE.ISO8859-1/htdocs/developers/cvs.xml
diff --git a/de_DE.ISO8859-1/htdocs/docproj/Makefile b/de_DE.ISO8859-1/htdocs/docproj/Makefile
index 1dc857005b..4b35a1f831 100644
--- a/de_DE.ISO8859-1/htdocs/docproj/Makefile
+++ b/de_DE.ISO8859-1/htdocs/docproj/Makefile
@@ -12,11 +12,11 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	doc-set.sgml
-DOCS+=	docproj.sgml
-DOCS+=	sgml.sgml
-DOCS+=	submitting.sgml
-DOCS+=	who.sgml
+DOCS=	doc-set.xml
+DOCS+=	docproj.xml
+DOCS+=	sgml.xml
+DOCS+=	submitting.xml
+DOCS+=	who.xml
 
 INDEXLINK= docproj.html
 
diff --git a/de_DE.ISO8859-1/htdocs/docproj/doc-set.sgml b/de_DE.ISO8859-1/htdocs/docproj/doc-set.xml
similarity index 95%
rename from de_DE.ISO8859-1/htdocs/docproj/doc-set.sgml
rename to de_DE.ISO8859-1/htdocs/docproj/doc-set.xml
index 3693459e30..27aa2060fa 100644
--- a/de_DE.ISO8859-1/htdocs/docproj/doc-set.sgml
+++ b/de_DE.ISO8859-1/htdocs/docproj/doc-set.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/docproj/doc-set.sgml,v 1.1 2007/01/14 17:54:58 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/docproj/doc-set.xml,v 1.1 2007/01/14 17:54:58 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.17">
 <!ENTITY title "FreeBSD Documentation Project: Die FreeBSD-Dokumentation">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/docproj/docproj.sgml b/de_DE.ISO8859-1/htdocs/docproj/docproj.xml
similarity index 97%
rename from de_DE.ISO8859-1/htdocs/docproj/docproj.sgml
rename to de_DE.ISO8859-1/htdocs/docproj/docproj.xml
index 279b1b3a26..0b3fa1dfd7 100644
--- a/de_DE.ISO8859-1/htdocs/docproj/docproj.sgml
+++ b/de_DE.ISO8859-1/htdocs/docproj/docproj.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/docproj/docproj.sgml,v 1.5 2007/01/18 15:41:28 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/docproj/docproj.xml,v 1.5 2007/01/18 15:41:28 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.27">
 <!ENTITY title "FreeBSD Documentation Project">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/docproj/sgml.sgml b/de_DE.ISO8859-1/htdocs/docproj/sgml.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/docproj/sgml.sgml
rename to de_DE.ISO8859-1/htdocs/docproj/sgml.xml
index 49b43f84b6..54ff9cf519 100644
--- a/de_DE.ISO8859-1/htdocs/docproj/sgml.sgml
+++ b/de_DE.ISO8859-1/htdocs/docproj/sgml.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/docproj/sgml.sgml,v 1.2 2008/02/24 11:23:07 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/docproj/sgml.xml,v 1.2 2008/02/24 11:23:07 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.28">
 <!ENTITY title "FreeBSD Documentation Project: SGML">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/docproj/submitting.sgml b/de_DE.ISO8859-1/htdocs/docproj/submitting.xml
similarity index 95%
rename from de_DE.ISO8859-1/htdocs/docproj/submitting.sgml
rename to de_DE.ISO8859-1/htdocs/docproj/submitting.xml
index 104e854e53..0012cf9c75 100644
--- a/de_DE.ISO8859-1/htdocs/docproj/submitting.sgml
+++ b/de_DE.ISO8859-1/htdocs/docproj/submitting.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
 <!ENTITY url.articles "&enbase;/doc/en_US.ISO8859-1/articles">
-<!ENTITY dedate "$FreeBSDde: de-www/docproj/submitting.sgml,v 1.2 2008/12/09 09:50:54 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/docproj/submitting.xml,v 1.2 2008/12/09 09:50:54 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.18">
 <!ENTITY title "FreeBSD Documentation Project: Beitr�ge einreichen">
 ]>
@@ -133,17 +133,17 @@
 
     <ol>
       <li><p>Erstellen Sie eine Kopie der zu �ndernden Datei
-        (in diesem Fall <tt>foo.sgml</tt>): do</p>
+        (in diesem Fall <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>Nun f�hren Sie Ihre �nderungen in
-         foo.sgml durch.</p>
+         foo.xml durch.</p>
 
 	<pre>
-    % <b>vi foo.sgml</b>
+    % <b>vi foo.xml</b>
     ... tipp tipp tipp ...
 
     ... �nderungen testen, Tippfehler suchen und korrigieren ...
@@ -152,7 +152,7 @@
       <li><p>Danach erzeugen Sie die Differenz:</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>Mit diesem Befehl werden die beiden Dateien verglichen und
diff --git a/de_DE.ISO8859-1/htdocs/docproj/who.sgml b/de_DE.ISO8859-1/htdocs/docproj/who.xml
similarity index 95%
rename from de_DE.ISO8859-1/htdocs/docproj/who.sgml
rename to de_DE.ISO8859-1/htdocs/docproj/who.xml
index ea1fdba084..825c20b7f2 100644
--- a/de_DE.ISO8859-1/htdocs/docproj/who.sgml
+++ b/de_DE.ISO8859-1/htdocs/docproj/who.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/docproj/who.sgml,v 1.3 2008/08/23 09:30:10 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/docproj/who.xml,v 1.3 2008/08/23 09:30:10 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.15">
 <!ENTITY title "FreeBSD Documentation Project: Wer sind wir?">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/docs.sgml b/de_DE.ISO8859-1/htdocs/docs.xml
similarity index 90%
rename from de_DE.ISO8859-1/htdocs/docs.sgml
rename to de_DE.ISO8859-1/htdocs/docs.xml
index 1641667c03..16555e763a 100644
--- a/de_DE.ISO8859-1/htdocs/docs.sgml
+++ b/de_DE.ISO8859-1/htdocs/docs.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/docs.sgml,v 1.16 2006/10/21 10:28:37 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/docs.xml,v 1.16 2006/10/21 10:28:37 jkois Exp $">
 <!ENTITY title "FreeBSD Dokumentation">
 <!ENTITY reference "basiert auf: 1.195">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/docs/Makefile b/de_DE.ISO8859-1/htdocs/docs/Makefile
index ec301e29c7..9dc03277d0 100644
--- a/de_DE.ISO8859-1/htdocs/docs/Makefile
+++ b/de_DE.ISO8859-1/htdocs/docs/Makefile
@@ -9,7 +9,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS= books.sgml
-DOCS+= webresources.sgml
+DOCS= books.xml
+DOCS+= webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/de_DE.ISO8859-1/htdocs/docs/books.sgml b/de_DE.ISO8859-1/htdocs/docs/books.xml
similarity index 99%
rename from de_DE.ISO8859-1/htdocs/docs/books.sgml
rename to de_DE.ISO8859-1/htdocs/docs/books.xml
index 85ea132435..386ec6a4db 100644
--- a/de_DE.ISO8859-1/htdocs/docs/books.sgml
+++ b/de_DE.ISO8859-1/htdocs/docs/books.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/docs/books.sgml,v 1.32 2011/02/20 14:05:21 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/docs/books.xml,v 1.32 2011/02/20 14:05:21 jkois Exp $">
 <!ENTITY title "Online vorhandene B�cher und Artikel">
 <!ENTITY reference "basiert auf: 1.41">
 <!ENTITY url.articles "../../doc/en_US.ISO8859-1/articles">
diff --git a/de_DE.ISO8859-1/htdocs/docs/webresources.sgml b/de_DE.ISO8859-1/htdocs/docs/webresources.xml
similarity index 96%
rename from de_DE.ISO8859-1/htdocs/docs/webresources.sgml
rename to de_DE.ISO8859-1/htdocs/docs/webresources.xml
index fe67d3be54..f55e7d821c 100644
--- a/de_DE.ISO8859-1/htdocs/docs/webresources.sgml
+++ b/de_DE.ISO8859-1/htdocs/docs/webresources.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/docs/webresources.sgml,v 1.8 2010/09/05 10:10:21 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/docs/webresources.xml,v 1.8 2010/09/05 10:10:21 jkois Exp $">
 <!ENTITY title "Internet-Ressourcen">
 <!ENTITY reference "basiert auf: 1.11">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/features.sgml b/de_DE.ISO8859-1/htdocs/features.xml
similarity index 99%
rename from de_DE.ISO8859-1/htdocs/features.sgml
rename to de_DE.ISO8859-1/htdocs/features.xml
index 8bbd462adc..cdf2e35094 100644
--- a/de_DE.ISO8859-1/htdocs/features.sgml
+++ b/de_DE.ISO8859-1/htdocs/features.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/features.sgml,v 1.22 2008/03/24 14:30:04 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/features.xml,v 1.22 2008/03/24 14:30:04 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.34">
 <!ENTITY title "Die technischen Fortschritte von FreeBSD">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/internet.sgml b/de_DE.ISO8859-1/htdocs/internet.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/internet.sgml
rename to de_DE.ISO8859-1/htdocs/internet.xml
index fd6cc057e5..c0a1261507 100644
--- a/de_DE.ISO8859-1/htdocs/internet.sgml
+++ b/de_DE.ISO8859-1/htdocs/internet.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/internet.sgml,v 1.17 2007/09/26 10:08:01 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/internet.xml,v 1.17 2007/09/26 10:08:01 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.38">
 <!ENTITY title "FreeBSDs Netzwerkf�higkeiten">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/ipv6/Makefile b/de_DE.ISO8859-1/htdocs/ipv6/Makefile
index ad85544d09..778d7d91c8 100644
--- a/de_DE.ISO8859-1/htdocs/ipv6/Makefile
+++ b/de_DE.ISO8859-1/htdocs/ipv6/Makefile
@@ -9,7 +9,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+=		index.sgml
+DOCS+=		index.xml
 
 #DATA+=		../../en/ipv6/IPv6-badge-blue-256-trans.png	\
 #		../../en/ipv6/IPv6-badge-blue-128-trans.png
diff --git a/de_DE.ISO8859-1/htdocs/ipv6/index.sgml b/de_DE.ISO8859-1/htdocs/ipv6/index.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/ipv6/index.sgml
rename to de_DE.ISO8859-1/htdocs/ipv6/index.xml
index c9750effd0..41e1102e84 100644
--- a/de_DE.ISO8859-1/htdocs/ipv6/index.sgml
+++ b/de_DE.ISO8859-1/htdocs/ipv6/index.xml
@@ -30,7 +30,7 @@
 
      The FreeBSD German Documentation Project
      The FreeBSD Documentation Project
-     $FreeBSDde: de-www/ipv6/index.sgml,v 1.3 2012/01/14 10:13:42 jkois Exp $
+     $FreeBSDde: de-www/ipv6/index.xml,v 1.3 2012/01/14 10:13:42 jkois Exp $
      $FreeBSD$
      $basiert auf: 1.9
 -->
diff --git a/de_DE.ISO8859-1/htdocs/java/Makefile b/de_DE.ISO8859-1/htdocs/java/Makefile
index 5eae2f252b..0a78f1db6b 100644
--- a/de_DE.ISO8859-1/htdocs/java/Makefile
+++ b/de_DE.ISO8859-1/htdocs/java/Makefile
@@ -13,10 +13,10 @@
 #SUBDIR+=	docs
 #SUBDIR+=	links
 
-#DOCS =  advocacy.sgml
-#DOCS+=  howhelp.sgml
-DOCS+=  index.sgml
-#DOCS+=  install.sgml
-#DOCS+=  newsflash.sgml
+#DOCS =  advocacy.xml
+#DOCS+=  howhelp.xml
+DOCS+=  index.xml
+#DOCS+=  install.xml
+#DOCS+=  newsflash.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/de_DE.ISO8859-1/htdocs/java/index.sgml b/de_DE.ISO8859-1/htdocs/java/index.xml
similarity index 97%
rename from de_DE.ISO8859-1/htdocs/java/index.sgml
rename to de_DE.ISO8859-1/htdocs/java/index.xml
index d8440c463b..a72113b44d 100644
--- a/de_DE.ISO8859-1/htdocs/java/index.sgml
+++ b/de_DE.ISO8859-1/htdocs/java/index.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/java/index.sgml,v 1.7 2012/02/12 10:27:12 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/java/index.xml,v 1.7 2012/02/12 10:27:12 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.30">
 <!ENTITY title "FreeBSD &java; Project">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/logo.sgml b/de_DE.ISO8859-1/htdocs/logo.xml
similarity index 97%
rename from de_DE.ISO8859-1/htdocs/logo.sgml
rename to de_DE.ISO8859-1/htdocs/logo.xml
index f4491ea28e..6b5dc53c08 100644
--- a/de_DE.ISO8859-1/htdocs/logo.sgml
+++ b/de_DE.ISO8859-1/htdocs/logo.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/logo.sgml,v 1.5 2010/08/17 10:36:58 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/logo.xml,v 1.5 2010/08/17 10:36:58 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.7">
 <!ENTITY title "FreeBSD Logo">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/mailto.sgml b/de_DE.ISO8859-1/htdocs/mailto.xml
similarity index 95%
rename from de_DE.ISO8859-1/htdocs/mailto.sgml
rename to de_DE.ISO8859-1/htdocs/mailto.xml
index f16e8db7c2..33644c7149 100644
--- a/de_DE.ISO8859-1/htdocs/mailto.sgml
+++ b/de_DE.ISO8859-1/htdocs/mailto.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/mailto.sgml,v 1.10 2007/03/19 16:32:30 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/mailto.xml,v 1.10 2007/03/19 16:32:30 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.32">
 <!ENTITY title "FreeBSD Ansprechpartner">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/news/Makefile b/de_DE.ISO8859-1/htdocs/news/Makefile
index 3ca8f471d2..c615342106 100644
--- a/de_DE.ISO8859-1/htdocs/news/Makefile
+++ b/de_DE.ISO8859-1/htdocs/news/Makefile
@@ -9,7 +9,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+= news.sgml
+DOCS+= news.xml
 
 #Subdirs fuer alte News
 SUBDIR=  2009
diff --git a/de_DE.ISO8859-1/htdocs/news/news.sgml b/de_DE.ISO8859-1/htdocs/news/news.xml
similarity index 96%
rename from de_DE.ISO8859-1/htdocs/news/news.sgml
rename to de_DE.ISO8859-1/htdocs/news/news.xml
index 81d95dd59c..4d477cddd4 100644
--- a/de_DE.ISO8859-1/htdocs/news/news.sgml
+++ b/de_DE.ISO8859-1/htdocs/news/news.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/news/news.sgml,v 1.14 2011/08/31 16:35:03 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/news/news.xml,v 1.14 2011/08/31 16:35:03 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.53">
 <!ENTITY title "FreeBSD Neuigkeiten">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/Makefile b/de_DE.ISO8859-1/htdocs/platforms/Makefile
index 14b520e35c..76c2794ee6 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/Makefile
+++ b/de_DE.ISO8859-1/htdocs/platforms/Makefile
@@ -9,19 +9,19 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	alpha.sgml
-DOCS+=	amd64.sgml
-DOCS+=  arm.sgml
-DOCS+=	ia64.sgml
-DOCS+=	i386.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+=	ia64.xml
+DOCS+=	i386.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/de_DE.ISO8859-1/htdocs/platforms/alpha.sgml b/de_DE.ISO8859-1/htdocs/platforms/alpha.xml
similarity index 95%
rename from de_DE.ISO8859-1/htdocs/platforms/alpha.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/alpha.xml
index 20140e598a..b0c0cb3a87 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/alpha.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/alpha.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/alpha.sgml,v 1.11 2011/03/11 16:57:58 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/alpha.xml,v 1.11 2011/03/11 16:57:58 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.8">
 <!ENTITY title "FreeBSD/alpha Project">
 <!ENTITY email 'freebsd-alpha'>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/amd64.sgml b/de_DE.ISO8859-1/htdocs/platforms/amd64.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/platforms/amd64.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/amd64.xml
diff --git a/de_DE.ISO8859-1/htdocs/platforms/arm.sgml b/de_DE.ISO8859-1/htdocs/platforms/arm.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/platforms/arm.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/arm.xml
diff --git a/de_DE.ISO8859-1/htdocs/platforms/i386.sgml b/de_DE.ISO8859-1/htdocs/platforms/i386.xml
similarity index 95%
rename from de_DE.ISO8859-1/htdocs/platforms/i386.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/i386.xml
index b9699a5768..d23c3776dc 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/i386.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/i386.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/i386.sgml,v 1.8 2010/01/21 21:25:47 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/i386.xml,v 1.8 2010/01/21 21:25:47 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.12">
 <!ENTITY title "FreeBSD/i386 Project">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/ia64.sgml b/de_DE.ISO8859-1/htdocs/platforms/ia64.xml
similarity index 88%
rename from de_DE.ISO8859-1/htdocs/platforms/ia64.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/ia64.xml
index 322a4cdaca..f1f702cfa6 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/ia64.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/ia64.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/ia64.sgml,v 1.6 2006/10/19 19:26:03 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/ia64.xml,v 1.6 2006/10/19 19:26:03 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.13">
 <!ENTITY title "FreeBSD/ia64 Project">
 <!ENTITY email 'freebsd-ia64'>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/ia64/Makefile b/de_DE.ISO8859-1/htdocs/platforms/ia64/Makefile
index e4063416b8..930567f70a 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/ia64/Makefile
+++ b/de_DE.ISO8859-1/htdocs/platforms/ia64/Makefile
@@ -9,7 +9,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/de_DE.ISO8859-1/htdocs/platforms/ia64/index.sgml b/de_DE.ISO8859-1/htdocs/platforms/ia64/index.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/platforms/ia64/index.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/ia64/index.xml
diff --git a/de_DE.ISO8859-1/htdocs/platforms/ia64/machines.sgml b/de_DE.ISO8859-1/htdocs/platforms/ia64/machines.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/platforms/ia64/machines.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/ia64/machines.xml
index 02671ac9d7..eb7a4bc5b2 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/ia64/machines.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/ia64/machines.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/ia64/machines.sgml,v 1.13 2006/10/19 19:26:04 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/ia64/machines.xml,v 1.13 2006/10/19 19:26:04 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.9">
 <!ENTITY title "FreeBSD/ia64 Projekt &ndash; Ger�te">
 <!ENTITY email 'freebsd-ia64'>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/ia64/refs.sgml b/de_DE.ISO8859-1/htdocs/platforms/ia64/refs.xml
similarity index 97%
rename from de_DE.ISO8859-1/htdocs/platforms/ia64/refs.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/ia64/refs.xml
index acb47166f1..93e5a99908 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/ia64/refs.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/ia64/refs.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/ia64/refs.sgml,v 1.13 2006/10/19 19:26:04 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/ia64/refs.xml,v 1.13 2006/10/19 19:26:04 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.11">
 <!ENTITY title "FreeBSD/ia64 Projekt &ndash; Referenzen">
 <!ENTITY email 'freebsd-ia64'>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/ia64/todo.sgml b/de_DE.ISO8859-1/htdocs/platforms/ia64/todo.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/platforms/ia64/todo.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/ia64/todo.xml
diff --git a/de_DE.ISO8859-1/htdocs/platforms/index.sgml b/de_DE.ISO8859-1/htdocs/platforms/index.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/platforms/index.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/index.xml
diff --git a/de_DE.ISO8859-1/htdocs/platforms/mips.sgml b/de_DE.ISO8859-1/htdocs/platforms/mips.xml
similarity index 97%
rename from de_DE.ISO8859-1/htdocs/platforms/mips.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/mips.xml
index dc4853d53d..2335a12f53 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/mips.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/mips.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/mips.sgml,v 1.15 2008/06/15 16:11:24 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/mips.xml,v 1.15 2008/06/15 16:11:24 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.7">
 <!ENTITY title "FreeBSD/MIPS Project">
 <!ENTITY email 'freebsd-mips'>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/pc98.sgml b/de_DE.ISO8859-1/htdocs/platforms/pc98.xml
similarity index 96%
rename from de_DE.ISO8859-1/htdocs/platforms/pc98.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/pc98.xml
index c04ddde055..4341443224 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/pc98.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/pc98.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/pc98.sgml,v 1.18 2011/08/31 16:29:38 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/pc98.xml,v 1.18 2011/08/31 16:29:38 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.18">
 <!ENTITY title "FreeBSD/pc98 Project">
 <!ENTITY email 're-pc98'>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/ppc.sgml b/de_DE.ISO8859-1/htdocs/platforms/ppc.xml
similarity index 99%
rename from de_DE.ISO8859-1/htdocs/platforms/ppc.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/ppc.xml
index ed1fea29de..6303ee0852 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/ppc.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/ppc.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/ppc.sgml,v 1.26 2012/02/12 10:07:04 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/ppc.xml,v 1.26 2012/02/12 10:07:04 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.30">
 <!ENTITY title "FreeBSD/ppc Projekt">
 <!ENTITY email 'freebsd-ppc'>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/sparc.sgml b/de_DE.ISO8859-1/htdocs/platforms/sparc.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/platforms/sparc.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/sparc.xml
index f6da3aa4d1..5555bc65b7 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/sparc.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/sparc.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/sparc.sgml,v 1.31 2012/02/12 10:09:04 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/sparc.xml,v 1.31 2012/02/12 10:09:04 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.42">
 <!ENTITY title "FreeBSD/sparc64 Project">
 <!ENTITY email 'freebsd-sparc64'>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/sun4v.sgml b/de_DE.ISO8859-1/htdocs/platforms/sun4v.xml
similarity index 94%
rename from de_DE.ISO8859-1/htdocs/platforms/sun4v.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/sun4v.xml
index 28aa6d1ba6..20d6a1e279 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/sun4v.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/sun4v.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/sun4v.sgml,v 1.8 2012/02/12 10:13:02 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/sun4v.xml,v 1.8 2012/02/12 10:13:02 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.9">
 <!ENTITY title "FreeBSD/sun4v Project">
 <!ENTITY email 'freebsd-sun4v'>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/x86-64.sgml b/de_DE.ISO8859-1/htdocs/platforms/x86-64.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/platforms/x86-64.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/x86-64.xml
index 841a5ea77c..d90f548f64 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/x86-64.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/x86-64.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/x86-64.sgml,v 1.7 2006/10/19 19:26:03 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/x86-64.xml,v 1.7 2006/10/19 19:26:03 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.16">
 <!ENTITY title "FreeBSD/x86-64 Project">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/platforms/xbox.sgml b/de_DE.ISO8859-1/htdocs/platforms/xbox.xml
similarity index 96%
rename from de_DE.ISO8859-1/htdocs/platforms/xbox.sgml
rename to de_DE.ISO8859-1/htdocs/platforms/xbox.xml
index 4a15791757..bcb9cde1a9 100644
--- a/de_DE.ISO8859-1/htdocs/platforms/xbox.sgml
+++ b/de_DE.ISO8859-1/htdocs/platforms/xbox.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/platforms/xbox.sgml,v 1.2 2008/06/15 15:03:59 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/platforms/xbox.xml,v 1.2 2008/06/15 15:03:59 jkois Exp $">
 <!ENTITY reference "basiert auf: r39202">
 <!ENTITY title "FreeBSD/xbox Project">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/ports/Makefile b/de_DE.ISO8859-1/htdocs/ports/Makefile
index 49c01977c6..473177bac3 100644
--- a/de_DE.ISO8859-1/htdocs/ports/Makefile
+++ b/de_DE.ISO8859-1/htdocs/ports/Makefile
@@ -45,18 +45,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
 
@@ -74,15 +74,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 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/de_DE.ISO8859-1/htdocs/ports/index.sgml b/de_DE.ISO8859-1/htdocs/ports/index.xml
similarity index 97%
rename from de_DE.ISO8859-1/htdocs/ports/index.sgml
rename to de_DE.ISO8859-1/htdocs/ports/index.xml
index 45ef1f45d3..ea793fe1e6 100644
--- a/de_DE.ISO8859-1/htdocs/ports/index.sgml
+++ b/de_DE.ISO8859-1/htdocs/ports/index.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/ports/index.sgml,v 1.3 2007/04/02 18:39:36 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/ports/index.xml,v 1.3 2007/04/02 18:39:36 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title 'Die FreeBSD Ports-Sammlung'>
 <!ENTITY % ports.ent SYSTEM "ports.ent">
diff --git a/de_DE.ISO8859-1/htdocs/ports/installing.sgml b/de_DE.ISO8859-1/htdocs/ports/installing.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/ports/installing.sgml
rename to de_DE.ISO8859-1/htdocs/ports/installing.xml
diff --git a/de_DE.ISO8859-1/htdocs/ports/references.sgml b/de_DE.ISO8859-1/htdocs/ports/references.xml
similarity index 97%
rename from de_DE.ISO8859-1/htdocs/ports/references.sgml
rename to de_DE.ISO8859-1/htdocs/ports/references.xml
index 5c32cb91a1..bbc3b55cf8 100644
--- a/de_DE.ISO8859-1/htdocs/ports/references.sgml
+++ b/de_DE.ISO8859-1/htdocs/ports/references.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/ports/references.sgml,v 1.1 2007/03/31 14:27:06 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/ports/references.xml,v 1.1 2007/03/31 14:27:06 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.4">
 <!ENTITY title 'FreeBSD Ports -- Referenzen'>
 <!ENTITY % ports.ent SYSTEM "ports.ent">
diff --git a/de_DE.ISO8859-1/htdocs/ports/searching.sgml b/de_DE.ISO8859-1/htdocs/ports/searching.xml
similarity index 93%
rename from de_DE.ISO8859-1/htdocs/ports/searching.sgml
rename to de_DE.ISO8859-1/htdocs/ports/searching.xml
index 88e8b009d8..a1d66ac758 100644
--- a/de_DE.ISO8859-1/htdocs/ports/searching.sgml
+++ b/de_DE.ISO8859-1/htdocs/ports/searching.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/ports/searching.sgml,v 1.1 2007/03/31 14:27:06 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/ports/searching.xml,v 1.1 2007/03/31 14:27:06 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title 'Die FreeBSD Ports-Sammlung durchsuchen'>
 <!ENTITY % ports.ent SYSTEM "ports.ent">
diff --git a/de_DE.ISO8859-1/htdocs/ports/updating.sgml b/de_DE.ISO8859-1/htdocs/ports/updating.xml
similarity index 95%
rename from de_DE.ISO8859-1/htdocs/ports/updating.sgml
rename to de_DE.ISO8859-1/htdocs/ports/updating.xml
index 54ac8f6e55..ed54767516 100644
--- a/de_DE.ISO8859-1/htdocs/ports/updating.sgml
+++ b/de_DE.ISO8859-1/htdocs/ports/updating.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/ports/updating.sgml,v 1.1 2007/03/31 14:27:07 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/ports/updating.xml,v 1.1 2007/03/31 14:27:07 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.2">
 <!ENTITY title 'Die FreeBSD Ports-Sammlung aktualisieren'>
 <!ENTITY % ports.ent SYSTEM "ports.ent">
diff --git a/de_DE.ISO8859-1/htdocs/projects/Makefile b/de_DE.ISO8859-1/htdocs/projects/Makefile
index 586e288d52..41a10082ef 100644
--- a/de_DE.ISO8859-1/htdocs/projects/Makefile
+++ b/de_DE.ISO8859-1/htdocs/projects/Makefile
@@ -12,9 +12,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	projects.sgml
-DOCS+=	newbies.sgml
-DOCS+=	cvsweb.sgml
+DOCS=	projects.xml
+DOCS+=	newbies.xml
+DOCS+=	cvsweb.xml
 
 INDEXLINK= projects.html
 
diff --git a/de_DE.ISO8859-1/htdocs/projects/cvsweb.sgml b/de_DE.ISO8859-1/htdocs/projects/cvsweb.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/projects/cvsweb.sgml
rename to de_DE.ISO8859-1/htdocs/projects/cvsweb.xml
index c6b15b3a1c..dcf9bd83ff 100644
--- a/de_DE.ISO8859-1/htdocs/projects/cvsweb.sgml
+++ b/de_DE.ISO8859-1/htdocs/projects/cvsweb.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/projects/cvsweb.sgml,v 1.6 2011/06/05 17:47:55 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/projects/cvsweb.xml,v 1.6 2011/06/05 17:47:55 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.42">
 <!ENTITY title 'FreeBSD CVSweb Project'>
 <!ENTITY email 'freebsd-cvsweb'>
diff --git a/de_DE.ISO8859-1/htdocs/projects/newbies.sgml b/de_DE.ISO8859-1/htdocs/projects/newbies.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/projects/newbies.sgml
rename to de_DE.ISO8859-1/htdocs/projects/newbies.xml
diff --git a/de_DE.ISO8859-1/htdocs/projects/projects.sgml b/de_DE.ISO8859-1/htdocs/projects/projects.xml
similarity index 99%
rename from de_DE.ISO8859-1/htdocs/projects/projects.sgml
rename to de_DE.ISO8859-1/htdocs/projects/projects.xml
index ebdfa1b9d1..141e3526db 100644
--- a/de_DE.ISO8859-1/htdocs/projects/projects.sgml
+++ b/de_DE.ISO8859-1/htdocs/projects/projects.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/projects/projects.sgml,v 1.11 2009/02/21 17:23:10 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/projects/projects.xml,v 1.11 2009/02/21 17:23:10 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.207">
 <!ENTITY title "FreeBSD Entwicklungsprojekte">
 
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.11R/Makefile b/de_DE.ISO8859-1/htdocs/releases/4.11R/Makefile
index fadb7dc290..0796c38c72 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.11R/Makefile
+++ b/de_DE.ISO8859-1/htdocs/releases/4.11R/Makefile
@@ -11,10 +11,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/de_DE.ISO8859-1/htdocs/releases/4.11R/announce.sgml b/de_DE.ISO8859-1/htdocs/releases/4.11R/announce.xml
similarity index 99%
rename from de_DE.ISO8859-1/htdocs/releases/4.11R/announce.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.11R/announce.xml
index d8982541c8..59ea13e716 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.11R/announce.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.11R/announce.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.11R/announce.sgml,v 1.3 2006/10/19 19:26:05 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.11R/announce.xml,v 1.3 2006/10/19 19:26:05 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.5">
 <!ENTITY local.rel "4.11">
 <!ENTITY title "FreeBSD &local.rel;-RELEASE Announcement">
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.11R/hardware.sgml b/de_DE.ISO8859-1/htdocs/releases/4.11R/hardware.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.11R/hardware.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.11R/hardware.xml
index c822372331..a4bfd32ed0 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.11R/hardware.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.11R/hardware.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.11R/hardware.sgml,v 1.3 2006/10/19 19:26:05 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.11R/hardware.xml,v 1.3 2006/10/19 19:26:05 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.11-RELEASE Hardware Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.11R/installation.sgml b/de_DE.ISO8859-1/htdocs/releases/4.11R/installation.xml
similarity index 96%
rename from de_DE.ISO8859-1/htdocs/releases/4.11R/installation.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.11R/installation.xml
index 5c9b2bf90f..6313f8045d 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.11R/installation.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.11R/installation.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.11R/installation.sgml,v 1.3 2006/10/19 19:26:05 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.11R/installation.xml,v 1.3 2006/10/19 19:26:05 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.11-RELEASE Installation Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.11R/relnotes.sgml b/de_DE.ISO8859-1/htdocs/releases/4.11R/relnotes.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.11R/relnotes.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.11R/relnotes.xml
index 96f4ab7224..630d80e24e 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.11R/relnotes.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.11R/relnotes.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.11R/relnotes.sgml,v 1.3 2006/10/19 19:26:05 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.11R/relnotes.xml,v 1.3 2006/10/19 19:26:05 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.11-RELEASE Release Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.6.2R/Makefile b/de_DE.ISO8859-1/htdocs/releases/4.6.2R/Makefile
index e536769085..de843c129a 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.6.2R/Makefile
+++ b/de_DE.ISO8859-1/htdocs/releases/4.6.2R/Makefile
@@ -11,9 +11,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/de_DE.ISO8859-1/htdocs/releases/4.6.2R/announce.sgml b/de_DE.ISO8859-1/htdocs/releases/4.6.2R/announce.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/releases/4.6.2R/announce.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.6.2R/announce.xml
index 8b1dd8fafe..dfeb4e0d93 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.6.2R/announce.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.6.2R/announce.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.6.2R/announce.sgml,v 1.4 2006/10/19 19:26:06 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.6.2R/announce.xml,v 1.4 2006/10/19 19:26:06 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.5">
 <!ENTITY title "FreeBSD 4.6.2-RELEASE Announcement">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.6.2R/hardware.sgml b/de_DE.ISO8859-1/htdocs/releases/4.6.2R/hardware.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.6.2R/hardware.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.6.2R/hardware.xml
index fc719e6e0d..9bf1e82478 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.6.2R/hardware.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.6.2R/hardware.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.6.2R/hardware.sgml,v 1.4 2006/10/19 19:26:06 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.6.2R/hardware.xml,v 1.4 2006/10/19 19:26:06 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.6.2-RELEASE Hardware Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.6.2R/relnotes.sgml b/de_DE.ISO8859-1/htdocs/releases/4.6.2R/relnotes.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.6.2R/relnotes.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.6.2R/relnotes.xml
index 016bfda04d..2ae5c9cade 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.6.2R/relnotes.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.6.2R/relnotes.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.6.2R/relnotes.sgml,v 1.3 2006/10/19 19:26:06 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.6.2R/relnotes.xml,v 1.3 2006/10/19 19:26:06 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.6.2-RELEASE Release Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.7R/Makefile b/de_DE.ISO8859-1/htdocs/releases/4.7R/Makefile
index 22b0b23074..984d556910 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.7R/Makefile
+++ b/de_DE.ISO8859-1/htdocs/releases/4.7R/Makefile
@@ -11,10 +11,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/de_DE.ISO8859-1/htdocs/releases/4.7R/announce.sgml b/de_DE.ISO8859-1/htdocs/releases/4.7R/announce.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/releases/4.7R/announce.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.7R/announce.xml
index 67d5c488ef..d710a6f231 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.7R/announce.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.7R/announce.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.7R/announce.sgml,v 1.5 2006/10/19 19:26:06 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.7R/announce.xml,v 1.5 2006/10/19 19:26:06 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.6">
 <!ENTITY title "FreeBSD 4.7-RELEASE Announcement">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.7R/hardware.sgml b/de_DE.ISO8859-1/htdocs/releases/4.7R/hardware.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.7R/hardware.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.7R/hardware.xml
index 827796159d..107c15c36a 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.7R/hardware.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.7R/hardware.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.7R/hardware.sgml,v 1.4 2006/10/19 19:26:06 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.7R/hardware.xml,v 1.4 2006/10/19 19:26:06 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.7-RELEASE Hardware Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.7R/installation.sgml b/de_DE.ISO8859-1/htdocs/releases/4.7R/installation.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.7R/installation.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.7R/installation.xml
index dfd46def7a..1540a85a33 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.7R/installation.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.7R/installation.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.7R/installation.sgml,v 1.3 2006/10/19 19:26:06 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.7R/installation.xml,v 1.3 2006/10/19 19:26:06 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.7-RELEASE Installation Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.7R/relnotes.sgml b/de_DE.ISO8859-1/htdocs/releases/4.7R/relnotes.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.7R/relnotes.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.7R/relnotes.xml
index 076d2e9c6d..c40c770cd8 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.7R/relnotes.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.7R/relnotes.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.7R/relnotes.sgml,v 1.5 2006/10/19 19:26:06 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.7R/relnotes.xml,v 1.5 2006/10/19 19:26:06 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.7-RELEASE Release Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.8R/Makefile b/de_DE.ISO8859-1/htdocs/releases/4.8R/Makefile
index cac42a56b4..cd14212fcb 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.8R/Makefile
+++ b/de_DE.ISO8859-1/htdocs/releases/4.8R/Makefile
@@ -11,10 +11,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/de_DE.ISO8859-1/htdocs/releases/4.8R/announce.sgml b/de_DE.ISO8859-1/htdocs/releases/4.8R/announce.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/releases/4.8R/announce.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.8R/announce.xml
index 74527f4662..fe23e6aa14 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.8R/announce.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.8R/announce.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.8R/announce.sgml,v 1.4 2006/10/19 19:26:07 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.8R/announce.xml,v 1.4 2006/10/19 19:26:07 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY local.rel "4.8">
 <!ENTITY title "FreeBSD &local.rel;-RELEASE Announcement">
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.8R/hardware.sgml b/de_DE.ISO8859-1/htdocs/releases/4.8R/hardware.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.8R/hardware.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.8R/hardware.xml
index da448dcbb5..dc111bbefc 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.8R/hardware.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.8R/hardware.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.8R/hardware.sgml,v 1.4 2006/10/19 19:26:07 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.8R/hardware.xml,v 1.4 2006/10/19 19:26:07 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.8-RELEASE Hardware Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.8R/installation.sgml b/de_DE.ISO8859-1/htdocs/releases/4.8R/installation.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.8R/installation.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.8R/installation.xml
index 3335d399d0..4d956d3816 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.8R/installation.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.8R/installation.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.8R/installation.sgml,v 1.3 2006/10/19 19:26:07 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.8R/installation.xml,v 1.3 2006/10/19 19:26:07 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.8-RELEASE Installation Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.8R/relnotes.sgml b/de_DE.ISO8859-1/htdocs/releases/4.8R/relnotes.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.8R/relnotes.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.8R/relnotes.xml
index 77661c2734..ea54ed77c2 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.8R/relnotes.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.8R/relnotes.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.8R/relnotes.sgml,v 1.5 2006/10/19 19:26:07 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.8R/relnotes.xml,v 1.5 2006/10/19 19:26:07 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.8-RELEASE Release Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.9R/Makefile b/de_DE.ISO8859-1/htdocs/releases/4.9R/Makefile
index 291664579c..e61c55da47 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.9R/Makefile
+++ b/de_DE.ISO8859-1/htdocs/releases/4.9R/Makefile
@@ -11,10 +11,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	installation.sgml
-DOCS+=	hardware.sgml
-DOCS+=	relnotes.sgml
+DOCS=	announce.xml
+DOCS+=	installation.xml
+DOCS+=	hardware.xml
+DOCS+=	relnotes.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.9R/announce.sgml b/de_DE.ISO8859-1/htdocs/releases/4.9R/announce.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/releases/4.9R/announce.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.9R/announce.xml
index b0086b0a88..ed882a9581 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.9R/announce.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.9R/announce.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.9R/announce.sgml,v 1.4 2006/10/19 19:26:07 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.9R/announce.xml,v 1.4 2006/10/19 19:26:07 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.6">
 <!ENTITY local.rel "4.9">
 <!ENTITY title "FreeBSD &local.rel;-RELEASE Announcement">
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.9R/hardware.sgml b/de_DE.ISO8859-1/htdocs/releases/4.9R/hardware.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.9R/hardware.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.9R/hardware.xml
index 265871cb6d..b3482b8f9d 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.9R/hardware.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.9R/hardware.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.9R/hardware.sgml,v 1.3 2006/10/19 19:26:07 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.9R/hardware.xml,v 1.3 2006/10/19 19:26:07 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.9-RELEASE Hardware Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.9R/installation.sgml b/de_DE.ISO8859-1/htdocs/releases/4.9R/installation.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.9R/installation.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.9R/installation.xml
index 2c8cf854e4..06f382b191 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.9R/installation.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.9R/installation.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.9R/installation.sgml,v 1.3 2006/10/19 19:26:07 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.9R/installation.xml,v 1.3 2006/10/19 19:26:07 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.9-RELEASE Installation Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/4.9R/relnotes.sgml b/de_DE.ISO8859-1/htdocs/releases/4.9R/relnotes.xml
similarity index 91%
rename from de_DE.ISO8859-1/htdocs/releases/4.9R/relnotes.sgml
rename to de_DE.ISO8859-1/htdocs/releases/4.9R/relnotes.xml
index 40c5767d1e..600f059f6d 100644
--- a/de_DE.ISO8859-1/htdocs/releases/4.9R/relnotes.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/4.9R/relnotes.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/4.9R/relnotes.sgml,v 1.3 2006/10/19 19:26:07 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/4.9R/relnotes.xml,v 1.3 2006/10/19 19:26:07 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 4.9-RELEASE Release Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.0R/Makefile b/de_DE.ISO8859-1/htdocs/releases/5.0R/Makefile
index 15ad2860c4..4b49efa4b1 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.0R/Makefile
+++ b/de_DE.ISO8859-1/htdocs/releases/5.0R/Makefile
@@ -11,10 +11,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/de_DE.ISO8859-1/htdocs/releases/5.0R/announce.sgml b/de_DE.ISO8859-1/htdocs/releases/5.0R/announce.xml
similarity index 99%
rename from de_DE.ISO8859-1/htdocs/releases/5.0R/announce.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.0R/announce.xml
index be16111c07..19e8fea1c2 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.0R/announce.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.0R/announce.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.0R/announce.sgml,v 1.5 2006/10/20 22:12:16 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.0R/announce.xml,v 1.5 2006/10/20 22:12:16 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.7">
 <!ENTITY title "FreeBSD 5.0-RELEASE Announcement">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.0R/hardware.sgml b/de_DE.ISO8859-1/htdocs/releases/5.0R/hardware.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.0R/hardware.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.0R/hardware.xml
index fe859630d9..8f99814b3a 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.0R/hardware.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.0R/hardware.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.0R/hardware.sgml,v 1.5 2006/10/19 19:26:08 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.0R/hardware.xml,v 1.5 2006/10/19 19:26:08 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.5">
 <!ENTITY title "FreeBSD 5.0-RELEASE Hardware Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.0R/installation.sgml b/de_DE.ISO8859-1/htdocs/releases/5.0R/installation.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.0R/installation.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.0R/installation.xml
index 5aa640616d..bb2b13e6be 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.0R/installation.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.0R/installation.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.0R/installation.sgml,v 1.6 2006/10/19 19:26:08 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.0R/installation.xml,v 1.6 2006/10/19 19:26:08 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.6">
 <!ENTITY title "FreeBSD 5.0-RELEASE Installation Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.0R/relnotes.sgml b/de_DE.ISO8859-1/htdocs/releases/5.0R/relnotes.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.0R/relnotes.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.0R/relnotes.xml
index 7237c27c87..e79fc70f0b 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.0R/relnotes.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.0R/relnotes.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.0R/relnotes.sgml,v 1.5 2006/10/19 19:26:08 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.0R/relnotes.xml,v 1.5 2006/10/19 19:26:08 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.4">
 <!ENTITY title "FreeBSD 5.0-RELEASE Release Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.1R/Makefile b/de_DE.ISO8859-1/htdocs/releases/5.1R/Makefile
index 4375929a13..25e17459d2 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.1R/Makefile
+++ b/de_DE.ISO8859-1/htdocs/releases/5.1R/Makefile
@@ -11,10 +11,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/de_DE.ISO8859-1/htdocs/releases/5.1R/announce.sgml b/de_DE.ISO8859-1/htdocs/releases/5.1R/announce.xml
similarity index 99%
rename from de_DE.ISO8859-1/htdocs/releases/5.1R/announce.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.1R/announce.xml
index 99dc014810..c59cf474d4 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.1R/announce.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.1R/announce.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.1R/announce.sgml,v 1.5 2006/10/19 19:26:08 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.1R/announce.xml,v 1.5 2006/10/19 19:26:08 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.5">
 <!ENTITY title "FreeBSD 5.1-RELEASE Announcement">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.1R/hardware.sgml b/de_DE.ISO8859-1/htdocs/releases/5.1R/hardware.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.1R/hardware.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.1R/hardware.xml
index cc98e6d8a5..08ad7784bf 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.1R/hardware.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.1R/hardware.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.1R/hardware.sgml,v 1.4 2006/10/19 19:26:09 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.1R/hardware.xml,v 1.4 2006/10/19 19:26:09 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.4">
 <!ENTITY title "FreeBSD 5.1-RELEASE Hardware Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.1R/installation.sgml b/de_DE.ISO8859-1/htdocs/releases/5.1R/installation.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.1R/installation.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.1R/installation.xml
index 23deb77ce7..dd4064fc27 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.1R/installation.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.1R/installation.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.1R/installation.sgml,v 1.4 2006/10/19 19:26:09 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.1R/installation.xml,v 1.4 2006/10/19 19:26:09 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.4">
 <!ENTITY title "FreeBSD 5.1-RELEASE Installation Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.1R/relnotes.sgml b/de_DE.ISO8859-1/htdocs/releases/5.1R/relnotes.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.1R/relnotes.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.1R/relnotes.xml
index 5f28eaa8d2..bb5f286d2e 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.1R/relnotes.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.1R/relnotes.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.1R/relnotes.sgml,v 1.4 2006/10/19 19:26:09 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.1R/relnotes.xml,v 1.4 2006/10/19 19:26:09 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.4">
 <!ENTITY title "FreeBSD 5.1-RELEASE Release Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.2R/Makefile b/de_DE.ISO8859-1/htdocs/releases/5.2R/Makefile
index 5a59563434..d25aacecc3 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.2R/Makefile
+++ b/de_DE.ISO8859-1/htdocs/releases/5.2R/Makefile
@@ -11,9 +11,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	hardware.sgml
-DOCS+=	installation.sgml
-DOCS+=	relnotes.sgml
+DOCS=	hardware.xml
+DOCS+=	installation.xml
+DOCS+=	relnotes.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.2R/hardware.sgml b/de_DE.ISO8859-1/htdocs/releases/5.2R/hardware.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.2R/hardware.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.2R/hardware.xml
index 0dba69630a..16155f9e94 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.2R/hardware.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.2R/hardware.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.2R/hardware.sgml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.2R/hardware.xml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 5.2-RELEASE Hardware Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.2R/installation.sgml b/de_DE.ISO8859-1/htdocs/releases/5.2R/installation.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.2R/installation.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.2R/installation.xml
index b9ca0d38ec..a4e5a32b08 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.2R/installation.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.2R/installation.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.2R/installation.sgml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.2R/installation.xml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 5.2-RELEASE Installation Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.2R/relnotes.sgml b/de_DE.ISO8859-1/htdocs/releases/5.2R/relnotes.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.2R/relnotes.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.2R/relnotes.xml
index 0040c87976..7870b5d4a1 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.2R/relnotes.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.2R/relnotes.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.2R/relnotes.sgml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.2R/relnotes.xml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 5.2-RELEASE Release Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.3R/Makefile b/de_DE.ISO8859-1/htdocs/releases/5.3R/Makefile
index c4bdd894b1..654d658ed2 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.3R/Makefile
+++ b/de_DE.ISO8859-1/htdocs/releases/5.3R/Makefile
@@ -11,10 +11,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/de_DE.ISO8859-1/htdocs/releases/5.3R/announce.sgml b/de_DE.ISO8859-1/htdocs/releases/5.3R/announce.xml
similarity index 99%
rename from de_DE.ISO8859-1/htdocs/releases/5.3R/announce.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.3R/announce.xml
index cfc0121303..3074459a49 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.3R/announce.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.3R/announce.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.3R/announce.sgml,v 1.4 2006/10/19 19:26:09 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.3R/announce.xml,v 1.4 2006/10/19 19:26:09 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.6">
 <!ENTITY title "FreeBSD 5.3-RELEASE Announcement">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.3R/hardware.sgml b/de_DE.ISO8859-1/htdocs/releases/5.3R/hardware.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.3R/hardware.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.3R/hardware.xml
index 7104abffae..0f2acb0b15 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.3R/hardware.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.3R/hardware.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.3R/hardware.sgml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.3R/hardware.xml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 5.3-RELEASE Hardware Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.3R/installation.sgml b/de_DE.ISO8859-1/htdocs/releases/5.3R/installation.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.3R/installation.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.3R/installation.xml
index d98a9fa065..5004e3004c 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.3R/installation.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.3R/installation.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.3R/installation.sgml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.3R/installation.xml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 5.3-RELEASE Installation Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/5.3R/relnotes.sgml b/de_DE.ISO8859-1/htdocs/releases/5.3R/relnotes.xml
similarity index 92%
rename from de_DE.ISO8859-1/htdocs/releases/5.3R/relnotes.sgml
rename to de_DE.ISO8859-1/htdocs/releases/5.3R/relnotes.xml
index 6cfa6409db..83ffe1f0e8 100644
--- a/de_DE.ISO8859-1/htdocs/releases/5.3R/relnotes.sgml
+++ b/de_DE.ISO8859-1/htdocs/releases/5.3R/relnotes.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/releases/5.3R/relnotes.sgml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/releases/5.3R/relnotes.xml,v 1.3 2006/10/19 19:26:09 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.3">
 <!ENTITY title "FreeBSD 5.3-RELEASE Release Notes">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/releases/Makefile b/de_DE.ISO8859-1/htdocs/releases/Makefile
index 2d537c34fb..a9babcc687 100644
--- a/de_DE.ISO8859-1/htdocs/releases/Makefile
+++ b/de_DE.ISO8859-1/htdocs/releases/Makefile
@@ -9,7 +9,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml
+DOCS?=	index.xml
 
 SUBDIR=		4.6.2R 4.7R 4.8R 4.9R 4.11R
 SUBDIR+=	5.0R 5.1R 5.2R 5.3R
diff --git a/de_DE.ISO8859-1/htdocs/releases/index.sgml b/de_DE.ISO8859-1/htdocs/releases/index.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/releases/index.sgml
rename to de_DE.ISO8859-1/htdocs/releases/index.xml
diff --git a/de_DE.ISO8859-1/htdocs/relnotes.sgml b/de_DE.ISO8859-1/htdocs/relnotes.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/relnotes.sgml
rename to de_DE.ISO8859-1/htdocs/relnotes.xml
index 29ecd004f2..847967a942 100644
--- a/de_DE.ISO8859-1/htdocs/relnotes.sgml
+++ b/de_DE.ISO8859-1/htdocs/relnotes.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/relnotes.sgml,v 1.17 2010/08/04 21:04:41 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/relnotes.xml,v 1.17 2010/08/04 21:04:41 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.22">
 <!ENTITY title "Release Dokumentation">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/security/Makefile b/de_DE.ISO8859-1/htdocs/security/Makefile
index fce4ed14d3..f8f42e2373 100644
--- a/de_DE.ISO8859-1/htdocs/security/Makefile
+++ b/de_DE.ISO8859-1/htdocs/security/Makefile
@@ -9,8 +9,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	charter.sgml
-DOCS+=	security.sgml
+DOCS=	charter.xml
+DOCS+=	security.xml
 
 INDEXLINK=	security.html
 
diff --git a/de_DE.ISO8859-1/htdocs/security/charter.sgml b/de_DE.ISO8859-1/htdocs/security/charter.xml
similarity index 97%
rename from de_DE.ISO8859-1/htdocs/security/charter.sgml
rename to de_DE.ISO8859-1/htdocs/security/charter.xml
index 25ac0a348b..79cd7a20a9 100644
--- a/de_DE.ISO8859-1/htdocs/security/charter.sgml
+++ b/de_DE.ISO8859-1/htdocs/security/charter.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/security/charter.sgml,v 1.7 2008/03/01 16:08:49 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/security/charter.xml,v 1.7 2008/03/01 16:08:49 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.6">
 <!ENTITY title "Charta des FreeBSD-Security-Officers">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/security/security.sgml b/de_DE.ISO8859-1/htdocs/security/security.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/security/security.sgml
rename to de_DE.ISO8859-1/htdocs/security/security.xml
diff --git a/de_DE.ISO8859-1/htdocs/send-pr.sgml b/de_DE.ISO8859-1/htdocs/send-pr.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/send-pr.sgml
rename to de_DE.ISO8859-1/htdocs/send-pr.xml
diff --git a/de_DE.ISO8859-1/htdocs/snapshots/Makefile b/de_DE.ISO8859-1/htdocs/snapshots/Makefile
index 7263541e14..b00a747982 100644
--- a/de_DE.ISO8859-1/htdocs/snapshots/Makefile
+++ b/de_DE.ISO8859-1/htdocs/snapshots/Makefile
@@ -9,6 +9,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml
+DOCS?=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/de_DE.ISO8859-1/htdocs/snapshots/index.sgml b/de_DE.ISO8859-1/htdocs/snapshots/index.xml
similarity index 98%
rename from de_DE.ISO8859-1/htdocs/snapshots/index.sgml
rename to de_DE.ISO8859-1/htdocs/snapshots/index.xml
index 2aa9cbe237..a15568bd64 100644
--- a/de_DE.ISO8859-1/htdocs/snapshots/index.sgml
+++ b/de_DE.ISO8859-1/htdocs/snapshots/index.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/snapshots/index.sgml,v 1.2 2010/04/18 19:48:06 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/snapshots/index.xml,v 1.2 2010/04/18 19:48:06 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.44">
 <!ENTITY title "FreeBSD Snapshot Releases">
 <!ENTITY url.snapshots "ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots">
diff --git a/de_DE.ISO8859-1/htdocs/support.sgml b/de_DE.ISO8859-1/htdocs/support.xml
similarity index 96%
rename from de_DE.ISO8859-1/htdocs/support.sgml
rename to de_DE.ISO8859-1/htdocs/support.xml
index 995a3d8a9c..40150e3f16 100644
--- a/de_DE.ISO8859-1/htdocs/support.sgml
+++ b/de_DE.ISO8859-1/htdocs/support.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/support.sgml,v 1.9 2008/10/25 10:26:36 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/support.xml,v 1.9 2008/10/25 10:26:36 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.356">
 <!ENTITY title "Unterst�tzung">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/support/Makefile b/de_DE.ISO8859-1/htdocs/support/Makefile
index 98c0a686ec..54c49c48dd 100644
--- a/de_DE.ISO8859-1/htdocs/support/Makefile
+++ b/de_DE.ISO8859-1/htdocs/support/Makefile
@@ -9,7 +9,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS= bugreports.sgml
-DOCS+= webresources.sgml
+DOCS= bugreports.xml
+DOCS+= webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/de_DE.ISO8859-1/htdocs/support/bugreports.sgml b/de_DE.ISO8859-1/htdocs/support/bugreports.xml
similarity index 96%
rename from de_DE.ISO8859-1/htdocs/support/bugreports.sgml
rename to de_DE.ISO8859-1/htdocs/support/bugreports.xml
index 5e0876b538..3056bc036c 100644
--- a/de_DE.ISO8859-1/htdocs/support/bugreports.sgml
+++ b/de_DE.ISO8859-1/htdocs/support/bugreports.xml
@@ -1,7 +1,7 @@
 <?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 dedate "$FreeBSDde: de-www/support/bugreports.sgml,v 1.7 2012/04/19 15:36:14 jkois Exp $">
+<!ENTITY dedate "$FreeBSDde: de-www/support/bugreports.xml,v 1.7 2012/04/19 15:36:14 jkois Exp $">
 <!ENTITY reference "basiert auf: 1.6">
 <!ENTITY title "Problemberichte">
 ]>
diff --git a/de_DE.ISO8859-1/htdocs/support/webresources.sgml b/de_DE.ISO8859-1/htdocs/support/webresources.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/support/webresources.sgml
rename to de_DE.ISO8859-1/htdocs/support/webresources.xml
diff --git a/de_DE.ISO8859-1/htdocs/where.sgml b/de_DE.ISO8859-1/htdocs/where.xml
similarity index 100%
rename from de_DE.ISO8859-1/htdocs/where.sgml
rename to de_DE.ISO8859-1/htdocs/where.xml
diff --git a/de_DE.ISO8859-1/share/sgml/bibliography.sgml b/de_DE.ISO8859-1/share/sgml/bibliography.xml
similarity index 98%
rename from de_DE.ISO8859-1/share/sgml/bibliography.sgml
rename to de_DE.ISO8859-1/share/sgml/bibliography.xml
index a978b3c098..c5cab8dd20 100644
--- a/de_DE.ISO8859-1/share/sgml/bibliography.sgml
+++ b/de_DE.ISO8859-1/share/sgml/bibliography.xml
@@ -1,6 +1,6 @@
 <!--
   $FreeBSD$
-  $FreeBSDde: de-docproj/share/sgml/bibliography.sgml,v 1.1 2002/02/25 11:49:29 ue Exp $
+  $FreeBSDde: de-docproj/share/sgml/bibliography.xml,v 1.1 2002/02/25 11:49:29 ue Exp $
 
   Basiert auf der Bibliographie aus Version 1.348 des FAQ
 -->
diff --git a/de_DE.ISO8859-1/share/sgml/glossary.ent b/de_DE.ISO8859-1/share/sgml/glossary.ent
index 2711301b70..4a8464a776 100644
--- a/de_DE.ISO8859-1/share/sgml/glossary.ent
+++ b/de_DE.ISO8859-1/share/sgml/glossary.ent
@@ -30,7 +30,7 @@
 	des Haupttextes zu vermeiden.
 
     $FreeBSD$
-    $FreeBSDde: de-docproj/share/sgml/glossary/freebsd-glossary.sgml,v 1.17 2011/07/25 15:56:55 bcr Exp $
+    $FreeBSDde: de-docproj/share/sgml/glossary/freebsd-glossary.xml,v 1.17 2011/07/25 15:56:55 bcr Exp $
     basiert auf: 1.37
 -->
 
diff --git a/el_GR.ISO8859-7/articles/bsdl-gpl/Makefile b/el_GR.ISO8859-7/articles/bsdl-gpl/Makefile
index e683b09462..96b26b4048 100644
--- a/el_GR.ISO8859-7/articles/bsdl-gpl/Makefile
+++ b/el_GR.ISO8859-7/articles/bsdl-gpl/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/el_GR.ISO8859-7/articles/bsdl-gpl/article.sgml b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/bsdl-gpl/article.sgml
rename to el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
index 0372382f0b..6e1e448b90 100644
--- a/el_GR.ISO8859-7/articles/bsdl-gpl/article.sgml
+++ b/el_GR.ISO8859-7/articles/bsdl-gpl/article.xml
@@ -9,7 +9,7 @@
 
   FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/bsdl-gpl/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/bsdl-gpl/article.xml
   %SRCID%	1.8
 
 -->
diff --git a/el_GR.ISO8859-7/articles/compiz-fusion/Makefile b/el_GR.ISO8859-7/articles/compiz-fusion/Makefile
index 50fa129e96..1e8a1c09fe 100644
--- a/el_GR.ISO8859-7/articles/compiz-fusion/Makefile
+++ b/el_GR.ISO8859-7/articles/compiz-fusion/Makefile
@@ -14,7 +14,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/el_GR.ISO8859-7/articles/compiz-fusion/article.sgml b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/compiz-fusion/article.sgml
rename to el_GR.ISO8859-7/articles/compiz-fusion/article.xml
index 3127e229e7..0bb8ceae3a 100644
--- a/el_GR.ISO8859-7/articles/compiz-fusion/article.sgml
+++ b/el_GR.ISO8859-7/articles/compiz-fusion/article.xml
@@ -12,7 +12,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/compiz-fusion/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/compiz-fusion/article.xml
   %SRCID%	1.6
 
 -->
diff --git a/el_GR.ISO8859-7/articles/contributing/Makefile b/el_GR.ISO8859-7/articles/contributing/Makefile
index 1f5b5eb47b..905bbf0562 100644
--- a/el_GR.ISO8859-7/articles/contributing/Makefile
+++ b/el_GR.ISO8859-7/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/el_GR.ISO8859-7/articles/contributing/article.sgml b/el_GR.ISO8859-7/articles/contributing/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/contributing/article.sgml
rename to el_GR.ISO8859-7/articles/contributing/article.xml
index 7179948cfd..b599bbb976 100644
--- a/el_GR.ISO8859-7/articles/contributing/article.sgml
+++ b/el_GR.ISO8859-7/articles/contributing/article.xml
@@ -12,7 +12,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/contributing/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/contributing/article.xml
   %SRCID%	1.511
 
 -->
diff --git a/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile b/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile
index cf44ff1c87..202ee2c2aa 100644
--- a/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile
+++ b/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile
@@ -12,7 +12,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml b/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml
rename to el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
index 7f9a8f35b0..0c2d9e146b 100644
--- a/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml
+++ b/el_GR.ISO8859-7/articles/cvs-freebsd/article.xml
@@ -10,7 +10,7 @@
 
   FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/cvs-freebsd/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/cvs-freebsd/article.xml
   %SRCID%	1.17
 
 -->
diff --git a/el_GR.ISO8859-7/articles/explaining-bsd/Makefile b/el_GR.ISO8859-7/articles/explaining-bsd/Makefile
index 7acc860def..72916bee80 100644
--- a/el_GR.ISO8859-7/articles/explaining-bsd/Makefile
+++ b/el_GR.ISO8859-7/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/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml b/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/explaining-bsd/article.sgml
rename to el_GR.ISO8859-7/articles/explaining-bsd/article.xml
index f9049d6e7a..10c990af86 100644
--- a/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml
+++ b/el_GR.ISO8859-7/articles/explaining-bsd/article.xml
@@ -12,7 +12,7 @@
   Explaining BSD
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/explaining-bsd/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/explaining-bsd/article.xml
   %SRCID%	1.24
 
 -->
diff --git a/el_GR.ISO8859-7/articles/freebsd-questions/Makefile b/el_GR.ISO8859-7/articles/freebsd-questions/Makefile
index e6699e8467..56376ed3e2 100644
--- a/el_GR.ISO8859-7/articles/freebsd-questions/Makefile
+++ b/el_GR.ISO8859-7/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/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml b/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/freebsd-questions/article.sgml
rename to el_GR.ISO8859-7/articles/freebsd-questions/article.xml
index 33cf41a219..a71088e761 100644
--- a/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml
+++ b/el_GR.ISO8859-7/articles/freebsd-questions/article.xml
@@ -11,7 +11,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/freebsd-questions/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/freebsd-questions/article.xml
   %SRCID%	1.24
 
 -->
diff --git a/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile b/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile
index bb5ce632fb..5a8ff0d1f0 100644
--- a/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile
+++ b/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile
@@ -14,7 +14,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/el_GR.ISO8859-7/articles/gjournal-desktop/article.sgml b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/gjournal-desktop/article.sgml
rename to el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
index e1d544b8b8..b4f9248e80 100644
--- a/el_GR.ISO8859-7/articles/gjournal-desktop/article.sgml
+++ b/el_GR.ISO8859-7/articles/gjournal-desktop/article.xml
@@ -12,7 +12,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/gjournal-desktop/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/gjournal-desktop/article.xml
   %SRCID%	1.5
 
 -->
diff --git a/el_GR.ISO8859-7/articles/greek-language-support/Makefile b/el_GR.ISO8859-7/articles/greek-language-support/Makefile
index b1644f25fd..6cb5ec95e8 100644
--- a/el_GR.ISO8859-7/articles/greek-language-support/Makefile
+++ b/el_GR.ISO8859-7/articles/greek-language-support/Makefile
@@ -7,7 +7,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/el_GR.ISO8859-7/articles/greek-language-support/article.sgml b/el_GR.ISO8859-7/articles/greek-language-support/article.xml
similarity index 100%
rename from el_GR.ISO8859-7/articles/greek-language-support/article.sgml
rename to el_GR.ISO8859-7/articles/greek-language-support/article.xml
diff --git a/el_GR.ISO8859-7/articles/laptop/Makefile b/el_GR.ISO8859-7/articles/laptop/Makefile
index 3bebf224c1..72408c15cb 100644
--- a/el_GR.ISO8859-7/articles/laptop/Makefile
+++ b/el_GR.ISO8859-7/articles/laptop/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/el_GR.ISO8859-7/articles/laptop/article.sgml b/el_GR.ISO8859-7/articles/laptop/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/laptop/article.sgml
rename to el_GR.ISO8859-7/articles/laptop/article.xml
index ccd72104fc..5021be1cac 100644
--- a/el_GR.ISO8859-7/articles/laptop/article.sgml
+++ b/el_GR.ISO8859-7/articles/laptop/article.xml
@@ -11,7 +11,7 @@
 
     The FreeBSD Greek Documentation Project
 
-    %SOURCE%	en_US.ISO8859-1/articles/laptop/article.sgml
+    %SOURCE%	en_US.ISO8859-1/articles/laptop/article.xml
     %SRCID%	1.25
 
 -->
diff --git a/el_GR.ISO8859-7/articles/linux-users/Makefile b/el_GR.ISO8859-7/articles/linux-users/Makefile
index 13d4430541..fac5013236 100644
--- a/el_GR.ISO8859-7/articles/linux-users/Makefile
+++ b/el_GR.ISO8859-7/articles/linux-users/Makefile
@@ -14,7 +14,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/el_GR.ISO8859-7/articles/linux-users/article.sgml b/el_GR.ISO8859-7/articles/linux-users/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/linux-users/article.sgml
rename to el_GR.ISO8859-7/articles/linux-users/article.xml
index c53453daf0..448ad08823 100644
--- a/el_GR.ISO8859-7/articles/linux-users/article.sgml
+++ b/el_GR.ISO8859-7/articles/linux-users/article.xml
@@ -12,7 +12,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/linux-users/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/linux-users/article.xml
   %SRCID%	1.8
 
 -->
diff --git a/el_GR.ISO8859-7/articles/mailing-list-faq/Makefile b/el_GR.ISO8859-7/articles/mailing-list-faq/Makefile
index 3717d6221c..998dcfc305 100644
--- a/el_GR.ISO8859-7/articles/mailing-list-faq/Makefile
+++ b/el_GR.ISO8859-7/articles/mailing-list-faq/Makefile
@@ -21,7 +21,7 @@ WITH_ARTICLE_TOC?=YES
 #
 
 # SGML content
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/el_GR.ISO8859-7/articles/mailing-list-faq/article.sgml b/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/mailing-list-faq/article.sgml
rename to el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
index 070de71558..90fa75941a 100644
--- a/el_GR.ISO8859-7/articles/mailing-list-faq/article.sgml
+++ b/el_GR.ISO8859-7/articles/mailing-list-faq/article.xml
@@ -11,7 +11,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/mailing-list-faq/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/mailing-list-faq/article.xml
   %SRCID%	1.9
 
 -->
diff --git a/el_GR.ISO8859-7/articles/nanobsd/Makefile b/el_GR.ISO8859-7/articles/nanobsd/Makefile
index 50fa0405ef..4f6c427950 100644
--- a/el_GR.ISO8859-7/articles/nanobsd/Makefile
+++ b/el_GR.ISO8859-7/articles/nanobsd/Makefile
@@ -18,7 +18,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/el_GR.ISO8859-7/articles/nanobsd/article.sgml b/el_GR.ISO8859-7/articles/nanobsd/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/nanobsd/article.sgml
rename to el_GR.ISO8859-7/articles/nanobsd/article.xml
index 3d3d4a9313..de9938182d 100644
--- a/el_GR.ISO8859-7/articles/nanobsd/article.sgml
+++ b/el_GR.ISO8859-7/articles/nanobsd/article.xml
@@ -10,7 +10,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/nanobsd/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/nanobsd/article.xml
   %SRCID%	1.5
 
 -->
diff --git a/el_GR.ISO8859-7/articles/new-users/Makefile b/el_GR.ISO8859-7/articles/new-users/Makefile
index 30eb2fb6e3..ce2d91b1e1 100644
--- a/el_GR.ISO8859-7/articles/new-users/Makefile
+++ b/el_GR.ISO8859-7/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/el_GR.ISO8859-7/articles/new-users/article.sgml b/el_GR.ISO8859-7/articles/new-users/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/new-users/article.sgml
rename to el_GR.ISO8859-7/articles/new-users/article.xml
index 2764c4e39f..891565ad07 100644
--- a/el_GR.ISO8859-7/articles/new-users/article.sgml
+++ b/el_GR.ISO8859-7/articles/new-users/article.xml
@@ -13,7 +13,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/new-users/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/new-users/article.xml
   %SRCID%	1.51
 
 -->
diff --git a/el_GR.ISO8859-7/articles/problem-reports/Makefile b/el_GR.ISO8859-7/articles/problem-reports/Makefile
index 5d648483fe..58b842bbb8 100644
--- a/el_GR.ISO8859-7/articles/problem-reports/Makefile
+++ b/el_GR.ISO8859-7/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/el_GR.ISO8859-7/articles/problem-reports/article.sgml b/el_GR.ISO8859-7/articles/problem-reports/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/problem-reports/article.sgml
rename to el_GR.ISO8859-7/articles/problem-reports/article.xml
index 9c3f0cb7ef..8b4a9685ae 100644
--- a/el_GR.ISO8859-7/articles/problem-reports/article.sgml
+++ b/el_GR.ISO8859-7/articles/problem-reports/article.xml
@@ -11,7 +11,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/problem-reports/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/problem-reports/article.xml
   %SRCID%	1.43
 
 -->
diff --git a/el_GR.ISO8859-7/articles/releng-packages/Makefile b/el_GR.ISO8859-7/articles/releng-packages/Makefile
index 5df5455820..07d85b0fdc 100644
--- a/el_GR.ISO8859-7/articles/releng-packages/Makefile
+++ b/el_GR.ISO8859-7/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/el_GR.ISO8859-7/articles/releng-packages/article.sgml b/el_GR.ISO8859-7/articles/releng-packages/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/releng-packages/article.sgml
rename to el_GR.ISO8859-7/articles/releng-packages/article.xml
index e80bb05c93..6d4e30394d 100644
--- a/el_GR.ISO8859-7/articles/releng-packages/article.sgml
+++ b/el_GR.ISO8859-7/articles/releng-packages/article.xml
@@ -10,7 +10,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/releng-packages/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/releng-packages/article.xml
   %SRCID%   1.6
 
 -->
diff --git a/el_GR.ISO8859-7/articles/releng/Makefile b/el_GR.ISO8859-7/articles/releng/Makefile
index db669dcad6..766f2a6bc4 100644
--- a/el_GR.ISO8859-7/articles/releng/Makefile
+++ b/el_GR.ISO8859-7/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/el_GR.ISO8859-7/articles/releng/article.sgml b/el_GR.ISO8859-7/articles/releng/article.xml
similarity index 99%
rename from el_GR.ISO8859-7/articles/releng/article.sgml
rename to el_GR.ISO8859-7/articles/releng/article.xml
index 8eed4a1d72..a509529481 100644
--- a/el_GR.ISO8859-7/articles/releng/article.sgml
+++ b/el_GR.ISO8859-7/articles/releng/article.xml
@@ -12,7 +12,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%	en_US.ISO8859-1/articles/releng/article.sgml
+  %SOURCE%	en_US.ISO8859-1/articles/releng/article.xml
   %SRCID%	1.48
 
 -->
@@ -270,12 +270,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>
 
@@ -328,7 +328,7 @@
 	</listitem>
 
         <listitem>
-          <para><filename>www/en/docs.sgml</filename></para>
+          <para><filename>www/en/docs.xml</filename></para>
         </listitem>
 
         <listitem>
@@ -347,12 +347,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>
@@ -372,11 +372,11 @@
 	</listitem>
 
 	<listitem>
-	  <para><filename>www/en/includes.sgml</filename></para>
+	  <para><filename>www/en/includes.xml</filename></para>
 	</listitem>
 
 	<listitem>
-	  <para><filename>www/es/includes.sgml</filename></para>
+	  <para><filename>www/es/includes.xml</filename></para>
 	</listitem>
 
 	<listitem>
diff --git a/el_GR.ISO8859-7/books/faq/Makefile b/el_GR.ISO8859-7/books/faq/Makefile
index 071210c072..88c4409936 100644
--- a/el_GR.ISO8859-7/books/faq/Makefile
+++ b/el_GR.ISO8859-7/books/faq/Makefile
@@ -24,7 +24,7 @@ WITH_BIBLIOXREF_TITLE?=YES
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/el_GR.ISO8859-7/books/faq/book.sgml b/el_GR.ISO8859-7/books/faq/book.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/faq/book.sgml
rename to el_GR.ISO8859-7/books/faq/book.xml
index 4f9fa2bb1c..56e93d1630 100644
--- a/el_GR.ISO8859-7/books/faq/book.sgml
+++ b/el_GR.ISO8859-7/books/faq/book.xml
@@ -3,7 +3,7 @@
 	"../../../share/sgml/freebsd42.dtd" [
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EL" "../../share/sgml/entities.ent">
 %entities;
-<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.sgml">
+<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.xml">
 ]>
 
 <!--
@@ -12,7 +12,7 @@
 
   The FreeBSD Greek Documentation Project
 
-  %SOURCE%      en_US.ISO8859-1/books/faq/book.sgml
+  %SOURCE%      en_US.ISO8859-1/books/faq/book.xml
   %SRCID%       1.1103
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/Makefile b/el_GR.ISO8859-7/books/handbook/Makefile
index 04f0f7cc7e..fafb9c8c6d 100644
--- a/el_GR.ISO8859-7/books/handbook/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/Makefile
@@ -20,7 +20,7 @@
 # Make 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
@@ -30,8 +30,8 @@
 #
 # ��� �� ���������� ��� ��� �������� ��� ����������:
 #
-# - ���������� ���� �� Makefile, �� chapters.ent ��� �� book.sgml
-# - ��������� ��� ������� ��������� ��� ��������� ��� preface/preface.sgml
+# - ���������� ���� �� Makefile, �� chapters.ent ��� �� book.xml
+# - ��������� ��� ������� ��������� ��� ��������� ��� preface/preface.xml
 #
 # ------------------------------------------------------------------------
 
@@ -251,45 +251,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
@@ -297,12 +297,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 ${MASTERDOC}
 
 #
@@ -318,9 +318,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}
@@ -328,20 +328,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/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.sgml b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
index ee88b6cc8c..7f143e23b0 100644
--- a/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
   %SRCID%	1.1
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/audit/chapter.sgml b/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/audit/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/audit/chapter.xml
index 33655a3af1..d4e062a558 100644
--- a/el_GR.ISO8859-7/books/handbook/audit/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/audit/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%      en_US.ISO8859-1/books/handbook/audit/chapter.sgml
+  %SOURCE%      en_US.ISO8859-1/books/handbook/audit/chapter.xml
   %SRCID%       1.1
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/basics/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/basics/chapter.xml
index dc0cfab98f..9b19881c83 100644
--- a/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/basics/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%      en_US.ISO8859-1/books/handbook/basics/chapter.sgml
+  %SOURCE%      en_US.ISO8859-1/books/handbook/basics/chapter.xml
   %SRCID%       38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/bibliography/chapter.sgml b/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/bibliography/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
index 8b7047e18a..d7426c1885 100644
--- a/el_GR.ISO8859-7/books/handbook/bibliography/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/bibliography/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%      en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
+  %SOURCE%      en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
   %SRCID%       39056
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/book.sgml b/el_GR.ISO8859-7/books/handbook/book.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/book.sgml
rename to el_GR.ISO8859-7/books/handbook/book.xml
index ec01cc0ccf..95007701c9 100644
--- a/el_GR.ISO8859-7/books/handbook/book.sgml
+++ b/el_GR.ISO8859-7/books/handbook/book.xml
@@ -20,7 +20,7 @@
 
   $FreeBSD$
 
-  %SOURCE%      en_US.ISO8859-1/books/handbook/book.sgml
+  %SOURCE%      en_US.ISO8859-1/books/handbook/book.xml
   %SRCID%       38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/boot/chapter.sgml b/el_GR.ISO8859-7/books/handbook/boot/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/boot/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/boot/chapter.xml
index 7ecdde469b..78fd02bb2e 100644
--- a/el_GR.ISO8859-7/books/handbook/boot/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/boot/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%      en_US.ISO8859-1/books/handbook/boot/chapter.sgml
+  %SOURCE%      en_US.ISO8859-1/books/handbook/boot/chapter.xml
   %SRCID%       38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.sgml b/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
index c4e51600ea..562791a918 100644
--- a/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/bsdinstall/chapter.xml
@@ -6,7 +6,7 @@
 
      $FreeBSD$
 
-     %SOURCE%	en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
      %SRCID%	39098
 -->
 
diff --git a/el_GR.ISO8859-7/books/handbook/chapters.ent b/el_GR.ISO8859-7/books/handbook/chapters.ent
index bd33ed22c1..daa4314a4b 100644
--- a/el_GR.ISO8859-7/books/handbook/chapters.ent
+++ b/el_GR.ISO8859-7/books/handbook/chapters.ent
@@ -60,143 +60,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/el_GR.ISO8859-7/books/handbook/colophon.sgml b/el_GR.ISO8859-7/books/handbook/colophon.xml
similarity index 95%
rename from el_GR.ISO8859-7/books/handbook/colophon.sgml
rename to el_GR.ISO8859-7/books/handbook/colophon.xml
index 3a3e612448..98df77588e 100644
--- a/el_GR.ISO8859-7/books/handbook/colophon.sgml
+++ b/el_GR.ISO8859-7/books/handbook/colophon.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/colophon.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/colophon.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/config/chapter.sgml b/el_GR.ISO8859-7/books/handbook/config/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/config/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/config/chapter.xml
index 9afd443ec8..d9c096ae43 100644
--- a/el_GR.ISO8859-7/books/handbook/config/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/config/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/config/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/config/chapter.xml
   %SRCID%	1.229
 
 -->
@@ -972,7 +972,7 @@ ukphy1:  10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto</screen>
 	  object)</primary></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>��������, �������� ����� ������ ������������� ��� ��� ��������
 	  �������� ������������ ��� ���� ������� ���� ���� ��������� ���
diff --git a/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml b/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
index a3d13f56a3..0620644521 100644
--- a/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
   %SRCID%	38879
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml b/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
index b02249238e..77b5691edd 100644
--- a/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.xml
   %SRCID%	39265
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/disks/chapter.sgml b/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/disks/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/disks/chapter.xml
index 1cda8c1d0f..e865836ba7 100644
--- a/el_GR.ISO8859-7/books/handbook/disks/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/disks/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/disks/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/disks/chapter.xml
   %SRCID%	1.1
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/dtrace/Makefile b/el_GR.ISO8859-7/books/handbook/dtrace/Makefile
index be94ef2c90..e3d020467f 100644
--- a/el_GR.ISO8859-7/books/handbook/dtrace/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/dtrace/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	1.1
 #
 
-CHAPTERS= 	dtrace/chapter.sgml
+CHAPTERS= 	dtrace/chapter.xml
 
 VPATH=		..
 
diff --git a/el_GR.ISO8859-7/books/handbook/dtrace/chapter.sgml b/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/dtrace/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
index 7a2d7a195e..ba77da0fa4 100644
--- a/el_GR.ISO8859-7/books/handbook/dtrace/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/dtrace/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/eresources/chapter.sgml b/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/eresources/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
index b44d607159..dbd61564f6 100644
--- a/el_GR.ISO8859-7/books/handbook/eresources/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/eresources/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/eresources/chapter.xml
   %SRCID%	39281
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/filesystems/Makefile b/el_GR.ISO8859-7/books/handbook/filesystems/Makefile
index cb61bfe236..fd98bb00ae 100644
--- a/el_GR.ISO8859-7/books/handbook/filesystems/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/filesystems/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	1.1
 #
 
-CHAPTERS= 	filesystems/chapter.sgml
+CHAPTERS= 	filesystems/chapter.xml
 
 VPATH=		..
 
diff --git a/el_GR.ISO8859-7/books/handbook/filesystems/chapter.sgml b/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/filesystems/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
index 051a75a125..b9dd86fd33 100644
--- a/el_GR.ISO8859-7/books/handbook/filesystems/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/filesystems/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
   %SRCID%	39361
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml b/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
index 9e4e3fff8f..b02e5148e6 100644
--- a/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/firewalls/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
   %SRCID%	39270
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/geom/chapter.sgml b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/geom/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/geom/chapter.xml
index c8a4f4088e..298c4e9e17 100644
--- a/el_GR.ISO8859-7/books/handbook/geom/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/geom/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/geom/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/geom/chapter.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/install/chapter.sgml b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/install/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/install/chapter.xml
index ae4659adda..cb7d31d596 100644
--- a/el_GR.ISO8859-7/books/handbook/install/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/install/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/install/chapter.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/introduction/chapter.sgml b/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/introduction/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
index 827f2eae89..6df27ecefc 100644
--- a/el_GR.ISO8859-7/books/handbook/introduction/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/introduction/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/introduction/chapter.xml
   %SRCID%	39262
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/jails/chapter.sgml b/el_GR.ISO8859-7/books/handbook/jails/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/jails/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/jails/chapter.xml
index 96a110171c..0149ef15ad 100644
--- a/el_GR.ISO8859-7/books/handbook/jails/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/jails/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%      en_US.ISO8859-1/books/handbook/jails/chapter.sgml
+  %SOURCE%      en_US.ISO8859-1/books/handbook/jails/chapter.xml
   %SRCID%       38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml b/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
index 6bb92a77b9..4aa66c2439 100644
--- a/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
   %SRCID%	39097
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/l10n/chapter.sgml b/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/l10n/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
index a2ea172e72..faa054cd4a 100644
--- a/el_GR.ISO8859-7/books/handbook/l10n/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/l10n/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/l10n/chapter.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml b/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
index bc206b956a..6b0bc9d9b9 100644
--- a/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/mac/chapter.sgml b/el_GR.ISO8859-7/books/handbook/mac/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/mac/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/mac/chapter.xml
index 7acf3a2b30..ccdc74afc0 100644
--- a/el_GR.ISO8859-7/books/handbook/mac/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/mac/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/mac/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/mac/chapter.xml
   %SRCID%	1.1
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/mail/chapter.sgml b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/mail/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/mail/chapter.xml
index b3ad72ed95..f056b75c19 100644
--- a/el_GR.ISO8859-7/books/handbook/mail/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/mail/chapter.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml b/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
index b7e9be0696..e8e879bbc4 100644
--- a/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/mirrors/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
   %SRCID%	39186
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml b/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
index 3dcaaa3767..d6f26eedf2 100644
--- a/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/multimedia/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/network-servers/chapter.sgml b/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/network-servers/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
index c8a0fb3c42..cf3eaab2a0 100644
--- a/el_GR.ISO8859-7/books/handbook/network-servers/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/network-servers/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
   %SRCID%	1.1
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml b/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
similarity index 95%
rename from el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
index 73c741cbdd..4bfb7574f2 100644
--- a/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
   %SRCID%	39297
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/ports/chapter.sgml b/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/ports/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/ports/chapter.xml
index 95cf74ce48..8f9f091262 100644
--- a/el_GR.ISO8859-7/books/handbook/ports/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/ports/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/ports/chapter.xml
   %SRCID%	39234
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.sgml b/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
index 854bce98e8..ef5b3378ea 100644
--- a/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
   %SRCID%	39010
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/preface/preface.sgml b/el_GR.ISO8859-7/books/handbook/preface/preface.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/preface/preface.sgml
rename to el_GR.ISO8859-7/books/handbook/preface/preface.xml
index 718aa9e800..6d945c2eff 100644
--- a/el_GR.ISO8859-7/books/handbook/preface/preface.sgml
+++ b/el_GR.ISO8859-7/books/handbook/preface/preface.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/preface/preface.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/preface/preface.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml b/el_GR.ISO8859-7/books/handbook/printing/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/printing/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/printing/chapter.xml
index dfba3d34ca..c5c5eb6f86 100644
--- a/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/printing/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/printing/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/printing/chapter.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/security/chapter.sgml b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/security/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/security/chapter.xml
index 9f7658f1ec..ce0a37b849 100644
--- a/el_GR.ISO8859-7/books/handbook/security/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/security/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/security/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/security/chapter.xml
   %SRCID%	1.1
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.sgml b/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/serialcomms/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
index 41b7b47f07..1e1d557673 100644
--- a/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/users/chapter.sgml b/el_GR.ISO8859-7/books/handbook/users/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/users/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/users/chapter.xml
index c102eb01bf..9b49303608 100644
--- a/el_GR.ISO8859-7/books/handbook/users/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/users/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/users/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/users/chapter.xml
   %SRCID%	39362
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/vinum/chapter.sgml b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/vinum/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
index c035d5ad15..8ff93bc5df 100644
--- a/el_GR.ISO8859-7/books/handbook/vinum/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/vinum/chapter.xml
@@ -12,7 +12,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/vinum/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/vinum/chapter.xml
   %SRCID%	38826
 
 -->
diff --git a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
index ee628e9678..b55c5811fb 100644
--- a/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/virtualization/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
+  %SOURCE%	en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
   %SRCID%	39283
 
 -->
@@ -1076,7 +1076,7 @@ EndSection</programlisting>
 &lt;!--
 # Sun VirtualBox
 # Hal driver description for the vboxmouse driver
-# $Id: chapter.sgml,v 1.16 2011-12-09 19:53:53 manolis Exp $
+# $Id: chapter.xml,v 1.16 2011-12-09 19:53:53 manolis Exp $
 
 	Copyright (C) 2008-2009 Sun Microsystems, Inc.
 
diff --git a/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml b/el_GR.ISO8859-7/books/handbook/x11/chapter.xml
similarity index 99%
rename from el_GR.ISO8859-7/books/handbook/x11/chapter.sgml
rename to el_GR.ISO8859-7/books/handbook/x11/chapter.xml
index f5e07f7f9d..d709336dd8 100644
--- a/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml
+++ b/el_GR.ISO8859-7/books/handbook/x11/chapter.xml
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%      en_US.ISO8859-1/books/handbook/x11/chapter.sgml
+  %SOURCE%      en_US.ISO8859-1/books/handbook/x11/chapter.xml
   %SRCID%       39176
 
 -->
diff --git a/el_GR.ISO8859-7/htdocs/about.sgml b/el_GR.ISO8859-7/htdocs/about.xml
similarity index 99%
rename from el_GR.ISO8859-7/htdocs/about.sgml
rename to el_GR.ISO8859-7/htdocs/about.xml
index e5dd8957db..8475934a7c 100644
--- a/el_GR.ISO8859-7/htdocs/about.sgml
+++ b/el_GR.ISO8859-7/htdocs/about.xml
@@ -3,7 +3,7 @@
 <!ENTITY title "About FreeBSD">
 <!ENTITY % navinclude.about "INCLUDE">
 <!--
-  %SOURCE%	en/about.sgml
+  %SOURCE%	en/about.xml
   %SRCID%	1.14
 -->
 ]>
diff --git a/el_GR.ISO8859-7/htdocs/docs.sgml b/el_GR.ISO8859-7/htdocs/docs.xml
similarity index 95%
rename from el_GR.ISO8859-7/htdocs/docs.sgml
rename to el_GR.ISO8859-7/htdocs/docs.xml
index 30300af0dd..da3c38e8a0 100644
--- a/el_GR.ISO8859-7/htdocs/docs.sgml
+++ b/el_GR.ISO8859-7/htdocs/docs.xml
@@ -6,7 +6,7 @@
 
 <!--
 
-    %SOURCE%	en/docs.sgml
+    %SOURCE%	en/docs.xml
     %SRCID%	1.195
 
 -->
diff --git a/el_GR.ISO8859-7/share/sgml/glossary.ent b/el_GR.ISO8859-7/share/sgml/glossary.ent
index f75b684028..10a0fa2ff7 100644
--- a/el_GR.ISO8859-7/share/sgml/glossary.ent
+++ b/el_GR.ISO8859-7/share/sgml/glossary.ent
@@ -7,7 +7,7 @@
 
   $FreeBSD$
 
-  %SOURCE%	en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml
+  %SOURCE%	en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.xml
   %SRCID%	1.37
 
   �������� ��� FreeBSD.
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
similarity index 100%
rename from en_US.ISO8859-1/articles/bsdl-gpl/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/building-products/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/articles/committers-guide/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/compiz-fusion/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/console-server/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/contributing-ports/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/contributing/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/contributors/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/contributors/contrib.portmgralumni.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/cups/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/custom-gcc/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/cvs-freebsd/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/cvsup-advanced/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/explaining-bsd/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/filtering-bridges/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/fonts/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/freebsd-questions/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/freebsd-update-server/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/geom-class/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/gjournal-desktop/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/hubs/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/ipsec-must/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/laptop/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/ldap-auth/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/linux-comparison/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/linux-emulation/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/linux-users/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/mailing-list-faq/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/mh/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/nanobsd/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/new-users/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/p4-primer/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/pam/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/port-mentor-guidelines/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/portbuild/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/pr-guidelines/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/problem-reports/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/rc-scripting/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/relaydelay/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/releng-packages/article.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/articles/releng/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/remote-install/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/serial-uart/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/solid-state/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/vm-design/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/articles/wp-toolbox/article.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/book.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml
rename to 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
similarity index 91%
rename from en_US.ISO8859-1/books/bibliography/book.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/corp-net-guide/book.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/design-44bsd/book.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/dev-model/book.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/book.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/faq/book.sgml
rename to 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=  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.sgml
+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
similarity index 98%
rename from en_US.ISO8859-1/books/fdp-primer/book.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml
rename to 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
similarity index 98%
rename from en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml
rename to 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
similarity index 94%
rename from en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml
rename to 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
similarity index 97%
rename from en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/audit/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/basics/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/book.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/boot/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/colophon.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/books/handbook/config/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/disks/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/geom/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/install/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/jails/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/mac/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/mail/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/ports/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/preface/preface.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/printing/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/security/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/users/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/vinum/chapter.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/handbook/x11/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/pmake/answers/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/pmake/basics/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/pmake/book.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/pmake/glossary/glossary.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/pmake/gods/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/pmake/intro/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/pmake/legalnotice.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/books/porters-handbook/book.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/about.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/administration.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/advocacy/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/advocacy/myths.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/advocacy/whyusefreebsd.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/applications.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/art.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/availability.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/commercial/commercial.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/community/irc.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/community/mailinglists.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/community/newsgroups.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/community/social.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/community/webresources.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/copyright/copyright.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/copyright/daemon.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/copyright/freebsd-doc-license.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/copyright/freebsd-license.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/copyright/license.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/copyright/trademarks.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/developers/cvs.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/htdocs/docproj/current.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/docproj/doc-set.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/docproj/docproj.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/docproj/handbook.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/docproj/handbook3.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/docproj/sgml.sgml
rename to 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
similarity index 96%
rename from en_US.ISO8859-1/htdocs/docproj/submitting.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/docproj/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/docproj/translations.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/docproj/who.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/docs.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/docs/books.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/docs/webresources.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/donations/donors.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/donations/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/donations/wantlist.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/events/2002/bsdcon-devsummit.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/events/2002/usenix-devsummit.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/events/2003/bsdcon-devsummit.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/features.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/contact.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/bugging.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/develfaq.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/example-Makefile.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq2.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq210.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq212.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq214.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq216.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq218.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq220.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq222.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq224.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq226.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq228.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq230.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq232.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/faq28.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/gnome1_porting.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/gnome2_porting.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/gnome_porting.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/halfaq.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/porting.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/docs/volunteer.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/gnome/screenshots.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/about.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/bylaws.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/core-vote.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/data.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/developer.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/doceng.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/expire-bits.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/fortunes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/hats.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/homepage.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/i18n.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/internal.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/machines.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/mirror.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/new-account.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/policies.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/releng.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/resources.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/statistic.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internal/working-with-hats.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/internet.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/ipv6/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/ipv6/ipv6only.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/ipv6/w6d-www-stats.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/ipv6/w6d.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/ipv6/w6l.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/advocacy.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/dists/15.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/dists/16.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/dists/17.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/dists/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/docs/faq.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/docs/howtoports.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/docs/newbies.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/docs/performance.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/docs/tutorials.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/howhelp.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/install.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/links/api.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/links/development.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/links/documentation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/links/freebsd.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/links/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/links/resources.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/links/servlets.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/links/tools.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/links/tutorials.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/java/links/vendor.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/logo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/mailto.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/marketing/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/1993/freebsd-coined.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/1996/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/1997/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/1998/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/1999/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/2000/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/news.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/press-rel-1.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/press-rel-2.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/press-rel-3.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/press-rel-4.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/press-rel-5.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/press-rel-6.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/press-rel-7.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/press-rel-8.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/press-rel-9.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/pressreleases.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/sou1999.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/news/status/status.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/alpha.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/amd64.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/arm.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/i386.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/ia64.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/ia64/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/ia64/machines.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/ia64/refs.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/ia64/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/mips.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/pc98.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/ppc.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/sparc.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/sun4v.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/x86-64.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/platforms/xbox.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/portmgr/charter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/portmgr/implementation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/portmgr/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/portmgr/policies.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/portmgr/policies_committing.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/portmgr/policies_contributors.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/portmgr/policies_eol.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/portmgr/qa.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/ports/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/ports/installing.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/ports/references.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/ports/searching.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/ports/updating.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/privacy.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/acpi/completed.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/acpi/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/bigdisk/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/busdma/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/c99/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/cvsweb.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/mac/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/mips/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/netperf/cluster.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/netperf/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/newbies.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/projects.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/summerofcode-2005.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/summerofcode-2006.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/summerofcode-2007.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/summerofcode-2008.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/projects/summerofcode.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/prstats/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/publish.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.0.5R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.0.5R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.0/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.0/credits.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.0/install.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.0/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.1.5R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.1.5R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.1.6R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.1.6R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.1.6R/security.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.1.7R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.1.7R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.1R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.1R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.1R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.2R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.2R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.5R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.5R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.5R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.6R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.6R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.6R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.7R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.7R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.7R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.8R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.8R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2.8R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2R/install-media.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/2.2R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.0R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.0R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.0R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.1R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.1R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.1R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.2R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.2R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.2R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.3R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.3R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.3R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.4R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.4R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.4R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.5R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.5R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/3.5R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.0R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.0R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.0R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.1.1R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.1.1R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.1.1R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.10R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.10R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.10R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.10R/qa.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.10R/relnotes.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/htdocs/releases/4.10R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.10R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.11R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.11R/errata_policy.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.11R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.11R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.11R/relnotes.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/htdocs/releases/4.11R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.11R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.1R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.1R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.1R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.2R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.2R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.2R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.3R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.3R/errata.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.3R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.4R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.4R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.4R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.5R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.5R/contents.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.5R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.5R/notes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.5R/qa.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.5R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.6.2R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.6.2R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.6.2R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.6R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.6R/contents.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.6R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.6R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.6R/qa.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.6R/relnotes.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/htdocs/releases/4.6R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.7R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.7R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.7R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.7R/qa.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.7R/relnotes.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/htdocs/releases/4.7R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.8R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.8R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.8R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.8R/qa.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.8R/relnotes.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/htdocs/releases/4.8R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.9R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.9R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.9R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.9R/qa.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.9R/relnotes.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/htdocs/releases/4.9R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/4.9R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/DP1/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/DP1/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/DP1/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/DP1/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/DP2/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/DP2/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/DP2/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/DP2/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.0R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.1R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.1R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.1R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.1R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.1R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.1R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.2.1R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.2.1R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.2.1R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.2.1R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.2R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.2R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.2R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.2R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.2R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.2R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.3R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.3R/errata_policy.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.3R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.3R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.3R/policy.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.3R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.3R/schedule.sgml
rename to 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
similarity index 97%
rename from en_US.ISO8859-1/htdocs/releases/5.3R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.4R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.4R/errata_policy.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.4R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.4R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.4R/relnotes.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/htdocs/releases/5.4R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.4R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.5R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.5R/approvals.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.5R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.5R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.5R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.5R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/5.5R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.0R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.0R/approvals.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.0R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.0R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.0R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.0R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.0R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.1R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.1R/approvals.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.1R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.1R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.1R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.1R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.1R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.2R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.2R/approvals.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.2R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.2R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.2R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.2R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.2R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.3R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.3R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.3R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.3R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.3R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.4R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.4R/hardware.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.4R/installation.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.4R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/6.4R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.0R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.0R/approvals.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.0R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.0R/todo.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.1R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.1R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.2R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.2R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.2R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.2R/status.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.3R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.3R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.3R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.4R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/7.4R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.0R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.0R/pressrelease.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.0R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.0R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.1R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.1R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.1R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.2R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.2R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.2R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.3R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.3R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/8.3R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/9.0R/announce.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/9.0R/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/9.0R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/9.1R/schedule.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releases/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releng/charter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releng/dst_info.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/releng/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/relnotes.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/search/opensearch/opensearch.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/search/search-mid.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/search/search.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/search/searchhints.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/security/advisories.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/security/charter.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/security/notices.sgml
rename to 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
similarity index 99%
rename from en_US.ISO8859-1/htdocs/security/security.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/send-pr.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/snapshots/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/support.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/support/bugreports.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/support/webresources.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/tutorials/index.sgml
rename to 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
similarity index 100%
rename from en_US.ISO8859-1/htdocs/where.sgml
rename to en_US.ISO8859-1/htdocs/where.xml
diff --git a/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile b/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile
index 75c2096eb4..5f6cb07291 100644
--- a/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile
+++ b/es_ES.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/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml b/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml
rename to es_ES.ISO8859-1/articles/casestudy-argentina.com/article.xml
diff --git a/es_ES.ISO8859-1/articles/contributing/Makefile b/es_ES.ISO8859-1/articles/contributing/Makefile
index 7dda35ae7c..ec117499a7 100644
--- a/es_ES.ISO8859-1/articles/contributing/Makefile
+++ b/es_ES.ISO8859-1/articles/contributing/Makefile
@@ -9,7 +9,7 @@ INSTALL_ONLY_COMPRESSED?=
 
 WITH_ARTICLE_TOC?=YES
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/es_ES.ISO8859-1/articles/contributing/article.sgml b/es_ES.ISO8859-1/articles/contributing/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/contributing/article.sgml
rename to es_ES.ISO8859-1/articles/contributing/article.xml
diff --git a/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile b/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile
index 2c30891dff..f8d326bd94 100644
--- a/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile
+++ b/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile
@@ -17,7 +17,7 @@ INSTALL_ONLY_COMPRESSED?=
 WITH_ARTICLE_TOC?=YES
 
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml b/es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml
rename to es_ES.ISO8859-1/articles/cvs-freebsd/article.xml
diff --git a/es_ES.ISO8859-1/articles/explaining-bsd/Makefile b/es_ES.ISO8859-1/articles/explaining-bsd/Makefile
index 810908a285..de52273f00 100644
--- a/es_ES.ISO8859-1/articles/explaining-bsd/Makefile
+++ b/es_ES.ISO8859-1/articles/explaining-bsd/Makefile
@@ -19,7 +19,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  article.sgml
+SRCS=  article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml b/es_ES.ISO8859-1/articles/explaining-bsd/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/explaining-bsd/article.sgml
rename to es_ES.ISO8859-1/articles/explaining-bsd/article.xml
diff --git a/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile b/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile
index a6a26740a4..849ccd3ff9 100644
--- a/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile
+++ b/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile
@@ -16,7 +16,7 @@ INSTALL_ONLY_COMPRESSED?=
 WITH_ARTICLE_TOC?=YES
 
 # SGML content
-SRCS= article.sgml fase_1.sh fase_2.sh fase_3.mk
+SRCS= article.xml fase_1.sh fase_2.sh fase_3.mk
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml
rename to es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
diff --git a/es_ES.ISO8859-1/articles/fdp-es/Makefile b/es_ES.ISO8859-1/articles/fdp-es/Makefile
index 4e3b2f6ba9..5124abf4e5 100644
--- a/es_ES.ISO8859-1/articles/fdp-es/Makefile
+++ b/es_ES.ISO8859-1/articles/fdp-es/Makefile
@@ -11,7 +11,7 @@ INSTALL_ONLY_COMPRESSED?=
 
 WITH_ARTICLE_TOC?=YES
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/es_ES.ISO8859-1/articles/fdp-es/article.sgml b/es_ES.ISO8859-1/articles/fdp-es/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/fdp-es/article.sgml
rename to es_ES.ISO8859-1/articles/fdp-es/article.xml
diff --git a/es_ES.ISO8859-1/articles/laptop/Makefile b/es_ES.ISO8859-1/articles/laptop/Makefile
index 9fa0dd9c5f..e34649040b 100644
--- a/es_ES.ISO8859-1/articles/laptop/Makefile
+++ b/es_ES.ISO8859-1/articles/laptop/Makefile
@@ -15,7 +15,7 @@ INSTALL_ONLY_COMPRESSED?=
 WITH_ARTICLE_TOC?=YES
 
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/es_ES.ISO8859-1/articles/laptop/article.sgml b/es_ES.ISO8859-1/articles/laptop/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/laptop/article.sgml
rename to es_ES.ISO8859-1/articles/laptop/article.xml
diff --git a/es_ES.ISO8859-1/articles/linux-comparison/Makefile b/es_ES.ISO8859-1/articles/linux-comparison/Makefile
index 060f686cb9..eed69d5078 100644
--- a/es_ES.ISO8859-1/articles/linux-comparison/Makefile
+++ b/es_ES.ISO8859-1/articles/linux-comparison/Makefile
@@ -8,7 +8,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/es_ES.ISO8859-1/articles/linux-comparison/article.sgml b/es_ES.ISO8859-1/articles/linux-comparison/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/linux-comparison/article.sgml
rename to es_ES.ISO8859-1/articles/linux-comparison/article.xml
diff --git a/es_ES.ISO8859-1/articles/linux-users/Makefile b/es_ES.ISO8859-1/articles/linux-users/Makefile
index 4c0ac44d24..fbe7e3f17c 100644
--- a/es_ES.ISO8859-1/articles/linux-users/Makefile
+++ b/es_ES.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/es_ES.ISO8859-1/articles/linux-users/article.sgml b/es_ES.ISO8859-1/articles/linux-users/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/linux-users/article.sgml
rename to es_ES.ISO8859-1/articles/linux-users/article.xml
diff --git a/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile b/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile
index c3aa17a953..8ccd93beec 100644
--- a/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile
+++ b/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile
@@ -20,7 +20,7 @@ WITH_ARTICLE_TOC?=YES
 #
 
 # SGML content
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml b/es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml
rename to es_ES.ISO8859-1/articles/mailing-list-faq/article.xml
diff --git a/es_ES.ISO8859-1/articles/nanobsd/Makefile b/es_ES.ISO8859-1/articles/nanobsd/Makefile
index 1b3baa6fe3..c250f8c418 100644
--- a/es_ES.ISO8859-1/articles/nanobsd/Makefile
+++ b/es_ES.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/es_ES.ISO8859-1/articles/nanobsd/article.sgml b/es_ES.ISO8859-1/articles/nanobsd/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/nanobsd/article.sgml
rename to es_ES.ISO8859-1/articles/nanobsd/article.xml
diff --git a/es_ES.ISO8859-1/articles/p4-primer/Makefile b/es_ES.ISO8859-1/articles/p4-primer/Makefile
index 2c861f93e8..15910929c6 100644
--- a/es_ES.ISO8859-1/articles/p4-primer/Makefile
+++ b/es_ES.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/es_ES.ISO8859-1/articles/p4-primer/article.sgml b/es_ES.ISO8859-1/articles/p4-primer/article.xml
similarity index 100%
rename from es_ES.ISO8859-1/articles/p4-primer/article.sgml
rename to es_ES.ISO8859-1/articles/p4-primer/article.xml
diff --git a/es_ES.ISO8859-1/articles/problem-reports/Makefile b/es_ES.ISO8859-1/articles/problem-reports/Makefile
index b7104e0cf9..d6ba6fce80 100644
--- a/es_ES.ISO8859-1/articles/problem-reports/Makefile
+++ b/es_ES.ISO8859-1/articles/problem-reports/Makefile
@@ -12,7 +12,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/es_ES.ISO8859-1/articles/problem-reports/article.sgml b/es_ES.ISO8859-1/articles/problem-reports/article.xml
similarity index 99%
rename from es_ES.ISO8859-1/articles/problem-reports/article.sgml
rename to es_ES.ISO8859-1/articles/problem-reports/article.xml
index d8db59a86f..e095ba4731 100644
--- a/es_ES.ISO8859-1/articles/problem-reports/article.sgml
+++ b/es_ES.ISO8859-1/articles/problem-reports/article.xml
@@ -11,7 +11,7 @@
 
     <pubdate>$FreeBSD$</pubdate>
 <!--
-$FreeBSDes: doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml,v 1.2 2004/10/09 01:56:32 jesusr Exp $
+$FreeBSDes: doc/es_ES.ISO8859-1/articles/problem-reports/article.xml,v 1.2 2004/10/09 01:56:32 jesusr Exp $
 -->
 
     <legalnotice id="trademarks" role="trademarks">
diff --git a/es_ES.ISO8859-1/articles/releng/Makefile b/es_ES.ISO8859-1/articles/releng/Makefile
index 153cfaec4a..39cf4b849a 100644
--- a/es_ES.ISO8859-1/articles/releng/Makefile
+++ b/es_ES.ISO8859-1/articles/releng/Makefile
@@ -13,7 +13,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/es_ES.ISO8859-1/articles/releng/article.sgml b/es_ES.ISO8859-1/articles/releng/article.xml
similarity index 99%
rename from es_ES.ISO8859-1/articles/releng/article.sgml
rename to es_ES.ISO8859-1/articles/releng/article.xml
index b1262b3574..606545580a 100644
--- a/es_ES.ISO8859-1/articles/releng/article.sgml
+++ b/es_ES.ISO8859-1/articles/releng/article.xml
@@ -335,12 +335,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>
 
@@ -393,7 +393,7 @@
         </listitem>
 
         <listitem>
-          <para><filename>www/en/docs.sgml</filename></para>
+          <para><filename>www/en/docs.xml</filename></para>
         </listitem>
 
         <listitem>
@@ -413,12 +413,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>
@@ -436,7 +436,7 @@
 
       <itemizedlist>
         <listitem>
-          <para><filename>www/share/sgml/includes.release.sgml</filename></para>
+          <para><filename>www/share/sgml/includes.release.xml</filename></para>
         </listitem>
 
         <listitem>
@@ -448,7 +448,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/es_ES.ISO8859-1/books/faq/Makefile b/es_ES.ISO8859-1/books/faq/Makefile
index 93631057e5..9785978664 100644
--- a/es_ES.ISO8859-1/books/faq/Makefile
+++ b/es_ES.ISO8859-1/books/faq/Makefile
@@ -19,7 +19,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/es_ES.ISO8859-1/books/faq/book.sgml b/es_ES.ISO8859-1/books/faq/book.xml
similarity index 100%
rename from es_ES.ISO8859-1/books/faq/book.sgml
rename to es_ES.ISO8859-1/books/faq/book.xml
diff --git a/es_ES.ISO8859-1/books/handbook/Makefile b/es_ES.ISO8859-1/books/handbook/Makefile
index 4220ee5bee..397a8d5803 100755
--- a/es_ES.ISO8859-1/books/handbook/Makefile
+++ b/es_ES.ISO8859-1/books/handbook/Makefile
@@ -22,7 +22,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
@@ -156,42 +156,42 @@ IMAGES_LIB+= callouts/10.png
 #
 
 # SGML content
-SRCS+= audit/chapter.sgml
-SRCS+=  book.sgml
-SRCS+= colophon.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+= 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+= colophon.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+= 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
@@ -199,11 +199,11 @@ 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./}
 
-pgpkeyring: pgpkeys/chapter.sgml
+pgpkeyring: pgpkeys/chapter.xml
 	@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 47008c88bc..a8e054b92f 100755
--- a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -4,12 +4,12 @@
 
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
      %SRCID%    0.0
 
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.3 2004/08/26 10:03:24 carvay Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml,v 1.3 2004/08/26 10:03:24 carvay Exp $
 -->
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/audit/chapter.sgml b/es_ES.ISO8859-1/books/handbook/audit/chapter.xml
similarity index 94%
rename from es_ES.ISO8859-1/books/handbook/audit/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/audit/chapter.xml
index ecbd73ea01..40721a2b72 100644
--- a/es_ES.ISO8859-1/books/handbook/audit/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/audit/chapter.xml
@@ -8,7 +8,7 @@
 
 
      The FreeBSD Spanish Documentation Project
-       %SOURCE% en_US.ISO8859-1/books/handbook/audit/chapter.sgml
+       %SOURCE% en_US.ISO8859-1/books/handbook/audit/chapter.xml
        %SRCID%    0.0
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/basics/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/basics/chapter.xml
index 49b20b2486..cc0e7bf93c 100755
--- a/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/basics/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/basics/chapter.xml
      %SRCID%    1.154
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml b/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
index 470cc4e74e..adcaf1ef07 100755
--- a/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/bibliography/chapter.xml
@@ -5,7 +5,7 @@
 
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
      %SRCID%    0.0
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/book.sgml b/es_ES.ISO8859-1/books/handbook/book.xml
similarity index 98%
rename from es_ES.ISO8859-1/books/handbook/book.sgml
rename to es_ES.ISO8859-1/books/handbook/book.xml
index 1dec63991e..2ebb688abf 100755
--- a/es_ES.ISO8859-1/books/handbook/book.sgml
+++ b/es_ES.ISO8859-1/books/handbook/book.xml
@@ -15,11 +15,11 @@
 
 
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/book.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/book.xml
      %SRCID%    1.173
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/book.sgml,v 1.7 2004/10/08 22:36:39 jesusr Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/book.xml,v 1.7 2004/10/08 22:36:39 jesusr Exp $
 -->
 
 <book lang="es">
diff --git a/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml b/es_ES.ISO8859-1/books/handbook/boot/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/boot/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/boot/chapter.xml
index e541f60de4..c30266dbcb 100644
--- a/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/boot/chapter.xml
@@ -4,11 +4,11 @@
 
      The FreeBSD Spanish Documentation Project
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/boot/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/boot/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.3 2004/10/08 18:39:51 jesusr Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/boot/chapter.xml,v 1.3 2004/10/08 18:39:51 jesusr Exp $
 -->
 
 <chapter id="boot">
diff --git a/es_ES.ISO8859-1/books/handbook/chapters.ent b/es_ES.ISO8859-1/books/handbook/chapters.ent
index a4a3fbfdf6..fab3b141f3 100755
--- a/es_ES.ISO8859-1/books/handbook/chapters.ent
+++ b/es_ES.ISO8859-1/books/handbook/chapters.ent
@@ -9,7 +9,7 @@
      FreeBSD. Cada entidad es nombrada como chap.foo, donde foo es el
      atributo identificador en ese cap�tulo y corresponde al
      nombre del directorio en el que est� guardado el archivo
-     .sgml que contiene la informaci�n.
+     .xml que contiene la informaci�n.
 
      Chapters should be listed in the order in which they are referenced.
      Los cap�tulos deben listarse en el mismo orden en el que son
@@ -61,140 +61,140 @@
 <!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.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/es_ES.ISO8859-1/books/handbook/colophon.sgml b/es_ES.ISO8859-1/books/handbook/colophon.xml
similarity index 84%
rename from es_ES.ISO8859-1/books/handbook/colophon.sgml
rename to es_ES.ISO8859-1/books/handbook/colophon.xml
index ef9c5b0802..757be7a2dd 100644
--- a/es_ES.ISO8859-1/books/handbook/colophon.sgml
+++ b/es_ES.ISO8859-1/books/handbook/colophon.xml
@@ -3,12 +3,12 @@
      The FreeBSD Documentation Project
 
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/colophon/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/colophon/chapter.xml
      %SRCID%    0.0
 
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/colophon.sgml,v 1.2 2004/10/08 21:21:21 jesusr Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/colophon.xml,v 1.2 2004/10/08 21:21:21 jesusr Exp $
 -->
 
 <colophon id='colophon'>
diff --git a/es_ES.ISO8859-1/books/handbook/config/chapter.sgml b/es_ES.ISO8859-1/books/handbook/config/chapter.xml
similarity index 89%
rename from es_ES.ISO8859-1/books/handbook/config/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/config/chapter.xml
index 277630573d..bdf9fce3a7 100644
--- a/es_ES.ISO8859-1/books/handbook/config/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/config/chapter.xml
@@ -5,13 +5,13 @@
 
           The FreeBSD Spanish Documentation Project
 
-	  %SOURCE% en_US.ISO8859-1/books/handbook/config/chapter.sgml
+	  %SOURCE% en_US.ISO8859-1/books/handbook/config/chapter.xml
 	  %SRCID%    0.0
 
 
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml,v 1.1 2004/08/25 18:49:07 carvay Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/config/chapter.xml,v 1.1 2004/08/25 18:49:07 carvay Exp $
 -->
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 20aee1367e..f4f13fc3a0 100755
--- a/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -4,7 +4,7 @@
 
      The FreeBSD Spanish Documentation Project
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
      %SRCID%    0.0
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml b/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
index bc3521883b..da24efcfd7 100644
--- a/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -4,7 +4,7 @@
 
      The FreeBSD Spanish Documentation Project
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.xml
      %SRCID%    1.78
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml b/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/disks/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/disks/chapter.xml
index 22c27343d6..797e418fdb 100644
--- a/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/disks/chapter.xml
@@ -4,7 +4,7 @@
 
      The FreeBSD Spanish Documentation Project
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/disks/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml b/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
index 559576eb1b..ed00cd1f37 100755
--- a/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/eresources/chapter.xml
@@ -4,7 +4,7 @@
 
      The FreeBSD Spanish Documentation Project
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/firewalls/Makefile b/es_ES.ISO8859-1/books/handbook/firewalls/Makefile
index 331f5bf8ec..9320a51f68 100644
--- a/es_ES.ISO8859-1/books/handbook/firewalls/Makefile
+++ b/es_ES.ISO8859-1/books/handbook/firewalls/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	firewalls/chapter.sgml
+CHAPTERS= 	firewalls/chapter.xml
 
 VPATH=		..
 
diff --git a/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml b/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
similarity index 93%
rename from es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
index 24e716ccae..27b273129a 100644
--- a/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -5,7 +5,7 @@
 
      The FreeBSD Spanish Documentation Project
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
      %SRCID%    0.0
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/geom/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/geom/chapter.xml
index b8d7a64bc0..3a3a17c509 100644
--- a/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
@@ -5,7 +5,7 @@
      The FreeBSD Spanish Documentation Project
 
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/geom/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/geom/chapter.xml
      %SRCID%    1.15
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/install/chapter.sgml b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/install/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/install/chapter.xml
index b337c87b13..9561c329e2 100755
--- a/es_ES.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
@@ -6,12 +6,12 @@
      The FreeBSD Spanish Documentation Project
 
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/install/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/install/chapter.xml
      %SRCID%    1.390
 
 
 $FreeBSD$
-$FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml,v 1.5 2004/10/08 18:48:47 jesusr Exp $
+$FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/install/chapter.xml,v 1.5 2004/10/08 18:48:47 jesusr Exp $
 
 
 -->
diff --git a/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml b/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
index 5f2564bf4f..f7c37db1e5 100755
--- a/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -4,7 +4,7 @@
 
      The FreeBSD Spanish Documentation Project
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.xml
      %SRCID%    1.126
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/jails/chapter.sgml b/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/jails/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/jails/chapter.xml
index 1aaf3c32cb..3ca141ef23 100644
--- a/es_ES.ISO8859-1/books/handbook/jails/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/jails/chapter.xml
@@ -4,7 +4,7 @@
 
      The FreeBSD Spanish Documentation Project
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/jails/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/jails/chapter.xml
      %SRCID%    1.14
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 7b8f12ab22..e6c565ac1f 100755
--- a/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -4,12 +4,12 @@
 
      The FreeBSD Spanish Documentation Project
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
      %SRCID%    1.186
 
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml,v 1.2 2004/10/08 22:14:25 jesusr Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.xml,v 1.2 2004/10/08 22:14:25 jesusr Exp $
 -->
 
 <chapter id="kernelconfig">
diff --git a/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml b/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
index a66d25682c..8eb69d1a3d 100755
--- a/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -4,7 +4,7 @@
 
      The FreeBSD Spanish Documentation Project
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/l10n/chapter.xml
      %SRCID%    1.115
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml b/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
index c0cec68590..29f119cd53 100755
--- a/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -5,7 +5,7 @@
 
      The FreeBSD Spanish Documentation Project
 
-     %SOURCE% en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
      %SRCID%    1.136
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml b/es_ES.ISO8859-1/books/handbook/mac/chapter.xml
similarity index 95%
rename from es_ES.ISO8859-1/books/handbook/mac/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/mac/chapter.xml
index 7a2c70b597..bf520959eb 100644
--- a/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/mac/chapter.xml
@@ -4,7 +4,7 @@
 
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/mac/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/mac/chapter.xml
      %SRCID%    0.0
 
 
@@ -14,7 +14,7 @@
 
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE%	en_US.ISO8859-1/books/handbook/mac/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/mac/chapter.xml
      %SRCID%	0.0
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/mail/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/mail/chapter.xml
index 81a33b8219..972aca5bcf 100755
--- a/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
@@ -3,11 +3,11 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/mail/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml,v 1.2 2004/07/29 15:31:44 carvay Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/mail/chapter.xml,v 1.2 2004/07/29 15:31:44 carvay Exp $
 -->
 
 <chapter id="mail">
diff --git a/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml b/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
similarity index 88%
rename from es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
index 91554edb96..95d76fe814 100755
--- a/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -3,11 +3,11 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.2 2004/08/25 18:38:41 carvay Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.xml,v 1.2 2004/08/25 18:38:41 carvay Exp $
 -->
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml b/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
index 15b227aca5..36d7389b18 100644
--- a/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/multimedia/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
      %SRCID%    1.130
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/network-servers/chapter.sgml b/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
similarity index 98%
rename from es_ES.ISO8859-1/books/handbook/network-servers/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
index 0ff9081f78..a1f505b2c2 100644
--- a/es_ES.ISO8859-1/books/handbook/network-servers/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
index 449a3109b8..a67436d033 100755
--- a/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml
@@ -3,11 +3,11 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml,v 1.2 2004/10/08 19:17:35 jesusr Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.xml,v 1.2 2004/10/08 19:17:35 jesusr Exp $
 -->
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml b/es_ES.ISO8859-1/books/handbook/ports/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/ports/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/ports/chapter.xml
index db343b9474..bb5822a5d4 100755
--- a/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/ports/chapter.xml
@@ -3,11 +3,11 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.xml
      %SRCID%    1.284
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.2 2004/10/08 21:26:03 jesusr Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/ports/chapter.xml,v 1.2 2004/10/08 21:26:03 jesusr Exp $
 -->
 
 
diff --git a/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
index 47589ddb5b..f382b7cf30 100755
--- a/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/preface/preface.sgml b/es_ES.ISO8859-1/books/handbook/preface/preface.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/preface/preface.sgml
rename to es_ES.ISO8859-1/books/handbook/preface/preface.xml
index 97082a4210..19ecae79f7 100644
--- a/es_ES.ISO8859-1/books/handbook/preface/preface.sgml
+++ b/es_ES.ISO8859-1/books/handbook/preface/preface.xml
@@ -4,7 +4,7 @@
 
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/preface/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/preface/chapter.xml
      %SRCID%    1.39
 
 -->
diff --git a/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml b/es_ES.ISO8859-1/books/handbook/printing/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/printing/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/printing/chapter.xml
index ad22335034..c1c19adca6 100755
--- a/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/printing/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/printing/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/printing/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/security/chapter.sgml b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/security/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/security/chapter.xml
index 9e287dd0d9..d70d2a0398 100755
--- a/es_ES.ISO8859-1/books/handbook/security/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/security/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/security/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml b/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
index c8119564b1..e4ede53d79 100755
--- a/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -3,11 +3,11 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml,v 1.4 2004/10/08 19:06:36 jesusr Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.xml,v 1.4 2004/10/08 19:06:36 jesusr Exp $
 -->
 
 <chapter id="serialcomms">
diff --git a/es_ES.ISO8859-1/books/handbook/users/chapter.sgml b/es_ES.ISO8859-1/books/handbook/users/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/users/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/users/chapter.xml
index 3b3656be5a..7f231264e3 100644
--- a/es_ES.ISO8859-1/books/handbook/users/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/users/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/users/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/users/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
similarity index 97%
rename from es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
index 5939e1e753..5873bc6cf0 100644
--- a/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -2,7 +2,7 @@
 <!--
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/vinum/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/vinum/chapter.xml
      %SRCID%    0.0
 
 	The Vinum Volume Manager
@@ -13,7 +13,7 @@
 
 	para el FreeBSD Documentation Project
 	$FreeBSD$
-	$FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml,v 1.2 2004/08/25 18:35:22 carvay Exp $
+	$FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml,v 1.2 2004/08/25 18:35:22 carvay Exp $
 -->
 
 <chapter id="vinum-vinum">
diff --git a/es_ES.ISO8859-1/books/handbook/virtualization/chapter.sgml b/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
similarity index 98%
rename from es_ES.ISO8859-1/books/handbook/virtualization/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
index 8dc1bbfc8b..5c4ba92666 100644
--- a/es_ES.ISO8859-1/books/handbook/virtualization/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
      %SRCID%    0.0
 
      $FreeBSD$
diff --git a/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml b/es_ES.ISO8859-1/books/handbook/x11/chapter.xml
similarity index 99%
rename from es_ES.ISO8859-1/books/handbook/x11/chapter.sgml
rename to es_ES.ISO8859-1/books/handbook/x11/chapter.xml
index f73b3e90ea..8d881d66d2 100755
--- a/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml
+++ b/es_ES.ISO8859-1/books/handbook/x11/chapter.xml
@@ -3,11 +3,11 @@
      The FreeBSD Documentation Project
 
      The FreeBSD Spanish Documentation Project
-     %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml
+     %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.xml
      %SRCID%    1.190
 
      $FreeBSD$
-     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.5 2004/10/09 01:38:16 jesusr Exp $
+     $FreeBSDes: doc/es_ES.ISO8859-1/books/handbook/x11/chapter.xml,v 1.5 2004/10/09 01:38:16 jesusr Exp $
 -->
 
 <chapter id="x11">
diff --git a/es_ES.ISO8859-1/htdocs/Makefile b/es_ES.ISO8859-1/htdocs/Makefile
index ac0a403d6e..8295f22913 100644
--- a/es_ES.ISO8859-1/htdocs/Makefile
+++ b/es_ES.ISO8859-1/htdocs/Makefile
@@ -9,20 +9,20 @@
 
 # These are turned into validated, normalized HTML files.
 
-DOCS=  about.sgml
-DOCS+= applications.sgml
-DOCS+= availability.sgml
-DOCS+= community.sgml
-DOCS+= docs.sgml
-DOCS+= features.sgml
-DOCS+= internet.sgml
-DOCS+= mailto.sgml
-DOCS+= publish.sgml
-DOCS+= send-pr.sgml
-DOCS+= support.sgml
-DOCS+= where.sgml
+DOCS=  about.xml
+DOCS+= applications.xml
+DOCS+= availability.xml
+DOCS+= community.xml
+DOCS+= docs.xml
+DOCS+= features.xml
+DOCS+= internet.xml
+DOCS+= mailto.xml
+DOCS+= publish.xml
+DOCS+= send-pr.xml
+DOCS+= support.xml
+DOCS+= where.xml
 
-CLEANFILES+=atoz.sgml site.sgml
+CLEANFILES+=atoz.xml site.xml
 
 # Subdirectories
 # SGML
diff --git a/es_ES.ISO8859-1/htdocs/about.sgml b/es_ES.ISO8859-1/htdocs/about.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/about.sgml
rename to es_ES.ISO8859-1/htdocs/about.xml
diff --git a/es_ES.ISO8859-1/htdocs/applications.sgml b/es_ES.ISO8859-1/htdocs/applications.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/applications.sgml
rename to es_ES.ISO8859-1/htdocs/applications.xml
diff --git a/es_ES.ISO8859-1/htdocs/availability.sgml b/es_ES.ISO8859-1/htdocs/availability.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/availability.sgml
rename to es_ES.ISO8859-1/htdocs/availability.xml
diff --git a/es_ES.ISO8859-1/htdocs/community.sgml b/es_ES.ISO8859-1/htdocs/community.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/community.sgml
rename to es_ES.ISO8859-1/htdocs/community.xml
diff --git a/es_ES.ISO8859-1/htdocs/copyright/Makefile b/es_ES.ISO8859-1/htdocs/copyright/Makefile
index 497fc687ab..f839549da6 100644
--- a/es_ES.ISO8859-1/htdocs/copyright/Makefile
+++ b/es_ES.ISO8859-1/htdocs/copyright/Makefile
@@ -7,9 +7,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	freebsd-license.sgml
-DOCS+=	daemon.sgml
-DOCS+=	copyright.sgml
+DOCS=	freebsd-license.xml
+DOCS+=	daemon.xml
+DOCS+=	copyright.xml
 
 INDEXLINK= copyright.html
 
diff --git a/es_ES.ISO8859-1/htdocs/copyright/copyright.sgml b/es_ES.ISO8859-1/htdocs/copyright/copyright.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/copyright/copyright.sgml
rename to es_ES.ISO8859-1/htdocs/copyright/copyright.xml
diff --git a/es_ES.ISO8859-1/htdocs/copyright/daemon.sgml b/es_ES.ISO8859-1/htdocs/copyright/daemon.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/copyright/daemon.sgml
rename to es_ES.ISO8859-1/htdocs/copyright/daemon.xml
diff --git a/es_ES.ISO8859-1/htdocs/copyright/freebsd-license.sgml b/es_ES.ISO8859-1/htdocs/copyright/freebsd-license.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/copyright/freebsd-license.sgml
rename to es_ES.ISO8859-1/htdocs/copyright/freebsd-license.xml
diff --git a/es_ES.ISO8859-1/htdocs/docproj/Makefile b/es_ES.ISO8859-1/htdocs/docproj/Makefile
index 5205b915b6..4af0afcc94 100644
--- a/es_ES.ISO8859-1/htdocs/docproj/Makefile
+++ b/es_ES.ISO8859-1/htdocs/docproj/Makefile
@@ -7,13 +7,13 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   current.sgml
-DOCS+=	doc-set.sgml
-DOCS+=  sgml.sgml
-DOCS+=  submitting.sgml
-DOCS+=  who.sgml
-DOCS+=  translations.sgml
-DOCS+=	docproj.sgml
+DOCS=   current.xml
+DOCS+=	doc-set.xml
+DOCS+=  sgml.xml
+DOCS+=  submitting.xml
+DOCS+=  who.xml
+DOCS+=  translations.xml
+DOCS+=	docproj.xml
 
 INDEXLINK= docproj.html
 
diff --git a/es_ES.ISO8859-1/htdocs/docproj/current.sgml b/es_ES.ISO8859-1/htdocs/docproj/current.xml
similarity index 99%
rename from es_ES.ISO8859-1/htdocs/docproj/current.sgml
rename to es_ES.ISO8859-1/htdocs/docproj/current.xml
index 19a87ff1bc..1b323e40a4 100644
--- a/es_ES.ISO8859-1/htdocs/docproj/current.sgml
+++ b/es_ES.ISO8859-1/htdocs/docproj/current.xml
@@ -84,7 +84,7 @@
       atentamente el �ndice existente (print-output) y el
       Chicago Manual of Style u otro libro que trate sobre �ndices.
       Por favor, consulte en el hist�rico del CVS sobre los errores
-      ya corregidos de los ficheros chapter.sgml y el �ndice.
+      ya corregidos de los ficheros chapter.xml y el �ndice.
       Es imprescindible revisar la versi�n PostScript del Handbook
       despu�s de hacer cualquier cambio en "indexterm"; palabras
       demasiado largas o "indexterms" demasiado anidados pueden destruir
diff --git a/es_ES.ISO8859-1/htdocs/docproj/doc-set.sgml b/es_ES.ISO8859-1/htdocs/docproj/doc-set.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/docproj/doc-set.sgml
rename to es_ES.ISO8859-1/htdocs/docproj/doc-set.xml
diff --git a/es_ES.ISO8859-1/htdocs/docproj/docproj.sgml b/es_ES.ISO8859-1/htdocs/docproj/docproj.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/docproj/docproj.sgml
rename to es_ES.ISO8859-1/htdocs/docproj/docproj.xml
diff --git a/es_ES.ISO8859-1/htdocs/docproj/sgml.sgml b/es_ES.ISO8859-1/htdocs/docproj/sgml.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/docproj/sgml.sgml
rename to es_ES.ISO8859-1/htdocs/docproj/sgml.xml
diff --git a/es_ES.ISO8859-1/htdocs/docproj/submitting.sgml b/es_ES.ISO8859-1/htdocs/docproj/submitting.xml
similarity index 95%
rename from es_ES.ISO8859-1/htdocs/docproj/submitting.sgml
rename to es_ES.ISO8859-1/htdocs/docproj/submitting.xml
index ced6e7cda6..d5ae63797f 100644
--- a/es_ES.ISO8859-1/htdocs/docproj/submitting.sgml
+++ b/es_ES.ISO8859-1/htdocs/docproj/submitting.xml
@@ -101,16 +101,16 @@
 
     <ol>
       <li><p>Hacer una copia del fichero que vas a modificar. Si est�s
-          cambiando el fichero <tt>foo.sgml</tt>, haz</p>
+          cambiando el fichero <tt>foo.xml</tt>, haz</p>
 
 	<pre>
-    % <b>cp foo.sgml foo.sgml.old</b>
+    % <b>cp foo.xml foo.xml.old</b>
 	</pre></li>
 
-      <li><p>Entonces, haz los cambios en el fichero foo.sgml</p>
+      <li><p>Entonces, haz los cambios en el fichero foo.xml</p>
 
 	<pre>
-    % <b>vi foo.sgml</b>
+    % <b>vi foo.xml</b>
     ... tap tap tap ...
 
     ... testea los cambios, leelos y revisalos...
@@ -119,7 +119,7 @@
       <li><p>Haz el diff. El comando para hacerlo es</p>
 
 	<pre>
-    % <b>diff -c foo.sgml.old foo.sgml > foo.diff</b>
+    % <b>diff -c foo.xml.old foo.xml > foo.diff</b>
 	</pre>
 
         <p>Este comando buscar� las diferencias entre los dis ficheros
diff --git a/es_ES.ISO8859-1/htdocs/docproj/translations.sgml b/es_ES.ISO8859-1/htdocs/docproj/translations.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/docproj/translations.sgml
rename to es_ES.ISO8859-1/htdocs/docproj/translations.xml
diff --git a/es_ES.ISO8859-1/htdocs/docproj/who.sgml b/es_ES.ISO8859-1/htdocs/docproj/who.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/docproj/who.sgml
rename to es_ES.ISO8859-1/htdocs/docproj/who.xml
diff --git a/es_ES.ISO8859-1/htdocs/docs.sgml b/es_ES.ISO8859-1/htdocs/docs.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/docs.sgml
rename to es_ES.ISO8859-1/htdocs/docs.xml
diff --git a/es_ES.ISO8859-1/htdocs/features.sgml b/es_ES.ISO8859-1/htdocs/features.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/features.sgml
rename to es_ES.ISO8859-1/htdocs/features.xml
diff --git a/es_ES.ISO8859-1/htdocs/internal/Makefile b/es_ES.ISO8859-1/htdocs/internal/Makefile
index a5d38ecaba..4c3819a1f1 100644
--- a/es_ES.ISO8859-1/htdocs/internal/Makefile
+++ b/es_ES.ISO8859-1/htdocs/internal/Makefile
@@ -7,13 +7,13 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	photos.sgml
-DOCS+=	internal.sgml
-DOCS+= 	about.sgml
-DOCS+= 	machines.sgml
-DOCS+= 	mirror.sgml
-DOCS+=	statistic.sgml
-DOCS+=	developer.sgml
+DOCS=	photos.xml
+DOCS+=	internal.xml
+DOCS+= 	about.xml
+DOCS+= 	machines.xml
+DOCS+= 	mirror.xml
+DOCS+=	statistic.xml
+DOCS+=	developer.xml
 
 INDEXLINK=	internal.html
 
diff --git a/es_ES.ISO8859-1/htdocs/internal/about.sgml b/es_ES.ISO8859-1/htdocs/internal/about.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/internal/about.sgml
rename to es_ES.ISO8859-1/htdocs/internal/about.xml
diff --git a/es_ES.ISO8859-1/htdocs/internal/developer.sgml b/es_ES.ISO8859-1/htdocs/internal/developer.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/internal/developer.sgml
rename to es_ES.ISO8859-1/htdocs/internal/developer.xml
diff --git a/es_ES.ISO8859-1/htdocs/internal/homepage.sgml b/es_ES.ISO8859-1/htdocs/internal/homepage.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/internal/homepage.sgml
rename to es_ES.ISO8859-1/htdocs/internal/homepage.xml
diff --git a/es_ES.ISO8859-1/htdocs/internal/internal.sgml b/es_ES.ISO8859-1/htdocs/internal/internal.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/internal/internal.sgml
rename to es_ES.ISO8859-1/htdocs/internal/internal.xml
diff --git a/es_ES.ISO8859-1/htdocs/internal/machines.sgml b/es_ES.ISO8859-1/htdocs/internal/machines.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/internal/machines.sgml
rename to es_ES.ISO8859-1/htdocs/internal/machines.xml
diff --git a/es_ES.ISO8859-1/htdocs/internal/mirror.sgml b/es_ES.ISO8859-1/htdocs/internal/mirror.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/internal/mirror.sgml
rename to es_ES.ISO8859-1/htdocs/internal/mirror.xml
diff --git a/es_ES.ISO8859-1/htdocs/internal/photos.sgml b/es_ES.ISO8859-1/htdocs/internal/photos.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/internal/photos.sgml
rename to es_ES.ISO8859-1/htdocs/internal/photos.xml
diff --git a/es_ES.ISO8859-1/htdocs/internal/statistic.sgml b/es_ES.ISO8859-1/htdocs/internal/statistic.xml
similarity index 97%
rename from es_ES.ISO8859-1/htdocs/internal/statistic.sgml
rename to es_ES.ISO8859-1/htdocs/internal/statistic.xml
index 7b931616fc..938e71e862 100644
--- a/es_ES.ISO8859-1/htdocs/internal/statistic.sgml
+++ b/es_ES.ISO8859-1/htdocs/internal/statistic.xml
@@ -45,7 +45,7 @@
     http://www.freebsd.org/statistic/release_usage/images/</a>.
     </p>
 
-<!-- from ../projects/projects.sgml -->
+<!-- from ../projects/projects.xml -->
 <h2>El contador de FreeBSD</h2>
 
 
diff --git a/es_ES.ISO8859-1/htdocs/internet.sgml b/es_ES.ISO8859-1/htdocs/internet.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/internet.sgml
rename to es_ES.ISO8859-1/htdocs/internet.xml
diff --git a/es_ES.ISO8859-1/htdocs/mailto.sgml b/es_ES.ISO8859-1/htdocs/mailto.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/mailto.sgml
rename to es_ES.ISO8859-1/htdocs/mailto.xml
diff --git a/es_ES.ISO8859-1/htdocs/news/Makefile b/es_ES.ISO8859-1/htdocs/news/Makefile
index 72adbfe494..880730e9d4 100644
--- a/es_ES.ISO8859-1/htdocs/news/Makefile
+++ b/es_ES.ISO8859-1/htdocs/news/Makefile
@@ -7,15 +7,15 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+= press.sgml
-DOCS+= newsflash.sgml
-DOCS+= news.sgml
+DOCS+= press.xml
+DOCS+= newsflash.xml
+DOCS+= news.xml
 
 # press releases
-DOCS+= pressreleases.sgml
-DOCS+= press-rel-1.sgml
-DOCS+= press-rel-2.sgml
-DOCS+= press-rel-3.sgml
+DOCS+= pressreleases.xml
+DOCS+= press-rel-1.xml
+DOCS+= press-rel-2.xml
+DOCS+= press-rel-3.xml
 
 INDEXLINK= news.html
 
diff --git a/es_ES.ISO8859-1/htdocs/news/includes.sgml b/es_ES.ISO8859-1/htdocs/news/includes.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/news/includes.sgml
rename to es_ES.ISO8859-1/htdocs/news/includes.xml
diff --git a/es_ES.ISO8859-1/htdocs/news/news.sgml b/es_ES.ISO8859-1/htdocs/news/news.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/news/news.sgml
rename to es_ES.ISO8859-1/htdocs/news/news.xml
diff --git a/es_ES.ISO8859-1/htdocs/news/newsflash.sgml b/es_ES.ISO8859-1/htdocs/news/newsflash.xml
similarity index 99%
rename from es_ES.ISO8859-1/htdocs/news/newsflash.sgml
rename to es_ES.ISO8859-1/htdocs/news/newsflash.xml
index 35fe143958..03953c76c7 100644
--- a/es_ES.ISO8859-1/htdocs/news/newsflash.sgml
+++ b/es_ES.ISO8859-1/htdocs/news/newsflash.xml
@@ -2,7 +2,7 @@
 <!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 "FreeBSD News flash!">
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % newsincludes SYSTEM "includes.xml"> %newsincludes;
 ]>
 <!-- $FreeBSD$ -->
 
diff --git a/es_ES.ISO8859-1/htdocs/news/press-rel-1.sgml b/es_ES.ISO8859-1/htdocs/news/press-rel-1.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/news/press-rel-1.sgml
rename to es_ES.ISO8859-1/htdocs/news/press-rel-1.xml
diff --git a/es_ES.ISO8859-1/htdocs/news/press-rel-2.sgml b/es_ES.ISO8859-1/htdocs/news/press-rel-2.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/news/press-rel-2.sgml
rename to es_ES.ISO8859-1/htdocs/news/press-rel-2.xml
diff --git a/es_ES.ISO8859-1/htdocs/news/press-rel-3.sgml b/es_ES.ISO8859-1/htdocs/news/press-rel-3.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/news/press-rel-3.sgml
rename to es_ES.ISO8859-1/htdocs/news/press-rel-3.xml
diff --git a/es_ES.ISO8859-1/htdocs/news/press.sgml b/es_ES.ISO8859-1/htdocs/news/press.xml
similarity index 99%
rename from es_ES.ISO8859-1/htdocs/news/press.sgml
rename to es_ES.ISO8859-1/htdocs/news/press.xml
index 7a7590225f..b94b68b7cc 100644
--- a/es_ES.ISO8859-1/htdocs/news/press.sgml
+++ b/es_ES.ISO8859-1/htdocs/news/press.xml
@@ -2,7 +2,7 @@
 <!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 "FreeBSD en la Prensa">
-<!ENTITY % newsincludes SYSTEM "includes.sgml"> %newsincludes;
+<!ENTITY % newsincludes SYSTEM "includes.xml"> %newsincludes;
 ]>
 <!-- $FreeBSD$ -->
 
diff --git a/es_ES.ISO8859-1/htdocs/news/pressreleases.sgml b/es_ES.ISO8859-1/htdocs/news/pressreleases.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/news/pressreleases.sgml
rename to es_ES.ISO8859-1/htdocs/news/pressreleases.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/Makefile b/es_ES.ISO8859-1/htdocs/platforms/Makefile
index 4c2c2e0fd8..0258fa94ab 100644
--- a/es_ES.ISO8859-1/htdocs/platforms/Makefile
+++ b/es_ES.ISO8859-1/htdocs/platforms/Makefile
@@ -9,16 +9,16 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	alpha.sgml
-DOCS+=	arm.sgml
-DOCS+=	amd64.sgml
-DOCS+=	i386.sgml
-DOCS+=	index.sgml
-DOCS+=	mips.sgml
-DOCS+=	pc98.sgml
-DOCS+=	sparc.sgml
-DOCS+=	sun4v.sgml
-DOCS+=	xbox.sgml
+DOCS=	alpha.xml
+DOCS+=	arm.xml
+DOCS+=	amd64.xml
+DOCS+=	i386.xml
+DOCS+=	index.xml
+DOCS+=	mips.xml
+DOCS+=	pc98.xml
+DOCS+=	sparc.xml
+DOCS+=	sun4v.xml
+DOCS+=	xbox.xml
 
 SUBDIR=	ia64
 
diff --git a/es_ES.ISO8859-1/htdocs/platforms/alpha.sgml b/es_ES.ISO8859-1/htdocs/platforms/alpha.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/alpha.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/alpha.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/amd64.sgml b/es_ES.ISO8859-1/htdocs/platforms/amd64.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/amd64.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/amd64.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/arm.sgml b/es_ES.ISO8859-1/htdocs/platforms/arm.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/arm.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/arm.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/i386.sgml b/es_ES.ISO8859-1/htdocs/platforms/i386.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/i386.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/i386.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/ia64/Makefile b/es_ES.ISO8859-1/htdocs/platforms/ia64/Makefile
index 7f718ebf35..63e9c35654 100644
--- a/es_ES.ISO8859-1/htdocs/platforms/ia64/Makefile
+++ b/es_ES.ISO8859-1/htdocs/platforms/ia64/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml machines.sgml refs.sgml todo.sgml
+DOCS=	index.xml machines.xml refs.xml todo.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/es_ES.ISO8859-1/htdocs/platforms/ia64/index.sgml b/es_ES.ISO8859-1/htdocs/platforms/ia64/index.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/ia64/index.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/ia64/index.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/ia64/machines.sgml b/es_ES.ISO8859-1/htdocs/platforms/ia64/machines.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/ia64/machines.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/ia64/machines.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/ia64/refs.sgml b/es_ES.ISO8859-1/htdocs/platforms/ia64/refs.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/ia64/refs.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/ia64/refs.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/ia64/todo.sgml b/es_ES.ISO8859-1/htdocs/platforms/ia64/todo.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/ia64/todo.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/ia64/todo.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/index.sgml b/es_ES.ISO8859-1/htdocs/platforms/index.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/index.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/index.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/mips.sgml b/es_ES.ISO8859-1/htdocs/platforms/mips.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/mips.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/mips.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/pc98.sgml b/es_ES.ISO8859-1/htdocs/platforms/pc98.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/pc98.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/pc98.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/sparc.sgml b/es_ES.ISO8859-1/htdocs/platforms/sparc.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/sparc.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/sparc.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/sun4v.sgml b/es_ES.ISO8859-1/htdocs/platforms/sun4v.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/sun4v.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/sun4v.xml
diff --git a/es_ES.ISO8859-1/htdocs/platforms/xbox.sgml b/es_ES.ISO8859-1/htdocs/platforms/xbox.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/platforms/xbox.sgml
rename to es_ES.ISO8859-1/htdocs/platforms/xbox.xml
diff --git a/es_ES.ISO8859-1/htdocs/projects/Makefile b/es_ES.ISO8859-1/htdocs/projects/Makefile
index da976de28c..615df83187 100644
--- a/es_ES.ISO8859-1/htdocs/projects/Makefile
+++ b/es_ES.ISO8859-1/htdocs/projects/Makefile
@@ -7,8 +7,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	projects.sgml
-DOCS+=	newbies.sgml
+DOCS=	projects.xml
+DOCS+=	newbies.xml
 
 INDEXLINK= projects.html
 
diff --git a/es_ES.ISO8859-1/htdocs/projects/newbies.sgml b/es_ES.ISO8859-1/htdocs/projects/newbies.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/projects/newbies.sgml
rename to es_ES.ISO8859-1/htdocs/projects/newbies.xml
diff --git a/es_ES.ISO8859-1/htdocs/projects/projects.sgml b/es_ES.ISO8859-1/htdocs/projects/projects.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/projects/projects.sgml
rename to es_ES.ISO8859-1/htdocs/projects/projects.xml
diff --git a/es_ES.ISO8859-1/htdocs/publish.sgml b/es_ES.ISO8859-1/htdocs/publish.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/publish.sgml
rename to es_ES.ISO8859-1/htdocs/publish.xml
diff --git a/es_ES.ISO8859-1/htdocs/releases/Makefile b/es_ES.ISO8859-1/htdocs/releases/Makefile
index d884e3ca82..4d6bcbd33d 100644
--- a/es_ES.ISO8859-1/htdocs/releases/Makefile
+++ b/es_ES.ISO8859-1/htdocs/releases/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml snapshots.sgml
+DOCS?=	index.xml snapshots.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/es_ES.ISO8859-1/htdocs/releases/index.sgml b/es_ES.ISO8859-1/htdocs/releases/index.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/releases/index.sgml
rename to es_ES.ISO8859-1/htdocs/releases/index.xml
diff --git a/es_ES.ISO8859-1/htdocs/releases/snapshots.sgml b/es_ES.ISO8859-1/htdocs/releases/snapshots.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/releases/snapshots.sgml
rename to es_ES.ISO8859-1/htdocs/releases/snapshots.xml
diff --git a/es_ES.ISO8859-1/htdocs/search/Makefile b/es_ES.ISO8859-1/htdocs/search/Makefile
index 9b326c17cb..9e29c49fd9 100644
--- a/es_ES.ISO8859-1/htdocs/search/Makefile
+++ b/es_ES.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
 
 INDEXLINK=	search.html
 
diff --git a/es_ES.ISO8859-1/htdocs/search/search-mid.sgml b/es_ES.ISO8859-1/htdocs/search/search-mid.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/search/search-mid.sgml
rename to es_ES.ISO8859-1/htdocs/search/search-mid.xml
diff --git a/es_ES.ISO8859-1/htdocs/search/search.sgml b/es_ES.ISO8859-1/htdocs/search/search.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/search/search.sgml
rename to es_ES.ISO8859-1/htdocs/search/search.xml
diff --git a/es_ES.ISO8859-1/htdocs/search/searchhints.sgml b/es_ES.ISO8859-1/htdocs/search/searchhints.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/search/searchhints.sgml
rename to es_ES.ISO8859-1/htdocs/search/searchhints.xml
diff --git a/es_ES.ISO8859-1/htdocs/security/Makefile b/es_ES.ISO8859-1/htdocs/security/Makefile
index 476f34a92c..a70d5a5703 100644
--- a/es_ES.ISO8859-1/htdocs/security/Makefile
+++ b/es_ES.ISO8859-1/htdocs/security/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	security.sgml
+DOCS=	security.xml
 
 INDEXLINK= security.html
 
diff --git a/es_ES.ISO8859-1/htdocs/security/security.sgml b/es_ES.ISO8859-1/htdocs/security/security.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/security/security.sgml
rename to es_ES.ISO8859-1/htdocs/security/security.xml
diff --git a/es_ES.ISO8859-1/htdocs/send-pr.sgml b/es_ES.ISO8859-1/htdocs/send-pr.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/send-pr.sgml
rename to es_ES.ISO8859-1/htdocs/send-pr.xml
diff --git a/es_ES.ISO8859-1/htdocs/support.sgml b/es_ES.ISO8859-1/htdocs/support.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/support.sgml
rename to es_ES.ISO8859-1/htdocs/support.xml
diff --git a/es_ES.ISO8859-1/htdocs/where.sgml b/es_ES.ISO8859-1/htdocs/where.xml
similarity index 100%
rename from es_ES.ISO8859-1/htdocs/where.sgml
rename to es_ES.ISO8859-1/htdocs/where.xml
diff --git a/fr_FR.ISO8859-1/articles/building-products/Makefile b/fr_FR.ISO8859-1/articles/building-products/Makefile
index 7ca6b11b43..2513ec172a 100644
--- a/fr_FR.ISO8859-1/articles/building-products/Makefile
+++ b/fr_FR.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/fr_FR.ISO8859-1/articles/building-products/article.sgml b/fr_FR.ISO8859-1/articles/building-products/article.xml
similarity index 100%
rename from fr_FR.ISO8859-1/articles/building-products/article.sgml
rename to fr_FR.ISO8859-1/articles/building-products/article.xml
diff --git a/fr_FR.ISO8859-1/articles/committers-guide/Makefile b/fr_FR.ISO8859-1/articles/committers-guide/Makefile
index 72c1d9b8c9..c38fe0dba7 100644
--- a/fr_FR.ISO8859-1/articles/committers-guide/Makefile
+++ b/fr_FR.ISO8859-1/articles/committers-guide/Makefile
@@ -13,7 +13,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/committers-guide/article.sgml b/fr_FR.ISO8859-1/articles/committers-guide/article.xml
similarity index 100%
rename from fr_FR.ISO8859-1/articles/committers-guide/article.sgml
rename to fr_FR.ISO8859-1/articles/committers-guide/article.xml
diff --git a/fr_FR.ISO8859-1/articles/contributing-ports/Makefile b/fr_FR.ISO8859-1/articles/contributing-ports/Makefile
index d2b8aa3ceb..bc11e81810 100644
--- a/fr_FR.ISO8859-1/articles/contributing-ports/Makefile
+++ b/fr_FR.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/fr_FR.ISO8859-1/articles/contributing-ports/article.sgml b/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
similarity index 100%
rename from fr_FR.ISO8859-1/articles/contributing-ports/article.sgml
rename to fr_FR.ISO8859-1/articles/contributing-ports/article.xml
diff --git a/fr_FR.ISO8859-1/articles/contributing/Makefile b/fr_FR.ISO8859-1/articles/contributing/Makefile
index 92194c09ef..ba1bc8de29 100644
--- a/fr_FR.ISO8859-1/articles/contributing/Makefile
+++ b/fr_FR.ISO8859-1/articles/contributing/Makefile
@@ -15,7 +15,7 @@ INSTALL_ONLY_COMPRESSED?=
 
 JADEFLAGS+=	-V %generate-article-toc%
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/contributing/article.sgml b/fr_FR.ISO8859-1/articles/contributing/article.xml
similarity index 99%
rename from fr_FR.ISO8859-1/articles/contributing/article.sgml
rename to fr_FR.ISO8859-1/articles/contributing/article.xml
index cbaba185b6..596636e8fc 100644
--- a/fr_FR.ISO8859-1/articles/contributing/article.sgml
+++ b/fr_FR.ISO8859-1/articles/contributing/article.xml
@@ -11,7 +11,7 @@
       The FreeBSD French Documentation Project
 
       $FreeBSD$
-      $Id: article.sgml,v 1.8 2007-01-05 15:01:13 blackend Exp $
+      $Id: article.xml,v 1.8 2007-01-05 15:01:13 blackend Exp $
       Original revision: 1.497
 -->
 
diff --git a/fr_FR.ISO8859-1/articles/contributors/Makefile b/fr_FR.ISO8859-1/articles/contributors/Makefile
index 21447cb63e..ed9e5b1c3e 100644
--- a/fr_FR.ISO8859-1/articles/contributors/Makefile
+++ b/fr_FR.ISO8859-1/articles/contributors/Makefile
@@ -15,7 +15,7 @@ INSTALL_ONLY_COMPRESSED?=
 
 JADEFLAGS+=	-V %generate-article-toc%
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/contributors/article.sgml b/fr_FR.ISO8859-1/articles/contributors/article.xml
similarity index 99%
rename from fr_FR.ISO8859-1/articles/contributors/article.sgml
rename to fr_FR.ISO8859-1/articles/contributors/article.xml
index 1989923eab..e4b18b9326 100644
--- a/fr_FR.ISO8859-1/articles/contributors/article.sgml
+++ b/fr_FR.ISO8859-1/articles/contributors/article.xml
@@ -11,7 +11,7 @@
       The FreeBSD French Documentation Project
 
       $FreeBSD$
-      $Id: article.sgml,v 1.8 2002-12-11 16:04:55 gioria Exp $
+      $Id: article.xml,v 1.8 2002-12-11 16:04:55 gioria Exp $
       Original revision: 1.304
 -->
 
diff --git a/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile b/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile
index c190c0e4d7..8103cb4794 100644
--- a/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile
+++ b/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile
@@ -14,7 +14,7 @@ INSTALL_ONLY_COMPRESSED?=
 
 JADEFLAGS+=	-V %generate-article-toc%
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml b/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
similarity index 99%
rename from fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml
rename to fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
index 9fd4d319e0..c7ca581340 100644
--- a/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml
+++ b/fr_FR.ISO8859-1/articles/cvsup-advanced/article.xml
@@ -11,7 +11,7 @@
       The FreeBSD French Documentation Project
 
       $FreeBSD$
-      $Id: article.sgml,v 1.7 2007-01-20 13:34:48 blackend Exp $
+      $Id: article.xml,v 1.7 2007-01-20 13:34:48 blackend Exp $
       Original revision: 1.12
 -->
 
diff --git a/fr_FR.ISO8859-1/articles/explaining-bsd/Makefile b/fr_FR.ISO8859-1/articles/explaining-bsd/Makefile
index b4e09dedad..1568be17c8 100644
--- a/fr_FR.ISO8859-1/articles/explaining-bsd/Makefile
+++ b/fr_FR.ISO8859-1/articles/explaining-bsd/Makefile
@@ -14,7 +14,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/explaining-bsd/article.sgml b/fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
similarity index 100%
rename from fr_FR.ISO8859-1/articles/explaining-bsd/article.sgml
rename to fr_FR.ISO8859-1/articles/explaining-bsd/article.xml
diff --git a/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile b/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile
index 8b003c374a..eb4477b3dd 100644
--- a/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile
+++ b/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile
@@ -15,7 +15,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml b/fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
similarity index 100%
rename from fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml
rename to fr_FR.ISO8859-1/articles/filtering-bridges/article.xml
diff --git a/fr_FR.ISO8859-1/articles/fonts/Makefile b/fr_FR.ISO8859-1/articles/fonts/Makefile
index 72c1d9b8c9..c38fe0dba7 100644
--- a/fr_FR.ISO8859-1/articles/fonts/Makefile
+++ b/fr_FR.ISO8859-1/articles/fonts/Makefile
@@ -13,7 +13,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/fonts/article.sgml b/fr_FR.ISO8859-1/articles/fonts/article.xml
similarity index 100%
rename from fr_FR.ISO8859-1/articles/fonts/article.sgml
rename to fr_FR.ISO8859-1/articles/fonts/article.xml
diff --git a/fr_FR.ISO8859-1/articles/ipsec-must/Makefile b/fr_FR.ISO8859-1/articles/ipsec-must/Makefile
index 8b003c374a..eb4477b3dd 100644
--- a/fr_FR.ISO8859-1/articles/ipsec-must/Makefile
+++ b/fr_FR.ISO8859-1/articles/ipsec-must/Makefile
@@ -15,7 +15,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml b/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
similarity index 99%
rename from fr_FR.ISO8859-1/articles/ipsec-must/article.sgml
rename to fr_FR.ISO8859-1/articles/ipsec-must/article.xml
index 8c6a513347..5a9d89811b 100644
--- a/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml
+++ b/fr_FR.ISO8859-1/articles/ipsec-must/article.xml
@@ -11,7 +11,7 @@
     The FreeBSD French Documentation Project
 
     $FreeBSD$
-    $Id: article.sgml,v 1.7 2007-01-20 13:34:48 blackend Exp $
+    $Id: article.xml,v 1.7 2007-01-20 13:34:48 blackend Exp $
     Original revision: 1.12
 -->
 
diff --git a/fr_FR.ISO8859-1/articles/laptop/Makefile b/fr_FR.ISO8859-1/articles/laptop/Makefile
index 1615341a71..9c41fc9b52 100644
--- a/fr_FR.ISO8859-1/articles/laptop/Makefile
+++ b/fr_FR.ISO8859-1/articles/laptop/Makefile
@@ -15,7 +15,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/laptop/article.sgml b/fr_FR.ISO8859-1/articles/laptop/article.xml
similarity index 99%
rename from fr_FR.ISO8859-1/articles/laptop/article.sgml
rename to fr_FR.ISO8859-1/articles/laptop/article.xml
index ca5181418f..a130cbca41 100644
--- a/fr_FR.ISO8859-1/articles/laptop/article.sgml
+++ b/fr_FR.ISO8859-1/articles/laptop/article.xml
@@ -10,7 +10,7 @@
      The FreeBSD French Documentation Project
 
      $FreeBSD$
-     $Id: article.sgml,v 1.2 2002-09-22 18:49:48 blackend Exp $
+     $Id: article.xml,v 1.2 2002-09-22 18:49:48 blackend Exp $
      Original revision: 1.5
 -->
 
diff --git a/fr_FR.ISO8859-1/articles/linux-users/Makefile b/fr_FR.ISO8859-1/articles/linux-users/Makefile
index 4c0ac44d24..fbe7e3f17c 100644
--- a/fr_FR.ISO8859-1/articles/linux-users/Makefile
+++ b/fr_FR.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/fr_FR.ISO8859-1/articles/linux-users/article.sgml b/fr_FR.ISO8859-1/articles/linux-users/article.xml
similarity index 100%
rename from fr_FR.ISO8859-1/articles/linux-users/article.sgml
rename to fr_FR.ISO8859-1/articles/linux-users/article.xml
diff --git a/fr_FR.ISO8859-1/articles/mh/Makefile b/fr_FR.ISO8859-1/articles/mh/Makefile
index 72c1d9b8c9..c38fe0dba7 100644
--- a/fr_FR.ISO8859-1/articles/mh/Makefile
+++ b/fr_FR.ISO8859-1/articles/mh/Makefile
@@ -13,7 +13,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/mh/article.sgml b/fr_FR.ISO8859-1/articles/mh/article.xml
similarity index 100%
rename from fr_FR.ISO8859-1/articles/mh/article.sgml
rename to fr_FR.ISO8859-1/articles/mh/article.xml
diff --git a/fr_FR.ISO8859-1/articles/nanobsd/Makefile b/fr_FR.ISO8859-1/articles/nanobsd/Makefile
index 620bfe4c34..368228c4e0 100644
--- a/fr_FR.ISO8859-1/articles/nanobsd/Makefile
+++ b/fr_FR.ISO8859-1/articles/nanobsd/Makefile
@@ -21,7 +21,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/fr_FR.ISO8859-1/articles/nanobsd/article.sgml b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
similarity index 100%
rename from fr_FR.ISO8859-1/articles/nanobsd/article.sgml
rename to fr_FR.ISO8859-1/articles/nanobsd/article.xml
diff --git a/fr_FR.ISO8859-1/articles/new-users/Makefile b/fr_FR.ISO8859-1/articles/new-users/Makefile
index 72c1d9b8c9..c38fe0dba7 100644
--- a/fr_FR.ISO8859-1/articles/new-users/Makefile
+++ b/fr_FR.ISO8859-1/articles/new-users/Makefile
@@ -13,7 +13,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/new-users/article.sgml b/fr_FR.ISO8859-1/articles/new-users/article.xml
similarity index 100%
rename from fr_FR.ISO8859-1/articles/new-users/article.sgml
rename to fr_FR.ISO8859-1/articles/new-users/article.xml
diff --git a/fr_FR.ISO8859-1/articles/pam/Makefile b/fr_FR.ISO8859-1/articles/pam/Makefile
index 4282f76b0f..f1d0dbc574 100644
--- a/fr_FR.ISO8859-1/articles/pam/Makefile
+++ b/fr_FR.ISO8859-1/articles/pam/Makefile
@@ -10,7 +10,7 @@ INSTALL_ONLY_COMPRESSED?=
 WITH_ARTICLE_TOC?=YES
 WITH_INLINE_LEGALNOTICE?=YES
 
-SRCS= article.sgml pam_app.c pam_conv.c pam_module.c
+SRCS= article.xml pam_app.c pam_conv.c pam_module.c
 
 CLEANFILES+= pam_app.c pam_conv.c pam_module.c
 
diff --git a/fr_FR.ISO8859-1/articles/pam/article.sgml b/fr_FR.ISO8859-1/articles/pam/article.xml
similarity index 100%
rename from fr_FR.ISO8859-1/articles/pam/article.sgml
rename to fr_FR.ISO8859-1/articles/pam/article.xml
diff --git a/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile b/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile
index b4e09dedad..1568be17c8 100644
--- a/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile
+++ b/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile
@@ -14,7 +14,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml b/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
similarity index 99%
rename from fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml
rename to fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
index 3b34648743..a61ddf42d3 100644
--- a/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml
+++ b/fr_FR.ISO8859-1/articles/pr-guidelines/article.xml
@@ -11,7 +11,7 @@
 	The FreeBSD French Documentation Project
 
 	$FreeBSD$
-	$Id: article.sgml,v 1.5 2002-12-11 16:24:29 gioria Exp $
+	$Id: article.xml,v 1.5 2002-12-11 16:24:29 gioria Exp $
 	Original revision: 1.8
 -->
 
diff --git a/fr_FR.ISO8859-1/articles/problem-reports/Makefile b/fr_FR.ISO8859-1/articles/problem-reports/Makefile
index 8b003c374a..eb4477b3dd 100644
--- a/fr_FR.ISO8859-1/articles/problem-reports/Makefile
+++ b/fr_FR.ISO8859-1/articles/problem-reports/Makefile
@@ -15,7 +15,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/articles/problem-reports/article.sgml b/fr_FR.ISO8859-1/articles/problem-reports/article.xml
similarity index 99%
rename from fr_FR.ISO8859-1/articles/problem-reports/article.sgml
rename to fr_FR.ISO8859-1/articles/problem-reports/article.xml
index cfb66fc58f..5c1140bc7b 100644
--- a/fr_FR.ISO8859-1/articles/problem-reports/article.sgml
+++ b/fr_FR.ISO8859-1/articles/problem-reports/article.xml
@@ -10,7 +10,7 @@
     The FreeBSD French Documentation Project
 
     $FreeBSD$
-    $Id: article.sgml,v 1.3 2007-01-19 21:27:58 blackend Exp $
+    $Id: article.xml,v 1.3 2007-01-19 21:27:58 blackend Exp $
     Original revision: 1.10
 -->
 
diff --git a/fr_FR.ISO8859-1/articles/releng-packages/Makefile b/fr_FR.ISO8859-1/articles/releng-packages/Makefile
index 91a81f97bd..da204fd84a 100644
--- a/fr_FR.ISO8859-1/articles/releng-packages/Makefile
+++ b/fr_FR.ISO8859-1/articles/releng-packages/Makefile
@@ -16,7 +16,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS=  article.sgml
+SRCS=  article.xml
 
 CSS_SHEET_ADDITIONS= extra.css
 
diff --git a/fr_FR.ISO8859-1/articles/releng-packages/article.sgml b/fr_FR.ISO8859-1/articles/releng-packages/article.xml
similarity index 99%
rename from fr_FR.ISO8859-1/articles/releng-packages/article.sgml
rename to fr_FR.ISO8859-1/articles/releng-packages/article.xml
index 29b0318299..db8d603fde 100644
--- a/fr_FR.ISO8859-1/articles/releng-packages/article.sgml
+++ b/fr_FR.ISO8859-1/articles/releng-packages/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
-     $Id: article.sgml,v 1.1 2002-06-20 09:51:25 blackend Exp $
+     $Id: article.xml,v 1.1 2002-06-20 09:51:25 blackend Exp $
      $FreeBSD$
      Original revision: 1.4
 -->
diff --git a/fr_FR.ISO8859-1/articles/releng/Makefile b/fr_FR.ISO8859-1/articles/releng/Makefile
index 0117c9702d..580803f8b9 100644
--- a/fr_FR.ISO8859-1/articles/releng/Makefile
+++ b/fr_FR.ISO8859-1/articles/releng/Makefile
@@ -18,7 +18,7 @@ INSTALL_ONLY_COMPRESSED?=
 JADEFLAGS+=	-V %generate-article-toc%
 
 # SGML content
-SRCS=  article.sgml branches.ascii
+SRCS=  article.xml branches.ascii
 
 # IMAGES
 IMAGES= branches.pic
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/Makefile b/fr_FR.ISO8859-1/books/developers-handbook/Makefile
index 3579fb6968..b38ea8f908 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/developers-handbook/Makefile
@@ -26,7 +26,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 # Entities
 
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/book.sgml b/fr_FR.ISO8859-1/books/developers-handbook/book.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/developers-handbook/book.sgml
rename to fr_FR.ISO8859-1/books/developers-handbook/book.xml
index 44b9a6c489..eceeab0072 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/book.sgml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/book.xml
@@ -11,7 +11,7 @@
      The FreeBSD French Documentation Project
 
      $FreeBSD$
-     $Id: book.sgml,v 1.2 2003-01-12 12:47:57 blackend Exp $
+     $Id: book.xml,v 1.2 2003-01-12 12:47:57 blackend Exp $
      Original revision: 1.15
 
 -->
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent b/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent
index 8a08407bb8..63e791fcbb 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent
+++ b/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent
@@ -8,58 +8,58 @@
      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.
      $FreeBSD$
 -->
 
 <!-- Part one -->
-<!-- No significant material yet, still in book.sgml -->
+<!-- No significant material yet, still in book.xml -->
 
 <!-- Part two -->
-<!ENTITY chap.tools			SYSTEM "tools/chapter.sgml">
-<!ENTITY chap.secure			SYSTEM "secure/chapter.sgml">
+<!ENTITY chap.tools			SYSTEM "tools/chapter.xml">
+<!ENTITY chap.secure			SYSTEM "secure/chapter.xml">
 
 <!-- Part three -->
-<!-- No significant material yet, still in book.sgml -->
-<!ENTITY chap.locking			SYSTEM "locking/chapter.sgml">
+<!-- No significant material yet, still in book.xml -->
+<!ENTITY chap.locking			SYSTEM "locking/chapter.xml">
 
 <!-- Part four -->
-<!-- No significant material yet, still in book.sgml -->
+<!-- No significant material yet, still in book.xml -->
 
 <!-- Part five -->
-<!-- No significant material yet, still in book.sgml -->
+<!-- No significant material yet, still in book.xml -->
 
 <!-- Part six -->
-<!-- No significant material yet, still in book.sgml -->
+<!-- No significant material yet, still in book.xml -->
 
 <!-- Part seven -->
-<!-- No significant material yet, still in book.sgml -->
+<!-- No significant material yet, still in book.xml -->
 
 <!-- Part eight -->
-<!-- No significant material yet, still in book.sgml -->
+<!-- No significant material yet, still in book.xml -->
 
 <!-- Part nine -->
-<!-- No significant material yet, still in book.sgml -->
+<!-- No significant material yet, still in book.xml -->
 
 <!-- Part ten -->
-<!-- No significant material yet, still in book.sgml -->
+<!-- No significant material yet, still in book.xml -->
 
 <!-- Part eleven -->
-<!ENTITY chap.driverbasics		SYSTEM "driverbasics/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.driverbasics		SYSTEM "driverbasics/chapter.xml">
+<!ENTITY chap.pci			SYSTEM "pci/chapter.xml">
+<!ENTITY chap.scsi			SYSTEM "scsi/chapter.xml">
+<!ENTITY chap.usb			SYSTEM "usb/chapter.xml">
 
 <!-- Part twelve -->
-<!-- No significant material yet, still in book.sgml -->
+<!-- No significant material yet, still in book.xml -->
 
 <!-- Part thirteen -->
-<!-- No significant material yet, still in book.sgml -->
+<!-- No significant material yet, still in book.xml -->
 
 <!-- Part fourteen -->
-<!-- No significant material yet, still in book.sgml -->
+<!-- No significant material yet, still in book.xml -->
 
 <!-- Part fifteen (appendices) -->
-<!ENTITY chap.bibliography		SYSTEM "bibliography/chapter.sgml">
+<!ENTITY chap.bibliography		SYSTEM "bibliography/chapter.xml">
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml b/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml
rename to fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
index 0729a8b970..398cec854c 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD French Documentation Project
 
      $FreeBSD$
-     $Id: chapter.sgml,v 1.2 2003-01-12 12:16:07 blackend Exp $
+     $Id: chapter.xml,v 1.2 2003-01-12 12:16:07 blackend Exp $
      Original revision: 1.5
 
 -->
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml b/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml
rename to fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
index 37fdcf17d1..c3a703c746 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
      The FreeBSD SMP Next Generation Project
-     $Id: chapter.sgml,v 1.2 2002-12-11 16:31:20 gioria Exp $
+     $Id: chapter.xml,v 1.2 2002-12-11 16:31:20 gioria Exp $
      Original revision: 1.3
      $FreeBSD$
 -->
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml b/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml
rename to fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
index 8d6ddb549e..129ef1be60 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: chapter.sgml,v 1.1 2002-02-14 14:25:02 gioria Exp $
+     $Id: chapter.xml,v 1.1 2002-02-14 14:25:02 gioria Exp $
      Original revision: 1.3
      $FreeBSD$
 -->
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml b/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
similarity index 86%
rename from fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml
rename to fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
index cbd683b888..9692f16ecb 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: chapter.sgml,v 1.1 2002-02-14 14:25:02 gioria Exp $
+     $Id: chapter.xml,v 1.1 2002-02-14 14:25:02 gioria Exp $
      Original revision: 1.3
      $FreeBSD$
 -->
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml b/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml
rename to fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
index 4cd60afc9e..19f5de9645 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: chapter.sgml,v 1.1 2002-02-14 14:25:02 gioria Exp $
+     $Id: chapter.xml,v 1.1 2002-02-14 14:25:02 gioria Exp $
      Original revision: 1.3
      $FreeBSD$
 
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml b/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml
rename to fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
index 9e0252870a..6bf317ae99 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: chapter.sgml,v 1.1 2002-02-14 14:25:02 gioria Exp $
+     $Id: chapter.xml,v 1.1 2002-02-14 14:25:02 gioria Exp $
      Original revision: 1.4
      $FreeBSD$
 -->
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml b/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
similarity index 88%
rename from fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml
rename to fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
index 96e41d5fce..66a7dbcfc7 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: chapter.sgml,v 1.1 2002-02-14 14:25:03 gioria Exp $
+     $Id: chapter.xml,v 1.1 2002-02-14 14:25:03 gioria Exp $
      Original revision: 1.1
      $FreeBSD$
 -->
diff --git a/fr_FR.ISO8859-1/books/faq/Makefile b/fr_FR.ISO8859-1/books/faq/Makefile
index bd0fcd905b..a099596a95 100644
--- a/fr_FR.ISO8859-1/books/faq/Makefile
+++ b/fr_FR.ISO8859-1/books/faq/Makefile
@@ -22,7 +22,7 @@ JADEFLAGS+=-Vbiblio-xref-title
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/fr_FR.ISO8859-1/books/faq/book.sgml b/fr_FR.ISO8859-1/books/faq/book.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/faq/book.sgml
rename to fr_FR.ISO8859-1/books/faq/book.xml
index 03f37f15c8..e04882c6f6 100644
--- a/fr_FR.ISO8859-1/books/faq/book.sgml
+++ b/fr_FR.ISO8859-1/books/faq/book.xml
@@ -3,7 +3,7 @@
 	"../../../share/sgml/freebsd42.dtd" [
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//FR" "../../share/sgml/entities.ent">
 %entities;
-<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.sgml">
+<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.xml">
 <!ENTITY isbn.amazon 'http://www.amazon.com/exec/obidos/ASIN'>
 ]>
 
@@ -3096,7 +3096,7 @@ et
 	The FreeBSD Documentation Project
 	The FreeBSD French Documentation Project
 
-        $Id: book.sgml,v 1.9 2002-10-05 15:17:08 gioria Exp $
+        $Id: book.xml,v 1.9 2002-10-05 15:17:08 gioria Exp $
         Original revision: n.nn
 -->
 
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/Makefile b/fr_FR.ISO8859-1/books/fdp-primer/Makefile
index 8f097b5d05..0bbf90cf22 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/Makefile
+++ b/fr_FR.ISO8859-1/books/fdp-primer/Makefile
@@ -23,19 +23,19 @@ 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+= the-faq/chapter.sgml
-SRCS+= the-handbook/chapter.sgml
-SRCS+= the-website/chapter.sgml
-SRCS+= tools/chapter.sgml
-SRCS+= translations/chapter.sgml
-SRCS+= writing-style/chapter.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+= the-faq/chapter.xml
+SRCS+= the-handbook/chapter.xml
+SRCS+= the-website/chapter.xml
+SRCS+= tools/chapter.xml
+SRCS+= translations/chapter.xml
+SRCS+= writing-style/chapter.xml
 
 # Entities
 SRCS+= chapters.ent
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/book.sgml b/fr_FR.ISO8859-1/books/fdp-primer/book.xml
similarity index 98%
rename from fr_FR.ISO8859-1/books/fdp-primer/book.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/book.xml
index f04a87a1e4..d72e402522 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/book.sgml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/book.xml
@@ -5,8 +5,8 @@
 %entities;
 <!ENTITY % chapters SYSTEM "chapters.ent">
 %chapters;
-<!ENTITY sgml.in-progress SYSTEM "in-progress.sgml">
-<!ENTITY sgml.todo SYSTEM "todo.sgml">
+<!ENTITY sgml.in-progress SYSTEM "in-progress.xml">
+<!ENTITY sgml.todo SYSTEM "todo.xml">
 ]>
 
 <!-- Copyright (c) 1998, 1999 Nik Clayton, All rights reserved.
@@ -275,8 +275,8 @@ Password:</screen></entry>
 
   &chap.overview;
   &chap.tools;
-  &chap.sgml-primer;
-  &chap.sgml-markup;
+  &chap.xml-primer;
+  &chap.xml-markup;
   &chap.stylesheets;
   &chap.the-faq;
   &chap.the-handbook;
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent b/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent
index f8f75d22e3..0898b2958d 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent
+++ b/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent
@@ -3,22 +3,22 @@
      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.the-faq		SYSTEM "the-faq/chapter.sgml">
-<!ENTITY chap.the-handbook	SYSTEM "the-handbook/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.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.the-faq		SYSTEM "the-faq/chapter.xml">
+<!ENTITY chap.the-handbook	SYSTEM "the-handbook/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">
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml b/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
similarity index 75%
rename from fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
index c3b471651d..046d7c6684 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/in-progress.xml
@@ -4,7 +4,7 @@
      The FreeBSD French Documentation Project
 
      $FreeBSD$
-     $Id: in-progress.sgml,v 1.1 2002-08-01 09:48:29 blackend Exp $
+     $Id: in-progress.xml,v 1.1 2002-08-01 09:48:29 blackend Exp $
 
 -->
 <para>** Traduction en Cours **</para>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
similarity index 98%
rename from fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 46d0b0c926..4090ac8e5f 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -38,7 +38,7 @@
   <para>Les versions r�centes d'Emacs ou Xemacs (disponibles au catalogue des
     logiciels port�s) incluent un paquetage tr�s utile appel� PSGML. Il est
     automatiquement appel� au chargement d'un fichier avec l'extension
-    <filename>.sgml</filename>, ou lorsque l'on tape <command>M-x
+    <filename>.xml</filename>, ou lorsque l'on tape <command>M-x
       sgml-mode</command>. C'est un mode majeur pour traiter les fichiers
     SGML, les �l�ments et les attributs.</para>
 
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index d746fd2ce6..de31952797 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -28,7 +28,7 @@
      ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
      POSSIBILITY OF SUCH DAMAGE.
 
-     $Id: chapter.sgml,v 1.2 2011-06-11 18:43:17 blackend Exp $
+     $Id: chapter.xml,v 1.2 2011-06-11 18:43:17 blackend Exp $
      $FreeBSD$
 -->
 
@@ -1734,7 +1734,7 @@ C'est le fichier 'foo2'</screen>
   de R�f�rence en Anglais dans
   <filename>/usr/doc/en/handbook/</filename>. Le
   fichier principal, dans ce r�pertoire, s'appelle
-  <filename>handbook.sgml</filename>. Il doit aussi
+  <filename>handbook.xml</filename>. Il doit aussi
   y avoir un <filename>Makefile</filename> et un
   certain nombre de fichiers avec l'extension
   <filename>.ent</filename>.</para>]]></programlisting>
@@ -1744,7 +1744,7 @@ C'est le fichier 'foo2'</screen>
 	  <para>Vous trouverez le source SGML du Manuel de R�f�rence en
             Anglais dans <filename>/usr/doc/en/handbook/</filename>. Le
             fichier principal, dans ce r�pertoire, s'appelle
-            <filename>handbook.sgml</filename>. Il doit aussi y avoir un
+            <filename>handbook.xml</filename>. Il doit aussi y avoir un
             <filename>Makefile</filename> et un certain nombre de fichiers
             avec l'extension <filename>.ent</filename>.</para>
 	</example>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
similarity index 95%
rename from fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index c852b76ebc..d6b39f3b5b 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -397,7 +397,7 @@ setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/catalog:$SGML_CATALOG_FILES</prog
 	</step>
 
 	<step>
-	  <para>Cr�ez un fichier <filename>exemple.sgml</filename>, o� vous
+	  <para>Cr�ez un fichier <filename>exemple.xml</filename>, o� vous
             mettrez&nbsp;:</para>
 
 	  <programlisting>
@@ -442,7 +442,7 @@ setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/catalog:$SGML_CATALOG_FILES</prog
 	  <para>Utilisez &man.nsgmls.1; pour v�rifier si votre document est
 	    valide&nbsp;:</para>
 
-          <screen>&prompt.user; <userinput>nsgmls -s example.sgml</userinput></screen>
+          <screen>&prompt.user; <userinput>nsgmls -s example.xml</userinput></screen>
 
 	  <para>Vous constaterez que &man.nsgmls.1; n'affiche rien. Cela
             signifie qu'il a valid� votre document.</para>
@@ -453,9 +453,9 @@ setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/catalog:$SGML_CATALOG_FILES</prog
 	    Supprimez les marques <sgmltag>title</sgmltag> et
 	    <sgmltag>/title</sgmltag> et relancer la validation.</para>
 
-          <screen>&prompt.user; <userinput>nsgmls -s example.sgml</userinput>
-nsgmls:example.sgml:5:4:E: character data is not allowed here
-nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
+          <screen>&prompt.user; <userinput>nsgmls -s example.xml</userinput>
+nsgmls:example.xml:5:4:E: character data is not allowed here
+nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
 	  <para>Les messages d'erreur de &man.nsgmls.1; sont structur�s en
             colonnes s�par�s par des deux-points ou des
@@ -934,13 +934,13 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 
       <procedure>
 	<step>
-	  <para>Ajoutez des commentaires &agrave; <filename>exemple.sgml</filename>
+	  <para>Ajoutez des commentaires &agrave; <filename>exemple.xml</filename>
             et validez vos modifications avec &man.nsgmls.1;</para>
 	</step>
 
 	<step>
 	  <para>Ajoutez des commentaires incorrects &agrave;
-	    <filename>exemple.sgml</filename>, pour voir quels messages
+	    <filename>exemple.xml</filename>, pour voir quels messages
             d'erreur produit alors &man.nsgmls.1;.</para>
 	</step>
       </procedure>
@@ -1066,7 +1066,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
       <procedure>
 	<step>
 	  <para>D�finissez un entit� g�n�rale dans
-	    <filename>exemple.sgml</filename>.</para>
+	    <filename>exemple.xml</filename>.</para>
 
 	  <programlisting>
 <![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
@@ -1098,7 +1098,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	</step>
 
 	<step>
-	  <para>Chargez <filename>exemple.sgml</filename> avec votre
+	  <para>Chargez <filename>exemple.xml</filename> avec votre
             navigateur (vous devrez peut-�tre le recopier dans
 	    <filename>exemple.html</filename> pour que votre navigateur le
             reconnaisse comme un document HTML).</para>
@@ -1120,9 +1120,9 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
             SGML tout aussi valide. En particulier, il y remplace les
             r�f�rences aux entit�s par leur contenu.</para>
 
-	  <para>Vous pouvez le faire avec &man.sgmlnorm.1;.</para>
+	  <para>Vous pouvez le faire avec &man.xmlnorm.1;.</para>
 
-          <screen>&prompt.user; <userinput>sgmlnorm exemple.sgml > exemple.html</userinput></screen>
+          <screen>&prompt.user; <userinput>sgmlnorm exemple.xml > exemple.html</userinput></screen>
 
 	  <para><filename>exemple.html</filename> doit maintenant contenir une
             version normalis�e (i.e., o� les r�f�rences aux entit�s ont �t�
@@ -1131,12 +1131,12 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	</step>
 
 	<step>
-	  <para>Si vous jetez un oeil au r�sultat de &man.sgmlnorm.1;, vous
+	  <para>Si vous jetez un oeil au r�sultat de &man.xmlnorm.1;, vous
             verrez qu'il ne comporte pas de d�claration DOCTYPE au d�but. Pour
             qu'elle y soit, utilisez l'option
             <option>-d</option>&nbsp;:</para>
 
-          <screen>&prompt.user; <userinput>sgmlnorm -d exemple.sgml > exemple.html</userinput></screen>
+          <screen>&prompt.user; <userinput>sgmlnorm -d exemple.xml > exemple.html</userinput></screen>
 	</step>
       </procedure>
     </sect2>
@@ -1155,9 +1155,9 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 
       <para>Supposons que le contenu d'un livre SGML soit d�coup� en fichiers,
         &agrave; raison d'un fichier par chapitre, appel�s
-	<filename>chaptitre1.sgml</filename>,
-	<filename>chapitre2.sgml</filename>, et ainsi de suite, et que le
-        fichier <filename>livre.sgml</filename> inclue ces chapitres.</para>
+	<filename>chaptitre1.xml</filename>,
+	<filename>chapitre2.xml</filename>, et ainsi de suite, et que le
+        fichier <filename>livre.xml</filename> inclue ces chapitres.</para>
 
       <para>Pour que vos entit�s aient pour valeur le contenu de ces fichiers,
         vous les d�clarerez avec le mot-cl� <literal>SYSTEM</literal>. Cela
@@ -1170,9 +1170,9 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 
 	<programlisting>
 <![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!ENTITY chapitre.1 SYSTEM "chapitre1.sgml">
-<!ENTITY chapitre.2 SYSTEM "chapitre2.sgml">
-<!ENTITY chapitre.3 SYSTEM "chapitre3.sgml">
+<!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
+<!ENTITY chapitre.2 SYSTEM "chapitre2.xml">
+<!ENTITY chapitre.3 SYSTEM "chapitre3.xml">
 <!-- Et ainsi de suite -->
 ]>
 
@@ -1188,8 +1188,8 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
       <warning>
 	<para>Quand vous vous servez d'entit�s g�n�rales pour inclure d'autres
           fichiers dans un document, les fichiers inclus
-	  (<filename>chapitre1.sgml</filename>,
-	  <filename>chapitre2.sgml</filename>, et ainsi de suite)  ne doivent
+	  (<filename>chapitre1.xml</filename>,
+	  <filename>chapitre2.xml</filename>, et ainsi de suite)  ne doivent
           <emphasis>pas</emphasis> commencer par une d�claration DOCTYPE. Ce
           serait une erreur de syntaxe.</para>
       </warning>
@@ -1225,9 +1225,9 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
           contiendra&nbsp;:</para>
 
 	<programlisting>
-<![ CDATA [<!ENTITY chapitre.1 SYSTEM "chapitre1.sgml">
-<!ENTITY chapitre.2 SYSTEM "chapitre2.sgml">
-<!ENTITY chapitre.3 SYSTEM "chapitre3.sgml">]]></programlisting>
+<![ CDATA [<!ENTITY chapitre.1 SYSTEM "chapitre1.xml">
+<!ENTITY chapitre.2 SYSTEM "chapitre2.xml">
+<!ENTITY chapitre.3 SYSTEM "chapitre3.xml">]]></programlisting>
 
 	<para>Cr�ez maintenant une entit� param�tre qui fasse r�f�rence au
           contenu de ce fichier. Utilisez ensuite cette entit� pour inclure
@@ -1263,9 +1263,9 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 
 	<procedure>
 	  <step>
-	    <para>Cr�ez trois fichiers, <filename>para1.sgml</filename>,
-	      <filename>para2.sgml</filename> et
-	      <filename>para3.sgml</filename>.</para>
+	    <para>Cr�ez trois fichiers, <filename>para1.xml</filename>,
+	      <filename>para2.xml</filename> et
+	      <filename>para3.xml</filename>.</para>
 
 	    <para>Mettez-y quelque chose qui ressemble &agrave; ceci&nbsp;:</para>
 
@@ -1274,15 +1274,15 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	  </step>
 
 	  <step>
-	    <para>Modifiez <filename>exemple.sgml</filename> de la fa�on
+	    <para>Modifiez <filename>exemple.xml</filename> de la fa�on
               suivante&nbsp;:</para>
 
 	    <programlisting>
 <![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY version "1.1">
-<!ENTITY para1 SYSTEM "para1.sgml">
-<!ENTITY para2 SYSTEM "para2.sgml">
-<!ENTITY para3 SYSTEM "para3.sgml">
+<!ENTITY para1 SYSTEM "para1.xml">
+<!ENTITY para2 SYSTEM "para2.xml">
+<!ENTITY para3 SYSTEM "para3.xml">
 ]>
 
 <html>
@@ -1302,15 +1302,15 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 
 	  <step>
 	    <para>G�n�rez <filename>exemple.html</filename> en normalisant
-	      <filename>exemple.sgml</filename>.</para>
+	      <filename>exemple.xml</filename>.</para>
 
-            <screen>&prompt.user; <userinput>sgmlnorm -d exemple.sgml > exemple.html</userinput></screen>
+            <screen>&prompt.user; <userinput>sgmlnorm -d exemple.xml > exemple.html</userinput></screen>
 	  </step>
 
 	  <step>
 	    <para>Affichez <filename>exemple.html</filename> avec votre
               navigateur Web et v�rifiez que les fichiers
-	      <filename>para<replaceable>n</replaceable>.sgml</filename> ont
+	      <filename>para<replaceable>n</replaceable>.xml</filename> ont
 	      bien �t� inclus dans <filename>exemple.html</filename>.</para>
 	  </step>
 	</procedure>
@@ -1328,11 +1328,11 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	<procedure>
 	  <step>
             <para>Modifiez comme ceci
-              <filename>exemple.sgml</filename>&nbsp;:</para>
+              <filename>exemple.xml</filename>&nbsp;:</para>
 
 	    <programlisting>
 <![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!ENTITY % entites SYSTEM "entites.sgml"> %entites;
+<!ENTITY % entites SYSTEM "entites.xml"> %entites;
 ]>
 
 <html>
@@ -1351,27 +1351,27 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	  </step>
 
 	  <step>
-	    <para>Cr�ez un nouveau fichier, <filename>entites.sgml</filename>,
+	    <para>Cr�ez un nouveau fichier, <filename>entites.xml</filename>,
 	      qui contienne&nbsp;:</para>
 
 	    <programlisting>
 <![ CDATA [<!ENTITY version "1.1">
-<!ENTITY para1 SYSTEM "para1.sgml">
-<!ENTITY para2 SYSTEM "para2.sgml">
-<!ENTITY para3 SYSTEM "para3.sgml">]]></programlisting>
+<!ENTITY para1 SYSTEM "para1.xml">
+<!ENTITY para2 SYSTEM "para2.xml">
+<!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
 	  </step>
 
 	  <step>
 	    <para>G�n�rez <filename>exemple.html</filename> en normalisant
-	      <filename>exemple.sgml</filename>.</para>
+	      <filename>exemple.xml</filename>.</para>
 
-            <screen>&prompt.user; <userinput>sgmlnorm -d exemple.sgml > exemple.html</userinput></screen>
+            <screen>&prompt.user; <userinput>sgmlnorm -d exemple.xml > exemple.html</userinput></screen>
 	  </step>
 
 	  <step>
 	    <para>Affichez <filename>exemple.html</filename> avec votre
               navigateur Web et v�rifiez que les fichiers
-	      <filename>para<replaceable>n</replaceable>.sgml</filename> ont
+	      <filename>para<replaceable>n</replaceable>.xml</filename> ont
 	      bien �t� inclus dans <filename>example.html</filename>.</para>
 	  </step>
 	</procedure>
@@ -1571,7 +1571,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 
       <procedure>
 	<step>
-	  <para>Cr�ez un nouveau fichier, <filename>section.sgml</filename>,
+	  <para>Cr�ez un nouveau fichier, <filename>section.xml</filename>,
             qui contienne&nbsp;:</para>
 
 	  <programlisting>
@@ -1607,7 +1607,7 @@ PUBLIC "-//W3C//DTD HTML 4.0//EN" "4.0/strict.dtd"</programlisting>
 	</step>
 
 	<step>
-	  <para>Normalisez le fichier avec &man.sgmlnorm.1; et examinez le
+	  <para>Normalisez le fichier avec &man.xmlnorm.1; et examinez le
             r�sultat. Notez quels paragraphes ont �t� conserv�s et quels
             paragraphes ont �t� supprim�s, et ce qu'est devenu le contenu des
             sections marqu�es CDATA.</para>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
similarity index 94%
rename from fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
index 58b0fcee62..b9b6035187 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.xml
@@ -82,14 +82,14 @@
     </sect2>
 
     <sect2>
-      <title><filename>handbook.sgml</filename></title>
+      <title><filename>handbook.xml</filename></title>
 
       <para>C'est la racine du Manuel de R�f�rence. Il contient la
 	<link linkend="sgml-primer-doctype-declaration">d�claration
           DOCTYPE</link> du Manuel, ainsi que les �l�ments qui d�crivent sa
           structure.</para>
 
-      <para><filename>handbook.sgml</filename> utilise des <link
+      <para><filename>handbook.xml</filename> utilise des <link
 	  linkend="sgml-primer-parameter-entities">entit�s param�tres</link>
         pour charger les fichiers d'extensions <filename>.ent</filename>. Ces
         fichiers (d�crits plus loin) d�finissent &agrave; leur tour des
@@ -98,10 +98,10 @@
     </sect2>
 
     <sect2>
-      <title><filename><replaceable>r�pertoire</replaceable>/chapter.sgml</filename></title>
+      <title><filename><replaceable>r�pertoire</replaceable>/chapter.xml</filename></title>
 
       <para>Chaque chapitre du manuel est compos� d'un fichier
-	<filename>chapter.sgml</filename> dans un sous-r�pertoire s�par� pour
+	<filename>chapter.xml</filename> dans un sous-r�pertoire s�par� pour
         chaque chapitre. Chaque r�pertoire prend le nom de l'attribut
 	<literal>id</literal> de l'�l�ment <sgmltag>chapter</sgmltag>.</para>
 
@@ -112,7 +112,7 @@
 ...
 </chapter>]]></programlisting>
 
-      <para>il s'appelera alors <filename>chapter.sgml</filename> dans le
+      <para>il s'appelera alors <filename>chapter.xml</filename> dans le
 	r�pertoire <filename>kernelconfiguration</filename>. Habituellement,
         il y aura un seul fichier pour tout le chapitre.</para>
 
@@ -121,7 +121,7 @@
         du <literal>id</literal>, et non au nom du r�pertoire.</para>
 
       <para>Dans les versions pr�c�dentes du Manuel, ces fichiers �taient dans
-        le m�me r�pertoire que <filename>handbook.sgml</filename>, avec le
+        le m�me r�pertoire que <filename>handbook.xml</filename>, avec le
         m�me nom que l'attribut <literal>id</literal> de l'�l�ment
 	<sgmltag>chapter</sgmltag> du fichier. Ils ont �t� d�plac�s dans des
         r�pertoires s�par�s en pr�vision des �volutions &agrave; venir du Manuel. Il
@@ -135,10 +135,10 @@
         y a beaucoup de fichiers.</para>
 
       <para>Un bref coup d'oeil montre qu'il y a de nombreux r�pertoires avec
-        chacun un fichier <filename>chapter.sgml</filename> dont
-	<filename>basics/chapter.sgml</filename>,
-	<filename>introduction/chapter.sgml</filename> et
-	<filename>printing/chapter.sgml</filename>.</para>
+        chacun un fichier <filename>chapter.xml</filename> dont
+	<filename>basics/chapter.xml</filename>,
+	<filename>introduction/chapter.xml</filename> et
+	<filename>printing/chapter.xml</filename>.</para>
 
       <important>
 	<para>Les noms des chapitres et/ou r�pertoires ne doivent pas faire
@@ -149,7 +149,7 @@
           dans la hi�rarchie).</para>
       </important>
 
-      <para>Chaque fichier <filename>chapter.sgml</filename> n'est pas un
+      <para>Chaque fichier <filename>chapter.xml</filename> n'est pas un
         document SGML int�gral. Ils n'ont en particulier pas de d�claration
         DOCTYPE en t�te du fichier.</para>
 
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml b/fr_FR.ISO8859-1/books/fdp-primer/todo.xml
similarity index 76%
rename from fr_FR.ISO8859-1/books/fdp-primer/todo.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/todo.xml
index cbeee13d7a..15867fb5c2 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/todo.xml
@@ -4,7 +4,7 @@
      The FreeBSD French Documentation Project
 
      $FreeBSD$
-     $Id: todo.sgml,v 1.1 2002-08-01 09:48:29 blackend Exp $
+     $Id: todo.xml,v 1.1 2002-08-01 09:48:29 blackend Exp $
 
 -->
 <para>*** A Traduire ***</para>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 78afaa39b1..27d47b149a 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -289,7 +289,7 @@
 	     Makefile
 	     FAQ/
 	         Makefile
-		 *.sgml</programlisting>
+		 *.xml</programlisting>
 
 	<para><literal>sv</literal> est le code ISO639 pour le Su�dois.
           Remarquez les deux <filename>Makefile</filename>s, qui servent &agrave;
@@ -461,7 +461,7 @@
 	<programlisting><![ CDATA [<!--
      The FreeBSD Documentation Project
 
-     &dollar;Id: chapter.sgml,v 1.11 1999/06/20 21:18:57 billf Exp $
+     &dollar;Id: chapter.xml,v 1.11 1999/06/20 21:18:57 billf Exp $
 -->]]></programlisting>
 
 	<para>La forme exacte peut changer, mais elles comporteront toujours
@@ -484,7 +484,7 @@
 	<programlisting><![ CDATA [<!--
      The FreeBSD Spanish Documentation Project
 
-     &dollar;Id: chapter.sgml,v 1.3 1999/06/24 19:12:32 jesusr Exp $
+     &dollar;Id: chapter.xml,v 1.3 1999/06/24 19:12:32 jesusr Exp $
      Original revision: 1.11
 -->]]></programlisting>
       </answer>
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml b/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml
rename to fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index 06a317db06..ed494b737b 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -19,7 +19,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
@@ -182,43 +182,43 @@ IMAGES_LIB+= callouts/15.png
 #
 
 # SGML content
-SRCS+= audit/chapter.sgml
-SRCS+= book.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+= 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+= 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+= 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
@@ -226,12 +226,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 ${MASTERDOC}
 
 #
@@ -247,9 +247,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}
@@ -257,20 +257,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/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 1958f1a968..8ef8052277 100644
--- a/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -1339,7 +1339,7 @@ wi0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
 	    object)</primary></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>Pour utiliser le NDISulator, vous avez besoin de trois
 	    choses:</para>
diff --git a/fr_FR.ISO8859-1/books/handbook/audit/Makefile b/fr_FR.ISO8859-1/books/handbook/audit/Makefile
index 84cb9b04ee..0dd0e1e0c6 100644
--- a/fr_FR.ISO8859-1/books/handbook/audit/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/audit/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	audit/chapter.sgml
+CHAPTERS= 	audit/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/basics/Makefile b/fr_FR.ISO8859-1/books/handbook/basics/Makefile
index c6805632a9..1a92190956 100644
--- a/fr_FR.ISO8859-1/books/handbook/basics/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/basics/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	basics/chapter.sgml
+CHAPTERS= 	basics/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/basics/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile b/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile
index ed3f6a18d2..5a48fb5c22 100644
--- a/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	bibliography/chapter.sgml
+CHAPTERS= 	bibliography/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/bibliography/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/book.sgml b/fr_FR.ISO8859-1/books/handbook/book.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/book.sgml
rename to fr_FR.ISO8859-1/books/handbook/book.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/boot/Makefile b/fr_FR.ISO8859-1/books/handbook/boot/Makefile
index 2902864c1b..95ca7733ae 100644
--- a/fr_FR.ISO8859-1/books/handbook/boot/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/boot/Makefile
@@ -9,7 +9,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	boot/chapter.sgml
+CHAPTERS= 	boot/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/boot/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/boot/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/chapters.ent b/fr_FR.ISO8859-1/books/handbook/chapters.ent
index 6d8edf24dc..d7a930da14 100644
--- a/fr_FR.ISO8859-1/books/handbook/chapters.ent
+++ b/fr_FR.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.
 
@@ -57,137 +57,137 @@
 <!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.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.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/fr_FR.ISO8859-1/books/handbook/colophon.sgml b/fr_FR.ISO8859-1/books/handbook/colophon.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/colophon.sgml
rename to fr_FR.ISO8859-1/books/handbook/colophon.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/config/Makefile b/fr_FR.ISO8859-1/books/handbook/config/Makefile
index 9c2c79ee0f..7cfc7c6e33 100644
--- a/fr_FR.ISO8859-1/books/handbook/config/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/config/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	config/chapter.sgml
+CHAPTERS= 	config/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/config/chapter.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/handbook/config/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/config/chapter.xml
index a8298fd31b..bc6153e124 100644
--- a/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/handbook/config/chapter.xml
@@ -1124,7 +1124,7 @@ ukphy1:  10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto</screen>
 	<indexterm><primary>KLD (module noyau chargeable)</primary></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>Malheureusement il y a toujours de nombreux fabricants
 	  qui ne fournissent pas &agrave; la communaut� des
diff --git a/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile b/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile
index be1f4f01ab..b286550fbb 100644
--- a/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	cutting-edge/chapter.sgml
+CHAPTERS= 	cutting-edge/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/desktop/Makefile b/fr_FR.ISO8859-1/books/handbook/desktop/Makefile
index a1d50a9ca8..3447e8f5c0 100644
--- a/fr_FR.ISO8859-1/books/handbook/desktop/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/desktop/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	desktop/chapter.sgml
+CHAPTERS= 	desktop/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/disks/Makefile b/fr_FR.ISO8859-1/books/handbook/disks/Makefile
index cb4d2393c6..11e8abc521 100644
--- a/fr_FR.ISO8859-1/books/handbook/disks/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/disks/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	disks/chapter.sgml
+CHAPTERS= 	disks/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/disks/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/dtrace/Makefile b/fr_FR.ISO8859-1/books/handbook/dtrace/Makefile
index 0a0e6e03dc..f766c4c4df 100644
--- a/fr_FR.ISO8859-1/books/handbook/dtrace/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/dtrace/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	dtrace/chapter.sgml
+CHAPTERS= 	dtrace/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/dtrace/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/dtrace/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/dtrace/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/dtrace/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/eresources/Makefile b/fr_FR.ISO8859-1/books/handbook/eresources/Makefile
index 74c5373f4b..c9325bd974 100644
--- a/fr_FR.ISO8859-1/books/handbook/eresources/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/eresources/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	eresources/chapter.sgml
+CHAPTERS= 	eresources/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/eresources/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/firewalls/Makefile b/fr_FR.ISO8859-1/books/handbook/firewalls/Makefile
index ba461597a8..4dc65234e6 100644
--- a/fr_FR.ISO8859-1/books/handbook/firewalls/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/firewalls/Makefile
@@ -5,7 +5,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	firewalls/chapter.sgml
+CHAPTERS= 	firewalls/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/firewalls/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/firewalls/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/geom/Makefile b/fr_FR.ISO8859-1/books/handbook/geom/Makefile
index 59e5759cdc..f574c00011 100644
--- a/fr_FR.ISO8859-1/books/handbook/geom/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/geom/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	geom/chapter.sgml
+CHAPTERS= 	geom/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/geom/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/install/Makefile b/fr_FR.ISO8859-1/books/handbook/install/Makefile
index 381cc1135f..3c6dad40a9 100644
--- a/fr_FR.ISO8859-1/books/handbook/install/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/install/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	install/chapter.sgml
+CHAPTERS= 	install/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/install/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/install/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/introduction/Makefile b/fr_FR.ISO8859-1/books/handbook/introduction/Makefile
index 887f1886a1..861902bbd1 100644
--- a/fr_FR.ISO8859-1/books/handbook/introduction/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/introduction/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	introduction/chapter.sgml
+CHAPTERS= 	introduction/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/introduction/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/jails/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/jails/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/jails/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile b/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile
index 3809c05d52..7c41136f4d 100644
--- a/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	kernelconfig/chapter.sgml
+CHAPTERS= 	kernelconfig/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/l10n/Makefile b/fr_FR.ISO8859-1/books/handbook/l10n/Makefile
index 2bde9fc6fe..15d6d890c6 100644
--- a/fr_FR.ISO8859-1/books/handbook/l10n/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/l10n/Makefile
@@ -9,7 +9,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	l10n/chapter.sgml
+CHAPTERS= 	l10n/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/l10n/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/mac/Makefile b/fr_FR.ISO8859-1/books/handbook/mac/Makefile
index 74aca4172f..ecd40cd7e2 100644
--- a/fr_FR.ISO8859-1/books/handbook/mac/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/mac/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mac/chapter.sgml
+CHAPTERS= 	mac/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/mac/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/mac/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/mail/Makefile b/fr_FR.ISO8859-1/books/handbook/mail/Makefile
index 6d1c002864..ad0ce1d2b5 100644
--- a/fr_FR.ISO8859-1/books/handbook/mail/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/mail/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	mail/chapter.sgml
+CHAPTERS= 	mail/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile b/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile
index ffcd9427ef..2e103156c4 100644
--- a/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	mirrors/chapter.sgml
+CHAPTERS= 	mirrors/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/mirrors/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile b/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile
index df817c51dd..5bd60b3a62 100644
--- a/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.2
 #
 
-CHAPTERS= 	multimedia/chapter.sgml
+CHAPTERS= 	multimedia/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/multimedia/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile b/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile
index 150dbe3121..8f39ebad57 100644
--- a/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile
+++ b/fr_FR.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/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/network-servers/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile b/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile
index 07f0e1858c..fa1c55cc58 100644
--- a/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.2
 #
 
-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/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/ports/Makefile b/fr_FR.ISO8859-1/books/handbook/ports/Makefile
index 5208c3dcaa..ef3003422b 100644
--- a/fr_FR.ISO8859-1/books/handbook/ports/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/ports/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	ports/chapter.sgml
+CHAPTERS= 	ports/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/ports/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/ports/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml b/fr_FR.ISO8859-1/books/handbook/preface/preface.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/preface/preface.sgml
rename to fr_FR.ISO8859-1/books/handbook/preface/preface.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/printing/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/printing/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/security/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/security/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/security/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
similarity index 96%
rename from fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 20f6e0cff8..d4e4fd8974 100644
--- a/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD French Documentation Project
 
      $FreeBSD$
-     $Id: chapter.sgml,v 1.5 2004-12-24 19:26:48 blackend Exp $
+     $Id: chapter.xml,v 1.5 2004-12-24 19:26:48 blackend Exp $
 -->
 
 <chapter id="serialcomms">
diff --git a/fr_FR.ISO8859-1/books/handbook/users/Makefile b/fr_FR.ISO8859-1/books/handbook/users/Makefile
index d8842ec7c5..5cd1693df2 100644
--- a/fr_FR.ISO8859-1/books/handbook/users/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/users/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	users/chapter.sgml
+CHAPTERS= 	users/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/users/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/users/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/users/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/vinum/Makefile b/fr_FR.ISO8859-1/books/handbook/vinum/Makefile
index 1e2c1fe6da..5b0f9e5a9a 100644
--- a/fr_FR.ISO8859-1/books/handbook/vinum/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/vinum/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	vinum/chapter.sgml
+CHAPTERS= 	vinum/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
similarity index 99%
rename from fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
index 24b8c24dd3..06df24be69 100644
--- a/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml
+++ b/fr_FR.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -10,7 +10,7 @@
 	The FreeBSD French Documentation Project
 
 	$FreeBSD$
-	$Id: chapter.sgml,v 1.5 2010-09-06 08:31:48 blackend Exp $
+	$Id: chapter.xml,v 1.5 2010-09-06 08:31:48 blackend Exp $
 	Original revision: 1.13
 -->
 
diff --git a/fr_FR.ISO8859-1/books/handbook/virtualization/Makefile b/fr_FR.ISO8859-1/books/handbook/virtualization/Makefile
index 4c89488e9c..7f5a1fd58b 100644
--- a/fr_FR.ISO8859-1/books/handbook/virtualization/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/virtualization/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	virtualization/chapter.sgml
+CHAPTERS= 	virtualization/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/virtualization/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/x11/Makefile b/fr_FR.ISO8859-1/books/handbook/x11/Makefile
index 692e57ed5a..03673dcf23 100644
--- a/fr_FR.ISO8859-1/books/handbook/x11/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/x11/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	x11/chapter.sgml
+CHAPTERS= 	x11/chapter.xml
 
 VPATH=		..
 
diff --git a/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml b/fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml
rename to fr_FR.ISO8859-1/books/handbook/x11/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/Makefile b/fr_FR.ISO8859-1/books/porters-handbook/Makefile
index ee458fb168..d82ba2816d 100644
--- a/fr_FR.ISO8859-1/books/porters-handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/porters-handbook/Makefile
@@ -20,7 +20,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 # Use the local DSSSL file
 DSLHTML?= 	${.CURDIR}/freebsd.dsl
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/book.sgml b/fr_FR.ISO8859-1/books/porters-handbook/book.xml
similarity index 100%
rename from fr_FR.ISO8859-1/books/porters-handbook/book.sgml
rename to fr_FR.ISO8859-1/books/porters-handbook/book.xml
diff --git a/fr_FR.ISO8859-1/htdocs/Makefile b/fr_FR.ISO8859-1/htdocs/Makefile
index 97708f384f..3e0c79a989 100644
--- a/fr_FR.ISO8859-1/htdocs/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/Makefile
@@ -12,22 +12,22 @@
 
 # These are turned into validated, normalized HTML files.
 
-DOCS=  about.sgml
-DOCS+= applications.sgml
-DOCS+= art.sgml
-DOCS+= auditors.sgml
-DOCS+= availability.sgml
-DOCS+= community.sgml
-DOCS+= docs.sgml
-DOCS+= features.sgml
-DOCS+= internet.sgml
-DOCS+= logo.sgml
-DOCS+= mailto.sgml
-DOCS+= publish.sgml
-DOCS+= relnotes.sgml
-DOCS+= send-pr.sgml
-DOCS+= support.sgml
-DOCS+= where.sgml
+DOCS=  about.xml
+DOCS+= applications.xml
+DOCS+= art.xml
+DOCS+= auditors.xml
+DOCS+= availability.xml
+DOCS+= community.xml
+DOCS+= docs.xml
+DOCS+= features.xml
+DOCS+= internet.xml
+DOCS+= logo.xml
+DOCS+= mailto.xml
+DOCS+= publish.xml
+DOCS+= relnotes.xml
+DOCS+= send-pr.xml
+DOCS+= support.xml
+DOCS+= where.xml
 
 # These will be directly installed.
 
diff --git a/fr_FR.ISO8859-1/htdocs/about.sgml b/fr_FR.ISO8859-1/htdocs/about.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/about.sgml
rename to fr_FR.ISO8859-1/htdocs/about.xml
diff --git a/fr_FR.ISO8859-1/htdocs/advocacy/Makefile b/fr_FR.ISO8859-1/htdocs/advocacy/Makefile
index 89b453f2ed..f32560059e 100644
--- a/fr_FR.ISO8859-1/htdocs/advocacy/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/advocacy/Makefile
@@ -12,8 +12,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   index.sgml
-DOCS+=	myths.sgml
-# DOCS+=	letter.sgml
+DOCS=   index.xml
+DOCS+=	myths.xml
+# DOCS+=	letter.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/advocacy/index.sgml b/fr_FR.ISO8859-1/htdocs/advocacy/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/advocacy/index.sgml
rename to fr_FR.ISO8859-1/htdocs/advocacy/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/advocacy/myths.sgml b/fr_FR.ISO8859-1/htdocs/advocacy/myths.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/advocacy/myths.sgml
rename to fr_FR.ISO8859-1/htdocs/advocacy/myths.xml
diff --git a/fr_FR.ISO8859-1/htdocs/applications.sgml b/fr_FR.ISO8859-1/htdocs/applications.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/applications.sgml
rename to fr_FR.ISO8859-1/htdocs/applications.xml
diff --git a/fr_FR.ISO8859-1/htdocs/art.sgml b/fr_FR.ISO8859-1/htdocs/art.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/art.sgml
rename to fr_FR.ISO8859-1/htdocs/art.xml
diff --git a/fr_FR.ISO8859-1/htdocs/auditors.sgml b/fr_FR.ISO8859-1/htdocs/auditors.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/auditors.sgml
rename to fr_FR.ISO8859-1/htdocs/auditors.xml
diff --git a/fr_FR.ISO8859-1/htdocs/availability.sgml b/fr_FR.ISO8859-1/htdocs/availability.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/availability.sgml
rename to fr_FR.ISO8859-1/htdocs/availability.xml
diff --git a/fr_FR.ISO8859-1/htdocs/commercial/Makefile b/fr_FR.ISO8859-1/htdocs/commercial/Makefile
index 0878f41483..719962ab1b 100644
--- a/fr_FR.ISO8859-1/htdocs/commercial/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/commercial/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS =  commercial.sgml
+DOCS =  commercial.xml
 
 INDEXLINK=commercial.html
 
diff --git a/fr_FR.ISO8859-1/htdocs/commercial/commercial.sgml b/fr_FR.ISO8859-1/htdocs/commercial/commercial.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/commercial/commercial.sgml
rename to fr_FR.ISO8859-1/htdocs/commercial/commercial.xml
diff --git a/fr_FR.ISO8859-1/htdocs/commercial/includes.sgml b/fr_FR.ISO8859-1/htdocs/commercial/includes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/commercial/includes.sgml
rename to fr_FR.ISO8859-1/htdocs/commercial/includes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/community.sgml b/fr_FR.ISO8859-1/htdocs/community.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/community.sgml
rename to fr_FR.ISO8859-1/htdocs/community.xml
diff --git a/fr_FR.ISO8859-1/htdocs/community/Makefile b/fr_FR.ISO8859-1/htdocs/community/Makefile
index e47acb7988..d41aab9f5d 100644
--- a/fr_FR.ISO8859-1/htdocs/community/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/community/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   irc.sgml mailinglists.sgml newsgroups.sgml webresources.sgml
+DOCS=   irc.xml mailinglists.xml newsgroups.xml webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/community/irc.sgml b/fr_FR.ISO8859-1/htdocs/community/irc.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/community/irc.sgml
rename to fr_FR.ISO8859-1/htdocs/community/irc.xml
diff --git a/fr_FR.ISO8859-1/htdocs/community/mailinglists.sgml b/fr_FR.ISO8859-1/htdocs/community/mailinglists.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/community/mailinglists.sgml
rename to fr_FR.ISO8859-1/htdocs/community/mailinglists.xml
diff --git a/fr_FR.ISO8859-1/htdocs/community/newsgroups.sgml b/fr_FR.ISO8859-1/htdocs/community/newsgroups.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/community/newsgroups.sgml
rename to fr_FR.ISO8859-1/htdocs/community/newsgroups.xml
diff --git a/fr_FR.ISO8859-1/htdocs/community/webresources.sgml b/fr_FR.ISO8859-1/htdocs/community/webresources.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/community/webresources.sgml
rename to fr_FR.ISO8859-1/htdocs/community/webresources.xml
diff --git a/fr_FR.ISO8859-1/htdocs/copyright/Makefile b/fr_FR.ISO8859-1/htdocs/copyright/Makefile
index e5dec55683..66572aabb5 100644
--- a/fr_FR.ISO8859-1/htdocs/copyright/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/copyright/Makefile
@@ -10,12 +10,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/fr_FR.ISO8859-1/htdocs/copyright/copyright.sgml b/fr_FR.ISO8859-1/htdocs/copyright/copyright.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/copyright/copyright.sgml
rename to fr_FR.ISO8859-1/htdocs/copyright/copyright.xml
diff --git a/fr_FR.ISO8859-1/htdocs/copyright/daemon.sgml b/fr_FR.ISO8859-1/htdocs/copyright/daemon.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/copyright/daemon.sgml
rename to fr_FR.ISO8859-1/htdocs/copyright/daemon.xml
diff --git a/fr_FR.ISO8859-1/htdocs/copyright/freebsd-doc-license.sgml b/fr_FR.ISO8859-1/htdocs/copyright/freebsd-doc-license.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/copyright/freebsd-doc-license.sgml
rename to fr_FR.ISO8859-1/htdocs/copyright/freebsd-doc-license.xml
diff --git a/fr_FR.ISO8859-1/htdocs/copyright/freebsd-license.sgml b/fr_FR.ISO8859-1/htdocs/copyright/freebsd-license.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/copyright/freebsd-license.sgml
rename to fr_FR.ISO8859-1/htdocs/copyright/freebsd-license.xml
diff --git a/fr_FR.ISO8859-1/htdocs/copyright/license.sgml b/fr_FR.ISO8859-1/htdocs/copyright/license.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/copyright/license.sgml
rename to fr_FR.ISO8859-1/htdocs/copyright/license.xml
diff --git a/fr_FR.ISO8859-1/htdocs/copyright/trademarks.sgml b/fr_FR.ISO8859-1/htdocs/copyright/trademarks.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/copyright/trademarks.sgml
rename to fr_FR.ISO8859-1/htdocs/copyright/trademarks.xml
diff --git a/fr_FR.ISO8859-1/htdocs/developers.sgml b/fr_FR.ISO8859-1/htdocs/developers.xml
similarity index 99%
rename from fr_FR.ISO8859-1/htdocs/developers.sgml
rename to fr_FR.ISO8859-1/htdocs/developers.xml
index 742cc0ad34..7f1441442c 100644
--- a/fr_FR.ISO8859-1/htdocs/developers.sgml
+++ b/fr_FR.ISO8859-1/htdocs/developers.xml
@@ -195,7 +195,7 @@ $FreeBSD$
 <!ENTITY a.wpaul "Bill Paul">
 <!ENTITY a.yar "Yar Tikhiy">
 
-<!-- Below we list the various hats.  This is used in internal/staff.sgml
+<!-- Below we list the various hats.  This is used in internal/staff.xml
 so that we may keep a list of hat owners and modify only this file. -->
 
 <!-- FreeBSD Bugmeister -->
diff --git a/fr_FR.ISO8859-1/htdocs/developers/Makefile b/fr_FR.ISO8859-1/htdocs/developers/Makefile
index 5aa5c75f2c..3e354e9c9b 100644
--- a/fr_FR.ISO8859-1/htdocs/developers/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/developers/Makefile
@@ -9,6 +9,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   cvs.sgml
+DOCS=   cvs.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/developers/cvs.sgml b/fr_FR.ISO8859-1/htdocs/developers/cvs.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/developers/cvs.sgml
rename to fr_FR.ISO8859-1/htdocs/developers/cvs.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docproj/Makefile b/fr_FR.ISO8859-1/htdocs/docproj/Makefile
index 0222389085..060e0efcb8 100644
--- a/fr_FR.ISO8859-1/htdocs/docproj/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/docproj/Makefile
@@ -10,15 +10,15 @@
 .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=   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
 
 INDEXLINK= docproj.html
 
diff --git a/fr_FR.ISO8859-1/htdocs/docproj/current.sgml b/fr_FR.ISO8859-1/htdocs/docproj/current.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docproj/current.sgml
rename to fr_FR.ISO8859-1/htdocs/docproj/current.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docproj/doc-set.sgml b/fr_FR.ISO8859-1/htdocs/docproj/doc-set.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docproj/doc-set.sgml
rename to fr_FR.ISO8859-1/htdocs/docproj/doc-set.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docproj/docproj.sgml b/fr_FR.ISO8859-1/htdocs/docproj/docproj.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docproj/docproj.sgml
rename to fr_FR.ISO8859-1/htdocs/docproj/docproj.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docproj/handbook.sgml b/fr_FR.ISO8859-1/htdocs/docproj/handbook.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docproj/handbook.sgml
rename to fr_FR.ISO8859-1/htdocs/docproj/handbook.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docproj/handbook3.sgml b/fr_FR.ISO8859-1/htdocs/docproj/handbook3.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docproj/handbook3.sgml
rename to fr_FR.ISO8859-1/htdocs/docproj/handbook3.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docproj/sgml.sgml b/fr_FR.ISO8859-1/htdocs/docproj/sgml.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docproj/sgml.sgml
rename to fr_FR.ISO8859-1/htdocs/docproj/sgml.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docproj/submitting.sgml b/fr_FR.ISO8859-1/htdocs/docproj/submitting.xml
similarity index 96%
rename from fr_FR.ISO8859-1/htdocs/docproj/submitting.sgml
rename to fr_FR.ISO8859-1/htdocs/docproj/submitting.xml
index 57e1432074..420040321e 100644
--- a/fr_FR.ISO8859-1/htdocs/docproj/submitting.sgml
+++ b/fr_FR.ISO8859-1/htdocs/docproj/submitting.xml
@@ -113,16 +113,16 @@
 
     <ol>
       <li><p>Faire une copie du fichier que vous allez modifier. Si vous
-      modifiez <tt>foo.sgml</tt>, tapez</p>
+      modifiez <tt>foo.xml</tt>, tapez</p>
 
 	<pre>
-    % <b>cp foo.sgml foo.sgml.old</b>
+    % <b>cp foo.xml foo.xml.old</b>
 	</pre></li>
 
-      <li><p>Puis, proc�dez &agrave; vos modifications sur foo.sgml.</p>
+      <li><p>Puis, proc�dez &agrave; vos modifications sur foo.xml.</p>
 
 	<pre>
-    % <b>vi foo.sgml</b>
+    % <b>vi foo.xml</b>
     ... tap tap tap ...
 
     ... testez les changements, relisez pour corriger les coquilles, etc...
@@ -131,7 +131,7 @@
       <li><p>Faites le diff. La commande est la suivante&nbsp;:</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>Ceci rep�re les diff�rences entre les deux fichiers, et les �crit dans le
diff --git a/fr_FR.ISO8859-1/htdocs/docproj/translations.sgml b/fr_FR.ISO8859-1/htdocs/docproj/translations.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docproj/translations.sgml
rename to fr_FR.ISO8859-1/htdocs/docproj/translations.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docproj/who.sgml b/fr_FR.ISO8859-1/htdocs/docproj/who.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docproj/who.sgml
rename to fr_FR.ISO8859-1/htdocs/docproj/who.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docs.sgml b/fr_FR.ISO8859-1/htdocs/docs.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docs.sgml
rename to fr_FR.ISO8859-1/htdocs/docs.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docs/Makefile b/fr_FR.ISO8859-1/htdocs/docs/Makefile
index d81fe3dd49..3f7b0be589 100644
--- a/fr_FR.ISO8859-1/htdocs/docs/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/docs/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   books.sgml man.sgml webresources.sgml
+DOCS=   books.xml man.xml webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/docs/books.sgml b/fr_FR.ISO8859-1/htdocs/docs/books.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docs/books.sgml
rename to fr_FR.ISO8859-1/htdocs/docs/books.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docs/man.sgml b/fr_FR.ISO8859-1/htdocs/docs/man.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docs/man.sgml
rename to fr_FR.ISO8859-1/htdocs/docs/man.xml
diff --git a/fr_FR.ISO8859-1/htdocs/docs/webresources.sgml b/fr_FR.ISO8859-1/htdocs/docs/webresources.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/docs/webresources.sgml
rename to fr_FR.ISO8859-1/htdocs/docs/webresources.xml
diff --git a/fr_FR.ISO8859-1/htdocs/donations/Makefile b/fr_FR.ISO8859-1/htdocs/donations/Makefile
index 1010078a68..c2c5661e26 100644
--- a/fr_FR.ISO8859-1/htdocs/donations/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/donations/Makefile
@@ -10,6 +10,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/fr_FR.ISO8859-1/htdocs/donations/donors.sgml b/fr_FR.ISO8859-1/htdocs/donations/donors.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/donations/donors.sgml
rename to fr_FR.ISO8859-1/htdocs/donations/donors.xml
diff --git a/fr_FR.ISO8859-1/htdocs/donations/index.sgml b/fr_FR.ISO8859-1/htdocs/donations/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/donations/index.sgml
rename to fr_FR.ISO8859-1/htdocs/donations/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/donations/wantlist.sgml b/fr_FR.ISO8859-1/htdocs/donations/wantlist.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/donations/wantlist.sgml
rename to fr_FR.ISO8859-1/htdocs/donations/wantlist.xml
diff --git a/fr_FR.ISO8859-1/htdocs/features.sgml b/fr_FR.ISO8859-1/htdocs/features.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/features.sgml
rename to fr_FR.ISO8859-1/htdocs/features.xml
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/Makefile b/fr_FR.ISO8859-1/htdocs/gnome/Makefile
index 04aea663fc..5c44cabe6c 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/gnome/Makefile
@@ -13,8 +13,8 @@
 SUBDIR=		docs
 # SUBDIR+=	images
 
-DOCS=	screenshots.sgml
-DOCS+=	contact.sgml
+DOCS=	screenshots.xml
+DOCS+=	contact.xml
 
 # DATA=	gnome_upgrade.sh
 # DATA+=	gnomelogalyzer.sh
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/contact.sgml b/fr_FR.ISO8859-1/htdocs/gnome/contact.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/gnome/contact.sgml
rename to fr_FR.ISO8859-1/htdocs/gnome/contact.xml
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/docs/22knownissues.sgml b/fr_FR.ISO8859-1/htdocs/gnome/docs/22knownissues.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/gnome/docs/22knownissues.sgml
rename to fr_FR.ISO8859-1/htdocs/gnome/docs/22knownissues.xml
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/docs/Makefile b/fr_FR.ISO8859-1/htdocs/gnome/docs/Makefile
index 4b9e4f0f01..3763c4c984 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/docs/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/gnome/docs/Makefile
@@ -10,12 +10,12 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	faq2.sgml
-DOCS+=	gnome_porting.sgml
-DOCS+=	gnome2_porting.sgml
-DOCS+=	porting.sgml
-DOCS+=	bugging.sgml
-DOCS+=  volunteer.sgml
-# DOCS+=	knownissues.sgml
+DOCS=	faq2.xml
+DOCS+=	gnome_porting.xml
+DOCS+=	gnome2_porting.xml
+DOCS+=	porting.xml
+DOCS+=	bugging.xml
+DOCS+=  volunteer.xml
+# DOCS+=	knownissues.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/docs/bugging.sgml b/fr_FR.ISO8859-1/htdocs/gnome/docs/bugging.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/gnome/docs/bugging.sgml
rename to fr_FR.ISO8859-1/htdocs/gnome/docs/bugging.xml
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/docs/faq.sgml b/fr_FR.ISO8859-1/htdocs/gnome/docs/faq.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/gnome/docs/faq.sgml
rename to fr_FR.ISO8859-1/htdocs/gnome/docs/faq.xml
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/docs/faq2.sgml b/fr_FR.ISO8859-1/htdocs/gnome/docs/faq2.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/gnome/docs/faq2.sgml
rename to fr_FR.ISO8859-1/htdocs/gnome/docs/faq2.xml
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/docs/gnome2_porting.sgml b/fr_FR.ISO8859-1/htdocs/gnome/docs/gnome2_porting.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/gnome/docs/gnome2_porting.sgml
rename to fr_FR.ISO8859-1/htdocs/gnome/docs/gnome2_porting.xml
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/docs/gnome_porting.sgml b/fr_FR.ISO8859-1/htdocs/gnome/docs/gnome_porting.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/gnome/docs/gnome_porting.sgml
rename to fr_FR.ISO8859-1/htdocs/gnome/docs/gnome_porting.xml
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/docs/porting.sgml b/fr_FR.ISO8859-1/htdocs/gnome/docs/porting.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/gnome/docs/porting.sgml
rename to fr_FR.ISO8859-1/htdocs/gnome/docs/porting.xml
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/docs/volunteer.sgml b/fr_FR.ISO8859-1/htdocs/gnome/docs/volunteer.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/gnome/docs/volunteer.sgml
rename to fr_FR.ISO8859-1/htdocs/gnome/docs/volunteer.xml
diff --git a/fr_FR.ISO8859-1/htdocs/gnome/screenshots.sgml b/fr_FR.ISO8859-1/htdocs/gnome/screenshots.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/gnome/screenshots.sgml
rename to fr_FR.ISO8859-1/htdocs/gnome/screenshots.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/Makefile b/fr_FR.ISO8859-1/htdocs/internal/Makefile
index 34ebce8522..d6d03ed10b 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/internal/Makefile
@@ -10,21 +10,21 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	photos.sgml
-DOCS+=	internal.sgml
-DOCS+= 	about.sgml
-DOCS+= 	machines.sgml
-DOCS+= 	mirror.sgml
-DOCS+=	new-account.sgml
-DOCS+=	statistic.sgml
-DOCS+= 	developer.sgml
-DOCS+=	bylaws.sgml
-DOCS+=  releng.sgml
-DOCS+=	expire-bits.sgml
-DOCS+=	core-vote.sgml
-# DOCS+=	trb-dispute.sgml
-# DOCS+=	doceng.sgml
-# DOCS+=	rtp.sgml
+DOCS=	photos.xml
+DOCS+=	internal.xml
+DOCS+= 	about.xml
+DOCS+= 	machines.xml
+DOCS+= 	mirror.xml
+DOCS+=	new-account.xml
+DOCS+=	statistic.xml
+DOCS+= 	developer.xml
+DOCS+=	bylaws.xml
+DOCS+=  releng.xml
+DOCS+=	expire-bits.xml
+DOCS+=	core-vote.xml
+# DOCS+=	trb-dispute.xml
+# DOCS+=	doceng.xml
+# DOCS+=	rtp.xml
 
 INDEXLINK=	internal.html
 
@@ -32,7 +32,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
 .PHONY: homepage.inc
 
 homepage.inc: ${DOC_PREFIX}/en_US.ISO8859-1/htdocs/internal/homepage.pl
diff --git a/fr_FR.ISO8859-1/htdocs/internal/about.sgml b/fr_FR.ISO8859-1/htdocs/internal/about.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/about.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/about.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/bylaws.sgml b/fr_FR.ISO8859-1/htdocs/internal/bylaws.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/bylaws.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/bylaws.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/core-vote.sgml b/fr_FR.ISO8859-1/htdocs/internal/core-vote.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/core-vote.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/core-vote.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/developer.sgml b/fr_FR.ISO8859-1/htdocs/internal/developer.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/developer.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/developer.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/expire-bits.sgml b/fr_FR.ISO8859-1/htdocs/internal/expire-bits.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/expire-bits.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/expire-bits.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/homepage.sgml b/fr_FR.ISO8859-1/htdocs/internal/homepage.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/homepage.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/homepage.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/internal.sgml b/fr_FR.ISO8859-1/htdocs/internal/internal.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/internal.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/internal.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/machines.sgml b/fr_FR.ISO8859-1/htdocs/internal/machines.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/machines.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/machines.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/mirror.sgml b/fr_FR.ISO8859-1/htdocs/internal/mirror.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/mirror.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/mirror.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/new-account.sgml b/fr_FR.ISO8859-1/htdocs/internal/new-account.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/new-account.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/new-account.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/photos.sgml b/fr_FR.ISO8859-1/htdocs/internal/photos.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/photos.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/photos.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/releng.sgml b/fr_FR.ISO8859-1/htdocs/internal/releng.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/releng.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/releng.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internal/statistic.sgml b/fr_FR.ISO8859-1/htdocs/internal/statistic.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internal/statistic.sgml
rename to fr_FR.ISO8859-1/htdocs/internal/statistic.xml
diff --git a/fr_FR.ISO8859-1/htdocs/internet.sgml b/fr_FR.ISO8859-1/htdocs/internet.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/internet.sgml
rename to fr_FR.ISO8859-1/htdocs/internet.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/Makefile b/fr_FR.ISO8859-1/htdocs/java/Makefile
index 1db0e3a4ac..481c47dc80 100644
--- a/fr_FR.ISO8859-1/htdocs/java/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/java/Makefile
@@ -14,12 +14,12 @@ SUBDIR =	dists
 SUBDIR+=	docs
 SUBDIR+=	links
 
-DOCS =  advocacy.sgml
-DOCS+=  howhelp.sgml
-DOCS+=  index.sgml
-DOCS+=  install.sgml
-DOCS+=  newsflash.sgml
-DOCS+=  press.sgml
+DOCS =  advocacy.xml
+DOCS+=  howhelp.xml
+DOCS+=  index.xml
+DOCS+=  install.xml
+DOCS+=  newsflash.xml
+DOCS+=  press.xml
 
 DATA=	j2j.gif
 
diff --git a/fr_FR.ISO8859-1/htdocs/java/advocacy.sgml b/fr_FR.ISO8859-1/htdocs/java/advocacy.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/advocacy.sgml
rename to fr_FR.ISO8859-1/htdocs/java/advocacy.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/dists/15.sgml b/fr_FR.ISO8859-1/htdocs/java/dists/15.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/dists/15.sgml
rename to fr_FR.ISO8859-1/htdocs/java/dists/15.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/dists/Makefile b/fr_FR.ISO8859-1/htdocs/java/dists/Makefile
index f58c15d4f4..be4d249039 100644
--- a/fr_FR.ISO8859-1/htdocs/java/dists/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/java/dists/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	15.sgml
-DOCS+=	index.sgml
+DOCS=	15.xml
+DOCS+=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/java/dists/index.sgml b/fr_FR.ISO8859-1/htdocs/java/dists/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/dists/index.sgml
rename to fr_FR.ISO8859-1/htdocs/java/dists/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/docs/Makefile b/fr_FR.ISO8859-1/htdocs/java/docs/Makefile
index 98ce0665bf..7978a41aef 100644
--- a/fr_FR.ISO8859-1/htdocs/java/docs/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/java/docs/Makefile
@@ -10,10 +10,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/fr_FR.ISO8859-1/htdocs/java/docs/faq.sgml b/fr_FR.ISO8859-1/htdocs/java/docs/faq.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/docs/faq.sgml
rename to fr_FR.ISO8859-1/htdocs/java/docs/faq.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/docs/howtoports.sgml b/fr_FR.ISO8859-1/htdocs/java/docs/howtoports.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/docs/howtoports.sgml
rename to fr_FR.ISO8859-1/htdocs/java/docs/howtoports.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/docs/newbies.sgml b/fr_FR.ISO8859-1/htdocs/java/docs/newbies.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/docs/newbies.sgml
rename to fr_FR.ISO8859-1/htdocs/java/docs/newbies.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/docs/performance.sgml b/fr_FR.ISO8859-1/htdocs/java/docs/performance.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/docs/performance.sgml
rename to fr_FR.ISO8859-1/htdocs/java/docs/performance.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/docs/tutorials.sgml b/fr_FR.ISO8859-1/htdocs/java/docs/tutorials.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/docs/tutorials.sgml
rename to fr_FR.ISO8859-1/htdocs/java/docs/tutorials.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/howhelp.sgml b/fr_FR.ISO8859-1/htdocs/java/howhelp.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/howhelp.sgml
rename to fr_FR.ISO8859-1/htdocs/java/howhelp.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/index.sgml b/fr_FR.ISO8859-1/htdocs/java/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/index.sgml
rename to fr_FR.ISO8859-1/htdocs/java/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/install.sgml b/fr_FR.ISO8859-1/htdocs/java/install.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/install.sgml
rename to fr_FR.ISO8859-1/htdocs/java/install.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/links/Makefile b/fr_FR.ISO8859-1/htdocs/java/links/Makefile
index 9d69cc8af0..eadde36e37 100644
--- a/fr_FR.ISO8859-1/htdocs/java/links/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/java/links/Makefile
@@ -10,15 +10,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/fr_FR.ISO8859-1/htdocs/java/links/api.sgml b/fr_FR.ISO8859-1/htdocs/java/links/api.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/links/api.sgml
rename to fr_FR.ISO8859-1/htdocs/java/links/api.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/links/development.sgml b/fr_FR.ISO8859-1/htdocs/java/links/development.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/links/development.sgml
rename to fr_FR.ISO8859-1/htdocs/java/links/development.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/links/documentation.sgml b/fr_FR.ISO8859-1/htdocs/java/links/documentation.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/links/documentation.sgml
rename to fr_FR.ISO8859-1/htdocs/java/links/documentation.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/links/freebsd.sgml b/fr_FR.ISO8859-1/htdocs/java/links/freebsd.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/links/freebsd.sgml
rename to fr_FR.ISO8859-1/htdocs/java/links/freebsd.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/links/index.sgml b/fr_FR.ISO8859-1/htdocs/java/links/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/links/index.sgml
rename to fr_FR.ISO8859-1/htdocs/java/links/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/links/resources.sgml b/fr_FR.ISO8859-1/htdocs/java/links/resources.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/links/resources.sgml
rename to fr_FR.ISO8859-1/htdocs/java/links/resources.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/links/servlets.sgml b/fr_FR.ISO8859-1/htdocs/java/links/servlets.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/links/servlets.sgml
rename to fr_FR.ISO8859-1/htdocs/java/links/servlets.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/links/tools.sgml b/fr_FR.ISO8859-1/htdocs/java/links/tools.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/links/tools.sgml
rename to fr_FR.ISO8859-1/htdocs/java/links/tools.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/links/tutorials.sgml b/fr_FR.ISO8859-1/htdocs/java/links/tutorials.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/links/tutorials.sgml
rename to fr_FR.ISO8859-1/htdocs/java/links/tutorials.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/links/vendor.sgml b/fr_FR.ISO8859-1/htdocs/java/links/vendor.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/links/vendor.sgml
rename to fr_FR.ISO8859-1/htdocs/java/links/vendor.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/newsflash.sgml b/fr_FR.ISO8859-1/htdocs/java/newsflash.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/newsflash.sgml
rename to fr_FR.ISO8859-1/htdocs/java/newsflash.xml
diff --git a/fr_FR.ISO8859-1/htdocs/java/press.sgml b/fr_FR.ISO8859-1/htdocs/java/press.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/java/press.sgml
rename to fr_FR.ISO8859-1/htdocs/java/press.xml
diff --git a/fr_FR.ISO8859-1/htdocs/logo.sgml b/fr_FR.ISO8859-1/htdocs/logo.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/logo.sgml
rename to fr_FR.ISO8859-1/htdocs/logo.xml
diff --git a/fr_FR.ISO8859-1/htdocs/mailto.sgml b/fr_FR.ISO8859-1/htdocs/mailto.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/mailto.sgml
rename to fr_FR.ISO8859-1/htdocs/mailto.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/1996/Makefile b/fr_FR.ISO8859-1/htdocs/news/1996/Makefile
index 5382cf1664..5dec9a8d33 100644
--- a/fr_FR.ISO8859-1/htdocs/news/1996/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/news/1996/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/news/1996/index.sgml b/fr_FR.ISO8859-1/htdocs/news/1996/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/1996/index.sgml
rename to fr_FR.ISO8859-1/htdocs/news/1996/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/1997/Makefile b/fr_FR.ISO8859-1/htdocs/news/1997/Makefile
index 86b4a214a9..4b928097ef 100644
--- a/fr_FR.ISO8859-1/htdocs/news/1997/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/news/1997/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
 
diff --git a/fr_FR.ISO8859-1/htdocs/news/1997/index.sgml b/fr_FR.ISO8859-1/htdocs/news/1997/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/1997/index.sgml
rename to fr_FR.ISO8859-1/htdocs/news/1997/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/1998/Makefile b/fr_FR.ISO8859-1/htdocs/news/1998/Makefile
index 375f330b39..4fccbd31cd 100644
--- a/fr_FR.ISO8859-1/htdocs/news/1998/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/news/1998/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
 
diff --git a/fr_FR.ISO8859-1/htdocs/news/1998/index.sgml b/fr_FR.ISO8859-1/htdocs/news/1998/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/1998/index.sgml
rename to fr_FR.ISO8859-1/htdocs/news/1998/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/1999/Makefile b/fr_FR.ISO8859-1/htdocs/news/1999/Makefile
index 0be0d000c6..bde3f730f6 100644
--- a/fr_FR.ISO8859-1/htdocs/news/1999/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/news/1999/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/news/1999/index.sgml b/fr_FR.ISO8859-1/htdocs/news/1999/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/1999/index.sgml
rename to fr_FR.ISO8859-1/htdocs/news/1999/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/2000/Makefile b/fr_FR.ISO8859-1/htdocs/news/2000/Makefile
index 0be0d000c6..bde3f730f6 100644
--- a/fr_FR.ISO8859-1/htdocs/news/2000/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/news/2000/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/news/2000/index.sgml b/fr_FR.ISO8859-1/htdocs/news/2000/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/2000/index.sgml
rename to fr_FR.ISO8859-1/htdocs/news/2000/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/Makefile b/fr_FR.ISO8859-1/htdocs/news/Makefile
index 221e8713db..2ff4668282 100644
--- a/fr_FR.ISO8859-1/htdocs/news/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/news/Makefile
@@ -10,22 +10,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/fr_FR.ISO8859-1/htdocs/news/news.sgml b/fr_FR.ISO8859-1/htdocs/news/news.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/news.sgml
rename to fr_FR.ISO8859-1/htdocs/news/news.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/press-rel-1.sgml b/fr_FR.ISO8859-1/htdocs/news/press-rel-1.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/press-rel-1.sgml
rename to fr_FR.ISO8859-1/htdocs/news/press-rel-1.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/press-rel-2.sgml b/fr_FR.ISO8859-1/htdocs/news/press-rel-2.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/press-rel-2.sgml
rename to fr_FR.ISO8859-1/htdocs/news/press-rel-2.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/press-rel-3.sgml b/fr_FR.ISO8859-1/htdocs/news/press-rel-3.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/press-rel-3.sgml
rename to fr_FR.ISO8859-1/htdocs/news/press-rel-3.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/press-rel-4.sgml b/fr_FR.ISO8859-1/htdocs/news/press-rel-4.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/press-rel-4.sgml
rename to fr_FR.ISO8859-1/htdocs/news/press-rel-4.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/press-rel-5.sgml b/fr_FR.ISO8859-1/htdocs/news/press-rel-5.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/press-rel-5.sgml
rename to fr_FR.ISO8859-1/htdocs/news/press-rel-5.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/press-rel-6.sgml b/fr_FR.ISO8859-1/htdocs/news/press-rel-6.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/press-rel-6.sgml
rename to fr_FR.ISO8859-1/htdocs/news/press-rel-6.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/press-rel-7.sgml b/fr_FR.ISO8859-1/htdocs/news/press-rel-7.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/press-rel-7.sgml
rename to fr_FR.ISO8859-1/htdocs/news/press-rel-7.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/press-rel-8.sgml b/fr_FR.ISO8859-1/htdocs/news/press-rel-8.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/press-rel-8.sgml
rename to fr_FR.ISO8859-1/htdocs/news/press-rel-8.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/press-rel-9.sgml b/fr_FR.ISO8859-1/htdocs/news/press-rel-9.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/press-rel-9.sgml
rename to fr_FR.ISO8859-1/htdocs/news/press-rel-9.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/pressreleases.sgml b/fr_FR.ISO8859-1/htdocs/news/pressreleases.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/pressreleases.sgml
rename to fr_FR.ISO8859-1/htdocs/news/pressreleases.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/sou1999.sgml b/fr_FR.ISO8859-1/htdocs/news/sou1999.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/sou1999.sgml
rename to fr_FR.ISO8859-1/htdocs/news/sou1999.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/status/Makefile b/fr_FR.ISO8859-1/htdocs/news/status/Makefile
index 30b2bbce11..4ef6344d5e 100644
--- a/fr_FR.ISO8859-1/htdocs/news/status/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/news/status/Makefile
@@ -12,7 +12,7 @@
 
 .SUFFIXES:	.xml .html
 
-DOCS=	status.sgml
+DOCS=	status.xml
 
 #XMLDOCS=	report-june-2001
 #XMLDOCS+=	report-july-2001
diff --git a/fr_FR.ISO8859-1/htdocs/news/status/status.sgml b/fr_FR.ISO8859-1/htdocs/news/status/status.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/status/status.sgml
rename to fr_FR.ISO8859-1/htdocs/news/status/status.xml
diff --git a/fr_FR.ISO8859-1/htdocs/news/webchanges.sgml b/fr_FR.ISO8859-1/htdocs/news/webchanges.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/news/webchanges.sgml
rename to fr_FR.ISO8859-1/htdocs/news/webchanges.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/Makefile b/fr_FR.ISO8859-1/htdocs/platforms/Makefile
index af9cec5394..5a1cb1ecf7 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/platforms/Makefile
@@ -10,19 +10,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=	amd64
 SUBDIR=	ia64
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/alpha.sgml b/fr_FR.ISO8859-1/htdocs/platforms/alpha.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/alpha.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/alpha.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/amd64.sgml b/fr_FR.ISO8859-1/htdocs/platforms/amd64.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/amd64.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/amd64.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/arm.sgml b/fr_FR.ISO8859-1/htdocs/platforms/arm.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/arm.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/arm.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/i386.sgml b/fr_FR.ISO8859-1/htdocs/platforms/i386.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/i386.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/i386.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/ia64.sgml b/fr_FR.ISO8859-1/htdocs/platforms/ia64.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/ia64.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/ia64.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/ia64/Makefile b/fr_FR.ISO8859-1/htdocs/platforms/ia64/Makefile
index a87252f6a9..e1e723514e 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/ia64/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/platforms/ia64/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml machines.sgml refs.sgml todo.sgml
+DOCS=	index.xml machines.xml refs.xml todo.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/ia64/index.sgml b/fr_FR.ISO8859-1/htdocs/platforms/ia64/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/ia64/index.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/ia64/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/ia64/machines.sgml b/fr_FR.ISO8859-1/htdocs/platforms/ia64/machines.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/ia64/machines.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/ia64/machines.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/ia64/refs.sgml b/fr_FR.ISO8859-1/htdocs/platforms/ia64/refs.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/ia64/refs.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/ia64/refs.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/ia64/todo.sgml b/fr_FR.ISO8859-1/htdocs/platforms/ia64/todo.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/ia64/todo.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/ia64/todo.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/index.sgml b/fr_FR.ISO8859-1/htdocs/platforms/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/index.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/mips.sgml b/fr_FR.ISO8859-1/htdocs/platforms/mips.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/mips.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/mips.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/pc98.sgml b/fr_FR.ISO8859-1/htdocs/platforms/pc98.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/pc98.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/pc98.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/ppc.sgml b/fr_FR.ISO8859-1/htdocs/platforms/ppc.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/ppc.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/ppc.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/sparc.sgml b/fr_FR.ISO8859-1/htdocs/platforms/sparc.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/sparc.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/sparc.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/sun4v.sgml b/fr_FR.ISO8859-1/htdocs/platforms/sun4v.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/sun4v.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/sun4v.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/x86-64.sgml b/fr_FR.ISO8859-1/htdocs/platforms/x86-64.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/x86-64.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/x86-64.xml
diff --git a/fr_FR.ISO8859-1/htdocs/platforms/xbox.sgml b/fr_FR.ISO8859-1/htdocs/platforms/xbox.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/platforms/xbox.sgml
rename to fr_FR.ISO8859-1/htdocs/platforms/xbox.xml
diff --git a/fr_FR.ISO8859-1/htdocs/projects/Makefile b/fr_FR.ISO8859-1/htdocs/projects/Makefile
index d1bc307387..c2ddce3448 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/projects/Makefile
@@ -10,10 +10,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	projects.sgml
-DOCS+=	newbies.sgml
-DOCS+=	libh.sgml
-DOCS+=	cvsweb.sgml
+DOCS=	projects.xml
+DOCS+=	newbies.xml
+DOCS+=	libh.xml
+DOCS+=	cvsweb.xml
 
 INDEXLINK= projects.html
 
diff --git a/fr_FR.ISO8859-1/htdocs/projects/acpi/Makefile b/fr_FR.ISO8859-1/htdocs/projects/acpi/Makefile
index 6b37cc5e01..e03ac8fcab 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/acpi/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/projects/acpi/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	marks
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 DATA=	style.css
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/projects/acpi/index.sgml b/fr_FR.ISO8859-1/htdocs/projects/acpi/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/projects/acpi/index.sgml
rename to fr_FR.ISO8859-1/htdocs/projects/acpi/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/projects/busdma/Makefile b/fr_FR.ISO8859-1/htdocs/projects/busdma/Makefile
index 83c65e37ba..1357b64be6 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/busdma/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/projects/busdma/Makefile
@@ -14,7 +14,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/fr_FR.ISO8859-1/htdocs/projects/busdma/index.sgml b/fr_FR.ISO8859-1/htdocs/projects/busdma/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/projects/busdma/index.sgml
rename to fr_FR.ISO8859-1/htdocs/projects/busdma/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/projects/c99/Makefile b/fr_FR.ISO8859-1/htdocs/projects/c99/Makefile
index 02a0037641..9951bc0032 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/c99/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/projects/c99/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	mike
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 DATA=	style.css
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/projects/c99/index.sgml b/fr_FR.ISO8859-1/htdocs/projects/c99/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/projects/c99/index.sgml
rename to fr_FR.ISO8859-1/htdocs/projects/c99/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/projects/cvsweb.sgml b/fr_FR.ISO8859-1/htdocs/projects/cvsweb.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/projects/cvsweb.sgml
rename to fr_FR.ISO8859-1/htdocs/projects/cvsweb.xml
diff --git a/fr_FR.ISO8859-1/htdocs/projects/libh.sgml b/fr_FR.ISO8859-1/htdocs/projects/libh.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/projects/libh.sgml
rename to fr_FR.ISO8859-1/htdocs/projects/libh.xml
diff --git a/fr_FR.ISO8859-1/htdocs/projects/mips/Makefile b/fr_FR.ISO8859-1/htdocs/projects/mips/Makefile
index c260aa1cce..dbb3cb3e92 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/mips/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/projects/mips/Makefile
@@ -14,7 +14,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/fr_FR.ISO8859-1/htdocs/projects/mips/index.sgml b/fr_FR.ISO8859-1/htdocs/projects/mips/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/projects/mips/index.sgml
rename to fr_FR.ISO8859-1/htdocs/projects/mips/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/projects/newbies.sgml b/fr_FR.ISO8859-1/htdocs/projects/newbies.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/projects/newbies.sgml
rename to fr_FR.ISO8859-1/htdocs/projects/newbies.xml
diff --git a/fr_FR.ISO8859-1/htdocs/projects/projects.sgml b/fr_FR.ISO8859-1/htdocs/projects/projects.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/projects/projects.sgml
rename to fr_FR.ISO8859-1/htdocs/projects/projects.xml
diff --git a/fr_FR.ISO8859-1/htdocs/projects/updater.sgml b/fr_FR.ISO8859-1/htdocs/projects/updater.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/projects/updater.sgml
rename to fr_FR.ISO8859-1/htdocs/projects/updater.xml
diff --git a/fr_FR.ISO8859-1/htdocs/prstats/Makefile b/fr_FR.ISO8859-1/htdocs/prstats/Makefile
index 91bb23ea06..9b71efda35 100644
--- a/fr_FR.ISO8859-1/htdocs/prstats/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/prstats/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/prstats/index.sgml b/fr_FR.ISO8859-1/htdocs/prstats/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/prstats/index.sgml
rename to fr_FR.ISO8859-1/htdocs/prstats/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/publish.sgml b/fr_FR.ISO8859-1/htdocs/publish.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/publish.sgml
rename to fr_FR.ISO8859-1/htdocs/publish.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/2.0/Makefile b/fr_FR.ISO8859-1/htdocs/releases/2.0/Makefile
index e780d3838e..85880efbbb 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/2.0/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/2.0/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml credits.sgml install.sgml notes.sgml
-DOCS= credits.sgml
+# DOCS=	announce.xml credits.xml install.xml notes.xml
+DOCS= credits.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/2.0/credits.sgml b/fr_FR.ISO8859-1/htdocs/releases/2.0/credits.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/2.0/credits.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/2.0/credits.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/2.2.8R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/2.2.8R/Makefile
index 9612cb6a40..0dd51dc9e2 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/2.2.8R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/2.2.8R/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml notes.sgml errata.sgml
-DOCS= notes.sgml
+# DOCS=	announce.xml notes.xml errata.xml
+DOCS= notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/2.2.8R/notes.sgml b/fr_FR.ISO8859-1/htdocs/releases/2.2.8R/notes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/2.2.8R/notes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/2.2.8R/notes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/3.1R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/3.1R/Makefile
index 9612cb6a40..0dd51dc9e2 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/3.1R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/3.1R/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml notes.sgml errata.sgml
-DOCS= notes.sgml
+# DOCS=	announce.xml notes.xml errata.xml
+DOCS= notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/3.1R/notes.sgml b/fr_FR.ISO8859-1/htdocs/releases/3.1R/notes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/3.1R/notes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/3.1R/notes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/3.2R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/3.2R/Makefile
index 9612cb6a40..0dd51dc9e2 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/3.2R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/3.2R/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml notes.sgml errata.sgml
-DOCS= notes.sgml
+# DOCS=	announce.xml notes.xml errata.xml
+DOCS= notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/3.2R/notes.sgml b/fr_FR.ISO8859-1/htdocs/releases/3.2R/notes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/3.2R/notes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/3.2R/notes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/3.3R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/3.3R/Makefile
index 9612cb6a40..0dd51dc9e2 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/3.3R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/3.3R/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml notes.sgml errata.sgml
-DOCS= notes.sgml
+# DOCS=	announce.xml notes.xml errata.xml
+DOCS= notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/3.3R/notes.sgml b/fr_FR.ISO8859-1/htdocs/releases/3.3R/notes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/3.3R/notes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/3.3R/notes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/3.4R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/3.4R/Makefile
index 9612cb6a40..0dd51dc9e2 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/3.4R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/3.4R/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml notes.sgml errata.sgml
-DOCS= notes.sgml
+# DOCS=	announce.xml notes.xml errata.xml
+DOCS= notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/3.4R/notes.sgml b/fr_FR.ISO8859-1/htdocs/releases/3.4R/notes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/3.4R/notes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/3.4R/notes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/3.5R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/3.5R/Makefile
index 9612cb6a40..0dd51dc9e2 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/3.5R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/3.5R/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml notes.sgml errata.sgml
-DOCS= notes.sgml
+# DOCS=	announce.xml notes.xml errata.xml
+DOCS= notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/3.5R/notes.sgml b/fr_FR.ISO8859-1/htdocs/releases/3.5R/notes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/3.5R/notes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/3.5R/notes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.0R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/4.0R/Makefile
index ea72658dd5..c11515a032 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.0R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/4.0R/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.xml notes.xml errata.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.0R/announce.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.0R/announce.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.0R/announce.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.0R/announce.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.0R/errata.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.0R/errata.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.0R/errata.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.0R/errata.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.0R/notes.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.0R/notes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.0R/notes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.0R/notes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.1.1R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/4.1.1R/Makefile
index bc57ff6f14..87b5c15933 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.1.1R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/4.1.1R/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml notes.sgml errata.sgml
-DOCS= errata.sgml
+# DOCS=	announce.xml notes.xml errata.xml
+DOCS= errata.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.1.1R/errata.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.1.1R/errata.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.1.1R/errata.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.1.1R/errata.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.1R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/4.1R/Makefile
index ea72658dd5..c11515a032 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.1R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/4.1R/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.xml notes.xml errata.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.1R/announce.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.1R/announce.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.1R/announce.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.1R/announce.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.1R/errata.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.1R/errata.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.1R/errata.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.1R/errata.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.1R/notes.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.1R/notes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.1R/notes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.1R/notes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.2R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/4.2R/Makefile
index c6a0dfb8fc..eb228b78f2 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.2R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/4.2R/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.xml notes.xml errata.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.2R/announce.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.2R/announce.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.2R/announce.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.2R/announce.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.2R/errata.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.2R/errata.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.2R/errata.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.2R/errata.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.2R/notes.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.2R/notes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.2R/notes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.2R/notes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.3R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/4.3R/Makefile
index c6a0dfb8fc..eb228b78f2 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.3R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/4.3R/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml notes.sgml errata.sgml
+DOCS=	announce.xml notes.xml errata.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.3R/announce.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.3R/announce.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.3R/announce.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.3R/announce.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.3R/errata.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.3R/errata.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.3R/errata.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.3R/errata.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.3R/notes.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.3R/notes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.3R/notes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.3R/notes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.4R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/4.4R/Makefile
index f4250694de..50a4da3738 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.4R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/4.4R/Makefile
@@ -10,8 +10,8 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml hardware.sgml notes.sgml
-DOCS= announce.sgml
+# DOCS=	announce.xml hardware.xml notes.xml
+DOCS= announce.xml
 
 DATA=	docbook.css
 # DATA+=	errata.html
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.4R/announce.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.4R/announce.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.4R/announce.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.4R/announce.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.5R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/4.5R/Makefile
index d5d0e42c9b..14a34bac93 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.5R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/4.5R/Makefile
@@ -10,9 +10,9 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	hardware.sgml notes.sgml qa.sgml announce.sgml schedule.sgml
-# DOCS+=	contents.sgml
-DOCS= notes.sgml announce.sgml
+# DOCS=	hardware.xml notes.xml qa.xml announce.xml schedule.xml
+# DOCS+=	contents.xml
+DOCS= notes.xml announce.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.5R/announce.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.5R/announce.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.5R/announce.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.5R/announce.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.5R/notes.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.5R/notes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.5R/notes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.5R/notes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.6.2R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/4.6.2R/Makefile
index 99064f5124..3b476aa3c7 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.6.2R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/4.6.2R/Makefile
@@ -10,10 +10,10 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	hardware.sgml relnotes.sgml
-# DOCS+=	announce.sgml
-# contents.sgml
-DOCS= relnotes.sgml
+# DOCS=	hardware.xml relnotes.xml
+# DOCS+=	announce.xml
+# contents.xml
+DOCS= relnotes.xml
 
 DATA=	docbook.css
 # DATA+=	errata.html
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.6.2R/relnotes.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.6.2R/relnotes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.6.2R/relnotes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.6.2R/relnotes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.6R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/4.6R/Makefile
index e73a543273..1ddd2b6d31 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.6R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/4.6R/Makefile
@@ -10,9 +10,9 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml contents.sgml
-# DOCS+=	hardware.sgml relnotes.sgml qa.sgml schedule.sgml
-DOCS= relnotes.sgml
+# DOCS=	announce.xml contents.xml
+# DOCS+=	hardware.xml relnotes.xml qa.xml schedule.xml
+DOCS= relnotes.xml
 
 DATA=	docbook.css
 # DATA+=	errata.html
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.6R/relnotes.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.6R/relnotes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.6R/relnotes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.6R/relnotes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.7R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/4.7R/Makefile
index b8bbf327f2..980adb5b94 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.7R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/4.7R/Makefile
@@ -10,8 +10,8 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	hardware.sgml relnotes.sgml schedule.sgml qa.sgml announce.sgml
-DOCS= announce.sgml
+# DOCS=	hardware.xml relnotes.xml schedule.xml qa.xml announce.xml
+DOCS= announce.xml
 
 DATA=	docbook.css
 DATA+=	errata.html
diff --git a/fr_FR.ISO8859-1/htdocs/releases/4.7R/announce.sgml b/fr_FR.ISO8859-1/htdocs/releases/4.7R/announce.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/4.7R/announce.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/4.7R/announce.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/5.0R/DP1/Makefile b/fr_FR.ISO8859-1/htdocs/releases/5.0R/DP1/Makefile
index a71d212a9d..16105d81f0 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/5.0R/DP1/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/5.0R/DP1/Makefile
@@ -10,10 +10,10 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	hardware.sgml relnotes.sgml installation.sgml
-# DOCS+=	announce.sgml
-# contents.sgml
-DOCS= relnotes.sgml
+# DOCS=	hardware.xml relnotes.xml installation.xml
+# DOCS+=	announce.xml
+# contents.xml
+DOCS= relnotes.xml
 
 # DATA=	docbook.css
 # DATA+=	errata.html
diff --git a/fr_FR.ISO8859-1/htdocs/releases/5.0R/DP1/relnotes.sgml b/fr_FR.ISO8859-1/htdocs/releases/5.0R/DP1/relnotes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/5.0R/DP1/relnotes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/5.0R/DP1/relnotes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/5.0R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/5.0R/Makefile
index 493d36b674..80bf49b885 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/5.0R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/5.0R/Makefile
@@ -10,8 +10,8 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml schedule.sgml todo.sgml
-# DOCS+=	hardware.sgml relnotes.sgml installation.sgml
+# DOCS=	announce.xml schedule.xml todo.xml
+# DOCS+=	hardware.xml relnotes.xml installation.xml
 
 # DATA=	docbook.css
 # DATA+=	errata.html
diff --git a/fr_FR.ISO8859-1/htdocs/releases/5.1R/Makefile b/fr_FR.ISO8859-1/htdocs/releases/5.1R/Makefile
index 92a3c43c4a..228c6f618a 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/5.1R/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/5.1R/Makefile
@@ -10,9 +10,9 @@
 .include "../Makefile.inc"
 .endif
 
-# DOCS=	announce.sgml schedule.sgml todo.sgml
-# DOCS+=	hardware.sgml relnotes.sgml installation.sgml
-DOCS= relnotes.sgml installation.sgml
+# DOCS=	announce.xml schedule.xml todo.xml
+# DOCS+=	hardware.xml relnotes.xml installation.xml
+DOCS= relnotes.xml installation.xml
 
 # DATA=	docbook.css
 # DATA+=	errata.html
diff --git a/fr_FR.ISO8859-1/htdocs/releases/5.1R/installation.sgml b/fr_FR.ISO8859-1/htdocs/releases/5.1R/installation.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/5.1R/installation.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/5.1R/installation.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/5.1R/relnotes.sgml b/fr_FR.ISO8859-1/htdocs/releases/5.1R/relnotes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/5.1R/relnotes.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/5.1R/relnotes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/Makefile b/fr_FR.ISO8859-1/htdocs/releases/Makefile
index 11c09558cc..eef6dbf5e1 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releases/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml snapshots.sgml
+DOCS?=	index.xml snapshots.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/fr_FR.ISO8859-1/htdocs/releases/index.sgml b/fr_FR.ISO8859-1/htdocs/releases/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/index.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releases/snapshots.sgml b/fr_FR.ISO8859-1/htdocs/releases/snapshots.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releases/snapshots.sgml
rename to fr_FR.ISO8859-1/htdocs/releases/snapshots.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releng/Makefile b/fr_FR.ISO8859-1/htdocs/releng/Makefile
index afd8f22a5f..a2c3bc8784 100644
--- a/fr_FR.ISO8859-1/htdocs/releng/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/releng/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml charter.sgml
+DOCS?=	index.xml charter.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/releng/charter.sgml b/fr_FR.ISO8859-1/htdocs/releng/charter.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releng/charter.sgml
rename to fr_FR.ISO8859-1/htdocs/releng/charter.xml
diff --git a/fr_FR.ISO8859-1/htdocs/releng/index.sgml b/fr_FR.ISO8859-1/htdocs/releng/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/releng/index.sgml
rename to fr_FR.ISO8859-1/htdocs/releng/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/relnotes.sgml b/fr_FR.ISO8859-1/htdocs/relnotes.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/relnotes.sgml
rename to fr_FR.ISO8859-1/htdocs/relnotes.xml
diff --git a/fr_FR.ISO8859-1/htdocs/search/Makefile b/fr_FR.ISO8859-1/htdocs/search/Makefile
index df30c15d60..fb5afca08b 100644
--- a/fr_FR.ISO8859-1/htdocs/search/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/search/Makefile
@@ -10,10 +10,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+= index-site.sgml
-DOCS+= search.sgml
-DOCS+= searchhints.sgml
-DOCS+=	search-mid.sgml
+DOCS+= index-site.xml
+DOCS+= search.xml
+DOCS+= searchhints.xml
+DOCS+=	search-mid.xml
 
 INDEXLINK=	search.html
 
diff --git a/fr_FR.ISO8859-1/htdocs/search/search-mid.sgml b/fr_FR.ISO8859-1/htdocs/search/search-mid.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/search/search-mid.sgml
rename to fr_FR.ISO8859-1/htdocs/search/search-mid.xml
diff --git a/fr_FR.ISO8859-1/htdocs/search/search.sgml b/fr_FR.ISO8859-1/htdocs/search/search.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/search/search.sgml
rename to fr_FR.ISO8859-1/htdocs/search/search.xml
diff --git a/fr_FR.ISO8859-1/htdocs/search/searchhints.sgml b/fr_FR.ISO8859-1/htdocs/search/searchhints.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/search/searchhints.sgml
rename to fr_FR.ISO8859-1/htdocs/search/searchhints.xml
diff --git a/fr_FR.ISO8859-1/htdocs/security/Makefile b/fr_FR.ISO8859-1/htdocs/security/Makefile
index f243282e9d..842b9b045b 100644
--- a/fr_FR.ISO8859-1/htdocs/security/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/security/Makefile
@@ -11,10 +11,10 @@
 .endif
 
 DOCS=
-DOCS+=	security.sgml
-DOCS+=	advisories.sgml
+DOCS+=	security.xml
+DOCS+=	advisories.xml
 
-advisories.sgml: advisories.html.inc
+advisories.xml: advisories.html.inc
 
 INDEXLINK=	security.html
 
diff --git a/fr_FR.ISO8859-1/htdocs/security/advisories.sgml b/fr_FR.ISO8859-1/htdocs/security/advisories.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/security/advisories.sgml
rename to fr_FR.ISO8859-1/htdocs/security/advisories.xml
diff --git a/fr_FR.ISO8859-1/htdocs/security/security.sgml b/fr_FR.ISO8859-1/htdocs/security/security.xml
similarity index 99%
rename from fr_FR.ISO8859-1/htdocs/security/security.sgml
rename to fr_FR.ISO8859-1/htdocs/security/security.xml
index aa2cf20296..9490c6247e 100644
--- a/fr_FR.ISO8859-1/htdocs/security/security.sgml
+++ b/fr_FR.ISO8859-1/htdocs/security/security.xml
@@ -298,7 +298,7 @@
     que la date pr�vue.</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/fr_FR.ISO8859-1/htdocs/send-pr.sgml b/fr_FR.ISO8859-1/htdocs/send-pr.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/send-pr.sgml
rename to fr_FR.ISO8859-1/htdocs/send-pr.xml
diff --git a/fr_FR.ISO8859-1/htdocs/snapshots/Makefile b/fr_FR.ISO8859-1/htdocs/snapshots/Makefile
index 14abca8de3..f949c2763a 100644
--- a/fr_FR.ISO8859-1/htdocs/snapshots/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/snapshots/Makefile
@@ -8,6 +8,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml
+DOCS?=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/snapshots/index.sgml b/fr_FR.ISO8859-1/htdocs/snapshots/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/snapshots/index.sgml
rename to fr_FR.ISO8859-1/htdocs/snapshots/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/support.sgml b/fr_FR.ISO8859-1/htdocs/support.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/support.sgml
rename to fr_FR.ISO8859-1/htdocs/support.xml
diff --git a/fr_FR.ISO8859-1/htdocs/support/Makefile b/fr_FR.ISO8859-1/htdocs/support/Makefile
index f289e8e059..b183985b82 100644
--- a/fr_FR.ISO8859-1/htdocs/support/Makefile
+++ b/fr_FR.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/fr_FR.ISO8859-1/htdocs/support/bugreports.sgml b/fr_FR.ISO8859-1/htdocs/support/bugreports.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/support/bugreports.sgml
rename to fr_FR.ISO8859-1/htdocs/support/bugreports.xml
diff --git a/fr_FR.ISO8859-1/htdocs/support/webresources.sgml b/fr_FR.ISO8859-1/htdocs/support/webresources.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/support/webresources.sgml
rename to fr_FR.ISO8859-1/htdocs/support/webresources.xml
diff --git a/fr_FR.ISO8859-1/htdocs/tutorials/Makefile b/fr_FR.ISO8859-1/htdocs/tutorials/Makefile
index 7b36a62ad9..3b383d2c06 100644
--- a/fr_FR.ISO8859-1/htdocs/tutorials/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/tutorials/Makefile
@@ -14,6 +14,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS = index.sgml
+DOCS = index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/fr_FR.ISO8859-1/htdocs/tutorials/index.sgml b/fr_FR.ISO8859-1/htdocs/tutorials/index.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/tutorials/index.sgml
rename to fr_FR.ISO8859-1/htdocs/tutorials/index.xml
diff --git a/fr_FR.ISO8859-1/htdocs/where.sgml b/fr_FR.ISO8859-1/htdocs/where.xml
similarity index 100%
rename from fr_FR.ISO8859-1/htdocs/where.sgml
rename to fr_FR.ISO8859-1/htdocs/where.xml
diff --git a/fr_FR.ISO8859-1/share/sgml/abstract.ent b/fr_FR.ISO8859-1/share/sgml/abstract.ent
index 9a157fa89a..a4e8a1e907 100644
--- a/fr_FR.ISO8859-1/share/sgml/abstract.ent
+++ b/fr_FR.ISO8859-1/share/sgml/abstract.ent
@@ -11,5 +11,5 @@
      Original revision: N/A
 -->
 
-<!ENTITY abstract.license SYSTEM "license.sgml">
-<!ENTITY abstract.disclaimer SYSTEM "disclaimer.sgml">
+<!ENTITY abstract.license SYSTEM "license.xml">
+<!ENTITY abstract.disclaimer SYSTEM "disclaimer.xml">
diff --git a/fr_FR.ISO8859-1/share/sgml/artheader.ent b/fr_FR.ISO8859-1/share/sgml/artheader.ent
index e155a066a9..76c9b9f728 100644
--- a/fr_FR.ISO8859-1/share/sgml/artheader.ent
+++ b/fr_FR.ISO8859-1/share/sgml/artheader.ent
@@ -11,4 +11,4 @@
      Original revision: N/A
 -->
 
-<!ENTITY artheader.copyright SYSTEM "copyright.sgml">
+<!ENTITY artheader.copyright SYSTEM "copyright.xml">
diff --git a/fr_FR.ISO8859-1/share/sgml/copyright.sgml b/fr_FR.ISO8859-1/share/sgml/copyright.xml
similarity index 100%
rename from fr_FR.ISO8859-1/share/sgml/copyright.sgml
rename to fr_FR.ISO8859-1/share/sgml/copyright.xml
diff --git a/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile b/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
index 9ade08ad75..1a841fa1fe 100644
--- a/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
+++ b/hu_HU.ISO8859-2/articles/compiz-fusion/Makefile
@@ -18,7 +18,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml b/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
similarity index 99%
rename from hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml
rename to hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
index 902cb9a99a..a5ba280661 100644
--- a/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml
+++ b/hu_HU.ISO8859-2/articles/compiz-fusion/article.xml
@@ -17,7 +17,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/articles/compiz-fusion/article.sgml
+     %SOURCE%	en_US.ISO8859-1/articles/compiz-fusion/article.xml
      %SRCID%	1.6
 -->
 
diff --git a/hu_HU.ISO8859-2/articles/cups/Makefile b/hu_HU.ISO8859-2/articles/cups/Makefile
index 758498f615..ae7697c49b 100644
--- a/hu_HU.ISO8859-2/articles/cups/Makefile
+++ b/hu_HU.ISO8859-2/articles/cups/Makefile
@@ -18,7 +18,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/hu_HU.ISO8859-2/articles/cups/article.sgml b/hu_HU.ISO8859-2/articles/cups/article.xml
similarity index 99%
rename from hu_HU.ISO8859-2/articles/cups/article.sgml
rename to hu_HU.ISO8859-2/articles/cups/article.xml
index b9d41b206c..b141b3b46c 100644
--- a/hu_HU.ISO8859-2/articles/cups/article.sgml
+++ b/hu_HU.ISO8859-2/articles/cups/article.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%   en_US.ISO8859-1/articles/cups/article.sgml
+     %SOURCE%   en_US.ISO8859-1/articles/cups/article.xml
      %SRCID%    1.5
 -->
 
diff --git a/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile b/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
index d68b082aeb..6c7d521e6a 100644
--- a/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
+++ b/hu_HU.ISO8859-2/articles/explaining-bsd/Makefile
@@ -20,7 +20,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/hu_HU.ISO8859-2/articles/explaining-bsd/article.sgml b/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
similarity index 99%
rename from hu_HU.ISO8859-2/articles/explaining-bsd/article.sgml
rename to hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
index ba78057875..a5e6f7da0c 100644
--- a/hu_HU.ISO8859-2/articles/explaining-bsd/article.sgml
+++ b/hu_HU.ISO8859-2/articles/explaining-bsd/article.xml
@@ -10,7 +10,7 @@
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
 
-     %SOURCE%	en_US.ISO8859-1/articles/explaining-bsd/article.sgml
+     %SOURCE%	en_US.ISO8859-1/articles/explaining-bsd/article.xml
      %SRCID%	1.25
 -->
 
diff --git a/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile b/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
index 2da416dee9..f397ca0ebf 100644
--- a/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
+++ b/hu_HU.ISO8859-2/articles/gjournal-desktop/Makefile
@@ -18,7 +18,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/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
similarity index 99%
rename from hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml
rename to hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
index 04143552be..eaf4c4212f 100644
--- a/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml
+++ b/hu_HU.ISO8859-2/articles/gjournal-desktop/article.xml
@@ -17,7 +17,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%   en_US.ISO8859-1/articles/gjournal-desktop/article.sgml
+     %SOURCE%   en_US.ISO8859-1/articles/gjournal-desktop/article.xml
      %SRCID%    1.5
 -->
 
diff --git a/hu_HU.ISO8859-2/articles/laptop/Makefile b/hu_HU.ISO8859-2/articles/laptop/Makefile
index ec9fffc7cc..d150d68778 100644
--- a/hu_HU.ISO8859-2/articles/laptop/Makefile
+++ b/hu_HU.ISO8859-2/articles/laptop/Makefile
@@ -20,7 +20,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/hu_HU.ISO8859-2/articles/laptop/article.sgml b/hu_HU.ISO8859-2/articles/laptop/article.xml
similarity index 99%
rename from hu_HU.ISO8859-2/articles/laptop/article.sgml
rename to hu_HU.ISO8859-2/articles/laptop/article.xml
index 6f596e160a..c80c3325c3 100644
--- a/hu_HU.ISO8859-2/articles/laptop/article.sgml
+++ b/hu_HU.ISO8859-2/articles/laptop/article.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/articles/laptop/article.sgml
+     %SOURCE%	en_US.ISO8859-1/articles/laptop/article.xml
      %SRCID%	1.25
 -->
 
diff --git a/hu_HU.ISO8859-2/articles/linux-comparison/Makefile b/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
index 317d1c03bc..7e5040c4dd 100644
--- a/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
+++ b/hu_HU.ISO8859-2/articles/linux-comparison/Makefile
@@ -20,7 +20,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml b/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
similarity index 99%
rename from hu_HU.ISO8859-2/articles/linux-comparison/article.sgml
rename to hu_HU.ISO8859-2/articles/linux-comparison/article.xml
index bcde012d07..45fed694db 100644
--- a/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml
+++ b/hu_HU.ISO8859-2/articles/linux-comparison/article.xml
@@ -40,7 +40,7 @@ Copyright (c) 2005 Dru Lavigne
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/articles/linux-comparison/article.sgml
+     %SOURCE%	en_US.ISO8859-1/articles/linux-comparison/article.xml
      %SRCID%	1.11
 -->
 
diff --git a/hu_HU.ISO8859-2/articles/linux-users/Makefile b/hu_HU.ISO8859-2/articles/linux-users/Makefile
index cd1dd73980..61647af74b 100644
--- a/hu_HU.ISO8859-2/articles/linux-users/Makefile
+++ b/hu_HU.ISO8859-2/articles/linux-users/Makefile
@@ -23,7 +23,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/hu_HU.ISO8859-2/articles/linux-users/article.sgml b/hu_HU.ISO8859-2/articles/linux-users/article.xml
similarity index 99%
rename from hu_HU.ISO8859-2/articles/linux-users/article.sgml
rename to hu_HU.ISO8859-2/articles/linux-users/article.xml
index dd78fccdd5..e6c282b874 100644
--- a/hu_HU.ISO8859-2/articles/linux-users/article.sgml
+++ b/hu_HU.ISO8859-2/articles/linux-users/article.xml
@@ -9,7 +9,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/articles/linux-users/article.sgml
+     %SOURCE%	en_US.ISO8859-1/articles/linux-users/article.xml
      %SRCID%	1.10
 -->
 
diff --git a/hu_HU.ISO8859-2/books/faq/Makefile b/hu_HU.ISO8859-2/books/faq/Makefile
index 88dc3cecca..232f5b447d 100644
--- a/hu_HU.ISO8859-2/books/faq/Makefile
+++ b/hu_HU.ISO8859-2/books/faq/Makefile
@@ -25,7 +25,7 @@ WITH_BIBLIOXREF_TITLE?=YES
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/hu_HU.ISO8859-2/books/faq/book.sgml b/hu_HU.ISO8859-2/books/faq/book.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/faq/book.sgml
rename to hu_HU.ISO8859-2/books/faq/book.xml
index be83063cf4..9024067191 100644
--- a/hu_HU.ISO8859-2/books/faq/book.sgml
+++ b/hu_HU.ISO8859-2/books/faq/book.xml
@@ -4,13 +4,13 @@
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//HU" "../../share/sgml/entities.ent">
 %entities;
 <!ENTITY enbase "http://www.FreeBSD.org">
-<!ENTITY bibliography SYSTEM "../../share/sgml/bibliography.sgml">
+<!ENTITY bibliography SYSTEM "../../share/sgml/bibliography.xml">
 <!ENTITY url.base.hu "&enbase;/hu">
 ]>
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/faq/book.sgml
+     %SOURCE%	en_US.ISO8859-1/books/faq/book.xml
      %SRCID%	1.1131
 -->
 
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/Makefile b/hu_HU.ISO8859-2/books/fdp-primer/Makefile
index f2afecff55..bdc300ffed 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/Makefile
+++ b/hu_HU.ISO8859-2/books/fdp-primer/Makefile
@@ -24,21 +24,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=  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.sgml
+SRCS+= examples/appendix.xml
 
 # Images from the cross-document image library
 IMAGES_LIB=	callouts/1.png
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/book.sgml b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
similarity index 98%
rename from hu_HU.ISO8859-2/books/fdp-primer/book.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/book.xml
index ef2929d695..9b443a63f5 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/book.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
@@ -40,7 +40,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/book.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/book.xml
      %SRCID%   1.33
 -->
 
@@ -293,8 +293,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/hu_HU.ISO8859-2/books/fdp-primer/chapters.ent b/hu_HU.ISO8859-2/books/fdp-primer/chapters.ent
index 9a49178221..a37bc0d26b 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/chapters.ent
+++ b/hu_HU.ISO8859-2/books/fdp-primer/chapters.ent
@@ -3,7 +3,7 @@
      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.
 
@@ -15,17 +15,17 @@
      %SRCID%   1.6
 -->
 
-<!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/hu_HU.ISO8859-2/books/fdp-primer/doc-build/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/doc-build/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/fdp-primer/doc-build/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/doc-build/chapter.xml
index 8873ce80ca..656768384c 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/doc-build/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/doc-build/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
      %SRCID%   1.16
 -->
 
@@ -278,7 +278,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # Az SGML forr�s
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
@@ -291,7 +291,7 @@ DOC_PREFIX?= ${.CURDIR}/../../..
 	karbantart�si k�telezetts�g�nket.</para>
 
       <para>A <makevar>DOC</makevar> hivatkozik (az
-	<filename>.sgml</filename> kiterjeszt�s
+	<filename>.xml</filename> kiterjeszt�s
 	n�lk�l) az adott k�nyvt�rban
 	tal�lhat� dokumentum f�
 	forr�s�ra.  Emellett az <makevar>SRCS</makevar>
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml b/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.xml
similarity index 98%
rename from hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.xml
index 2e8f19c962..8099bc5a9f 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
      %SRCID%   1.18
 -->
 
@@ -211,7 +211,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>�llom�ny</replaceable>.sgml &gt; <replaceable>�llom�ny</replaceable>.html <co id="examples-co-jade-1-filename"/></userinput></screen>
+    -t sgml <co id="examples-co-jade-1-transform"/> <replaceable>�llom�ny</replaceable>.xml &gt; <replaceable>�llom�ny</replaceable>.html <co id="examples-co-jade-1-filename"/></userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-1-nochunks">
@@ -268,7 +268,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>�llom�ny</replaceable>.sgml <co id="examples-co-jade-2-filename"/></userinput></screen>
+    -t sgml <co id="examples-co-jade-2-transform"/> <replaceable>�llom�ny</replaceable>.xml <co id="examples-co-jade-2-filename"/></userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-2-catalog">
@@ -328,7 +328,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>�llom�ny</replaceable>.sgml</userinput></screen>
+    -t tex <co id="examples-co-jade-3-tex"/> <replaceable>�llom�ny</replaceable>.xml</userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-3-tex-backend">
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.xml
index a91e3d2937..7348f320de 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
      %SRCID%   1.24
 -->
 
@@ -305,7 +305,7 @@
 
       <step>
 	<para>A k�nyvt�rban tal�lhat�
-	  <filename>.sgml</filename> �llom�nyokat
+	  <filename>.xml</filename> �llom�nyokat
 	  �rjuk �t a kedvenc
 	  sz�vegszerkeszt�nkkel.</para>
       </step>
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.xml
index 6d671dff87..fc8e79d69d 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
      %SRCID%   1.11
 -->
 
@@ -48,7 +48,7 @@
     csomag (a Portgy�jtem�nyb�l a <filename
       role="package">editors/psgml</filename> portb�l
     telep�thetj�k fel).  Ez a
-    kieg�sz�t�s vagy az <filename>.sgml</filename>
+    kieg�sz�t�s vagy az <filename>.xml</filename>
     �llom�nyok megnyit�sakor t�lt�dik be
     automatikusan, vagy pedig az <command>M-x sgml-mode</command>
     parancs beg�pel�s�vel.
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.xml
index 6e31055c35..da0cc0c17d 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/see-also/chapter.xml
      %SRCID%   1.15
 -->
 
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
index 83109cb027..aa3fc85aeb 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
      %SRCID%   1.80
 -->
 
@@ -2304,7 +2304,7 @@ Ez lenne az 'ize2' nev
 	  <programlisting><![CDATA[<para>]]>A k�zik�nyv magyar v�ltozat�nak SGML forr�sa a &lt;filename
     class="directory">/usr/doc/hu_HU.ISO8859-2/books/handbook/&lt;/filename>
   k�nyvt�rban tal�lhat�.  Ebben a k�nyvt�rban a
-  &lt;filename>book.sgml&lt;/filename> lesz a f� forr�s�llom�ny.  Mellette
+  &lt;filename>book.xml&lt;/filename> lesz a f� forr�s�llom�ny.  Mellette
   l�thatunk m�g egy &lt;filename>Makefile&lt;/filename> �llom�nyt �s t�bb
   &lt;filename>.ent&lt;/filename> kiterjeszt�ssel rendelkez�
   �llom�nyt.<![CDATA[</para>]]></programlisting>
@@ -2315,7 +2315,7 @@ Ez lenne az 'ize2' nev
 	  v�ltozat�nak SGML forr�sa a <filename
 	    class="directory">/usr/doc/hu_HU.ISO8859-2/books/handbook</filename>
 	  k�nyvt�rban tal�lhat�.  Ebben a
-	  k�nyvt�rban a <filename>book.sgml</filename> lesz
+	  k�nyvt�rban a <filename>book.xml</filename> lesz
 	  a f� forr�s�llom�ny.  Mellette
 	  tal�lhatunk m�g egy
 	  <filename>Makefile</filename> �llom�nyt
@@ -3125,9 +3125,9 @@ IMAGES+= abra3.png
 	<para>Tegy�k fel, hogy van egy h�rom fejezetb�l
 	  �ll� k�nyv�nk, ahol az egyes fejezeteket
 	  a saj�t k�nyvt�raikban t�roljuk:
-	  <filename>fejezet1/fejezet.sgml</filename>,
-	  <filename>fejezet2/fejezet.sgml</filename> �s
-	  <filename>fejezet3/fejezet.sgml</filename>.  Ha az egyes
+	  <filename>fejezet1/fejezet.xml</filename>,
+	  <filename>fejezet2/fejezet.xml</filename> �s
+	  <filename>fejezet3/fejezet.xml</filename>.  Ha az egyes
 	  fejezetekhez k�peket akartunk t�rs�tani,
 	  akkor javasolt ezeket a fejezetek
 	  alk�nyvt�r�ba
@@ -3143,7 +3143,7 @@ IMAGES+= abra3.png
 
 	<para>P�ld�ul a
 	  <filename>fejezet1/abra.png</filename> k�p
-	  eset�ben a <filename>fejezet1/fejezet.sgml</filename>
+	  eset�ben a <filename>fejezet1/fejezet.xml</filename>
 	  �llom�nyban a k�vetkez�t kell
 	  megadnunk:</para>
 
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
similarity index 96%
rename from hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
index a59ed0d92f..31ebfc837b 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
      %SRCID%   1.50
 -->
 
@@ -584,7 +584,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATA
       <procedure>
 	<step>
 	  <para>Hozzunk l�tre egy
-	    <filename>pr�ba.sgml</filename> nev�
+	    <filename>pr�ba.xml</filename> nev�
 	    �llom�nyt, �s �rjuk bele az
 	    al�bbi sz�veget:</para>
 
@@ -637,7 +637,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATA
 	    dokumentumunk
 	    �rv�nyess�g�t:</para>
 
-	  <screen>&prompt.user; <userinput>onsgmls -s pr�ba.sgml</userinput></screen>
+	  <screen>&prompt.user; <userinput>onsgmls -s pr�ba.xml</userinput></screen>
 
 	  <para>L�thatjuk, hogy az <command>onsgmls</command> nem
 	    jelez semmif�le hib�t, ami azt jelenti, hogy a
@@ -653,9 +653,9 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATA
 	    �jra az
 	    �rv�nyes�t�st.</para>
 
-	  <screen>&prompt.user; <userinput>onsgmls -s pr�ba.sgml</userinput>
-onsgmls:pr�ba.sgml:5:4:E: character data is not allowed here
-onsgmls:pr�ba.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
+	  <screen>&prompt.user; <userinput>onsgmls -s pr�ba.xml</userinput>
+onsgmls:pr�ba.xml:5:4:E: character data is not allowed here
+onsgmls:pr�ba.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
 	  <para>Az <command>onsgmls</command> �ltal
 	    gener�lt hiba�zenetek kett�spontokkal
@@ -1245,7 +1245,7 @@ onsgmls:pr
 	<step>
 	  <para>Tegy�nk n�h�ny megjegyz�st a
 	    kor�bban k�sz�tett
-	    <filename>pr�ba.sgml</filename>
+	    <filename>pr�ba.xml</filename>
 	    �llom�nyunkba, majd az
 	    <command>onsgmls</command> seg�ts�g�vel
 	    ellen�rizz�k, hogy k�zben
@@ -1255,7 +1255,7 @@ onsgmls:pr
 	<step>
 	  <para>Tegy�nk n�h�ny
 	    �rv�nytelen megjegyz�st a
-	    <filename>pr�ba.sgml</filename>
+	    <filename>pr�ba.xml</filename>
 	    �llom�nyba, majd n�zz�k meg, hogy
 	    az <command>onsgmls</command> milyen hiba�zeneteket ad
 	    r�juk.</para>
@@ -1415,7 +1415,7 @@ onsgmls:pr
       <procedure>
 	<step>
 	  <para>Tegy�k bele a
-	    <filename>pr�ba.sgml</filename>
+	    <filename>pr�ba.xml</filename>
 	    �llom�nyunkba a k�vetkez�
 	    �ltal�nos egyedet:</para>
 
@@ -1450,7 +1450,7 @@ onsgmls:pr
 
 	<step>
 	  <para>T�lts�k be a
-	    <filename>pr�ba.sgml</filename>
+	    <filename>pr�ba.xml</filename>
 	    �llom�nyt a b�ng�sz�nkbe
 	    (el�fordulhat, hogy m�solatot kell
 	    k�sz�teni r�la
@@ -1493,7 +1493,7 @@ onsgmls:pr
 	  <para>Erre a c�lra az <command>osgmlnorm</command>
 	    haszn�lhat�.</para>
 
-	  <screen>&prompt.user; <userinput>osgmlnorm pr�ba.sgml &gt; pr�ba.html</userinput></screen>
+	  <screen>&prompt.user; <userinput>osgmlnorm pr�ba.xml &gt; pr�ba.html</userinput></screen>
 
 	  <para>Ennek hat�s�ra
 	    <filename>pr�ba.html</filename> n�ven
@@ -1511,7 +1511,7 @@ onsgmls:pr
 	    Ezt a <option>-d</option> kapcsol�val tehetj�k
 	    hozz�:</para>
 
-	  <screen>&prompt.user; <userinput>osgmlnorm -d pr�ba.sgml &gt; pr�ba.html</userinput></screen>
+	  <screen>&prompt.user; <userinput>osgmlnorm -d pr�ba.xml &gt; pr�ba.html</userinput></screen>
 	</step>
       </procedure>
     </sect2>
@@ -1536,9 +1536,9 @@ onsgmls:pr
       <para>Tegy�k fel, hogy egy k�nyv�n dolgozunk az
 	SGML felhaszn�l�s�val, amelyet
 	fejezetenk�nt �llom�nyokra bontottunk,
-	<filename>fejezet1.sgml</filename>,
-	<filename>fejezet2.sgml</filename> stb. n�ven, illetve a
-	<filename>k�nyv.sgml</filename> �llom�ny
+	<filename>fejezet1.xml</filename>,
+	<filename>fejezet2.xml</filename> stb. n�ven, illetve a
+	<filename>k�nyv.xml</filename> �llom�ny
 	tartalmazza ezeket a fejezeket.</para>
 
       <para>Az �llom�nyok tartalm�t a
@@ -1554,9 +1554,9 @@ onsgmls:pr
 	  el�r�se �ltal�nos egyeddel</title>
 
 	<programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!ENTITY fejezet.1 SYSTEM "fejezet1.sgml">
-<!ENTITY fejezet.2 SYSTEM "fejezet2.sgml">
-<!ENTITY fejezet.3 SYSTEM "fejezet3.sgml">
+<!ENTITY fejezet.1 SYSTEM "fejezet1.xml">
+<!ENTITY fejezet.2 SYSTEM "fejezet2.xml">
+<!ENTITY fejezet.3 SYSTEM "fejezet3.xml">
 <!--]]> �s �gy tov�bb... <![CDATA[-->
 ]>
 
@@ -1574,8 +1574,8 @@ onsgmls:pr
 	  illeszt�nk be �llom�nyokat egy m�sik
 	  �llom�nyba, a beillesztett
 	  �llom�nyok (amilyen p�ld�ul a
-	  <filename>fejezet1.sgml</filename>,
-	  <filename>fejezet2.sgml</filename> �s a t�bbi)
+	  <filename>fejezet1.xml</filename>,
+	  <filename>fejezet2.xml</filename> �s a t�bbi)
 	  <emphasis>nem</emphasis> kezd�dhetnek DOCTYPE
 	  deklar�ci�val.  Ez szintaktikai hib�t
 	  eredm�nyez!</para>
@@ -1623,9 +1623,9 @@ onsgmls:pr
 	  Ebben a k�vetkez�ek
 	  tal�lhat�ak:</para>
 
-	<programlisting><![CDATA[<!ENTITY fejezet.1 SYSTEM "fejezet1.sgml">
-<!ENTITY fejezet.2 SYSTEM "fejezet2.sgml">
-<!ENTITY fejezet.3 SYSTEM "fejezet3.sgml">]]></programlisting>
+	<programlisting><![CDATA[<!ENTITY fejezet.1 SYSTEM "fejezet1.xml">
+<!ENTITY fejezet.2 SYSTEM "fejezet2.xml">
+<!ENTITY fejezet.3 SYSTEM "fejezet3.xml">]]></programlisting>
 
 	<para>Most pedig hozunk l�tre egy param�teregyedet
 	  az �llom�ny tartalm�nak
@@ -1664,9 +1664,9 @@ onsgmls:pr
 	<procedure>
 	  <step>
 	    <para>Hozzunk l�tre h�rom
-	      �llom�nyt: <filename>bekezd1.sgml</filename>,
-	      <filename>bekezd2.sgml</filename> �s
-	      <filename>bekezd3.sgml</filename>.</para>
+	      �llom�nyt: <filename>bekezd1.xml</filename>,
+	      <filename>bekezd2.xml</filename> �s
+	      <filename>bekezd3.xml</filename>.</para>
 
 	    <para>T�lts�k fel ezeket valami hasonl�
 	      sz�veggel:</para>
@@ -1676,15 +1676,15 @@ onsgmls:pr
 
 	  <step>
 	    <para>Szerkessz�k �t a
-	      <filename>pr�ba.sgml</filename>
+	      <filename>pr�ba.xml</filename>
 	      �llom�nyunk tartalm�t az
 	      al�bbi m�don:</para>
 
 	    <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY valtozat "1.1">
-<!ENTITY bekezd1 SYSTEM "bekezd1.sgml">
-<!ENTITY bekezd2 SYSTEM "bekezd2.sgml">
-<!ENTITY bekezd3 SYSTEM "bekezd3.sgml">
+<!ENTITY bekezd1 SYSTEM "bekezd1.xml">
+<!ENTITY bekezd2 SYSTEM "bekezd2.xml">
+<!ENTITY bekezd3 SYSTEM "bekezd3.xml">
 ]>
 
 <html>
@@ -1703,12 +1703,12 @@ onsgmls:pr
 	  </step>
 
 	  <step>
-	    <para>A <filename>pr�ba.sgml</filename>
+	    <para>A <filename>pr�ba.xml</filename>
 	      normaliz�l�s�val hozzuk l�tre a
 	      <filename>pr�ba.html</filename>
 	      �llom�nyt.</para>
 
-	    <screen>&prompt.user; <userinput>osgmlnorm -d pr�ba.sgml &gt; pr�ba.html</userinput></screen>
+	    <screen>&prompt.user; <userinput>osgmlnorm -d pr�ba.xml &gt; pr�ba.html</userinput></screen>
 	  </step>
 
 	  <step>
@@ -1716,7 +1716,7 @@ onsgmls:pr
 	      <filename>pr�ba.html</filename>
 	      �llom�nyt �s ellen�rizz�k,
 	      hogy a
-	      <filename>bekezd<replaceable>n</replaceable>.sgml</filename>
+	      <filename>bekezd<replaceable>n</replaceable>.xml</filename>
 	      �llom�nyok tartalma beker�lt a
 	      <filename>pr�ba.html</filename>
 	      �llom�nyba.</para>
@@ -1737,12 +1737,12 @@ onsgmls:pr
 	<procedure>
 	  <step>
 	    <para>Szerkessz�k �t a
-	      <filename>pr�ba.sgml</filename>
+	      <filename>pr�ba.xml</filename>
 	      �llom�nyt a k�vetkez�eknek
 	      megfelel�en:</para>
 
 	    <programlisting><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!ENTITY % egyedek SYSTEM "egyedek.sgml"> %egyedek;
+<!ENTITY % egyedek SYSTEM "egyedek.xml"> %egyedek;
 ]>
 
 <html>
@@ -1762,22 +1762,22 @@ onsgmls:pr
 
 	  <step>
 	    <para>Hozzunk l�tre egy �j
-	      �llom�nyt <filename>egyedek.sgml</filename>
+	      �llom�nyt <filename>egyedek.xml</filename>
 	      n�ven a k�vetkez� tartalommal:</para>
 
 	    <programlisting><![CDATA[<!ENTITY valtozat "1.1">
-<!ENTITY bekezd1 SYSTEM "bekezd1.sgml">
-<!ENTITY bekezd2 SYSTEM "bekezd2.sgml">
-<!ENTITY bekezd3 SYSTEM "bekezd3.sgml">]]></programlisting>
+<!ENTITY bekezd1 SYSTEM "bekezd1.xml">
+<!ENTITY bekezd2 SYSTEM "bekezd2.xml">
+<!ENTITY bekezd3 SYSTEM "bekezd3.xml">]]></programlisting>
 	  </step>
 
 	  <step>
-	    <para>A <filename>pr�ba.sgml</filename>
+	    <para>A <filename>pr�ba.xml</filename>
 	      normaliz�l�s�val �ll�tsuk
 	      el� a <filename>pr�ba.html</filename>
 	      �llom�nyt:</para>
 
-	    <screen>&prompt.user; <userinput>osgmlnorm -d pr�ba.sgml &gt; pr�ba.html</userinput></screen>
+	    <screen>&prompt.user; <userinput>osgmlnorm -d pr�ba.xml &gt; pr�ba.html</userinput></screen>
 	  </step>
 
 	  <step>
@@ -1785,7 +1785,7 @@ onsgmls:pr
 	      <filename>pr�ba.html</filename>
 	      �llom�nyt �s ellen�rizz�k,
 	      hogy a
-	      <filename>bekezd<replaceable>n</replaceable>.sgml</filename>
+	      <filename>bekezd<replaceable>n</replaceable>.xml</filename>
 	      �llom�nyok szerepelnek a
 	      <filename>pr�ba.html</filename>
 	      �llom�nyban.</para>
@@ -2050,7 +2050,7 @@ onsgmls:pr
 	<step>
 	  <para>A k�vetkez� sz�veggel hozzunk
 	    l�tre egy �llom�nyt
-	    <filename>szakasz.sgml</filename> n�ven:</para>
+	    <filename>szakasz.xml</filename> n�ven:</para>
 
 	  <programlisting>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 &lt;!ENTITY % szoveges.kimenet "INCLUDE">
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.xml
similarity index 95%
rename from hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.xml
index 4bb01cbcc9..f0ce22ba1c 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
      %SRCID%   1.19
 -->
 
@@ -271,7 +271,7 @@
 	</sect4>
 
 	<sect4>
-	  <title><filename>book.sgml</filename></title>
+	  <title><filename>book.xml</filename></title>
 
 	  <para>Ez a k�zik�nyv legfels� szint�
 	    dokumentuma.  Ebben van a k�zik�nyv <link
@@ -279,7 +279,7 @@
 	    illetve a szerkezet�t le�r�
 	    tov�bbi elemek.</para>
 
-	  <para>A <filename>book.sgml</filename> az
+	  <para>A <filename>book.xml</filename> az
 	    <filename>.ent</filename> kiterjeszt�s�
 	    �llom�nyokat <link
 	      linkend="sgml-primer-parameter-entities">param�teregyedek</link>
@@ -293,11 +293,11 @@
 	</sect4>
 
 	<sect4>
-	  <title><filename><replaceable>k�nyvt�r</replaceable>/chapter.sgml</filename></title>
+	  <title><filename><replaceable>k�nyvt�r</replaceable>/chapter.xml</filename></title>
 
 	  <para>A k�zik�nyv egyes fejezetei
 	    egym�st�l k�l�n�ll�
-	    k�nyvt�rakban, <filename>chapter.sgml</filename>
+	    k�nyvt�rakban, <filename>chapter.xml</filename>
 	    nev� �llom�nyokban
 	    t�rol�dnak.  Ezeket a k�nyvt�rakat
 	    az adott fejezetet jel�l�
@@ -313,7 +313,7 @@
 ...
 </chapter>]]></programlisting>
 
-	  <para>Ekkor a <filename>chapter.sgml</filename> nev�
+	  <para>Ekkor a <filename>chapter.xml</filename> nev�
 	    �llom�nyt tartalmaz� k�nyvt�r
 	    neve <filename>kernelconfig</filename> lesz.  Egy ilyen
 	    �llom�ny �ltal�ban a teljes
@@ -329,7 +329,7 @@
 
 	  <para>A k�zik�nyv kor�bbi
 	    v�ltozataiban az �sszes forr�s a
-	    <filename>book.sgml</filename> �llom�nnyal
+	    <filename>book.xml</filename> �llom�nnyal
 	    volt egy szinten, �s az adott
 	    <sgmltag>chapter</sgmltag> elemek <literal>id</literal>
 	    tulajdons�g�nak megfelel�en ker�lt
@@ -353,11 +353,11 @@
 
 	  <para>A k�zik�nyv forr�saiban k�nnyen
 	    l�thatjuk, hogy sok ilyen k�nyvt�r van,
-	    benn�k egy-egy <filename>chapter.sgml</filename>
+	    benn�k egy-egy <filename>chapter.xml</filename>
 	    �llom�nnyal.  P�ld�ul
-	    <filename>basics/chapter.sgml</filename>,
-	    <filename>introduction/chapter.sgml</filename> �s
-	    <filename>printing/chapter.sgml</filename>.</para>
+	    <filename>basics/chapter.xml</filename>,
+	    <filename>introduction/chapter.xml</filename> �s
+	    <filename>printing/chapter.xml</filename>.</para>
 
 	  <important>
 	    <para>A fejezeteket �s k�nyvt�rakat nem
@@ -372,7 +372,7 @@
 	      szerkezetben).</para>
 	  </important>
 
-	  <para>Az egyes <filename>chapter.sgml</filename>
+	  <para>Az egyes <filename>chapter.xml</filename>
 	    �llom�nyok �nmagukban teljes SGML
 	    dokumentumok.  K�l�n�sen az�rt, mert
 	    semmilyen <literal>DOCTYPE</literal> sor nem
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.xml
index fb1c87b01f..9a964eeef9 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
      %SRCID%   1.14
 -->
 
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.xml
index d34a81b0a9..899e18d7c5 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
      %SRCID%   1.27
 -->
 
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.xml
index 01b523a850..4c9771e59b 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/tools/chapter.xml
      %SRCID%   1.34
 -->
 
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.xml
index b01f7d9a7a..f2f0d6a0c8 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
      %SRCID%   1.31
 -->
 
@@ -343,7 +343,7 @@
                      books/
                            faq/
                                Makefile
-                               book.sgml</programlisting>
+                               book.xml</programlisting>
 
 	<para>Az <literal>sv_SE.ISO8859-1</literal> a
 	  ford�t�s neve, amely teh�t a
@@ -568,7 +568,7 @@
 	<programlisting>&lt;!--
      The &os; Documentation Project
 
-     &dollar;&os;: doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v 1.5 2000/07/07 18:38:38 dannyboy Exp &dollar;
+     &dollar;&os;: doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml,v 1.5 2000/07/07 18:38:38 dannyboy Exp &dollar;
 --&gt;</programlisting>
 
 	<para>A pontos fel�p�t�s ett�l
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml b/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml
rename to hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.xml
index 9400342434..1bbbaa57d8 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.xml
@@ -33,7 +33,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml
+     %SOURCE%  en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
      %SRCID%   1.49
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/Makefile b/hu_HU.ISO8859-2/books/handbook/Makefile
index 18f294696e..56509ae004 100644
--- a/hu_HU.ISO8859-2/books/handbook/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/Makefile
@@ -21,7 +21,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
@@ -31,8 +31,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
 #
 # ------------------------------------------------------------------------
 
@@ -214,44 +214,44 @@ IMAGES_LIB+= callouts/15.png
 #
 
 # SGML content
-SRCS+= audit/chapter.sgml
-SRCS+= book.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+= 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
@@ -259,12 +259,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 ${MASTERDOC}
 
 #
@@ -280,9 +280,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}
@@ -290,20 +290,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/hu_HU.ISO8859-2/books/handbook/advanced-networking/Makefile b/hu_HU.ISO8859-2/books/handbook/advanced-networking/Makefile
index 403930fec1..0131f264ec 100644
--- a/hu_HU.ISO8859-2/books/handbook/advanced-networking/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/advanced-networking/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	advanced-networking/chapter.sgml
+CHAPTERS= 	advanced-networking/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
index db8705ffd6..7d236f68a6 100644
--- a/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
      %SRCID%	1.433
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/audit/Makefile b/hu_HU.ISO8859-2/books/handbook/audit/Makefile
index 5685fd1a32..c8896ce0fe 100644
--- a/hu_HU.ISO8859-2/books/handbook/audit/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/audit/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	audit/chapter.sgml
+CHAPTERS= 	audit/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/audit/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/audit/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
index 7f6250e0bf..a6ee4e1726 100644
--- a/hu_HU.ISO8859-2/books/handbook/audit/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/audit/chapter.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/audit/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/audit/chapter.xml
      %SRCID%	1.34
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/basics/Makefile b/hu_HU.ISO8859-2/books/handbook/basics/Makefile
index 144d9deaaf..29e67bb07b 100644
--- a/hu_HU.ISO8859-2/books/handbook/basics/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/basics/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	basics/chapter.sgml
+CHAPTERS= 	basics/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
index 4aed6a0772..cae9986ffd 100644
--- a/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/basics/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/basics/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/basics/chapter.xml
      %SRCID%	1.157
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/bibliography/Makefile b/hu_HU.ISO8859-2/books/handbook/bibliography/Makefile
index 98cadf5210..82707b8ae8 100644
--- a/hu_HU.ISO8859-2/books/handbook/bibliography/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/bibliography/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	bibliography/chapter.sgml
+CHAPTERS= 	bibliography/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/bibliography/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
index 5141bce3e3..95c00eb831 100644
--- a/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/bibliography/chapter.xml
      %SRCID%	1.89
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/book.sgml b/hu_HU.ISO8859-2/books/handbook/book.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/book.sgml
rename to hu_HU.ISO8859-2/books/handbook/book.xml
index 03d6935b9b..95fda666dc 100644
--- a/hu_HU.ISO8859-2/books/handbook/book.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/book.xml
@@ -19,7 +19,7 @@
 <!--
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%   en_US.ISO8859-1/books/handbook/book.sgml
+     %SOURCE%   en_US.ISO8859-1/books/handbook/book.xml
      %SRCID%    1.176
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/boot/Makefile b/hu_HU.ISO8859-2/books/handbook/boot/Makefile
index 34053d084c..fbbcca9e85 100644
--- a/hu_HU.ISO8859-2/books/handbook/boot/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/boot/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	boot/chapter.sgml
+CHAPTERS= 	boot/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
index f270df9c13..8abc84d77d 100644
--- a/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/boot/chapter.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/boot/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/boot/chapter.xml
      %SRCID%	1.70
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/chapters.ent b/hu_HU.ISO8859-2/books/handbook/chapters.ent
index fb37c81123..8eaef370e2 100644
--- a/hu_HU.ISO8859-2/books/handbook/chapters.ent
+++ b/hu_HU.ISO8859-2/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.
 
@@ -57,140 +57,140 @@
 <!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.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/hu_HU.ISO8859-2/books/handbook/colophon.sgml b/hu_HU.ISO8859-2/books/handbook/colophon.xml
similarity index 94%
rename from hu_HU.ISO8859-2/books/handbook/colophon.sgml
rename to hu_HU.ISO8859-2/books/handbook/colophon.xml
index 2d5ac790b3..63b68017ec 100644
--- a/hu_HU.ISO8859-2/books/handbook/colophon.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/colophon.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/colophon.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/colophon.xml
      %SRCID%	1.9
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/config/Makefile b/hu_HU.ISO8859-2/books/handbook/config/Makefile
index 0ee6c64e6c..84d8364d63 100644
--- a/hu_HU.ISO8859-2/books/handbook/config/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/config/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	config/chapter.sgml
+CHAPTERS= 	config/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/config/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/config/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/config/chapter.xml
index 9b27a757bf..e661ddaa21 100644
--- a/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/config/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/config/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/config/chapter.xml
      %SRCID%	1.244
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/cutting-edge/Makefile b/hu_HU.ISO8859-2/books/handbook/cutting-edge/Makefile
index 1514886e91..ca215c0716 100644
--- a/hu_HU.ISO8859-2/books/handbook/cutting-edge/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/cutting-edge/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	cutting-edge/chapter.sgml
+CHAPTERS= 	cutting-edge/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
index 3064076e5a..93566945fe 100644
--- a/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
      %SRCID%	1.249
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/desktop/Makefile b/hu_HU.ISO8859-2/books/handbook/desktop/Makefile
index bf3ece9365..9dd849aefa 100644
--- a/hu_HU.ISO8859-2/books/handbook/desktop/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/desktop/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	desktop/chapter.sgml
+CHAPTERS= 	desktop/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
index c5be2a973d..08fcf9a485 100644
--- a/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml
@@ -6,7 +6,7 @@
 <!--
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.xml
      %SRCID%	1.97
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/disks/Makefile b/hu_HU.ISO8859-2/books/handbook/disks/Makefile
index 5d8a7e5f21..9b39b739ad 100644
--- a/hu_HU.ISO8859-2/books/handbook/disks/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/disks/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	disks/chapter.sgml
+CHAPTERS= 	disks/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
index 3e04711eee..931ca60809 100644
--- a/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/disks/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/disks/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/disks/chapter.xml
      %SRCID%	1.298
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/dtrace/Makefile b/hu_HU.ISO8859-2/books/handbook/dtrace/Makefile
index 48e9f06fc2..be58d55443 100644
--- a/hu_HU.ISO8859-2/books/handbook/dtrace/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/dtrace/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	dtrace/chapter.sgml
+CHAPTERS= 	dtrace/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
index 4af6711e91..2007d0b765 100644
--- a/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%   en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml
+     %SOURCE%   en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
      %SRCID%    1.8
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/eresources/Makefile b/hu_HU.ISO8859-2/books/handbook/eresources/Makefile
index b1604cf4d9..66a587d5b9 100644
--- a/hu_HU.ISO8859-2/books/handbook/eresources/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/eresources/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	eresources/chapter.sgml
+CHAPTERS= 	eresources/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
index 09eeda6c35..01b979b6de 100644
--- a/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/eresources/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/eresources/chapter.xml
      %SRCID%	1.203
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/filesystems/Makefile b/hu_HU.ISO8859-2/books/handbook/filesystems/Makefile
index 3a9d8868c6..19c6878201 100644
--- a/hu_HU.ISO8859-2/books/handbook/filesystems/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/filesystems/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	filesystems/chapter.sgml
+CHAPTERS= 	filesystems/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
index ed89d8f747..7cdb7529f6 100644
--- a/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%   en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
+     %SOURCE%   en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
      %SRCID%    1.9
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/firewalls/Makefile b/hu_HU.ISO8859-2/books/handbook/firewalls/Makefile
index d8b645cca6..5a3a107aea 100644
--- a/hu_HU.ISO8859-2/books/handbook/firewalls/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/firewalls/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	firewalls/chapter.sgml
+CHAPTERS= 	firewalls/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
index 9424584d93..e1b72c2819 100644
--- a/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
      %SRCID%	1.94
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/geom/Makefile b/hu_HU.ISO8859-2/books/handbook/geom/Makefile
index 078be6371f..aeda31bf47 100644
--- a/hu_HU.ISO8859-2/books/handbook/geom/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/geom/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	geom/chapter.sgml
+CHAPTERS= 	geom/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
index 8311ff6f4b..ad674c1e9a 100644
--- a/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/geom/chapter.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/geom/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/geom/chapter.xml
      %SRCID%	1.50
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/install/Makefile b/hu_HU.ISO8859-2/books/handbook/install/Makefile
index 3971108963..2d4b5539c1 100644
--- a/hu_HU.ISO8859-2/books/handbook/install/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/install/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	install/chapter.sgml
+CHAPTERS= 	install/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/install/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/install/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/install/chapter.xml
index 477c825722..ea9be46471 100644
--- a/hu_HU.ISO8859-2/books/handbook/install/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/install/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/install/chapter.xml
      %SRCID%	1.413
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/introduction/Makefile b/hu_HU.ISO8859-2/books/handbook/introduction/Makefile
index 6749ad24a0..bdc1077828 100644
--- a/hu_HU.ISO8859-2/books/handbook/introduction/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/introduction/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	introduction/chapter.sgml
+CHAPTERS= 	introduction/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
index a363de7bc0..afcd4fc3e6 100644
--- a/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/introduction/chapter.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/introduction/chapter.xml
      %SRCID%	1.138
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
index f64f1bd8af..9391061d45 100644
--- a/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/jails/chapter.xml
@@ -7,7 +7,7 @@
 <!--
     The FreeBSD Hungarian Documentation Project
     Translated by: PALI, Gabor <pgj@FreeBSD.org>
-    %SOURCE%	en_US.ISO8859-1/books/handbook/jails/chapter.sgml
+    %SOURCE%	en_US.ISO8859-1/books/handbook/jails/chapter.xml
     %SRCID%	1.21
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/kernelconfig/Makefile b/hu_HU.ISO8859-2/books/handbook/kernelconfig/Makefile
index 382ef1b0e4..390165a2df 100644
--- a/hu_HU.ISO8859-2/books/handbook/kernelconfig/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/kernelconfig/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	kernelconfig/chapter.sgml
+CHAPTERS= 	kernelconfig/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
index c262992cc4..2b66058407 100644
--- a/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.xml
@@ -6,7 +6,7 @@
 -->
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
      %SRCID%	1.194
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/l10n/Makefile b/hu_HU.ISO8859-2/books/handbook/l10n/Makefile
index 3f47a40b06..65a72c2b98 100644
--- a/hu_HU.ISO8859-2/books/handbook/l10n/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/l10n/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	l10n/chapter.sgml
+CHAPTERS= 	l10n/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
index e0db86d338..3e78307827 100644
--- a/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
@@ -6,7 +6,7 @@
 -->
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/l10n/chapter.xml
      %SRCID%	1.133
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/linuxemu/Makefile b/hu_HU.ISO8859-2/books/handbook/linuxemu/Makefile
index 0361185195..0ef2151f64 100644
--- a/hu_HU.ISO8859-2/books/handbook/linuxemu/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/linuxemu/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	linuxemu/chapter.sgml
+CHAPTERS= 	linuxemu/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
index 56f48964e1..fa8a3fbfca 100644
--- a/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
      %SRCID%	1.141
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/mac/Makefile b/hu_HU.ISO8859-2/books/handbook/mac/Makefile
index 5909cc2ad9..1438365572 100644
--- a/hu_HU.ISO8859-2/books/handbook/mac/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/mac/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mac/chapter.sgml
+CHAPTERS= 	mac/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
index 2b2f4d1493..971f865e29 100644
--- a/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/mac/chapter.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/mac/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/mac/chapter.xml
      %SRCID%	1.75
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/mail/Makefile b/hu_HU.ISO8859-2/books/handbook/mail/Makefile
index 2af5995c76..111c579f4f 100644
--- a/hu_HU.ISO8859-2/books/handbook/mail/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/mail/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mail/chapter.sgml
+CHAPTERS= 	mail/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/mail/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/mail/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
index bdb0d667f2..1ac404ad39 100644
--- a/hu_HU.ISO8859-2/books/handbook/mail/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/mail/chapter.xml
      %SRCID%	1.138
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/mirrors/Makefile b/hu_HU.ISO8859-2/books/handbook/mirrors/Makefile
index c6dadc9628..211ba0c3b2 100644
--- a/hu_HU.ISO8859-2/books/handbook/mirrors/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/mirrors/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mirrors/chapter.sgml
+CHAPTERS= 	mirrors/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
index 501f72a706..99cdd2a284 100644
--- a/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
      %SRCID%	1.489
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/multimedia/Makefile b/hu_HU.ISO8859-2/books/handbook/multimedia/Makefile
index a92dd48fbd..5c930bccb8 100644
--- a/hu_HU.ISO8859-2/books/handbook/multimedia/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/multimedia/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	multimedia/chapter.sgml
+CHAPTERS= 	multimedia/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
index 6990ca41c3..19603a94df 100644
--- a/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
      %SRCID%	1.137
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/network-servers/Makefile b/hu_HU.ISO8859-2/books/handbook/network-servers/Makefile
index eb2b743f6b..0f3e52bbbc 100644
--- a/hu_HU.ISO8859-2/books/handbook/network-servers/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/network-servers/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	network-servers/chapter.sgml
+CHAPTERS= 	network-servers/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
index 96b18675dc..9dfe80d894 100644
--- a/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
      %SRCID%	1.125
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/pgpkeys/Makefile b/hu_HU.ISO8859-2/books/handbook/pgpkeys/Makefile
index 8293a82852..39f74d1a72 100644
--- a/hu_HU.ISO8859-2/books/handbook/pgpkeys/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/pgpkeys/Makefile
@@ -7,7 +7,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/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
similarity index 94%
rename from hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
index 70c54c41da..aaf079153b 100644
--- a/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/pgpkeys/chapter.xml
@@ -5,7 +5,7 @@
 -->
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/pgpkeys/chapter.xml
      %SRCID%	1.286
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/ports/Makefile b/hu_HU.ISO8859-2/books/handbook/ports/Makefile
index c440e63a6d..eb361926e7 100644
--- a/hu_HU.ISO8859-2/books/handbook/ports/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/ports/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	ports/chapter.sgml
+CHAPTERS= 	ports/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
index 1620435d07..86df55f0db 100644
--- a/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/ports/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/ports/chapter.xml
      %SRCID%	1.290
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/Makefile b/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/Makefile
index e8df63ce7f..20bf300160 100644
--- a/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	ppp-and-slip/chapter.sgml
+CHAPTERS= 	ppp-and-slip/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
index 4e5e617f7a..a8d8ad1e16 100644
--- a/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
      %SRCID%	1.194
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml b/hu_HU.ISO8859-2/books/handbook/preface/preface.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/preface/preface.sgml
rename to hu_HU.ISO8859-2/books/handbook/preface/preface.xml
index 62f16c2921..96a205cf0c 100644
--- a/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/preface/preface.xml
@@ -4,7 +4,7 @@
 -->
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/preface/preface.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/preface/preface.xml
      %SRCID%	1.46
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/printing/Makefile b/hu_HU.ISO8859-2/books/handbook/printing/Makefile
index 7f85281ab2..97f6cf1448 100644
--- a/hu_HU.ISO8859-2/books/handbook/printing/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/printing/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	printing/chapter.sgml
+CHAPTERS= 	printing/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
index 94c8057709..059b6d216f 100644
--- a/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/printing/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/printing/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/printing/chapter.xml
      %SRCID%	1.122
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/security/Makefile b/hu_HU.ISO8859-2/books/handbook/security/Makefile
index 6eb1abbd6e..f382c011ac 100644
--- a/hu_HU.ISO8859-2/books/handbook/security/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/security/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	security/chapter.sgml
+CHAPTERS= 	security/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/security/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/security/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/security/chapter.xml
index 9f42e33843..8e0e5e2f98 100644
--- a/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/security/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/security/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/security/chapter.xml
      %SRCID%	1.336
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/serialcomms/Makefile b/hu_HU.ISO8859-2/books/handbook/serialcomms/Makefile
index 3e44e768e3..a259ac5407 100644
--- a/hu_HU.ISO8859-2/books/handbook/serialcomms/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/serialcomms/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	serialcomms/chapter.sgml
+CHAPTERS= 	serialcomms/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
index cfc171800e..e92c197311 100644
--- a/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
      %SRCID%	1.133
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/users/Makefile b/hu_HU.ISO8859-2/books/handbook/users/Makefile
index f2b0ea07f8..34d4c5d1db 100644
--- a/hu_HU.ISO8859-2/books/handbook/users/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/users/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	users/chapter.sgml
+CHAPTERS= 	users/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/users/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/users/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/users/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/users/chapter.xml
index 438939ecc6..1e046a17b7 100644
--- a/hu_HU.ISO8859-2/books/handbook/users/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/users/chapter.xml
@@ -6,7 +6,7 @@
 -->
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/users/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/users/chapter.xml
      %SRCID%	1.59
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/vinum/Makefile b/hu_HU.ISO8859-2/books/handbook/vinum/Makefile
index cc3090e910..295484f65c 100644
--- a/hu_HU.ISO8859-2/books/handbook/vinum/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/vinum/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	vinum/chapter.sgml
+CHAPTERS= 	vinum/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/vinum/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
index 392bdcf881..e03ef42112 100644
--- a/hu_HU.ISO8859-2/books/handbook/vinum/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/vinum/chapter.xml
@@ -11,7 +11,7 @@
 -->
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/vinum/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/vinum/chapter.xml
      %SRCID%	1.47
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/virtualization/Makefile b/hu_HU.ISO8859-2/books/handbook/virtualization/Makefile
index c98e2f7f0b..9cc9300bf8 100644
--- a/hu_HU.ISO8859-2/books/handbook/virtualization/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/virtualization/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	virtualization/chapter.sgml
+CHAPTERS= 	virtualization/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
index 4c65bfabfc..fce0116b0a 100644
--- a/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
      %SRCID%	1.25
 -->
 
diff --git a/hu_HU.ISO8859-2/books/handbook/x11/Makefile b/hu_HU.ISO8859-2/books/handbook/x11/Makefile
index c4c28e8fe8..33cfe79f50 100644
--- a/hu_HU.ISO8859-2/books/handbook/x11/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/x11/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	x11/chapter.sgml
+CHAPTERS= 	x11/chapter.xml
 
 VPATH=		..
 
diff --git a/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml b/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
similarity index 99%
rename from hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml
rename to hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
index 3dafd47c97..9b2dcc7874 100644
--- a/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml
+++ b/hu_HU.ISO8859-2/books/handbook/x11/chapter.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/books/handbook/x11/chapter.sgml
+     %SOURCE%	en_US.ISO8859-1/books/handbook/x11/chapter.xml
      %SRCID%	1.204
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/Makefile b/hu_HU.ISO8859-2/htdocs/Makefile
index 6bd3b73d24..ce650b040b 100644
--- a/hu_HU.ISO8859-2/htdocs/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/Makefile
@@ -13,18 +13,18 @@
 
 # These are turned into validated, normalized HTML files.
 
-DOCS=	about.sgml
-DOCS+=	administration.sgml
-DOCS+=	applications.sgml
-DOCS+=	art.sgml
-DOCS+=	docs.sgml
-DOCS+=	features.sgml
-DOCS+=	internet.sgml
-DOCS+=	logo.sgml
-DOCS+=	mailto.sgml
-DOCS+=	send-pr.sgml
-DOCS+=	support.sgml
-DOCS+=	where.sgml
+DOCS=	about.xml
+DOCS+=	administration.xml
+DOCS+=	applications.xml
+DOCS+=	art.xml
+DOCS+=	docs.xml
+DOCS+=	features.xml
+DOCS+=	internet.xml
+DOCS+=	logo.xml
+DOCS+=	mailto.xml
+DOCS+=	send-pr.xml
+DOCS+=	support.xml
+DOCS+=	where.xml
 
 # Subdirectories
 # SGML
diff --git a/hu_HU.ISO8859-2/htdocs/about.sgml b/hu_HU.ISO8859-2/htdocs/about.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/about.sgml
rename to hu_HU.ISO8859-2/htdocs/about.xml
index d6f477aa0f..f8d148adb4 100644
--- a/hu_HU.ISO8859-2/htdocs/about.sgml
+++ b/hu_HU.ISO8859-2/htdocs/about.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/about.sgml
+     %SOURCE%	en/about.xml
      %SRCID%	1.14
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/administration.sgml b/hu_HU.ISO8859-2/htdocs/administration.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/administration.sgml
rename to hu_HU.ISO8859-2/htdocs/administration.xml
index 036300fd31..4fcf950548 100644
--- a/hu_HU.ISO8859-2/htdocs/administration.sgml
+++ b/hu_HU.ISO8859-2/htdocs/administration.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/administration.sgml
+     %SOURCE%	en/administration.xml
      %SRCID%	1.38
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/advocacy/Makefile b/hu_HU.ISO8859-2/htdocs/advocacy/Makefile
index 2ea533256f..c90149fc48 100644
--- a/hu_HU.ISO8859-2/htdocs/advocacy/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/advocacy/Makefile
@@ -11,7 +11,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   index.sgml
-DOCS+=	myths.sgml
+DOCS=   index.xml
+DOCS+=	myths.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/hu_HU.ISO8859-2/htdocs/advocacy/index.sgml b/hu_HU.ISO8859-2/htdocs/advocacy/index.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/advocacy/index.sgml
rename to hu_HU.ISO8859-2/htdocs/advocacy/index.xml
index 87af67b4b9..3eec563cd6 100644
--- a/hu_HU.ISO8859-2/htdocs/advocacy/index.sgml
+++ b/hu_HU.ISO8859-2/htdocs/advocacy/index.xml
@@ -6,7 +6,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/advocacy/index.sgml
+     %SOURCE%	en/advocacy/index.xml
      %SRCID%	1.17
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/advocacy/myths.sgml b/hu_HU.ISO8859-2/htdocs/advocacy/myths.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/advocacy/myths.sgml
rename to hu_HU.ISO8859-2/htdocs/advocacy/myths.xml
index 1720d21c91..14f0a6ba68 100644
--- a/hu_HU.ISO8859-2/htdocs/advocacy/myths.sgml
+++ b/hu_HU.ISO8859-2/htdocs/advocacy/myths.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/advocacy/myths.sgml
+     %SOURCE%	en/advocacy/myths.xml
      %SRCID%	1.44
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/applications.sgml b/hu_HU.ISO8859-2/htdocs/applications.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/applications.sgml
rename to hu_HU.ISO8859-2/htdocs/applications.xml
index dc54727027..77020fa5b4 100644
--- a/hu_HU.ISO8859-2/htdocs/applications.sgml
+++ b/hu_HU.ISO8859-2/htdocs/applications.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/applications.sgml
+     %SOURCE%	en/applications.xml
      %SRCID%	1.34
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/art.sgml b/hu_HU.ISO8859-2/htdocs/art.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/art.sgml
rename to hu_HU.ISO8859-2/htdocs/art.xml
index 2bae83b302..874010fafd 100644
--- a/hu_HU.ISO8859-2/htdocs/art.sgml
+++ b/hu_HU.ISO8859-2/htdocs/art.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/art.sgml
+     %SOURCE%	en/art.xml
      %SRCID%	1.10
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/community/Makefile b/hu_HU.ISO8859-2/htdocs/community/Makefile
index 0aad2163bc..d2933c3a20 100644
--- a/hu_HU.ISO8859-2/htdocs/community/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/community/Makefile
@@ -11,6 +11,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   irc.sgml mailinglists.sgml newsgroups.sgml webresources.sgml
+DOCS=   irc.xml mailinglists.xml newsgroups.xml webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/hu_HU.ISO8859-2/htdocs/community/irc.sgml b/hu_HU.ISO8859-2/htdocs/community/irc.xml
similarity index 97%
rename from hu_HU.ISO8859-2/htdocs/community/irc.sgml
rename to hu_HU.ISO8859-2/htdocs/community/irc.xml
index 9447bc2205..0b663625d8 100644
--- a/hu_HU.ISO8859-2/htdocs/community/irc.sgml
+++ b/hu_HU.ISO8859-2/htdocs/community/irc.xml
@@ -6,7 +6,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/community/irc.sgml
+     %SOURCE%	en/community/irc.xml
      %SRCID%	1.4
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/community/mailinglists.sgml b/hu_HU.ISO8859-2/htdocs/community/mailinglists.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/community/mailinglists.sgml
rename to hu_HU.ISO8859-2/htdocs/community/mailinglists.xml
index 7ae6e5933c..5a60892237 100644
--- a/hu_HU.ISO8859-2/htdocs/community/mailinglists.sgml
+++ b/hu_HU.ISO8859-2/htdocs/community/mailinglists.xml
@@ -6,7 +6,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/community/mailinglists.sgml
+     %SOURCE%	en/community/mailinglists.xml
      %SRCID%	1.18
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/community/newsgroups.sgml b/hu_HU.ISO8859-2/htdocs/community/newsgroups.xml
similarity index 96%
rename from hu_HU.ISO8859-2/htdocs/community/newsgroups.sgml
rename to hu_HU.ISO8859-2/htdocs/community/newsgroups.xml
index 31663bc30f..2fbdb140af 100644
--- a/hu_HU.ISO8859-2/htdocs/community/newsgroups.sgml
+++ b/hu_HU.ISO8859-2/htdocs/community/newsgroups.xml
@@ -6,7 +6,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/community/newsgroups.sgml
+     %SOURCE%	en/community/newsgroups.xml
      %SRCID%	1.5
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/community/webresources.sgml b/hu_HU.ISO8859-2/htdocs/community/webresources.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/community/webresources.sgml
rename to hu_HU.ISO8859-2/htdocs/community/webresources.xml
index b953dfc5a1..669a6c34af 100644
--- a/hu_HU.ISO8859-2/htdocs/community/webresources.sgml
+++ b/hu_HU.ISO8859-2/htdocs/community/webresources.xml
@@ -6,7 +6,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/community/webresources.sgml
+     %SOURCE%	en/community/webresources.xml
      %SRCID%	1.4
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/copyright/Makefile b/hu_HU.ISO8859-2/htdocs/copyright/Makefile
index 14606cce90..fde479a990 100644
--- a/hu_HU.ISO8859-2/htdocs/copyright/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/copyright/Makefile
@@ -11,7 +11,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	copyright.sgml
+DOCS=	copyright.xml
 
 INDEXLINK= copyright.html
 
diff --git a/hu_HU.ISO8859-2/htdocs/copyright/copyright.sgml b/hu_HU.ISO8859-2/htdocs/copyright/copyright.xml
similarity index 96%
rename from hu_HU.ISO8859-2/htdocs/copyright/copyright.sgml
rename to hu_HU.ISO8859-2/htdocs/copyright/copyright.xml
index f4ffa1e244..6d9212c6b4 100644
--- a/hu_HU.ISO8859-2/htdocs/copyright/copyright.sgml
+++ b/hu_HU.ISO8859-2/htdocs/copyright/copyright.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/copyright/copyright.sgml
+     %SOURCE%	en/copyright/copyright.xml
      %SRCID%	1.12
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/developers/Makefile b/hu_HU.ISO8859-2/htdocs/developers/Makefile
index 26583176b3..a740bf889d 100644
--- a/hu_HU.ISO8859-2/htdocs/developers/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/developers/Makefile
@@ -11,6 +11,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   cvs.sgml
+DOCS=   cvs.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/hu_HU.ISO8859-2/htdocs/developers/cvs.sgml b/hu_HU.ISO8859-2/htdocs/developers/cvs.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/developers/cvs.sgml
rename to hu_HU.ISO8859-2/htdocs/developers/cvs.xml
index b06dd89019..4cb40ebd74 100644
--- a/hu_HU.ISO8859-2/htdocs/developers/cvs.sgml
+++ b/hu_HU.ISO8859-2/htdocs/developers/cvs.xml
@@ -6,7 +6,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/developers/cvs.sgml
+     %SOURCE%	en/developers/cvs.xml
      %SRCID%	1.10
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/docproj/Makefile b/hu_HU.ISO8859-2/htdocs/docproj/Makefile
index f4d97dc74d..6bbba3b377 100644
--- a/hu_HU.ISO8859-2/htdocs/docproj/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/docproj/Makefile
@@ -11,12 +11,12 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+=	doc-set.sgml
-DOCS+=	hungarian.sgml
-DOCS+=  sgml.sgml
-DOCS+=  submitting.sgml
-DOCS+=  who.sgml
-DOCS+=	docproj.sgml
+DOCS+=	doc-set.xml
+DOCS+=	hungarian.xml
+DOCS+=  sgml.xml
+DOCS+=  submitting.xml
+DOCS+=  who.xml
+DOCS+=	docproj.xml
 
 INDEXLINK= docproj.html
 
diff --git a/hu_HU.ISO8859-2/htdocs/docproj/doc-set.sgml b/hu_HU.ISO8859-2/htdocs/docproj/doc-set.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/docproj/doc-set.sgml
rename to hu_HU.ISO8859-2/htdocs/docproj/doc-set.xml
index 21d2664748..51f4e2b844 100644
--- a/hu_HU.ISO8859-2/htdocs/docproj/doc-set.sgml
+++ b/hu_HU.ISO8859-2/htdocs/docproj/doc-set.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Peter Terbe <sncdev@gmail.com>
-     %SOURCE%	en/docproj/doc-set.sgml
+     %SOURCE%	en/docproj/doc-set.xml
      %SRCID%	1.17
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/docproj/docproj.sgml b/hu_HU.ISO8859-2/htdocs/docproj/docproj.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/docproj/docproj.sgml
rename to hu_HU.ISO8859-2/htdocs/docproj/docproj.xml
index 40eee3907d..f4004bb28d 100644
--- a/hu_HU.ISO8859-2/htdocs/docproj/docproj.sgml
+++ b/hu_HU.ISO8859-2/htdocs/docproj/docproj.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Peter Terbe <sncdev@gmail.com>
-     %SOURCE%	en/docproj/docproj.sgml
+     %SOURCE%	en/docproj/docproj.xml
      %SRCID%	1.21
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/docproj/hungarian.sgml b/hu_HU.ISO8859-2/htdocs/docproj/hungarian.xml
similarity index 100%
rename from hu_HU.ISO8859-2/htdocs/docproj/hungarian.sgml
rename to hu_HU.ISO8859-2/htdocs/docproj/hungarian.xml
diff --git a/hu_HU.ISO8859-2/htdocs/docproj/sgml.sgml b/hu_HU.ISO8859-2/htdocs/docproj/sgml.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/docproj/sgml.sgml
rename to hu_HU.ISO8859-2/htdocs/docproj/sgml.xml
index 69073f74a5..1d455ea50d 100644
--- a/hu_HU.ISO8859-2/htdocs/docproj/sgml.sgml
+++ b/hu_HU.ISO8859-2/htdocs/docproj/sgml.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Peter Terbe <sncdev@gmail.com>
-     %SOURCE%	en/docproj/sgml.sgml
+     %SOURCE%	en/docproj/sgml.xml
      %SRCID%	1.28
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/docproj/submitting.sgml b/hu_HU.ISO8859-2/htdocs/docproj/submitting.xml
similarity index 96%
rename from hu_HU.ISO8859-2/htdocs/docproj/submitting.sgml
rename to hu_HU.ISO8859-2/htdocs/docproj/submitting.xml
index 94e7e6f732..68fbe9f789 100644
--- a/hu_HU.ISO8859-2/htdocs/docproj/submitting.sgml
+++ b/hu_HU.ISO8859-2/htdocs/docproj/submitting.xml
@@ -8,7 +8,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Peter Terbe <sncdev@gmail.com>
-     %SOURCE%	en/docproj/submitting.sgml
+     %SOURCE%	en/docproj/submitting.xml
      %SRCID%	1.18
 -->
 
@@ -164,22 +164,22 @@
       <li>
 	<p>K�sz�ts�nk m�solatot az eredeti
 	  �llom�nyr�l.  Miel�tt az
-	  <tt>ize.sgml</tt> �llom�nyt
+	  <tt>ize.xml</tt> �llom�nyt
 	  m�dos�tan�nk, v�gezz�k el a
 	  k�vetkez� m�veletet:</p>
 
 	<pre>
-	  % <b>cp ize.sgml ize.sgml.eredeti</b>
+	  % <b>cp ize.xml ize.xml.eredeti</b>
 	</pre>
       </li>
 
       <li>
 	<p>Ezt k�vet�en v�gezz�k el a
 	  k�v�nt m�dos�t�sokat az
-	  ize.sgml �llom�nyon.</p>
+	  ize.xml �llom�nyon.</p>
 
 	<pre>
-	  % <b>vi foo.sgml</b>
+	  % <b>vi foo.xml</b>
 	  ... tap tap tap ...
 	  ... tesztelj�k a m�dos�t�sokat, n�zz�k �t, nehogy
 	  el�r�s maradjon benne stb. ...
@@ -191,7 +191,7 @@
 	  k�vetkez� parancsot kell kiadnunk:</p>
 
 	<pre>
-	  % <b>diff -u ize.sgml.eredeti ize.sgml > ize.diff</b>
+	  % <b>diff -u ize.xml.eredeti ize.xml > ize.diff</b>
 	</pre>
 
 	<p>A program megvizsg�lja a k�t
diff --git a/hu_HU.ISO8859-2/htdocs/docproj/who.sgml b/hu_HU.ISO8859-2/htdocs/docproj/who.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/docproj/who.sgml
rename to hu_HU.ISO8859-2/htdocs/docproj/who.xml
index d259fc4920..1c9c38cc94 100644
--- a/hu_HU.ISO8859-2/htdocs/docproj/who.sgml
+++ b/hu_HU.ISO8859-2/htdocs/docproj/who.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Peter Terbe <sncdev@gmail.com>
-     %SOURCE%	en/docproj/who.sgml
+     %SOURCE%	en/docproj/who.xml
      %SRCID%	1.15
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/docs.sgml b/hu_HU.ISO8859-2/htdocs/docs.xml
similarity index 96%
rename from hu_HU.ISO8859-2/htdocs/docs.sgml
rename to hu_HU.ISO8859-2/htdocs/docs.xml
index dd43aee558..b68bbba5c4 100644
--- a/hu_HU.ISO8859-2/htdocs/docs.sgml
+++ b/hu_HU.ISO8859-2/htdocs/docs.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/docs.sgml
+     %SOURCE%	en/docs.xml
      %SRCID%	1.195
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/docs/Makefile b/hu_HU.ISO8859-2/htdocs/docs/Makefile
index 1675f154bc..4475b09312 100644
--- a/hu_HU.ISO8859-2/htdocs/docs/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/docs/Makefile
@@ -11,6 +11,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/hu_HU.ISO8859-2/htdocs/docs/books.sgml b/hu_HU.ISO8859-2/htdocs/docs/books.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/docs/books.sgml
rename to hu_HU.ISO8859-2/htdocs/docs/books.xml
index 8936eb7cce..d759936ea0 100644
--- a/hu_HU.ISO8859-2/htdocs/docs/books.sgml
+++ b/hu_HU.ISO8859-2/htdocs/docs/books.xml
@@ -12,7 +12,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/docs/books.sgml
+     %SOURCE%	en/docs/books.xml
      %SRCID%	1.40
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/docs/webresources.sgml b/hu_HU.ISO8859-2/htdocs/docs/webresources.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/docs/webresources.sgml
rename to hu_HU.ISO8859-2/htdocs/docs/webresources.xml
index 6836a175af..ca24e510ee 100644
--- a/hu_HU.ISO8859-2/htdocs/docs/webresources.sgml
+++ b/hu_HU.ISO8859-2/htdocs/docs/webresources.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/docs/webresources.sgml
+     %SOURCE%	en/docs/webresources.xml
      %SRCID%	1.11
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/features.sgml b/hu_HU.ISO8859-2/htdocs/features.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/features.sgml
rename to hu_HU.ISO8859-2/htdocs/features.xml
index d05bd09fb2..aec67a0b82 100644
--- a/hu_HU.ISO8859-2/htdocs/features.sgml
+++ b/hu_HU.ISO8859-2/htdocs/features.xml
@@ -6,7 +6,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/features.sgml
+     %SOURCE%	en/features.xml
      %SRCID%	1.34
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/internet.sgml b/hu_HU.ISO8859-2/htdocs/internet.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/internet.sgml
rename to hu_HU.ISO8859-2/htdocs/internet.xml
index 93d5401fcc..8c47c1bd3a 100644
--- a/hu_HU.ISO8859-2/htdocs/internet.sgml
+++ b/hu_HU.ISO8859-2/htdocs/internet.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/internet.sgml
+     %SOURCE%	en/internet.xml
      %SRCID%	1.39
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/logo.sgml b/hu_HU.ISO8859-2/htdocs/logo.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/logo.sgml
rename to hu_HU.ISO8859-2/htdocs/logo.xml
index 1cb06e02c5..99d3e45929 100644
--- a/hu_HU.ISO8859-2/htdocs/logo.sgml
+++ b/hu_HU.ISO8859-2/htdocs/logo.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Peter Terbe <sncdev@gmail.com>
-     %SOURCE%	en/logo.sgml
+     %SOURCE%	en/logo.xml
      %SRCID%	1.7
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/mailto.sgml b/hu_HU.ISO8859-2/htdocs/mailto.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/mailto.sgml
rename to hu_HU.ISO8859-2/htdocs/mailto.xml
index 407eba7907..a6a7027ebc 100644
--- a/hu_HU.ISO8859-2/htdocs/mailto.sgml
+++ b/hu_HU.ISO8859-2/htdocs/mailto.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/mailto.sgml
+     %SOURCE%	en/mailto.xml
      %SRCID%	1.32
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/news/Makefile b/hu_HU.ISO8859-2/htdocs/news/Makefile
index a9f017c146..4ee1826d85 100644
--- a/hu_HU.ISO8859-2/htdocs/news/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/news/Makefile
@@ -11,8 +11,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+= news.sgml
-DOCS+= pressreleases.sgml
+DOCS+= news.xml
+DOCS+= pressreleases.xml
 
 INDEXLINK= news.html
 
diff --git a/hu_HU.ISO8859-2/htdocs/news/news.sgml b/hu_HU.ISO8859-2/htdocs/news/news.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/news/news.sgml
rename to hu_HU.ISO8859-2/htdocs/news/news.xml
index d01c88aab1..9ee525f6e1 100644
--- a/hu_HU.ISO8859-2/htdocs/news/news.sgml
+++ b/hu_HU.ISO8859-2/htdocs/news/news.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/news/news.sgml
+     %SOURCE%	en/news/news.xml
      %SRCID%	1.52
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/news/pressreleases.sgml b/hu_HU.ISO8859-2/htdocs/news/pressreleases.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/news/pressreleases.sgml
rename to hu_HU.ISO8859-2/htdocs/news/pressreleases.xml
index 0f07f289fb..bc2c2eccd7 100644
--- a/hu_HU.ISO8859-2/htdocs/news/pressreleases.sgml
+++ b/hu_HU.ISO8859-2/htdocs/news/pressreleases.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/news/pressreleases.sgml
+     %SOURCE%	en/news/pressreleases.xml
      %SRCID%	1.15
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/Makefile b/hu_HU.ISO8859-2/htdocs/platforms/Makefile
index 0445a27450..5a9df1f4ec 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/platforms/Makefile
@@ -11,17 +11,17 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	alpha.sgml
-DOCS+=	amd64.sgml
-DOCS+=	arm.sgml
-DOCS+=	i386.sgml
-DOCS+=	index.sgml
-DOCS+=	mips.sgml
-DOCS+=	pc98.sgml
-DOCS+=	ppc.sgml
-DOCS+=	sparc.sgml
-DOCS+=	sun4v.sgml
-DOCS+=	xbox.sgml
+DOCS=	alpha.xml
+DOCS+=	amd64.xml
+DOCS+=	arm.xml
+DOCS+=	i386.xml
+DOCS+=	index.xml
+DOCS+=	mips.xml
+DOCS+=	pc98.xml
+DOCS+=	ppc.xml
+DOCS+=	sparc.xml
+DOCS+=	sun4v.xml
+DOCS+=	xbox.xml
 
 SUBDIR=	ia64
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/alpha.sgml b/hu_HU.ISO8859-2/htdocs/platforms/alpha.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/platforms/alpha.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/alpha.xml
index ed444f8fff..12c215f7a4 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/alpha.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/alpha.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/alpha.sgml
+     %SOURCE%	en/platforms/alpha.xml
      %SRCID%	1.7
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/amd64.sgml b/hu_HU.ISO8859-2/htdocs/platforms/amd64.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/platforms/amd64.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/amd64.xml
index 2f641632af..0fe43911e7 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/amd64.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/amd64.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/amd64.sgml
+     %SOURCE%	en/platforms/amd64.xml
      %SRCID%	1.24
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/arm.sgml b/hu_HU.ISO8859-2/htdocs/platforms/arm.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/platforms/arm.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/arm.xml
index 553a6e829c..5ceed8cd21 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/arm.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/arm.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/arm.sgml
+     %SOURCE%	en/platforms/arm.xml
      %SRCID%	1.14
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/i386.sgml b/hu_HU.ISO8859-2/htdocs/platforms/i386.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/platforms/i386.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/i386.xml
index 6689a55cde..32336d576f 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/i386.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/i386.xml
@@ -6,7 +6,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/i386.sgml
+     %SOURCE%	en/platforms/i386.xml
      %SRCID%	1.12
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/ia64/Makefile b/hu_HU.ISO8859-2/htdocs/platforms/ia64/Makefile
index 7f718ebf35..63e9c35654 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/ia64/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/platforms/ia64/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml machines.sgml refs.sgml todo.sgml
+DOCS=	index.xml machines.xml refs.xml todo.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/ia64/index.sgml b/hu_HU.ISO8859-2/htdocs/platforms/ia64/index.xml
similarity index 100%
rename from hu_HU.ISO8859-2/htdocs/platforms/ia64/index.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/ia64/index.xml
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/ia64/machines.sgml b/hu_HU.ISO8859-2/htdocs/platforms/ia64/machines.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/platforms/ia64/machines.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/ia64/machines.xml
index cb403da8e5..c49bd85235 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/ia64/machines.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/ia64/machines.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/ia64/machines.sgml
+     %SOURCE%	en/platforms/ia64/machines.xml
      %SRCID%	1.9
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/ia64/refs.sgml b/hu_HU.ISO8859-2/htdocs/platforms/ia64/refs.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/platforms/ia64/refs.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/ia64/refs.xml
index 7ba2f6ae1d..e50acb4bcf 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/ia64/refs.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/ia64/refs.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/ia64/refs.sgml
+     %SOURCE%	en/platforms/ia64/refs.xml
      %SRCID%	1.11
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/ia64/todo.sgml b/hu_HU.ISO8859-2/htdocs/platforms/ia64/todo.xml
similarity index 100%
rename from hu_HU.ISO8859-2/htdocs/platforms/ia64/todo.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/ia64/todo.xml
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/index.sgml b/hu_HU.ISO8859-2/htdocs/platforms/index.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/platforms/index.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/index.xml
index 98eeb1266a..23dd987263 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/index.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/index.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/index.sgml
+     %SOURCE%	en/platforms/index.xml
      %SRCID%	1.24
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/mips.sgml b/hu_HU.ISO8859-2/htdocs/platforms/mips.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/platforms/mips.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/mips.xml
index 234e0e7288..913f4adb89 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/mips.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/mips.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/mips.sgml
+     %SOURCE%	en/platforms/mips.xml
      %SRCID%	1.7
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/pc98.sgml b/hu_HU.ISO8859-2/htdocs/platforms/pc98.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/platforms/pc98.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/pc98.xml
index 4468e62245..a6aa8f8fed 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/pc98.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/pc98.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/pc98.sgml
+     %SOURCE%	en/platforms/pc98.xml
      %SRCID%	1.17
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/ppc.sgml b/hu_HU.ISO8859-2/htdocs/platforms/ppc.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/platforms/ppc.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/ppc.xml
index 4d1284b311..cb964eb6d3 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/ppc.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/ppc.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/ppc.sgml
+     %SOURCE%	en/platforms/ppc.xml
      %SRCID%	1.26
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/sparc.sgml b/hu_HU.ISO8859-2/htdocs/platforms/sparc.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/platforms/sparc.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/sparc.xml
index af440dedfb..105762c03a 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/sparc.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/sparc.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/sparc.sgml
+     %SOURCE%	en/platforms/sparc.xml
      %SRCID%	1.40
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/sun4v.sgml b/hu_HU.ISO8859-2/htdocs/platforms/sun4v.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/platforms/sun4v.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/sun4v.xml
index af82a78f28..f2cc318c17 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/sun4v.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/sun4v.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/sun4v.sgml
+     %SOURCE%	en/platforms/sun4v.xml
      %SRCID%	1.8
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/platforms/xbox.sgml b/hu_HU.ISO8859-2/htdocs/platforms/xbox.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/platforms/xbox.sgml
rename to hu_HU.ISO8859-2/htdocs/platforms/xbox.xml
index b7779a5eae..37643d45e9 100644
--- a/hu_HU.ISO8859-2/htdocs/platforms/xbox.sgml
+++ b/hu_HU.ISO8859-2/htdocs/platforms/xbox.xml
@@ -6,7 +6,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/platforms/xbox.sgml
+     %SOURCE%	en/platforms/xbox.xml
      %SRCID%	1.10
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/projects/Makefile b/hu_HU.ISO8859-2/htdocs/projects/Makefile
index 909b1cbcd4..e1d8ed2d9b 100644
--- a/hu_HU.ISO8859-2/htdocs/projects/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/projects/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	projects.sgml
+DOCS=	projects.xml
 
 INDEXLINK= projects.html
 
diff --git a/hu_HU.ISO8859-2/htdocs/projects/projects.sgml b/hu_HU.ISO8859-2/htdocs/projects/projects.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/projects/projects.sgml
rename to hu_HU.ISO8859-2/htdocs/projects/projects.xml
index c4abdf20d4..61aafa37d6 100644
--- a/hu_HU.ISO8859-2/htdocs/projects/projects.sgml
+++ b/hu_HU.ISO8859-2/htdocs/projects/projects.xml
@@ -9,7 +9,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/projects/projects.sgml
+     %SOURCE%	en/projects/projects.xml
      %SRCID%	1.211
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/search/Makefile b/hu_HU.ISO8859-2/htdocs/search/Makefile
index 51e567a0e6..830f4d363e 100644
--- a/hu_HU.ISO8859-2/htdocs/search/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/search/Makefile
@@ -7,10 +7,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+=	index-site.sgml
-DOCS+=	search.sgml
-DOCS+=	searchhints.sgml
-DOCS+=	search-mid.sgml
+DOCS+=	index-site.xml
+DOCS+=	search.xml
+DOCS+=	searchhints.xml
+DOCS+=	search-mid.xml
 
 INDEXLINK=	search.html
 
diff --git a/hu_HU.ISO8859-2/htdocs/search/search-mid.sgml b/hu_HU.ISO8859-2/htdocs/search/search-mid.xml
similarity index 97%
rename from hu_HU.ISO8859-2/htdocs/search/search-mid.sgml
rename to hu_HU.ISO8859-2/htdocs/search/search-mid.xml
index 3b915d1349..1af6f81723 100644
--- a/hu_HU.ISO8859-2/htdocs/search/search-mid.sgml
+++ b/hu_HU.ISO8859-2/htdocs/search/search-mid.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/search/search-mid.sgml
+     %SOURCE%	en/search/search-mid.xml
      %SRCID%	1.10
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/search/search.sgml b/hu_HU.ISO8859-2/htdocs/search/search.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/search/search.sgml
rename to hu_HU.ISO8859-2/htdocs/search/search.xml
index ac16bc15ae..e684d6448a 100644
--- a/hu_HU.ISO8859-2/htdocs/search/search.sgml
+++ b/hu_HU.ISO8859-2/htdocs/search/search.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/search/search.sgml
+     %SOURCE%	en/search/search.xml
      %SRCID%	1.118
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/search/searchhints.sgml b/hu_HU.ISO8859-2/htdocs/search/searchhints.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/search/searchhints.sgml
rename to hu_HU.ISO8859-2/htdocs/search/searchhints.xml
index c017236453..83477c05c7 100644
--- a/hu_HU.ISO8859-2/htdocs/search/searchhints.sgml
+++ b/hu_HU.ISO8859-2/htdocs/search/searchhints.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/search/searchhints.sgml
+     %SOURCE%	en/search/searchhints.xml
      %SRCID%	1.10
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/security/Makefile b/hu_HU.ISO8859-2/htdocs/security/Makefile
index 8c9596f5ae..327baaf8ae 100644
--- a/hu_HU.ISO8859-2/htdocs/security/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/security/Makefile
@@ -11,10 +11,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS =	security.sgml
-DOCS+=	advisories.sgml
+DOCS =	security.xml
+DOCS+=	advisories.xml
 
-advisories.sgml: advisories.html.inc
+advisories.xml: advisories.html.inc
 
 INDEXLINK=	security.html
 
diff --git a/hu_HU.ISO8859-2/htdocs/security/advisories.sgml b/hu_HU.ISO8859-2/htdocs/security/advisories.xml
similarity index 96%
rename from hu_HU.ISO8859-2/htdocs/security/advisories.sgml
rename to hu_HU.ISO8859-2/htdocs/security/advisories.xml
index dc64c83495..9640dee891 100644
--- a/hu_HU.ISO8859-2/htdocs/security/advisories.sgml
+++ b/hu_HU.ISO8859-2/htdocs/security/advisories.xml
@@ -7,7 +7,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en/security/advisories.sgml
+     %SOURCE%	en/security/advisories.xml
      %SRCID%	1.1
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/security/security.sgml b/hu_HU.ISO8859-2/htdocs/security/security.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/security/security.sgml
rename to hu_HU.ISO8859-2/htdocs/security/security.xml
index 576afbd978..42a0ec0f32 100644
--- a/hu_HU.ISO8859-2/htdocs/security/security.sgml
+++ b/hu_HU.ISO8859-2/htdocs/security/security.xml
@@ -8,7 +8,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en/security/security.sgml
+     %SOURCE%	en/security/security.xml
      %SRCID%	1.214
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/send-pr.sgml b/hu_HU.ISO8859-2/htdocs/send-pr.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/send-pr.sgml
rename to hu_HU.ISO8859-2/htdocs/send-pr.xml
index da9ed15f78..91734d1fc0 100644
--- a/hu_HU.ISO8859-2/htdocs/send-pr.sgml
+++ b/hu_HU.ISO8859-2/htdocs/send-pr.xml
@@ -9,7 +9,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Peter Terbe <sncdev@gmail.com>
-     %SOURCE%	en/send-pr.sgml
+     %SOURCE%	en/send-pr.xml
      %SRCID%	1.61
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/support.sgml b/hu_HU.ISO8859-2/htdocs/support.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/support.sgml
rename to hu_HU.ISO8859-2/htdocs/support.xml
index 2a772dcde8..0e75d0c9b7 100644
--- a/hu_HU.ISO8859-2/htdocs/support.sgml
+++ b/hu_HU.ISO8859-2/htdocs/support.xml
@@ -6,7 +6,7 @@
 
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/support.sgml
+     %SOURCE%	en/support.xml
      %SRCID%	1.356
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/support/Makefile b/hu_HU.ISO8859-2/htdocs/support/Makefile
index fac2fb5d25..e76eb6c6a9 100644
--- a/hu_HU.ISO8859-2/htdocs/support/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/support/Makefile
@@ -11,6 +11,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/hu_HU.ISO8859-2/htdocs/support/bugreports.sgml b/hu_HU.ISO8859-2/htdocs/support/bugreports.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/support/bugreports.sgml
rename to hu_HU.ISO8859-2/htdocs/support/bugreports.xml
index 7a806eebb1..4c78e08010 100644
--- a/hu_HU.ISO8859-2/htdocs/support/bugreports.sgml
+++ b/hu_HU.ISO8859-2/htdocs/support/bugreports.xml
@@ -6,7 +6,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/support/bugreports.sgml
+     %SOURCE%	en/support/bugreports.xml
      %SRCID%	1.5
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/support/webresources.sgml b/hu_HU.ISO8859-2/htdocs/support/webresources.xml
similarity index 98%
rename from hu_HU.ISO8859-2/htdocs/support/webresources.sgml
rename to hu_HU.ISO8859-2/htdocs/support/webresources.xml
index 35c3338437..6cf67db236 100644
--- a/hu_HU.ISO8859-2/htdocs/support/webresources.sgml
+++ b/hu_HU.ISO8859-2/htdocs/support/webresources.xml
@@ -6,7 +6,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/support/webresources.sgml
+     %SOURCE%	en/support/webresources.xml
      %SRCID%	1.3
 -->
 
diff --git a/hu_HU.ISO8859-2/htdocs/where.sgml b/hu_HU.ISO8859-2/htdocs/where.xml
similarity index 99%
rename from hu_HU.ISO8859-2/htdocs/where.sgml
rename to hu_HU.ISO8859-2/htdocs/where.xml
index 4e7dc796ab..37b72f8da3 100644
--- a/hu_HU.ISO8859-2/htdocs/where.sgml
+++ b/hu_HU.ISO8859-2/htdocs/where.xml
@@ -7,7 +7,7 @@
 
 <!-- FreeBSD Hungarian Documentation Project
      Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
-     %SOURCE%	en/where.sgml
+     %SOURCE%	en/where.xml
      %SRCID%	1.105
 -->
 
diff --git a/hu_HU.ISO8859-2/share/sgml/bibliography.sgml b/hu_HU.ISO8859-2/share/sgml/bibliography.xml
similarity index 99%
rename from hu_HU.ISO8859-2/share/sgml/bibliography.sgml
rename to hu_HU.ISO8859-2/share/sgml/bibliography.xml
index 81fdc87a29..195db79aa1 100644
--- a/hu_HU.ISO8859-2/share/sgml/bibliography.sgml
+++ b/hu_HU.ISO8859-2/share/sgml/bibliography.xml
@@ -4,7 +4,7 @@
 -->
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	share/sgml/bibliography.sgml
+     %SOURCE%	share/sgml/bibliography.xml
      %SRCID%	1.10
 -->
 
diff --git a/hu_HU.ISO8859-2/share/sgml/glossary.ent b/hu_HU.ISO8859-2/share/sgml/glossary.ent
index 8f69a1d97a..f6ff94e7ee 100644
--- a/hu_HU.ISO8859-2/share/sgml/glossary.ent
+++ b/hu_HU.ISO8859-2/share/sgml/glossary.ent
@@ -33,7 +33,7 @@
 -->
 <!-- The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor <pgj@FreeBSD.org>
-     %SOURCE%	en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml
+     %SOURCE%	en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.xml
      %SRCID%	1.36
 -->
 
diff --git a/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl b/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl
index eb2860a7c5..4d98edb3e0 100644
--- a/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl
+++ b/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl
@@ -46,12 +46,12 @@
 
   <xsl:template match="/">
     <xsl:choose>
-      <xsl:when test="$target = 'handbook/mirrors/chapter.sgml'">
+      <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
 	<xsl:call-template name="mirrors-docbook-country-index-all" />
 	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
 	<xsl:call-template name="mirrors-docbook-variablelist" />
       </xsl:when>
-      <xsl:when test="$target = 'handbook/eresources/chapter.sgml'">
+      <xsl:when test="$target = 'handbook/eresources/chapter.xml'">
 	<xsl:call-template name="mirrors-docbook-country-index-all" />
 	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
 	<xsl:call-template name="mirrors-docbook-itemizedlist" />
diff --git a/it_IT.ISO8859-15/articles/committers-guide/Makefile b/it_IT.ISO8859-15/articles/committers-guide/Makefile
index 30139e3c4c..692b28fedb 100644
--- a/it_IT.ISO8859-15/articles/committers-guide/Makefile
+++ b/it_IT.ISO8859-15/articles/committers-guide/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/it_IT.ISO8859-15/articles/committers-guide/article.sgml b/it_IT.ISO8859-15/articles/committers-guide/article.xml
similarity index 100%
rename from it_IT.ISO8859-15/articles/committers-guide/article.sgml
rename to it_IT.ISO8859-15/articles/committers-guide/article.xml
diff --git a/it_IT.ISO8859-15/articles/explaining-bsd/Makefile b/it_IT.ISO8859-15/articles/explaining-bsd/Makefile
index 5d5291bf47..39733a2b9e 100644
--- a/it_IT.ISO8859-15/articles/explaining-bsd/Makefile
+++ b/it_IT.ISO8859-15/articles/explaining-bsd/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/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml b/it_IT.ISO8859-15/articles/explaining-bsd/article.xml
similarity index 100%
rename from it_IT.ISO8859-15/articles/explaining-bsd/article.sgml
rename to it_IT.ISO8859-15/articles/explaining-bsd/article.xml
diff --git a/it_IT.ISO8859-15/articles/filtering-bridges/Makefile b/it_IT.ISO8859-15/articles/filtering-bridges/Makefile
index b41d2ebd8c..25cdb8103e 100644
--- a/it_IT.ISO8859-15/articles/filtering-bridges/Makefile
+++ b/it_IT.ISO8859-15/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/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml b/it_IT.ISO8859-15/articles/filtering-bridges/article.xml
similarity index 100%
rename from it_IT.ISO8859-15/articles/filtering-bridges/article.sgml
rename to it_IT.ISO8859-15/articles/filtering-bridges/article.xml
diff --git a/it_IT.ISO8859-15/articles/new-users/Makefile b/it_IT.ISO8859-15/articles/new-users/Makefile
index 5dd9a75a56..9254148082 100644
--- a/it_IT.ISO8859-15/articles/new-users/Makefile
+++ b/it_IT.ISO8859-15/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/it_IT.ISO8859-15/articles/new-users/article.sgml b/it_IT.ISO8859-15/articles/new-users/article.xml
similarity index 100%
rename from it_IT.ISO8859-15/articles/new-users/article.sgml
rename to it_IT.ISO8859-15/articles/new-users/article.xml
diff --git a/it_IT.ISO8859-15/articles/vm-design/Makefile b/it_IT.ISO8859-15/articles/vm-design/Makefile
index 2780936f21..f4d95d0958 100644
--- a/it_IT.ISO8859-15/articles/vm-design/Makefile
+++ b/it_IT.ISO8859-15/articles/vm-design/Makefile
@@ -8,7 +8,7 @@ DOC?= article
 FORMATS?= html
 WITH_ARTICLE_TOC?= YES
 
-SRCS=		article.sgml
+SRCS=		article.xml
 IMAGES_EN =	fig1.eps
 IMAGES_EN+=	fig2.eps
 IMAGES_EN+=	fig3.eps
diff --git a/it_IT.ISO8859-15/articles/vm-design/article.sgml b/it_IT.ISO8859-15/articles/vm-design/article.xml
similarity index 100%
rename from it_IT.ISO8859-15/articles/vm-design/article.sgml
rename to it_IT.ISO8859-15/articles/vm-design/article.xml
diff --git a/it_IT.ISO8859-15/books/handbook/Makefile b/it_IT.ISO8859-15/books/handbook/Makefile
index dd695f8597..6432ef3708 100644
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@@ -17,7 +17,7 @@
 # Targets specifici del Manuale
 #
 #       pgpkeyring      Questo target legger� il contenuto del file
-#                       pgpkeys/chapter.sgml ad estrarr� tutte le chiavi
+#                       pgpkeys/chapter.xml ad estrarr� tutte le chiavi
 #                       pgp sullo standard output.  Questo output pu�
 #                       quindi essere rediretto su un file e distribuito
 #                       come un keyring pubblico degli sviluppatori di
@@ -184,42 +184,42 @@ IMAGES_LIB+= callouts/15.png
 #
 
 # Contenuto SGML
-SRCS = book.sgml
-SRCS+= colophon.sgml
-SRCS+= advanced-networking/chapter.sgml
-SRCS+= audit/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+= 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 = book.xml
+SRCS+= colophon.xml
+SRCS+= advanced-networking/chapter.xml
+SRCS+= audit/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+= 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
@@ -227,12 +227,12 @@ SRCS+= chapters.ent
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Attiva tutti i capitoli.
-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 ${MASTERDOC}
 
 #
@@ -248,9 +248,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}
@@ -258,20 +258,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/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile b/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile
index 9bc3fccc51..81a4b6cc34 100644
--- a/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	advanced-networking/chapter.sgml
+CHAPTERS= 	advanced-networking/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml b/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/audit/Makefile b/it_IT.ISO8859-15/books/handbook/audit/Makefile
index 62198d2b0e..c7eb1af36f 100644
--- a/it_IT.ISO8859-15/books/handbook/audit/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/audit/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	audit/chapter.sgml
+CHAPTERS= 	audit/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml b/it_IT.ISO8859-15/books/handbook/audit/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/audit/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/audit/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/basics/Makefile b/it_IT.ISO8859-15/books/handbook/basics/Makefile
index 8827060440..e06928100d 100644
--- a/it_IT.ISO8859-15/books/handbook/basics/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/basics/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	basics/chapter.sgml
+CHAPTERS= 	basics/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml b/it_IT.ISO8859-15/books/handbook/basics/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/basics/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/basics/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/bibliography/Makefile b/it_IT.ISO8859-15/books/handbook/bibliography/Makefile
index 3f27769f07..34d50dd67b 100644
--- a/it_IT.ISO8859-15/books/handbook/bibliography/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/bibliography/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	bibliography/chapter.sgml
+CHAPTERS= 	bibliography/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml b/it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/bibliography/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/book.sgml b/it_IT.ISO8859-15/books/handbook/book.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/book.sgml
rename to it_IT.ISO8859-15/books/handbook/book.xml
diff --git a/it_IT.ISO8859-15/books/handbook/boot/Makefile b/it_IT.ISO8859-15/books/handbook/boot/Makefile
index 31e4b07d51..873b2f0824 100644
--- a/it_IT.ISO8859-15/books/handbook/boot/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/boot/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	boot/chapter.sgml
+CHAPTERS= 	boot/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml b/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/boot/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/boot/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/chapters.ent b/it_IT.ISO8859-15/books/handbook/chapters.ent
index 7e7cfa2979..0267af8510 100644
--- a/it_IT.ISO8859-15/books/handbook/chapters.ent
+++ b/it_IT.ISO8859-15/books/handbook/chapters.ent
@@ -55,140 +55,140 @@
 <!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.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/it_IT.ISO8859-15/books/handbook/colophon.sgml b/it_IT.ISO8859-15/books/handbook/colophon.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/colophon.sgml
rename to it_IT.ISO8859-15/books/handbook/colophon.xml
diff --git a/it_IT.ISO8859-15/books/handbook/config/Makefile b/it_IT.ISO8859-15/books/handbook/config/Makefile
index 499ed0e287..e8c56adcdf 100644
--- a/it_IT.ISO8859-15/books/handbook/config/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/config/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	config/chapter.sgml
+CHAPTERS= 	config/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/config/chapter.sgml b/it_IT.ISO8859-15/books/handbook/config/chapter.xml
similarity index 99%
rename from it_IT.ISO8859-15/books/handbook/config/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/config/chapter.xml
index edba87f0b5..301ee5cbf4 100644
--- a/it_IT.ISO8859-15/books/handbook/config/chapter.sgml
+++ b/it_IT.ISO8859-15/books/handbook/config/chapter.xml
@@ -992,7 +992,7 @@ ukphy1:  10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto</screen>
   <indexterm><primary>KLD (oggetti del kernel caricabili)</primary></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>Sfortunatamente, ci sono ancora molti venditori
           di hardware che non forniscono specifiche dei loro
diff --git a/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile b/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile
index 12c6213cf5..89072448ed 100644
--- a/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	cutting-edge/chapter.sgml
+CHAPTERS= 	cutting-edge/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml b/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/desktop/Makefile b/it_IT.ISO8859-15/books/handbook/desktop/Makefile
index 0585360573..826714edfe 100644
--- a/it_IT.ISO8859-15/books/handbook/desktop/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/desktop/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	desktop/chapter.sgml
+CHAPTERS= 	desktop/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml b/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/desktop/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/disks/Makefile b/it_IT.ISO8859-15/books/handbook/disks/Makefile
index e2e1d27c62..b8273f04a3 100644
--- a/it_IT.ISO8859-15/books/handbook/disks/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/disks/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	disks/chapter.sgml
+CHAPTERS= 	disks/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml b/it_IT.ISO8859-15/books/handbook/disks/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/disks/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/disks/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/eresources/Makefile b/it_IT.ISO8859-15/books/handbook/eresources/Makefile
index d9d20d6036..ec27e622dc 100644
--- a/it_IT.ISO8859-15/books/handbook/eresources/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/eresources/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	eresources/chapter.sgml
+CHAPTERS= 	eresources/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml b/it_IT.ISO8859-15/books/handbook/eresources/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/eresources/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/firewalls/Makefile b/it_IT.ISO8859-15/books/handbook/firewalls/Makefile
index 7b5971c535..032f315d1a 100644
--- a/it_IT.ISO8859-15/books/handbook/firewalls/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/firewalls/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	firewalls/chapter.sgml
+CHAPTERS= 	firewalls/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml b/it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/firewalls/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/geom/Makefile b/it_IT.ISO8859-15/books/handbook/geom/Makefile
index d2ab6fcaf9..53822e6bfd 100644
--- a/it_IT.ISO8859-15/books/handbook/geom/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/geom/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	geom/chapter.sgml
+CHAPTERS= 	geom/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml b/it_IT.ISO8859-15/books/handbook/geom/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/geom/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/geom/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/install/Makefile b/it_IT.ISO8859-15/books/handbook/install/Makefile
index 0e21ad9d0f..e40221a155 100644
--- a/it_IT.ISO8859-15/books/handbook/install/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/install/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	install/chapter.sgml
+CHAPTERS= 	install/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/install/chapter.sgml b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/install/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/install/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/introduction/Makefile b/it_IT.ISO8859-15/books/handbook/introduction/Makefile
index 053016daea..ca9b31427c 100644
--- a/it_IT.ISO8859-15/books/handbook/introduction/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/introduction/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	introduction/chapter.sgml
+CHAPTERS= 	introduction/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml b/it_IT.ISO8859-15/books/handbook/introduction/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/introduction/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/jails/Makefile b/it_IT.ISO8859-15/books/handbook/jails/Makefile
index 8409040161..515c8f3d46 100644
--- a/it_IT.ISO8859-15/books/handbook/jails/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/jails/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	jails/chapter.sgml
+CHAPTERS= 	jails/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/jails/chapter.sgml b/it_IT.ISO8859-15/books/handbook/jails/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/jails/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/jails/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile b/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile
index 8b6e2f18e1..4c71af59e6 100644
--- a/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	kernelconfig/chapter.sgml
+CHAPTERS= 	kernelconfig/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml b/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/l10n/Makefile b/it_IT.ISO8859-15/books/handbook/l10n/Makefile
index 22f0363511..60ba2ff47a 100644
--- a/it_IT.ISO8859-15/books/handbook/l10n/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/l10n/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	l10n/chapter.sgml
+CHAPTERS= 	l10n/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml b/it_IT.ISO8859-15/books/handbook/l10n/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/l10n/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile b/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile
index 23a200867e..9d42accb39 100644
--- a/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	linuxemu/chapter.sgml
+CHAPTERS= 	linuxemu/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml b/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/linuxemu/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/mac/Makefile b/it_IT.ISO8859-15/books/handbook/mac/Makefile
index 6f89f60b36..5a48b6194b 100644
--- a/it_IT.ISO8859-15/books/handbook/mac/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/mac/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mac/chapter.sgml
+CHAPTERS= 	mac/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml b/it_IT.ISO8859-15/books/handbook/mac/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/mac/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/mac/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/mail/Makefile b/it_IT.ISO8859-15/books/handbook/mail/Makefile
index f71563ad01..33cc89c0f9 100644
--- a/it_IT.ISO8859-15/books/handbook/mail/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/mail/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mail/chapter.sgml
+CHAPTERS= 	mail/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/mail/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/mail/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/mirrors/Makefile b/it_IT.ISO8859-15/books/handbook/mirrors/Makefile
index d78871c6b2..a9dfefa30c 100644
--- a/it_IT.ISO8859-15/books/handbook/mirrors/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/mirrors/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mirrors/chapter.sgml
+CHAPTERS= 	mirrors/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml b/it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/mirrors/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/multimedia/Makefile b/it_IT.ISO8859-15/books/handbook/multimedia/Makefile
index 9554035b27..86d406f58f 100644
--- a/it_IT.ISO8859-15/books/handbook/multimedia/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/multimedia/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	multimedia/chapter.sgml
+CHAPTERS= 	multimedia/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml b/it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/multimedia/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/network-servers/Makefile b/it_IT.ISO8859-15/books/handbook/network-servers/Makefile
index fedd913d51..d3187ecd8c 100644
--- a/it_IT.ISO8859-15/books/handbook/network-servers/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/network-servers/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	network-servers/chapter.sgml
+CHAPTERS= 	network-servers/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml b/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile b/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile
index dec9fbe096..ba41e96f65 100644
--- a/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile
+++ b/it_IT.ISO8859-15/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/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml b/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/ports/Makefile b/it_IT.ISO8859-15/books/handbook/ports/Makefile
index 2bdc9665c2..59c797d606 100644
--- a/it_IT.ISO8859-15/books/handbook/ports/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/ports/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	ports/chapter.sgml
+CHAPTERS= 	ports/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml b/it_IT.ISO8859-15/books/handbook/ports/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/ports/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/ports/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile b/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile
index 04846f53a0..c4c6140795 100644
--- a/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile
+++ b/it_IT.ISO8859-15/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/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml b/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/preface/preface.sgml b/it_IT.ISO8859-15/books/handbook/preface/preface.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/preface/preface.sgml
rename to it_IT.ISO8859-15/books/handbook/preface/preface.xml
diff --git a/it_IT.ISO8859-15/books/handbook/printing/Makefile b/it_IT.ISO8859-15/books/handbook/printing/Makefile
index 50122d5aff..52171122f7 100644
--- a/it_IT.ISO8859-15/books/handbook/printing/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/printing/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	printing/chapter.sgml
+CHAPTERS= 	printing/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml b/it_IT.ISO8859-15/books/handbook/printing/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/printing/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/printing/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/security/Makefile b/it_IT.ISO8859-15/books/handbook/security/Makefile
index dc53e3d058..436f4254c9 100644
--- a/it_IT.ISO8859-15/books/handbook/security/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/security/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	security/chapter.sgml
+CHAPTERS= 	security/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/security/chapter.sgml b/it_IT.ISO8859-15/books/handbook/security/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/security/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/security/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile b/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile
index 1bfc6afff8..8d9573fc36 100644
--- a/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	serialcomms/chapter.sgml
+CHAPTERS= 	serialcomms/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml b/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/serialcomms/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/users/Makefile b/it_IT.ISO8859-15/books/handbook/users/Makefile
index 4b11d7ebd9..cafabfd7a2 100644
--- a/it_IT.ISO8859-15/books/handbook/users/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/users/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	users/chapter.sgml
+CHAPTERS= 	users/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/users/chapter.sgml b/it_IT.ISO8859-15/books/handbook/users/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/users/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/users/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/vinum/Makefile b/it_IT.ISO8859-15/books/handbook/vinum/Makefile
index 51d136b3cf..dd31d34c4c 100644
--- a/it_IT.ISO8859-15/books/handbook/vinum/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/vinum/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	vinum/chapter.sgml
+CHAPTERS= 	vinum/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml b/it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/vinum/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/virtualization/Makefile b/it_IT.ISO8859-15/books/handbook/virtualization/Makefile
index 45ed52f717..8a2d2f2823 100644
--- a/it_IT.ISO8859-15/books/handbook/virtualization/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/virtualization/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	virtualization/chapter.sgml
+CHAPTERS= 	virtualization/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/virtualization/chapter.sgml b/it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/virtualization/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/virtualization/chapter.xml
diff --git a/it_IT.ISO8859-15/books/handbook/x11/Makefile b/it_IT.ISO8859-15/books/handbook/x11/Makefile
index 46ca90e47b..cfd5ef6597 100644
--- a/it_IT.ISO8859-15/books/handbook/x11/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/x11/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	x11/chapter.sgml
+CHAPTERS= 	x11/chapter.xml
 
 VPATH=		..
 
diff --git a/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml b/it_IT.ISO8859-15/books/handbook/x11/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/handbook/x11/chapter.sgml
rename to it_IT.ISO8859-15/books/handbook/x11/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/Makefile b/it_IT.ISO8859-15/books/unix-introduction/Makefile
index d08239cf37..1aa021cfad 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/Makefile
+++ b/it_IT.ISO8859-15/books/unix-introduction/Makefile
@@ -19,21 +19,21 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # Contenuto SGML
-SRCS = book.sgml
-SRCS+= bibliography/chapter.sgml
-SRCS+= command-summary/chapter.sgml
-SRCS+= commands/chapter.sgml
-SRCS+= editors/chapter.sgml
-SRCS+= getting-started/chapter.sgml
-SRCS+= glossary/chapter.sgml
-SRCS+= history/chapter.sgml
-SRCS+= preface/chapter.sgml
-SRCS+= shell-programming/chapter.sgml
-SRCS+= shells/chapter.sgml
-SRCS+= special-features/chapter.sgml
-SRCS+= structure/chapter.sgml
-SRCS+= system-resource/chapter.sgml
-SRCS+= text-processing/chapter.sgml
+SRCS = book.xml
+SRCS+= bibliography/chapter.xml
+SRCS+= command-summary/chapter.xml
+SRCS+= commands/chapter.xml
+SRCS+= editors/chapter.xml
+SRCS+= getting-started/chapter.xml
+SRCS+= glossary/chapter.xml
+SRCS+= history/chapter.xml
+SRCS+= preface/chapter.xml
+SRCS+= shell-programming/chapter.xml
+SRCS+= shells/chapter.xml
+SRCS+= special-features/chapter.xml
+SRCS+= structure/chapter.xml
+SRCS+= system-resource/chapter.xml
+SRCS+= text-processing/chapter.xml
 
 # Entities
 SRCS+= chapters.ent
diff --git a/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/book.sgml b/it_IT.ISO8859-15/books/unix-introduction/book.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/book.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/book.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/chapters.ent b/it_IT.ISO8859-15/books/unix-introduction/chapters.ent
index 906c753cbf..c534ff37dd 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/chapters.ent
+++ b/it_IT.ISO8859-15/books/unix-introduction/chapters.ent
@@ -12,17 +12,17 @@
      $FreeBSD$
 -->
 
-<!ENTITY chap.preface                 SYSTEM "preface/chapter.sgml">
-<!ENTITY chap.history                 SYSTEM "history/chapter.sgml">
-<!ENTITY chap.structure               SYSTEM "structure/chapter.sgml">
-<!ENTITY chap.getting-started         SYSTEM "getting-started/chapter.sgml">
-<!ENTITY chap.system-resource         SYSTEM "system-resource/chapter.sgml">
-<!ENTITY chap.shells                  SYSTEM "shells/chapter.sgml">
-<!ENTITY chap.special-features        SYSTEM "special-features/chapter.sgml">
-<!ENTITY chap.text-processing         SYSTEM "text-processing/chapter.sgml">
-<!ENTITY chap.commands                SYSTEM "commands/chapter.sgml">
-<!ENTITY chap.shell-programming       SYSTEM "shell-programming/chapter.sgml">
-<!ENTITY chap.editors                 SYSTEM "editors/chapter.sgml">
-<!ENTITY chap.command-summary         SYSTEM "command-summary/chapter.sgml">
-<!ENTITY chap.bibliography            SYSTEM "bibliography/chapter.sgml">
-<!ENTITY chap.glossary                SYSTEM "glossary/chapter.sgml">
+<!ENTITY chap.preface                 SYSTEM "preface/chapter.xml">
+<!ENTITY chap.history                 SYSTEM "history/chapter.xml">
+<!ENTITY chap.structure               SYSTEM "structure/chapter.xml">
+<!ENTITY chap.getting-started         SYSTEM "getting-started/chapter.xml">
+<!ENTITY chap.system-resource         SYSTEM "system-resource/chapter.xml">
+<!ENTITY chap.shells                  SYSTEM "shells/chapter.xml">
+<!ENTITY chap.special-features        SYSTEM "special-features/chapter.xml">
+<!ENTITY chap.text-processing         SYSTEM "text-processing/chapter.xml">
+<!ENTITY chap.commands                SYSTEM "commands/chapter.xml">
+<!ENTITY chap.shell-programming       SYSTEM "shell-programming/chapter.xml">
+<!ENTITY chap.editors                 SYSTEM "editors/chapter.xml">
+<!ENTITY chap.command-summary         SYSTEM "command-summary/chapter.xml">
+<!ENTITY chap.bibliography            SYSTEM "bibliography/chapter.xml">
+<!ENTITY chap.glossary                SYSTEM "glossary/chapter.xml">
diff --git a/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/commands/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/editors/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/history/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/preface/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/shells/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/structure/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.xml
diff --git a/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml b/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml
similarity index 100%
rename from it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml
rename to it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.xml
diff --git a/it_IT.ISO8859-15/htdocs/Makefile b/it_IT.ISO8859-15/htdocs/Makefile
index dbd3bef479..a77e0743ef 100644
--- a/it_IT.ISO8859-15/htdocs/Makefile
+++ b/it_IT.ISO8859-15/htdocs/Makefile
@@ -8,12 +8,12 @@
 
 # These are turned into validated, normalized HTML files.
 
-DOCS=  about.sgml
-DOCS+= community.sgml
-DOCS+= docs.sgml
-DOCS+= mailto.sgml
-DOCS+= support.sgml
-DOCS+= where.sgml
+DOCS=  about.xml
+DOCS+= community.xml
+DOCS+= docs.xml
+DOCS+= mailto.xml
+DOCS+= support.xml
+DOCS+= where.xml
 
 XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
 DEPENDSET.index=transtable mirrors news press events \
diff --git a/it_IT.ISO8859-15/htdocs/about.sgml b/it_IT.ISO8859-15/htdocs/about.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/about.sgml
rename to it_IT.ISO8859-15/htdocs/about.xml
diff --git a/it_IT.ISO8859-15/htdocs/community.sgml b/it_IT.ISO8859-15/htdocs/community.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/community.sgml
rename to it_IT.ISO8859-15/htdocs/community.xml
diff --git a/it_IT.ISO8859-15/htdocs/copyright/Makefile b/it_IT.ISO8859-15/htdocs/copyright/Makefile
index 57ab6e3ebb..2810d6147e 100644
--- a/it_IT.ISO8859-15/htdocs/copyright/Makefile
+++ b/it_IT.ISO8859-15/htdocs/copyright/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=  copyright.sgml
+DOCS=  copyright.xml
 
 INDEXLINK= copyright.html
 
diff --git a/it_IT.ISO8859-15/htdocs/copyright/copyright.sgml b/it_IT.ISO8859-15/htdocs/copyright/copyright.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/copyright/copyright.sgml
rename to it_IT.ISO8859-15/htdocs/copyright/copyright.xml
diff --git a/it_IT.ISO8859-15/htdocs/docs.sgml b/it_IT.ISO8859-15/htdocs/docs.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/docs.sgml
rename to it_IT.ISO8859-15/htdocs/docs.xml
diff --git a/it_IT.ISO8859-15/htdocs/docs/Makefile b/it_IT.ISO8859-15/htdocs/docs/Makefile
index ed64d74993..73b95e2236 100644
--- a/it_IT.ISO8859-15/htdocs/docs/Makefile
+++ b/it_IT.ISO8859-15/htdocs/docs/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS= books.sgml
+DOCS= books.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/it_IT.ISO8859-15/htdocs/docs/books.sgml b/it_IT.ISO8859-15/htdocs/docs/books.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/docs/books.sgml
rename to it_IT.ISO8859-15/htdocs/docs/books.xml
diff --git a/it_IT.ISO8859-15/htdocs/mailto.sgml b/it_IT.ISO8859-15/htdocs/mailto.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/mailto.sgml
rename to it_IT.ISO8859-15/htdocs/mailto.xml
diff --git a/it_IT.ISO8859-15/htdocs/platforms/Makefile b/it_IT.ISO8859-15/htdocs/platforms/Makefile
index 75d87e2cf1..a62cd12b97 100644
--- a/it_IT.ISO8859-15/htdocs/platforms/Makefile
+++ b/it_IT.ISO8859-15/htdocs/platforms/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/it_IT.ISO8859-15/htdocs/platforms/index.sgml b/it_IT.ISO8859-15/htdocs/platforms/index.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/platforms/index.sgml
rename to it_IT.ISO8859-15/htdocs/platforms/index.xml
diff --git a/it_IT.ISO8859-15/htdocs/ports/Makefile b/it_IT.ISO8859-15/htdocs/ports/Makefile
index 75d87e2cf1..a62cd12b97 100644
--- a/it_IT.ISO8859-15/htdocs/ports/Makefile
+++ b/it_IT.ISO8859-15/htdocs/ports/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/it_IT.ISO8859-15/htdocs/ports/index.sgml b/it_IT.ISO8859-15/htdocs/ports/index.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/ports/index.sgml
rename to it_IT.ISO8859-15/htdocs/ports/index.xml
diff --git a/it_IT.ISO8859-15/htdocs/releases/4.10R/Makefile b/it_IT.ISO8859-15/htdocs/releases/4.10R/Makefile
index 5b893c0621..0d83fb6c25 100644
--- a/it_IT.ISO8859-15/htdocs/releases/4.10R/Makefile
+++ b/it_IT.ISO8859-15/htdocs/releases/4.10R/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=  announce.sgml
+DOCS=  announce.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/it_IT.ISO8859-15/htdocs/releases/4.10R/announce.sgml b/it_IT.ISO8859-15/htdocs/releases/4.10R/announce.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/releases/4.10R/announce.sgml
rename to it_IT.ISO8859-15/htdocs/releases/4.10R/announce.xml
diff --git a/it_IT.ISO8859-15/htdocs/releases/4.11R/Makefile b/it_IT.ISO8859-15/htdocs/releases/4.11R/Makefile
index 5b893c0621..0d83fb6c25 100644
--- a/it_IT.ISO8859-15/htdocs/releases/4.11R/Makefile
+++ b/it_IT.ISO8859-15/htdocs/releases/4.11R/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=  announce.sgml
+DOCS=  announce.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/it_IT.ISO8859-15/htdocs/releases/4.11R/announce.sgml b/it_IT.ISO8859-15/htdocs/releases/4.11R/announce.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/releases/4.11R/announce.sgml
rename to it_IT.ISO8859-15/htdocs/releases/4.11R/announce.xml
diff --git a/it_IT.ISO8859-15/htdocs/releases/5.2.1R/Makefile b/it_IT.ISO8859-15/htdocs/releases/5.2.1R/Makefile
index 5b893c0621..0d83fb6c25 100644
--- a/it_IT.ISO8859-15/htdocs/releases/5.2.1R/Makefile
+++ b/it_IT.ISO8859-15/htdocs/releases/5.2.1R/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=  announce.sgml
+DOCS=  announce.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/it_IT.ISO8859-15/htdocs/releases/5.2.1R/announce.sgml b/it_IT.ISO8859-15/htdocs/releases/5.2.1R/announce.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/releases/5.2.1R/announce.sgml
rename to it_IT.ISO8859-15/htdocs/releases/5.2.1R/announce.xml
diff --git a/it_IT.ISO8859-15/htdocs/releases/5.2R/Makefile b/it_IT.ISO8859-15/htdocs/releases/5.2R/Makefile
index 5b893c0621..0d83fb6c25 100644
--- a/it_IT.ISO8859-15/htdocs/releases/5.2R/Makefile
+++ b/it_IT.ISO8859-15/htdocs/releases/5.2R/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=  announce.sgml
+DOCS=  announce.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/it_IT.ISO8859-15/htdocs/releases/5.2R/announce.sgml b/it_IT.ISO8859-15/htdocs/releases/5.2R/announce.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/releases/5.2R/announce.sgml
rename to it_IT.ISO8859-15/htdocs/releases/5.2R/announce.xml
diff --git a/it_IT.ISO8859-15/htdocs/releases/5.3R/Makefile b/it_IT.ISO8859-15/htdocs/releases/5.3R/Makefile
index 5b893c0621..0d83fb6c25 100644
--- a/it_IT.ISO8859-15/htdocs/releases/5.3R/Makefile
+++ b/it_IT.ISO8859-15/htdocs/releases/5.3R/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=  announce.sgml
+DOCS=  announce.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/it_IT.ISO8859-15/htdocs/releases/5.3R/announce.sgml b/it_IT.ISO8859-15/htdocs/releases/5.3R/announce.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/releases/5.3R/announce.sgml
rename to it_IT.ISO8859-15/htdocs/releases/5.3R/announce.xml
diff --git a/it_IT.ISO8859-15/htdocs/releases/5.4R/Makefile b/it_IT.ISO8859-15/htdocs/releases/5.4R/Makefile
index 5b893c0621..0d83fb6c25 100755
--- a/it_IT.ISO8859-15/htdocs/releases/5.4R/Makefile
+++ b/it_IT.ISO8859-15/htdocs/releases/5.4R/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=  announce.sgml
+DOCS=  announce.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/it_IT.ISO8859-15/htdocs/releases/5.4R/announce.sgml b/it_IT.ISO8859-15/htdocs/releases/5.4R/announce.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/releases/5.4R/announce.sgml
rename to it_IT.ISO8859-15/htdocs/releases/5.4R/announce.xml
diff --git a/it_IT.ISO8859-15/htdocs/releases/6.0R/Makefile b/it_IT.ISO8859-15/htdocs/releases/6.0R/Makefile
index 5b893c0621..0d83fb6c25 100755
--- a/it_IT.ISO8859-15/htdocs/releases/6.0R/Makefile
+++ b/it_IT.ISO8859-15/htdocs/releases/6.0R/Makefile
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=  announce.sgml
+DOCS=  announce.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/it_IT.ISO8859-15/htdocs/releases/6.0R/announce.sgml b/it_IT.ISO8859-15/htdocs/releases/6.0R/announce.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/releases/6.0R/announce.sgml
rename to it_IT.ISO8859-15/htdocs/releases/6.0R/announce.xml
diff --git a/it_IT.ISO8859-15/htdocs/releases/Makefile b/it_IT.ISO8859-15/htdocs/releases/Makefile
index 924541aa8a..fee21f90d7 100644
--- a/it_IT.ISO8859-15/htdocs/releases/Makefile
+++ b/it_IT.ISO8859-15/htdocs/releases/Makefile
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?= index.sgml
+DOCS?= index.xml
 
 SUBDIR = 4.10R 4.11R
 SUBDIR+= 5.2R 5.2.1R 5.3R 5.4R
diff --git a/it_IT.ISO8859-15/htdocs/releases/index.sgml b/it_IT.ISO8859-15/htdocs/releases/index.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/releases/index.sgml
rename to it_IT.ISO8859-15/htdocs/releases/index.xml
diff --git a/it_IT.ISO8859-15/htdocs/support.sgml b/it_IT.ISO8859-15/htdocs/support.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/support.sgml
rename to it_IT.ISO8859-15/htdocs/support.xml
diff --git a/it_IT.ISO8859-15/htdocs/where.sgml b/it_IT.ISO8859-15/htdocs/where.xml
similarity index 100%
rename from it_IT.ISO8859-15/htdocs/where.sgml
rename to it_IT.ISO8859-15/htdocs/where.xml
diff --git a/ja_JP.eucJP/articles/contributing/Makefile b/ja_JP.eucJP/articles/contributing/Makefile
index 1591509dde..b5122f1dcd 100644
--- a/ja_JP.eucJP/articles/contributing/Makefile
+++ b/ja_JP.eucJP/articles/contributing/Makefile
@@ -13,7 +13,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/ja_JP.eucJP/articles/contributing/article.sgml b/ja_JP.eucJP/articles/contributing/article.xml
similarity index 100%
rename from ja_JP.eucJP/articles/contributing/article.sgml
rename to ja_JP.eucJP/articles/contributing/article.xml
diff --git a/ja_JP.eucJP/articles/contributors/Makefile b/ja_JP.eucJP/articles/contributors/Makefile
index b63c45bdc6..838a08ace0 100644
--- a/ja_JP.eucJP/articles/contributors/Makefile
+++ b/ja_JP.eucJP/articles/contributors/Makefile
@@ -15,13 +15,13 @@ INSTALL_ONLY_COMPRESSED?=
 
 ORGDIR=	${DOC_PREFIX}/en_US.ISO8859-1/articles/contributors
 
-SRCS=	article.sgml
+SRCS=	article.xml
 SRCS+=	${ORGDIR}/contrib.ent
-SRCS+=	${ORGDIR}/contrib.386bsd.sgml
-SRCS+=	${ORGDIR}/contrib.additional.sgml
-SRCS+=	${ORGDIR}/contrib.committers.sgml
-SRCS+=	${ORGDIR}/contrib.corealumni.sgml
-SRCS+=	${ORGDIR}/contrib.develalumni.sgml
+SRCS+=	${ORGDIR}/contrib.386bsd.xml
+SRCS+=	${ORGDIR}/contrib.additional.xml
+SRCS+=	${ORGDIR}/contrib.committers.xml
+SRCS+=	${ORGDIR}/contrib.corealumni.xml
+SRCS+=	${ORGDIR}/contrib.develalumni.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/ja_JP.eucJP/articles/contributors/article.sgml b/ja_JP.eucJP/articles/contributors/article.xml
similarity index 100%
rename from ja_JP.eucJP/articles/contributors/article.sgml
rename to ja_JP.eucJP/articles/contributors/article.xml
diff --git a/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile b/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile
index 559ffd4e4b..0e965e1403 100644
--- a/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile
+++ b/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile
@@ -20,7 +20,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/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
similarity index 100%
rename from ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml
rename to ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
diff --git a/ja_JP.eucJP/articles/fonts/Makefile b/ja_JP.eucJP/articles/fonts/Makefile
index 94282fa325..82030b9327 100644
--- a/ja_JP.eucJP/articles/fonts/Makefile
+++ b/ja_JP.eucJP/articles/fonts/Makefile
@@ -12,7 +12,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ja_JP.eucJP/articles/fonts/article.sgml b/ja_JP.eucJP/articles/fonts/article.xml
similarity index 100%
rename from ja_JP.eucJP/articles/fonts/article.sgml
rename to ja_JP.eucJP/articles/fonts/article.xml
diff --git a/ja_JP.eucJP/articles/ipsec-must/Makefile b/ja_JP.eucJP/articles/ipsec-must/Makefile
index dce2131d38..068cfbd7a5 100644
--- a/ja_JP.eucJP/articles/ipsec-must/Makefile
+++ b/ja_JP.eucJP/articles/ipsec-must/Makefile
@@ -12,7 +12,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ja_JP.eucJP/articles/ipsec-must/article.sgml b/ja_JP.eucJP/articles/ipsec-must/article.xml
similarity index 100%
rename from ja_JP.eucJP/articles/ipsec-must/article.sgml
rename to ja_JP.eucJP/articles/ipsec-must/article.xml
diff --git a/ja_JP.eucJP/articles/problem-reports/Makefile b/ja_JP.eucJP/articles/problem-reports/Makefile
index 6a73d46c6f..dedf082468 100644
--- a/ja_JP.eucJP/articles/problem-reports/Makefile
+++ b/ja_JP.eucJP/articles/problem-reports/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/ja_JP.eucJP/articles/problem-reports/article.sgml b/ja_JP.eucJP/articles/problem-reports/article.xml
similarity index 100%
rename from ja_JP.eucJP/articles/problem-reports/article.sgml
rename to ja_JP.eucJP/articles/problem-reports/article.xml
diff --git a/ja_JP.eucJP/books/design-44bsd/Makefile b/ja_JP.eucJP/books/design-44bsd/Makefile
index faae5a5533..31d1526ff8 100644
--- a/ja_JP.eucJP/books/design-44bsd/Makefile
+++ b/ja_JP.eucJP/books/design-44bsd/Makefile
@@ -10,7 +10,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/ja_JP.eucJP/books/design-44bsd/book.sgml b/ja_JP.eucJP/books/design-44bsd/book.xml
similarity index 100%
rename from ja_JP.eucJP/books/design-44bsd/book.sgml
rename to ja_JP.eucJP/books/design-44bsd/book.xml
diff --git a/ja_JP.eucJP/books/faq/Makefile b/ja_JP.eucJP/books/faq/Makefile
index 24e2f4a7a5..4134fea3b3 100644
--- a/ja_JP.eucJP/books/faq/Makefile
+++ b/ja_JP.eucJP/books/faq/Makefile
@@ -23,7 +23,7 @@ WITH_BIBLIOXREF_TITLE?=YES
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/books/faq/book.sgml b/ja_JP.eucJP/books/faq/book.xml
similarity index 99%
rename from ja_JP.eucJP/books/faq/book.sgml
rename to ja_JP.eucJP/books/faq/book.xml
index f4dd290d31..20709d0138 100644
--- a/ja_JP.eucJP/books/faq/book.sgml
+++ b/ja_JP.eucJP/books/faq/book.xml
@@ -1062,7 +1062,7 @@
                   <para>Postscript �ǤΥϥ�ɥ֥å��� BZip2
                     �����ǰ��̤���Ƥ����硢�ե�����̾��
                     <filename>handbook/</filename> �ǥ��쥯�ȥ�����
-                    <filename>book.sgml.bz2</filename> �ˤʤ�ޤ���</para>
+                    <filename>book.xml.bz2</filename> �ˤʤ�ޤ���</para>
                 </listitem>
 
                 <listitem>
diff --git a/ja_JP.eucJP/books/fdp-primer/Makefile b/ja_JP.eucJP/books/fdp-primer/Makefile
index abc0bc6347..f0ce50515d 100644
--- a/ja_JP.eucJP/books/fdp-primer/Makefile
+++ b/ja_JP.eucJP/books/fdp-primer/Makefile
@@ -21,22 +21,22 @@ 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=  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.sgml
+SRCS+= examples/appendix.xml
 
 # Images from the cross-document image library
 #IMAGES_LIB=    callouts/1.png
diff --git a/ja_JP.eucJP/books/fdp-primer/book.sgml b/ja_JP.eucJP/books/fdp-primer/book.xml
similarity index 98%
rename from ja_JP.eucJP/books/fdp-primer/book.sgml
rename to ja_JP.eucJP/books/fdp-primer/book.xml
index 955b64e358..df6328f566 100644
--- a/ja_JP.eucJP/books/fdp-primer/book.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/book.xml
@@ -4,7 +4,7 @@
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//JA" "../../share/sgml
 %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.
@@ -264,8 +264,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/ja_JP.eucJP/books/fdp-primer/chapters.ent b/ja_JP.eucJP/books/fdp-primer/chapters.ent
index 99689ea1cb..4e63f36ef1 100644
--- a/ja_JP.eucJP/books/fdp-primer/chapters.ent
+++ b/ja_JP.eucJP/books/fdp-primer/chapters.ent
@@ -9,22 +9,22 @@
      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.
 -->
 
-<!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/ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml b/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
similarity index 98%
rename from ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml
rename to ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
index 439ebc10b2..9698b30005 100644
--- a/ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/examples/appendix.xml
@@ -178,7 +178,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"> file.sgml > file.html <co id="examples-co-jade-1-filename"></userinput></screen>
+    -t sgml <co id="examples-co-jade-1-transform"> file.xml > file.html <co id="examples-co-jade-1-filename"></userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-1-nochunks">
@@ -222,7 +222,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">
@@ -267,7 +267,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/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
similarity index 99%
rename from ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml
rename to ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
index cb5a4a78a4..a445bd6814 100644
--- a/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/overview/chapter.xml
@@ -267,7 +267,7 @@
       </step>
 
       <step>
-	<para><filename>.sgml</filename> �ե�����򤢤ʤ��ι�����
+	<para><filename>.xml</filename> �ե�����򤢤ʤ��ι�����
 	  ���ǥ������Խ����ޤ���</para>
       </step>
 
diff --git a/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
similarity index 98%
rename from ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml
rename to ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
index 6ac989e5e7..ebfcd50583 100644
--- a/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
@@ -41,7 +41,7 @@
   <para>�������������� <application>Emacs</application> ��
     <application>XEmacs</application> (Ports Collection �ˤ���ޤ�)�ˤϡ�
     PSGML �ȸƤФ�����������ʥѥå���������°���Ƥ��ޤ���
-    ����ϳ�ĥ�Ҥ��ȤʤäƤ��� <filename>.sgml</filename> �Υե����뤬�ɤ߹��ޤ�뤫��
+    ����ϳ�ĥ�Ҥ��ȤʤäƤ��� <filename>.xml</filename> �Υե����뤬�ɤ߹��ޤ�뤫��
     <command>M-x sgml-mode</command> �����Ϥ��뤳�ȤǸƤӽФ���ޤ���
     PSGML �ϡ�SGML �ե�����䥨����ȡ�°���򰷤�����Υ᥸�㡼�⡼�ɤǤ���
   </para>
diff --git a/ja_JP.eucJP/books/fdp-primer/see-also/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/fdp-primer/see-also/chapter.sgml
rename to ja_JP.eucJP/books/fdp-primer/see-also/chapter.xml
diff --git a/ja_JP.eucJP/books/fdp-primer/structure/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
similarity index 95%
rename from ja_JP.eucJP/books/fdp-primer/structure/chapter.sgml
rename to ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
index 5d50edbf87..2e1a06c479 100644
--- a/ja_JP.eucJP/books/fdp-primer/structure/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/structure/chapter.xml
@@ -206,7 +206,7 @@
 	</sect4>
 
 	<sect4>
-	  <title><filename>book.sgml</filename></title>
+	  <title><filename>book.xml</filename></title>
 
 	  <para>����ϥϥ�ɥ֥å��ι�¤�ˤ����ƺǾ�̤ˤ�����ʸ��Ǥ���
 	    �ϥ�ɥ֥å��� <link
@@ -214,7 +214,7 @@
 	      ���</link>�ȥϥ�ɥ֥å��ι����򵭽Ҥ��뤿��Υ�����Ȥ��ޤޤ�Ƥ��ޤ���
 	  </para>
 
-	  <para><filename>book.sgml</filename> �ϡ�
+	  <para><filename>book.xml</filename> �ϡ�
 	    <filename>.ent</filename>
 	    �Ȥ�����ĥ�ҤΤĤ����ե����������ɤ��뤿���<link
 	      linkend="sgml-primer-parameter-entities">�ѥ�᡼������(parameter
@@ -226,10 +226,10 @@
 	</sect4>
 
 	<sect4>
-	  <title><filename><replaceable>directory</replaceable>/chapter.sgml</filename></title>
+	  <title><filename><replaceable>directory</replaceable>/chapter.xml</filename></title>
 
 	  <para>�ϥ�ɥ֥å��γƾϤϡ��ߤ��˸��̤�ʬ����줿�ǥ��쥯�ȥ��
-	    <filename>chapter.sgml</filename> �Ȥ����ե�����Ȥ��Ƴ�Ǽ����Ƥ��ޤ���
+	    <filename>chapter.xml</filename> �Ȥ����ե�����Ȥ��Ƴ�Ǽ����Ƥ��ޤ���
 	    ���줾��Υǥ��쥯�ȥ�ˤϡ�<sgmltag>chapter</sgmltag> ������Ȥ�
 	    <literal>id</literal> °�����ͤ�Ʊ��̾�����դ����Ƥ��ޤ���
 	  </para>
@@ -243,7 +243,7 @@
 
 	  <para>�Τ褦�ˤʤäƤ����Ȥ���С������
 	    <filename>kernelconfiguration</filename> �Ȥ���
-	    �ǥ��쥯�ȥ���� <filename>chapter.sgml</filename>
+	    �ǥ��쥯�ȥ���� <filename>chapter.xml</filename>
 	    �Ȥ����ե�����Ǥ����̾
 	    ���ξϤ����ƤϤ��٤Ƥ��Υե�����˽񤫤�Ƥ��ޤ���</para>
 
@@ -254,7 +254,7 @@
 	    �ǥ��쥯�ȥ�̾�Ȥδ�Ϣ�Ϥ���ޤ���</para>
 
 	  <para>�ϥ�ɥ֥å��ΰ������ǤǤϡ�ʸ��Υե������
-	    <filename>book.sgml</filename> ��Ʊ���ǥ��쥯�ȥ�ˤ�����Ƥ��ơ�
+	    <filename>book.xml</filename> ��Ʊ���ǥ��쥯�ȥ�ˤ�����Ƥ��ơ�
 	    �ե�����̾�� <sgmltag>chapter</sgmltag> ������Ȥ�
 	    <literal>id</literal> °�����ͤˤʤäƤ��ޤ�����
 	    �������̤Υǥ��쥯�ȥ��ʬ���ư�ư�������Τϥϥ�ɥ֥å���
@@ -268,11 +268,11 @@
 	    ��¿���Υե����뤬�ǥ��쥯�ȥ�ˤ���������н褷�䤹���ʤ�Ǥ��礦��</para>
 
 	  <para>�����ޤǤ��ñ�ˤޤȤ��ȡ�
-	    �ġ��� <filename>chapter.sgml</filename>
+	    �ġ��� <filename>chapter.xml</filename>
 	    �Ȥ����ե������ޤ�ǥ��쥯�ȥ꤬�������󤢤ꡢ������
-	    <filename>basics/chapter.sgml</filename>,
-	    <filename>introduction/chapter.sgml</filename>,
-	    <filename>printing/chapter.sgml</filename>
+	    <filename>basics/chapter.xml</filename>,
+	    <filename>introduction/chapter.xml</filename>,
+	    <filename>printing/chapter.xml</filename>
 	    �ʤɤȤ���̾���ˤʤäƤ���Ȥ������ȤǤ���</para>
 
 	  <important>
@@ -285,7 +285,7 @@
 	    </para>
 	  </important>
 
-	  <para>�ơ��� <filename>chapter.sgml</filename> �ե�����ϡ�
+	  <para>�ơ��� <filename>chapter.xml</filename> �ե�����ϡ�
 	    ������ SGML ʸ��ǤϤ���ޤ��󡣾ܤ��������С�
 	    �����Υե��������Ƭ�ˤ� DOCTYPE ����ιԤ��񤫤�Ƥ��ޤ���
 	  </para>
diff --git a/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.sgml
rename to ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.xml
diff --git a/ja_JP.eucJP/books/fdp-primer/the-website/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/fdp-primer/the-website/chapter.sgml
rename to ja_JP.eucJP/books/fdp-primer/the-website/chapter.xml
diff --git a/ja_JP.eucJP/books/fdp-primer/tools/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/tools/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/fdp-primer/tools/chapter.sgml
rename to ja_JP.eucJP/books/fdp-primer/tools/chapter.xml
diff --git a/ja_JP.eucJP/books/fdp-primer/translations/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
similarity index 98%
rename from ja_JP.eucJP/books/fdp-primer/translations/chapter.sgml
rename to ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
index 0870c1eddc..f9a7f2afdc 100644
--- a/ja_JP.eucJP/books/fdp-primer/translations/chapter.sgml
+++ b/ja_JP.eucJP/books/fdp-primer/translations/chapter.xml
@@ -257,7 +257,7 @@
                      books/
                            faq/
                                Makefile
-                               book.sgml</programlisting>
+                               book.xml</programlisting>
 
 	<para><literal>sv_SE.ISO8859-1</literal> ��������̾���ǡ�
 	  <filename><replaceable>lang</replaceable>.<replaceable>encoding</replaceable></filename>
@@ -417,7 +417,7 @@
 	<programlisting>&lt;!--
      The FreeBSD Documentation Project
 
-     &dollar;FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v 1.5 2000/07/07 18:38:38 dannyboy Exp &dollar;
+     &dollar;FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml,v 1.5 2000/07/07 18:38:38 dannyboy Exp &dollar;
 --&gt;</programlisting>
 
 	<para>���ʸ��κ����ϰ㤦���⤷��ޤ��󤬡�
@@ -442,7 +442,7 @@
 	<programlisting>&lt;!--
      The FreeBSD Spanish Documentation Project
 
-     &dollar;FreeBSD: doc/es_ES.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v 1.3 1999/06/24 19:12:32 jesusr Exp &dollar;
+     &dollar;FreeBSD: doc/es_ES.ISO8859-1/books/fdp-primer/translations/chapter.xml,v 1.3 1999/06/24 19:12:32 jesusr Exp &dollar;
      Original revision: 1.11
 --&gt;</programlisting>
       </answer>
diff --git a/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.sgml b/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/fdp-primer/writing-style/chapter.sgml
rename to ja_JP.eucJP/books/fdp-primer/writing-style/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index c90f287993..0b6af97cad 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -18,7 +18,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
@@ -28,8 +28,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
 #
 # ------------------------------------------------------------------------
 
@@ -249,62 +249,62 @@ 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+= freebsd-glossary.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+= freebsd-glossary.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
 
 # Japanese only
-SRCS+=	jcontrib/chapter.sgml
+SRCS+=	jcontrib/chapter.xml
 
 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 ${MASTERDOC}
 
 #
@@ -320,9 +320,9 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # rules generating lists of mirror site from XML database.
 #
-XMLDOCS=	mirrors-ftp:::mirrors.sgml.ftp.inc.tmp \
-		mirrors-cvsup:::mirrors.sgml.cvsup.inc.tmp \
-		eresources:::eresources.sgml.www.inc.tmp
+XMLDOCS=	mirrors-ftp:::mirrors.xml.ftp.inc.tmp \
+		mirrors-cvsup:::mirrors.xml.cvsup.inc.tmp \
+		eresources:::eresources.xml.www.inc.tmp
 DEPENDSET.DEFAULT=	transtable mirror
 XSLT.DEFAULT=		${XSL_MIRRORS}
 XML.DEFAULT=		${XML_MIRRORS}
@@ -330,32 +330,32 @@ 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.ftp.inc.tmp \
-		mirrors.sgml.cvsup.inc mirrors.sgml.cvsup.inc.tmp \
-		eresources.sgml.www.inc eresources.sgml.www.inc.tmp
+CLEANFILES+=	mirrors.xml.ftp.inc mirrors.xml.ftp.inc.tmp \
+		mirrors.xml.cvsup.inc mirrors.xml.cvsup.inc.tmp \
+		eresources.xml.www.inc eresources.xml.www.inc.tmp
 
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
 
 .for p in ftp cvsup
-mirrors.sgml.${p}.inc: mirrors.sgml.${p}.inc.tmp
+mirrors.xml.${p}.inc: mirrors.xml.${p}.inc.tmp
 	${CP} ${.ALLSRC} ${.TARGET}
 #	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 #	    < $@.tmp > $@ || (${RM} -f $@ && false)
 .endfor
 
-eresources.sgml.www.inc: eresources.sgml.www.inc.tmp
+eresources.xml.www.inc: eresources.xml.www.inc.tmp
 	${CP} ${.ALLSRC} ${.TARGET}
 #	${SED} -e 's,<\([^ >]*\)\([^>]*\)/>,<\1\2></\1>,;s,</anchor>,,'\
 #	    < $@.tmp > $@ || (${RM} -f $@ && false)
diff --git a/ja_JP.eucJP/books/handbook/advanced-networking/Makefile b/ja_JP.eucJP/books/handbook/advanced-networking/Makefile
index c0d8b8caaa..c1753ea59c 100644
--- a/ja_JP.eucJP/books/handbook/advanced-networking/Makefile
+++ b/ja_JP.eucJP/books/handbook/advanced-networking/Makefile
@@ -6,7 +6,7 @@
 # Original revision: 1.1
 
 
-CHAPTERS= 	advanced-networking/chapter.sgml
+CHAPTERS= 	advanced-networking/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml b/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml
rename to ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/basics/Makefile b/ja_JP.eucJP/books/handbook/basics/Makefile
index 45e82e8386..ed25875c28 100644
--- a/ja_JP.eucJP/books/handbook/basics/Makefile
+++ b/ja_JP.eucJP/books/handbook/basics/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	basics/chapter.sgml
+CHAPTERS= 	basics/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/basics/chapter.sgml b/ja_JP.eucJP/books/handbook/basics/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/basics/chapter.sgml
rename to ja_JP.eucJP/books/handbook/basics/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/bibliography/Makefile b/ja_JP.eucJP/books/handbook/bibliography/Makefile
index 8d6bbc00ca..7c69e8b9c8 100644
--- a/ja_JP.eucJP/books/handbook/bibliography/Makefile
+++ b/ja_JP.eucJP/books/handbook/bibliography/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	bibliography/chapter.sgml
+CHAPTERS= 	bibliography/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml b/ja_JP.eucJP/books/handbook/bibliography/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/bibliography/chapter.sgml
rename to ja_JP.eucJP/books/handbook/bibliography/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/book.sgml b/ja_JP.eucJP/books/handbook/book.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/book.sgml
rename to ja_JP.eucJP/books/handbook/book.xml
diff --git a/ja_JP.eucJP/books/handbook/boot/Makefile b/ja_JP.eucJP/books/handbook/boot/Makefile
index 7578c95f19..998c5429d2 100644
--- a/ja_JP.eucJP/books/handbook/boot/Makefile
+++ b/ja_JP.eucJP/books/handbook/boot/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	boot/chapter.sgml
+CHAPTERS= 	boot/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/boot/chapter.sgml b/ja_JP.eucJP/books/handbook/boot/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/boot/chapter.sgml
rename to ja_JP.eucJP/books/handbook/boot/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/bsdinstall/Makefile b/ja_JP.eucJP/books/handbook/bsdinstall/Makefile
index b5f6bf3805..0ad1b83553 100644
--- a/ja_JP.eucJP/books/handbook/bsdinstall/Makefile
+++ b/ja_JP.eucJP/books/handbook/bsdinstall/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	bsdinstall/chapter.sgml
+CHAPTERS= 	bsdinstall/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/bsdinstall/chapter.sgml b/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/bsdinstall/chapter.sgml
rename to ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/chapters.ent b/ja_JP.eucJP/books/handbook/chapters.ent
index 874b8ce1ac..1505851dc2 100644
--- a/ja_JP.eucJP/books/handbook/chapters.ent
+++ b/ja_JP.eucJP/books/handbook/chapters.ent
@@ -9,7 +9,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.
 -->
@@ -57,140 +57,140 @@
 <!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.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/ja_JP.eucJP/books/handbook/colophon.sgml b/ja_JP.eucJP/books/handbook/colophon.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/colophon.sgml
rename to ja_JP.eucJP/books/handbook/colophon.xml
diff --git a/ja_JP.eucJP/books/handbook/config/Makefile b/ja_JP.eucJP/books/handbook/config/Makefile
index d92f2f4b8d..b3548438f2 100644
--- a/ja_JP.eucJP/books/handbook/config/Makefile
+++ b/ja_JP.eucJP/books/handbook/config/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	config/chapter.sgml
+CHAPTERS= 	config/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/config/chapter.sgml b/ja_JP.eucJP/books/handbook/config/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/config/chapter.sgml
rename to ja_JP.eucJP/books/handbook/config/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/Makefile b/ja_JP.eucJP/books/handbook/cutting-edge/Makefile
index 55370d28ae..fb784369e6 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/Makefile
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	cutting-edge/chapter.sgml
+CHAPTERS= 	cutting-edge/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
rename to ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/desktop/Makefile b/ja_JP.eucJP/books/handbook/desktop/Makefile
index 0b8829e639..70e12dfc60 100644
--- a/ja_JP.eucJP/books/handbook/desktop/Makefile
+++ b/ja_JP.eucJP/books/handbook/desktop/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	desktop/chapter.sgml
+CHAPTERS= 	desktop/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.sgml b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/desktop/chapter.sgml
rename to ja_JP.eucJP/books/handbook/desktop/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/disks/Makefile b/ja_JP.eucJP/books/handbook/disks/Makefile
index 8fac275105..23ae42c111 100644
--- a/ja_JP.eucJP/books/handbook/disks/Makefile
+++ b/ja_JP.eucJP/books/handbook/disks/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	disks/chapter.sgml
+CHAPTERS= 	disks/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/disks/chapter.sgml b/ja_JP.eucJP/books/handbook/disks/chapter.xml
similarity index 99%
rename from ja_JP.eucJP/books/handbook/disks/chapter.sgml
rename to ja_JP.eucJP/books/handbook/disks/chapter.xml
index df82b2bd35..0f688934d3 100644
--- a/ja_JP.eucJP/books/handbook/disks/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/disks/chapter.xml
@@ -435,7 +435,7 @@ ad3: 29333MB &lt;WDC WD307AA&gt; [59598/16/63] at ata1-slave UDMA33</programlist
 	  <para>���ˡ��ե����륷���ƥ�ΰ���ʬ�Ȥ��ơ�
 	    ������ɤΤ褦����³����Τ����θ���ޤ���&man.vinum.8;
 	    <!-- Furukawa:2004/1/8
-	    should be refer this after creating vinum/chapter.sgml
+	    should be refer this after creating vinum/chapter.xml
 	    (<xref linkend="vinum-vinum"/>)
 	    -->
 	    ����� &man.ccd.4;
@@ -632,7 +632,7 @@ sh MAKEDEV ccd0</programlisting>
 
 	<para>&man.vinum.8; �ξܺ٤ˤĤ��Ƥ� Vinum �ܥ�塼��ޥͥ���
 	  <!-- Furukawa:2004/1/8
-	  should be refer this after creating vinum/chapter.sgml
+	  should be refer this after creating vinum/chapter.xml
 	  <xref linkend="vinum-vinum"/>
 	  -->
 	  �򻲾Ȥ��Ƥ���������</para>
@@ -2687,7 +2687,7 @@ Filesystem 1K-blocks Used Avail Capacity  Mounted on
     <para>FreeBSD&nbsp;5.0 ��
       Soft Updates
       <!-- Furukawa:2004/1/8
-      should be refer this after updating config/chapter.sgml
+      should be refer this after updating config/chapter.xml
       <link linkend="soft-updates">Soft Updates</link>
       -->
       �ȶ�Ĵ����ե����륷���ƥॹ�ʥåץ���åȤȤ�����������ǽ���󶡤��ޤ���</para>
@@ -3040,7 +3040,7 @@ Filesystem 1K-blocks Used Avail Capacity  Mounted on
       (MAC: Mandatory Access Control)
       (Mandatory Access Control (MAC) �򻲾�)
       <!-- Furukawa:2004/1/8
-      should be refer this after updating security/chapter.sgml
+      should be refer this after updating security/chapter.xml
       (<xref linkend="mac"/> �򻲾�)
       -->
       �ϡ�����ԥ塼����ư����ǡ�OS ���¹���Ǥ���Ȥ��ˡ�
diff --git a/ja_JP.eucJP/books/handbook/eresources/Makefile b/ja_JP.eucJP/books/handbook/eresources/Makefile
index 90451d666d..99483af3be 100644
--- a/ja_JP.eucJP/books/handbook/eresources/Makefile
+++ b/ja_JP.eucJP/books/handbook/eresources/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	eresources/chapter.sgml
+CHAPTERS= 	eresources/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/eresources/chapter.sgml b/ja_JP.eucJP/books/handbook/eresources/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/eresources/chapter.sgml
rename to ja_JP.eucJP/books/handbook/eresources/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/install/Makefile b/ja_JP.eucJP/books/handbook/install/Makefile
index 6c7d75e10e..eb675b6045 100644
--- a/ja_JP.eucJP/books/handbook/install/Makefile
+++ b/ja_JP.eucJP/books/handbook/install/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	install/chapter.sgml
+CHAPTERS= 	install/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/install/chapter.sgml b/ja_JP.eucJP/books/handbook/install/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/install/chapter.sgml
rename to ja_JP.eucJP/books/handbook/install/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/introduction/Makefile b/ja_JP.eucJP/books/handbook/introduction/Makefile
index 1e9c9350cf..173f45e954 100644
--- a/ja_JP.eucJP/books/handbook/introduction/Makefile
+++ b/ja_JP.eucJP/books/handbook/introduction/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	introduction/chapter.sgml
+CHAPTERS= 	introduction/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/introduction/chapter.sgml b/ja_JP.eucJP/books/handbook/introduction/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/introduction/chapter.sgml
rename to ja_JP.eucJP/books/handbook/introduction/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/jcontrib/chapter.sgml b/ja_JP.eucJP/books/handbook/jcontrib/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/jcontrib/chapter.sgml
rename to ja_JP.eucJP/books/handbook/jcontrib/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/kernelconfig/Makefile b/ja_JP.eucJP/books/handbook/kernelconfig/Makefile
index 0fbad0291a..33c18c3e1b 100644
--- a/ja_JP.eucJP/books/handbook/kernelconfig/Makefile
+++ b/ja_JP.eucJP/books/handbook/kernelconfig/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	kernelconfig/chapter.sgml
+CHAPTERS= 	kernelconfig/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml b/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml
rename to ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/l10n/Makefile b/ja_JP.eucJP/books/handbook/l10n/Makefile
index ab00c60da3..9356698f4c 100644
--- a/ja_JP.eucJP/books/handbook/l10n/Makefile
+++ b/ja_JP.eucJP/books/handbook/l10n/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	l10n/chapter.sgml
+CHAPTERS= 	l10n/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/l10n/chapter.sgml b/ja_JP.eucJP/books/handbook/l10n/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/l10n/chapter.sgml
rename to ja_JP.eucJP/books/handbook/l10n/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/linuxemu/Makefile b/ja_JP.eucJP/books/handbook/linuxemu/Makefile
index e87254f2ff..5dc13f931a 100644
--- a/ja_JP.eucJP/books/handbook/linuxemu/Makefile
+++ b/ja_JP.eucJP/books/handbook/linuxemu/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	linuxemu/chapter.sgml
+CHAPTERS= 	linuxemu/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/linuxemu/chapter.sgml b/ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/linuxemu/chapter.sgml
rename to ja_JP.eucJP/books/handbook/linuxemu/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/mail/Makefile b/ja_JP.eucJP/books/handbook/mail/Makefile
index 16dfa6f007..eec9d6f746 100644
--- a/ja_JP.eucJP/books/handbook/mail/Makefile
+++ b/ja_JP.eucJP/books/handbook/mail/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	mail/chapter.sgml
+CHAPTERS= 	mail/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/mail/chapter.sgml b/ja_JP.eucJP/books/handbook/mail/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/mail/chapter.sgml
rename to ja_JP.eucJP/books/handbook/mail/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/mirrors/Makefile b/ja_JP.eucJP/books/handbook/mirrors/Makefile
index 2a5c791c92..1ebbe94f2b 100644
--- a/ja_JP.eucJP/books/handbook/mirrors/Makefile
+++ b/ja_JP.eucJP/books/handbook/mirrors/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	mirrors/chapter.sgml
+CHAPTERS= 	mirrors/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml b/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/mirrors/chapter.sgml
rename to ja_JP.eucJP/books/handbook/mirrors/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/multimedia/Makefile b/ja_JP.eucJP/books/handbook/multimedia/Makefile
index 70c52ad36c..85dac5da29 100644
--- a/ja_JP.eucJP/books/handbook/multimedia/Makefile
+++ b/ja_JP.eucJP/books/handbook/multimedia/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.2
 
-CHAPTERS= 	multimedia/chapter.sgml
+CHAPTERS= 	multimedia/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/multimedia/chapter.sgml b/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/multimedia/chapter.sgml
rename to ja_JP.eucJP/books/handbook/multimedia/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/pgpkeys/Makefile b/ja_JP.eucJP/books/handbook/pgpkeys/Makefile
index 9e3f8faf0b..b7b69da084 100644
--- a/ja_JP.eucJP/books/handbook/pgpkeys/Makefile
+++ b/ja_JP.eucJP/books/handbook/pgpkeys/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.3
 
-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/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml b/ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml
rename to ja_JP.eucJP/books/handbook/pgpkeys/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/ports/Makefile b/ja_JP.eucJP/books/handbook/ports/Makefile
index 5a8fab3aa1..4027f077ba 100644
--- a/ja_JP.eucJP/books/handbook/ports/Makefile
+++ b/ja_JP.eucJP/books/handbook/ports/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	ports/chapter.sgml
+CHAPTERS= 	ports/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/ports/chapter.sgml b/ja_JP.eucJP/books/handbook/ports/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/ports/chapter.sgml
rename to ja_JP.eucJP/books/handbook/ports/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/ppp-and-slip/Makefile b/ja_JP.eucJP/books/handbook/ppp-and-slip/Makefile
index 3a8e7a0e8a..dc1ff826fc 100644
--- a/ja_JP.eucJP/books/handbook/ppp-and-slip/Makefile
+++ b/ja_JP.eucJP/books/handbook/ppp-and-slip/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	ppp-and-slip/chapter.sgml
+CHAPTERS= 	ppp-and-slip/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml b/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml
rename to ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/preface/preface.sgml b/ja_JP.eucJP/books/handbook/preface/preface.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/preface/preface.sgml
rename to ja_JP.eucJP/books/handbook/preface/preface.xml
diff --git a/ja_JP.eucJP/books/handbook/printing/Makefile b/ja_JP.eucJP/books/handbook/printing/Makefile
index c010259142..dccc0c1b21 100644
--- a/ja_JP.eucJP/books/handbook/printing/Makefile
+++ b/ja_JP.eucJP/books/handbook/printing/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	printing/chapter.sgml
+CHAPTERS= 	printing/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/printing/chapter.sgml b/ja_JP.eucJP/books/handbook/printing/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/printing/chapter.sgml
rename to ja_JP.eucJP/books/handbook/printing/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/security/Makefile b/ja_JP.eucJP/books/handbook/security/Makefile
index 705b4f2562..49d988e90d 100644
--- a/ja_JP.eucJP/books/handbook/security/Makefile
+++ b/ja_JP.eucJP/books/handbook/security/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	security/chapter.sgml
+CHAPTERS= 	security/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/security/chapter.sgml b/ja_JP.eucJP/books/handbook/security/chapter.xml
similarity index 99%
rename from ja_JP.eucJP/books/handbook/security/chapter.sgml
rename to ja_JP.eucJP/books/handbook/security/chapter.xml
index 521f8c3483..941450d408 100644
--- a/ja_JP.eucJP/books/handbook/security/chapter.sgml
+++ b/ja_JP.eucJP/books/handbook/security/chapter.xml
@@ -4,7 +4,7 @@
      The FreeBSD Japanese Documentation Project
 
      Original revision: 1.122
-     Waiting for:	1.123 or mac/chapter.sgml
+     Waiting for:	1.123 or mac/chapter.xml
 			("mac" referenced from disks).
      Translation note: "fs-acl" section added in rev.1.118 is moved to
 	handbook/basics in rev.1.134 and moved back to this file in
diff --git a/ja_JP.eucJP/books/handbook/serialcomms/Makefile b/ja_JP.eucJP/books/handbook/serialcomms/Makefile
index 87e75b510d..859fd8f150 100644
--- a/ja_JP.eucJP/books/handbook/serialcomms/Makefile
+++ b/ja_JP.eucJP/books/handbook/serialcomms/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	serialcomms/chapter.sgml
+CHAPTERS= 	serialcomms/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml b/ja_JP.eucJP/books/handbook/serialcomms/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml
rename to ja_JP.eucJP/books/handbook/serialcomms/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/users/Makefile b/ja_JP.eucJP/books/handbook/users/Makefile
index 77de1111d8..9c746e49d9 100644
--- a/ja_JP.eucJP/books/handbook/users/Makefile
+++ b/ja_JP.eucJP/books/handbook/users/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	users/chapter.sgml
+CHAPTERS= 	users/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/users/chapter.sgml b/ja_JP.eucJP/books/handbook/users/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/users/chapter.sgml
rename to ja_JP.eucJP/books/handbook/users/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/x11/Makefile b/ja_JP.eucJP/books/handbook/x11/Makefile
index 01da81ebf9..e3677b2c06 100644
--- a/ja_JP.eucJP/books/handbook/x11/Makefile
+++ b/ja_JP.eucJP/books/handbook/x11/Makefile
@@ -5,7 +5,7 @@
 #
 # Original revision: 1.1
 
-CHAPTERS= 	x11/chapter.sgml
+CHAPTERS= 	x11/chapter.xml
 
 VPATH=		..
 
diff --git a/ja_JP.eucJP/books/handbook/x11/chapter.sgml b/ja_JP.eucJP/books/handbook/x11/chapter.xml
similarity index 100%
rename from ja_JP.eucJP/books/handbook/x11/chapter.sgml
rename to ja_JP.eucJP/books/handbook/x11/chapter.xml
diff --git a/ja_JP.eucJP/books/porters-handbook/Makefile b/ja_JP.eucJP/books/porters-handbook/Makefile
index 39219c2cec..bc8d220752 100644
--- a/ja_JP.eucJP/books/porters-handbook/Makefile
+++ b/ja_JP.eucJP/books/porters-handbook/Makefile
@@ -20,7 +20,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 # Use the local DSSSL file
 DSLHTML?= 	${.CURDIR}/freebsd.dsl
diff --git a/ja_JP.eucJP/books/porters-handbook/book.sgml b/ja_JP.eucJP/books/porters-handbook/book.xml
similarity index 100%
rename from ja_JP.eucJP/books/porters-handbook/book.sgml
rename to ja_JP.eucJP/books/porters-handbook/book.xml
diff --git a/ja_JP.eucJP/htdocs/Makefile b/ja_JP.eucJP/htdocs/Makefile
index 6b967c7106..b071fbfaf8 100644
--- a/ja_JP.eucJP/htdocs/Makefile
+++ b/ja_JP.eucJP/htdocs/Makefile
@@ -11,25 +11,25 @@
 
 # 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
 
 # Japanese-only file
-DOCS+= jabout.sgml
+DOCS+= jabout.xml
 
 XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
 DEPENDSET.index=transtable mirrors news press events \
diff --git a/ja_JP.eucJP/htdocs/about.sgml b/ja_JP.eucJP/htdocs/about.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/about.sgml
rename to ja_JP.eucJP/htdocs/about.xml
diff --git a/ja_JP.eucJP/htdocs/applications.sgml b/ja_JP.eucJP/htdocs/applications.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/applications.sgml
rename to ja_JP.eucJP/htdocs/applications.xml
diff --git a/ja_JP.eucJP/htdocs/availability.sgml b/ja_JP.eucJP/htdocs/availability.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/availability.sgml
rename to ja_JP.eucJP/htdocs/availability.xml
diff --git a/ja_JP.eucJP/htdocs/commercial/Makefile b/ja_JP.eucJP/htdocs/commercial/Makefile
index 0e3ce778f9..b78ea68b4b 100644
--- a/ja_JP.eucJP/htdocs/commercial/Makefile
+++ b/ja_JP.eucJP/htdocs/commercial/Makefile
@@ -9,7 +9,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=		commercial.sgml
+DOCS=		commercial.xml
 INDEXLINK=	commercial.html
 
 XSLT.DEFAULT=		${XSL_ENTRIES}
diff --git a/ja_JP.eucJP/htdocs/commercial/commercial.sgml b/ja_JP.eucJP/htdocs/commercial/commercial.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/commercial/commercial.sgml
rename to ja_JP.eucJP/htdocs/commercial/commercial.xml
diff --git a/ja_JP.eucJP/htdocs/community/Makefile b/ja_JP.eucJP/htdocs/community/Makefile
index 8ad8a5f973..c606bfab0f 100644
--- a/ja_JP.eucJP/htdocs/community/Makefile
+++ b/ja_JP.eucJP/htdocs/community/Makefile
@@ -8,7 +8,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   irc.sgml mailinglists.sgml newsgroups.sgml webresources.sgml
+DOCS=   irc.xml mailinglists.xml newsgroups.xml webresources.xml
 
 #XMLDOCS+=	social::${XML_EVENTS_EVENTS}:
 
diff --git a/ja_JP.eucJP/htdocs/community/irc.sgml b/ja_JP.eucJP/htdocs/community/irc.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/community/irc.sgml
rename to ja_JP.eucJP/htdocs/community/irc.xml
diff --git a/ja_JP.eucJP/htdocs/community/mailinglists.sgml b/ja_JP.eucJP/htdocs/community/mailinglists.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/community/mailinglists.sgml
rename to ja_JP.eucJP/htdocs/community/mailinglists.xml
diff --git a/ja_JP.eucJP/htdocs/community/newsgroups.sgml b/ja_JP.eucJP/htdocs/community/newsgroups.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/community/newsgroups.sgml
rename to ja_JP.eucJP/htdocs/community/newsgroups.xml
diff --git a/ja_JP.eucJP/htdocs/community/webresources.sgml b/ja_JP.eucJP/htdocs/community/webresources.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/community/webresources.sgml
rename to ja_JP.eucJP/htdocs/community/webresources.xml
diff --git a/ja_JP.eucJP/htdocs/copyright/Makefile b/ja_JP.eucJP/htdocs/copyright/Makefile
index 674c0d0bfa..46c5b66818 100644
--- a/ja_JP.eucJP/htdocs/copyright/Makefile
+++ b/ja_JP.eucJP/htdocs/copyright/Makefile
@@ -9,12 +9,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/ja_JP.eucJP/htdocs/copyright/copyright.sgml b/ja_JP.eucJP/htdocs/copyright/copyright.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/copyright/copyright.sgml
rename to ja_JP.eucJP/htdocs/copyright/copyright.xml
diff --git a/ja_JP.eucJP/htdocs/copyright/daemon.sgml b/ja_JP.eucJP/htdocs/copyright/daemon.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/copyright/daemon.sgml
rename to ja_JP.eucJP/htdocs/copyright/daemon.xml
diff --git a/ja_JP.eucJP/htdocs/copyright/freebsd-license.sgml b/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/copyright/freebsd-license.sgml
rename to ja_JP.eucJP/htdocs/copyright/freebsd-license.xml
diff --git a/ja_JP.eucJP/htdocs/copyright/license.sgml b/ja_JP.eucJP/htdocs/copyright/license.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/copyright/license.sgml
rename to ja_JP.eucJP/htdocs/copyright/license.xml
diff --git a/ja_JP.eucJP/htdocs/copyright/trademarks.sgml b/ja_JP.eucJP/htdocs/copyright/trademarks.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/copyright/trademarks.sgml
rename to ja_JP.eucJP/htdocs/copyright/trademarks.xml
diff --git a/ja_JP.eucJP/htdocs/developers/Makefile b/ja_JP.eucJP/htdocs/developers/Makefile
index 14d947b2d2..b4f4289177 100644
--- a/ja_JP.eucJP/htdocs/developers/Makefile
+++ b/ja_JP.eucJP/htdocs/developers/Makefile
@@ -8,6 +8,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   cvs.sgml
+DOCS=   cvs.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/developers/cvs.sgml b/ja_JP.eucJP/htdocs/developers/cvs.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/developers/cvs.sgml
rename to ja_JP.eucJP/htdocs/developers/cvs.xml
diff --git a/ja_JP.eucJP/htdocs/docproj/Makefile b/ja_JP.eucJP/htdocs/docproj/Makefile
index 4df44d7242..f02f22f609 100644
--- a/ja_JP.eucJP/htdocs/docproj/Makefile
+++ b/ja_JP.eucJP/htdocs/docproj/Makefile
@@ -9,16 +9,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/ja_JP.eucJP/htdocs/docproj/current.sgml b/ja_JP.eucJP/htdocs/docproj/current.xml
similarity index 99%
rename from ja_JP.eucJP/htdocs/docproj/current.sgml
rename to ja_JP.eucJP/htdocs/docproj/current.xml
index 3384f5b246..d2b5262f50 100644
--- a/ja_JP.eucJP/htdocs/docproj/current.sgml
+++ b/ja_JP.eucJP/htdocs/docproj/current.xml
@@ -89,7 +89,7 @@
       ��������˴ؤ��� Chicago �ޥ˥奢��䡢
       ����ǥå����˴�Ϣ����¾�Υ�������֥å����ɤळ�Ȥ������侩����ޤ���
       ���˽������줿����ǥå����Υ��顼�ˤĤ��Ƥϡ�
-      chapter.sgml �ե������ CVS �������������������
+      chapter.xml �ե������ CVS �������������������
       indexterm ���Ф����ѹ���Ԥʤä���ˤϡ�
       �ϥ�ɥ֥å��Υݥ��ȥ�����ץ��Ǥ��ǧ���뤳�Ȥ�ɬ�ܤǤ���
       Ĺ��ñ��䡢��������ҤȤʤä� indexterm ���Ѥ�����ȡ�
diff --git a/ja_JP.eucJP/htdocs/docproj/doc-set.sgml b/ja_JP.eucJP/htdocs/docproj/doc-set.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/docproj/doc-set.sgml
rename to ja_JP.eucJP/htdocs/docproj/doc-set.xml
diff --git a/ja_JP.eucJP/htdocs/docproj/docproj.sgml b/ja_JP.eucJP/htdocs/docproj/docproj.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/docproj/docproj.sgml
rename to ja_JP.eucJP/htdocs/docproj/docproj.xml
diff --git a/ja_JP.eucJP/htdocs/docproj/sgml.sgml b/ja_JP.eucJP/htdocs/docproj/sgml.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/docproj/sgml.sgml
rename to ja_JP.eucJP/htdocs/docproj/sgml.xml
diff --git a/ja_JP.eucJP/htdocs/docproj/submitting.sgml b/ja_JP.eucJP/htdocs/docproj/submitting.xml
similarity index 95%
rename from ja_JP.eucJP/htdocs/docproj/submitting.sgml
rename to ja_JP.eucJP/htdocs/docproj/submitting.xml
index a137d4f672..70b0c18279 100644
--- a/ja_JP.eucJP/htdocs/docproj/submitting.sgml
+++ b/ja_JP.eucJP/htdocs/docproj/submitting.xml
@@ -117,16 +117,16 @@
 
 	<ol>
 	<li><p>�ѹ�����ե�����Υ��ԡ����äƤ���������
-	�⤷ <tt>foo.sgml</tt> ���ѹ�������Ϥ����Ǥ���</p>
+	�⤷ <tt>foo.xml</tt> ���ѹ�������Ϥ����Ǥ���</p>
 
 	<pre>
-    % <b>cp foo.sgml foo.sgml.old</b>
+    % <b>cp foo.xml foo.xml.old</b>
 	</pre></li>
 
-	<li><p>���줫�顢foo.sgml ���ѹ����ޤ���</p>
+	<li><p>���줫�顢foo.xml ���ѹ����ޤ���</p>
 
 	<pre>
-    % <b>vi foo.sgml</b>
+    % <b>vi foo.xml</b>
     ... �����ȡ������򤳤����ơ������Ѥ��� ...
 
     ... �ѹ������������ơ��������ʤ�����ǧ���ơ���ˤ��ˤ��ˤ� ...
@@ -135,7 +135,7 @@
       <li><p>diff ��Ĥ���ޤ��������ѤΥ��ޥ�ɤϰʲ��Τ褦�ˤʤ�ޤ���</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>��ĤΥե�������������Ĵ�١������� <tt>foo.diff</tt>
diff --git a/ja_JP.eucJP/htdocs/docproj/translations.sgml b/ja_JP.eucJP/htdocs/docproj/translations.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/docproj/translations.sgml
rename to ja_JP.eucJP/htdocs/docproj/translations.xml
diff --git a/ja_JP.eucJP/htdocs/docproj/who.sgml b/ja_JP.eucJP/htdocs/docproj/who.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/docproj/who.sgml
rename to ja_JP.eucJP/htdocs/docproj/who.xml
diff --git a/ja_JP.eucJP/htdocs/docs.sgml b/ja_JP.eucJP/htdocs/docs.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/docs.sgml
rename to ja_JP.eucJP/htdocs/docs.xml
diff --git a/ja_JP.eucJP/htdocs/docs/Makefile b/ja_JP.eucJP/htdocs/docs/Makefile
index 722f03f4de..584adc0b29 100644
--- a/ja_JP.eucJP/htdocs/docs/Makefile
+++ b/ja_JP.eucJP/htdocs/docs/Makefile
@@ -8,6 +8,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/ja_JP.eucJP/htdocs/docs/books.sgml b/ja_JP.eucJP/htdocs/docs/books.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/docs/books.sgml
rename to ja_JP.eucJP/htdocs/docs/books.xml
diff --git a/ja_JP.eucJP/htdocs/docs/webresources.sgml b/ja_JP.eucJP/htdocs/docs/webresources.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/docs/webresources.sgml
rename to ja_JP.eucJP/htdocs/docs/webresources.xml
diff --git a/ja_JP.eucJP/htdocs/features.sgml b/ja_JP.eucJP/htdocs/features.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/features.sgml
rename to ja_JP.eucJP/htdocs/features.xml
diff --git a/ja_JP.eucJP/htdocs/internal/Makefile b/ja_JP.eucJP/htdocs/internal/Makefile
index 20d059e3a4..cd060172aa 100644
--- a/ja_JP.eucJP/htdocs/internal/Makefile
+++ b/ja_JP.eucJP/htdocs/internal/Makefile
@@ -9,25 +9,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
 
@@ -35,7 +35,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/ja_JP.eucJP/htdocs/internal/about.sgml b/ja_JP.eucJP/htdocs/internal/about.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/internal/about.sgml
rename to ja_JP.eucJP/htdocs/internal/about.xml
diff --git a/ja_JP.eucJP/htdocs/internal/developer.sgml b/ja_JP.eucJP/htdocs/internal/developer.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/internal/developer.sgml
rename to ja_JP.eucJP/htdocs/internal/developer.xml
diff --git a/ja_JP.eucJP/htdocs/internal/internal.sgml b/ja_JP.eucJP/htdocs/internal/internal.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/internal/internal.sgml
rename to ja_JP.eucJP/htdocs/internal/internal.xml
diff --git a/ja_JP.eucJP/htdocs/internal/machines.sgml b/ja_JP.eucJP/htdocs/internal/machines.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/internal/machines.sgml
rename to ja_JP.eucJP/htdocs/internal/machines.xml
diff --git a/ja_JP.eucJP/htdocs/internal/mirror.sgml b/ja_JP.eucJP/htdocs/internal/mirror.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/internal/mirror.sgml
rename to ja_JP.eucJP/htdocs/internal/mirror.xml
diff --git a/ja_JP.eucJP/htdocs/internal/statistic.sgml b/ja_JP.eucJP/htdocs/internal/statistic.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/internal/statistic.sgml
rename to ja_JP.eucJP/htdocs/internal/statistic.xml
diff --git a/ja_JP.eucJP/htdocs/internet.sgml b/ja_JP.eucJP/htdocs/internet.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/internet.sgml
rename to ja_JP.eucJP/htdocs/internet.xml
diff --git a/ja_JP.eucJP/htdocs/jabout.sgml b/ja_JP.eucJP/htdocs/jabout.xml
similarity index 97%
rename from ja_JP.eucJP/htdocs/jabout.sgml
rename to ja_JP.eucJP/htdocs/jabout.xml
index 9013d67a59..97295235cf 100644
--- a/ja_JP.eucJP/htdocs/jabout.sgml
+++ b/ja_JP.eucJP/htdocs/jabout.xml
@@ -2,7 +2,7 @@
 <!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 "About Japanese Translation">
-<!ENTITY % jmember  SYSTEM "jmember.sgml"> %jmember;
+<!ENTITY % jmember  SYSTEM "jmember.xml"> %jmember;
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSS Japanese Documentation Project -->
diff --git a/ja_JP.eucJP/htdocs/java/Makefile b/ja_JP.eucJP/htdocs/java/Makefile
index 4debebadc5..3f642cc535 100644
--- a/ja_JP.eucJP/htdocs/java/Makefile
+++ b/ja_JP.eucJP/htdocs/java/Makefile
@@ -13,10 +13,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
 
 XML.DEFAULT=	news.xml
 XMLDOCS=	newsflash
diff --git a/ja_JP.eucJP/htdocs/java/advocacy.sgml b/ja_JP.eucJP/htdocs/java/advocacy.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/advocacy.sgml
rename to ja_JP.eucJP/htdocs/java/advocacy.xml
diff --git a/ja_JP.eucJP/htdocs/java/dists/15.sgml b/ja_JP.eucJP/htdocs/java/dists/15.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/dists/15.sgml
rename to ja_JP.eucJP/htdocs/java/dists/15.xml
diff --git a/ja_JP.eucJP/htdocs/java/dists/Makefile b/ja_JP.eucJP/htdocs/java/dists/Makefile
index 9cb49f3038..2e8a54652b 100644
--- a/ja_JP.eucJP/htdocs/java/dists/Makefile
+++ b/ja_JP.eucJP/htdocs/java/dists/Makefile
@@ -9,9 +9,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/ja_JP.eucJP/htdocs/java/dists/index.sgml b/ja_JP.eucJP/htdocs/java/dists/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/dists/index.sgml
rename to ja_JP.eucJP/htdocs/java/dists/index.xml
diff --git a/ja_JP.eucJP/htdocs/java/howhelp.sgml b/ja_JP.eucJP/htdocs/java/howhelp.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/howhelp.sgml
rename to ja_JP.eucJP/htdocs/java/howhelp.xml
diff --git a/ja_JP.eucJP/htdocs/java/index.sgml b/ja_JP.eucJP/htdocs/java/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/index.sgml
rename to ja_JP.eucJP/htdocs/java/index.xml
diff --git a/ja_JP.eucJP/htdocs/java/install.sgml b/ja_JP.eucJP/htdocs/java/install.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/install.sgml
rename to ja_JP.eucJP/htdocs/java/install.xml
diff --git a/ja_JP.eucJP/htdocs/java/links/Makefile b/ja_JP.eucJP/htdocs/java/links/Makefile
index 72963572fa..b8583674fe 100644
--- a/ja_JP.eucJP/htdocs/java/links/Makefile
+++ b/ja_JP.eucJP/htdocs/java/links/Makefile
@@ -9,15 +9,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/ja_JP.eucJP/htdocs/java/links/api.sgml b/ja_JP.eucJP/htdocs/java/links/api.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/links/api.sgml
rename to ja_JP.eucJP/htdocs/java/links/api.xml
diff --git a/ja_JP.eucJP/htdocs/java/links/development.sgml b/ja_JP.eucJP/htdocs/java/links/development.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/links/development.sgml
rename to ja_JP.eucJP/htdocs/java/links/development.xml
diff --git a/ja_JP.eucJP/htdocs/java/links/documentation.sgml b/ja_JP.eucJP/htdocs/java/links/documentation.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/links/documentation.sgml
rename to ja_JP.eucJP/htdocs/java/links/documentation.xml
diff --git a/ja_JP.eucJP/htdocs/java/links/freebsd.sgml b/ja_JP.eucJP/htdocs/java/links/freebsd.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/links/freebsd.sgml
rename to ja_JP.eucJP/htdocs/java/links/freebsd.xml
diff --git a/ja_JP.eucJP/htdocs/java/links/index.sgml b/ja_JP.eucJP/htdocs/java/links/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/links/index.sgml
rename to ja_JP.eucJP/htdocs/java/links/index.xml
diff --git a/ja_JP.eucJP/htdocs/java/links/resources.sgml b/ja_JP.eucJP/htdocs/java/links/resources.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/links/resources.sgml
rename to ja_JP.eucJP/htdocs/java/links/resources.xml
diff --git a/ja_JP.eucJP/htdocs/java/links/servlets.sgml b/ja_JP.eucJP/htdocs/java/links/servlets.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/links/servlets.sgml
rename to ja_JP.eucJP/htdocs/java/links/servlets.xml
diff --git a/ja_JP.eucJP/htdocs/java/links/tools.sgml b/ja_JP.eucJP/htdocs/java/links/tools.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/links/tools.sgml
rename to ja_JP.eucJP/htdocs/java/links/tools.xml
diff --git a/ja_JP.eucJP/htdocs/java/links/tutorials.sgml b/ja_JP.eucJP/htdocs/java/links/tutorials.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/links/tutorials.sgml
rename to ja_JP.eucJP/htdocs/java/links/tutorials.xml
diff --git a/ja_JP.eucJP/htdocs/java/links/vendor.sgml b/ja_JP.eucJP/htdocs/java/links/vendor.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/java/links/vendor.sgml
rename to ja_JP.eucJP/htdocs/java/links/vendor.xml
diff --git a/ja_JP.eucJP/htdocs/jmember.sgml b/ja_JP.eucJP/htdocs/jmember.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/jmember.sgml
rename to ja_JP.eucJP/htdocs/jmember.xml
diff --git a/ja_JP.eucJP/htdocs/mailto.sgml b/ja_JP.eucJP/htdocs/mailto.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/mailto.sgml
rename to ja_JP.eucJP/htdocs/mailto.xml
diff --git a/ja_JP.eucJP/htdocs/news/1996/Makefile b/ja_JP.eucJP/htdocs/news/1996/Makefile
index c48c397313..26c1b8d6eb 100644
--- a/ja_JP.eucJP/htdocs/news/1996/Makefile
+++ b/ja_JP.eucJP/htdocs/news/1996/Makefile
@@ -9,6 +9,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/news/1996/index.sgml b/ja_JP.eucJP/htdocs/news/1996/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/news/1996/index.sgml
rename to ja_JP.eucJP/htdocs/news/1996/index.xml
diff --git a/ja_JP.eucJP/htdocs/news/1997/Makefile b/ja_JP.eucJP/htdocs/news/1997/Makefile
index ffe2b09294..001e7c83d2 100644
--- a/ja_JP.eucJP/htdocs/news/1997/Makefile
+++ b/ja_JP.eucJP/htdocs/news/1997/Makefile
@@ -9,6 +9,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/news/1997/index.sgml b/ja_JP.eucJP/htdocs/news/1997/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/news/1997/index.sgml
rename to ja_JP.eucJP/htdocs/news/1997/index.xml
diff --git a/ja_JP.eucJP/htdocs/news/Makefile b/ja_JP.eucJP/htdocs/news/Makefile
index c71b43f497..10cdf524d9 100644
--- a/ja_JP.eucJP/htdocs/news/Makefile
+++ b/ja_JP.eucJP/htdocs/news/Makefile
@@ -9,22 +9,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/ja_JP.eucJP/htdocs/news/news.sgml b/ja_JP.eucJP/htdocs/news/news.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/news/news.sgml
rename to ja_JP.eucJP/htdocs/news/news.xml
diff --git a/ja_JP.eucJP/htdocs/news/press-rel-1.sgml b/ja_JP.eucJP/htdocs/news/press-rel-1.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/news/press-rel-1.sgml
rename to ja_JP.eucJP/htdocs/news/press-rel-1.xml
diff --git a/ja_JP.eucJP/htdocs/news/press-rel-2.sgml b/ja_JP.eucJP/htdocs/news/press-rel-2.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/news/press-rel-2.sgml
rename to ja_JP.eucJP/htdocs/news/press-rel-2.xml
diff --git a/ja_JP.eucJP/htdocs/news/press-rel-3.sgml b/ja_JP.eucJP/htdocs/news/press-rel-3.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/news/press-rel-3.sgml
rename to ja_JP.eucJP/htdocs/news/press-rel-3.xml
diff --git a/ja_JP.eucJP/htdocs/news/press-rel-4.sgml b/ja_JP.eucJP/htdocs/news/press-rel-4.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/news/press-rel-4.sgml
rename to ja_JP.eucJP/htdocs/news/press-rel-4.xml
diff --git a/ja_JP.eucJP/htdocs/news/press-rel-5.sgml b/ja_JP.eucJP/htdocs/news/press-rel-5.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/news/press-rel-5.sgml
rename to ja_JP.eucJP/htdocs/news/press-rel-5.xml
diff --git a/ja_JP.eucJP/htdocs/news/pressreleases.sgml b/ja_JP.eucJP/htdocs/news/pressreleases.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/news/pressreleases.sgml
rename to ja_JP.eucJP/htdocs/news/pressreleases.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/Makefile b/ja_JP.eucJP/htdocs/platforms/Makefile
index 29ab8906b1..b57c07efc4 100644
--- a/ja_JP.eucJP/htdocs/platforms/Makefile
+++ b/ja_JP.eucJP/htdocs/platforms/Makefile
@@ -9,19 +9,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/ja_JP.eucJP/htdocs/platforms/alpha.sgml b/ja_JP.eucJP/htdocs/platforms/alpha.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/alpha.sgml
rename to ja_JP.eucJP/htdocs/platforms/alpha.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/amd64.sgml b/ja_JP.eucJP/htdocs/platforms/amd64.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/amd64.sgml
rename to ja_JP.eucJP/htdocs/platforms/amd64.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/arm.sgml b/ja_JP.eucJP/htdocs/platforms/arm.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/arm.sgml
rename to ja_JP.eucJP/htdocs/platforms/arm.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/ia64.sgml b/ja_JP.eucJP/htdocs/platforms/ia64.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/ia64.sgml
rename to ja_JP.eucJP/htdocs/platforms/ia64.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/ia64/Makefile b/ja_JP.eucJP/htdocs/platforms/ia64/Makefile
index 7d1e5d4392..5ffd51e60a 100644
--- a/ja_JP.eucJP/htdocs/platforms/ia64/Makefile
+++ b/ja_JP.eucJP/htdocs/platforms/ia64/Makefile
@@ -8,7 +8,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/ja_JP.eucJP/htdocs/platforms/ia64/index.sgml b/ja_JP.eucJP/htdocs/platforms/ia64/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/ia64/index.sgml
rename to ja_JP.eucJP/htdocs/platforms/ia64/index.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/ia64/machines.sgml b/ja_JP.eucJP/htdocs/platforms/ia64/machines.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/ia64/machines.sgml
rename to ja_JP.eucJP/htdocs/platforms/ia64/machines.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/ia64/refs.sgml b/ja_JP.eucJP/htdocs/platforms/ia64/refs.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/ia64/refs.sgml
rename to ja_JP.eucJP/htdocs/platforms/ia64/refs.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/ia64/todo.sgml b/ja_JP.eucJP/htdocs/platforms/ia64/todo.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/ia64/todo.sgml
rename to ja_JP.eucJP/htdocs/platforms/ia64/todo.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/index.sgml b/ja_JP.eucJP/htdocs/platforms/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/index.sgml
rename to ja_JP.eucJP/htdocs/platforms/index.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/mips.sgml b/ja_JP.eucJP/htdocs/platforms/mips.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/mips.sgml
rename to ja_JP.eucJP/htdocs/platforms/mips.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/pc98.sgml b/ja_JP.eucJP/htdocs/platforms/pc98.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/pc98.sgml
rename to ja_JP.eucJP/htdocs/platforms/pc98.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/ppc.sgml b/ja_JP.eucJP/htdocs/platforms/ppc.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/ppc.sgml
rename to ja_JP.eucJP/htdocs/platforms/ppc.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/sparc.sgml b/ja_JP.eucJP/htdocs/platforms/sparc.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/sparc.sgml
rename to ja_JP.eucJP/htdocs/platforms/sparc.xml
diff --git a/ja_JP.eucJP/htdocs/platforms/x86-64.sgml b/ja_JP.eucJP/htdocs/platforms/x86-64.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/platforms/x86-64.sgml
rename to ja_JP.eucJP/htdocs/platforms/x86-64.xml
diff --git a/ja_JP.eucJP/htdocs/ports/Makefile b/ja_JP.eucJP/htdocs/ports/Makefile
index e778a10878..4579f9b75e 100644
--- a/ja_JP.eucJP/htdocs/ports/Makefile
+++ b/ja_JP.eucJP/htdocs/ports/Makefile
@@ -49,18 +49,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
 
@@ -78,15 +78,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]" ${DOC_PREFIX}/en_US.ISO8859-1/htdocs/ports/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/ja_JP.eucJP/htdocs/ports/index.sgml b/ja_JP.eucJP/htdocs/ports/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/ports/index.sgml
rename to ja_JP.eucJP/htdocs/ports/index.xml
diff --git a/ja_JP.eucJP/htdocs/ports/installing.sgml b/ja_JP.eucJP/htdocs/ports/installing.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/ports/installing.sgml
rename to ja_JP.eucJP/htdocs/ports/installing.xml
diff --git a/ja_JP.eucJP/htdocs/ports/portindex b/ja_JP.eucJP/htdocs/ports/portindex
index d7d95778d6..1b6e060585 100755
--- a/ja_JP.eucJP/htdocs/ports/portindex
+++ b/ja_JP.eucJP/htdocs/ports/portindex
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# 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
@@ -294,7 +294,7 @@ sub main {
 
     	# Add an entry to the master index
 
-	# workaround for SGML bug, `--' is not allowed in comments
+	# workaround for XML syntax, `--' is not allowed in comments
 	my $sname = $name;
 	$sname =~ s/--/-=/g;
     	$master[$portnumber] = 
@@ -303,9 +303,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 -- ���롼�פˤ��ʬ��");
 
     print $moutf <<EOF;
@@ -337,7 +337,7 @@ EOF
 
 
 	    # 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";
@@ -358,9 +358,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 -- ����ե��٥åȽ�");
 
     print $moutf <<EOF;
@@ -385,9 +385,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 ����");
     print $mindex "<p>\n";
     print $mindex sort @master;
diff --git a/ja_JP.eucJP/htdocs/ports/references.sgml b/ja_JP.eucJP/htdocs/ports/references.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/ports/references.sgml
rename to ja_JP.eucJP/htdocs/ports/references.xml
diff --git a/ja_JP.eucJP/htdocs/ports/searching.sgml b/ja_JP.eucJP/htdocs/ports/searching.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/ports/searching.sgml
rename to ja_JP.eucJP/htdocs/ports/searching.xml
diff --git a/ja_JP.eucJP/htdocs/ports/updating.sgml b/ja_JP.eucJP/htdocs/ports/updating.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/ports/updating.sgml
rename to ja_JP.eucJP/htdocs/ports/updating.xml
diff --git a/ja_JP.eucJP/htdocs/projects/Makefile b/ja_JP.eucJP/htdocs/projects/Makefile
index b9b2fadf11..45b9757f1f 100644
--- a/ja_JP.eucJP/htdocs/projects/Makefile
+++ b/ja_JP.eucJP/htdocs/projects/Makefile
@@ -9,13 +9,13 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	projects.sgml
-DOCS+=	newbies.sgml
-DOCS+=	cvsweb.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-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/ja_JP.eucJP/htdocs/projects/cvsweb.sgml b/ja_JP.eucJP/htdocs/projects/cvsweb.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/projects/cvsweb.sgml
rename to ja_JP.eucJP/htdocs/projects/cvsweb.xml
diff --git a/ja_JP.eucJP/htdocs/projects/mips/Makefile b/ja_JP.eucJP/htdocs/projects/mips/Makefile
index 9031edb482..43c624ac40 100644
--- a/ja_JP.eucJP/htdocs/projects/mips/Makefile
+++ b/ja_JP.eucJP/htdocs/projects/mips/Makefile
@@ -13,7 +13,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/ja_JP.eucJP/htdocs/projects/mips/index.sgml b/ja_JP.eucJP/htdocs/projects/mips/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/projects/mips/index.sgml
rename to ja_JP.eucJP/htdocs/projects/mips/index.xml
diff --git a/ja_JP.eucJP/htdocs/projects/newbies.sgml b/ja_JP.eucJP/htdocs/projects/newbies.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/projects/newbies.sgml
rename to ja_JP.eucJP/htdocs/projects/newbies.xml
diff --git a/ja_JP.eucJP/htdocs/projects/projects.sgml b/ja_JP.eucJP/htdocs/projects/projects.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/projects/projects.sgml
rename to ja_JP.eucJP/htdocs/projects/projects.xml
diff --git a/ja_JP.eucJP/htdocs/prstats/Makefile b/ja_JP.eucJP/htdocs/prstats/Makefile
index c29bd64f06..ff20f73280 100644
--- a/ja_JP.eucJP/htdocs/prstats/Makefile
+++ b/ja_JP.eucJP/htdocs/prstats/Makefile
@@ -8,6 +8,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/prstats/index.sgml b/ja_JP.eucJP/htdocs/prstats/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/prstats/index.sgml
rename to ja_JP.eucJP/htdocs/prstats/index.xml
diff --git a/ja_JP.eucJP/htdocs/publish.sgml b/ja_JP.eucJP/htdocs/publish.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/publish.sgml
rename to ja_JP.eucJP/htdocs/publish.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.1.5R/Makefile b/ja_JP.eucJP/htdocs/releases/2.1.5R/Makefile
index c90d3be0b2..02a5c6fde7 100644
--- a/ja_JP.eucJP/htdocs/releases/2.1.5R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/2.1.5R/Makefile
@@ -9,8 +9,8 @@
 .include "../Makefile.inc"
 .endif
 
-#DOCS=  announce.sgml
-#DOCS+= notes.sgml
-DOCS=  notes.sgml
+#DOCS=  announce.xml
+#DOCS+= notes.xml
+DOCS=  notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/releases/2.1.5R/notes.sgml b/ja_JP.eucJP/htdocs/releases/2.1.5R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.1.5R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/2.1.5R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.1.6R/Makefile b/ja_JP.eucJP/htdocs/releases/2.1.6R/Makefile
index 5bd5194259..22d225bd72 100644
--- a/ja_JP.eucJP/htdocs/releases/2.1.6R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/2.1.6R/Makefile
@@ -9,9 +9,9 @@
 .include "../Makefile.inc"
 .endif
 
-#DOCS=	announce.sgml
-#DOCS+=	notes.sgml
-DOCS=	notes.sgml
-DOCS+=	security.sgml
+#DOCS=	announce.xml
+#DOCS+=	notes.xml
+DOCS=	notes.xml
+DOCS+=	security.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/releases/2.1.6R/notes.sgml b/ja_JP.eucJP/htdocs/releases/2.1.6R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.1.6R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/2.1.6R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.1.6R/security.sgml b/ja_JP.eucJP/htdocs/releases/2.1.6R/security.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.1.6R/security.sgml
rename to ja_JP.eucJP/htdocs/releases/2.1.6R/security.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.1.7R/Makefile b/ja_JP.eucJP/htdocs/releases/2.1.7R/Makefile
index 54f0bf862e..061cc6aaa2 100644
--- a/ja_JP.eucJP/htdocs/releases/2.1.7R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/2.1.7R/Makefile
@@ -9,8 +9,8 @@
 .include "../Makefile.inc"
 .endif
 
-#DOCS=	announce.sgml
-DOCS=	notes.sgml
-#DOCS=+	notes.sgml
+#DOCS=	announce.xml
+DOCS=	notes.xml
+#DOCS=+	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/releases/2.1.7R/notes.sgml b/ja_JP.eucJP/htdocs/releases/2.1.7R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.1.7R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/2.1.7R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.1R/Makefile b/ja_JP.eucJP/htdocs/releases/2.2.1R/Makefile
index 4fd85a6948..974551a70b 100644
--- a/ja_JP.eucJP/htdocs/releases/2.2.1R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/2.2.1R/Makefile
@@ -9,6 +9,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	notes.sgml
+DOCS=	notes.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.1R/notes.sgml b/ja_JP.eucJP/htdocs/releases/2.2.1R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.1R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.1R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.2R/Makefile b/ja_JP.eucJP/htdocs/releases/2.2.2R/Makefile
index 518ca6d8e4..19d28bf4b9 100644
--- a/ja_JP.eucJP/htdocs/releases/2.2.2R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/2.2.2R/Makefile
@@ -9,7 +9,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/ja_JP.eucJP/htdocs/releases/2.2.2R/errata.sgml b/ja_JP.eucJP/htdocs/releases/2.2.2R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.2R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.2R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.2R/notes.sgml b/ja_JP.eucJP/htdocs/releases/2.2.2R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.2R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.2R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.5R/Makefile b/ja_JP.eucJP/htdocs/releases/2.2.5R/Makefile
index f4fc6a0789..933fd9333d 100644
--- a/ja_JP.eucJP/htdocs/releases/2.2.5R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/2.2.5R/Makefile
@@ -9,8 +9,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	notes.sgml
-DOCS+=	errata.sgml
+DOCS=	announce.xml
+DOCS+=	notes.xml
+DOCS+=	errata.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.5R/announce.sgml b/ja_JP.eucJP/htdocs/releases/2.2.5R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.5R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.5R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.5R/errata.sgml b/ja_JP.eucJP/htdocs/releases/2.2.5R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.5R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.5R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.5R/notes.sgml b/ja_JP.eucJP/htdocs/releases/2.2.5R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.5R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.5R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.6R/Makefile b/ja_JP.eucJP/htdocs/releases/2.2.6R/Makefile
index 7abae6da3b..278090cefd 100644
--- a/ja_JP.eucJP/htdocs/releases/2.2.6R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/2.2.6R/Makefile
@@ -9,8 +9,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	notes.sgml
-DOCS+=	errata.sgml
+DOCS=	announce.xml
+DOCS+=	notes.xml
+DOCS+=	errata.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.6R/announce.sgml b/ja_JP.eucJP/htdocs/releases/2.2.6R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.6R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.6R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.6R/errata.sgml b/ja_JP.eucJP/htdocs/releases/2.2.6R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.6R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.6R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.6R/notes.sgml b/ja_JP.eucJP/htdocs/releases/2.2.6R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.6R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.6R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.7R/Makefile b/ja_JP.eucJP/htdocs/releases/2.2.7R/Makefile
index 7abae6da3b..278090cefd 100644
--- a/ja_JP.eucJP/htdocs/releases/2.2.7R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/2.2.7R/Makefile
@@ -9,8 +9,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-DOCS+=	notes.sgml
-DOCS+=	errata.sgml
+DOCS=	announce.xml
+DOCS+=	notes.xml
+DOCS+=	errata.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.7R/announce.sgml b/ja_JP.eucJP/htdocs/releases/2.2.7R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.7R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.7R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.7R/errata.sgml b/ja_JP.eucJP/htdocs/releases/2.2.7R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.7R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.7R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.7R/notes.sgml b/ja_JP.eucJP/htdocs/releases/2.2.7R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.7R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.7R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.8R/Makefile b/ja_JP.eucJP/htdocs/releases/2.2.8R/Makefile
index 3874a773a1..aa1c963284 100644
--- a/ja_JP.eucJP/htdocs/releases/2.2.8R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/2.2.8R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/2.2.8R/announce.sgml b/ja_JP.eucJP/htdocs/releases/2.2.8R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.8R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.8R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.8R/errata.sgml b/ja_JP.eucJP/htdocs/releases/2.2.8R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.8R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.8R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2.8R/notes.sgml b/ja_JP.eucJP/htdocs/releases/2.2.8R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2.8R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2.8R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2R/Makefile b/ja_JP.eucJP/htdocs/releases/2.2R/Makefile
index c0b18a3316..d303a505ef 100644
--- a/ja_JP.eucJP/htdocs/releases/2.2R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/2.2R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/2.2R/announce.sgml b/ja_JP.eucJP/htdocs/releases/2.2R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2R/install-media.sgml b/ja_JP.eucJP/htdocs/releases/2.2R/install-media.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2R/install-media.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2R/install-media.xml
diff --git a/ja_JP.eucJP/htdocs/releases/2.2R/notes.sgml b/ja_JP.eucJP/htdocs/releases/2.2R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/2.2R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/2.2R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.0R/Makefile b/ja_JP.eucJP/htdocs/releases/3.0R/Makefile
index 3874a773a1..aa1c963284 100644
--- a/ja_JP.eucJP/htdocs/releases/3.0R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/3.0R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/3.0R/announce.sgml b/ja_JP.eucJP/htdocs/releases/3.0R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.0R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/3.0R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.0R/errata.sgml b/ja_JP.eucJP/htdocs/releases/3.0R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.0R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/3.0R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.0R/notes.sgml b/ja_JP.eucJP/htdocs/releases/3.0R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.0R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/3.0R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.1R/Makefile b/ja_JP.eucJP/htdocs/releases/3.1R/Makefile
index 3874a773a1..aa1c963284 100644
--- a/ja_JP.eucJP/htdocs/releases/3.1R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/3.1R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/3.1R/announce.sgml b/ja_JP.eucJP/htdocs/releases/3.1R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.1R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/3.1R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.1R/errata.sgml b/ja_JP.eucJP/htdocs/releases/3.1R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.1R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/3.1R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.1R/notes.sgml b/ja_JP.eucJP/htdocs/releases/3.1R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.1R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/3.1R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.2R/Makefile b/ja_JP.eucJP/htdocs/releases/3.2R/Makefile
index 3874a773a1..aa1c963284 100644
--- a/ja_JP.eucJP/htdocs/releases/3.2R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/3.2R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/3.2R/announce.sgml b/ja_JP.eucJP/htdocs/releases/3.2R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.2R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/3.2R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.2R/errata.sgml b/ja_JP.eucJP/htdocs/releases/3.2R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.2R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/3.2R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.2R/notes.sgml b/ja_JP.eucJP/htdocs/releases/3.2R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.2R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/3.2R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.3R/Makefile b/ja_JP.eucJP/htdocs/releases/3.3R/Makefile
index 3874a773a1..aa1c963284 100644
--- a/ja_JP.eucJP/htdocs/releases/3.3R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/3.3R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/3.3R/announce.sgml b/ja_JP.eucJP/htdocs/releases/3.3R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.3R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/3.3R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.3R/errata.sgml b/ja_JP.eucJP/htdocs/releases/3.3R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.3R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/3.3R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.3R/notes.sgml b/ja_JP.eucJP/htdocs/releases/3.3R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.3R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/3.3R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.4R/Makefile b/ja_JP.eucJP/htdocs/releases/3.4R/Makefile
index 3874a773a1..aa1c963284 100644
--- a/ja_JP.eucJP/htdocs/releases/3.4R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/3.4R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/3.4R/announce.sgml b/ja_JP.eucJP/htdocs/releases/3.4R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.4R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/3.4R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.4R/errata.sgml b/ja_JP.eucJP/htdocs/releases/3.4R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.4R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/3.4R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.4R/notes.sgml b/ja_JP.eucJP/htdocs/releases/3.4R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.4R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/3.4R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.5R/Makefile b/ja_JP.eucJP/htdocs/releases/3.5R/Makefile
index 3874a773a1..aa1c963284 100644
--- a/ja_JP.eucJP/htdocs/releases/3.5R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/3.5R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/3.5R/announce.sgml b/ja_JP.eucJP/htdocs/releases/3.5R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.5R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/3.5R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.5R/errata.sgml b/ja_JP.eucJP/htdocs/releases/3.5R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.5R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/3.5R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/3.5R/notes.sgml b/ja_JP.eucJP/htdocs/releases/3.5R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/3.5R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/3.5R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.0R/Makefile b/ja_JP.eucJP/htdocs/releases/4.0R/Makefile
index 3874a773a1..aa1c963284 100644
--- a/ja_JP.eucJP/htdocs/releases/4.0R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.0R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/4.0R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.0R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.0R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.0R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.0R/errata.sgml b/ja_JP.eucJP/htdocs/releases/4.0R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.0R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/4.0R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.0R/notes.sgml b/ja_JP.eucJP/htdocs/releases/4.0R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.0R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.0R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.1.1R/Makefile b/ja_JP.eucJP/htdocs/releases/4.1.1R/Makefile
index 3874a773a1..aa1c963284 100644
--- a/ja_JP.eucJP/htdocs/releases/4.1.1R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.1.1R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/4.1.1R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.1.1R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.1.1R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.1.1R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.1.1R/errata.sgml b/ja_JP.eucJP/htdocs/releases/4.1.1R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.1.1R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/4.1.1R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.1.1R/notes.sgml b/ja_JP.eucJP/htdocs/releases/4.1.1R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.1.1R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.1.1R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.10R/Makefile b/ja_JP.eucJP/htdocs/releases/4.10R/Makefile
index 2ba635ff27..9904ac6873 100644
--- a/ja_JP.eucJP/htdocs/releases/4.10R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.10R/Makefile
@@ -8,13 +8,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/ja_JP.eucJP/htdocs/releases/4.10R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.10R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.10R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.10R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.10R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/4.10R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.10R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/4.10R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.10R/relnotes.sgml b/ja_JP.eucJP/htdocs/releases/4.10R/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.10R/relnotes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.10R/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.11R/Makefile b/ja_JP.eucJP/htdocs/releases/4.11R/Makefile
index 956a4dccdb..68d7d40aa0 100644
--- a/ja_JP.eucJP/htdocs/releases/4.11R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.11R/Makefile
@@ -8,13 +8,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/ja_JP.eucJP/htdocs/releases/4.11R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.11R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.11R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.11R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.11R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/4.11R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.11R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/4.11R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.11R/relnotes.sgml b/ja_JP.eucJP/htdocs/releases/4.11R/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.11R/relnotes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.11R/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.1R/Makefile b/ja_JP.eucJP/htdocs/releases/4.1R/Makefile
index 3874a773a1..aa1c963284 100644
--- a/ja_JP.eucJP/htdocs/releases/4.1R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.1R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/4.1R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.1R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.1R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.1R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.1R/errata.sgml b/ja_JP.eucJP/htdocs/releases/4.1R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.1R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/4.1R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.1R/notes.sgml b/ja_JP.eucJP/htdocs/releases/4.1R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.1R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.1R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.2R/Makefile b/ja_JP.eucJP/htdocs/releases/4.2R/Makefile
index 68c188da28..e6e50cea5c 100644
--- a/ja_JP.eucJP/htdocs/releases/4.2R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.2R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/4.2R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.2R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.2R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.2R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.2R/errata.sgml b/ja_JP.eucJP/htdocs/releases/4.2R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.2R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/4.2R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.2R/notes.sgml b/ja_JP.eucJP/htdocs/releases/4.2R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.2R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.2R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.3R/Makefile b/ja_JP.eucJP/htdocs/releases/4.3R/Makefile
index 68c188da28..e6e50cea5c 100644
--- a/ja_JP.eucJP/htdocs/releases/4.3R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.3R/Makefile
@@ -9,8 +9,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/ja_JP.eucJP/htdocs/releases/4.3R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.3R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.3R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.3R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.3R/errata.sgml b/ja_JP.eucJP/htdocs/releases/4.3R/errata.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.3R/errata.sgml
rename to ja_JP.eucJP/htdocs/releases/4.3R/errata.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.3R/notes.sgml b/ja_JP.eucJP/htdocs/releases/4.3R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.3R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.3R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.4R/Makefile b/ja_JP.eucJP/htdocs/releases/4.4R/Makefile
index 9a97c2c825..e8a2bd631c 100644
--- a/ja_JP.eucJP/htdocs/releases/4.4R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.4R/Makefile
@@ -8,9 +8,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/ja_JP.eucJP/htdocs/releases/4.4R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.4R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.4R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.4R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.4R/notes.sgml b/ja_JP.eucJP/htdocs/releases/4.4R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.4R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.4R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.5R/Makefile b/ja_JP.eucJP/htdocs/releases/4.5R/Makefile
index 7a9aa5814b..f1d402bf31 100644
--- a/ja_JP.eucJP/htdocs/releases/4.5R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.5R/Makefile
@@ -8,12 +8,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/ja_JP.eucJP/htdocs/releases/4.5R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.5R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.5R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.5R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.5R/contents.sgml b/ja_JP.eucJP/htdocs/releases/4.5R/contents.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.5R/contents.sgml
rename to ja_JP.eucJP/htdocs/releases/4.5R/contents.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.5R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/4.5R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.5R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/4.5R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.5R/notes.sgml b/ja_JP.eucJP/htdocs/releases/4.5R/notes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.5R/notes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.5R/notes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.5R/qa.sgml b/ja_JP.eucJP/htdocs/releases/4.5R/qa.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.5R/qa.sgml
rename to ja_JP.eucJP/htdocs/releases/4.5R/qa.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.5R/schedule.sgml b/ja_JP.eucJP/htdocs/releases/4.5R/schedule.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.5R/schedule.sgml
rename to ja_JP.eucJP/htdocs/releases/4.5R/schedule.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.6.2R/Makefile b/ja_JP.eucJP/htdocs/releases/4.6.2R/Makefile
index e4c0de7821..75f6311459 100644
--- a/ja_JP.eucJP/htdocs/releases/4.6.2R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.6.2R/Makefile
@@ -8,9 +8,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/ja_JP.eucJP/htdocs/releases/4.6.2R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.6.2R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.6.2R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.6.2R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.6.2R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/4.6.2R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.6.2R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/4.6.2R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.6.2R/relnotes.sgml b/ja_JP.eucJP/htdocs/releases/4.6.2R/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.6.2R/relnotes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.6.2R/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.6R/Makefile b/ja_JP.eucJP/htdocs/releases/4.6R/Makefile
index df62173a70..43bf22d774 100644
--- a/ja_JP.eucJP/htdocs/releases/4.6R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.6R/Makefile
@@ -8,13 +8,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/ja_JP.eucJP/htdocs/releases/4.6R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.6R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.6R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.6R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.6R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/4.6R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.6R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/4.6R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.6R/relnotes.sgml b/ja_JP.eucJP/htdocs/releases/4.6R/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.6R/relnotes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.6R/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.7R/Makefile b/ja_JP.eucJP/htdocs/releases/4.7R/Makefile
index 4a696ad973..7f2459af20 100644
--- a/ja_JP.eucJP/htdocs/releases/4.7R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.7R/Makefile
@@ -8,12 +8,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/ja_JP.eucJP/htdocs/releases/4.7R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.7R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.7R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.7R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.7R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/4.7R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.7R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/4.7R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.7R/relnotes.sgml b/ja_JP.eucJP/htdocs/releases/4.7R/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.7R/relnotes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.7R/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.8R/Makefile b/ja_JP.eucJP/htdocs/releases/4.8R/Makefile
index f343dafc15..42d1f6af66 100644
--- a/ja_JP.eucJP/htdocs/releases/4.8R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.8R/Makefile
@@ -8,12 +8,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/ja_JP.eucJP/htdocs/releases/4.8R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.8R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.8R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.8R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.8R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/4.8R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.8R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/4.8R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.8R/relnotes.sgml b/ja_JP.eucJP/htdocs/releases/4.8R/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.8R/relnotes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.8R/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.9R/Makefile b/ja_JP.eucJP/htdocs/releases/4.9R/Makefile
index 799fabbe53..794728350a 100644
--- a/ja_JP.eucJP/htdocs/releases/4.9R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/4.9R/Makefile
@@ -8,13 +8,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/ja_JP.eucJP/htdocs/releases/4.9R/announce.sgml b/ja_JP.eucJP/htdocs/releases/4.9R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.9R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/4.9R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.9R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/4.9R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.9R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/4.9R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/4.9R/relnotes.sgml b/ja_JP.eucJP/htdocs/releases/4.9R/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/4.9R/relnotes.sgml
rename to ja_JP.eucJP/htdocs/releases/4.9R/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.0R/Makefile b/ja_JP.eucJP/htdocs/releases/5.0R/Makefile
index 091385a1d0..055db387ab 100644
--- a/ja_JP.eucJP/htdocs/releases/5.0R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/5.0R/Makefile
@@ -11,12 +11,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/ja_JP.eucJP/htdocs/releases/5.0R/announce.sgml b/ja_JP.eucJP/htdocs/releases/5.0R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.0R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/5.0R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.0R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/5.0R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.0R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/5.0R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.0R/installation.sgml b/ja_JP.eucJP/htdocs/releases/5.0R/installation.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.0R/installation.sgml
rename to ja_JP.eucJP/htdocs/releases/5.0R/installation.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.0R/relnotes.sgml b/ja_JP.eucJP/htdocs/releases/5.0R/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.0R/relnotes.sgml
rename to ja_JP.eucJP/htdocs/releases/5.0R/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.1R/Makefile b/ja_JP.eucJP/htdocs/releases/5.1R/Makefile
index 13fa0a1db7..1ece1b2c0b 100644
--- a/ja_JP.eucJP/htdocs/releases/5.1R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/5.1R/Makefile
@@ -8,12 +8,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/ja_JP.eucJP/htdocs/releases/5.1R/announce.sgml b/ja_JP.eucJP/htdocs/releases/5.1R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.1R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/5.1R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.1R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/5.1R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.1R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/5.1R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.1R/installation.sgml b/ja_JP.eucJP/htdocs/releases/5.1R/installation.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.1R/installation.sgml
rename to ja_JP.eucJP/htdocs/releases/5.1R/installation.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.1R/relnotes.sgml b/ja_JP.eucJP/htdocs/releases/5.1R/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.1R/relnotes.sgml
rename to ja_JP.eucJP/htdocs/releases/5.1R/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.2.1R/Makefile b/ja_JP.eucJP/htdocs/releases/5.2.1R/Makefile
index 71645e4b2d..724f959b33 100644
--- a/ja_JP.eucJP/htdocs/releases/5.2.1R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/5.2.1R/Makefile
@@ -8,10 +8,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/ja_JP.eucJP/htdocs/releases/5.2.1R/announce.sgml b/ja_JP.eucJP/htdocs/releases/5.2.1R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.2.1R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/5.2.1R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.2.1R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/5.2.1R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.2.1R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/5.2.1R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.2.1R/relnotes.sgml b/ja_JP.eucJP/htdocs/releases/5.2.1R/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.2.1R/relnotes.sgml
rename to ja_JP.eucJP/htdocs/releases/5.2.1R/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.2R/Makefile b/ja_JP.eucJP/htdocs/releases/5.2R/Makefile
index e90663e60f..9407462492 100644
--- a/ja_JP.eucJP/htdocs/releases/5.2R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/5.2R/Makefile
@@ -8,12 +8,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/ja_JP.eucJP/htdocs/releases/5.2R/announce.sgml b/ja_JP.eucJP/htdocs/releases/5.2R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.2R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/5.2R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.2R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/5.2R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.2R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/5.2R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.2R/relnotes.sgml b/ja_JP.eucJP/htdocs/releases/5.2R/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.2R/relnotes.sgml
rename to ja_JP.eucJP/htdocs/releases/5.2R/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.3R/Makefile b/ja_JP.eucJP/htdocs/releases/5.3R/Makefile
index 5058fb453b..ccac6ad8da 100644
--- a/ja_JP.eucJP/htdocs/releases/5.3R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/5.3R/Makefile
@@ -8,11 +8,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/ja_JP.eucJP/htdocs/releases/5.3R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/5.3R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.3R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/5.3R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/5.4R/Makefile b/ja_JP.eucJP/htdocs/releases/5.4R/Makefile
index a0ca5d32eb..ed5fd84663 100644
--- a/ja_JP.eucJP/htdocs/releases/5.4R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/5.4R/Makefile
@@ -8,11 +8,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/ja_JP.eucJP/htdocs/releases/5.4R/hardware.sgml b/ja_JP.eucJP/htdocs/releases/5.4R/hardware.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/5.4R/hardware.sgml
rename to ja_JP.eucJP/htdocs/releases/5.4R/hardware.xml
diff --git a/ja_JP.eucJP/htdocs/releases/8.2R/Makefile b/ja_JP.eucJP/htdocs/releases/8.2R/Makefile
index b91f9442a5..2800033bfc 100644
--- a/ja_JP.eucJP/htdocs/releases/8.2R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/8.2R/Makefile
@@ -9,10 +9,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-#DOCS=	announce.sgml \
-#	schedule.sgml \
-#	relnotes.sgml
+DOCS=	announce.xml
+#DOCS=	announce.xml \
+#	schedule.xml \
+#	relnotes.xml
 
 DATA=	docbook.css
 #DATA=	docbook.css \
diff --git a/ja_JP.eucJP/htdocs/releases/8.2R/announce.sgml b/ja_JP.eucJP/htdocs/releases/8.2R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/8.2R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/8.2R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/8.3R/Makefile b/ja_JP.eucJP/htdocs/releases/8.3R/Makefile
index a722ac7776..9f536e8c66 100644
--- a/ja_JP.eucJP/htdocs/releases/8.3R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/8.3R/Makefile
@@ -9,9 +9,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	announce.sgml
-#DOCS+=	announce.sgml \
-#	schedule.sgml
+DOCS=	announce.xml
+#DOCS+=	announce.xml \
+#	schedule.xml
 
 DATA=	docbook.css
 #DATA=	docbook.css \
diff --git a/ja_JP.eucJP/htdocs/releases/8.3R/announce.sgml b/ja_JP.eucJP/htdocs/releases/8.3R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/8.3R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/8.3R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/9.0R/Makefile b/ja_JP.eucJP/htdocs/releases/9.0R/Makefile
index c7498b0f17..ebe134a788 100644
--- a/ja_JP.eucJP/htdocs/releases/9.0R/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/9.0R/Makefile
@@ -9,10 +9,10 @@
 .include "../Makefile.inc"
 .endif
 
-#DOCS=	schedule.sgml \
-#	relnotes.sgml \
-#	announce.sgml
-DOCS=	announce.sgml
+#DOCS=	schedule.xml \
+#	relnotes.xml \
+#	announce.xml
+DOCS=	announce.xml
 
 DATA=	docbook.css \
 #	hardware.html \
diff --git a/ja_JP.eucJP/htdocs/releases/9.0R/announce.sgml b/ja_JP.eucJP/htdocs/releases/9.0R/announce.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/9.0R/announce.sgml
rename to ja_JP.eucJP/htdocs/releases/9.0R/announce.xml
diff --git a/ja_JP.eucJP/htdocs/releases/Makefile b/ja_JP.eucJP/htdocs/releases/Makefile
index 495d693552..47352d7e70 100644
--- a/ja_JP.eucJP/htdocs/releases/Makefile
+++ b/ja_JP.eucJP/htdocs/releases/Makefile
@@ -9,7 +9,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml
+DOCS?=	index.xml
 
 #SUBDIR=	1.1 1.1.5 2.0 2.0.5R 2.1R
 SUBDIR=		2.1.5R 2.1.6R 2.1.7R 2.2R
diff --git a/ja_JP.eucJP/htdocs/releases/index.sgml b/ja_JP.eucJP/htdocs/releases/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/releases/index.sgml
rename to ja_JP.eucJP/htdocs/releases/index.xml
diff --git a/ja_JP.eucJP/htdocs/relnotes.sgml b/ja_JP.eucJP/htdocs/relnotes.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/relnotes.sgml
rename to ja_JP.eucJP/htdocs/relnotes.xml
diff --git a/ja_JP.eucJP/htdocs/search/Makefile b/ja_JP.eucJP/htdocs/search/Makefile
index 0590c223c1..11d588027f 100644
--- a/ja_JP.eucJP/htdocs/search/Makefile
+++ b/ja_JP.eucJP/htdocs/search/Makefile
@@ -11,10 +11,10 @@
 
 # These are turned into validated, normalized HTML files.
 
-DOCS+= index-site.sgml
-DOCS+= search.sgml
-DOCS+= searchhints.sgml
-DOCS+= search-mid.sgml
+DOCS+= index-site.xml
+DOCS+= search.xml
+DOCS+= searchhints.xml
+DOCS+= search-mid.xml
 
 #SUBDIR+= opensearch
 
diff --git a/ja_JP.eucJP/htdocs/search/search-mid.sgml b/ja_JP.eucJP/htdocs/search/search-mid.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/search/search-mid.sgml
rename to ja_JP.eucJP/htdocs/search/search-mid.xml
diff --git a/ja_JP.eucJP/htdocs/search/search.sgml b/ja_JP.eucJP/htdocs/search/search.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/search/search.sgml
rename to ja_JP.eucJP/htdocs/search/search.xml
diff --git a/ja_JP.eucJP/htdocs/search/searchhints.sgml b/ja_JP.eucJP/htdocs/search/searchhints.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/search/searchhints.sgml
rename to ja_JP.eucJP/htdocs/search/searchhints.xml
diff --git a/ja_JP.eucJP/htdocs/security/Makefile b/ja_JP.eucJP/htdocs/security/Makefile
index 06c21c201c..4989ce27c7 100644
--- a/ja_JP.eucJP/htdocs/security/Makefile
+++ b/ja_JP.eucJP/htdocs/security/Makefile
@@ -13,14 +13,14 @@
 #+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/ja_JP.eucJP/htdocs/security/security.sgml b/ja_JP.eucJP/htdocs/security/security.xml
similarity index 99%
rename from ja_JP.eucJP/htdocs/security/security.sgml
rename to ja_JP.eucJP/htdocs/security/security.xml
index a969182ab6..103946e604 100644
--- a/ja_JP.eucJP/htdocs/security/security.sgml
+++ b/ja_JP.eucJP/htdocs/security/security.xml
@@ -234,7 +234,7 @@
     �֥������ݼ餬���ܤ���Ƥ������դ����᤯��λ�����ǽ���⤢��Ȥ������Ȥˤ����դ���������</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.
     -->
 
diff --git a/ja_JP.eucJP/htdocs/send-pr.sgml b/ja_JP.eucJP/htdocs/send-pr.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/send-pr.sgml
rename to ja_JP.eucJP/htdocs/send-pr.xml
diff --git a/ja_JP.eucJP/htdocs/snapshots/Makefile b/ja_JP.eucJP/htdocs/snapshots/Makefile
index f3a778a6c5..72c4d144c8 100644
--- a/ja_JP.eucJP/htdocs/snapshots/Makefile
+++ b/ja_JP.eucJP/htdocs/snapshots/Makefile
@@ -9,6 +9,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml
+DOCS?=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/snapshots/index.sgml b/ja_JP.eucJP/htdocs/snapshots/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/snapshots/index.sgml
rename to ja_JP.eucJP/htdocs/snapshots/index.xml
diff --git a/ja_JP.eucJP/htdocs/support.sgml b/ja_JP.eucJP/htdocs/support.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/support.sgml
rename to ja_JP.eucJP/htdocs/support.xml
diff --git a/ja_JP.eucJP/htdocs/support/Makefile b/ja_JP.eucJP/htdocs/support/Makefile
index c951b1aea3..6f72417274 100644
--- a/ja_JP.eucJP/htdocs/support/Makefile
+++ b/ja_JP.eucJP/htdocs/support/Makefile
@@ -8,6 +8,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/ja_JP.eucJP/htdocs/support/bugreports.sgml b/ja_JP.eucJP/htdocs/support/bugreports.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/support/bugreports.sgml
rename to ja_JP.eucJP/htdocs/support/bugreports.xml
diff --git a/ja_JP.eucJP/htdocs/support/webresources.sgml b/ja_JP.eucJP/htdocs/support/webresources.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/support/webresources.sgml
rename to ja_JP.eucJP/htdocs/support/webresources.xml
diff --git a/ja_JP.eucJP/htdocs/tutorials/Makefile b/ja_JP.eucJP/htdocs/tutorials/Makefile
index 98fbc74c3e..6f3419ede4 100644
--- a/ja_JP.eucJP/htdocs/tutorials/Makefile
+++ b/ja_JP.eucJP/htdocs/tutorials/Makefile
@@ -13,6 +13,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS = index.sgml
+DOCS = index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ja_JP.eucJP/htdocs/tutorials/index.sgml b/ja_JP.eucJP/htdocs/tutorials/index.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/tutorials/index.sgml
rename to ja_JP.eucJP/htdocs/tutorials/index.xml
diff --git a/ja_JP.eucJP/htdocs/where.sgml b/ja_JP.eucJP/htdocs/where.xml
similarity index 100%
rename from ja_JP.eucJP/htdocs/where.sgml
rename to ja_JP.eucJP/htdocs/where.xml
diff --git a/ja_JP.eucJP/share/sgml/authors.ent b/ja_JP.eucJP/share/sgml/authors.ent
index cfa89d9cec..3aa7fc4d0c 100644
--- a/ja_JP.eucJP/share/sgml/authors.ent
+++ b/ja_JP.eucJP/share/sgml/authors.ent
@@ -158,7 +158,7 @@
 
 <!--
 <!ENTITY a.jp.motoyuki "���� ��Ƿ <email>motoyuki@jp.FreeBSD.org</email>">
-authors.sgml �����äƤ���Τǥ����ȥ�����
+authors.xml �����äƤ���Τǥ����ȥ�����
 -->
 
 <!ENTITY a.jp.mrt "��餿���夦�������� <email>mrt@mickey.ai.kyutech.ac.jp</email>">
diff --git a/mn_MN.UTF-8/books/handbook/Makefile b/mn_MN.UTF-8/books/handbook/Makefile
index 456985c81c..782283b84b 100644
--- a/mn_MN.UTF-8/books/handbook/Makefile
+++ b/mn_MN.UTF-8/books/handbook/Makefile
@@ -19,7 +19,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
@@ -29,8 +29,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
 #
 # ------------------------------------------------------------------------
 
@@ -251,45 +251,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
@@ -297,12 +297,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 ${MASTERDOC}
 
 #
@@ -318,9 +318,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}
@@ -328,20 +328,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/mn_MN.UTF-8/books/handbook/advanced-networking/Makefile b/mn_MN.UTF-8/books/handbook/advanced-networking/Makefile
index aac7e46d5f..8b9d70056b 100644
--- a/mn_MN.UTF-8/books/handbook/advanced-networking/Makefile
+++ b/mn_MN.UTF-8/books/handbook/advanced-networking/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	advanced-networking/chapter.sgml
+CHAPTERS= 	advanced-networking/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.sgml b/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/advanced-networking/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/advanced-networking/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/audit/Makefile b/mn_MN.UTF-8/books/handbook/audit/Makefile
index b96a7cf76f..064bff484b 100644
--- a/mn_MN.UTF-8/books/handbook/audit/Makefile
+++ b/mn_MN.UTF-8/books/handbook/audit/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	audit/chapter.sgml
+CHAPTERS= 	audit/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/audit/chapter.sgml b/mn_MN.UTF-8/books/handbook/audit/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/audit/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/audit/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/basics/Makefile b/mn_MN.UTF-8/books/handbook/basics/Makefile
index 83e06610a5..91963fc5e8 100644
--- a/mn_MN.UTF-8/books/handbook/basics/Makefile
+++ b/mn_MN.UTF-8/books/handbook/basics/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	basics/chapter.sgml
+CHAPTERS= 	basics/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/basics/chapter.sgml b/mn_MN.UTF-8/books/handbook/basics/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/basics/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/basics/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/bibliography/Makefile b/mn_MN.UTF-8/books/handbook/bibliography/Makefile
index 7591443a3e..421ddbfb03 100644
--- a/mn_MN.UTF-8/books/handbook/bibliography/Makefile
+++ b/mn_MN.UTF-8/books/handbook/bibliography/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	bibliography/chapter.sgml
+CHAPTERS= 	bibliography/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/bibliography/chapter.sgml b/mn_MN.UTF-8/books/handbook/bibliography/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/bibliography/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/bibliography/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/book.sgml b/mn_MN.UTF-8/books/handbook/book.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/book.sgml
rename to mn_MN.UTF-8/books/handbook/book.xml
diff --git a/mn_MN.UTF-8/books/handbook/boot/Makefile b/mn_MN.UTF-8/books/handbook/boot/Makefile
index b745ddd92d..1771af0951 100644
--- a/mn_MN.UTF-8/books/handbook/boot/Makefile
+++ b/mn_MN.UTF-8/books/handbook/boot/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	boot/chapter.sgml
+CHAPTERS= 	boot/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/boot/chapter.sgml b/mn_MN.UTF-8/books/handbook/boot/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/boot/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/boot/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/bsdinstall/Makefile b/mn_MN.UTF-8/books/handbook/bsdinstall/Makefile
index 8241e72bcb..91a46e5296 100644
--- a/mn_MN.UTF-8/books/handbook/bsdinstall/Makefile
+++ b/mn_MN.UTF-8/books/handbook/bsdinstall/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	bsdinstall/chapter.sgml
+CHAPTERS= 	bsdinstall/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.sgml b/mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/bsdinstall/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/bsdinstall/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/chapters.ent b/mn_MN.UTF-8/books/handbook/chapters.ent
index fe6a5051ee..0956278d0e 100644
--- a/mn_MN.UTF-8/books/handbook/chapters.ent
+++ b/mn_MN.UTF-8/books/handbook/chapters.ent
@@ -10,7 +10,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.
 
@@ -59,143 +59,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/mn_MN.UTF-8/books/handbook/colophon.sgml b/mn_MN.UTF-8/books/handbook/colophon.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/colophon.sgml
rename to mn_MN.UTF-8/books/handbook/colophon.xml
diff --git a/mn_MN.UTF-8/books/handbook/config/Makefile b/mn_MN.UTF-8/books/handbook/config/Makefile
index 54a19fa91d..9055420889 100644
--- a/mn_MN.UTF-8/books/handbook/config/Makefile
+++ b/mn_MN.UTF-8/books/handbook/config/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	config/chapter.sgml
+CHAPTERS= 	config/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/config/chapter.sgml b/mn_MN.UTF-8/books/handbook/config/chapter.xml
similarity index 99%
rename from mn_MN.UTF-8/books/handbook/config/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/config/chapter.xml
index 8c0a3cfc71..90f93e66cd 100644
--- a/mn_MN.UTF-8/books/handbook/config/chapter.sgml
+++ b/mn_MN.UTF-8/books/handbook/config/chapter.xml
@@ -873,7 +873,7 @@ dc1: [ITHREAD]</screen>
 	  object буюу цөмийн ачаалж болох обьект)</primary></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>Харамсалтай нь өөрийн драйверуудад зориулсан схемүүдийг нээлттэй
 	эхийн хүрээнийхэнд өгдөггүй, тийм мэдээллийг худалдааны нууц гэж үздэг
diff --git a/mn_MN.UTF-8/books/handbook/cutting-edge/Makefile b/mn_MN.UTF-8/books/handbook/cutting-edge/Makefile
index 216e9ccb16..c6b25513b9 100644
--- a/mn_MN.UTF-8/books/handbook/cutting-edge/Makefile
+++ b/mn_MN.UTF-8/books/handbook/cutting-edge/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	cutting-edge/chapter.sgml
+CHAPTERS= 	cutting-edge/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.sgml b/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/cutting-edge/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/desktop/Makefile b/mn_MN.UTF-8/books/handbook/desktop/Makefile
index aa13669205..98da2932bf 100644
--- a/mn_MN.UTF-8/books/handbook/desktop/Makefile
+++ b/mn_MN.UTF-8/books/handbook/desktop/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	desktop/chapter.sgml
+CHAPTERS= 	desktop/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/desktop/chapter.sgml b/mn_MN.UTF-8/books/handbook/desktop/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/desktop/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/desktop/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/disks/Makefile b/mn_MN.UTF-8/books/handbook/disks/Makefile
index 376df2e958..2981727319 100644
--- a/mn_MN.UTF-8/books/handbook/disks/Makefile
+++ b/mn_MN.UTF-8/books/handbook/disks/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	disks/chapter.sgml
+CHAPTERS= 	disks/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/disks/chapter.sgml b/mn_MN.UTF-8/books/handbook/disks/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/disks/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/disks/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/dtrace/Makefile b/mn_MN.UTF-8/books/handbook/dtrace/Makefile
index 82ca1ca83c..403b24728d 100644
--- a/mn_MN.UTF-8/books/handbook/dtrace/Makefile
+++ b/mn_MN.UTF-8/books/handbook/dtrace/Makefile
@@ -7,7 +7,7 @@
 #
 # $FreeBSD$
 
-CHAPTERS= 	dtrace/chapter.sgml
+CHAPTERS= 	dtrace/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/dtrace/chapter.sgml b/mn_MN.UTF-8/books/handbook/dtrace/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/dtrace/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/dtrace/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/eresources/Makefile b/mn_MN.UTF-8/books/handbook/eresources/Makefile
index 2c15bbdd94..494edf9d72 100644
--- a/mn_MN.UTF-8/books/handbook/eresources/Makefile
+++ b/mn_MN.UTF-8/books/handbook/eresources/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	eresources/chapter.sgml
+CHAPTERS= 	eresources/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/eresources/chapter.sgml b/mn_MN.UTF-8/books/handbook/eresources/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/eresources/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/eresources/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/filesystems/Makefile b/mn_MN.UTF-8/books/handbook/filesystems/Makefile
index a7f6ab271a..3501611a61 100644
--- a/mn_MN.UTF-8/books/handbook/filesystems/Makefile
+++ b/mn_MN.UTF-8/books/handbook/filesystems/Makefile
@@ -6,7 +6,7 @@
 #
 # $FreeBSD$
 
-CHAPTERS= 	filesystems/chapter.sgml
+CHAPTERS= 	filesystems/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/filesystems/chapter.sgml b/mn_MN.UTF-8/books/handbook/filesystems/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/filesystems/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/filesystems/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/firewalls/Makefile b/mn_MN.UTF-8/books/handbook/firewalls/Makefile
index 1ec82c45e0..58620e28ff 100644
--- a/mn_MN.UTF-8/books/handbook/firewalls/Makefile
+++ b/mn_MN.UTF-8/books/handbook/firewalls/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	firewalls/chapter.sgml
+CHAPTERS= 	firewalls/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml b/mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/firewalls/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/geom/Makefile b/mn_MN.UTF-8/books/handbook/geom/Makefile
index bfeacb3662..58a0ccd5af 100644
--- a/mn_MN.UTF-8/books/handbook/geom/Makefile
+++ b/mn_MN.UTF-8/books/handbook/geom/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	geom/chapter.sgml
+CHAPTERS= 	geom/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/geom/chapter.sgml b/mn_MN.UTF-8/books/handbook/geom/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/geom/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/geom/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/install/Makefile b/mn_MN.UTF-8/books/handbook/install/Makefile
index 02ab45f2d7..01915592a9 100644
--- a/mn_MN.UTF-8/books/handbook/install/Makefile
+++ b/mn_MN.UTF-8/books/handbook/install/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	install/chapter.sgml
+CHAPTERS= 	install/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/install/chapter.sgml b/mn_MN.UTF-8/books/handbook/install/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/install/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/install/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/introduction/Makefile b/mn_MN.UTF-8/books/handbook/introduction/Makefile
index 2648160c5d..394c0cb2d8 100644
--- a/mn_MN.UTF-8/books/handbook/introduction/Makefile
+++ b/mn_MN.UTF-8/books/handbook/introduction/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	introduction/chapter.sgml
+CHAPTERS= 	introduction/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/introduction/chapter.sgml b/mn_MN.UTF-8/books/handbook/introduction/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/introduction/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/introduction/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/jails/chapter.sgml b/mn_MN.UTF-8/books/handbook/jails/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/jails/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/jails/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/kernelconfig/Makefile b/mn_MN.UTF-8/books/handbook/kernelconfig/Makefile
index ab32a0f8ae..2d66e2da05 100644
--- a/mn_MN.UTF-8/books/handbook/kernelconfig/Makefile
+++ b/mn_MN.UTF-8/books/handbook/kernelconfig/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	kernelconfig/chapter.sgml
+CHAPTERS= 	kernelconfig/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml b/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/kernelconfig/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/l10n/Makefile b/mn_MN.UTF-8/books/handbook/l10n/Makefile
index b7ab863a09..706e6b71bf 100644
--- a/mn_MN.UTF-8/books/handbook/l10n/Makefile
+++ b/mn_MN.UTF-8/books/handbook/l10n/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	l10n/chapter.sgml
+CHAPTERS= 	l10n/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/l10n/chapter.sgml b/mn_MN.UTF-8/books/handbook/l10n/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/l10n/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/l10n/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/linuxemu/Makefile b/mn_MN.UTF-8/books/handbook/linuxemu/Makefile
index ac57de5867..7b02657713 100644
--- a/mn_MN.UTF-8/books/handbook/linuxemu/Makefile
+++ b/mn_MN.UTF-8/books/handbook/linuxemu/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	linuxemu/chapter.sgml
+CHAPTERS= 	linuxemu/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/linuxemu/chapter.sgml b/mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/linuxemu/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/linuxemu/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/mac/Makefile b/mn_MN.UTF-8/books/handbook/mac/Makefile
index bebe29f8a8..4c8d76c674 100644
--- a/mn_MN.UTF-8/books/handbook/mac/Makefile
+++ b/mn_MN.UTF-8/books/handbook/mac/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	mac/chapter.sgml
+CHAPTERS= 	mac/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/mac/chapter.sgml b/mn_MN.UTF-8/books/handbook/mac/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/mac/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/mac/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/mail/Makefile b/mn_MN.UTF-8/books/handbook/mail/Makefile
index 452415be64..c5a808e6b2 100644
--- a/mn_MN.UTF-8/books/handbook/mail/Makefile
+++ b/mn_MN.UTF-8/books/handbook/mail/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	mail/chapter.sgml
+CHAPTERS= 	mail/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/mail/chapter.sgml b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/mail/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/mail/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/mirrors/Makefile b/mn_MN.UTF-8/books/handbook/mirrors/Makefile
index 6dda7a63e5..bf28b5e2e2 100644
--- a/mn_MN.UTF-8/books/handbook/mirrors/Makefile
+++ b/mn_MN.UTF-8/books/handbook/mirrors/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	mirrors/chapter.sgml
+CHAPTERS= 	mirrors/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml b/mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/mirrors/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/multimedia/Makefile b/mn_MN.UTF-8/books/handbook/multimedia/Makefile
index 3afa2e98ec..26246a2d22 100644
--- a/mn_MN.UTF-8/books/handbook/multimedia/Makefile
+++ b/mn_MN.UTF-8/books/handbook/multimedia/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	multimedia/chapter.sgml
+CHAPTERS= 	multimedia/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/multimedia/chapter.sgml b/mn_MN.UTF-8/books/handbook/multimedia/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/multimedia/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/multimedia/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/network-servers/Makefile b/mn_MN.UTF-8/books/handbook/network-servers/Makefile
index 217e8234d6..a67cee810e 100644
--- a/mn_MN.UTF-8/books/handbook/network-servers/Makefile
+++ b/mn_MN.UTF-8/books/handbook/network-servers/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	network-servers/chapter.sgml
+CHAPTERS= 	network-servers/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/network-servers/chapter.sgml b/mn_MN.UTF-8/books/handbook/network-servers/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/network-servers/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/network-servers/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/pgpkeys/Makefile b/mn_MN.UTF-8/books/handbook/pgpkeys/Makefile
index aeede75bcf..97952c3212 100644
--- a/mn_MN.UTF-8/books/handbook/pgpkeys/Makefile
+++ b/mn_MN.UTF-8/books/handbook/pgpkeys/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-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/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.sgml b/mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/pgpkeys/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/pgpkeys/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/ports/Makefile b/mn_MN.UTF-8/books/handbook/ports/Makefile
index 19378daba5..f80322b34d 100644
--- a/mn_MN.UTF-8/books/handbook/ports/Makefile
+++ b/mn_MN.UTF-8/books/handbook/ports/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	ports/chapter.sgml
+CHAPTERS= 	ports/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/ports/chapter.sgml b/mn_MN.UTF-8/books/handbook/ports/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/ports/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/ports/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/ppp-and-slip/Makefile b/mn_MN.UTF-8/books/handbook/ppp-and-slip/Makefile
index 1f866a105a..8541fe3140 100644
--- a/mn_MN.UTF-8/books/handbook/ppp-and-slip/Makefile
+++ b/mn_MN.UTF-8/books/handbook/ppp-and-slip/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	ppp-and-slip/chapter.sgml
+CHAPTERS= 	ppp-and-slip/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.sgml b/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/preface/preface.sgml b/mn_MN.UTF-8/books/handbook/preface/preface.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/preface/preface.sgml
rename to mn_MN.UTF-8/books/handbook/preface/preface.xml
diff --git a/mn_MN.UTF-8/books/handbook/printing/Makefile b/mn_MN.UTF-8/books/handbook/printing/Makefile
index 57aa8073bb..2070249381 100644
--- a/mn_MN.UTF-8/books/handbook/printing/Makefile
+++ b/mn_MN.UTF-8/books/handbook/printing/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	printing/chapter.sgml
+CHAPTERS= 	printing/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/printing/chapter.sgml b/mn_MN.UTF-8/books/handbook/printing/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/printing/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/printing/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/security/Makefile b/mn_MN.UTF-8/books/handbook/security/Makefile
index 038768527c..48d3ba48df 100644
--- a/mn_MN.UTF-8/books/handbook/security/Makefile
+++ b/mn_MN.UTF-8/books/handbook/security/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	security/chapter.sgml
+CHAPTERS= 	security/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/security/chapter.sgml b/mn_MN.UTF-8/books/handbook/security/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/security/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/security/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/serialcomms/Makefile b/mn_MN.UTF-8/books/handbook/serialcomms/Makefile
index 8cc7c9db56..dfa3d82e14 100644
--- a/mn_MN.UTF-8/books/handbook/serialcomms/Makefile
+++ b/mn_MN.UTF-8/books/handbook/serialcomms/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	serialcomms/chapter.sgml
+CHAPTERS= 	serialcomms/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.sgml b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/serialcomms/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/users/Makefile b/mn_MN.UTF-8/books/handbook/users/Makefile
index 6225f24702..95b6d0bd75 100644
--- a/mn_MN.UTF-8/books/handbook/users/Makefile
+++ b/mn_MN.UTF-8/books/handbook/users/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	users/chapter.sgml
+CHAPTERS= 	users/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/users/chapter.sgml b/mn_MN.UTF-8/books/handbook/users/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/users/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/users/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/vinum/Makefile b/mn_MN.UTF-8/books/handbook/vinum/Makefile
index 218a106b7e..e38212210b 100644
--- a/mn_MN.UTF-8/books/handbook/vinum/Makefile
+++ b/mn_MN.UTF-8/books/handbook/vinum/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	vinum/chapter.sgml
+CHAPTERS= 	vinum/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/vinum/chapter.sgml b/mn_MN.UTF-8/books/handbook/vinum/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/vinum/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/vinum/chapter.xml
diff --git a/mn_MN.UTF-8/books/handbook/virtualization/Makefile b/mn_MN.UTF-8/books/handbook/virtualization/Makefile
index 8dda046dd6..6beeba514b 100644
--- a/mn_MN.UTF-8/books/handbook/virtualization/Makefile
+++ b/mn_MN.UTF-8/books/handbook/virtualization/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	virtualization/chapter.sgml
+CHAPTERS= 	virtualization/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/virtualization/chapter.sgml b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
similarity index 99%
rename from mn_MN.UTF-8/books/handbook/virtualization/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
index 4a7ebef4ca..7d2cf465fd 100644
--- a/mn_MN.UTF-8/books/handbook/virtualization/chapter.sgml
+++ b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
@@ -1056,7 +1056,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/mn_MN.UTF-8/books/handbook/x11/Makefile b/mn_MN.UTF-8/books/handbook/x11/Makefile
index 6eb7840782..afd3db665c 100644
--- a/mn_MN.UTF-8/books/handbook/x11/Makefile
+++ b/mn_MN.UTF-8/books/handbook/x11/Makefile
@@ -7,7 +7,7 @@
 # Build the Handbook with just the content from this chapter.
 #
 
-CHAPTERS= 	x11/chapter.sgml
+CHAPTERS= 	x11/chapter.xml
 
 VPATH=		..
 
diff --git a/mn_MN.UTF-8/books/handbook/x11/chapter.sgml b/mn_MN.UTF-8/books/handbook/x11/chapter.xml
similarity index 100%
rename from mn_MN.UTF-8/books/handbook/x11/chapter.sgml
rename to mn_MN.UTF-8/books/handbook/x11/chapter.xml
diff --git a/nl_NL.ISO8859-1/articles/contributing-ports/Makefile b/nl_NL.ISO8859-1/articles/contributing-ports/Makefile
index c886dafff8..91ebe2a8e5 100644
--- a/nl_NL.ISO8859-1/articles/contributing-ports/Makefile
+++ b/nl_NL.ISO8859-1/articles/contributing-ports/Makefile
@@ -14,7 +14,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/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml b/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
similarity index 100%
rename from nl_NL.ISO8859-1/articles/contributing-ports/article.sgml
rename to nl_NL.ISO8859-1/articles/contributing-ports/article.xml
diff --git a/nl_NL.ISO8859-1/articles/contributing/Makefile b/nl_NL.ISO8859-1/articles/contributing/Makefile
index 15c4031102..ba7b27f404 100644
--- a/nl_NL.ISO8859-1/articles/contributing/Makefile
+++ b/nl_NL.ISO8859-1/articles/contributing/Makefile
@@ -14,7 +14,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/nl_NL.ISO8859-1/articles/contributing/article.sgml b/nl_NL.ISO8859-1/articles/contributing/article.xml
similarity index 100%
rename from nl_NL.ISO8859-1/articles/contributing/article.sgml
rename to nl_NL.ISO8859-1/articles/contributing/article.xml
diff --git a/nl_NL.ISO8859-1/articles/explaining-bsd/Makefile b/nl_NL.ISO8859-1/articles/explaining-bsd/Makefile
index 6bdd8314da..993a1b9350 100644
--- a/nl_NL.ISO8859-1/articles/explaining-bsd/Makefile
+++ b/nl_NL.ISO8859-1/articles/explaining-bsd/Makefile
@@ -14,7 +14,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/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml b/nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
similarity index 100%
rename from nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml
rename to nl_NL.ISO8859-1/articles/explaining-bsd/article.xml
diff --git a/nl_NL.ISO8859-1/articles/problem-reports/Makefile b/nl_NL.ISO8859-1/articles/problem-reports/Makefile
index 6f895f053b..392609bca4 100644
--- a/nl_NL.ISO8859-1/articles/problem-reports/Makefile
+++ b/nl_NL.ISO8859-1/articles/problem-reports/Makefile
@@ -14,7 +14,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/nl_NL.ISO8859-1/articles/problem-reports/article.sgml b/nl_NL.ISO8859-1/articles/problem-reports/article.xml
similarity index 100%
rename from nl_NL.ISO8859-1/articles/problem-reports/article.sgml
rename to nl_NL.ISO8859-1/articles/problem-reports/article.xml
diff --git a/nl_NL.ISO8859-1/articles/solid-state/Makefile b/nl_NL.ISO8859-1/articles/solid-state/Makefile
index 32546cefde..7cf8f2fb80 100644
--- a/nl_NL.ISO8859-1/articles/solid-state/Makefile
+++ b/nl_NL.ISO8859-1/articles/solid-state/Makefile
@@ -14,7 +14,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/nl_NL.ISO8859-1/articles/solid-state/article.sgml b/nl_NL.ISO8859-1/articles/solid-state/article.xml
similarity index 100%
rename from nl_NL.ISO8859-1/articles/solid-state/article.sgml
rename to nl_NL.ISO8859-1/articles/solid-state/article.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/Makefile b/nl_NL.ISO8859-1/books/handbook/Makefile
index 6345a5861b..ddb541be79 100644
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@@ -19,7 +19,7 @@
 #
 # Handboekspecifieke doelen
 #
-#       pgpkeyring      Dit doel leest de inhoud van pgpkeys/chapter.sgml
+#       pgpkeyring      Dit doel leest de inhoud van pgpkeys/chapter.xml
 #			en schrijft dan alle PGP sleutels naar stdout.
 #			De uitvoer kan omgeleid worden naar een bestand
 #			en verspreid worden als een publieke sleutelring
@@ -29,8 +29,8 @@
 # ------------------------------------------------------------------------
 # Om een nieuw hoofdstuk aan het Handboek toe te voegen:
 #
-# - Werk deze Makefile, chapters.ent en book.sgml bij
-# - Voeg een beschrijving voor het nieuwe hoofdstuk toe aan preface/preface.sgml
+# - Werk deze Makefile, chapters.ent en book.xml bij
+# - Voeg een beschrijving voor het nieuwe hoofdstuk toe aan preface/preface.xml
 #
 # ------------------------------------------------------------------------
 
@@ -251,45 +251,45 @@ IMAGES_LIB+= callouts/15.png
 #
 
 # SGML-inhoud
-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
 
 # Entiteiten
 SRCS+= chapters.ent
@@ -297,12 +297,12 @@ SRCS+= chapters.ent
 SYMLINKS=	${DESTDIR} index.html handbook.html
 
 # Neem alle hoofdstukken mee.
-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}
 
 #
@@ -318,9 +318,9 @@ DOC_PREFIX?=	${.CURDIR}/../../..
 #
 # regels die lijsten met mirrors vanuit de XML-database genereren.
 #
-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}
@@ -328,20 +328,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/nl_NL.ISO8859-1/books/handbook/advanced-networking/Makefile b/nl_NL.ISO8859-1/books/handbook/advanced-networking/Makefile
index 5f76a6ce11..e2ad20cd2d 100644
--- a/nl_NL.ISO8859-1/books/handbook/advanced-networking/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/advanced-networking/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	advanced-networking/chapter.sgml
+CHAPTERS= 	advanced-networking/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/audit/Makefile b/nl_NL.ISO8859-1/books/handbook/audit/Makefile
index c3d6236b80..c7849c4330 100644
--- a/nl_NL.ISO8859-1/books/handbook/audit/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/audit/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	audit/chapter.sgml
+CHAPTERS= 	audit/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/audit/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/audit/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/audit/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/audit/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/basics/Makefile b/nl_NL.ISO8859-1/books/handbook/basics/Makefile
index 8daa293c73..95a1005d12 100644
--- a/nl_NL.ISO8859-1/books/handbook/basics/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/basics/Makefile
@@ -6,7 +6,7 @@
 # %SOURCE%	en_US.ISO8859-1/books/handbook/basics/Makefile
 # %SRCID%	38826
 
-CHAPTERS= 	basics/chapter.sgml
+CHAPTERS= 	basics/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/bibliography/Makefile b/nl_NL.ISO8859-1/books/handbook/bibliography/Makefile
index 78faff7779..1447311e21 100644
--- a/nl_NL.ISO8859-1/books/handbook/bibliography/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/bibliography/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	bibliography/chapter.sgml
+CHAPTERS= 	bibliography/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/bibliography/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/bibliography/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/book.sgml b/nl_NL.ISO8859-1/books/handbook/book.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/book.sgml
rename to nl_NL.ISO8859-1/books/handbook/book.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/boot/Makefile b/nl_NL.ISO8859-1/books/handbook/boot/Makefile
index de23eded51..61432aec03 100644
--- a/nl_NL.ISO8859-1/books/handbook/boot/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/boot/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	boot/chapter.sgml
+CHAPTERS= 	boot/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/boot/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/boot/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/bsdinstall/Makefile b/nl_NL.ISO8859-1/books/handbook/bsdinstall/Makefile
index eeb143c01b..4158bca924 100644
--- a/nl_NL.ISO8859-1/books/handbook/bsdinstall/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/bsdinstall/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	bsdinstall/chapter.sgml
+CHAPTERS= 	bsdinstall/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/bsdinstall/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/bsdinstall/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/bsdinstall/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/chapters.ent b/nl_NL.ISO8859-1/books/handbook/chapters.ent
index c9ce0066fe..3706897718 100644
--- a/nl_NL.ISO8859-1/books/handbook/chapters.ent
+++ b/nl_NL.ISO8859-1/books/handbook/chapters.ent
@@ -3,7 +3,7 @@
      Maakt entiteiten aan voor elk hoofdstuk in het FreeBSD Handboek. Elke
      entiteit heet chap.foo, waarbij foo de waarde is van het id attribuut
      van dat hoofdstuk en overeenkomt met de naam van de directory waarin
-     het .sgml-bestand van dat hoofdstuk is opgeslagen.
+     het .xml-bestand van dat hoofdstuk is opgeslagen.
 
      Hoofdstukken dienen te worden genoemd in de volgorde waarin naar ze
      wordt verwezen.
@@ -57,143 +57,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;
 
 <!-- Deel een -->
 <![%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">
 ]]>
 
 <!-- Deel twee -->
 <![%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">
 ]]>
 
 <!-- Deel drie -->
 <![%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">
 ]]>
 
 <!-- Deel vier -->
 <![%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">
 ]]>
 
 <!-- Deel vijf (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/nl_NL.ISO8859-1/books/handbook/colophon.sgml b/nl_NL.ISO8859-1/books/handbook/colophon.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/colophon.sgml
rename to nl_NL.ISO8859-1/books/handbook/colophon.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/config/Makefile b/nl_NL.ISO8859-1/books/handbook/config/Makefile
index b2aee808a0..4ea86f911c 100644
--- a/nl_NL.ISO8859-1/books/handbook/config/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/config/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	config/chapter.sgml
+CHAPTERS= 	config/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/config/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/config/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/cutting-edge/Makefile b/nl_NL.ISO8859-1/books/handbook/cutting-edge/Makefile
index 47c7cfa48f..03f6780d04 100644
--- a/nl_NL.ISO8859-1/books/handbook/cutting-edge/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/cutting-edge/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	cutting-edge/chapter.sgml
+CHAPTERS= 	cutting-edge/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/desktop/Makefile b/nl_NL.ISO8859-1/books/handbook/desktop/Makefile
index d0c77096d3..a90e6a309a 100644
--- a/nl_NL.ISO8859-1/books/handbook/desktop/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/desktop/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	desktop/chapter.sgml
+CHAPTERS= 	desktop/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/disks/Makefile b/nl_NL.ISO8859-1/books/handbook/disks/Makefile
index 8b18591dc3..e5739b15e9 100644
--- a/nl_NL.ISO8859-1/books/handbook/disks/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/disks/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	disks/chapter.sgml
+CHAPTERS= 	disks/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/dtrace/Makefile b/nl_NL.ISO8859-1/books/handbook/dtrace/Makefile
index cd9e876dbf..1dc4c17da6 100644
--- a/nl_NL.ISO8859-1/books/handbook/dtrace/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/dtrace/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	dtrace/chapter.sgml
+CHAPTERS= 	dtrace/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/eresources/Makefile b/nl_NL.ISO8859-1/books/handbook/eresources/Makefile
index 19be293f60..616d80bcc7 100644
--- a/nl_NL.ISO8859-1/books/handbook/eresources/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/eresources/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	eresources/chapter.sgml
+CHAPTERS= 	eresources/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/filesystems/Makefile b/nl_NL.ISO8859-1/books/handbook/filesystems/Makefile
index 2282adff78..597c6cf767 100644
--- a/nl_NL.ISO8859-1/books/handbook/filesystems/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/filesystems/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	filesystems/chapter.sgml
+CHAPTERS= 	filesystems/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/firewalls/Makefile b/nl_NL.ISO8859-1/books/handbook/firewalls/Makefile
index 8325b46303..2ac3b5c099 100644
--- a/nl_NL.ISO8859-1/books/handbook/firewalls/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/firewalls/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	firewalls/chapter.sgml
+CHAPTERS= 	firewalls/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/geom/Makefile b/nl_NL.ISO8859-1/books/handbook/geom/Makefile
index ca84ca4551..4bf98c320d 100644
--- a/nl_NL.ISO8859-1/books/handbook/geom/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/geom/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	geom/chapter.sgml
+CHAPTERS= 	geom/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/install/Makefile b/nl_NL.ISO8859-1/books/handbook/install/Makefile
index 1917a9e4b4..8a6eebadcc 100644
--- a/nl_NL.ISO8859-1/books/handbook/install/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/install/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	install/chapter.sgml
+CHAPTERS= 	install/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/install/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/install/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/introduction/Makefile b/nl_NL.ISO8859-1/books/handbook/introduction/Makefile
index edccebb3ce..ec511c0190 100644
--- a/nl_NL.ISO8859-1/books/handbook/introduction/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/introduction/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	introduction/chapter.sgml
+CHAPTERS= 	introduction/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/jails/Makefile b/nl_NL.ISO8859-1/books/handbook/jails/Makefile
index 64a6ef8725..cf70fff0b1 100644
--- a/nl_NL.ISO8859-1/books/handbook/jails/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/jails/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	jails/chapter.sgml
+CHAPTERS= 	jails/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/kernelconfig/Makefile b/nl_NL.ISO8859-1/books/handbook/kernelconfig/Makefile
index ce1f4dc003..3bfe7475d6 100644
--- a/nl_NL.ISO8859-1/books/handbook/kernelconfig/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/kernelconfig/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	kernelconfig/chapter.sgml
+CHAPTERS= 	kernelconfig/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/l10n/Makefile b/nl_NL.ISO8859-1/books/handbook/l10n/Makefile
index 90c3aaeef6..41afbb342e 100644
--- a/nl_NL.ISO8859-1/books/handbook/l10n/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/l10n/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	l10n/chapter.sgml
+CHAPTERS= 	l10n/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/linuxemu/Makefile b/nl_NL.ISO8859-1/books/handbook/linuxemu/Makefile
index 0289a82020..0b034c1095 100644
--- a/nl_NL.ISO8859-1/books/handbook/linuxemu/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/linuxemu/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	linuxemu/chapter.sgml
+CHAPTERS= 	linuxemu/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/mac/Makefile b/nl_NL.ISO8859-1/books/handbook/mac/Makefile
index 9d05f7e73e..19128c4c77 100644
--- a/nl_NL.ISO8859-1/books/handbook/mac/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/mac/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	mac/chapter.sgml
+CHAPTERS= 	mac/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/mail/Makefile b/nl_NL.ISO8859-1/books/handbook/mail/Makefile
index cd7afc7031..c1f7e23e37 100644
--- a/nl_NL.ISO8859-1/books/handbook/mail/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/mail/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	mail/chapter.sgml
+CHAPTERS= 	mail/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/mail/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/mirrors/Makefile b/nl_NL.ISO8859-1/books/handbook/mirrors/Makefile
index eb5b0dfbed..2e58a7e733 100644
--- a/nl_NL.ISO8859-1/books/handbook/mirrors/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/mirrors/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	mirrors/chapter.sgml
+CHAPTERS= 	mirrors/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/multimedia/Makefile b/nl_NL.ISO8859-1/books/handbook/multimedia/Makefile
index 4d8fe29b4d..23a9b61e67 100644
--- a/nl_NL.ISO8859-1/books/handbook/multimedia/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/multimedia/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	multimedia/chapter.sgml
+CHAPTERS= 	multimedia/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/network-servers/Makefile b/nl_NL.ISO8859-1/books/handbook/network-servers/Makefile
index 9f341a4ea3..d7ada3d3de 100644
--- a/nl_NL.ISO8859-1/books/handbook/network-servers/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/network-servers/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	network-servers/chapter.sgml
+CHAPTERS= 	network-servers/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/pgpkeys/Makefile b/nl_NL.ISO8859-1/books/handbook/pgpkeys/Makefile
index 877db1a1da..1de6b4bf82 100644
--- a/nl_NL.ISO8859-1/books/handbook/pgpkeys/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/pgpkeys/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-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/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/ports/Makefile b/nl_NL.ISO8859-1/books/handbook/ports/Makefile
index caca172e4f..490a15284c 100644
--- a/nl_NL.ISO8859-1/books/handbook/ports/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/ports/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	ports/chapter.sgml
+CHAPTERS= 	ports/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/ports/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/ports/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/Makefile b/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/Makefile
index d5ff5db2f4..f86d158502 100644
--- a/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	ppp-and-slip/chapter.sgml
+CHAPTERS= 	ppp-and-slip/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml b/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/preface/preface.sgml
rename to nl_NL.ISO8859-1/books/handbook/preface/preface.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/printing/Makefile b/nl_NL.ISO8859-1/books/handbook/printing/Makefile
index 0976b69a02..85756c86d2 100644
--- a/nl_NL.ISO8859-1/books/handbook/printing/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/printing/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	printing/chapter.sgml
+CHAPTERS= 	printing/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/security/Makefile b/nl_NL.ISO8859-1/books/handbook/security/Makefile
index 53a2df137e..26944a0cc1 100644
--- a/nl_NL.ISO8859-1/books/handbook/security/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/security/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	security/chapter.sgml
+CHAPTERS= 	security/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/security/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/security/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/serialcomms/Makefile b/nl_NL.ISO8859-1/books/handbook/serialcomms/Makefile
index e5fda4cd6e..cfc95055e6 100644
--- a/nl_NL.ISO8859-1/books/handbook/serialcomms/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/serialcomms/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	serialcomms/chapter.sgml
+CHAPTERS= 	serialcomms/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/users/Makefile b/nl_NL.ISO8859-1/books/handbook/users/Makefile
index b4eddea07b..443069daa7 100644
--- a/nl_NL.ISO8859-1/books/handbook/users/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/users/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	users/chapter.sgml
+CHAPTERS= 	users/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/users/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/users/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/users/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/vinum/Makefile b/nl_NL.ISO8859-1/books/handbook/vinum/Makefile
index 0e3c95c0a9..0abf695265 100644
--- a/nl_NL.ISO8859-1/books/handbook/vinum/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/vinum/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	vinum/chapter.sgml
+CHAPTERS= 	vinum/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/vinum/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/vinum/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/virtualization/Makefile b/nl_NL.ISO8859-1/books/handbook/virtualization/Makefile
index 4f34f05f33..18ca30338b 100644
--- a/nl_NL.ISO8859-1/books/handbook/virtualization/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/virtualization/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	virtualization/chapter.sgml
+CHAPTERS= 	virtualization/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
diff --git a/nl_NL.ISO8859-1/books/handbook/x11/Makefile b/nl_NL.ISO8859-1/books/handbook/x11/Makefile
index ba9c283205..e2287408ee 100644
--- a/nl_NL.ISO8859-1/books/handbook/x11/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/x11/Makefile
@@ -7,7 +7,7 @@
 # %SRCID%	38826
 #
 
-CHAPTERS= 	x11/chapter.sgml
+CHAPTERS= 	x11/chapter.xml
 
 VPATH=		..
 
diff --git a/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
similarity index 100%
rename from nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml
rename to nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
diff --git a/nl_NL.ISO8859-1/htdocs/Makefile b/nl_NL.ISO8859-1/htdocs/Makefile
index 7c3f1d09d1..3fa404cefd 100644
--- a/nl_NL.ISO8859-1/htdocs/Makefile
+++ b/nl_NL.ISO8859-1/htdocs/Makefile
@@ -11,22 +11,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/nl_NL.ISO8859-1/htdocs/about.sgml b/nl_NL.ISO8859-1/htdocs/about.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/about.sgml
rename to nl_NL.ISO8859-1/htdocs/about.xml
diff --git a/nl_NL.ISO8859-1/htdocs/administration.sgml b/nl_NL.ISO8859-1/htdocs/administration.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/administration.sgml
rename to nl_NL.ISO8859-1/htdocs/administration.xml
diff --git a/nl_NL.ISO8859-1/htdocs/applications.sgml b/nl_NL.ISO8859-1/htdocs/applications.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/applications.sgml
rename to nl_NL.ISO8859-1/htdocs/applications.xml
diff --git a/nl_NL.ISO8859-1/htdocs/art.sgml b/nl_NL.ISO8859-1/htdocs/art.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/art.sgml
rename to nl_NL.ISO8859-1/htdocs/art.xml
diff --git a/nl_NL.ISO8859-1/htdocs/availability.sgml b/nl_NL.ISO8859-1/htdocs/availability.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/availability.sgml
rename to nl_NL.ISO8859-1/htdocs/availability.xml
diff --git a/nl_NL.ISO8859-1/htdocs/docs.sgml b/nl_NL.ISO8859-1/htdocs/docs.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/docs.sgml
rename to nl_NL.ISO8859-1/htdocs/docs.xml
diff --git a/nl_NL.ISO8859-1/htdocs/features.sgml b/nl_NL.ISO8859-1/htdocs/features.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/features.sgml
rename to nl_NL.ISO8859-1/htdocs/features.xml
diff --git a/nl_NL.ISO8859-1/htdocs/internet.sgml b/nl_NL.ISO8859-1/htdocs/internet.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/internet.sgml
rename to nl_NL.ISO8859-1/htdocs/internet.xml
diff --git a/nl_NL.ISO8859-1/htdocs/logo.sgml b/nl_NL.ISO8859-1/htdocs/logo.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/logo.sgml
rename to nl_NL.ISO8859-1/htdocs/logo.xml
diff --git a/nl_NL.ISO8859-1/htdocs/mailto.sgml b/nl_NL.ISO8859-1/htdocs/mailto.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/mailto.sgml
rename to nl_NL.ISO8859-1/htdocs/mailto.xml
diff --git a/nl_NL.ISO8859-1/htdocs/privacy.sgml b/nl_NL.ISO8859-1/htdocs/privacy.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/privacy.sgml
rename to nl_NL.ISO8859-1/htdocs/privacy.xml
diff --git a/nl_NL.ISO8859-1/htdocs/publish.sgml b/nl_NL.ISO8859-1/htdocs/publish.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/publish.sgml
rename to nl_NL.ISO8859-1/htdocs/publish.xml
diff --git a/nl_NL.ISO8859-1/htdocs/relnotes.sgml b/nl_NL.ISO8859-1/htdocs/relnotes.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/relnotes.sgml
rename to nl_NL.ISO8859-1/htdocs/relnotes.xml
diff --git a/nl_NL.ISO8859-1/htdocs/send-pr.sgml b/nl_NL.ISO8859-1/htdocs/send-pr.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/send-pr.sgml
rename to nl_NL.ISO8859-1/htdocs/send-pr.xml
diff --git a/nl_NL.ISO8859-1/htdocs/support.sgml b/nl_NL.ISO8859-1/htdocs/support.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/support.sgml
rename to nl_NL.ISO8859-1/htdocs/support.xml
diff --git a/nl_NL.ISO8859-1/htdocs/where.sgml b/nl_NL.ISO8859-1/htdocs/where.xml
similarity index 100%
rename from nl_NL.ISO8859-1/htdocs/where.sgml
rename to nl_NL.ISO8859-1/htdocs/where.xml
diff --git a/nl_NL.ISO8859-1/share/sgml/bibliography.sgml b/nl_NL.ISO8859-1/share/sgml/bibliography.xml
similarity index 100%
rename from nl_NL.ISO8859-1/share/sgml/bibliography.sgml
rename to nl_NL.ISO8859-1/share/sgml/bibliography.xml
diff --git a/nl_NL.ISO8859-1/share/sgml/trademarks.sgml b/nl_NL.ISO8859-1/share/sgml/trademarks.xml
similarity index 96%
rename from nl_NL.ISO8859-1/share/sgml/trademarks.sgml
rename to nl_NL.ISO8859-1/share/sgml/trademarks.xml
index 740e509493..a30460313e 100644
--- a/nl_NL.ISO8859-1/share/sgml/trademarks.sgml
+++ b/nl_NL.ISO8859-1/share/sgml/trademarks.xml
@@ -2,7 +2,7 @@
      Trademark Legend, as required by The Open Group, Sun, etc..
 
      $FreeBSD$
-     %SOURCE%	en_US.ISO8859-1/share/sgml/trademarks.sgml
+     %SOURCE%	en_US.ISO8859-1/share/sgml/trademarks.xml
      %SRCID%	38826
 -->
 
diff --git a/no_NO.ISO8859-1/books/handbook/basics/chapter.sgml b/no_NO.ISO8859-1/books/handbook/basics/chapter.xml
similarity index 100%
rename from no_NO.ISO8859-1/books/handbook/basics/chapter.sgml
rename to no_NO.ISO8859-1/books/handbook/basics/chapter.xml
diff --git a/no_NO.ISO8859-1/books/handbook/bibliography/chapter.sgml b/no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml
similarity index 100%
rename from no_NO.ISO8859-1/books/handbook/bibliography/chapter.sgml
rename to no_NO.ISO8859-1/books/handbook/bibliography/chapter.xml
diff --git a/no_NO.ISO8859-1/books/handbook/install/chapter.sgml b/no_NO.ISO8859-1/books/handbook/install/chapter.xml
similarity index 100%
rename from no_NO.ISO8859-1/books/handbook/install/chapter.sgml
rename to no_NO.ISO8859-1/books/handbook/install/chapter.xml
diff --git a/pl_PL.ISO8859-2/articles/filtering-bridges/Makefile b/pl_PL.ISO8859-2/articles/filtering-bridges/Makefile
index 886e21cc9d..1cc1eb84e1 100644
--- a/pl_PL.ISO8859-2/articles/filtering-bridges/Makefile
+++ b/pl_PL.ISO8859-2/articles/filtering-bridges/Makefile
@@ -7,7 +7,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/pl_PL.ISO8859-2/articles/filtering-bridges/article.sgml b/pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
similarity index 100%
rename from pl_PL.ISO8859-2/articles/filtering-bridges/article.sgml
rename to pl_PL.ISO8859-2/articles/filtering-bridges/article.xml
diff --git a/pl_PL.ISO8859-2/articles/new-users/Makefile b/pl_PL.ISO8859-2/articles/new-users/Makefile
index 886e21cc9d..1cc1eb84e1 100644
--- a/pl_PL.ISO8859-2/articles/new-users/Makefile
+++ b/pl_PL.ISO8859-2/articles/new-users/Makefile
@@ -7,7 +7,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/pl_PL.ISO8859-2/articles/new-users/article.sgml b/pl_PL.ISO8859-2/articles/new-users/article.xml
similarity index 100%
rename from pl_PL.ISO8859-2/articles/new-users/article.sgml
rename to pl_PL.ISO8859-2/articles/new-users/article.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/Makefile b/pl_PL.ISO8859-2/books/handbook/Makefile
index e0158899a0..9db1629e12 100644
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@@ -18,7 +18,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
@@ -154,40 +154,40 @@ IMAGES_LIB+= callouts/10.png
 #
 
 # SGML content
-SRCS+= audit/chapter.sgml
-SRCS+= book.sgml
-SRCS+= colophon.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+= geom/chapter.sgml
-SRCS+= install/chapter.sgml
-SRCS+= introduction/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+= x11/chapter.sgml
+SRCS+= audit/chapter.xml
+SRCS+= book.xml
+SRCS+= colophon.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+= geom/chapter.xml
+SRCS+= install/chapter.xml
+SRCS+= introduction/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+= x11/chapter.xml
 
 # Entities
 SRCS+= chapters.ent
@@ -195,12 +195,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 ${MASTERDOC}
 
 #
@@ -216,9 +216,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}
@@ -226,20 +226,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/pl_PL.ISO8859-2/books/handbook/advanced-networking/Makefile b/pl_PL.ISO8859-2/books/handbook/advanced-networking/Makefile
index eb62e4335c..9bb05ff8f3 100644
--- a/pl_PL.ISO8859-2/books/handbook/advanced-networking/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/advanced-networking/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	advanced-networking/chapter.sgml
+CHAPTERS= 	advanced-networking/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/audit/Makefile b/pl_PL.ISO8859-2/books/handbook/audit/Makefile
index 84cb9b04ee..0dd0e1e0c6 100644
--- a/pl_PL.ISO8859-2/books/handbook/audit/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/audit/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	audit/chapter.sgml
+CHAPTERS= 	audit/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/audit/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/audit/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/audit/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/basics/Makefile b/pl_PL.ISO8859-2/books/handbook/basics/Makefile
index fea6942368..7b701a90e0 100644
--- a/pl_PL.ISO8859-2/books/handbook/basics/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/basics/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	basics/chapter.sgml
+CHAPTERS= 	basics/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/basics/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/basics/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/basics/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/bibliography/Makefile b/pl_PL.ISO8859-2/books/handbook/bibliography/Makefile
index f926466a22..539b10a12f 100644
--- a/pl_PL.ISO8859-2/books/handbook/bibliography/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/bibliography/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	bibliography/chapter.sgml
+CHAPTERS= 	bibliography/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/bibliography/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/bibliography/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/book.sgml b/pl_PL.ISO8859-2/books/handbook/book.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/book.sgml
rename to pl_PL.ISO8859-2/books/handbook/book.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/boot/Makefile b/pl_PL.ISO8859-2/books/handbook/boot/Makefile
index 92105efc40..3786930d1c 100644
--- a/pl_PL.ISO8859-2/books/handbook/boot/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/boot/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	boot/chapter.sgml
+CHAPTERS= 	boot/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/boot/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/boot/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/boot/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/chapters.ent b/pl_PL.ISO8859-2/books/handbook/chapters.ent
index 4542f66d47..9740b42942 100644
--- a/pl_PL.ISO8859-2/books/handbook/chapters.ent
+++ b/pl_PL.ISO8859-2/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,137 +53,137 @@
 <!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.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.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/pl_PL.ISO8859-2/books/handbook/colophon.sgml b/pl_PL.ISO8859-2/books/handbook/colophon.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/colophon.sgml
rename to pl_PL.ISO8859-2/books/handbook/colophon.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/config/Makefile b/pl_PL.ISO8859-2/books/handbook/config/Makefile
index 40c8e11572..0167936e03 100644
--- a/pl_PL.ISO8859-2/books/handbook/config/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/config/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	config/chapter.sgml
+CHAPTERS= 	config/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/config/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/config/chapter.xml
similarity index 99%
rename from pl_PL.ISO8859-2/books/handbook/config/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/config/chapter.xml
index 660bb4e60d..282b0899c3 100644
--- a/pl_PL.ISO8859-2/books/handbook/config/chapter.sgml
+++ b/pl_PL.ISO8859-2/books/handbook/config/chapter.xml
@@ -923,7 +923,7 @@ ukphy1:  10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto</screen>
 	  object)</primary></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/pl_PL.ISO8859-2/books/handbook/cutting-edge/Makefile b/pl_PL.ISO8859-2/books/handbook/cutting-edge/Makefile
index 29da7845dd..91cfee8044 100644
--- a/pl_PL.ISO8859-2/books/handbook/cutting-edge/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/cutting-edge/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	cutting-edge/chapter.sgml
+CHAPTERS= 	cutting-edge/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/desktop/Makefile b/pl_PL.ISO8859-2/books/handbook/desktop/Makefile
index 6dd222f080..e8ccd090f7 100644
--- a/pl_PL.ISO8859-2/books/handbook/desktop/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/desktop/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	desktop/chapter.sgml
+CHAPTERS= 	desktop/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/desktop/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/desktop/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/disks/Makefile b/pl_PL.ISO8859-2/books/handbook/disks/Makefile
index 140975c79e..f685035ccc 100644
--- a/pl_PL.ISO8859-2/books/handbook/disks/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/disks/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	disks/chapter.sgml
+CHAPTERS= 	disks/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/disks/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/disks/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/disks/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/eresources/Makefile b/pl_PL.ISO8859-2/books/handbook/eresources/Makefile
index cb030a0162..ecd3e9cff0 100644
--- a/pl_PL.ISO8859-2/books/handbook/eresources/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/eresources/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	eresources/chapter.sgml
+CHAPTERS= 	eresources/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/eresources/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/eresources/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/eresources/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/firewalls/Makefile b/pl_PL.ISO8859-2/books/handbook/firewalls/Makefile
index 331f5bf8ec..9320a51f68 100644
--- a/pl_PL.ISO8859-2/books/handbook/firewalls/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/firewalls/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	firewalls/chapter.sgml
+CHAPTERS= 	firewalls/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/firewalls/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/firewalls/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/geom/Makefile b/pl_PL.ISO8859-2/books/handbook/geom/Makefile
index 59e5759cdc..f574c00011 100644
--- a/pl_PL.ISO8859-2/books/handbook/geom/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/geom/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	geom/chapter.sgml
+CHAPTERS= 	geom/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/geom/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/geom/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/geom/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/install/Makefile b/pl_PL.ISO8859-2/books/handbook/install/Makefile
index 738cdb647d..9ca79617b2 100644
--- a/pl_PL.ISO8859-2/books/handbook/install/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/install/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	install/chapter.sgml
+CHAPTERS= 	install/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/install/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/install/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/install/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/introduction/Makefile b/pl_PL.ISO8859-2/books/handbook/introduction/Makefile
index 4c22f7ce8a..db1a5173b2 100644
--- a/pl_PL.ISO8859-2/books/handbook/introduction/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/introduction/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	introduction/chapter.sgml
+CHAPTERS= 	introduction/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/introduction/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/introduction/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/introduction/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/kernelconfig/Makefile b/pl_PL.ISO8859-2/books/handbook/kernelconfig/Makefile
index 95839d340a..e2c2e5cdf0 100644
--- a/pl_PL.ISO8859-2/books/handbook/kernelconfig/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/kernelconfig/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	kernelconfig/chapter.sgml
+CHAPTERS= 	kernelconfig/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/l10n/Makefile b/pl_PL.ISO8859-2/books/handbook/l10n/Makefile
index c6741a2341..45d3429ab1 100644
--- a/pl_PL.ISO8859-2/books/handbook/l10n/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/l10n/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	l10n/chapter.sgml
+CHAPTERS= 	l10n/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/l10n/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/l10n/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/l10n/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/linuxemu/Makefile b/pl_PL.ISO8859-2/books/handbook/linuxemu/Makefile
index 37adfa9af6..a477216e72 100644
--- a/pl_PL.ISO8859-2/books/handbook/linuxemu/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/linuxemu/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	linuxemu/chapter.sgml
+CHAPTERS= 	linuxemu/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/mac/Makefile b/pl_PL.ISO8859-2/books/handbook/mac/Makefile
index 74aca4172f..ecd40cd7e2 100644
--- a/pl_PL.ISO8859-2/books/handbook/mac/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/mac/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mac/chapter.sgml
+CHAPTERS= 	mac/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/mac/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/mac/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/mac/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/mac/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/mail/Makefile b/pl_PL.ISO8859-2/books/handbook/mail/Makefile
index 538dff091f..6138758090 100644
--- a/pl_PL.ISO8859-2/books/handbook/mail/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/mail/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mail/chapter.sgml
+CHAPTERS= 	mail/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/mail/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/mail/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/mirrors/Makefile b/pl_PL.ISO8859-2/books/handbook/mirrors/Makefile
index ad5c0e2abe..9197ba315d 100644
--- a/pl_PL.ISO8859-2/books/handbook/mirrors/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/mirrors/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mirrors/chapter.sgml
+CHAPTERS= 	mirrors/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/mirrors/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/mirrors/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/multimedia/Makefile b/pl_PL.ISO8859-2/books/handbook/multimedia/Makefile
index f90e1cd2b0..d645e14d83 100644
--- a/pl_PL.ISO8859-2/books/handbook/multimedia/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/multimedia/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	multimedia/chapter.sgml
+CHAPTERS= 	multimedia/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/multimedia/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/multimedia/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/network-servers/Makefile b/pl_PL.ISO8859-2/books/handbook/network-servers/Makefile
index 150dbe3121..8f39ebad57 100644
--- a/pl_PL.ISO8859-2/books/handbook/network-servers/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/network-servers/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	network-servers/chapter.sgml
+CHAPTERS= 	network-servers/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/network-servers/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/network-servers/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/pgpkeys/Makefile b/pl_PL.ISO8859-2/books/handbook/pgpkeys/Makefile
index 7c61203aff..caba57d9a4 100644
--- a/pl_PL.ISO8859-2/books/handbook/pgpkeys/Makefile
+++ b/pl_PL.ISO8859-2/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/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/ports/Makefile b/pl_PL.ISO8859-2/books/handbook/ports/Makefile
index 93280bcae8..f5ebfe0a14 100644
--- a/pl_PL.ISO8859-2/books/handbook/ports/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/ports/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	ports/chapter.sgml
+CHAPTERS= 	ports/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/ports/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/ports/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/ports/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/Makefile b/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/Makefile
index 1a44fcbd0c..4026603f90 100644
--- a/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/Makefile
+++ b/pl_PL.ISO8859-2/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/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/preface/preface.sgml b/pl_PL.ISO8859-2/books/handbook/preface/preface.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/preface/preface.sgml
rename to pl_PL.ISO8859-2/books/handbook/preface/preface.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/printing/Makefile b/pl_PL.ISO8859-2/books/handbook/printing/Makefile
index 72d9e9b80a..cbf5a174cc 100644
--- a/pl_PL.ISO8859-2/books/handbook/printing/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/printing/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	printing/chapter.sgml
+CHAPTERS= 	printing/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/printing/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/printing/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/printing/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/printing/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/security/Makefile b/pl_PL.ISO8859-2/books/handbook/security/Makefile
index bbf01aa7ab..3524819d48 100644
--- a/pl_PL.ISO8859-2/books/handbook/security/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/security/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	security/chapter.sgml
+CHAPTERS= 	security/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/security/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/security/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/security/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/security/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/serialcomms/Makefile b/pl_PL.ISO8859-2/books/handbook/serialcomms/Makefile
index b83d9a27bb..3dbd97ce6d 100644
--- a/pl_PL.ISO8859-2/books/handbook/serialcomms/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/serialcomms/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	serialcomms/chapter.sgml
+CHAPTERS= 	serialcomms/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/users/Makefile b/pl_PL.ISO8859-2/books/handbook/users/Makefile
index dfa2918b7b..b44bd80628 100644
--- a/pl_PL.ISO8859-2/books/handbook/users/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/users/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	users/chapter.sgml
+CHAPTERS= 	users/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/users/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/users/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/users/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/users/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/vinum/Makefile b/pl_PL.ISO8859-2/books/handbook/vinum/Makefile
index eca585a9aa..b970524581 100644
--- a/pl_PL.ISO8859-2/books/handbook/vinum/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/vinum/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	vinum/chapter.sgml
+CHAPTERS= 	vinum/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/vinum/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/vinum/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/vinum/chapter.xml
diff --git a/pl_PL.ISO8859-2/books/handbook/x11/Makefile b/pl_PL.ISO8859-2/books/handbook/x11/Makefile
index 06b452cd33..040a7ae2b2 100644
--- a/pl_PL.ISO8859-2/books/handbook/x11/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/x11/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	x11/chapter.sgml
+CHAPTERS= 	x11/chapter.xml
 
 VPATH=		..
 
diff --git a/pl_PL.ISO8859-2/books/handbook/x11/chapter.sgml b/pl_PL.ISO8859-2/books/handbook/x11/chapter.xml
similarity index 100%
rename from pl_PL.ISO8859-2/books/handbook/x11/chapter.sgml
rename to pl_PL.ISO8859-2/books/handbook/x11/chapter.xml
diff --git a/pt_BR.ISO8859-1/articles/building-products/article.sgml b/pt_BR.ISO8859-1/articles/building-products/article.xml
similarity index 100%
rename from pt_BR.ISO8859-1/articles/building-products/article.sgml
rename to pt_BR.ISO8859-1/articles/building-products/article.xml
diff --git a/pt_BR.ISO8859-1/articles/contributing-ports/Makefile b/pt_BR.ISO8859-1/articles/contributing-ports/Makefile
index 2e619ed49c..0186861363 100644
--- a/pt_BR.ISO8859-1/articles/contributing-ports/Makefile
+++ b/pt_BR.ISO8859-1/articles/contributing-ports/Makefile
@@ -16,7 +16,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/pt_BR.ISO8859-1/articles/contributing-ports/article.sgml b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
similarity index 100%
rename from pt_BR.ISO8859-1/articles/contributing-ports/article.sgml
rename to pt_BR.ISO8859-1/articles/contributing-ports/article.xml
diff --git a/pt_BR.ISO8859-1/articles/contributing/Makefile b/pt_BR.ISO8859-1/articles/contributing/Makefile
index 711016a9bd..005f4ad0c1 100644
--- a/pt_BR.ISO8859-1/articles/contributing/Makefile
+++ b/pt_BR.ISO8859-1/articles/contributing/Makefile
@@ -15,7 +15,7 @@ INSTALL_ONLY_COMPRESSED?=
 
 WITH_ARTICLE_TOC?=YES
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/pt_BR.ISO8859-1/articles/contributing/article.sgml b/pt_BR.ISO8859-1/articles/contributing/article.xml
similarity index 100%
rename from pt_BR.ISO8859-1/articles/contributing/article.sgml
rename to pt_BR.ISO8859-1/articles/contributing/article.xml
diff --git a/pt_BR.ISO8859-1/articles/explaining-bsd/Makefile b/pt_BR.ISO8859-1/articles/explaining-bsd/Makefile
index cee66a9543..da91a17eb4 100644
--- a/pt_BR.ISO8859-1/articles/explaining-bsd/Makefile
+++ b/pt_BR.ISO8859-1/articles/explaining-bsd/Makefile
@@ -18,7 +18,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/pt_BR.ISO8859-1/articles/explaining-bsd/article.sgml b/pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
similarity index 100%
rename from pt_BR.ISO8859-1/articles/explaining-bsd/article.sgml
rename to pt_BR.ISO8859-1/articles/explaining-bsd/article.xml
diff --git a/pt_BR.ISO8859-1/articles/freebsd-questions/Makefile b/pt_BR.ISO8859-1/articles/freebsd-questions/Makefile
index c30215815e..6fdd61788a 100644
--- a/pt_BR.ISO8859-1/articles/freebsd-questions/Makefile
+++ b/pt_BR.ISO8859-1/articles/freebsd-questions/Makefile
@@ -18,7 +18,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/pt_BR.ISO8859-1/articles/freebsd-questions/article.sgml b/pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
similarity index 100%
rename from pt_BR.ISO8859-1/articles/freebsd-questions/article.sgml
rename to pt_BR.ISO8859-1/articles/freebsd-questions/article.xml
diff --git a/pt_BR.ISO8859-1/articles/freebsd-update-server/article.sgml b/pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
similarity index 100%
rename from pt_BR.ISO8859-1/articles/freebsd-update-server/article.sgml
rename to pt_BR.ISO8859-1/articles/freebsd-update-server/article.xml
diff --git a/pt_BR.ISO8859-1/articles/hubs/Makefile b/pt_BR.ISO8859-1/articles/hubs/Makefile
index 5cd9597f55..34b23031b0 100644
--- a/pt_BR.ISO8859-1/articles/hubs/Makefile
+++ b/pt_BR.ISO8859-1/articles/hubs/Makefile
@@ -16,7 +16,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/pt_BR.ISO8859-1/articles/hubs/article.sgml b/pt_BR.ISO8859-1/articles/hubs/article.xml
similarity index 100%
rename from pt_BR.ISO8859-1/articles/hubs/article.sgml
rename to pt_BR.ISO8859-1/articles/hubs/article.xml
diff --git a/pt_BR.ISO8859-1/articles/linux-users/Makefile b/pt_BR.ISO8859-1/articles/linux-users/Makefile
index e7b9b23ca7..b34d3c7424 100644
--- a/pt_BR.ISO8859-1/articles/linux-users/Makefile
+++ b/pt_BR.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/pt_BR.ISO8859-1/articles/linux-users/article.sgml b/pt_BR.ISO8859-1/articles/linux-users/article.xml
similarity index 100%
rename from pt_BR.ISO8859-1/articles/linux-users/article.sgml
rename to pt_BR.ISO8859-1/articles/linux-users/article.xml
diff --git a/pt_BR.ISO8859-1/articles/new-users/Makefile b/pt_BR.ISO8859-1/articles/new-users/Makefile
index ac8c11d6d4..61096a904e 100644
--- a/pt_BR.ISO8859-1/articles/new-users/Makefile
+++ b/pt_BR.ISO8859-1/articles/new-users/Makefile
@@ -16,7 +16,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/pt_BR.ISO8859-1/articles/new-users/article.sgml b/pt_BR.ISO8859-1/articles/new-users/article.xml
similarity index 100%
rename from pt_BR.ISO8859-1/articles/new-users/article.sgml
rename to pt_BR.ISO8859-1/articles/new-users/article.xml
diff --git a/pt_BR.ISO8859-1/articles/problem-reports/Makefile b/pt_BR.ISO8859-1/articles/problem-reports/Makefile
index a63b4aca1a..9fd22973d8 100644
--- a/pt_BR.ISO8859-1/articles/problem-reports/Makefile
+++ b/pt_BR.ISO8859-1/articles/problem-reports/Makefile
@@ -16,7 +16,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/pt_BR.ISO8859-1/articles/problem-reports/article.sgml b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
similarity index 100%
rename from pt_BR.ISO8859-1/articles/problem-reports/article.sgml
rename to pt_BR.ISO8859-1/articles/problem-reports/article.xml
diff --git a/pt_BR.ISO8859-1/books/faq/Makefile b/pt_BR.ISO8859-1/books/faq/Makefile
index 2a168b9e91..519a6a583c 100644
--- a/pt_BR.ISO8859-1/books/faq/Makefile
+++ b/pt_BR.ISO8859-1/books/faq/Makefile
@@ -26,7 +26,7 @@ WITH_BIBLIOXREF_TITLE?=YES
 #
 
 # SGML content
-SRCS= book.sgml
+SRCS= book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/pt_BR.ISO8859-1/books/faq/book.sgml b/pt_BR.ISO8859-1/books/faq/book.xml
similarity index 99%
rename from pt_BR.ISO8859-1/books/faq/book.sgml
rename to pt_BR.ISO8859-1/books/faq/book.xml
index 992e196d42..bcc45bbd14 100644
--- a/pt_BR.ISO8859-1/books/faq/book.sgml
+++ b/pt_BR.ISO8859-1/books/faq/book.xml
@@ -3,7 +3,7 @@
 	"../../../share/sgml/freebsd42.dtd" [
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//PT" "../../share/sgml/entities.ent">
 %entities;
-<!ENTITY bibliography SYSTEM "../../share/sgml/bibliography.sgml">
+<!ENTITY bibliography SYSTEM "../../share/sgml/bibliography.xml">
 ]>
 
 <!--
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/Makefile b/pt_BR.ISO8859-1/books/fdp-primer/Makefile
index 1732ad0096..714803341b 100755
--- a/pt_BR.ISO8859-1/books/fdp-primer/Makefile
+++ b/pt_BR.ISO8859-1/books/fdp-primer/Makefile
@@ -22,21 +22,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=  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.sgml
+SRCS+= examples/appendix.xml
 
 # Images from the cross-document image library
 IMAGES_LIB=	callouts/1.png
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/book.sgml b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
similarity index 99%
rename from pt_BR.ISO8859-1/books/fdp-primer/book.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/book.xml
index 3d3cdbe60b..ccfb0187d7 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/book.sgml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
@@ -273,8 +273,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/pt_BR.ISO8859-1/books/fdp-primer/chapters.ent b/pt_BR.ISO8859-1/books/fdp-primer/chapters.ent
index fd6fd5cec4..3dc72223c0 100755
--- a/pt_BR.ISO8859-1/books/fdp-primer/chapters.ent
+++ b/pt_BR.ISO8859-1/books/fdp-primer/chapters.ent
@@ -9,17 +9,17 @@
 
 -->
 
-<!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/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
similarity index 99%
rename from pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
index 85fa1b8065..cd66467abc 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
@@ -251,7 +251,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
@@ -265,7 +265,7 @@ DOC_PREFIX?= ${.CURDIR}/../../..
 	mant�-lo.</para>
 
       <para><makevar>DOC</makevar> � o nome (sem a 
-	extens�o <filename>.sgml</filename>) do principal 
+	extens�o <filename>.xml</filename>) do principal 
 	documento criado por este diret�rio.  A vari�vel
 	<makevar>SRCS</makevar> lista todos os arquivos individuais 
 	que comp�em o documento.  Ela tamb�m deve 
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.sgml b/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
similarity index 98%
rename from pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
index e223134850..5e96afc1c5 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.sgml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/examples/appendix.xml
@@ -190,7 +190,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">
@@ -246,7 +246,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">
@@ -306,7 +306,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/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
similarity index 99%
rename from pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
index 7c80ede6ce..b97ed64711 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.sgml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/overview/chapter.xml
@@ -286,7 +286,7 @@
       </step>
 
       <step>
-	<para>Edite os arquivos <filename>.sgml</filename> 
+	<para>Edite os arquivos <filename>.xml</filename> 
           utilizando o editor da sua prefer�ncia.</para>
       </step>
 
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
similarity index 99%
rename from pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
index 23df6017bc..93a6a92480 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.xml
@@ -46,7 +46,7 @@
     um pacote muito �til chamado PSGML (ele pode ser instalado
     pelo <filename role="package">editors/psgml</filename>).  Ele 
     � automaticamente invocado quando um arquivo com a
-    extens�o <filename>.sgml</filename> � carregado, ou
+    extens�o <filename>.xml</filename> � carregado, ou
     executando <command>M-x sgml-mode</command>, ele � a
     modalidade principal para tratar dos elementos e dos atributos de
     um arquivo SGML.</para>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/see-also/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
similarity index 99%
rename from pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
index 4533ebdd21..92a93e19c6 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.xml
@@ -2048,7 +2048,7 @@ para a arquitetura Intel.</para>]]></programlisting>
 	
 	  <programlisting><![ RCDATA [<para>O fonte SGML do Handbook em Ingl�s pode ser encotrado em 
   <filename class="directory">/usr/doc/en_US.ISO8859-1/books/handbook/</filename>.  
-  O primeiro arquivo neste diret�rio � chamado <filename>book.sgml</filename>. 
+  O primeiro arquivo neste diret�rio � chamado <filename>book.xml</filename>. 
   Voc� tamb�m deve ver o <filename>Makefile</filename> 
   e alguns arquivos com a extens�o <filename>.ent</filename>.</para>]]></programlisting>
 
@@ -2057,7 +2057,7 @@ para a arquitetura Intel.</para>]]></programlisting>
 	  <para>O fonte SGML do Handbook em Ingl�s pode ser 
 	    encotrado em <filename>/usr/doc/en/handbook/</filename>.
 	    O primeiro arquivo neste diret�rio � 
-	    chamado <filename>handbook.sgml</filename>.  Voc� 
+	    chamado <filename>handbook.xml</filename>.  Voc� 
 	    tamb�m deve ver o <filename>Makefile</filename> 
 	    e alguns arquivos com a extens�o 
 	    <filename>.ent</filename>.</para>
@@ -2767,9 +2767,9 @@ IMAGES+= fig3.png
 	<para>Suponha que voc� tenha um livro com tr�s
 	  cap�tulos, e os cap�tulos est�o 
 	  armazenados cada um no seu pr�prio diret�rio,
-	  chamados <filename>chapter1/chapter.sgml</filename>,
-	  <filename>chapter2/chapter.sgml</filename>, e
-	  <filename>chapter3/chapter.sgml</filename>.  Se cada 
+	  chamados <filename>chapter1/chapter.xml</filename>,
+	  <filename>chapter2/chapter.xml</filename>, e
+	  <filename>chapter3/chapter.xml</filename>.  Se cada 
 	  cap�tulo tiver imagens associadas a eles, � 
 	  sugerido que voc� as coloque dentro do respectivo 
 	  subdiret�rio de cada cap�tulo 
@@ -2786,7 +2786,7 @@ IMAGES+= fig3.png
 
 	<para>Por exemplo, se voc� tiver
 	  <filename>chapter1/fig1.png</filename>, ent�o
-	  <filename>chapter1/chapter.sgml</filename> deve 
+	  <filename>chapter1/chapter.xml</filename> deve 
 	  conter:</para>  	
 
 	<programlisting>&lt;mediaobject>
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
similarity index 96%
rename from pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
index b9eb895046..bc2280e9ed 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.xml
@@ -501,7 +501,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATA
 
       <procedure>
 	<step>
-	  <para>Crie o arquivo <filename>example.sgml</filename>, e 
+	  <para>Crie o arquivo <filename>example.xml</filename>, e 
 	    entre com o seguinte texto:</para>
 
 	  <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -546,7 +546,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATA
 	  <para>Utilize o <command>onsgmls</command> para verificar 
 	    se o seu documento � v�lido:</para>
 
-          <screen>&prompt.user; <userinput>onsgmls -s example.sgml</userinput></screen>
+          <screen>&prompt.user; <userinput>onsgmls -s example.xml</userinput></screen>
 
 	  <para>Como voc� ir� ver, o 
 	    <command>onsgmls</command> ir� executar sem 
@@ -560,9 +560,9 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATA
 	    tags <sgmltag>title</sgmltag> e <sgmltag>/title</sgmltag>
 	    , e execute novamente a valida��o.</para>
 
-          <screen>&prompt.user; <userinput>onsgmls -s example.sgml</userinput>
-onsgmls:example.sgml:5:4:E: character data is not allowed here
-onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
+          <screen>&prompt.user; <userinput>onsgmls -s example.xml</userinput>
+onsgmls:example.xml:5:4:E: character data is not allowed here
+onsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
 	  <para>As mensagens de erro emitidas pelo 
 	    <command>onsgmls</command> s�o organizadas em 
@@ -1093,14 +1093,14 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <procedure>
 	<step>
 	  <para>Adicione alguns coment�rios ao arquivo
-	  <filename>example.sgml</filename> e verifique se ele 
+	  <filename>example.xml</filename> e verifique se ele 
 	  continua v�lido usando o <command>onsgmls</command>.
 	  </para>
 	</step>
 
 	<step>
 	  <para>Adicione alguns coment�rios inv�lidos ao
-	    <filename>example.sgml</filename> e veja as mensagens de 
+	    <filename>example.xml</filename> e veja as mensagens de 
 	    erro que o <command>onsgmls</command> emite quando 
 	    encontra um coment�rio inv�lido.</para>
 	</step>
@@ -1247,7 +1247,7 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <procedure>
 	<step>
 	  <para>Adicione uma entidade geral ao 
-	    <filename>example.sgml</filename>.</para>
+	    <filename>example.xml</filename>.</para>
 
 	  <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY version "1.1">
@@ -1278,7 +1278,7 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	</step>
 
 	<step>
-	  <para>Carregue o arquivo <filename>example.sgml</filename>
+	  <para>Carregue o arquivo <filename>example.xml</filename>
 	    no seu navegador web (Voc� pode precisar 
 	    copi�-lo para <filename>example.html</filename> 
 	    antes que o seu navegador possa reconhec�-lo como 
@@ -1311,7 +1311,7 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  <para>Voc� pode utilizar o <command>osgmlnorm
 	    </command> para fazer isto:</para>
 
-          <screen>&prompt.user; <userinput>osgmlnorm example.sgml &gt; example.html</userinput></screen>
+          <screen>&prompt.user; <userinput>osgmlnorm example.xml &gt; example.html</userinput></screen>
 
 	  <para>Voc� deve encontrar uma c�pia 
 	    normalizada (isto �, entidades referenciadas 
@@ -1327,7 +1327,7 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	    inicio.  Para inclu�-la voc� precisa 
 	    utilizar a op��o <option>-d</option>:</para>
 	
-          <screen>&prompt.user; <userinput>osgmlnorm -d example.sgml &gt; example.html</userinput></screen>
+          <screen>&prompt.user; <userinput>osgmlnorm -d example.xml &gt; example.html</userinput></screen>
 	</step>
       </procedure>
     </sect2>
@@ -1347,9 +1347,9 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
       <para>Suponha que voc� possui algum conte�do para um 
 	livro SGML organizado em arquivos, um arquivo por cap�tulo, 
-	chamados <filename>chapter1.sgml</filename>,
-	<filename>chapter2.sgml</filename>, e assim por diante, com 
-	um arquivo <filename>book.sgml</filename> que ir� 
+	chamados <filename>chapter1.xml</filename>,
+	<filename>chapter2.xml</filename>, e assim por diante, com 
+	um arquivo <filename>book.xml</filename> que ir� 
 	conter estes cap�tulos.</para>
 	
       <para>A fim de utilizar o conte�do destes arquivos como 
@@ -1363,9 +1363,9 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  arquivos</title>
 	
 	<programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!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">
 <!-- e assim por diante -->
 ]>
 
@@ -1381,8 +1381,8 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <warning>
 	<para>Quando utilizar uma entidade geral para incluir outros
 	  arquivos em um documento, os arquivos que estiverem sendo
-	  inclusos (<filename>chapter1.sgml</filename>,
-	  <filename>chapter2.sgml</filename>, etc) 
+	  inclusos (<filename>chapter1.xml</filename>,
+	  <filename>chapter2.xml</filename>, etc) 
 	  <emphasis>n�o devem</emphasis> iniciar com uma 
 	  declara��o DOCTYPE.  Isto � um erro 
 	  de sintaxe.</para>
@@ -1424,9 +1424,9 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  <filename>chapters.ent</filename>.  Este arquivo 
 	  cont�m o seguinte:</para>
 	
-	<programlisting><![ RCDATA [<!ENTITY chapter.1 SYSTEM "chapter1.sgml">
-<!ENTITY chapter.2 SYSTEM "chapter2.sgml">
-<!ENTITY chapter.3 SYSTEM "chapter3.sgml">]]></programlisting>
+	<programlisting><![ RCDATA [<!ENTITY chapter.1 SYSTEM "chapter1.xml">
+<!ENTITY chapter.2 SYSTEM "chapter2.xml">
+<!ENTITY chapter.3 SYSTEM "chapter3.xml">]]></programlisting>
 
 	<para>Agora crie uma entidade de par�metro para referenciar 
 	  o conte�do do arquivo.  E ent�o utilize a 
@@ -1461,9 +1461,9 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	<procedure>
 	  <step>
 	    <para>Crie tr�s arquivos, 
-	      <filename>para1.sgml</filename>,
-	      <filename>para2.sgml</filename>, e
-	      <filename>para3.sgml</filename>.</para>
+	      <filename>para1.xml</filename>,
+	      <filename>para2.xml</filename>, e
+	      <filename>para3.xml</filename>.</para>
 
 	    <para>Coloque um conte�do similar ao seguinte em 
 	      cada arquivo:</para>
@@ -1472,14 +1472,14 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  </step>
 
 	  <step>
-	    <para>Edite o arquivo <filename>example.sgml</filename>
+	    <para>Edite o arquivo <filename>example.xml</filename>
 	      para que ele se pare�a com este:</para>
 
 	    <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY version "1.1">
-<!ENTITY para1 SYSTEM "para1.sgml">
-<!ENTITY para2 SYSTEM "para2.sgml">
-<!ENTITY para3 SYSTEM "para3.sgml">
+<!ENTITY para1 SYSTEM "para1.xml">
+<!ENTITY para2 SYSTEM "para2.xml">
+<!ENTITY para3 SYSTEM "para3.xml">
 ]>
 
 <html>
@@ -1501,16 +1501,16 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	    <para>Produza o arquivo 
 	      <filename>example.html</filename> atrav�s da
 	      normaliza��o do arquivo 
-	      <filename>example.sgml</filename>.</para>
+	      <filename>example.xml</filename>.</para>
 
-            <screen>&prompt.user; <userinput>osgmlnorm -d example.sgml &gt; example.html</userinput></screen>
+            <screen>&prompt.user; <userinput>osgmlnorm -d example.xml &gt; example.html</userinput></screen>
 	  </step>
 
 	  <step>
 	    <para>Carregue o arquivo 
 	      <filename>example.html</filename> no seu navegador web,
 	      e confirme que os arquivos 
-	      <filename>para<replaceable>n</replaceable>.sgml</filename>
+	      <filename>para<replaceable>n</replaceable>.xml</filename>
 	      foram inclu�dos no <filename>example.html</filename>.
 	      </para>
 	  </step>
@@ -1529,11 +1529,11 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	<procedure>
 	  <step>
 	    <para>Edite o arquivo 
-	      <filename>example.sgml</filename> para que ele se
+	      <filename>example.xml</filename> para que ele se
 	      pare�a com este:</para>
 	
 	    <programlisting><![ RCDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!ENTITY % entities SYSTEM "entities.sgml"> %entities;
+<!ENTITY % entities SYSTEM "entities.xml"> %entities;
 ]>
 
 <html>
@@ -1553,28 +1553,28 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
 	  <step>
 	    <para>Crie um novo arquivo chamado 
-	      <filename>entities.sgml</filename>, com este 
+	      <filename>entities.xml</filename>, com este 
 	      conte�do:</para>
 
 	    <programlisting><![ RCDATA [<!ENTITY version "1.1">
-<!ENTITY para1 SYSTEM "para1.sgml">
-<!ENTITY para2 SYSTEM "para2.sgml">
-<!ENTITY para3 SYSTEM "para3.sgml">]]></programlisting>
+<!ENTITY para1 SYSTEM "para1.xml">
+<!ENTITY para2 SYSTEM "para2.xml">
+<!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
 	  </step>
 
 	  <step>
 	    <para>Produza o arquivo <filename>example.html</filename>
 	      atrav�s da normaliza��o do arquivo
-	      <filename>example.sgml</filename>.</para>
+	      <filename>example.xml</filename>.</para>
 
-            <screen>&prompt.user; <userinput>osgmlnorm -d example.sgml &gt; example.html</userinput></screen>
+            <screen>&prompt.user; <userinput>osgmlnorm -d example.xml &gt; example.html</userinput></screen>
 	  </step>
 
 	  <step>
 	    <para>Carregue o arquivo 
 	      <filename>example.html</filename> no seu navegador web
 	      e confirme que os arquivos
-	      <filename>para<replaceable>n</replaceable>.sgml</filename>
+	      <filename>para<replaceable>n</replaceable>.xml</filename>
 	      foram inclu�dos no arquivo 
 	      <filename>example.html</filename>.</para>
 	  </step>
@@ -1820,7 +1820,7 @@ onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <procedure>
 	<step>
 	  <para>Crie um novo arquivo chamado 
-	    <filename>section.sgml</filename>, o qual deve conter o 
+	    <filename>section.xml</filename>, o qual deve conter o 
 	    seguinte conte�do:</para>
 
 	  <programlisting>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
similarity index 95%
rename from pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
index 0ef20bf6ea..bf353892fd 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.sgml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/structure/chapter.xml
@@ -241,7 +241,7 @@
 	</sect4>
 
 	<sect4>
-	  <title><filename>book.sgml</filename></title>
+	  <title><filename>book.xml</filename></title>
 	
 	  <para>Este � o documento de mais alto n�vel 
 	    do Handbook.  Ele cont�m as 
@@ -250,7 +250,7 @@
 	    assim como os elementos que descrevem a estrutura do 
 	    Handbook.</para>
 	
-	  <para>O <filename>book.sgml</filename> utiliza <link
+	  <para>O <filename>book.xml</filename> utiliza <link
 	    linkend="sgml-primer-parameter-entities">entidades de
 	    par�metro</link> para carregar os arquivos com 
 	    extens�o <filename>.ent</filename>.  Estes 
@@ -261,10 +261,10 @@
 	</sect4>
 
 	<sect4>
-	  <title><filename><replaceable>directory</replaceable>/chapter.sgml</filename></title>
+	  <title><filename><replaceable>directory</replaceable>/chapter.xml</filename></title>
 
 	  <para>Cada cap�tulo do Handbook � armazenado 
-	    em um arquivo chamado <filename>chapter.sgml</filename> 
+	    em um arquivo chamado <filename>chapter.xml</filename> 
 	    localizado em um diret�rio separado dos outros 
 	    cap�tulos.  Cada diret�rio � nomeado
 	    depois do valor do atributo <literal>id</literal> no 
@@ -279,7 +279,7 @@
 </chapter>]]></programlisting>
 
 	  <para>Ent�o ele ser� chamado de 
-	    <filename>chapter.sgml</filename> e ser�
+	    <filename>chapter.xml</filename> e ser�
 	    armazenadao no diret�rio <filename>kernelconfig
 	    </filename>.  Em geral, todo o conte�do do 
 	    cap�tulo ser� mantido neste arquivo.</para>
@@ -293,7 +293,7 @@
 	
 	  <para>Nas vers�es anteriores do Handbook os 
 	    arquivos eram armazenados no mesmo diret�rio 
-	    que o <filename>book.sgml</filename>, e depois nomeados 
+	    que o <filename>book.xml</filename>, e depois nomeados 
 	    a partir do valor do atributo <literal>id</literal> 
 	    presente no elemento <sgmltag>chapter</sgmltag> do 
 	    arquivo.  Agora, � poss�vel incluir imagens
@@ -314,10 +314,10 @@
 	
 	  <para>Um exame r�pido vai mostrar que existem muitos
 	    diret�rios com um �nico arquivo 
-	    <filename>chapter.sgml</filename>, incluindo 
-	    <filename>basics/chapter.sgml</filename>,
-	    <filename>introduction/chapter.sgml</filename>, e
-	    <filename>printing/chapter.sgml</filename>.</para>
+	    <filename>chapter.xml</filename>, incluindo 
+	    <filename>basics/chapter.xml</filename>,
+	    <filename>introduction/chapter.xml</filename>, e
+	    <filename>printing/chapter.xml</filename>.</para>
 	
 	  <important>
 	    <para>Os cap�tulos e/ou diret�rios 
@@ -332,7 +332,7 @@
 	      hierarquia).</para>
 	  </important>
 	
-	  <para>Cada arquivo <filename>chapter.sgml</filename> 
+	  <para>Cada arquivo <filename>chapter.xml</filename> 
 	    n�o ser� um documento SGML completo.  Em 
 	    particular, eles n�o ter�o as suas 
 	    pr�prias linhas DOCTYPE no in�cio do
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/stylesheets/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/the-website/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/tools/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
similarity index 97%
rename from pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
index 98f5774d56..37239a3c4f 100644
--- a/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.sgml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/translations/chapter.xml
@@ -177,10 +177,10 @@
 	<para>Por exemplo, para ver as diferen�as entre as
 	  revis�es <literal>r33733</literal> e
 	  <literal>r33734</literal> do
-	  <filename>en_US.ISO8859-1/books/fdp-primer/book.sgml
+	  <filename>en_US.ISO8859-1/books/fdp-primer/book.xml
 	  </filename>, execute:</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>
 
@@ -328,7 +328,7 @@ head/
                      books/
                            faq/
                                Makefile
-                               book.sgml</programlisting>
+                               book.xml</programlisting>
 
 	<para><literal>sv_SE.ISO8859-1</literal> � o nome da
 	  tradu��o, na forma
@@ -522,7 +522,7 @@ head/
 	<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>A forma exata pode mudar, mas ela sempre
@@ -548,7 +548,7 @@ head/
 
 	<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/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml b/pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml
rename to pt_BR.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/Makefile b/pt_BR.ISO8859-1/books/handbook/Makefile
index b4bb57663b..5e80d94636 100644
--- a/pt_BR.ISO8859-1/books/handbook/Makefile
+++ b/pt_BR.ISO8859-1/books/handbook/Makefile
@@ -21,7 +21,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
@@ -117,32 +117,32 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
-SRCS+= advanced-networking/chapter.sgml
-SRCS+= basics/chapter.sgml
-SRCS+= bibliography/chapter.sgml
-SRCS+= config/chapter.sgml
-SRCS+= boot/chapter.sgml
-SRCS+= cutting-edge/chapter.sgml
-SRCS+= disks/chapter.sgml
-SRCS+= eresources/chapter.sgml
-SRCS+= install/chapter.sgml
-SRCS+= introduction/chapter.sgml
-SRCS+= kernelconfig/chapter.sgml
-SRCS+= l10n/chapter.sgml
-SRCS+= linuxemu/chapter.sgml
-SRCS+= mail/chapter.sgml
-SRCS+= mirrors/chapter.sgml
-SRCS+= pgpkeys/chapter.sgml
-SRCS+= ppp-and-slip/chapter.sgml
-SRCS+= printing/chapter.sgml
-SRCS+= security/chapter.sgml
-SRCS+= serialcomms/chapter.sgml
-SRCS+= users/chapter.sgml
-SRCS+= x11/chapter.sgml
-SRCS+= ports/chapter.sgml
-SRCS+= preface/preface.sgml
-SRCS+= colophon.sgml
+SRCS=  book.xml
+SRCS+= advanced-networking/chapter.xml
+SRCS+= basics/chapter.xml
+SRCS+= bibliography/chapter.xml
+SRCS+= config/chapter.xml
+SRCS+= boot/chapter.xml
+SRCS+= cutting-edge/chapter.xml
+SRCS+= disks/chapter.xml
+SRCS+= eresources/chapter.xml
+SRCS+= install/chapter.xml
+SRCS+= introduction/chapter.xml
+SRCS+= kernelconfig/chapter.xml
+SRCS+= l10n/chapter.xml
+SRCS+= linuxemu/chapter.xml
+SRCS+= mail/chapter.xml
+SRCS+= mirrors/chapter.xml
+SRCS+= pgpkeys/chapter.xml
+SRCS+= ppp-and-slip/chapter.xml
+SRCS+= printing/chapter.xml
+SRCS+= security/chapter.xml
+SRCS+= serialcomms/chapter.xml
+SRCS+= users/chapter.xml
+SRCS+= x11/chapter.xml
+SRCS+= ports/chapter.xml
+SRCS+= preface/preface.xml
+SRCS+= colophon.xml
 
 # Entities
 SRCS+= chapters.ent
@@ -150,11 +150,11 @@ 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./}
 
-pgpkeyring: pgpkeys/chapter.sgml
+pgpkeyring: pgpkeys/chapter.xml
 	@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/advanced-networking/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/basics/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/basics/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/basics/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/basics/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/bibliography/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/bibliography/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/book.sgml b/pt_BR.ISO8859-1/books/handbook/book.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/book.sgml
rename to pt_BR.ISO8859-1/books/handbook/book.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/boot/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/boot/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/boot/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/boot/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/chapters.ent b/pt_BR.ISO8859-1/books/handbook/chapters.ent
index a908f86531..75fef0877f 100644
--- a/pt_BR.ISO8859-1/books/handbook/chapters.ent
+++ b/pt_BR.ISO8859-1/books/handbook/chapters.ent
@@ -9,7 +9,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.
 -->
@@ -55,137 +55,137 @@
 <!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.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.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/pt_BR.ISO8859-1/books/handbook/colophon.sgml b/pt_BR.ISO8859-1/books/handbook/colophon.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/colophon.sgml
rename to pt_BR.ISO8859-1/books/handbook/colophon.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/config/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/config/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/config/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/config/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/disks/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/disks/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/disks/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/disks/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/eresources/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/eresources/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/eresources/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/install/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/install/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/install/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/install/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/introduction/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/introduction/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/introduction/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/kernelconfig/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/l10n/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/l10n/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/l10n/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/linuxemu/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/mail/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/mail/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/mail/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/mail/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/mirrors/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/mirrors/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/pgpkeys/Makefile b/pt_BR.ISO8859-1/books/handbook/pgpkeys/Makefile
index 4f21f93e56..282142fe5f 100644
--- a/pt_BR.ISO8859-1/books/handbook/pgpkeys/Makefile
+++ b/pt_BR.ISO8859-1/books/handbook/pgpkeys/Makefile
@@ -11,7 +11,7 @@
 # Original revision: 1.1
 #
 
-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/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/pgpkeys/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/ports/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/ports/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/ports/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/ports/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/preface/preface.sgml b/pt_BR.ISO8859-1/books/handbook/preface/preface.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/preface/preface.sgml
rename to pt_BR.ISO8859-1/books/handbook/preface/preface.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/printing/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/printing/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/printing/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/printing/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/security/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/security/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/security/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/security/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/serialcomms/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/users/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/users/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/users/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/users/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/x11/chapter.sgml b/pt_BR.ISO8859-1/books/handbook/x11/chapter.xml
similarity index 100%
rename from pt_BR.ISO8859-1/books/handbook/x11/chapter.sgml
rename to pt_BR.ISO8859-1/books/handbook/x11/chapter.xml
diff --git a/ru_RU.KOI8-R/articles/committers-guide/Makefile b/ru_RU.KOI8-R/articles/committers-guide/Makefile
index df3d144e11..661c4d5b69 100644
--- a/ru_RU.KOI8-R/articles/committers-guide/Makefile
+++ b/ru_RU.KOI8-R/articles/committers-guide/Makefile
@@ -17,7 +17,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/ru_RU.KOI8-R/articles/committers-guide/article.sgml b/ru_RU.KOI8-R/articles/committers-guide/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/committers-guide/article.sgml
rename to ru_RU.KOI8-R/articles/committers-guide/article.xml
index 52f58391b4..87fb3c756c 100644
--- a/ru_RU.KOI8-R/articles/committers-guide/article.sgml
+++ b/ru_RU.KOI8-R/articles/committers-guide/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/committers-guide/article.sgml,v 1.30 2007/05/09 06:08:23 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/committers-guide/article.xml,v 1.30 2007/05/09 06:08:23 gad Exp $
 
      Original revision: r30088
 -->
@@ -752,11 +752,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
 	</itemizedlist>
 
 	<para>����� ��������� �� �������� �������� � �������, ����������
-	  ������������� ����� (<literal>$Id: article.sgml,v 1.19 2007-05-09 06:08:50 bvs Exp $</literal> ���, � ������ FreeBSD,
+	  ������������� ����� (<literal>$Id: article.xml,v 1.19 2007-05-09 06:08:50 bvs Exp $</literal> ���, � ������ FreeBSD,
 	  <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>).
 	  ��� ����������� ��������������� ���� ��� ���������� ���������
 	  (� ������ ������ ���������� ������ ������-����������� � ������ ������
-	  <literal>$Id: article.sgml,v 1.19 2007-05-09 06:08:50 bvs Exp $</literal>, ������� ���� ������ � <literal>$Id: article.sgml,v 1.19 2007-05-09 06:08:50 bvs Exp $</literal>
+	  <literal>$Id: article.xml,v 1.19 2007-05-09 06:08:50 bvs Exp $</literal>, ������� ���� ������ � <literal>$Id: article.xml,v 1.19 2007-05-09 06:08:50 bvs Exp $</literal>
 	  ��� &os.stable;).</para>
       </listitem>
 
@@ -1110,16 +1110,16 @@ Host pcvs.FreeBSD.org
 
       <listitem>
 	<para>����� �������� ���� <quote>SGML ��������</quote> �
-	  <filename>www/en/developers.sgml</filename>.</para>
+	  <filename>www/en/developers.xml</filename>.</para>
       </listitem>
 
       <listitem>
 	<para>�������� ���� � ������ <quote>������������</quote> ������
 	  <ulink url="&url.articles.contributors;/index.html">��������� �������
 	  FreeBSD</ulink>
-  	  (<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml</filename>)
+  	  (<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.committers.xml</filename>)
 	  � ������� ���� ������ �� ������� <quote>������ ���������</quote>
-	  (<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml</filename>).</para>
+	  (<filename>doc/en_US.ISO8859-1/articles/contributors/contrib.additional.xml</filename>).</para>
       </listitem>
 
       <listitem>
diff --git a/ru_RU.KOI8-R/articles/console-server/Makefile b/ru_RU.KOI8-R/articles/console-server/Makefile
index 895ce96d25..890f58d80c 100644
--- a/ru_RU.KOI8-R/articles/console-server/Makefile
+++ b/ru_RU.KOI8-R/articles/console-server/Makefile
@@ -17,7 +17,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/ru_RU.KOI8-R/articles/console-server/article.sgml b/ru_RU.KOI8-R/articles/console-server/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/console-server/article.sgml
rename to ru_RU.KOI8-R/articles/console-server/article.xml
index 63ba60a85c..d77011dde2 100644
--- a/ru_RU.KOI8-R/articles/console-server/article.sgml
+++ b/ru_RU.KOI8-R/articles/console-server/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/console-server/article.sgml,v 1.13 2007/01/06 18:28:16 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/console-server/article.xml,v 1.13 2007/01/06 18:28:16 gad Exp $
 
      Original revision: r28570
 -->
diff --git a/ru_RU.KOI8-R/articles/contributing/Makefile b/ru_RU.KOI8-R/articles/contributing/Makefile
index db38be42bc..688f593070 100644
--- a/ru_RU.KOI8-R/articles/contributing/Makefile
+++ b/ru_RU.KOI8-R/articles/contributing/Makefile
@@ -17,7 +17,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/ru_RU.KOI8-R/articles/contributing/article.sgml b/ru_RU.KOI8-R/articles/contributing/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/contributing/article.sgml
rename to ru_RU.KOI8-R/articles/contributing/article.xml
index 336b3e7bf3..b432f9ec7f 100644
--- a/ru_RU.KOI8-R/articles/contributing/article.sgml
+++ b/ru_RU.KOI8-R/articles/contributing/article.xml
@@ -9,7 +9,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/contributing/article.sgml,v 1.3 2006/03/28 16:40:29 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/contributing/article.xml,v 1.3 2006/03/28 16:40:29 gad Exp $
 
      Original revision: r34267
 -->
diff --git a/ru_RU.KOI8-R/articles/cups/Makefile b/ru_RU.KOI8-R/articles/cups/Makefile
index 71cb0350e9..c2036ef9e1 100644
--- a/ru_RU.KOI8-R/articles/cups/Makefile
+++ b/ru_RU.KOI8-R/articles/cups/Makefile
@@ -15,7 +15,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/ru_RU.KOI8-R/articles/cups/article.sgml b/ru_RU.KOI8-R/articles/cups/article.xml
similarity index 100%
rename from ru_RU.KOI8-R/articles/cups/article.sgml
rename to ru_RU.KOI8-R/articles/cups/article.xml
diff --git a/ru_RU.KOI8-R/articles/custom-gcc/Makefile b/ru_RU.KOI8-R/articles/custom-gcc/Makefile
index 60bc3a04bb..86551ad20f 100644
--- a/ru_RU.KOI8-R/articles/custom-gcc/Makefile
+++ b/ru_RU.KOI8-R/articles/custom-gcc/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/ru_RU.KOI8-R/articles/custom-gcc/article.sgml b/ru_RU.KOI8-R/articles/custom-gcc/article.xml
similarity index 100%
rename from ru_RU.KOI8-R/articles/custom-gcc/article.sgml
rename to ru_RU.KOI8-R/articles/custom-gcc/article.xml
diff --git a/ru_RU.KOI8-R/articles/cvs-freebsd/Makefile b/ru_RU.KOI8-R/articles/cvs-freebsd/Makefile
index eee7cace85..6c9f24c005 100644
--- a/ru_RU.KOI8-R/articles/cvs-freebsd/Makefile
+++ b/ru_RU.KOI8-R/articles/cvs-freebsd/Makefile
@@ -14,7 +14,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=  article.sgml
+SRCS=  article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/articles/cvs-freebsd/article.sgml b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/cvs-freebsd/article.sgml
rename to ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
index 8b406e5364..ae4176ae29 100644
--- a/ru_RU.KOI8-R/articles/cvs-freebsd/article.sgml
+++ b/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/cvs-freebsd/article.sgml,v 1.9 2006/02/05 17:43:22 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/cvs-freebsd/article.xml,v 1.9 2006/02/05 17:43:22 marck Exp $
 
      Original revision: r32632
 -->
diff --git a/ru_RU.KOI8-R/articles/cvsup-advanced/Makefile b/ru_RU.KOI8-R/articles/cvsup-advanced/Makefile
index 9d71c8e612..dc019ba55c 100644
--- a/ru_RU.KOI8-R/articles/cvsup-advanced/Makefile
+++ b/ru_RU.KOI8-R/articles/cvsup-advanced/Makefile
@@ -16,7 +16,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/ru_RU.KOI8-R/articles/cvsup-advanced/article.sgml b/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/cvsup-advanced/article.sgml
rename to ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
index 0df0391671..02c9117cd0 100644
--- a/ru_RU.KOI8-R/articles/cvsup-advanced/article.sgml
+++ b/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/cvsup-advanced/article.sgml,v 1.5 2005/06/12 05:18:06 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/cvsup-advanced/article.xml,v 1.5 2005/06/12 05:18:06 gad Exp $
 
      Original revision: r23909
 -->
diff --git a/ru_RU.KOI8-R/articles/explaining-bsd/Makefile b/ru_RU.KOI8-R/articles/explaining-bsd/Makefile
index bcbdf2d0a9..cde3d7b041 100644
--- a/ru_RU.KOI8-R/articles/explaining-bsd/Makefile
+++ b/ru_RU.KOI8-R/articles/explaining-bsd/Makefile
@@ -19,7 +19,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/ru_RU.KOI8-R/articles/explaining-bsd/article.sgml b/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/explaining-bsd/article.sgml
rename to ru_RU.KOI8-R/articles/explaining-bsd/article.xml
index 9780cc25ec..26bff3ed5d 100644
--- a/ru_RU.KOI8-R/articles/explaining-bsd/article.sgml
+++ b/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
@@ -9,7 +9,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/explaining-bsd/article.sgml,v 1.11 2007/01/06 18:28:16 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/explaining-bsd/article.xml,v 1.11 2007/01/06 18:28:16 gad Exp $
 
      Original revision: r38183
 -->
diff --git a/ru_RU.KOI8-R/articles/fbsd-from-scratch/Makefile b/ru_RU.KOI8-R/articles/fbsd-from-scratch/Makefile
index 7aa220ebf1..5a0f821faf 100644
--- a/ru_RU.KOI8-R/articles/fbsd-from-scratch/Makefile
+++ b/ru_RU.KOI8-R/articles/fbsd-from-scratch/Makefile
@@ -26,7 +26,7 @@ EXTRAS+=	stage_3.mk
 
 CLEANFILES+= ${EXTRAS}
 
-SRCS=	article.sgml
+SRCS=	article.xml
 SRCS+= 	${EXTRAS}
 
 ${EXTRAS}:
diff --git a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.sgml b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/fbsd-from-scratch/article.sgml
rename to ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
index 5d037a42a8..e94acc7284 100644
--- a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.sgml
+++ b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
@@ -9,7 +9,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.sgml,v 1.5 2005/06/12 13:52:24 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml,v 1.5 2005/06/12 13:52:24 gad Exp $
 
      Original revision: r33355
 -->
diff --git a/ru_RU.KOI8-R/articles/fonts/Makefile b/ru_RU.KOI8-R/articles/fonts/Makefile
index de239365e6..83bce9c48d 100644
--- a/ru_RU.KOI8-R/articles/fonts/Makefile
+++ b/ru_RU.KOI8-R/articles/fonts/Makefile
@@ -15,7 +15,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=  article.sgml
+SRCS=  article.xml
 
 URL_RELPREFIX?=        ../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/articles/fonts/article.sgml b/ru_RU.KOI8-R/articles/fonts/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/fonts/article.sgml
rename to ru_RU.KOI8-R/articles/fonts/article.xml
index 8fcc4706c6..f66fad9820 100644
--- a/ru_RU.KOI8-R/articles/fonts/article.sgml
+++ b/ru_RU.KOI8-R/articles/fonts/article.xml
@@ -9,7 +9,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/fonts/article.sgml,v 1.5 2005/12/06 17:56:24 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/fonts/article.xml,v 1.5 2005/12/06 17:56:24 gad Exp $
 
      Original revision: r38183
 -->
diff --git a/ru_RU.KOI8-R/articles/freebsd-questions/Makefile b/ru_RU.KOI8-R/articles/freebsd-questions/Makefile
index 7aeb037143..23294cf41a 100644
--- a/ru_RU.KOI8-R/articles/freebsd-questions/Makefile
+++ b/ru_RU.KOI8-R/articles/freebsd-questions/Makefile
@@ -15,7 +15,7 @@ WITH_ARICLE_TOC?= YES
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=  article.sgml
+SRCS=  article.xml
 
 URL_RELPREFIX?= ../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/articles/freebsd-questions/article.sgml b/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/freebsd-questions/article.sgml
rename to ru_RU.KOI8-R/articles/freebsd-questions/article.xml
index 12d853521c..5cd5cc969e 100644
--- a/ru_RU.KOI8-R/articles/freebsd-questions/article.sgml
+++ b/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
@@ -9,7 +9,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/freebsd-questions/article.sgml,v 1.10 2005/10/09 10:45:04 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/freebsd-questions/article.xml,v 1.10 2005/10/09 10:45:04 gad Exp $
 
      Original revision: r25762
 -->
diff --git a/ru_RU.KOI8-R/articles/geom-class/Makefile b/ru_RU.KOI8-R/articles/geom-class/Makefile
index 658c161e99..7ca13f2f3b 100644
--- a/ru_RU.KOI8-R/articles/geom-class/Makefile
+++ b/ru_RU.KOI8-R/articles/geom-class/Makefile
@@ -14,7 +14,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/ru_RU.KOI8-R/articles/geom-class/article.sgml b/ru_RU.KOI8-R/articles/geom-class/article.xml
similarity index 100%
rename from ru_RU.KOI8-R/articles/geom-class/article.sgml
rename to ru_RU.KOI8-R/articles/geom-class/article.xml
diff --git a/ru_RU.KOI8-R/articles/gjournal-desktop/Makefile b/ru_RU.KOI8-R/articles/gjournal-desktop/Makefile
index 7326d4ef89..e81a228567 100644
--- a/ru_RU.KOI8-R/articles/gjournal-desktop/Makefile
+++ b/ru_RU.KOI8-R/articles/gjournal-desktop/Makefile
@@ -13,7 +13,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/ru_RU.KOI8-R/articles/gjournal-desktop/article.sgml b/ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
similarity index 100%
rename from ru_RU.KOI8-R/articles/gjournal-desktop/article.sgml
rename to ru_RU.KOI8-R/articles/gjournal-desktop/article.xml
diff --git a/ru_RU.KOI8-R/articles/hubs/Makefile b/ru_RU.KOI8-R/articles/hubs/Makefile
index 65a4d0854b..cbc11679bb 100644
--- a/ru_RU.KOI8-R/articles/hubs/Makefile
+++ b/ru_RU.KOI8-R/articles/hubs/Makefile
@@ -16,7 +16,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/ru_RU.KOI8-R/articles/hubs/article.sgml b/ru_RU.KOI8-R/articles/hubs/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/hubs/article.sgml
rename to ru_RU.KOI8-R/articles/hubs/article.xml
index a4420063ec..55b686cd8b 100644
--- a/ru_RU.KOI8-R/articles/hubs/article.sgml
+++ b/ru_RU.KOI8-R/articles/hubs/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/hubs/article.sgml,v 1.21 2007/05/15 18:39:34 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/hubs/article.xml,v 1.21 2007/05/15 18:39:34 gad Exp $
 
      Original revision: r38826
 -->
diff --git a/ru_RU.KOI8-R/articles/ipsec-must/Makefile b/ru_RU.KOI8-R/articles/ipsec-must/Makefile
index 9e5aba3b19..f047bc5903 100644
--- a/ru_RU.KOI8-R/articles/ipsec-must/Makefile
+++ b/ru_RU.KOI8-R/articles/ipsec-must/Makefile
@@ -15,7 +15,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=		../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/articles/ipsec-must/article.sgml b/ru_RU.KOI8-R/articles/ipsec-must/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/ipsec-must/article.sgml
rename to ru_RU.KOI8-R/articles/ipsec-must/article.xml
index ca36acc376..0bd7cad6a3 100644
--- a/ru_RU.KOI8-R/articles/ipsec-must/article.sgml
+++ b/ru_RU.KOI8-R/articles/ipsec-must/article.xml
@@ -9,7 +9,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/ipsec-must/article.sgml,v 1.7 2004/07/16 12:06:05 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/ipsec-must/article.xml,v 1.7 2004/07/16 12:06:05 den Exp $
 
      Original revision: r25543
 -->
diff --git a/ru_RU.KOI8-R/articles/laptop/Makefile b/ru_RU.KOI8-R/articles/laptop/Makefile
index 69b33735d5..bc2e5c0fd3 100644
--- a/ru_RU.KOI8-R/articles/laptop/Makefile
+++ b/ru_RU.KOI8-R/articles/laptop/Makefile
@@ -16,7 +16,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/ru_RU.KOI8-R/articles/laptop/article.sgml b/ru_RU.KOI8-R/articles/laptop/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/laptop/article.sgml
rename to ru_RU.KOI8-R/articles/laptop/article.xml
index e0c8822891..9d80418c78 100644
--- a/ru_RU.KOI8-R/articles/laptop/article.sgml
+++ b/ru_RU.KOI8-R/articles/laptop/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/laptop/article.sgml,v 1.15 2007/05/15 07:58:44 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/laptop/article.xml,v 1.15 2007/05/15 07:58:44 gad Exp $
 
      Original revision: r29400
 -->
diff --git a/ru_RU.KOI8-R/articles/linux-comparison/Makefile b/ru_RU.KOI8-R/articles/linux-comparison/Makefile
index 2ebeba7bee..9b4f550330 100644
--- a/ru_RU.KOI8-R/articles/linux-comparison/Makefile
+++ b/ru_RU.KOI8-R/articles/linux-comparison/Makefile
@@ -14,7 +14,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/articles/linux-comparison/article.sgml b/ru_RU.KOI8-R/articles/linux-comparison/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/linux-comparison/article.sgml
rename to ru_RU.KOI8-R/articles/linux-comparison/article.xml
index 18c23284d6..db00c1074e 100644
--- a/ru_RU.KOI8-R/articles/linux-comparison/article.sgml
+++ b/ru_RU.KOI8-R/articles/linux-comparison/article.xml
@@ -40,7 +40,7 @@ Copyright (c) 2005 Dru Lavigne
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/linux-comparison/article.sgml,v 1.7 2007/01/06 18:28:16 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/linux-comparison/article.xml,v 1.7 2007/01/06 18:28:16 gad Exp $
      $FreeBSD$
 
      Original revision: r37598
diff --git a/ru_RU.KOI8-R/articles/mailing-list-faq/Makefile b/ru_RU.KOI8-R/articles/mailing-list-faq/Makefile
index 98f317cd7f..b0cd2b0c64 100644
--- a/ru_RU.KOI8-R/articles/mailing-list-faq/Makefile
+++ b/ru_RU.KOI8-R/articles/mailing-list-faq/Makefile
@@ -23,7 +23,7 @@ WITH_ARTICLE_TOC?=YES
 #
 
 # SGML content
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/articles/mailing-list-faq/article.sgml b/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/mailing-list-faq/article.sgml
rename to ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
index 180030d603..cb9cf86df3 100644
--- a/ru_RU.KOI8-R/articles/mailing-list-faq/article.sgml
+++ b/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/mailing-list-faq/article.sgml,v 1.4 2006/02/09 14:56:28 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml,v 1.4 2006/02/09 14:56:28 marck Exp $
 
      Original revision: r36992
 -->
diff --git a/ru_RU.KOI8-R/articles/mh/Makefile b/ru_RU.KOI8-R/articles/mh/Makefile
index ea363f9ddb..301b023763 100644
--- a/ru_RU.KOI8-R/articles/mh/Makefile
+++ b/ru_RU.KOI8-R/articles/mh/Makefile
@@ -15,7 +15,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/ru_RU.KOI8-R/articles/mh/article.sgml b/ru_RU.KOI8-R/articles/mh/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/mh/article.sgml
rename to ru_RU.KOI8-R/articles/mh/article.xml
index af41cc2d02..9764ee0f27 100644
--- a/ru_RU.KOI8-R/articles/mh/article.sgml
+++ b/ru_RU.KOI8-R/articles/mh/article.xml
@@ -9,7 +9,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/mh/article.sgml,v 1.8 2005/10/29 15:46:59 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/mh/article.xml,v 1.8 2005/10/29 15:46:59 gad Exp $
 
      Original revision: r32632
 -->
diff --git a/ru_RU.KOI8-R/articles/new-users/Makefile b/ru_RU.KOI8-R/articles/new-users/Makefile
index af8814da5a..6625fffb73 100644
--- a/ru_RU.KOI8-R/articles/new-users/Makefile
+++ b/ru_RU.KOI8-R/articles/new-users/Makefile
@@ -15,7 +15,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 URL_RELPREFIX?= ../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/articles/new-users/article.sgml b/ru_RU.KOI8-R/articles/new-users/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/new-users/article.sgml
rename to ru_RU.KOI8-R/articles/new-users/article.xml
index de7787f29e..f0abc0fd9e 100644
--- a/ru_RU.KOI8-R/articles/new-users/article.sgml
+++ b/ru_RU.KOI8-R/articles/new-users/article.xml
@@ -9,7 +9,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/new-users/article.sgml,v 1.6 2007/05/15 18:28:39 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/new-users/article.xml,v 1.6 2007/05/15 18:28:39 gad Exp $
 
      Original revision: r33764
 -->
diff --git a/ru_RU.KOI8-R/articles/pam/Makefile b/ru_RU.KOI8-R/articles/pam/Makefile
index aa6c41d5d0..1cdbf6497e 100644
--- a/ru_RU.KOI8-R/articles/pam/Makefile
+++ b/ru_RU.KOI8-R/articles/pam/Makefile
@@ -17,7 +17,7 @@ INSTALL_ONLY_COMPRESSED?=
 WITH_ARTICLE_TOC?=YES
 WITH_INLINE_LEGALNOTICE?=YES
 
-SRCS= article.sgml pam_app.c pam_conv.c pam_module.c
+SRCS= article.xml pam_app.c pam_conv.c pam_module.c
 
 CLEANFILES+= pam_app.c pam_conv.c pam_module.c
 
diff --git a/ru_RU.KOI8-R/articles/pam/article.sgml b/ru_RU.KOI8-R/articles/pam/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/pam/article.sgml
rename to ru_RU.KOI8-R/articles/pam/article.xml
index 236cd6d195..1447a62eb9 100644
--- a/ru_RU.KOI8-R/articles/pam/article.sgml
+++ b/ru_RU.KOI8-R/articles/pam/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/pam/article.sgml,v 1.12 2004/07/16 12:06:10 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/pam/article.xml,v 1.12 2004/07/16 12:06:10 den Exp $
 
      Original revision: r18148
 -->
diff --git a/ru_RU.KOI8-R/articles/portbuild/Makefile b/ru_RU.KOI8-R/articles/portbuild/Makefile
index f9ba9ea0b4..f9c065f12f 100644
--- a/ru_RU.KOI8-R/articles/portbuild/Makefile
+++ b/ru_RU.KOI8-R/articles/portbuild/Makefile
@@ -17,7 +17,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/ru_RU.KOI8-R/articles/portbuild/article.sgml b/ru_RU.KOI8-R/articles/portbuild/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/portbuild/article.sgml
rename to ru_RU.KOI8-R/articles/portbuild/article.xml
index afe252a283..8659ea6e07 100644
--- a/ru_RU.KOI8-R/articles/portbuild/article.sgml
+++ b/ru_RU.KOI8-R/articles/portbuild/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/portbuild/article.sgml,v 1.11 2007/05/15 19:23:49 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/portbuild/article.xml,v 1.11 2007/05/15 19:23:49 gad Exp $
 
      Original revision: r28574
 -->
diff --git a/ru_RU.KOI8-R/articles/pr-guidelines/Makefile b/ru_RU.KOI8-R/articles/pr-guidelines/Makefile
index 88deaaf07b..9a6a8bd72d 100644
--- a/ru_RU.KOI8-R/articles/pr-guidelines/Makefile
+++ b/ru_RU.KOI8-R/articles/pr-guidelines/Makefile
@@ -15,7 +15,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/ru_RU.KOI8-R/articles/pr-guidelines/article.sgml b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/pr-guidelines/article.sgml
rename to ru_RU.KOI8-R/articles/pr-guidelines/article.xml
index 37087c5a3d..587c9088eb 100644
--- a/ru_RU.KOI8-R/articles/pr-guidelines/article.sgml
+++ b/ru_RU.KOI8-R/articles/pr-guidelines/article.xml
@@ -10,7 +10,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/pr-guidelines/article.sgml,v 1.4 2005/12/16 20:08:02 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/pr-guidelines/article.xml,v 1.4 2005/12/16 20:08:02 gad Exp $
 
      Original revision: r38826
 -->
diff --git a/ru_RU.KOI8-R/articles/problem-reports/Makefile b/ru_RU.KOI8-R/articles/problem-reports/Makefile
index 7115e9e41e..4d21f2f957 100644
--- a/ru_RU.KOI8-R/articles/problem-reports/Makefile
+++ b/ru_RU.KOI8-R/articles/problem-reports/Makefile
@@ -16,7 +16,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/ru_RU.KOI8-R/articles/problem-reports/article.sgml b/ru_RU.KOI8-R/articles/problem-reports/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/problem-reports/article.sgml
rename to ru_RU.KOI8-R/articles/problem-reports/article.xml
index ce97f5ec34..9f2ccbf779 100644
--- a/ru_RU.KOI8-R/articles/problem-reports/article.sgml
+++ b/ru_RU.KOI8-R/articles/problem-reports/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/problem-reports/article.sgml,v 1.20 2006/04/05 04:28:40 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/problem-reports/article.xml,v 1.20 2006/04/05 04:28:40 gad Exp $
 
      Original revision: r33563
 -->
diff --git a/ru_RU.KOI8-R/articles/relaydelay/Makefile b/ru_RU.KOI8-R/articles/relaydelay/Makefile
index a00aa1675d..c34023f087 100644
--- a/ru_RU.KOI8-R/articles/relaydelay/Makefile
+++ b/ru_RU.KOI8-R/articles/relaydelay/Makefile
@@ -15,7 +15,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/ru_RU.KOI8-R/articles/relaydelay/article.sgml b/ru_RU.KOI8-R/articles/relaydelay/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/relaydelay/article.sgml
rename to ru_RU.KOI8-R/articles/relaydelay/article.xml
index 1bc58212a3..a638e750e4 100644
--- a/ru_RU.KOI8-R/articles/relaydelay/article.sgml
+++ b/ru_RU.KOI8-R/articles/relaydelay/article.xml
@@ -10,7 +10,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/relaydelay/article.sgml,v 1.2 2007/05/15 19:31:54 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/relaydelay/article.xml,v 1.2 2007/05/15 19:31:54 gad Exp $
 
      Original revision: r32632
 -->
diff --git a/ru_RU.KOI8-R/articles/releng-packages/Makefile b/ru_RU.KOI8-R/articles/releng-packages/Makefile
index 301d81f109..f2eb2b2d7c 100644
--- a/ru_RU.KOI8-R/articles/releng-packages/Makefile
+++ b/ru_RU.KOI8-R/articles/releng-packages/Makefile
@@ -14,7 +14,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=  article.sgml
+SRCS=  article.xml
 
 CSS_SHEET_ADDITIONS= extra.css
 
diff --git a/ru_RU.KOI8-R/articles/releng-packages/article.sgml b/ru_RU.KOI8-R/articles/releng-packages/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/releng-packages/article.sgml
rename to ru_RU.KOI8-R/articles/releng-packages/article.xml
index 438f759308..838ac276fc 100644
--- a/ru_RU.KOI8-R/articles/releng-packages/article.sgml
+++ b/ru_RU.KOI8-R/articles/releng-packages/article.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/releng-packages/article.sgml,v 1.7 2006/03/22 17:03:22 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/releng-packages/article.xml,v 1.7 2006/03/22 17:03:22 marck Exp $
 
      Original revision: r27314
 -->
diff --git a/ru_RU.KOI8-R/articles/releng/Makefile b/ru_RU.KOI8-R/articles/releng/Makefile
index fbdb985e25..b92bba8ce8 100644
--- a/ru_RU.KOI8-R/articles/releng/Makefile
+++ b/ru_RU.KOI8-R/articles/releng/Makefile
@@ -16,7 +16,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/ru_RU.KOI8-R/articles/releng/article.sgml b/ru_RU.KOI8-R/articles/releng/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/releng/article.sgml
rename to ru_RU.KOI8-R/articles/releng/article.xml
index 81d3e32a4f..f51c33ed7b 100644
--- a/ru_RU.KOI8-R/articles/releng/article.sgml
+++ b/ru_RU.KOI8-R/articles/releng/article.xml
@@ -9,7 +9,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/releng/article.sgml,v 1.15 2006/03/22 16:48:41 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/releng/article.xml,v 1.15 2006/03/22 16:48:41 marck Exp $
 
      Original revision: r38826
 -->
@@ -392,11 +392,11 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para><filename>doc/ru_RU.KOI8-R/books/handbook/mirrors/chapter.sgml</filename></para>
+	    <para><filename>doc/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml</filename></para>
 	  </listitem>
 
 	  <listitem>
-	    <para><filename>doc/en_US.ISO8859-1/books/porters-handbook/book.sgml</filename></para>
+	    <para><filename>doc/en_US.ISO8859-1/books/porters-handbook/book.xml</filename></para>
 	  </listitem>
 
 	  <listitem>
@@ -448,7 +448,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para><filename>www/en/docs/man.sgml</filename></para>
+	    <para><filename>www/en/docs/man.xml</filename></para>
 	  </listitem>
 
 	  <listitem>
@@ -466,11 +466,11 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para><filename>src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml</filename></para>
+	    <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</filename></para>
+	    <para><filename>src/release/doc/en_US.ISO8859-1/errata/article.xml</filename></para>
 	  </listitem>
 	</itemizedlist>
 
@@ -493,7 +493,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>
@@ -505,7 +505,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/ru_RU.KOI8-R/articles/solid-state/Makefile b/ru_RU.KOI8-R/articles/solid-state/Makefile
index dcd59a3d00..18eb92fc82 100644
--- a/ru_RU.KOI8-R/articles/solid-state/Makefile
+++ b/ru_RU.KOI8-R/articles/solid-state/Makefile
@@ -16,7 +16,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/ru_RU.KOI8-R/articles/solid-state/article.sgml b/ru_RU.KOI8-R/articles/solid-state/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/solid-state/article.sgml
rename to ru_RU.KOI8-R/articles/solid-state/article.xml
index 8926739bd8..41408525ee 100644
--- a/ru_RU.KOI8-R/articles/solid-state/article.sgml
+++ b/ru_RU.KOI8-R/articles/solid-state/article.xml
@@ -38,7 +38,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/solid-state/article.sgml,v 1.7 2006/03/28 16:20:06 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/solid-state/article.xml,v 1.7 2006/03/28 16:20:06 gad Exp $
 
      Original revision: r35977
 -->
diff --git a/ru_RU.KOI8-R/articles/vm-design/Makefile b/ru_RU.KOI8-R/articles/vm-design/Makefile
index eeceab883c..34e3bc8d74 100644
--- a/ru_RU.KOI8-R/articles/vm-design/Makefile
+++ b/ru_RU.KOI8-R/articles/vm-design/Makefile
@@ -16,7 +16,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/ru_RU.KOI8-R/articles/vm-design/article.sgml b/ru_RU.KOI8-R/articles/vm-design/article.xml
similarity index 99%
rename from ru_RU.KOI8-R/articles/vm-design/article.sgml
rename to ru_RU.KOI8-R/articles/vm-design/article.xml
index 9aa8d8405a..588f468291 100644
--- a/ru_RU.KOI8-R/articles/vm-design/article.sgml
+++ b/ru_RU.KOI8-R/articles/vm-design/article.xml
@@ -9,7 +9,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/vm-design/article.sgml,v 1.7 2005/06/11 13:41:40 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/vm-design/article.xml,v 1.7 2005/06/11 13:41:40 gad Exp $
 
      Original revision: r35897
 -->
diff --git a/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.sgml b/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.sgml
rename to ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
index aa58ff4b23..531ac00b72 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.sgml
+++ b/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.sgml,v 1.10 2004/02/19 17:52:02 andy Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/arch-handbook/driverbasics/chapter.xml,v 1.10 2004/02/19 17:52:02 andy Exp $
 
      Original revision: r18565
 -->
diff --git a/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.sgml b/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/arch-handbook/locking/chapter.sgml
rename to ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
index e189436724..2cd5a80a7b 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.sgml
+++ b/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml
@@ -5,7 +5,7 @@
      The FreeBSD SMP Next Generation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.sgml,v 1.4 2005/06/04 10:17:39 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/arch-handbook/locking/chapter.xml,v 1.4 2005/06/04 10:17:39 gad Exp $
 
      Original revision: r24446
 -->
diff --git a/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.sgml b/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/arch-handbook/sound/chapter.sgml
rename to ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
index 9a34d6b6e9..0343bbcef3 100644
--- a/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.sgml
+++ b/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.sgml,v 1.8 2005/06/08 05:57:29 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/arch-handbook/sound/chapter.xml,v 1.8 2005/06/08 05:57:29 gad Exp $
 
      Original revision: r24454
 -->
diff --git a/ru_RU.KOI8-R/books/design-44bsd/Makefile b/ru_RU.KOI8-R/books/design-44bsd/Makefile
index 3c7b803bfa..6086ac11d4 100644
--- a/ru_RU.KOI8-R/books/design-44bsd/Makefile
+++ b/ru_RU.KOI8-R/books/design-44bsd/Makefile
@@ -14,7 +14,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/ru_RU.KOI8-R/books/design-44bsd/book.sgml b/ru_RU.KOI8-R/books/design-44bsd/book.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/design-44bsd/book.sgml
rename to ru_RU.KOI8-R/books/design-44bsd/book.xml
index f6e4671178..7f5ce0f461 100644
--- a/ru_RU.KOI8-R/books/design-44bsd/book.sgml
+++ b/ru_RU.KOI8-R/books/design-44bsd/book.xml
@@ -9,7 +9,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/design-44bsd/book.sgml,v 1.13 2005/04/23 07:14:17 andy Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/design-44bsd/book.xml,v 1.13 2005/04/23 07:14:17 andy Exp $
 
      Original revision: r21867
 -->
diff --git a/ru_RU.KOI8-R/books/developers-handbook/Makefile b/ru_RU.KOI8-R/books/developers-handbook/Makefile
index 554ace2828..ef18349463 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/Makefile
+++ b/ru_RU.KOI8-R/books/developers-handbook/Makefile
@@ -29,19 +29,19 @@ IMAGES_EN = sockets/layers.eps sockets/sain.eps sockets/sainfill.eps sockets/sai
 #
 
 # SGML content
-SRCS=  book.sgml
-SRCS+= dma/chapter.sgml
-SRCS+= introduction/chapter.sgml
-SRCS+= ipv6/chapter.sgml
-SRCS+= kerneldebug/chapter.sgml
-SRCS+= kernelopts/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+= dma/chapter.xml
+SRCS+= introduction/chapter.xml
+SRCS+= ipv6/chapter.xml
+SRCS+= kerneldebug/chapter.xml
+SRCS+= kernelopts/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/ru_RU.KOI8-R/books/developers-handbook/book.sgml b/ru_RU.KOI8-R/books/developers-handbook/book.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/developers-handbook/book.sgml
rename to ru_RU.KOI8-R/books/developers-handbook/book.xml
index 063502fe44..3da5e09bb9 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/book.sgml
+++ b/ru_RU.KOI8-R/books/developers-handbook/book.xml
@@ -10,7 +10,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/developers-handbook/book.sgml,v 1.2 2001/03/11 12:13:23 phantom Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/developers-handbook/book.xml,v 1.2 2001/03/11 12:13:23 phantom Exp $
 
      Original revision: r8435
 -->
diff --git a/ru_RU.KOI8-R/books/developers-handbook/chapters.ent b/ru_RU.KOI8-R/books/developers-handbook/chapters.ent
index 9b6100ffae..5419653a3d 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/chapters.ent
+++ b/ru_RU.KOI8-R/books/developers-handbook/chapters.ent
@@ -11,30 +11,30 @@
      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.
 -->
 
 <!-- ����� ������ -->
-<!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">
 
 <!-- ����� ������ - 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">
 
 <!-- ����� ������ - ���� -->
-<!ENTITY chap.dma			SYSTEM "dma/chapter.sgml">
-<!ENTITY chap.kerneldebug		SYSTEM "kerneldebug/chapter.sgml">
-<!ENTITY chap.kernelopts		SYSTEM "kernelopts/chapter.sgml">
+<!ENTITY chap.dma			SYSTEM "dma/chapter.xml">
+<!ENTITY chap.kerneldebug		SYSTEM "kerneldebug/chapter.xml">
+<!ENTITY chap.kernelopts		SYSTEM "kernelopts/chapter.xml">
 
 <!-- ����� ����� - ���������� ����������� -->
-<!ENTITY chap.x86			SYSTEM "x86/chapter.sgml">
+<!ENTITY chap.x86			SYSTEM "x86/chapter.xml">
 
 <!-- ����� ������ - ���������� -->
-<!ENTITY chap.index			SYSTEM "index.sgml">
+<!ENTITY chap.index			SYSTEM "index.xml">
diff --git a/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.sgml b/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.sgml
rename to ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
index 8106e58182..a0859acebb 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.sgml
+++ b/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.sgml,v 1.3 2005/06/14 12:53:48 andy Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/developers-handbook/introduction/chapter.xml,v 1.3 2005/06/14 12:53:48 andy Exp $
 
      Original revision: r23070
 -->
diff --git a/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.sgml b/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.sgml
rename to ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
index 0e982a1127..643c2ac33a 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.sgml
+++ b/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.sgml,v 1.16 2005/05/23 06:40:07 andy Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/developers-handbook/kerneldebug/chapter.xml,v 1.16 2005/05/23 06:40:07 andy Exp $
 
      Original revision: r24625
 -->
diff --git a/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.sgml b/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/developers-handbook/policies/chapter.sgml
rename to ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
index 865ce90e48..8637dc82a1 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.sgml
+++ b/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.sgml,v 1.6 2005/07/11 12:44:48 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/developers-handbook/policies/chapter.xml,v 1.6 2005/07/11 12:44:48 gad Exp $
 
      Original revision: r21827
 -->
diff --git a/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.sgml b/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/developers-handbook/secure/chapter.sgml
rename to ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
index 4fe3851ba9..26a1714ec0 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.sgml
+++ b/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.sgml,v 1.4 2005/07/11 11:54:33 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/developers-handbook/secure/chapter.xml,v 1.4 2005/07/11 11:54:33 gad Exp $
 
      Original revision: r24438
 -->
diff --git a/ru_RU.KOI8-R/books/faq/Makefile b/ru_RU.KOI8-R/books/faq/Makefile
index ecd01f0927..c99d18a86c 100644
--- a/ru_RU.KOI8-R/books/faq/Makefile
+++ b/ru_RU.KOI8-R/books/faq/Makefile
@@ -26,7 +26,7 @@ WITH_BIBLIOXREF_TITLE?=YES
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
diff --git a/ru_RU.KOI8-R/books/faq/book.sgml b/ru_RU.KOI8-R/books/faq/book.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/faq/book.sgml
rename to ru_RU.KOI8-R/books/faq/book.xml
index ebd8774586..34eb340e3e 100644
--- a/ru_RU.KOI8-R/books/faq/book.sgml
+++ b/ru_RU.KOI8-R/books/faq/book.xml
@@ -3,7 +3,7 @@
 	"../../../share/sgml/freebsd42.dtd" [
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//RU" "../../share/sgml/entities.ent">
 %entities;
-<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.sgml">
+<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.xml">
 <!ENTITY rel.head "<emphasis>10-CURRENT</emphasis>">
 <!ENTITY rel.head.relx "10.<replaceable>X</replaceable>">
 <!ENTITY rel.head.releng "<symbol>HEAD</symbol>">
@@ -29,7 +29,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/faq/book.sgml,v 1.213 2007/05/14 19:27:34 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/faq/book.xml,v 1.213 2007/05/14 19:27:34 gad Exp $
 
      Original revision: r38488
 -->
diff --git a/ru_RU.KOI8-R/books/fdp-primer/Makefile b/ru_RU.KOI8-R/books/fdp-primer/Makefile
index 5b88d4f3f9..bee02179ad 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/Makefile
+++ b/ru_RU.KOI8-R/books/fdp-primer/Makefile
@@ -24,21 +24,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=  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.sgml
+SRCS+= examples/appendix.xml
 
 # Images from the cross-document image library
 #IMAGES_LIB=	callouts/1.png
diff --git a/ru_RU.KOI8-R/books/fdp-primer/book.sgml b/ru_RU.KOI8-R/books/fdp-primer/book.xml
similarity index 98%
rename from ru_RU.KOI8-R/books/fdp-primer/book.sgml
rename to ru_RU.KOI8-R/books/fdp-primer/book.xml
index 312773354f..a049058b58 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/book.sgml
+++ b/ru_RU.KOI8-R/books/fdp-primer/book.xml
@@ -10,7 +10,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/book.sgml,v 1.9 2005/05/04 18:23:39 andy Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/book.xml,v 1.9 2005/05/04 18:23:39 andy Exp $
 
      Original revision: r23836
 -->
@@ -248,8 +248,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/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.sgml b/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.sgml
rename to ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
index 142b3edb2e..4e2f5cb036 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.sgml
+++ b/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.sgml,v 1.4 2004/03/22 01:47:32 phantom Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/doc-build/chapter.xml,v 1.4 2004/03/22 01:47:32 phantom Exp $
 
      Original revision: r19547
 -->
@@ -212,7 +212,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
@@ -224,7 +224,7 @@ DOC_PREFIX?= ${.CURDIR}/../../..
 	���������.</para>
 
       <para><makevar>DOC</makevar> �������� ������ (�������������� ����������
-	<filename>.sgml</filename>) �������� ���������, ������������ � ����
+	<filename>.xml</filename>) �������� ���������, ������������ � ����
 	��������.  � <makevar>SRCS</makevar> ������������� ��� ��������� �����,
 	������� ���������� ��������.  ���� ����� ������ ���� �������� ������
 	�����, ��������� ������� ������ ��������� � ������������.</para>
diff --git a/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.sgml b/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
similarity index 98%
rename from ru_RU.KOI8-R/books/fdp-primer/overview/chapter.sgml
rename to ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
index d464390726..e760bbbf19 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.sgml
+++ b/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.sgml,v 1.5 2005/05/05 08:58:47 andy Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/overview/chapter.xml,v 1.5 2005/05/05 08:58:47 andy Exp $
 
      Original revision: r23836
 -->
@@ -244,7 +244,7 @@
       </step>
 
       <step>
-	<para>�������������� ����� <filename>.sgml</filename> ��� ������ ������
+	<para>�������������� ����� <filename>.xml</filename> ��� ������ ������
 	  �������� ���������.</para>
       </step>
 
diff --git a/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.sgml b/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
similarity index 98%
rename from ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.sgml
rename to ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
index eb6f036637..a4fbceb0ff 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.sgml
+++ b/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.sgml,v 1.4 2004/11/22 16:00:41 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/see-also/chapter.xml,v 1.4 2004/11/22 16:00:41 den Exp $
 
      Original revision: r21827
 -->
diff --git a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.sgml b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.sgml
rename to ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
index d118b56ac5..2a0d3307cc 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.sgml
+++ b/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.sgml,v 1.8 2005/05/07 07:59:46 maxim Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/sgml-markup/chapter.xml,v 1.8 2005/05/07 07:59:46 maxim Exp $
 
      Original revision: r23877
 -->
@@ -1862,7 +1862,7 @@ tion</replaceable>;</literal>
 	  <programlisting><![ CDATA [<para>�������� ��� SGML ��� ����������� ��
   ���������� ����� ����� ����� � ��������
   <filename>/usr/doc/en/handbook/</filename>.  � ���� �������� ������ ����
-  ���������� <filename>handbook.sgml</filename>.  �� ����� ������ ���������� ��
+  ���������� <filename>handbook.xml</filename>.  �� ����� ������ ���������� ��
   <filename>Makefile</filename> � ��������� ���������� ������ � �����������
   <filename>.ent</filename>.</para>]]></programlisting>
 
@@ -1871,7 +1871,7 @@ tion</replaceable>;</literal>
 	  <para>�������� ��� SGML ��� ����������� �� ���������� ����� �����
 	    ����� � �������� <filename>/usr/doc/en/handbook/</filename>.  �
 	    ���� �������� ������ ���� ����������
-	    <filename>handbook.sgml</filename>.  �� ����� ������ ���������� ��
+	    <filename>handbook.xml</filename>.  �� ����� ������ ���������� ��
 	    <filename>Makefile</filename> � ��������� ���������� ������ �
 	    ����������� <filename>.ent</filename>.</para>
 	</example>
@@ -2503,9 +2503,9 @@ IMAGES+= fig3.png
 
 	<para>�����������, ��� � ��� ���� ����� � ����� �������, ������ �����
 	  �������� � ����� ����������� ���������, � �������
-	  <filename>chapter1/chapter.sgml</filename>,
-	  <filename>chapter2/chapter.sgml</filename> �
-	  <filename>chapter3/chapter.sgml</filename>.  ���� � ������ ����� ����
+	  <filename>chapter1/chapter.xml</filename>,
+	  <filename>chapter2/chapter.xml</filename> �
+	  <filename>chapter3/chapter.xml</filename>.  ���� � ������ ����� ����
 	  �����������, ��������� � ���, � ���������� ���������� ��� �����������
 	  � ����������� ��������������� ����� (<filename>chapter1/</filename>,
 	  <filename>chapter2/</filename> �
@@ -2518,7 +2518,7 @@ IMAGES+= fig3.png
 	  ���������.</para>
 
 	<para>��������, ���� � ��� ���� <filename>chapter1/fig1.png</filename>,
-	  �� <filename>chapter1/chapter.sgml</filename> ������ ���������</para>
+	  �� <filename>chapter1/chapter.xml</filename> ������ ���������</para>
 
 	<programlisting>&lt;mediaobject>
   &lt;imageobject>
diff --git a/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.sgml b/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.sgml
rename to ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
index 9b8108f027..d7a4302d4d 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.sgml
+++ b/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.sgml,v 1.5 2005/06/02 15:18:17 andy Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/the-website/chapter.xml,v 1.5 2005/06/02 15:18:17 andy Exp $
 
      Original revision: r24690
 -->
diff --git a/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.sgml b/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/fdp-primer/tools/chapter.sgml
rename to ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
index 67a202c8aa..4780afe4e3 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.sgml
+++ b/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.sgml,v 1.9 2005/05/06 18:59:32 andy Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/tools/chapter.xml,v 1.9 2005/05/06 18:59:32 andy Exp $
 
      Original revision: r23963
 -->
diff --git a/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.sgml b/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.sgml
rename to ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
index 25166ec15f..dbc3071da2 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.sgml
+++ b/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.sgml,v 1.7 2005/06/14 13:02:03 andy Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/fdp-primer/writing-style/chapter.xml,v 1.7 2005/06/14 13:02:03 andy Exp $
 
      Original revision: r23861
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index ac4afb6018..550bde74ba 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -21,7 +21,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
@@ -161,41 +161,41 @@ IMAGES_LIB+= callouts/10.png
 #
 
 # SGML content
-SRCS+=  audit/chapter.sgml
-SRCS+=	book.sgml
-SRCS+=	colophon.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+=	filesystems/chapter.sgml
-SRCS+=	firewalls/chapter.sgml
-SRCS+=	geom/chapter.sgml
-SRCS+=	install/chapter.sgml
-SRCS+=	introduction/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+=	x11/chapter.sgml
+SRCS+=  audit/chapter.xml
+SRCS+=	book.xml
+SRCS+=	colophon.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+=	filesystems/chapter.xml
+SRCS+=	firewalls/chapter.xml
+SRCS+=	geom/chapter.xml
+SRCS+=	install/chapter.xml
+SRCS+=	introduction/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+=	x11/chapter.xml
 
 # Entities
 SRCS+=	chapters.ent
@@ -203,12 +203,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 ${MASTERDOC}
 
 #
@@ -224,9 +224,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}
@@ -234,20 +234,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/ru_RU.KOI8-R/books/handbook/advanced-networking/Makefile b/ru_RU.KOI8-R/books/handbook/advanced-networking/Makefile
index 2fdf4fa9a3..bfc2319670 100644
--- a/ru_RU.KOI8-R/books/handbook/advanced-networking/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/advanced-networking/Makefile
@@ -7,7 +7,7 @@
 # Original revision: r21084
 #
 
-CHAPTERS= 	advanced-networking/chapter.sgml
+CHAPTERS= 	advanced-networking/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
index cae3a95a6c..53f638d982 100644
--- a/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml,v 1.123 2006/06/20 18:02:31 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.xml,v 1.123 2006/06/20 18:02:31 marck Exp $
 
      Original revision: r28135
 -->
@@ -1205,7 +1205,7 @@ wi0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
 
     <!-- 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>��� ������������� NDISulator ����������� ��� ����:</para>
 
diff --git a/ru_RU.KOI8-R/books/handbook/audit/Makefile b/ru_RU.KOI8-R/books/handbook/audit/Makefile
index 1b01a06deb..5bbc5815f9 100644
--- a/ru_RU.KOI8-R/books/handbook/audit/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/audit/Makefile
@@ -6,7 +6,7 @@
 #
 # Original revision: r25313
 
-CHAPTERS= 	audit/chapter.sgml
+CHAPTERS= 	audit/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/audit/chapter.sgml b/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/audit/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/audit/chapter.xml
index 2609616d24..59a33b64d5 100644
--- a/ru_RU.KOI8-R/books/handbook/audit/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/audit/chapter.xml
@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/audit/chapter.sgml,v 1.10 2007/06/26 08:38:00 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/audit/chapter.xml,v 1.10 2007/06/26 08:38:00 den Exp $
      $FreeBSD$
 
      Original revision: r30208
diff --git a/ru_RU.KOI8-R/books/handbook/basics/Makefile b/ru_RU.KOI8-R/books/handbook/basics/Makefile
index 4bcd3dc8bc..fc34586173 100644
--- a/ru_RU.KOI8-R/books/handbook/basics/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/basics/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	basics/chapter.sgml
+CHAPTERS= 	basics/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/basics/chapter.sgml b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/basics/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/basics/chapter.xml
index b71d53f720..9662774759 100644
--- a/ru_RU.KOI8-R/books/handbook/basics/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/basics/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/basics/chapter.sgml,v 1.41 2007/06/25 10:41:18 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/basics/chapter.xml,v 1.41 2007/06/25 10:41:18 den Exp $
 
      Original revision: r36653
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/bibliography/Makefile b/ru_RU.KOI8-R/books/handbook/bibliography/Makefile
index ac510db5f1..d99dd25a54 100644
--- a/ru_RU.KOI8-R/books/handbook/bibliography/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/bibliography/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	bibliography/chapter.sgml
+CHAPTERS= 	bibliography/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/bibliography/chapter.sgml b/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/bibliography/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
index fa4b87f7ce..e8d1353b98 100644
--- a/ru_RU.KOI8-R/books/handbook/bibliography/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/bibliography/chapter.sgml,v 1.20 2007/06/25 10:41:18 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/bibliography/chapter.xml,v 1.20 2007/06/25 10:41:18 den Exp $
 
      Original revision: r28557
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/book.sgml b/ru_RU.KOI8-R/books/handbook/book.xml
similarity index 98%
rename from ru_RU.KOI8-R/books/handbook/book.sgml
rename to ru_RU.KOI8-R/books/handbook/book.xml
index 8829b1c6cb..d7b86e3340 100644
--- a/ru_RU.KOI8-R/books/handbook/book.sgml
+++ b/ru_RU.KOI8-R/books/handbook/book.xml
@@ -14,7 +14,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/book.sgml,v 1.66 2006/05/19 12:09:01 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/book.xml,v 1.66 2006/05/19 12:09:01 marck Exp $
      Original revision: r27853
 
      TODO: review ENTITY'es
diff --git a/ru_RU.KOI8-R/books/handbook/boot/Makefile b/ru_RU.KOI8-R/books/handbook/boot/Makefile
index 9919893633..4208380379 100644
--- a/ru_RU.KOI8-R/books/handbook/boot/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/boot/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	boot/chapter.sgml
+CHAPTERS= 	boot/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/boot/chapter.sgml b/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/boot/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/boot/chapter.xml
index adc55703d0..2f0d46912b 100644
--- a/ru_RU.KOI8-R/books/handbook/boot/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/boot/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/boot/chapter.sgml,v 1.31 2006/12/28 11:40:46 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/boot/chapter.xml,v 1.31 2006/12/28 11:40:46 marck Exp $
 
      Original revision: r36653
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/chapters.ent b/ru_RU.KOI8-R/books/handbook/chapters.ent
index fee47d0623..101b55ba55 100644
--- a/ru_RU.KOI8-R/books/handbook/chapters.ent
+++ b/ru_RU.KOI8-R/books/handbook/chapters.ent
@@ -10,7 +10,7 @@
 <!--
      �������� ��������� ��� ������� ������� �����������. ������ ��������
      ���������� chap.foo, ��� foo �������� ��������� id ����� �������,
-     � ������������� �������� �������� � ������� .sgml ����� �����������
+     � ������������� �������� �������� � ������� .xml ����� �����������
      � ����� ������� ���������.
 
      ������� ������ ���� ������������� � ������� � ������� ��� ������������.
@@ -58,137 +58,137 @@
 <!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.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.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/ru_RU.KOI8-R/books/handbook/colophon.sgml b/ru_RU.KOI8-R/books/handbook/colophon.xml
similarity index 90%
rename from ru_RU.KOI8-R/books/handbook/colophon.sgml
rename to ru_RU.KOI8-R/books/handbook/colophon.xml
index c3763201e5..fddc7f54dc 100644
--- a/ru_RU.KOI8-R/books/handbook/colophon.sgml
+++ b/ru_RU.KOI8-R/books/handbook/colophon.xml
@@ -3,7 +3,7 @@
      The Russian FreeBSD Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/colophon.sgml,v 1.5 2006/03/07 15:43:17 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/colophon.xml,v 1.5 2006/03/07 15:43:17 marck Exp $
 
      Original revision: r25312
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/config/Makefile b/ru_RU.KOI8-R/books/handbook/config/Makefile
index 0aafcad2b3..61e0a11e20 100644
--- a/ru_RU.KOI8-R/books/handbook/config/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/config/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9819
 #
 
-CHAPTERS= 	config/chapter.sgml
+CHAPTERS= 	config/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/config/chapter.sgml b/ru_RU.KOI8-R/books/handbook/config/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/config/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/config/chapter.xml
index 58bd2129d4..a99290ba37 100644
--- a/ru_RU.KOI8-R/books/handbook/config/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/config/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/config/chapter.sgml,v 1.45 2006/06/20 18:02:32 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/config/chapter.xml,v 1.45 2006/06/20 18:02:32 marck Exp $
 
      Original revision: r27981
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/cutting-edge/Makefile b/ru_RU.KOI8-R/books/handbook/cutting-edge/Makefile
index 10f51f8177..2c44ba4a94 100644
--- a/ru_RU.KOI8-R/books/handbook/cutting-edge/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/cutting-edge/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	cutting-edge/chapter.sgml
+CHAPTERS= 	cutting-edge/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.sgml b/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
index d9eac6e127..c33b28c768 100644
--- a/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.sgml,v 1.52 2006/06/20 18:02:32 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml,v 1.52 2006/06/20 18:02:32 marck Exp $
 
      Original revision: r28061
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/desktop/Makefile b/ru_RU.KOI8-R/books/handbook/desktop/Makefile
index 406b3e4829..7b6e2cf89d 100644
--- a/ru_RU.KOI8-R/books/handbook/desktop/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/desktop/Makefile
@@ -7,7 +7,7 @@
 # Original revision: r14154
 #
 
-CHAPTERS= 	desktop/chapter.sgml
+CHAPTERS= 	desktop/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml b/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
index 1c62f7e939..cd457312d8 100644
--- a/ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml,v 1.19 2006/02/13 11:02:41 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml,v 1.19 2006/02/13 11:02:41 marck Exp $
 
      Original revision: r27071
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/disks/Makefile b/ru_RU.KOI8-R/books/handbook/disks/Makefile
index 01e59c94e4..bbaffe4486 100644
--- a/ru_RU.KOI8-R/books/handbook/disks/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/disks/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	disks/chapter.sgml
+CHAPTERS= 	disks/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/disks/chapter.sgml b/ru_RU.KOI8-R/books/handbook/disks/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/disks/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/disks/chapter.xml
index ba91b88559..21b0bd72c5 100644
--- a/ru_RU.KOI8-R/books/handbook/disks/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/disks/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/disks/chapter.sgml,v 1.88 2007/06/15 13:01:18 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/disks/chapter.xml,v 1.88 2007/06/15 13:01:18 den Exp $
 
      Original revision: r36743
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/eresources/Makefile b/ru_RU.KOI8-R/books/handbook/eresources/Makefile
index a95916111a..5ceac871e7 100644
--- a/ru_RU.KOI8-R/books/handbook/eresources/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/eresources/Makefile
@@ -7,7 +7,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	eresources/chapter.sgml
+CHAPTERS= 	eresources/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/eresources/chapter.sgml b/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/eresources/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
index 8eca30a088..2b8cc70f0a 100644
--- a/ru_RU.KOI8-R/books/handbook/eresources/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/eresources/chapter.sgml,v 1.31 2007/06/26 09:16:37 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/eresources/chapter.xml,v 1.31 2007/06/26 09:16:37 den Exp $
 
      Original revision: r37627
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/filesystems/Makefile b/ru_RU.KOI8-R/books/handbook/filesystems/Makefile
index fa28dca746..53a6cb1221 100644
--- a/ru_RU.KOI8-R/books/handbook/filesystems/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/filesystems/Makefile
@@ -5,7 +5,7 @@
 # Original revision: r32971
 #
 
-CHAPTERS= 	filesystems/chapter.sgml
+CHAPTERS= 	filesystems/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/filesystems/chapter.sgml b/ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml
similarity index 100%
rename from ru_RU.KOI8-R/books/handbook/filesystems/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/filesystems/chapter.xml
diff --git a/ru_RU.KOI8-R/books/handbook/firewalls/Makefile b/ru_RU.KOI8-R/books/handbook/firewalls/Makefile
index 055669c684..7da903bbaf 100644
--- a/ru_RU.KOI8-R/books/handbook/firewalls/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/firewalls/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r23130
 #
 
-CHAPTERS= 	firewalls/chapter.sgml
+CHAPTERS= 	firewalls/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/firewalls/chapter.sgml b/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/firewalls/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
index acbe22cbc7..1b3e8556b1 100644
--- a/ru_RU.KOI8-R/books/handbook/firewalls/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/firewalls/chapter.sgml,v 1.16 2006/06/20 18:02:32 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/firewalls/chapter.xml,v 1.16 2006/06/20 18:02:32 marck Exp $
 
      Original revision: r36653
 
diff --git a/ru_RU.KOI8-R/books/handbook/geom/Makefile b/ru_RU.KOI8-R/books/handbook/geom/Makefile
index e47536878f..f3db8f0dfd 100644
--- a/ru_RU.KOI8-R/books/handbook/geom/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/geom/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r25313
 #
 
-CHAPTERS= 	geom/chapter.sgml
+CHAPTERS= 	geom/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/geom/chapter.sgml b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/geom/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/geom/chapter.xml
index ce2195d8f8..d804ad63f0 100644
--- a/ru_RU.KOI8-R/books/handbook/geom/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/geom/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
      $FreeBSD$
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/geom/chapter.sgml,v 1.11 2007/06/28 06:57:38 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/geom/chapter.xml,v 1.11 2007/06/28 06:57:38 den Exp $
 
      Original revision: r36383
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/install/Makefile b/ru_RU.KOI8-R/books/handbook/install/Makefile
index bd12ad4f19..774f3760b1 100644
--- a/ru_RU.KOI8-R/books/handbook/install/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/install/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	install/chapter.sgml
+CHAPTERS= 	install/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/install/chapter.sgml b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/install/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/install/chapter.xml
index 4211808354..b224fca5e5 100644
--- a/ru_RU.KOI8-R/books/handbook/install/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/install/chapter.sgml,v 1.46 2007/07/13 13:13:07 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/install/chapter.xml,v 1.46 2007/07/13 13:13:07 den Exp $
 
      Original revision: r37417
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/introduction/Makefile b/ru_RU.KOI8-R/books/handbook/introduction/Makefile
index ba6cdacebd..40a19ce84a 100644
--- a/ru_RU.KOI8-R/books/handbook/introduction/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/introduction/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	introduction/chapter.sgml
+CHAPTERS= 	introduction/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/introduction/chapter.sgml b/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/introduction/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
index cc0e2174c8..4949c64566 100644
--- a/ru_RU.KOI8-R/books/handbook/introduction/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/introduction/chapter.sgml,v 1.32 2007/06/25 13:53:00 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/introduction/chapter.xml,v 1.32 2007/06/25 13:53:00 den Exp $
 
      Original revision: r29870
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/kernelconfig/Makefile b/ru_RU.KOI8-R/books/handbook/kernelconfig/Makefile
index 5049b42f86..9e2799bf0d 100644
--- a/ru_RU.KOI8-R/books/handbook/kernelconfig/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/kernelconfig/Makefile
@@ -7,7 +7,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	kernelconfig/chapter.sgml
+CHAPTERS= 	kernelconfig/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.sgml b/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
index 5e93bc3f01..b0c2cf58cf 100644
--- a/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.sgml,v 1.35 2007/06/26 11:42:42 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml,v 1.35 2007/06/26 11:42:42 den Exp $
 
      Original revision: r37856
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/l10n/Makefile b/ru_RU.KOI8-R/books/handbook/l10n/Makefile
index a690c83957..24a28c75d6 100644
--- a/ru_RU.KOI8-R/books/handbook/l10n/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/l10n/Makefile
@@ -7,7 +7,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	l10n/chapter.sgml
+CHAPTERS= 	l10n/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/l10n/chapter.sgml b/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/l10n/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
index da59a5d5a0..287c0bc9d4 100644
--- a/ru_RU.KOI8-R/books/handbook/l10n/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/l10n/chapter.sgml,v 1.20 2007/06/26 11:42:42 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/l10n/chapter.xml,v 1.20 2007/06/26 11:42:42 den Exp $
 
      Original revision: r30225
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/linuxemu/Makefile b/ru_RU.KOI8-R/books/handbook/linuxemu/Makefile
index 9198626381..b357828f89 100644
--- a/ru_RU.KOI8-R/books/handbook/linuxemu/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/linuxemu/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	linuxemu/chapter.sgml
+CHAPTERS= 	linuxemu/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml b/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
index b504c62bc4..2746707174 100644
--- a/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml,v 1.29 2007/06/26 11:42:42 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.xml,v 1.29 2007/06/26 11:42:42 den Exp $
 
      Original revision: r29718
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/mac/Makefile b/ru_RU.KOI8-R/books/handbook/mac/Makefile
index 383038e486..de218d3956 100644
--- a/ru_RU.KOI8-R/books/handbook/mac/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/mac/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r21215
 #
 
-CHAPTERS= 	mac/chapter.sgml
+CHAPTERS= 	mac/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/mac/chapter.sgml b/ru_RU.KOI8-R/books/handbook/mac/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/mac/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/mac/chapter.xml
index cb7732639f..eeb197962e 100644
--- a/ru_RU.KOI8-R/books/handbook/mac/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/mac/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/mac/chapter.sgml,v 1.17 2004/11/26 14:34:37 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/mac/chapter.xml,v 1.17 2004/11/26 14:34:37 den Exp $
 
      Original revision: r22988
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/mail/Makefile b/ru_RU.KOI8-R/books/handbook/mail/Makefile
index 01560afe96..6072265e09 100644
--- a/ru_RU.KOI8-R/books/handbook/mail/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/mail/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	mail/chapter.sgml
+CHAPTERS= 	mail/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/mail/chapter.sgml b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/mail/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/mail/chapter.xml
index 0c2f3b9b45..a1e3ce457a 100644
--- a/ru_RU.KOI8-R/books/handbook/mail/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/mail/chapter.sgml,v 1.36 2007/06/22 11:41:08 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/mail/chapter.xml,v 1.36 2007/06/22 11:41:08 den Exp $
 
      Original revision: r37308
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/mirrors/Makefile b/ru_RU.KOI8-R/books/handbook/mirrors/Makefile
index 764fa3ddc1..cb8329173c 100644
--- a/ru_RU.KOI8-R/books/handbook/mirrors/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/mirrors/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	mirrors/chapter.sgml
+CHAPTERS= 	mirrors/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.sgml b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/mirrors/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
index 2d0bc63981..8473d65ce3 100644
--- a/ru_RU.KOI8-R/books/handbook/mirrors/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/mirrors/chapter.sgml,v 1.39 2006/06/30 12:36:59 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/mirrors/chapter.xml,v 1.39 2006/06/30 12:36:59 marck Exp $
 
      Original revision: r28148
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/multimedia/Makefile b/ru_RU.KOI8-R/books/handbook/multimedia/Makefile
index 269cd4ddfc..5da64fe97e 100644
--- a/ru_RU.KOI8-R/books/handbook/multimedia/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/multimedia/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r13693
 #
 
-CHAPTERS= 	multimedia/chapter.sgml
+CHAPTERS= 	multimedia/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/multimedia/chapter.sgml b/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/multimedia/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
index 16a066607c..d2d867a31c 100644
--- a/ru_RU.KOI8-R/books/handbook/multimedia/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/multimedia/chapter.sgml,v 1.47 2007/06/25 10:41:18 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/multimedia/chapter.xml,v 1.47 2007/06/25 10:41:18 den Exp $
 
      Original revision: r29717
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/network-servers/Makefile b/ru_RU.KOI8-R/books/handbook/network-servers/Makefile
index b25c459b32..cb8ebc2324 100644
--- a/ru_RU.KOI8-R/books/handbook/network-servers/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/network-servers/Makefile
@@ -6,7 +6,7 @@
 #
 # Original revision: r21463
 
-CHAPTERS= 	network-servers/chapter.sgml
+CHAPTERS= 	network-servers/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/network-servers/chapter.sgml b/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/network-servers/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
index 3c09dca725..84ec47cf31 100644
--- a/ru_RU.KOI8-R/books/handbook/network-servers/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/network-servers/chapter.sgml,v 1.33 2006/06/25 08:59:40 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/network-servers/chapter.xml,v 1.33 2006/06/25 08:59:40 marck Exp $
 
      Original revision: r37843
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/pgpkeys/Makefile b/ru_RU.KOI8-R/books/handbook/pgpkeys/Makefile
index ab974dae92..6f37956125 100644
--- a/ru_RU.KOI8-R/books/handbook/pgpkeys/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/pgpkeys/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r16831
 #
 
-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/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.sgml b/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
similarity index 96%
rename from ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
index be2f1bb4ca..3a3dbacd6f 100644
--- a/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml
@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.sgml,v 1.21 2006/01/08 06:20:12 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.xml,v 1.21 2006/01/08 06:20:12 gad Exp $
      $FreeBSD$
 
      Original revision: r26800
diff --git a/ru_RU.KOI8-R/books/handbook/ports/Makefile b/ru_RU.KOI8-R/books/handbook/ports/Makefile
index cf4f2156c1..884222c204 100644
--- a/ru_RU.KOI8-R/books/handbook/ports/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/ports/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	ports/chapter.sgml
+CHAPTERS= 	ports/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/ports/chapter.sgml b/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/ports/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/ports/chapter.xml
index d9ce09f35b..eb51231a68 100644
--- a/ru_RU.KOI8-R/books/handbook/ports/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/ports/chapter.sgml,v 1.67 2005/05/08 07:21:29 andy Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/ports/chapter.xml,v 1.67 2005/05/08 07:21:29 andy Exp $
 
      Original revision: r24463
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/ppp-and-slip/Makefile b/ru_RU.KOI8-R/books/handbook/ppp-and-slip/Makefile
index c1f51ba392..13c7188731 100644
--- a/ru_RU.KOI8-R/books/handbook/ppp-and-slip/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/ppp-and-slip/Makefile
@@ -7,7 +7,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	ppp-and-slip/chapter.sgml
+CHAPTERS= 	ppp-and-slip/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.sgml b/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
index 3de407a85b..e4ee10c1d2 100644
--- a/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.sgml,v 1.12 2004/09/28 08:39:21 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/ppp-and-slip/chapter.xml,v 1.12 2004/09/28 08:39:21 den Exp $
 
      Original revision: r22104
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/preface/preface.sgml b/ru_RU.KOI8-R/books/handbook/preface/preface.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/preface/preface.sgml
rename to ru_RU.KOI8-R/books/handbook/preface/preface.xml
index 2a615d1fde..37ceffff66 100644
--- a/ru_RU.KOI8-R/books/handbook/preface/preface.sgml
+++ b/ru_RU.KOI8-R/books/handbook/preface/preface.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/preface/preface.sgml,v 1.23 2006/05/19 12:09:02 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/preface/preface.xml,v 1.23 2006/05/19 12:09:02 marck Exp $
 
      Original revision: r27853
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/printing/Makefile b/ru_RU.KOI8-R/books/handbook/printing/Makefile
index c5d19b5099..f5eeffe06b 100644
--- a/ru_RU.KOI8-R/books/handbook/printing/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/printing/Makefile
@@ -7,7 +7,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	printing/chapter.sgml
+CHAPTERS= 	printing/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/printing/chapter.sgml b/ru_RU.KOI8-R/books/handbook/printing/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/printing/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/printing/chapter.xml
index 7a0796d229..eb0e773b6f 100644
--- a/ru_RU.KOI8-R/books/handbook/printing/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/printing/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/printing/chapter.sgml,v 1.15 2006/06/25 08:59:40 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/printing/chapter.xml,v 1.15 2006/06/25 08:59:40 marck Exp $
 
      Original revision: r27981
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/security/Makefile b/ru_RU.KOI8-R/books/handbook/security/Makefile
index 0269076547..2d87343a40 100644
--- a/ru_RU.KOI8-R/books/handbook/security/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/security/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	security/chapter.sgml
+CHAPTERS= 	security/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/security/chapter.sgml b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/security/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/security/chapter.xml
index 9bf398537b..8168ae79f6 100644
--- a/ru_RU.KOI8-R/books/handbook/security/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/security/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/security/chapter.sgml,v 1.54 2006/06/30 12:36:59 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/security/chapter.xml,v 1.54 2006/06/30 12:36:59 marck Exp $
 
      Original revision: r28169
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/serialcomms/Makefile b/ru_RU.KOI8-R/books/handbook/serialcomms/Makefile
index dcf1421cf1..287b701d70 100644
--- a/ru_RU.KOI8-R/books/handbook/serialcomms/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/serialcomms/Makefile
@@ -7,7 +7,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	serialcomms/chapter.sgml
+CHAPTERS= 	serialcomms/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.sgml b/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/serialcomms/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
index bd20f6c42c..31aca55c47 100644
--- a/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.sgml,v 1.16 2006/06/25 08:59:40 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml,v 1.16 2006/06/25 08:59:40 marck Exp $
 
      Original revision: r27981
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/users/Makefile b/ru_RU.KOI8-R/books/handbook/users/Makefile
index 1c8fc51935..218c0141c4 100644
--- a/ru_RU.KOI8-R/books/handbook/users/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/users/Makefile
@@ -7,7 +7,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	users/chapter.sgml
+CHAPTERS= 	users/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/users/chapter.sgml b/ru_RU.KOI8-R/books/handbook/users/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/users/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/users/chapter.xml
index ab7d53b80e..f0762b869b 100644
--- a/ru_RU.KOI8-R/books/handbook/users/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/users/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/users/chapter.sgml,v 1.19 2008/05/13 13:46:29 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/users/chapter.xml,v 1.19 2008/05/13 13:46:29 den Exp $
 
      Original revision: r37398
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/vinum/Makefile b/ru_RU.KOI8-R/books/handbook/vinum/Makefile
index 09d8a1798d..68dcb6c9eb 100644
--- a/ru_RU.KOI8-R/books/handbook/vinum/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/vinum/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r13852
 #
 
-CHAPTERS= 	vinum/chapter.sgml
+CHAPTERS= 	vinum/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/vinum/chapter.sgml b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/vinum/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
index a793567a03..d942e95974 100644
--- a/ru_RU.KOI8-R/books/handbook/vinum/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml
@@ -3,7 +3,7 @@
 	The FreeBSD Russian Documentation Project
 
 	$FreeBSD$
-	$FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/vinum/chapter.sgml,v 1.16 2006/06/25 08:59:40 marck Exp $
+	$FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/vinum/chapter.xml,v 1.16 2006/06/25 08:59:40 marck Exp $
 
 	Original revision: r27981
 -->
diff --git a/ru_RU.KOI8-R/books/handbook/x11/Makefile b/ru_RU.KOI8-R/books/handbook/x11/Makefile
index 32965f60c9..1c0d2ef85a 100644
--- a/ru_RU.KOI8-R/books/handbook/x11/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/x11/Makefile
@@ -6,7 +6,7 @@
 # Original revision: r9773
 #
 
-CHAPTERS= 	x11/chapter.sgml
+CHAPTERS= 	x11/chapter.xml
 
 VPATH=		..
 
diff --git a/ru_RU.KOI8-R/books/handbook/x11/chapter.sgml b/ru_RU.KOI8-R/books/handbook/x11/chapter.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/handbook/x11/chapter.sgml
rename to ru_RU.KOI8-R/books/handbook/x11/chapter.xml
index e281e6586c..8e742aa887 100644
--- a/ru_RU.KOI8-R/books/handbook/x11/chapter.sgml
+++ b/ru_RU.KOI8-R/books/handbook/x11/chapter.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/x11/chapter.sgml,v 1.68 2008/05/13 13:46:29 den Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/x11/chapter.xml,v 1.68 2008/05/13 13:46:29 den Exp $
 
      Original revision: r34751
 -->
diff --git a/ru_RU.KOI8-R/books/porters-handbook/Makefile b/ru_RU.KOI8-R/books/porters-handbook/Makefile
index c91b6ed06a..735afce33d 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/Makefile
+++ b/ru_RU.KOI8-R/books/porters-handbook/Makefile
@@ -26,7 +26,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 # Entities
 #SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent
diff --git a/ru_RU.KOI8-R/books/porters-handbook/book.sgml b/ru_RU.KOI8-R/books/porters-handbook/book.xml
similarity index 99%
rename from ru_RU.KOI8-R/books/porters-handbook/book.sgml
rename to ru_RU.KOI8-R/books/porters-handbook/book.xml
index 9281badcf0..d09d3c3953 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/book.sgml
+++ b/ru_RU.KOI8-R/books/porters-handbook/book.xml
@@ -9,7 +9,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml,v 1.136 2006/10/20 09:25:00 marck Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/book.xml,v 1.136 2006/10/20 09:25:00 marck Exp $
 
      Original revision: r39245
 -->
diff --git a/ru_RU.KOI8-R/htdocs/Makefile b/ru_RU.KOI8-R/htdocs/Makefile
index cfdcd7924f..8442d8f8e5 100644
--- a/ru_RU.KOI8-R/htdocs/Makefile
+++ b/ru_RU.KOI8-R/htdocs/Makefile
@@ -16,21 +16,21 @@
 
 # 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+= 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+= 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/ru_RU.KOI8-R/htdocs/about.sgml b/ru_RU.KOI8-R/htdocs/about.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/about.sgml
rename to ru_RU.KOI8-R/htdocs/about.xml
index 39cc7ef0a7..70853eb146 100644
--- a/ru_RU.KOI8-R/htdocs/about.sgml
+++ b/ru_RU.KOI8-R/htdocs/about.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/about.sgml,v 1.3 2006/06/10 11:24:35 gad Exp $
+     $FreeBSDru: frdp/www/ru/about.xml,v 1.3 2006/06/10 11:24:35 gad Exp $
 
      Original revision: 1.14
 -->
diff --git a/ru_RU.KOI8-R/htdocs/applications.sgml b/ru_RU.KOI8-R/htdocs/applications.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/applications.sgml
rename to ru_RU.KOI8-R/htdocs/applications.xml
index 1541898bfb..6bab892e1a 100644
--- a/ru_RU.KOI8-R/htdocs/applications.sgml
+++ b/ru_RU.KOI8-R/htdocs/applications.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/applications.sgml,v 1.14 2005/05/03 10:18:33 andy Exp $
+     $FreeBSDru: frdp/www/ru/applications.xml,v 1.14 2005/05/03 10:18:33 andy Exp $
 
       Original revision: 1.28
 -->
diff --git a/ru_RU.KOI8-R/htdocs/art.sgml b/ru_RU.KOI8-R/htdocs/art.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/art.sgml
rename to ru_RU.KOI8-R/htdocs/art.xml
index a7c4227c8f..68413f9264 100644
--- a/ru_RU.KOI8-R/htdocs/art.sgml
+++ b/ru_RU.KOI8-R/htdocs/art.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/art.sgml,v 1.3 2006/06/10 11:24:35 gad Exp $
+     $FreeBSDru: frdp/www/ru/art.xml,v 1.3 2006/06/10 11:24:35 gad Exp $
 
       Original revision: 1.3
 -->
diff --git a/ru_RU.KOI8-R/htdocs/availability.sgml b/ru_RU.KOI8-R/htdocs/availability.xml
similarity index 92%
rename from ru_RU.KOI8-R/htdocs/availability.sgml
rename to ru_RU.KOI8-R/htdocs/availability.xml
index 117ec37bb9..8b2fa7219b 100644
--- a/ru_RU.KOI8-R/htdocs/availability.sgml
+++ b/ru_RU.KOI8-R/htdocs/availability.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/availability.sgml,v 1.10 2006/06/10 11:24:35 gad Exp $
+     $FreeBSDru: frdp/www/ru/availability.xml,v 1.10 2006/06/10 11:24:35 gad Exp $
 
      Original revision: 1.34
 -->
diff --git a/ru_RU.KOI8-R/htdocs/commercial/Makefile b/ru_RU.KOI8-R/htdocs/commercial/Makefile
index 550fc9a6bc..848c52f427 100644
--- a/ru_RU.KOI8-R/htdocs/commercial/Makefile
+++ b/ru_RU.KOI8-R/htdocs/commercial/Makefile
@@ -11,13 +11,13 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS = 	commercial.sgml
-# DOCS+=  consulting.sgml
-# DOCS+=  consulting_bycat.sgml
-# DOCS+=  hardware.sgml
-# DOCS+=  misc.sgml
-# DOCS+=  software.sgml
-# DOCS+=  software_bycat.sgml
+DOCS = 	commercial.xml
+# DOCS+=  consulting.xml
+# DOCS+=  consulting_bycat.xml
+# DOCS+=  hardware.xml
+# DOCS+=  misc.xml
+# DOCS+=  software.xml
+# DOCS+=  software_bycat.xml
 
 INDEXLINK=commercial.html
 
diff --git a/ru_RU.KOI8-R/htdocs/commercial/commercial.sgml b/ru_RU.KOI8-R/htdocs/commercial/commercial.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/commercial/commercial.sgml
rename to ru_RU.KOI8-R/htdocs/commercial/commercial.xml
index 46aad0db67..10166309e4 100644
--- a/ru_RU.KOI8-R/htdocs/commercial/commercial.sgml
+++ b/ru_RU.KOI8-R/htdocs/commercial/commercial.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/commercial/commercial.sgml,v 1.9 2006/01/17 08:53:40 gad Exp $
+     $FreeBSDru: frdp/www/ru/commercial/commercial.xml,v 1.9 2006/01/17 08:53:40 gad Exp $
 
      Original revision: 1.35
 -->
diff --git a/ru_RU.KOI8-R/htdocs/commercial/includes.sgml b/ru_RU.KOI8-R/htdocs/commercial/includes.xml
similarity index 91%
rename from ru_RU.KOI8-R/htdocs/commercial/includes.sgml
rename to ru_RU.KOI8-R/htdocs/commercial/includes.xml
index 150c6d9dff..fd4d7a75cf 100644
--- a/ru_RU.KOI8-R/htdocs/commercial/includes.sgml
+++ b/ru_RU.KOI8-R/htdocs/commercial/includes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="koi8-r"?>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/commercial/includes.sgml,v 1.5 2003/09/22 07:02:26 den Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/commercial/includes.xml,v 1.5 2003/09/22 07:02:26 den Exp $ -->
 <!-- Original revision: 1.7 -->
 
 <!ENTITY vendorintroduction '
diff --git a/ru_RU.KOI8-R/htdocs/community/Makefile b/ru_RU.KOI8-R/htdocs/community/Makefile
index 3f1828d65c..679460e072 100644
--- a/ru_RU.KOI8-R/htdocs/community/Makefile
+++ b/ru_RU.KOI8-R/htdocs/community/Makefile
@@ -12,7 +12,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   irc.sgml mailinglists.sgml newsgroups.sgml webresources.sgml
+DOCS=   irc.xml mailinglists.xml newsgroups.xml webresources.xml
 
 XMLDOCS+=	social::${XML_EVENTS_EVENTS}:
 
diff --git a/ru_RU.KOI8-R/htdocs/community/irc.sgml b/ru_RU.KOI8-R/htdocs/community/irc.xml
similarity index 94%
rename from ru_RU.KOI8-R/htdocs/community/irc.sgml
rename to ru_RU.KOI8-R/htdocs/community/irc.xml
index 56c94e1917..4d817de8f5 100644
--- a/ru_RU.KOI8-R/htdocs/community/irc.sgml
+++ b/ru_RU.KOI8-R/htdocs/community/irc.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/community/irc.sgml,v 1.2 2006/01/16 20:50:00 gad Exp $
+     $FreeBSDru: frdp/www/ru/community/irc.xml,v 1.2 2006/01/16 20:50:00 gad Exp $
 
      Original revision: 1.4
 -->
diff --git a/ru_RU.KOI8-R/htdocs/community/mailinglists.sgml b/ru_RU.KOI8-R/htdocs/community/mailinglists.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/community/mailinglists.sgml
rename to ru_RU.KOI8-R/htdocs/community/mailinglists.xml
index d33b664bdb..3c7b21f282 100644
--- a/ru_RU.KOI8-R/htdocs/community/mailinglists.sgml
+++ b/ru_RU.KOI8-R/htdocs/community/mailinglists.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/community/mailinglists.sgml,v 1.2 2006/01/16 20:50:00 gad Exp $
+     $FreeBSDru: frdp/www/ru/community/mailinglists.xml,v 1.2 2006/01/16 20:50:00 gad Exp $
 
      Original revision: 1.18
 -->
diff --git a/ru_RU.KOI8-R/htdocs/community/newsgroups.sgml b/ru_RU.KOI8-R/htdocs/community/newsgroups.xml
similarity index 93%
rename from ru_RU.KOI8-R/htdocs/community/newsgroups.sgml
rename to ru_RU.KOI8-R/htdocs/community/newsgroups.xml
index fe5dc7200d..2a1d664c30 100644
--- a/ru_RU.KOI8-R/htdocs/community/newsgroups.sgml
+++ b/ru_RU.KOI8-R/htdocs/community/newsgroups.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/community/newsgroups.sgml,v 1.1 2005/10/31 13:38:09 gad Exp $
+     $FreeBSDru: frdp/www/ru/community/newsgroups.xml,v 1.1 2005/10/31 13:38:09 gad Exp $
 
      Original revision: 1.3
 -->
diff --git a/ru_RU.KOI8-R/htdocs/community/webresources.sgml b/ru_RU.KOI8-R/htdocs/community/webresources.xml
similarity index 95%
rename from ru_RU.KOI8-R/htdocs/community/webresources.sgml
rename to ru_RU.KOI8-R/htdocs/community/webresources.xml
index 2fb338c9b3..08904a0d2d 100644
--- a/ru_RU.KOI8-R/htdocs/community/webresources.sgml
+++ b/ru_RU.KOI8-R/htdocs/community/webresources.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/community/webresources.sgml,v 1.3 2006/01/17 14:10:41 gad Exp $
+     $FreeBSDru: frdp/www/ru/community/webresources.xml,v 1.3 2006/01/17 14:10:41 gad Exp $
 
      Original revision: 1.2
 -->
diff --git a/ru_RU.KOI8-R/htdocs/copyright/Makefile b/ru_RU.KOI8-R/htdocs/copyright/Makefile
index c4d5a03344..4894c850f5 100644
--- a/ru_RU.KOI8-R/htdocs/copyright/Makefile
+++ b/ru_RU.KOI8-R/htdocs/copyright/Makefile
@@ -11,12 +11,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/ru_RU.KOI8-R/htdocs/copyright/copyright.sgml b/ru_RU.KOI8-R/htdocs/copyright/copyright.xml
similarity index 93%
rename from ru_RU.KOI8-R/htdocs/copyright/copyright.sgml
rename to ru_RU.KOI8-R/htdocs/copyright/copyright.xml
index c2191efe88..da0475255d 100644
--- a/ru_RU.KOI8-R/htdocs/copyright/copyright.sgml
+++ b/ru_RU.KOI8-R/htdocs/copyright/copyright.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/copyright/copyright.sgml,v 1.5 2003/10/07 12:42:06 den Exp $
+     $FreeBSDru: frdp/www/ru/copyright/copyright.xml,v 1.5 2003/10/07 12:42:06 den Exp $
 
      Original revision: 1.13
 -->
diff --git a/ru_RU.KOI8-R/htdocs/copyright/daemon.sgml b/ru_RU.KOI8-R/htdocs/copyright/daemon.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/copyright/daemon.sgml
rename to ru_RU.KOI8-R/htdocs/copyright/daemon.xml
index b229d7c762..ec3d27d7b9 100644
--- a/ru_RU.KOI8-R/htdocs/copyright/daemon.sgml
+++ b/ru_RU.KOI8-R/htdocs/copyright/daemon.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/copyright/daemon.sgml,v 1.8 2004/09/21 07:31:05 den Exp $
+     $FreeBSDru: frdp/www/ru/copyright/daemon.xml,v 1.8 2004/09/21 07:31:05 den Exp $
 
      Original revision: 1.31
 -->
diff --git a/ru_RU.KOI8-R/htdocs/copyright/freebsd-doc-license.sgml b/ru_RU.KOI8-R/htdocs/copyright/freebsd-doc-license.xml
similarity index 100%
rename from ru_RU.KOI8-R/htdocs/copyright/freebsd-doc-license.sgml
rename to ru_RU.KOI8-R/htdocs/copyright/freebsd-doc-license.xml
diff --git a/ru_RU.KOI8-R/htdocs/copyright/freebsd-license.sgml b/ru_RU.KOI8-R/htdocs/copyright/freebsd-license.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/copyright/freebsd-license.sgml
rename to ru_RU.KOI8-R/htdocs/copyright/freebsd-license.xml
index 0e4a3beddd..23bc3739f2 100644
--- a/ru_RU.KOI8-R/htdocs/copyright/freebsd-license.sgml
+++ b/ru_RU.KOI8-R/htdocs/copyright/freebsd-license.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/copyright/freebsd-license.sgml,v 1.7 2004/02/04 10:49:36 den Exp $
+     $FreeBSDru: frdp/www/ru/copyright/freebsd-license.xml,v 1.7 2004/02/04 10:49:36 den Exp $
 
      Original revision: 1.24
 -->
diff --git a/ru_RU.KOI8-R/htdocs/copyright/license.sgml b/ru_RU.KOI8-R/htdocs/copyright/license.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/copyright/license.sgml
rename to ru_RU.KOI8-R/htdocs/copyright/license.xml
index 5a94b44a69..9f1578e338 100644
--- a/ru_RU.KOI8-R/htdocs/copyright/license.sgml
+++ b/ru_RU.KOI8-R/htdocs/copyright/license.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/copyright/license.sgml,v 1.5 2004/09/21 07:31:05 den Exp $
+     $FreeBSDru: frdp/www/ru/copyright/license.xml,v 1.5 2004/09/21 07:31:05 den Exp $
 
      Original revision: 1.12
 -->
diff --git a/ru_RU.KOI8-R/htdocs/copyright/trademarks.sgml b/ru_RU.KOI8-R/htdocs/copyright/trademarks.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/copyright/trademarks.sgml
rename to ru_RU.KOI8-R/htdocs/copyright/trademarks.xml
index 79905e8a9f..66d947d97e 100644
--- a/ru_RU.KOI8-R/htdocs/copyright/trademarks.sgml
+++ b/ru_RU.KOI8-R/htdocs/copyright/trademarks.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/copyright/trademarks.sgml,v 1.3 2003/11/11 11:48:26 den Exp $
+     $FreeBSDru: frdp/www/ru/copyright/trademarks.xml,v 1.3 2003/11/11 11:48:26 den Exp $
 
      Original revision: 1.19
 -->
diff --git a/ru_RU.KOI8-R/htdocs/developers.sgml b/ru_RU.KOI8-R/htdocs/developers.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/developers.sgml
rename to ru_RU.KOI8-R/htdocs/developers.xml
index 0d7f650799..8838ba69d8 100644
--- a/ru_RU.KOI8-R/htdocs/developers.sgml
+++ b/ru_RU.KOI8-R/htdocs/developers.xml
@@ -7,7 +7,7 @@ allows multiple documents to use the abbreviated entities, and allows
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSDru: frdp/www/ru/developers.sgml,v 1.15 2006/02/18 18:29:44 gad Exp $
+$FreeBSDru: frdp/www/ru/developers.xml,v 1.15 2006/02/18 18:29:44 gad Exp $
 $FreeBSD$
 
 Original revision: 1.124
@@ -188,7 +188,7 @@ Original revision: 1.124
 <!ENTITY a.wpaul "Bill Paul">
 <!ENTITY a.yar "Yar Tikhiy">
 
-<!-- Below we list the various hats.  This is used in internal/staff.sgml
+<!-- Below we list the various hats.  This is used in internal/staff.xml
 so that we may keep a list of hat owners and modify only this file. -->
 
 <!-- FreeBSD Bugmeister -->
diff --git a/ru_RU.KOI8-R/htdocs/developers/Makefile b/ru_RU.KOI8-R/htdocs/developers/Makefile
index 71ea3754a7..123947a864 100644
--- a/ru_RU.KOI8-R/htdocs/developers/Makefile
+++ b/ru_RU.KOI8-R/htdocs/developers/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   cvs.sgml
+DOCS=   cvs.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/developers/cvs.sgml b/ru_RU.KOI8-R/htdocs/developers/cvs.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/developers/cvs.sgml
rename to ru_RU.KOI8-R/htdocs/developers/cvs.xml
index b4b3cd3ae8..991c81ff96 100644
--- a/ru_RU.KOI8-R/htdocs/developers/cvs.sgml
+++ b/ru_RU.KOI8-R/htdocs/developers/cvs.xml
@@ -4,7 +4,7 @@
 <!ENTITY title "CVS �����������">
 ]>
 
-<!-- $FreeBSDru: frdp/www/ru/developers/cvs.sgml,v 1.1 2006/02/18 18:20:33 gad Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/developers/cvs.xml,v 1.1 2006/02/18 18:20:33 gad Exp $ -->
 <!-- $FreeBSD$ -->
 <!-- Original revision: 1.3 -->
 
diff --git a/ru_RU.KOI8-R/htdocs/docproj/Makefile b/ru_RU.KOI8-R/htdocs/docproj/Makefile
index f6cfea435a..e385e88628 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/Makefile
+++ b/ru_RU.KOI8-R/htdocs/docproj/Makefile
@@ -15,15 +15,15 @@
 .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=   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
 
 INDEXLINK= docproj.html
 
diff --git a/ru_RU.KOI8-R/htdocs/docproj/current.sgml b/ru_RU.KOI8-R/htdocs/docproj/current.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/docproj/current.sgml
rename to ru_RU.KOI8-R/htdocs/docproj/current.xml
index c26cf8128a..648a230b5c 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/current.sgml
+++ b/ru_RU.KOI8-R/htdocs/docproj/current.xml
@@ -17,7 +17,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docproj/current.sgml,v 1.24 2006/06/10 05:11:42 gad Exp $
+     $FreeBSDru: frdp/www/ru/docproj/current.xml,v 1.24 2006/06/10 05:11:42 gad Exp $
 
      Original revision: 1.87
 -->
@@ -111,7 +111,7 @@
     ��������� (������� � ������ �� ������) ������������ � ������ Chicago
     Manual of Style ��� ������ ����������, ����������� ���������� �, �����
     ����� �������, ������������ ���������.  ����������, ����������� ������
-    CVS ��������� ������ chapter.sgml, ����� ���������������� ���������
+    CVS ��������� ������ chapter.xml, ����� ���������������� ���������
     ������� ��� ������������ ������ ����������.  �������� ����� ��������
     ����� ��������� � ��������� � ������������ ������� ����� � �������
     ����������� � ������� PostScript, ��� ��� ������ ������, ����� ���
diff --git a/ru_RU.KOI8-R/htdocs/docproj/doc-set.sgml b/ru_RU.KOI8-R/htdocs/docproj/doc-set.xml
similarity index 95%
rename from ru_RU.KOI8-R/htdocs/docproj/doc-set.sgml
rename to ru_RU.KOI8-R/htdocs/docproj/doc-set.xml
index 694d7a1456..637b590d8c 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/doc-set.sgml
+++ b/ru_RU.KOI8-R/htdocs/docproj/doc-set.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docproj/doc-set.sgml,v 1.9 2006/06/10 05:11:42 gad Exp $
+     $FreeBSDru: frdp/www/ru/docproj/doc-set.xml,v 1.9 2006/06/10 05:11:42 gad Exp $
 
      Original revision: 1.13
 -->
diff --git a/ru_RU.KOI8-R/htdocs/docproj/docproj.sgml b/ru_RU.KOI8-R/htdocs/docproj/docproj.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/docproj/docproj.sgml
rename to ru_RU.KOI8-R/htdocs/docproj/docproj.xml
index 7c15c37de3..e07abcbb0b 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/docproj.sgml
+++ b/ru_RU.KOI8-R/htdocs/docproj/docproj.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docproj/docproj.sgml,v 1.6 2004/02/04 10:49:36 den Exp $
+     $FreeBSDru: frdp/www/ru/docproj/docproj.xml,v 1.6 2004/02/04 10:49:36 den Exp $
 
      Original revision: 1.17
 -->
diff --git a/ru_RU.KOI8-R/htdocs/docproj/handbook.sgml b/ru_RU.KOI8-R/htdocs/docproj/handbook.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/docproj/handbook.sgml
rename to ru_RU.KOI8-R/htdocs/docproj/handbook.xml
index 3626744957..f529d35b3e 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/handbook.sgml
+++ b/ru_RU.KOI8-R/htdocs/docproj/handbook.xml
@@ -11,7 +11,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docproj/handbook.sgml,v 1.5 2006/06/10 05:11:42 gad Exp $
+     $FreeBSDru: frdp/www/ru/docproj/handbook.xml,v 1.5 2006/06/10 05:11:42 gad Exp $
 
      Original revision: 1.17
 -->
diff --git a/ru_RU.KOI8-R/htdocs/docproj/handbook3.sgml b/ru_RU.KOI8-R/htdocs/docproj/handbook3.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/docproj/handbook3.sgml
rename to ru_RU.KOI8-R/htdocs/docproj/handbook3.xml
index 0021545fa8..1a96eed51e 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/handbook3.sgml
+++ b/ru_RU.KOI8-R/htdocs/docproj/handbook3.xml
@@ -11,7 +11,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docproj/handbook3.sgml,v 1.6 2004/03/10 13:28:20 den Exp $
+     $FreeBSDru: frdp/www/ru/docproj/handbook3.xml,v 1.6 2004/03/10 13:28:20 den Exp $
 
      Original revision: 1.29
 -->
diff --git a/ru_RU.KOI8-R/htdocs/docproj/sgml.sgml b/ru_RU.KOI8-R/htdocs/docproj/sgml.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/docproj/sgml.sgml
rename to ru_RU.KOI8-R/htdocs/docproj/sgml.xml
index f7c895c8f6..1ab4623634 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/sgml.sgml
+++ b/ru_RU.KOI8-R/htdocs/docproj/sgml.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docproj/sgml.sgml,v 1.10 2006/06/10 05:11:42 gad Exp $
+     $FreeBSDru: frdp/www/ru/docproj/sgml.xml,v 1.10 2006/06/10 05:11:42 gad Exp $
 
      Original revision: 1.26
 -->
diff --git a/ru_RU.KOI8-R/htdocs/docproj/submitting.sgml b/ru_RU.KOI8-R/htdocs/docproj/submitting.xml
similarity index 94%
rename from ru_RU.KOI8-R/htdocs/docproj/submitting.sgml
rename to ru_RU.KOI8-R/htdocs/docproj/submitting.xml
index 59883b268e..238ce06f81 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/submitting.sgml
+++ b/ru_RU.KOI8-R/htdocs/docproj/submitting.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docproj/submitting.sgml,v 1.9 2004/09/21 07:31:05 den Exp $
+     $FreeBSDru: frdp/www/ru/docproj/submitting.xml,v 1.9 2004/09/21 07:31:05 den Exp $
 
      Original revision: 1.14
 -->
@@ -113,17 +113,17 @@
   <ol>
     <li>
       <p>������� ����� �����, ������� ����������� ������.  ���� ��
-	��������� <tt>foo.sgml</tt>, ���������</p>
+	��������� <tt>foo.xml</tt>, ���������</p>
 
       <pre>
-        % <b>cp foo.sgml foo.sgml.old</b>
+        % <b>cp foo.xml foo.xml.old</b>
       </pre>
     </li>
 
-    <li><p>����� ������� ���� ��������� � foo.sgml</p>
+    <li><p>����� ������� ���� ��������� � foo.xml</p>
 
       <pre>
-        % <b>vi foo.sgml</b>
+        % <b>vi foo.xml</b>
         ... ���� ���� ���� ...
 
         ... ��������� ���������, ���� ��������, � ���� �������� ...
@@ -133,7 +133,7 @@
     <li><p>������ diff.  �������, ��� ��������:</p>
 
       <pre>
-        % <b>diff -ru foo.sgml.old foo.sgml > foo.diff</b>
+        % <b>diff -ru foo.xml.old foo.xml > foo.diff</b>
       </pre>
 
       <p>����� ����������� �������� ������� ����� ����� ������� � ������
diff --git a/ru_RU.KOI8-R/htdocs/docproj/translations.sgml b/ru_RU.KOI8-R/htdocs/docproj/translations.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/docproj/translations.sgml
rename to ru_RU.KOI8-R/htdocs/docproj/translations.xml
index 1b1e53a156..b481faf8d9 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/translations.sgml
+++ b/ru_RU.KOI8-R/htdocs/docproj/translations.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docproj/translations.sgml,v 1.21 2006/05/20 14:36:16 andy Exp $
+     $FreeBSDru: frdp/www/ru/docproj/translations.xml,v 1.21 2006/05/20 14:36:16 andy Exp $
 
      Original revision: 1.84
 -->
diff --git a/ru_RU.KOI8-R/htdocs/docproj/who.sgml b/ru_RU.KOI8-R/htdocs/docproj/who.xml
similarity index 95%
rename from ru_RU.KOI8-R/htdocs/docproj/who.sgml
rename to ru_RU.KOI8-R/htdocs/docproj/who.xml
index e8cd6aef05..41e5e194fa 100644
--- a/ru_RU.KOI8-R/htdocs/docproj/who.sgml
+++ b/ru_RU.KOI8-R/htdocs/docproj/who.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docproj/who.sgml,v 1.8 2006/06/10 05:11:42 gad Exp $
+     $FreeBSDru: frdp/www/ru/docproj/who.xml,v 1.8 2006/06/10 05:11:42 gad Exp $
 
      Original revision: 1.13
 -->
diff --git a/ru_RU.KOI8-R/htdocs/docs.sgml b/ru_RU.KOI8-R/htdocs/docs.xml
similarity index 91%
rename from ru_RU.KOI8-R/htdocs/docs.sgml
rename to ru_RU.KOI8-R/htdocs/docs.xml
index dd12bce21e..279108199b 100644
--- a/ru_RU.KOI8-R/htdocs/docs.sgml
+++ b/ru_RU.KOI8-R/htdocs/docs.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docs.sgml,v 1.50 2005/12/23 15:14:21 gad Exp $
+     $FreeBSDru: frdp/www/ru/docs.xml,v 1.50 2005/12/23 15:14:21 gad Exp $
 
      Original revision: 1.194
 -->
diff --git a/ru_RU.KOI8-R/htdocs/docs/Makefile b/ru_RU.KOI8-R/htdocs/docs/Makefile
index 89f6bc0c1a..14e01f8a87 100644
--- a/ru_RU.KOI8-R/htdocs/docs/Makefile
+++ b/ru_RU.KOI8-R/htdocs/docs/Makefile
@@ -10,6 +10,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   books.sgml man.sgml webresources.sgml
+DOCS=   books.xml man.xml webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/docs/books.sgml b/ru_RU.KOI8-R/htdocs/docs/books.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/docs/books.sgml
rename to ru_RU.KOI8-R/htdocs/docs/books.xml
index 777360b3fb..1b24267ce2 100644
--- a/ru_RU.KOI8-R/htdocs/docs/books.sgml
+++ b/ru_RU.KOI8-R/htdocs/docs/books.xml
@@ -12,7 +12,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docs/books.sgml,v 1.3 2006/07/18 09:55:10 den Exp $
+     $FreeBSDru: frdp/www/ru/docs/books.xml,v 1.3 2006/07/18 09:55:10 den Exp $
 
      Original revision: 1.21
 -->
diff --git a/ru_RU.KOI8-R/htdocs/docs/man.sgml b/ru_RU.KOI8-R/htdocs/docs/man.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/docs/man.sgml
rename to ru_RU.KOI8-R/htdocs/docs/man.xml
index 9738ed448f..434b775713 100644
--- a/ru_RU.KOI8-R/htdocs/docs/man.sgml
+++ b/ru_RU.KOI8-R/htdocs/docs/man.xml
@@ -9,7 +9,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docs/man.sgml,v 1.2 2006/07/18 09:55:10 den Exp $
+     $FreeBSDru: frdp/www/ru/docs/man.xml,v 1.2 2006/07/18 09:55:10 den Exp $
      Original revision: 1.7
 -->
 
diff --git a/ru_RU.KOI8-R/htdocs/docs/webresources.sgml b/ru_RU.KOI8-R/htdocs/docs/webresources.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/docs/webresources.sgml
rename to ru_RU.KOI8-R/htdocs/docs/webresources.xml
index 1c53fb6a20..262bdacf5b 100644
--- a/ru_RU.KOI8-R/htdocs/docs/webresources.sgml
+++ b/ru_RU.KOI8-R/htdocs/docs/webresources.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/docs/webresources.sgml,v 1.2 2006/07/18 09:55:10 den Exp $
+     $FreeBSDru: frdp/www/ru/docs/webresources.xml,v 1.2 2006/07/18 09:55:10 den Exp $
      Original revision: 1.6
 -->
 
diff --git a/ru_RU.KOI8-R/htdocs/donations/Makefile b/ru_RU.KOI8-R/htdocs/donations/Makefile
index 5efd028841..a9164bb492 100644
--- a/ru_RU.KOI8-R/htdocs/donations/Makefile
+++ b/ru_RU.KOI8-R/htdocs/donations/Makefile
@@ -9,6 +9,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/ru_RU.KOI8-R/htdocs/donations/donors.sgml b/ru_RU.KOI8-R/htdocs/donations/donors.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/donations/donors.sgml
rename to ru_RU.KOI8-R/htdocs/donations/donors.xml
index 9e42a842d3..87016813f2 100644
--- a/ru_RU.KOI8-R/htdocs/donations/donors.sgml
+++ b/ru_RU.KOI8-R/htdocs/donations/donors.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/donations/donors.sgml,v 1.11 2006/05/21 17:02:46 andy Exp $
+     $FreeBSDru: frdp/www/ru/donations/donors.xml,v 1.11 2006/05/21 17:02:46 andy Exp $
 
      Original revision: 1.315
 -->
diff --git a/ru_RU.KOI8-R/htdocs/donations/index.sgml b/ru_RU.KOI8-R/htdocs/donations/index.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/donations/index.sgml
rename to ru_RU.KOI8-R/htdocs/donations/index.xml
index fb71291c9f..0fd5101fb5 100644
--- a/ru_RU.KOI8-R/htdocs/donations/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/donations/index.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/donations/index.sgml,v 1.4 2004/09/21 07:31:05 den Exp $
+     $FreeBSDru: frdp/www/ru/donations/index.xml,v 1.4 2004/09/21 07:31:05 den Exp $
 
      Original revision: 1.11
 -->
diff --git a/ru_RU.KOI8-R/htdocs/donations/wantlist.sgml b/ru_RU.KOI8-R/htdocs/donations/wantlist.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/donations/wantlist.sgml
rename to ru_RU.KOI8-R/htdocs/donations/wantlist.xml
index db9ce7bfb8..42b9b0db12 100644
--- a/ru_RU.KOI8-R/htdocs/donations/wantlist.sgml
+++ b/ru_RU.KOI8-R/htdocs/donations/wantlist.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/donations/wantlist.sgml,v 1.12 2005/06/15 18:16:21 andy Exp $
+     $FreeBSDru: frdp/www/ru/donations/wantlist.xml,v 1.12 2005/06/15 18:16:21 andy Exp $
 
      Original revision: 1.336
 -->
diff --git a/ru_RU.KOI8-R/htdocs/events/2003/Makefile b/ru_RU.KOI8-R/htdocs/events/2003/Makefile
index 7693dfc918..9c43754b31 100644
--- a/ru_RU.KOI8-R/htdocs/events/2003/Makefile
+++ b/ru_RU.KOI8-R/htdocs/events/2003/Makefile
@@ -14,6 +14,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	bsdcon-devsummit.sgml
+DOCS?=	bsdcon-devsummit.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/events/2003/bsdcon-devsummit.sgml b/ru_RU.KOI8-R/htdocs/events/2003/bsdcon-devsummit.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/events/2003/bsdcon-devsummit.sgml
rename to ru_RU.KOI8-R/htdocs/events/2003/bsdcon-devsummit.xml
index d872db41fb..d31a4dd2ef 100644
--- a/ru_RU.KOI8-R/htdocs/events/2003/bsdcon-devsummit.sgml
+++ b/ru_RU.KOI8-R/htdocs/events/2003/bsdcon-devsummit.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/events/2003/bsdcon-devsummit.sgml,v 1.2 2004/09/21 07:31:06 den Exp $
+     $FreeBSDru: frdp/www/ru/events/2003/bsdcon-devsummit.xml,v 1.2 2004/09/21 07:31:06 den Exp $
 
      Original revision: 1.1
 -->
diff --git a/ru_RU.KOI8-R/htdocs/features.sgml b/ru_RU.KOI8-R/htdocs/features.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/features.sgml
rename to ru_RU.KOI8-R/htdocs/features.xml
index ab70cdb5fe..54b7394e05 100644
--- a/ru_RU.KOI8-R/htdocs/features.sgml
+++ b/ru_RU.KOI8-R/htdocs/features.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/features.sgml,v 1.12 2004/09/21 08:00:15 den Exp $
+     $FreeBSDru: frdp/www/ru/features.xml,v 1.12 2004/09/21 08:00:15 den Exp $
 
      Original revision: 1.34
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/Makefile b/ru_RU.KOI8-R/htdocs/gnome/Makefile
index 2b9615c78e..418b27f593 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/Makefile
+++ b/ru_RU.KOI8-R/htdocs/gnome/Makefile
@@ -15,8 +15,8 @@
 SUBDIR=		docs
 #SUBDIR+=	images
 
-DOCS=	screenshots.sgml
-DOCS+=	contact.sgml
+DOCS=	screenshots.xml
+DOCS+=	contact.xml
 
 DATA=	index.html newsflash.html news.rdf
 
diff --git a/ru_RU.KOI8-R/htdocs/gnome/contact.sgml b/ru_RU.KOI8-R/htdocs/gnome/contact.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/gnome/contact.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/contact.xml
index c2cc9e4b8d..4dae0417f8 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/contact.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/contact.xml
@@ -3,7 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/gnome/contact.sgml,v 1.4 2004/09/21 07:31:06 den Exp $
+     $FreeBSDru: frdp/www/ru/gnome/contact.xml,v 1.4 2004/09/21 07:31:06 den Exp $
 
      Original revision: 1.17
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/docs/Makefile b/ru_RU.KOI8-R/htdocs/gnome/docs/Makefile
index 2fdeb2d98f..16ecb93763 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/docs/Makefile
+++ b/ru_RU.KOI8-R/htdocs/gnome/docs/Makefile
@@ -14,15 +14,15 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	faq2.sgml
-DOCS+=	gnome_porting.sgml
-DOCS+=	gnome1_porting.sgml
-DOCS+=	gnome2_porting.sgml
-DOCS+=	porting.sgml
-DOCS+=	bugging.sgml
-DOCS+=  volunteer.sgml
-DOCS+=	knownissues.sgml
-DOCS+=	develfaq.sgml
-DOCS+=	example-Makefile.sgml
+DOCS=	faq2.xml
+DOCS+=	gnome_porting.xml
+DOCS+=	gnome1_porting.xml
+DOCS+=	gnome2_porting.xml
+DOCS+=	porting.xml
+DOCS+=	bugging.xml
+DOCS+=  volunteer.xml
+DOCS+=	knownissues.xml
+DOCS+=	develfaq.xml
+DOCS+=	example-Makefile.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/gnome/docs/bugging.sgml b/ru_RU.KOI8-R/htdocs/gnome/docs/bugging.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/gnome/docs/bugging.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/docs/bugging.xml
index 284343c040..ba7a600739 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/docs/bugging.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/docs/bugging.xml
@@ -3,7 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/gnome/docs/bugging.sgml,v 1.2 2004/09/21 07:31:06 den Exp $
+     $FreeBSDru: frdp/www/ru/gnome/docs/bugging.xml,v 1.2 2004/09/21 07:31:06 den Exp $
 
      Original revision: 1.9
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/docs/develfaq.sgml b/ru_RU.KOI8-R/htdocs/gnome/docs/develfaq.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/gnome/docs/develfaq.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/docs/develfaq.xml
index 3334ffb502..23e4b4ed34 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/docs/develfaq.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/docs/develfaq.xml
@@ -3,7 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/gnome/docs/develfaq.sgml,v 1.3 2004/09/21 07:31:06 den Exp $
+     $FreeBSDru: frdp/www/ru/gnome/docs/develfaq.xml,v 1.3 2004/09/21 07:31:06 den Exp $
 
      Original revision: 1.9
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/docs/example-Makefile.sgml b/ru_RU.KOI8-R/htdocs/gnome/docs/example-Makefile.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/gnome/docs/example-Makefile.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/docs/example-Makefile.xml
index f20d29ed9e..6d8417bacd 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/docs/example-Makefile.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/docs/example-Makefile.xml
@@ -3,7 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/gnome/docs/example-Makefile.sgml,v 1.2 2004/09/21 07:31:07 den Exp $
+     $FreeBSDru: frdp/www/ru/gnome/docs/example-Makefile.xml,v 1.2 2004/09/21 07:31:07 den Exp $
 
      Original revision: 1.3
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/docs/faq2.sgml b/ru_RU.KOI8-R/htdocs/gnome/docs/faq2.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/gnome/docs/faq2.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/docs/faq2.xml
index 9000ad1508..48ca0c6607 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/docs/faq2.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/docs/faq2.xml
@@ -3,7 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/gnome/docs/faq2.sgml,v 1.16 2005/06/04 18:37:40 andy Exp $
+     $FreeBSDru: frdp/www/ru/gnome/docs/faq2.xml,v 1.16 2005/06/04 18:37:40 andy Exp $
 
      Original revision: 1.91
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/docs/gnome2_porting.sgml b/ru_RU.KOI8-R/htdocs/gnome/docs/gnome2_porting.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/gnome/docs/gnome2_porting.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/docs/gnome2_porting.xml
index 39f4e633f0..8daa3b6731 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/docs/gnome2_porting.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/docs/gnome2_porting.xml
@@ -3,7 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/gnome/docs/gnome2_porting.sgml,v 1.3 2004/09/21 07:31:07 den Exp $
+     $FreeBSDru: frdp/www/ru/gnome/docs/gnome2_porting.xml,v 1.3 2004/09/21 07:31:07 den Exp $
 
      Original revision: 1.8
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/docs/gnome_porting.sgml b/ru_RU.KOI8-R/htdocs/gnome/docs/gnome_porting.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/gnome/docs/gnome_porting.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/docs/gnome_porting.xml
index 9a7ba6c7b9..83d9a7a9a3 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/docs/gnome_porting.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/docs/gnome_porting.xml
@@ -3,7 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/gnome/docs/gnome_porting.sgml,v 1.3 2004/09/21 07:31:07 den Exp $
+     $FreeBSDru: frdp/www/ru/gnome/docs/gnome_porting.xml,v 1.3 2004/09/21 07:31:07 den Exp $
 
      Original revision: 1.7
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/docs/knownissues.sgml b/ru_RU.KOI8-R/htdocs/gnome/docs/knownissues.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/gnome/docs/knownissues.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/docs/knownissues.xml
index 956700037b..1cece7fadd 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/docs/knownissues.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/docs/knownissues.xml
@@ -3,7 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/gnome/docs/knownissues.sgml,v 1.3 2004/09/21 07:31:07 den Exp $
+     $FreeBSDru: frdp/www/ru/gnome/docs/knownissues.xml,v 1.3 2004/09/21 07:31:07 den Exp $
 
      Original revision: 1.9
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/docs/porting.sgml b/ru_RU.KOI8-R/htdocs/gnome/docs/porting.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/gnome/docs/porting.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/docs/porting.xml
index 693213226e..ad46e3be5e 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/docs/porting.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/docs/porting.xml
@@ -3,7 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/gnome/docs/porting.sgml,v 1.4 2004/09/21 07:31:07 den Exp $
+     $FreeBSDru: frdp/www/ru/gnome/docs/porting.xml,v 1.4 2004/09/21 07:31:07 den Exp $
 
      Original revision: 1.34
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/docs/volunteer.sgml b/ru_RU.KOI8-R/htdocs/gnome/docs/volunteer.xml
similarity index 95%
rename from ru_RU.KOI8-R/htdocs/gnome/docs/volunteer.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/docs/volunteer.xml
index 9fde234f46..dd6748f9a4 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/docs/volunteer.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/docs/volunteer.xml
@@ -3,7 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/gnome/docs/volunteer.sgml,v 1.4 2004/09/21 07:31:07 den Exp $
+     $FreeBSDru: frdp/www/ru/gnome/docs/volunteer.xml,v 1.4 2004/09/21 07:31:07 den Exp $
 
      Original revision: 1.7
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/includes.sgml b/ru_RU.KOI8-R/htdocs/gnome/includes.xml
similarity index 80%
rename from ru_RU.KOI8-R/htdocs/gnome/includes.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/includes.xml
index 82e4018e46..a9bd71d6d9 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/includes.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/includes.xml
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/www/ru/gnome/includes.sgml,v 1.3 2005/06/04 15:38:04 andy Exp $
+     $FreeBSDru: frdp/www/ru/gnome/includes.xml,v 1.3 2005/06/04 15:38:04 andy Exp $
 
      Original revision: 1.10
 -->
diff --git a/ru_RU.KOI8-R/htdocs/gnome/screenshots.sgml b/ru_RU.KOI8-R/htdocs/gnome/screenshots.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/gnome/screenshots.sgml
rename to ru_RU.KOI8-R/htdocs/gnome/screenshots.xml
index 17a15b8661..e16b83074d 100644
--- a/ru_RU.KOI8-R/htdocs/gnome/screenshots.sgml
+++ b/ru_RU.KOI8-R/htdocs/gnome/screenshots.xml
@@ -3,7 +3,7 @@
 "http://www.FreeBSD.org/XML/doc/share/sgml/xhtml10-freebsd.dtd" [
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/gnome/screenshots.sgml,v 1.3 2004/09/21 07:31:06 den Exp $
+     $FreeBSDru: frdp/www/ru/gnome/screenshots.xml,v 1.3 2004/09/21 07:31:06 den Exp $
 
      Original revision: 1.27
 -->
diff --git a/ru_RU.KOI8-R/htdocs/handbook/Makefile b/ru_RU.KOI8-R/htdocs/handbook/Makefile
index efc4759257..f513b27e5e 100644
--- a/ru_RU.KOI8-R/htdocs/handbook/Makefile
+++ b/ru_RU.KOI8-R/htdocs/handbook/Makefile
@@ -9,6 +9,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS = index.sgml
+DOCS = index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/handbook/index.sgml b/ru_RU.KOI8-R/htdocs/handbook/index.xml
similarity index 92%
rename from ru_RU.KOI8-R/htdocs/handbook/index.sgml
rename to ru_RU.KOI8-R/htdocs/handbook/index.xml
index 47985c2214..52a6fc0ee4 100644
--- a/ru_RU.KOI8-R/htdocs/handbook/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/handbook/index.xml
@@ -9,7 +9,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/www/ru/handbook/index.sgml,v 1.5 2004/04/08 13:10:16 den Exp $
+     $FreeBSDru: frdp/www/ru/handbook/index.xml,v 1.5 2004/04/08 13:10:16 den Exp $
 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/internal/Makefile b/ru_RU.KOI8-R/htdocs/internal/Makefile
index 2a8ed46fd2..cc6cf4da87 100644
--- a/ru_RU.KOI8-R/htdocs/internal/Makefile
+++ b/ru_RU.KOI8-R/htdocs/internal/Makefile
@@ -14,22 +14,22 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	photos.sgml
-DOCS+=	internal.sgml
-DOCS+= 	about.sgml
-DOCS+= 	machines.sgml
-DOCS+= 	mirror.sgml
-DOCS+=	new-account.sgml
-DOCS+=	statistic.sgml
-DOCS+= 	developer.sgml
-DOCS+=	bylaws.sgml
-DOCS+=  releng.sgml
-DOCS+=	expire-bits.sgml
-DOCS+=	core-vote.sgml
-DOCS+=	doceng.sgml
-DOCS+=	rtp.sgml
-DOCS+=	policies.sgml
-DOCS+=	fortunes.sgml
+DOCS=	photos.xml
+DOCS+=	internal.xml
+DOCS+= 	about.xml
+DOCS+= 	machines.xml
+DOCS+= 	mirror.xml
+DOCS+=	new-account.xml
+DOCS+=	statistic.xml
+DOCS+= 	developer.xml
+DOCS+=	bylaws.xml
+DOCS+=  releng.xml
+DOCS+=	expire-bits.xml
+DOCS+=	core-vote.xml
+DOCS+=	doceng.xml
+DOCS+=	rtp.xml
+DOCS+=	policies.xml
+DOCS+=	fortunes.xml
 
 INDEXLINK=	internal.html
 
@@ -37,7 +37,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/ru_RU.KOI8-R/htdocs/internal/about.sgml b/ru_RU.KOI8-R/htdocs/internal/about.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/internal/about.sgml
rename to ru_RU.KOI8-R/htdocs/internal/about.xml
index 5a42f7474f..a246b224a4 100644
--- a/ru_RU.KOI8-R/htdocs/internal/about.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/about.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/about.sgml,v 1.14 2006/02/10 12:57:39 marck Exp $
+     $FreeBSDru: frdp/www/ru/internal/about.xml,v 1.14 2006/02/10 12:57:39 marck Exp $
 
      Original revision: 1.54
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/bylaws.sgml b/ru_RU.KOI8-R/htdocs/internal/bylaws.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/internal/bylaws.sgml
rename to ru_RU.KOI8-R/htdocs/internal/bylaws.xml
index f03267ab0c..2dd2f2d770 100644
--- a/ru_RU.KOI8-R/htdocs/internal/bylaws.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/bylaws.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/bylaws.sgml,v 1.5 2006/02/10 12:57:39 marck Exp $
+     $FreeBSDru: frdp/www/ru/internal/bylaws.xml,v 1.5 2006/02/10 12:57:39 marck Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/core-vote.sgml b/ru_RU.KOI8-R/htdocs/internal/core-vote.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/internal/core-vote.sgml
rename to ru_RU.KOI8-R/htdocs/internal/core-vote.xml
index 39d38f10ff..d273936667 100644
--- a/ru_RU.KOI8-R/htdocs/internal/core-vote.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/core-vote.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/core-vote.sgml,v 1.6 2006/02/18 18:10:40 marck Exp $
+     $FreeBSDru: frdp/www/ru/internal/core-vote.xml,v 1.6 2006/02/18 18:10:40 marck Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/developer.sgml b/ru_RU.KOI8-R/htdocs/internal/developer.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/internal/developer.sgml
rename to ru_RU.KOI8-R/htdocs/internal/developer.xml
index 4b70b0c6e9..a140069a52 100644
--- a/ru_RU.KOI8-R/htdocs/internal/developer.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/developer.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/developer.sgml,v 1.17 2006/07/19 10:45:38 den Exp $
+     $FreeBSDru: frdp/www/ru/internal/developer.xml,v 1.17 2006/07/19 10:45:38 den Exp $
 
      Original revision: 1.35
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/doceng.sgml b/ru_RU.KOI8-R/htdocs/internal/doceng.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/internal/doceng.sgml
rename to ru_RU.KOI8-R/htdocs/internal/doceng.xml
index 882a91e53c..b7b3ac4c96 100644
--- a/ru_RU.KOI8-R/htdocs/internal/doceng.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/doceng.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/doceng.sgml,v 1.8 2006/02/10 12:57:39 marck Exp $
+     $FreeBSDru: frdp/www/ru/internal/doceng.xml,v 1.8 2006/02/10 12:57:39 marck Exp $
 
      Original revision: 1.7
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/expire-bits.sgml b/ru_RU.KOI8-R/htdocs/internal/expire-bits.xml
similarity index 94%
rename from ru_RU.KOI8-R/htdocs/internal/expire-bits.sgml
rename to ru_RU.KOI8-R/htdocs/internal/expire-bits.xml
index 361a0528c2..74e2bd9ead 100644
--- a/ru_RU.KOI8-R/htdocs/internal/expire-bits.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/expire-bits.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/expire-bits.sgml,v 1.3 2006/02/10 12:57:39 marck Exp $
+     $FreeBSDru: frdp/www/ru/internal/expire-bits.xml,v 1.3 2006/02/10 12:57:39 marck Exp $
 
      Original revision: 1.2
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/fortunes.sgml b/ru_RU.KOI8-R/htdocs/internal/fortunes.xml
similarity index 95%
rename from ru_RU.KOI8-R/htdocs/internal/fortunes.sgml
rename to ru_RU.KOI8-R/htdocs/internal/fortunes.xml
index 6477cd0831..ff463b66e7 100644
--- a/ru_RU.KOI8-R/htdocs/internal/fortunes.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/fortunes.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/fortunes.sgml,v 1.1 2006/02/10 12:57:39 marck Exp $
+     $FreeBSDru: frdp/www/ru/internal/fortunes.xml,v 1.1 2006/02/10 12:57:39 marck Exp $
 
      Original revision: 1.2
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/homepage.sgml b/ru_RU.KOI8-R/htdocs/internal/homepage.xml
similarity index 87%
rename from ru_RU.KOI8-R/htdocs/internal/homepage.sgml
rename to ru_RU.KOI8-R/htdocs/internal/homepage.xml
index 031b605446..1e3baa6ac0 100644
--- a/ru_RU.KOI8-R/htdocs/internal/homepage.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/homepage.xml
@@ -6,7 +6,7 @@
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/internal/homepage.sgml,v 1.6 2006/02/10 12:57:39 marck Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/internal/homepage.xml,v 1.6 2006/02/10 12:57:39 marck Exp $ -->
 <!-- Original revision: 1.7 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/internal/internal.sgml b/ru_RU.KOI8-R/htdocs/internal/internal.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/internal/internal.sgml
rename to ru_RU.KOI8-R/htdocs/internal/internal.xml
index b65ff0947a..7a8e24af01 100644
--- a/ru_RU.KOI8-R/htdocs/internal/internal.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/internal.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/internal.sgml,v 1.15 2006/07/19 10:45:38 den Exp $
+     $FreeBSDru: frdp/www/ru/internal/internal.xml,v 1.15 2006/07/19 10:45:38 den Exp $
 
      Original revision: 1.30
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/machines.sgml b/ru_RU.KOI8-R/htdocs/internal/machines.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/internal/machines.sgml
rename to ru_RU.KOI8-R/htdocs/internal/machines.xml
index cc416b9aed..9c2f1b1ab8 100644
--- a/ru_RU.KOI8-R/htdocs/internal/machines.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/machines.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/machines.sgml,v 1.26 2006/02/10 12:57:39 marck Exp $
+     $FreeBSDru: frdp/www/ru/internal/machines.xml,v 1.26 2006/02/10 12:57:39 marck Exp $
 
      Original revision: 1.62
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/mirror.sgml b/ru_RU.KOI8-R/htdocs/internal/mirror.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/internal/mirror.sgml
rename to ru_RU.KOI8-R/htdocs/internal/mirror.xml
index 0ca0fc5810..f9a53df1c6 100644
--- a/ru_RU.KOI8-R/htdocs/internal/mirror.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/mirror.xml
@@ -5,7 +5,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/internal/mirror.sgml,v 1.9 2006/02/18 18:10:40 marck Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/internal/mirror.xml,v 1.9 2006/02/18 18:10:40 marck Exp $ -->
 <!-- Original revision: 1.21 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/internal/new-account.sgml b/ru_RU.KOI8-R/htdocs/internal/new-account.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/internal/new-account.sgml
rename to ru_RU.KOI8-R/htdocs/internal/new-account.xml
index ce46bf10df..bc0e33e65c 100644
--- a/ru_RU.KOI8-R/htdocs/internal/new-account.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/new-account.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/new-account.sgml,v 1.9 2006/02/10 12:57:39 marck Exp $
+     $FreeBSDru: frdp/www/ru/internal/new-account.xml,v 1.9 2006/02/10 12:57:39 marck Exp $
 
      Original revision: 1.15
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/photos.sgml b/ru_RU.KOI8-R/htdocs/internal/photos.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/internal/photos.sgml
rename to ru_RU.KOI8-R/htdocs/internal/photos.xml
index e7633ce3de..3803463d35 100644
--- a/ru_RU.KOI8-R/htdocs/internal/photos.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/photos.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/photos.sgml,v 1.13 2006/02/10 12:57:39 marck Exp $
+     $FreeBSDru: frdp/www/ru/internal/photos.xml,v 1.13 2006/02/10 12:57:39 marck Exp $
 
      Original revision: 1.25
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/policies.sgml b/ru_RU.KOI8-R/htdocs/internal/policies.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/internal/policies.sgml
rename to ru_RU.KOI8-R/htdocs/internal/policies.xml
index f13f30f4b2..839626ae73 100644
--- a/ru_RU.KOI8-R/htdocs/internal/policies.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/policies.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/policies.sgml,v 1.6 2006/07/19 10:45:38 den Exp $
+     $FreeBSDru: frdp/www/ru/internal/policies.xml,v 1.6 2006/07/19 10:45:38 den Exp $
 
      Original revision: 1.4
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/releng.sgml b/ru_RU.KOI8-R/htdocs/internal/releng.xml
similarity index 91%
rename from ru_RU.KOI8-R/htdocs/internal/releng.sgml
rename to ru_RU.KOI8-R/htdocs/internal/releng.xml
index 8e67602d07..f9df427cf1 100644
--- a/ru_RU.KOI8-R/htdocs/internal/releng.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/releng.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/releng.sgml,v 1.5 2006/07/19 10:45:38 den Exp $
+     $FreeBSDru: frdp/www/ru/internal/releng.xml,v 1.5 2006/07/19 10:45:38 den Exp $
 
      Original revision: 1.8
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/rtp.sgml b/ru_RU.KOI8-R/htdocs/internal/rtp.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/internal/rtp.sgml
rename to ru_RU.KOI8-R/htdocs/internal/rtp.xml
index af0724d72a..027df80a1b 100644
--- a/ru_RU.KOI8-R/htdocs/internal/rtp.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/rtp.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/rtp.sgml,v 1.6 2006/02/10 12:57:39 marck Exp $
+     $FreeBSDru: frdp/www/ru/internal/rtp.xml,v 1.6 2006/02/10 12:57:39 marck Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internal/statistic.sgml b/ru_RU.KOI8-R/htdocs/internal/statistic.xml
similarity index 94%
rename from ru_RU.KOI8-R/htdocs/internal/statistic.sgml
rename to ru_RU.KOI8-R/htdocs/internal/statistic.xml
index 4697c891cc..d253d32280 100644
--- a/ru_RU.KOI8-R/htdocs/internal/statistic.sgml
+++ b/ru_RU.KOI8-R/htdocs/internal/statistic.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/internal/statistic.sgml,v 1.9 2006/02/10 12:57:39 marck Exp $
+     $FreeBSDru: frdp/www/ru/internal/statistic.xml,v 1.9 2006/02/10 12:57:39 marck Exp $
 
      Original revision: 1.18
 -->
diff --git a/ru_RU.KOI8-R/htdocs/internet.sgml b/ru_RU.KOI8-R/htdocs/internet.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/internet.sgml
rename to ru_RU.KOI8-R/htdocs/internet.xml
index 315f34656c..1c004bb216 100644
--- a/ru_RU.KOI8-R/htdocs/internet.sgml
+++ b/ru_RU.KOI8-R/htdocs/internet.xml
@@ -7,7 +7,7 @@
 <!--
       The FreeBSD Russian Documentation Project
 
-      $FreeBSDru: frdp/www/ru/internet.sgml,v 1.11 2004/09/21 07:31:04 den Exp $
+      $FreeBSDru: frdp/www/ru/internet.xml,v 1.11 2004/09/21 07:31:04 den Exp $
 
       Original revision: 1.31
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/Makefile b/ru_RU.KOI8-R/htdocs/java/Makefile
index 446f7dbef3..b442e099d2 100644
--- a/ru_RU.KOI8-R/htdocs/java/Makefile
+++ b/ru_RU.KOI8-R/htdocs/java/Makefile
@@ -15,12 +15,12 @@ SUBDIR =	dists
 SUBDIR+=	docs
 SUBDIR+=	links
 
-DOCS =  advocacy.sgml
-DOCS+=  howhelp.sgml
-DOCS+=  index.sgml
-DOCS+=  install.sgml
-DOCS+=  newsflash.sgml
-DOCS+=  press.sgml
+DOCS =  advocacy.xml
+DOCS+=  howhelp.xml
+DOCS+=  index.xml
+DOCS+=  install.xml
+DOCS+=  newsflash.xml
+DOCS+=  press.xml
 
 #DATA=	j2j.gif
 
diff --git a/ru_RU.KOI8-R/htdocs/java/advocacy.sgml b/ru_RU.KOI8-R/htdocs/java/advocacy.xml
similarity index 94%
rename from ru_RU.KOI8-R/htdocs/java/advocacy.sgml
rename to ru_RU.KOI8-R/htdocs/java/advocacy.xml
index 1b7815bbff..e0c7f88c4d 100644
--- a/ru_RU.KOI8-R/htdocs/java/advocacy.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/advocacy.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/advocacy.sgml,v 1.5 2003/10/14 11:50:17 den Exp $
+     $FreeBSDru: frdp/www/ru/java/advocacy.xml,v 1.5 2003/10/14 11:50:17 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/dists/Makefile b/ru_RU.KOI8-R/htdocs/java/dists/Makefile
index 7395961fb7..08efb6b97d 100644
--- a/ru_RU.KOI8-R/htdocs/java/dists/Makefile
+++ b/ru_RU.KOI8-R/htdocs/java/dists/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/ru_RU.KOI8-R/htdocs/java/dists/index.sgml b/ru_RU.KOI8-R/htdocs/java/dists/index.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/java/dists/index.sgml
rename to ru_RU.KOI8-R/htdocs/java/dists/index.xml
index 5b6d9a3103..9401985a34 100644
--- a/ru_RU.KOI8-R/htdocs/java/dists/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/dists/index.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/dists/index.sgml,v 1.7 2004/09/21 07:31:08 den Exp $
+     $FreeBSDru: frdp/www/ru/java/dists/index.xml,v 1.7 2004/09/21 07:31:08 den Exp $
 
      Original revision: 1.7
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/docs/Makefile b/ru_RU.KOI8-R/htdocs/java/docs/Makefile
index 27da618421..a73a67bffb 100644
--- a/ru_RU.KOI8-R/htdocs/java/docs/Makefile
+++ b/ru_RU.KOI8-R/htdocs/java/docs/Makefile
@@ -11,10 +11,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS =	faq.sgml
-DOCS+=	howtoports.sgml
-DOCS+=	newbies.sgml
-DOCS+=	performance.sgml
-DOCS+=	tutorials.sgml
+DOCS =	faq.xml
+DOCS+=	howtoports.xml
+DOCS+=	newbies.xml
+DOCS+=	performance.xml
+DOCS+=	tutorials.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/java/docs/faq.sgml b/ru_RU.KOI8-R/htdocs/java/docs/faq.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/java/docs/faq.sgml
rename to ru_RU.KOI8-R/htdocs/java/docs/faq.xml
index 53508542b9..67785c4052 100644
--- a/ru_RU.KOI8-R/htdocs/java/docs/faq.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/docs/faq.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/docs/faq.sgml,v 1.6 2004/01/27 13:11:36 den Exp $
+     $FreeBSDru: frdp/www/ru/java/docs/faq.xml,v 1.6 2004/01/27 13:11:36 den Exp $
 
      Original revision: 1.7
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/docs/howtoports.sgml b/ru_RU.KOI8-R/htdocs/java/docs/howtoports.xml
similarity index 93%
rename from ru_RU.KOI8-R/htdocs/java/docs/howtoports.sgml
rename to ru_RU.KOI8-R/htdocs/java/docs/howtoports.xml
index e7c1af7221..957abbd7fe 100644
--- a/ru_RU.KOI8-R/htdocs/java/docs/howtoports.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/docs/howtoports.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/docs/howtoports.sgml,v 1.5 2004/04/08 07:08:53 den Exp $
+     $FreeBSDru: frdp/www/ru/java/docs/howtoports.xml,v 1.5 2004/04/08 07:08:53 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/docs/newbies.sgml b/ru_RU.KOI8-R/htdocs/java/docs/newbies.xml
similarity index 92%
rename from ru_RU.KOI8-R/htdocs/java/docs/newbies.sgml
rename to ru_RU.KOI8-R/htdocs/java/docs/newbies.xml
index 770ebde996..329e46e478 100644
--- a/ru_RU.KOI8-R/htdocs/java/docs/newbies.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/docs/newbies.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/docs/newbies.sgml,v 1.4 2003/10/16 12:36:17 den Exp $
+     $FreeBSDru: frdp/www/ru/java/docs/newbies.xml,v 1.4 2003/10/16 12:36:17 den Exp $
 
      Original revision: 1.5
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/docs/performance.sgml b/ru_RU.KOI8-R/htdocs/java/docs/performance.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/java/docs/performance.sgml
rename to ru_RU.KOI8-R/htdocs/java/docs/performance.xml
index 539de617fa..eca7eb8ba1 100644
--- a/ru_RU.KOI8-R/htdocs/java/docs/performance.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/docs/performance.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/docs/performance.sgml,v 1.4 2003/10/16 12:36:17 den Exp $
+     $FreeBSDru: frdp/www/ru/java/docs/performance.xml,v 1.4 2003/10/16 12:36:17 den Exp $
 
      Original revision: 1.2
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/docs/tutorials.sgml b/ru_RU.KOI8-R/htdocs/java/docs/tutorials.xml
similarity index 90%
rename from ru_RU.KOI8-R/htdocs/java/docs/tutorials.sgml
rename to ru_RU.KOI8-R/htdocs/java/docs/tutorials.xml
index 0c29ab6675..faa7809a5f 100644
--- a/ru_RU.KOI8-R/htdocs/java/docs/tutorials.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/docs/tutorials.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/docs/tutorials.sgml,v 1.4 2003/10/16 12:36:17 den Exp $
+     $FreeBSDru: frdp/www/ru/java/docs/tutorials.xml,v 1.4 2003/10/16 12:36:17 den Exp $
 
      Original revision: 1.5
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/howhelp.sgml b/ru_RU.KOI8-R/htdocs/java/howhelp.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/java/howhelp.sgml
rename to ru_RU.KOI8-R/htdocs/java/howhelp.xml
index d9fcbc62a2..e45766041c 100644
--- a/ru_RU.KOI8-R/htdocs/java/howhelp.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/howhelp.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/howhelp.sgml,v 1.8 2003/10/14 11:50:17 den Exp $
+     $FreeBSDru: frdp/www/ru/java/howhelp.xml,v 1.8 2003/10/14 11:50:17 den Exp $
 
      Original revision: 1.9
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/index.sgml b/ru_RU.KOI8-R/htdocs/java/index.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/java/index.sgml
rename to ru_RU.KOI8-R/htdocs/java/index.xml
index f9b5787a42..c72c56051b 100644
--- a/ru_RU.KOI8-R/htdocs/java/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/index.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/index.sgml,v 1.8 2004/09/21 07:31:08 den Exp $
+     $FreeBSDru: frdp/www/ru/java/index.xml,v 1.8 2004/09/21 07:31:08 den Exp $
 
      Original revision: 1.20
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/install.sgml b/ru_RU.KOI8-R/htdocs/java/install.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/java/install.sgml
rename to ru_RU.KOI8-R/htdocs/java/install.xml
index 16c39fece8..b98578db7d 100644
--- a/ru_RU.KOI8-R/htdocs/java/install.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/install.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/install.sgml,v 1.7 2004/04/08 07:08:53 den Exp $
+     $FreeBSDru: frdp/www/ru/java/install.xml,v 1.7 2004/04/08 07:08:53 den Exp $
 
      Original revision: 1.12
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/links/Makefile b/ru_RU.KOI8-R/htdocs/java/links/Makefile
index 269aa76626..e5514cd00c 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/Makefile
+++ b/ru_RU.KOI8-R/htdocs/java/links/Makefile
@@ -11,15 +11,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/ru_RU.KOI8-R/htdocs/java/links/api.sgml b/ru_RU.KOI8-R/htdocs/java/links/api.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/java/links/api.sgml
rename to ru_RU.KOI8-R/htdocs/java/links/api.xml
index 3c6043c183..c52110515f 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/api.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/links/api.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/links/api.sgml,v 1.5 2003/10/21 08:46:11 den Exp $
+     $FreeBSDru: frdp/www/ru/java/links/api.xml,v 1.5 2003/10/21 08:46:11 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/links/development.sgml b/ru_RU.KOI8-R/htdocs/java/links/development.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/java/links/development.sgml
rename to ru_RU.KOI8-R/htdocs/java/links/development.xml
index 9ca66c74e2..4636411ef3 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/development.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/links/development.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/links/development.sgml,v 1.4 2003/10/21 08:46:11 den Exp $
+     $FreeBSDru: frdp/www/ru/java/links/development.xml,v 1.4 2003/10/21 08:46:11 den Exp $
 
      Original revision: 1.10
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/links/documentation.sgml b/ru_RU.KOI8-R/htdocs/java/links/documentation.xml
similarity index 91%
rename from ru_RU.KOI8-R/htdocs/java/links/documentation.sgml
rename to ru_RU.KOI8-R/htdocs/java/links/documentation.xml
index ab6a1c13d5..01676050f7 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/documentation.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/links/documentation.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/links/documentation.sgml,v 1.4 2003/10/21 08:46:11 den Exp $
+     $FreeBSDru: frdp/www/ru/java/links/documentation.xml,v 1.4 2003/10/21 08:46:11 den Exp $
 
      Original revision: 1.5
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/links/freebsd.sgml b/ru_RU.KOI8-R/htdocs/java/links/freebsd.xml
similarity index 95%
rename from ru_RU.KOI8-R/htdocs/java/links/freebsd.sgml
rename to ru_RU.KOI8-R/htdocs/java/links/freebsd.xml
index 7b20b6da01..b1c805b858 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/freebsd.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/links/freebsd.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/links/freebsd.sgml,v 1.4 2003/10/21 08:46:11 den Exp $
+     $FreeBSDru: frdp/www/ru/java/links/freebsd.xml,v 1.4 2003/10/21 08:46:11 den Exp $
 
      Original revision: 1.8
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/links/index.sgml b/ru_RU.KOI8-R/htdocs/java/links/index.xml
similarity index 95%
rename from ru_RU.KOI8-R/htdocs/java/links/index.sgml
rename to ru_RU.KOI8-R/htdocs/java/links/index.xml
index 4942490b26..1a12661ec1 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/links/index.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/links/index.sgml,v 1.5 2003/10/21 08:46:11 den Exp $
+     $FreeBSDru: frdp/www/ru/java/links/index.xml,v 1.5 2003/10/21 08:46:11 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/links/resources.sgml b/ru_RU.KOI8-R/htdocs/java/links/resources.xml
similarity index 95%
rename from ru_RU.KOI8-R/htdocs/java/links/resources.sgml
rename to ru_RU.KOI8-R/htdocs/java/links/resources.xml
index 9ba8b37f12..07ca1c5fdd 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/resources.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/links/resources.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/links/resources.sgml,v 1.5 2003/10/21 08:46:11 den Exp $
+     $FreeBSDru: frdp/www/ru/java/links/resources.xml,v 1.5 2003/10/21 08:46:11 den Exp $
 
      Original revision: 1.8
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/links/servlets.sgml b/ru_RU.KOI8-R/htdocs/java/links/servlets.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/java/links/servlets.sgml
rename to ru_RU.KOI8-R/htdocs/java/links/servlets.xml
index d508712902..ff2f298caf 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/servlets.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/links/servlets.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/links/servlets.sgml,v 1.5 2003/10/21 08:46:11 den Exp $
+     $FreeBSDru: frdp/www/ru/java/links/servlets.xml,v 1.5 2003/10/21 08:46:11 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/links/tools.sgml b/ru_RU.KOI8-R/htdocs/java/links/tools.xml
similarity index 92%
rename from ru_RU.KOI8-R/htdocs/java/links/tools.sgml
rename to ru_RU.KOI8-R/htdocs/java/links/tools.xml
index e01548b545..678bbd4fce 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/tools.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/links/tools.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/links/tools.sgml,v 1.4 2003/10/21 08:46:11 den Exp $
+     $FreeBSDru: frdp/www/ru/java/links/tools.xml,v 1.4 2003/10/21 08:46:11 den Exp $
 
      Original revision: 1.5
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/links/tutorials.sgml b/ru_RU.KOI8-R/htdocs/java/links/tutorials.xml
similarity index 92%
rename from ru_RU.KOI8-R/htdocs/java/links/tutorials.sgml
rename to ru_RU.KOI8-R/htdocs/java/links/tutorials.xml
index d4777029b3..2a9c336741 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/tutorials.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/links/tutorials.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/links/tutorials.sgml,v 1.5 2003/10/21 08:46:11 den Exp $
+     $FreeBSDru: frdp/www/ru/java/links/tutorials.xml,v 1.5 2003/10/21 08:46:11 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/links/vendor.sgml b/ru_RU.KOI8-R/htdocs/java/links/vendor.xml
similarity index 94%
rename from ru_RU.KOI8-R/htdocs/java/links/vendor.sgml
rename to ru_RU.KOI8-R/htdocs/java/links/vendor.xml
index 733bfabf7b..359c0628dd 100644
--- a/ru_RU.KOI8-R/htdocs/java/links/vendor.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/links/vendor.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/links/vendor.sgml,v 1.4 2003/10/21 08:46:11 den Exp $
+     $FreeBSDru: frdp/www/ru/java/links/vendor.xml,v 1.4 2003/10/21 08:46:11 den Exp $
 
      Original revision: 1.5
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/newsflash.sgml b/ru_RU.KOI8-R/htdocs/java/newsflash.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/java/newsflash.sgml
rename to ru_RU.KOI8-R/htdocs/java/newsflash.xml
index e91c86af9b..7c88a3fc1a 100644
--- a/ru_RU.KOI8-R/htdocs/java/newsflash.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/newsflash.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/newsflash.sgml,v 1.28 2005/06/08 17:12:14 andy Exp $
+     $FreeBSDru: frdp/www/ru/java/newsflash.xml,v 1.28 2005/06/08 17:12:14 andy Exp $
 
      Original revision: 1.42
 -->
diff --git a/ru_RU.KOI8-R/htdocs/java/press.sgml b/ru_RU.KOI8-R/htdocs/java/press.xml
similarity index 92%
rename from ru_RU.KOI8-R/htdocs/java/press.sgml
rename to ru_RU.KOI8-R/htdocs/java/press.xml
index f7794659a5..fb98f3f49c 100644
--- a/ru_RU.KOI8-R/htdocs/java/press.sgml
+++ b/ru_RU.KOI8-R/htdocs/java/press.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/java/press.sgml,v 1.4 2003/10/15 13:09:39 den Exp $
+     $FreeBSDru: frdp/www/ru/java/press.xml,v 1.4 2003/10/15 13:09:39 den Exp $
 
      Original revision: 1.5
 -->
diff --git a/ru_RU.KOI8-R/htdocs/logo.sgml b/ru_RU.KOI8-R/htdocs/logo.xml
similarity index 100%
rename from ru_RU.KOI8-R/htdocs/logo.sgml
rename to ru_RU.KOI8-R/htdocs/logo.xml
diff --git a/ru_RU.KOI8-R/htdocs/mailto.sgml b/ru_RU.KOI8-R/htdocs/mailto.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/mailto.sgml
rename to ru_RU.KOI8-R/htdocs/mailto.xml
index 56fda020df..cf3e2d3795 100644
--- a/ru_RU.KOI8-R/htdocs/mailto.sgml
+++ b/ru_RU.KOI8-R/htdocs/mailto.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/mailto.sgml,v 1.9 2006/01/16 21:45:19 gad Exp $
+     $FreeBSDru: frdp/www/ru/mailto.xml,v 1.9 2006/01/16 21:45:19 gad Exp $
 
      Original revision: 1.32
 -->
diff --git a/ru_RU.KOI8-R/htdocs/marketing/Makefile b/ru_RU.KOI8-R/htdocs/marketing/Makefile
index a561a883d3..3ed4580db7 100644
--- a/ru_RU.KOI8-R/htdocs/marketing/Makefile
+++ b/ru_RU.KOI8-R/htdocs/marketing/Makefile
@@ -14,6 +14,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	os-comparison.sgml
+DOCS?=	os-comparison.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/marketing/os-comparison.sgml b/ru_RU.KOI8-R/htdocs/marketing/os-comparison.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/marketing/os-comparison.sgml
rename to ru_RU.KOI8-R/htdocs/marketing/os-comparison.xml
index b463b344a7..3adcdf2df4 100644
--- a/ru_RU.KOI8-R/htdocs/marketing/os-comparison.sgml
+++ b/ru_RU.KOI8-R/htdocs/marketing/os-comparison.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/marketing/os-comparison.sgml,v 1.1 2005/05/18 16:22:52 andy Exp $
+     $FreeBSDru: frdp/www/ru/marketing/os-comparison.xml,v 1.1 2005/05/18 16:22:52 andy Exp $
 
      Original revision: 1.3
 -->
diff --git a/ru_RU.KOI8-R/htdocs/news/1996/Makefile b/ru_RU.KOI8-R/htdocs/news/1996/Makefile
index e22f8d9c85..b18467df9b 100644
--- a/ru_RU.KOI8-R/htdocs/news/1996/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/1996/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/ru_RU.KOI8-R/htdocs/news/1996/index.sgml b/ru_RU.KOI8-R/htdocs/news/1996/index.xml
similarity index 95%
rename from ru_RU.KOI8-R/htdocs/news/1996/index.sgml
rename to ru_RU.KOI8-R/htdocs/news/1996/index.xml
index 1a23d2f713..8a11a60148 100644
--- a/ru_RU.KOI8-R/htdocs/news/1996/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/1996/index.xml
@@ -6,7 +6,7 @@
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/news/1996/index.sgml,v 1.7 2003/09/19 08:43:46 den Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/news/1996/index.xml,v 1.7 2003/09/19 08:43:46 den Exp $ -->
 <!-- Original revision: 1.9 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/news/1997/Makefile b/ru_RU.KOI8-R/htdocs/news/1997/Makefile
index 33bf4e3b0c..34d198d008 100644
--- a/ru_RU.KOI8-R/htdocs/news/1997/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/1997/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/ru_RU.KOI8-R/htdocs/news/1997/index.sgml b/ru_RU.KOI8-R/htdocs/news/1997/index.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/news/1997/index.sgml
rename to ru_RU.KOI8-R/htdocs/news/1997/index.xml
index 280f965282..e6fb693cfa 100644
--- a/ru_RU.KOI8-R/htdocs/news/1997/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/1997/index.xml
@@ -7,7 +7,7 @@
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/news/1997/index.sgml,v 1.7 2004/04/08 07:08:54 den Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/news/1997/index.xml,v 1.7 2004/04/08 07:08:54 den Exp $ -->
 <!-- Original revision: 1.7 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/news/1998/Makefile b/ru_RU.KOI8-R/htdocs/news/1998/Makefile
index e5befa273c..04a79c59a7 100644
--- a/ru_RU.KOI8-R/htdocs/news/1998/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/1998/Makefile
@@ -11,7 +11,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
 DEPENDSET.press=transtable press
diff --git a/ru_RU.KOI8-R/htdocs/news/1998/index.sgml b/ru_RU.KOI8-R/htdocs/news/1998/index.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/news/1998/index.sgml
rename to ru_RU.KOI8-R/htdocs/news/1998/index.xml
index b9881dc737..809efb5ccc 100644
--- a/ru_RU.KOI8-R/htdocs/news/1998/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/1998/index.xml
@@ -6,7 +6,7 @@
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/news/1998/index.sgml,v 1.10 2004/09/21 07:31:10 den Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/news/1998/index.xml,v 1.10 2004/09/21 07:31:10 den Exp $ -->
 <!-- Original revision: 1.8 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/news/1999/Makefile b/ru_RU.KOI8-R/htdocs/news/1999/Makefile
index 56b99f4797..ee742a4316 100644
--- a/ru_RU.KOI8-R/htdocs/news/1999/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/1999/Makefile
@@ -11,7 +11,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
 DEPENDSET.press=transtable press
diff --git a/ru_RU.KOI8-R/htdocs/news/1999/index.sgml b/ru_RU.KOI8-R/htdocs/news/1999/index.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/news/1999/index.sgml
rename to ru_RU.KOI8-R/htdocs/news/1999/index.xml
index df5b41da2c..43a5cd9842 100644
--- a/ru_RU.KOI8-R/htdocs/news/1999/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/1999/index.xml
@@ -6,7 +6,7 @@
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/news/1999/index.sgml,v 1.4 2002/04/06 20:43:47 phantom Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/news/1999/index.xml,v 1.4 2002/04/06 20:43:47 phantom Exp $ -->
 <!-- Original revision: 1.5 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/news/2000/Makefile b/ru_RU.KOI8-R/htdocs/news/2000/Makefile
index c222248d51..edc19cd126 100644
--- a/ru_RU.KOI8-R/htdocs/news/2000/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/2000/Makefile
@@ -11,7 +11,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 XMLDOCS+=	press:${XSL_NEWS_PRESS_OLD}::
 DEPENDSET.press=transtable press
diff --git a/ru_RU.KOI8-R/htdocs/news/2000/index.sgml b/ru_RU.KOI8-R/htdocs/news/2000/index.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/news/2000/index.sgml
rename to ru_RU.KOI8-R/htdocs/news/2000/index.xml
index c0bed9edb5..cdd687fa25 100644
--- a/ru_RU.KOI8-R/htdocs/news/2000/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/2000/index.xml
@@ -6,7 +6,7 @@
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/news/2000/index.sgml,v 1.7 2004/04/09 10:57:27 phantom Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/news/2000/index.xml,v 1.7 2004/04/09 10:57:27 phantom Exp $ -->
 <!-- Original revision: 1.11 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/news/Makefile b/ru_RU.KOI8-R/htdocs/news/Makefile
index 2b92a5e57b..dea8a99c7a 100644
--- a/ru_RU.KOI8-R/htdocs/news/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/Makefile
@@ -14,18 +14,18 @@
 .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+= 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
 
 # The yearly State of the Union address
-DOCS+= sou1999.sgml
+DOCS+= sou1999.xml
 
 INDEXLINK= news.html
 
diff --git a/ru_RU.KOI8-R/htdocs/news/news.sgml b/ru_RU.KOI8-R/htdocs/news/news.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/news/news.sgml
rename to ru_RU.KOI8-R/htdocs/news/news.xml
index 5b9f2c236a..0ecefac2b3 100644
--- a/ru_RU.KOI8-R/htdocs/news/news.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/news.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/news/news.sgml,v 1.12 2004/09/21 07:31:09 den Exp $
+     $FreeBSDru: frdp/www/ru/news/news.xml,v 1.12 2004/09/21 07:31:09 den Exp $
 
      Original revision: 1.41
 -->
diff --git a/ru_RU.KOI8-R/htdocs/news/press-rel-1.sgml b/ru_RU.KOI8-R/htdocs/news/press-rel-1.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/news/press-rel-1.sgml
rename to ru_RU.KOI8-R/htdocs/news/press-rel-1.xml
index a38316065f..e28899c5a5 100644
--- a/ru_RU.KOI8-R/htdocs/news/press-rel-1.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/press-rel-1.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/news/press-rel-1.sgml,v 1.9 2003/09/12 18:21:47 andy Exp $
+     $FreeBSDru: frdp/www/ru/news/press-rel-1.xml,v 1.9 2003/09/12 18:21:47 andy Exp $
 
      Original revision: 1.7
 -->
diff --git a/ru_RU.KOI8-R/htdocs/news/press-rel-2.sgml b/ru_RU.KOI8-R/htdocs/news/press-rel-2.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/news/press-rel-2.sgml
rename to ru_RU.KOI8-R/htdocs/news/press-rel-2.xml
index 6867800caa..bac8da344b 100644
--- a/ru_RU.KOI8-R/htdocs/news/press-rel-2.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/press-rel-2.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/news/press-rel-2.sgml,v 1.8 2003/09/12 18:23:43 andy Exp $
+     $FreeBSDru: frdp/www/ru/news/press-rel-2.xml,v 1.8 2003/09/12 18:23:43 andy Exp $
 
      Original revision: 1.10
 -->
diff --git a/ru_RU.KOI8-R/htdocs/news/press-rel-3.sgml b/ru_RU.KOI8-R/htdocs/news/press-rel-3.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/news/press-rel-3.sgml
rename to ru_RU.KOI8-R/htdocs/news/press-rel-3.xml
index dfb0fb2f68..7b221ce0b5 100644
--- a/ru_RU.KOI8-R/htdocs/news/press-rel-3.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/press-rel-3.xml
@@ -5,7 +5,7 @@
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/news/press-rel-3.sgml,v 1.6 2002/04/06 20:43:45 phantom Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/news/press-rel-3.xml,v 1.6 2002/04/06 20:43:45 phantom Exp $ -->
 <!-- Original revision: 1.6 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/news/press-rel-4.sgml b/ru_RU.KOI8-R/htdocs/news/press-rel-4.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/news/press-rel-4.sgml
rename to ru_RU.KOI8-R/htdocs/news/press-rel-4.xml
index 480493ae5b..2ba5367058 100644
--- a/ru_RU.KOI8-R/htdocs/news/press-rel-4.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/press-rel-4.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/news/press-rel-4.sgml,v 1.11 2004/09/21 07:31:09 den Exp $
+     $FreeBSDru: frdp/www/ru/news/press-rel-4.xml,v 1.11 2004/09/21 07:31:09 den Exp $
 
      Original revision: 1.4
 -->
diff --git a/ru_RU.KOI8-R/htdocs/news/press-rel-5.sgml b/ru_RU.KOI8-R/htdocs/news/press-rel-5.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/news/press-rel-5.sgml
rename to ru_RU.KOI8-R/htdocs/news/press-rel-5.xml
index 5652ff62a6..e9b34b6224 100644
--- a/ru_RU.KOI8-R/htdocs/news/press-rel-5.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/press-rel-5.xml
@@ -5,7 +5,7 @@
 ]>
 
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/news/press-rel-5.sgml,v 1.6 2003/09/22 08:07:33 den Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/news/press-rel-5.xml,v 1.6 2003/09/22 08:07:33 den Exp $ -->
 <!-- Original revision: 1.6 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/news/pressreleases.sgml b/ru_RU.KOI8-R/htdocs/news/pressreleases.xml
similarity index 95%
rename from ru_RU.KOI8-R/htdocs/news/pressreleases.sgml
rename to ru_RU.KOI8-R/htdocs/news/pressreleases.xml
index afce8f4ab1..207067135a 100644
--- a/ru_RU.KOI8-R/htdocs/news/pressreleases.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/pressreleases.xml
@@ -4,7 +4,7 @@
 <!ENTITY title "�����-������ FreeBSD">
 ]>
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/news/pressreleases.sgml,v 1.12 2004/09/21 07:31:09 den Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/news/pressreleases.xml,v 1.12 2004/09/21 07:31:09 den Exp $ -->
 <!-- Original revision: 1.8 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/news/sou1999.sgml b/ru_RU.KOI8-R/htdocs/news/sou1999.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/news/sou1999.sgml
rename to ru_RU.KOI8-R/htdocs/news/sou1999.xml
index 037aade48d..536246844d 100644
--- a/ru_RU.KOI8-R/htdocs/news/sou1999.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/sou1999.xml
@@ -4,7 +4,7 @@
 <!ENTITY title "��������� ���������� FreeBSD, 1999">
 ]>
 <!-- The FreeBSD Russian Documentation Project -->
-<!-- $FreeBSDru: frdp/www/ru/news/sou1999.sgml,v 1.6 2004/04/09 10:52:50 phantom Exp $ -->
+<!-- $FreeBSDru: frdp/www/ru/news/sou1999.xml,v 1.6 2004/04/09 10:52:50 phantom Exp $ -->
 <!-- Original revision: 1.6 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/ru_RU.KOI8-R/htdocs/news/status/Makefile b/ru_RU.KOI8-R/htdocs/news/status/Makefile
index ea2d62f1cc..1c5db466f5 100644
--- a/ru_RU.KOI8-R/htdocs/news/status/Makefile
+++ b/ru_RU.KOI8-R/htdocs/news/status/Makefile
@@ -10,7 +10,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	status.sgml
+DOCS=	status.xml
 
 INDEXLINK=	status.html
 
diff --git a/ru_RU.KOI8-R/htdocs/news/status/status.sgml b/ru_RU.KOI8-R/htdocs/news/status/status.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/news/status/status.sgml
rename to ru_RU.KOI8-R/htdocs/news/status/status.xml
index 8394da4cf1..3f9986c7c3 100644
--- a/ru_RU.KOI8-R/htdocs/news/status/status.sgml
+++ b/ru_RU.KOI8-R/htdocs/news/status/status.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/news/status/status.sgml,v 1.2 2004/04/09 10:51:41 phantom Exp $
+     $FreeBSDru: frdp/www/ru/news/status/status.xml,v 1.2 2004/04/09 10:51:41 phantom Exp $
 
      Original revision: 1.18
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/Makefile b/ru_RU.KOI8-R/htdocs/platforms/Makefile
index 10e1a57cf3..4c625cb159 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/Makefile
+++ b/ru_RU.KOI8-R/htdocs/platforms/Makefile
@@ -14,18 +14,18 @@
 .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+=	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+=	x86-64.xml
+DOCS+=  xbox.xml
 
 SUBDIR=	amd64
 SUBDIR+=ia64
diff --git a/ru_RU.KOI8-R/htdocs/platforms/alpha.sgml b/ru_RU.KOI8-R/htdocs/platforms/alpha.xml
similarity index 94%
rename from ru_RU.KOI8-R/htdocs/platforms/alpha.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/alpha.xml
index 2ddbe57cc7..ec51d25e09 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/alpha.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/alpha.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/alpha.sgml,v 1.6 2006/06/04 14:07:20 gad Exp $
+     $FreeBSDru: frdp/www/ru/platforms/alpha.xml,v 1.6 2006/06/04 14:07:20 gad Exp $
 
      Original revision: 1.4
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/amd64.sgml b/ru_RU.KOI8-R/htdocs/platforms/amd64.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/platforms/amd64.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/amd64.xml
index 80bd094cfd..8f518b636e 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/amd64.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/amd64.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/amd64.sgml,v 1.13 2006/07/19 10:45:38 den Exp $
+     $FreeBSDru: frdp/www/ru/platforms/amd64.xml,v 1.13 2006/07/19 10:45:38 den Exp $
 
      Original revision: 1.15
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/amd64/Makefile b/ru_RU.KOI8-R/htdocs/platforms/amd64/Makefile
index 6250cb753e..9519d5fffd 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/amd64/Makefile
+++ b/ru_RU.KOI8-R/htdocs/platforms/amd64/Makefile
@@ -14,6 +14,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	motherboards.sgml
+DOCS=	motherboards.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/platforms/amd64/motherboards.sgml b/ru_RU.KOI8-R/htdocs/platforms/amd64/motherboards.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/platforms/amd64/motherboards.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/amd64/motherboards.xml
index 6c92b01398..c9a57a7d6a 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/amd64/motherboards.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/amd64/motherboards.xml
@@ -9,7 +9,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/www/ru/platforms/amd64/motherboards.sgml,v 1.7 2005/06/10 18:35:25 andy Exp $
+     $FreeBSDru: frdp/www/ru/platforms/amd64/motherboards.xml,v 1.7 2005/06/10 18:35:25 andy Exp $
 
      Original revision: 1.24
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/arm.sgml b/ru_RU.KOI8-R/htdocs/platforms/arm.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/platforms/arm.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/arm.xml
index 421791f6c7..8cb07b3548 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/arm.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/arm.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/arm.sgml,v 1.3 2006/06/04 14:07:20 gad Exp $
+     $FreeBSDru: frdp/www/ru/platforms/arm.xml,v 1.3 2006/06/04 14:07:20 gad Exp $
 
      Original revision: 1.8
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/i386.sgml b/ru_RU.KOI8-R/htdocs/platforms/i386.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/platforms/i386.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/i386.xml
index ea5ab76766..50ac1908fe 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/i386.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/i386.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/i386.sgml,v 1.3 2006/06/04 14:07:20 gad Exp $
+     $FreeBSDru: frdp/www/ru/platforms/i386.xml,v 1.3 2006/06/04 14:07:20 gad Exp $
 
      Original revision: 1.8
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/ia64.sgml b/ru_RU.KOI8-R/htdocs/platforms/ia64.xml
similarity index 89%
rename from ru_RU.KOI8-R/htdocs/platforms/ia64.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/ia64.xml
index c41fcf4be7..e823a30aa3 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/ia64.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/ia64.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/ia64.sgml,v 1.9 2006/06/04 14:07:20 gad Exp $
+     $FreeBSDru: frdp/www/ru/platforms/ia64.xml,v 1.9 2006/06/04 14:07:20 gad Exp $
 
      Original revision: 1.12
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/ia64/Makefile b/ru_RU.KOI8-R/htdocs/platforms/ia64/Makefile
index a418fd934d..4d57c8e614 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/ia64/Makefile
+++ b/ru_RU.KOI8-R/htdocs/platforms/ia64/Makefile
@@ -12,6 +12,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml machines.sgml refs.sgml todo.sgml
+DOCS=	index.xml machines.xml refs.xml todo.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/platforms/ia64/index.sgml b/ru_RU.KOI8-R/htdocs/platforms/ia64/index.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/platforms/ia64/index.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/ia64/index.xml
index 0d42254c84..6647f075db 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/ia64/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/ia64/index.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/ia64/index.sgml,v 1.4 2004/09/21 07:31:10 den Exp $
+     $FreeBSDru: frdp/www/ru/platforms/ia64/index.xml,v 1.4 2004/09/21 07:31:10 den Exp $
 
      Original revision: 1.5
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/ia64/machines.sgml b/ru_RU.KOI8-R/htdocs/platforms/ia64/machines.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/platforms/ia64/machines.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/ia64/machines.xml
index 413d9ceea5..28f0e01b1b 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/ia64/machines.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/ia64/machines.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/ia64/machines.sgml,v 1.2 2004/09/21 07:31:10 den Exp $
+     $FreeBSDru: frdp/www/ru/platforms/ia64/machines.xml,v 1.2 2004/09/21 07:31:10 den Exp $
 
      Original revision: 1.1
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/ia64/refs.sgml b/ru_RU.KOI8-R/htdocs/platforms/ia64/refs.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/platforms/ia64/refs.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/ia64/refs.xml
index b6e99acf40..4bd310217e 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/ia64/refs.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/ia64/refs.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/ia64/refs.sgml,v 1.3 2004/09/21 07:31:10 den Exp $
+     $FreeBSDru: frdp/www/ru/platforms/ia64/refs.xml,v 1.3 2004/09/21 07:31:10 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/ia64/todo.sgml b/ru_RU.KOI8-R/htdocs/platforms/ia64/todo.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/platforms/ia64/todo.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/ia64/todo.xml
index 96d98d4592..4e1479440f 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/ia64/todo.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/ia64/todo.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/ia64/todo.sgml,v 1.4 2004/09/21 07:31:10 den Exp $
+     $FreeBSDru: frdp/www/ru/platforms/ia64/todo.xml,v 1.4 2004/09/21 07:31:10 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/index.sgml b/ru_RU.KOI8-R/htdocs/platforms/index.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/platforms/index.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/index.xml
index e8950e77a5..688ed05282 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/index.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/index.sgml,v 1.7 2005/11/01 21:34:25 gad Exp $
+     $FreeBSDru: frdp/www/ru/platforms/index.xml,v 1.7 2005/11/01 21:34:25 gad Exp $
 
      Original revision: 1.10
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/mips.sgml b/ru_RU.KOI8-R/htdocs/platforms/mips.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/platforms/mips.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/mips.xml
index de3b202b84..1bbf976bd0 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/mips.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/mips.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/mips.sgml,v 1.4 2006/06/04 14:07:20 gad Exp $
+     $FreeBSDru: frdp/www/ru/platforms/mips.xml,v 1.4 2006/06/04 14:07:20 gad Exp $
 
      Original revision: 1.5
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/pc98.sgml b/ru_RU.KOI8-R/htdocs/platforms/pc98.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/platforms/pc98.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/pc98.xml
index c4f4fe1f05..a0e22def04 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/pc98.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/pc98.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/pc98.sgml,v 1.6 2006/06/04 14:07:20 gad Exp $
+     $FreeBSDru: frdp/www/ru/platforms/pc98.xml,v 1.6 2006/06/04 14:07:20 gad Exp $
 
      Original revision: 1.15
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/ppc.sgml b/ru_RU.KOI8-R/htdocs/platforms/ppc.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/platforms/ppc.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/ppc.xml
index 858f14cd00..c766cf086b 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/ppc.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/ppc.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/ppc.sgml,v 1.9 2006/09/08 13:04:48 den Exp $
+     $FreeBSDru: frdp/www/ru/platforms/ppc.xml,v 1.9 2006/09/08 13:04:48 den Exp $
 
      Original revision: 1.18
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/sparc.sgml b/ru_RU.KOI8-R/htdocs/platforms/sparc.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/platforms/sparc.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/sparc.xml
index 3c442a0973..4dae6322e3 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/sparc.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/sparc.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/sparc.sgml,v 1.12 2006/09/08 13:04:48 den Exp $
+     $FreeBSDru: frdp/www/ru/platforms/sparc.xml,v 1.12 2006/09/08 13:04:48 den Exp $
 
      Original revision: 1.26
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/x86-64.sgml b/ru_RU.KOI8-R/htdocs/platforms/x86-64.xml
similarity index 92%
rename from ru_RU.KOI8-R/htdocs/platforms/x86-64.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/x86-64.xml
index 2f56977fe6..1fadead38a 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/x86-64.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/x86-64.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/platforms/x86-64.sgml,v 1.4 2006/06/04 14:07:20 gad Exp $
+     $FreeBSDru: frdp/www/ru/platforms/x86-64.xml,v 1.4 2006/06/04 14:07:20 gad Exp $
 
      Original revision: 1.15
 -->
diff --git a/ru_RU.KOI8-R/htdocs/platforms/xbox.sgml b/ru_RU.KOI8-R/htdocs/platforms/xbox.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/platforms/xbox.sgml
rename to ru_RU.KOI8-R/htdocs/platforms/xbox.xml
index b4bfbe166f..458edc6b64 100644
--- a/ru_RU.KOI8-R/htdocs/platforms/xbox.sgml
+++ b/ru_RU.KOI8-R/htdocs/platforms/xbox.xml
@@ -7,7 +7,7 @@
 <!--
   The FreeBSD Russian Documentation Project
 
-  $FreeBSDru: frdp/www/ru/platforms/xbox.sgml,v 1.2 2006/06/04 14:07:20 gad Exp $
+  $FreeBSDru: frdp/www/ru/platforms/xbox.xml,v 1.2 2006/06/04 14:07:20 gad Exp $
 
   Original revision: 1.4
 -->
diff --git a/ru_RU.KOI8-R/htdocs/portmgr/Makefile b/ru_RU.KOI8-R/htdocs/portmgr/Makefile
index 85810fe527..b4bbf9c2e8 100644
--- a/ru_RU.KOI8-R/htdocs/portmgr/Makefile
+++ b/ru_RU.KOI8-R/htdocs/portmgr/Makefile
@@ -14,6 +14,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml charter.sgml policies.sgml qa.sgml
+DOCS?=	index.xml charter.xml policies.xml qa.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/portmgr/charter.sgml b/ru_RU.KOI8-R/htdocs/portmgr/charter.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/portmgr/charter.sgml
rename to ru_RU.KOI8-R/htdocs/portmgr/charter.xml
index 0d114fca9d..07d3413c0e 100644
--- a/ru_RU.KOI8-R/htdocs/portmgr/charter.sgml
+++ b/ru_RU.KOI8-R/htdocs/portmgr/charter.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/portmgr/charter.sgml,v 1.1 2005/06/13 06:56:15 andy Exp $
+     $FreeBSDru: frdp/www/ru/portmgr/charter.xml,v 1.1 2005/06/13 06:56:15 andy Exp $
 
      Original revision: 1.1
 -->
diff --git a/ru_RU.KOI8-R/htdocs/portmgr/index.sgml b/ru_RU.KOI8-R/htdocs/portmgr/index.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/portmgr/index.sgml
rename to ru_RU.KOI8-R/htdocs/portmgr/index.xml
index f88433c745..7296b9c2c4 100644
--- a/ru_RU.KOI8-R/htdocs/portmgr/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/portmgr/index.xml
@@ -11,7 +11,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/portmgr/index.sgml,v 1.4 2006/09/08 13:04:48 den Exp $
+     $FreeBSDru: frdp/www/ru/portmgr/index.xml,v 1.4 2006/09/08 13:04:48 den Exp $
 
      Original revision: 1.4
 -->
diff --git a/ru_RU.KOI8-R/htdocs/portmgr/policies.sgml b/ru_RU.KOI8-R/htdocs/portmgr/policies.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/portmgr/policies.sgml
rename to ru_RU.KOI8-R/htdocs/portmgr/policies.xml
index fe5d4f90ac..9c4083d9e8 100644
--- a/ru_RU.KOI8-R/htdocs/portmgr/policies.sgml
+++ b/ru_RU.KOI8-R/htdocs/portmgr/policies.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/portmgr/policies.sgml,v 1.4 2006/09/08 13:04:48 den Exp $
+     $FreeBSDru: frdp/www/ru/portmgr/policies.xml,v 1.4 2006/09/08 13:04:48 den Exp $
 
      Original revision: 1.2
 -->
diff --git a/ru_RU.KOI8-R/htdocs/portmgr/qa.sgml b/ru_RU.KOI8-R/htdocs/portmgr/qa.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/portmgr/qa.sgml
rename to ru_RU.KOI8-R/htdocs/portmgr/qa.xml
index 74aca11979..b7be2bd9bb 100644
--- a/ru_RU.KOI8-R/htdocs/portmgr/qa.sgml
+++ b/ru_RU.KOI8-R/htdocs/portmgr/qa.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/portmgr/qa.sgml,v 1.2 2005/08/08 17:03:06 marck Exp $
+     $FreeBSDru: frdp/www/ru/portmgr/qa.xml,v 1.2 2005/08/08 17:03:06 marck Exp $
 
      Original revision: 1.2
 -->
diff --git a/ru_RU.KOI8-R/htdocs/ports/Makefile b/ru_RU.KOI8-R/htdocs/ports/Makefile
index 009f4851e4..36f61c7432 100644
--- a/ru_RU.KOI8-R/htdocs/ports/Makefile
+++ b/ru_RU.KOI8-R/htdocs/ports/Makefile
@@ -61,22 +61,22 @@ packages.exists:
 	${TOUCH} ${.TARGET}
 .endif
 
-Makefile.gen: index.sgml .NOTMAIN
-	(	${ECHO_CMD} DOCS= *.sgml;\
+Makefile.gen: index.xml .NOTMAIN
+	(	${ECHO_CMD} DOCS= *.xml;\
 		${ECHO_CMD} -n "DYNAMIC_DOCS= ";\
-		${ECHO_CMD} -n " master-index.sgml";\
-		${ECHO_CMD} -n " index.sgml";\
+		${ECHO_CMD} -n " master-index.xml";\
+		${ECHO_CMD} -n " index.xml";\
 	) > Makefile.gen
 	for categoryfile in ${CATEGORYLIST}; do \
-		${ECHO_CMD} -n " $$categoryfile.sgml" >> Makefile.gen; \
+		${ECHO_CMD} -n " $$categoryfile.xml" >> Makefile.gen; \
 	done
 
-index.sgml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN
-	${RM} -f *.sgml
+index.xml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN
+	${RM} -f *.xml
 	${PORTINDEX} ${INDEX} ${.CURDIR}
 
-# 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]" ${DOC_PREFIX}/en_US.ISO8859-1/htdocs/ports/categories | sed -e s"/,.*//"`
 
 install: all beforeinstall
diff --git a/ru_RU.KOI8-R/htdocs/projects/Makefile b/ru_RU.KOI8-R/htdocs/projects/Makefile
index 7afc58b3d1..03fb1c4157 100644
--- a/ru_RU.KOI8-R/htdocs/projects/Makefile
+++ b/ru_RU.KOI8-R/htdocs/projects/Makefile
@@ -14,10 +14,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	projects.sgml
-DOCS+=	newbies.sgml
-DOCS+=	cvsweb.sgml
-DOCS+=	summerofcode.sgml
+DOCS=	projects.xml
+DOCS+=	newbies.xml
+DOCS+=	cvsweb.xml
+DOCS+=	summerofcode.xml
 
 INDEXLINK= projects.html
 
diff --git a/ru_RU.KOI8-R/htdocs/projects/busdma/Makefile b/ru_RU.KOI8-R/htdocs/projects/busdma/Makefile
index 82492c2398..7abfaea945 100644
--- a/ru_RU.KOI8-R/htdocs/projects/busdma/Makefile
+++ b/ru_RU.KOI8-R/htdocs/projects/busdma/Makefile
@@ -18,7 +18,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/ru_RU.KOI8-R/htdocs/projects/busdma/index.sgml b/ru_RU.KOI8-R/htdocs/projects/busdma/index.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/projects/busdma/index.sgml
rename to ru_RU.KOI8-R/htdocs/projects/busdma/index.xml
index 1ebd6f4b20..0e345eee01 100644
--- a/ru_RU.KOI8-R/htdocs/projects/busdma/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/projects/busdma/index.xml
@@ -16,7 +16,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/projects/busdma/index.sgml,v 1.10 2005/06/16 17:00:05 andy Exp $
+     $FreeBSDru: frdp/www/ru/projects/busdma/index.xml,v 1.10 2005/06/16 17:00:05 andy Exp $
 
      Original revision: 1.102
 -->
diff --git a/ru_RU.KOI8-R/htdocs/projects/cvsweb.sgml b/ru_RU.KOI8-R/htdocs/projects/cvsweb.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/projects/cvsweb.sgml
rename to ru_RU.KOI8-R/htdocs/projects/cvsweb.xml
index 72adbbda0e..5802443d76 100644
--- a/ru_RU.KOI8-R/htdocs/projects/cvsweb.sgml
+++ b/ru_RU.KOI8-R/htdocs/projects/cvsweb.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/projects/cvsweb.sgml,v 1.8 2005/05/31 06:53:44 andy Exp $
+     $FreeBSDru: frdp/www/ru/projects/cvsweb.xml,v 1.8 2005/05/31 06:53:44 andy Exp $
 
      Original revision: 1.30
 -->
diff --git a/ru_RU.KOI8-R/htdocs/projects/newbies.sgml b/ru_RU.KOI8-R/htdocs/projects/newbies.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/projects/newbies.sgml
rename to ru_RU.KOI8-R/htdocs/projects/newbies.xml
index 198121fb00..ce094f7a7d 100644
--- a/ru_RU.KOI8-R/htdocs/projects/newbies.sgml
+++ b/ru_RU.KOI8-R/htdocs/projects/newbies.xml
@@ -9,7 +9,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/projects/newbies.sgml,v 1.19 2006/09/08 13:04:48 den Exp $
+     $FreeBSDru: frdp/www/ru/projects/newbies.xml,v 1.19 2006/09/08 13:04:48 den Exp $
 
      Original revision: 1.51
 -->
diff --git a/ru_RU.KOI8-R/htdocs/projects/projects.sgml b/ru_RU.KOI8-R/htdocs/projects/projects.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/projects/projects.sgml
rename to ru_RU.KOI8-R/htdocs/projects/projects.xml
index f9025a00cf..88e5c2c450 100644
--- a/ru_RU.KOI8-R/htdocs/projects/projects.sgml
+++ b/ru_RU.KOI8-R/htdocs/projects/projects.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/projects/projects.sgml,v 1.31 2005/06/14 16:55:02 andy Exp $
+     $FreeBSDru: frdp/www/ru/projects/projects.xml,v 1.31 2005/06/14 16:55:02 andy Exp $
 
      Original revision: 1.176
 -->
diff --git a/ru_RU.KOI8-R/htdocs/projects/summerofcode.sgml b/ru_RU.KOI8-R/htdocs/projects/summerofcode.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/projects/summerofcode.sgml
rename to ru_RU.KOI8-R/htdocs/projects/summerofcode.xml
index bca11ca7d3..917f271ad1 100644
--- a/ru_RU.KOI8-R/htdocs/projects/summerofcode.sgml
+++ b/ru_RU.KOI8-R/htdocs/projects/summerofcode.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/projects/summerofcode.sgml,v 1.3 2005/06/10 18:58:07 andy Exp $
+     $FreeBSDru: frdp/www/ru/projects/summerofcode.xml,v 1.3 2005/06/10 18:58:07 andy Exp $
 
      Original revision: 1.31
 -->
diff --git a/ru_RU.KOI8-R/htdocs/prstats/Makefile b/ru_RU.KOI8-R/htdocs/prstats/Makefile
index c29bd64f06..ff20f73280 100644
--- a/ru_RU.KOI8-R/htdocs/prstats/Makefile
+++ b/ru_RU.KOI8-R/htdocs/prstats/Makefile
@@ -8,6 +8,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	index.sgml
+DOCS=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/prstats/index.sgml b/ru_RU.KOI8-R/htdocs/prstats/index.xml
similarity index 100%
rename from ru_RU.KOI8-R/htdocs/prstats/index.sgml
rename to ru_RU.KOI8-R/htdocs/prstats/index.xml
diff --git a/ru_RU.KOI8-R/htdocs/publish.sgml b/ru_RU.KOI8-R/htdocs/publish.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/publish.sgml
rename to ru_RU.KOI8-R/htdocs/publish.xml
index 662b8bacad..2d0a116992 100644
--- a/ru_RU.KOI8-R/htdocs/publish.sgml
+++ b/ru_RU.KOI8-R/htdocs/publish.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/publish.sgml,v 1.16 2004/04/08 07:08:51 den Exp $
+     $FreeBSDru: frdp/www/ru/publish.xml,v 1.16 2004/04/08 07:08:51 den Exp $
 
      Original revision: 1.59
 -->
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.3R/Makefile b/ru_RU.KOI8-R/htdocs/releases/5.3R/Makefile
index 29aa3c5049..72cdaeb8a5 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.3R/Makefile
+++ b/ru_RU.KOI8-R/htdocs/releases/5.3R/Makefile
@@ -14,10 +14,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/ru_RU.KOI8-R/htdocs/releases/5.3R/announce.sgml b/ru_RU.KOI8-R/htdocs/releases/5.3R/announce.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/releases/5.3R/announce.sgml
rename to ru_RU.KOI8-R/htdocs/releases/5.3R/announce.xml
index 5ac501c9be..6721fbf290 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.3R/announce.sgml
+++ b/ru_RU.KOI8-R/htdocs/releases/5.3R/announce.xml
@@ -6,7 +6,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/releases/5.3R/announce.sgml,v 1.4 2004/11/10 06:15:53 den Exp $
+     $FreeBSDru: frdp/www/ru/releases/5.3R/announce.xml,v 1.4 2004/11/10 06:15:53 den Exp $
 
      Original revision: 1.4
 -->
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.3R/hardware.sgml b/ru_RU.KOI8-R/htdocs/releases/5.3R/hardware.xml
similarity index 93%
rename from ru_RU.KOI8-R/htdocs/releases/5.3R/hardware.sgml
rename to ru_RU.KOI8-R/htdocs/releases/5.3R/hardware.xml
index cce111a239..1d73c8acc8 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.3R/hardware.sgml
+++ b/ru_RU.KOI8-R/htdocs/releases/5.3R/hardware.xml
@@ -6,7 +6,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/releases/5.3R/hardware.sgml,v 1.2 2004/11/10 06:15:53 den Exp $
+     $FreeBSDru: frdp/www/ru/releases/5.3R/hardware.xml,v 1.2 2004/11/10 06:15:53 den Exp $
 
      Original revision: 1.1
 -->
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.3R/installation.sgml b/ru_RU.KOI8-R/htdocs/releases/5.3R/installation.xml
similarity index 93%
rename from ru_RU.KOI8-R/htdocs/releases/5.3R/installation.sgml
rename to ru_RU.KOI8-R/htdocs/releases/5.3R/installation.xml
index 5f0f2248da..c74e950738 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.3R/installation.sgml
+++ b/ru_RU.KOI8-R/htdocs/releases/5.3R/installation.xml
@@ -6,7 +6,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/releases/5.3R/installation.sgml,v 1.2 2004/11/10 06:15:53 den Exp $
+     $FreeBSDru: frdp/www/ru/releases/5.3R/installation.xml,v 1.2 2004/11/10 06:15:53 den Exp $
 
      Original revision: 1.1
 -->
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.3R/relnotes.sgml b/ru_RU.KOI8-R/htdocs/releases/5.3R/relnotes.xml
similarity index 93%
rename from ru_RU.KOI8-R/htdocs/releases/5.3R/relnotes.sgml
rename to ru_RU.KOI8-R/htdocs/releases/5.3R/relnotes.xml
index 8f1e3fe5ad..422fd9af01 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.3R/relnotes.sgml
+++ b/ru_RU.KOI8-R/htdocs/releases/5.3R/relnotes.xml
@@ -6,7 +6,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/releases/5.3R/relnotes.sgml,v 1.2 2004/11/10 06:15:53 den Exp $
+     $FreeBSDru: frdp/www/ru/releases/5.3R/relnotes.xml,v 1.2 2004/11/10 06:15:53 den Exp $
 
      Original revision: 1.1
 -->
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.4R/Makefile b/ru_RU.KOI8-R/htdocs/releases/5.4R/Makefile
index 22ba22dd86..e0078803c4 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.4R/Makefile
+++ b/ru_RU.KOI8-R/htdocs/releases/5.4R/Makefile
@@ -14,10 +14,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
 
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.4R/announce.sgml b/ru_RU.KOI8-R/htdocs/releases/5.4R/announce.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/releases/5.4R/announce.sgml
rename to ru_RU.KOI8-R/htdocs/releases/5.4R/announce.xml
index 5323d4e1e9..f27c38583f 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.4R/announce.sgml
+++ b/ru_RU.KOI8-R/htdocs/releases/5.4R/announce.xml
@@ -6,7 +6,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/releases/5.4R/announce.sgml,v 1.2 2005/05/11 07:51:53 den Exp $
+     $FreeBSDru: frdp/www/ru/releases/5.4R/announce.xml,v 1.2 2005/05/11 07:51:53 den Exp $
 
      Original revision: 1.6
 -->
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.4R/hardware.sgml b/ru_RU.KOI8-R/htdocs/releases/5.4R/hardware.xml
similarity index 93%
rename from ru_RU.KOI8-R/htdocs/releases/5.4R/hardware.sgml
rename to ru_RU.KOI8-R/htdocs/releases/5.4R/hardware.xml
index e41f62a524..15c5eefb47 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.4R/hardware.sgml
+++ b/ru_RU.KOI8-R/htdocs/releases/5.4R/hardware.xml
@@ -6,7 +6,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/releases/5.4R/hardware.sgml,v 1.1 2005/05/11 09:51:12 den Exp $
+     $FreeBSDru: frdp/www/ru/releases/5.4R/hardware.xml,v 1.1 2005/05/11 09:51:12 den Exp $
 
      Original revision: 1.1
 -->
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.4R/installation.sgml b/ru_RU.KOI8-R/htdocs/releases/5.4R/installation.xml
similarity index 93%
rename from ru_RU.KOI8-R/htdocs/releases/5.4R/installation.sgml
rename to ru_RU.KOI8-R/htdocs/releases/5.4R/installation.xml
index 01548fe86a..9dd4a2d2dd 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.4R/installation.sgml
+++ b/ru_RU.KOI8-R/htdocs/releases/5.4R/installation.xml
@@ -6,7 +6,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/releases/5.4R/installation.sgml,v 1.1 2005/05/11 09:51:12 den Exp $
+     $FreeBSDru: frdp/www/ru/releases/5.4R/installation.xml,v 1.1 2005/05/11 09:51:12 den Exp $
 
      Original revision: 1.1
 -->
diff --git a/ru_RU.KOI8-R/htdocs/releases/5.4R/relnotes.sgml b/ru_RU.KOI8-R/htdocs/releases/5.4R/relnotes.xml
similarity index 93%
rename from ru_RU.KOI8-R/htdocs/releases/5.4R/relnotes.sgml
rename to ru_RU.KOI8-R/htdocs/releases/5.4R/relnotes.xml
index 55f09db7a4..70c7bac8bc 100644
--- a/ru_RU.KOI8-R/htdocs/releases/5.4R/relnotes.sgml
+++ b/ru_RU.KOI8-R/htdocs/releases/5.4R/relnotes.xml
@@ -6,7 +6,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/releases/5.4R/relnotes.sgml,v 1.1 2005/05/11 09:51:12 den Exp $
+     $FreeBSDru: frdp/www/ru/releases/5.4R/relnotes.xml,v 1.1 2005/05/11 09:51:12 den Exp $
 
      Original revision: 1.1
 -->
diff --git a/ru_RU.KOI8-R/htdocs/releases/Makefile b/ru_RU.KOI8-R/htdocs/releases/Makefile
index 0be0b9fab0..599a610b10 100644
--- a/ru_RU.KOI8-R/htdocs/releases/Makefile
+++ b/ru_RU.KOI8-R/htdocs/releases/Makefile
@@ -14,7 +14,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml
+DOCS?=	index.xml
 
 SUBDIR=	5.3R 5.4R
 
diff --git a/ru_RU.KOI8-R/htdocs/releases/index.sgml b/ru_RU.KOI8-R/htdocs/releases/index.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/releases/index.sgml
rename to ru_RU.KOI8-R/htdocs/releases/index.xml
index fb4f6a0d49..3323b78bb6 100644
--- a/ru_RU.KOI8-R/htdocs/releases/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/releases/index.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/releases/index.sgml,v 1.37 2006/07/19 08:20:23 den Exp $
+     $FreeBSDru: frdp/www/ru/releases/index.xml,v 1.37 2006/07/19 08:20:23 den Exp $
 
      Original revision: 1.132
 -->
diff --git a/ru_RU.KOI8-R/htdocs/releng/Makefile b/ru_RU.KOI8-R/htdocs/releng/Makefile
index e5fb58d269..23b751d6c9 100644
--- a/ru_RU.KOI8-R/htdocs/releng/Makefile
+++ b/ru_RU.KOI8-R/htdocs/releng/Makefile
@@ -13,6 +13,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml charter.sgml
+DOCS?=	index.xml charter.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/releng/charter.sgml b/ru_RU.KOI8-R/htdocs/releng/charter.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/releng/charter.sgml
rename to ru_RU.KOI8-R/htdocs/releng/charter.xml
index 6efb8a9a18..434715cbc0 100644
--- a/ru_RU.KOI8-R/htdocs/releng/charter.sgml
+++ b/ru_RU.KOI8-R/htdocs/releng/charter.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/releng/charter.sgml,v 1.3 2004/09/21 07:31:11 den Exp $
+     $FreeBSDru: frdp/www/ru/releng/charter.xml,v 1.3 2004/09/21 07:31:11 den Exp $
 
      Original revision: 1.1
 -->
diff --git a/ru_RU.KOI8-R/htdocs/releng/index.sgml b/ru_RU.KOI8-R/htdocs/releng/index.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/releng/index.sgml
rename to ru_RU.KOI8-R/htdocs/releng/index.xml
index 0f9fd7e054..d001996687 100644
--- a/ru_RU.KOI8-R/htdocs/releng/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/releng/index.xml
@@ -14,7 +14,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/releng/index.sgml,v 1.15 2004/09/21 07:31:11 den Exp $
+     $FreeBSDru: frdp/www/ru/releng/index.xml,v 1.15 2004/09/21 07:31:11 den Exp $
 
      Original revision: 38826
 -->
diff --git a/ru_RU.KOI8-R/htdocs/relnotes.sgml b/ru_RU.KOI8-R/htdocs/relnotes.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/relnotes.sgml
rename to ru_RU.KOI8-R/htdocs/relnotes.xml
index eafad0f286..95294d01a8 100644
--- a/ru_RU.KOI8-R/htdocs/relnotes.sgml
+++ b/ru_RU.KOI8-R/htdocs/relnotes.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/relnotes.sgml,v 1.7 2005/03/22 14:25:14 den Exp $
+     $FreeBSDru: frdp/www/ru/relnotes.xml,v 1.7 2005/03/22 14:25:14 den Exp $
 
      Original revision: 1.12
 -->
diff --git a/ru_RU.KOI8-R/htdocs/search/Makefile b/ru_RU.KOI8-R/htdocs/search/Makefile
index 18f4ea3247..0fa611555b 100644
--- a/ru_RU.KOI8-R/htdocs/search/Makefile
+++ b/ru_RU.KOI8-R/htdocs/search/Makefile
@@ -11,10 +11,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+= index-site.sgml
-DOCS+= search.sgml
-DOCS+= searchhints.sgml
-DOCS+= search-mid.sgml
+DOCS+= index-site.xml
+DOCS+= search.xml
+DOCS+= searchhints.xml
+DOCS+= search-mid.xml
 
 INDEXLINK=	search.html
 
diff --git a/ru_RU.KOI8-R/htdocs/search/index-site.xsl b/ru_RU.KOI8-R/htdocs/search/index-site.xsl
index 819e882138..dd52734632 100644
--- a/ru_RU.KOI8-R/htdocs/search/index-site.xsl
+++ b/ru_RU.KOI8-R/htdocs/search/index-site.xsl
@@ -9,7 +9,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/search/index-site.sgml,v 1.6 2004/04/08 07:08:56 den Exp $
+     $FreeBSDru: frdp/www/ru/search/index-site.xml,v 1.6 2004/04/08 07:08:56 den Exp $
 
      Original revision: 1.25
 -->
diff --git a/ru_RU.KOI8-R/htdocs/search/search-mid.sgml b/ru_RU.KOI8-R/htdocs/search/search-mid.xml
similarity index 94%
rename from ru_RU.KOI8-R/htdocs/search/search-mid.sgml
rename to ru_RU.KOI8-R/htdocs/search/search-mid.xml
index 9dc9994d37..6b9c4e45d2 100644
--- a/ru_RU.KOI8-R/htdocs/search/search-mid.sgml
+++ b/ru_RU.KOI8-R/htdocs/search/search-mid.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/search/search-mid.sgml,v 1.5 2003/10/07 11:09:01 den Exp $
+     $FreeBSDru: frdp/www/ru/search/search-mid.xml,v 1.5 2003/10/07 11:09:01 den Exp $
 
      Original revision: 1.8
 -->
diff --git a/ru_RU.KOI8-R/htdocs/search/search.sgml b/ru_RU.KOI8-R/htdocs/search/search.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/search/search.sgml
rename to ru_RU.KOI8-R/htdocs/search/search.xml
index 160368759f..52cc96a421 100644
--- a/ru_RU.KOI8-R/htdocs/search/search.sgml
+++ b/ru_RU.KOI8-R/htdocs/search/search.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/search/search.sgml,v 1.20 2005/06/08 17:20:04 andy Exp $
+     $FreeBSDru: frdp/www/ru/search/search.xml,v 1.20 2005/06/08 17:20:04 andy Exp $
 
      Original revision: 1.98
 -->
diff --git a/ru_RU.KOI8-R/htdocs/search/searchhints.sgml b/ru_RU.KOI8-R/htdocs/search/searchhints.xml
similarity index 96%
rename from ru_RU.KOI8-R/htdocs/search/searchhints.sgml
rename to ru_RU.KOI8-R/htdocs/search/searchhints.xml
index 38a93a00e0..92f89edf3b 100644
--- a/ru_RU.KOI8-R/htdocs/search/searchhints.sgml
+++ b/ru_RU.KOI8-R/htdocs/search/searchhints.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/search/searchhints.sgml,v 1.5 2003/10/07 11:09:01 den Exp $
+     $FreeBSDru: frdp/www/ru/search/searchhints.xml,v 1.5 2003/10/07 11:09:01 den Exp $
 
      Original revision: 1.8
 -->
diff --git a/ru_RU.KOI8-R/htdocs/security/Makefile b/ru_RU.KOI8-R/htdocs/security/Makefile
index 27b3b965c7..160c6a6298 100644
--- a/ru_RU.KOI8-R/htdocs/security/Makefile
+++ b/ru_RU.KOI8-R/htdocs/security/Makefile
@@ -15,13 +15,13 @@
 .endif
 
 DOCS=
-DOCS+=	security.sgml
-DOCS+=	advisories.sgml
-DOCS+=	notices.sgml
+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/ru_RU.KOI8-R/htdocs/security/advisories.sgml b/ru_RU.KOI8-R/htdocs/security/advisories.xml
similarity index 100%
rename from ru_RU.KOI8-R/htdocs/security/advisories.sgml
rename to ru_RU.KOI8-R/htdocs/security/advisories.xml
diff --git a/ru_RU.KOI8-R/htdocs/security/notices.sgml b/ru_RU.KOI8-R/htdocs/security/notices.xml
similarity index 100%
rename from ru_RU.KOI8-R/htdocs/security/notices.sgml
rename to ru_RU.KOI8-R/htdocs/security/notices.xml
diff --git a/ru_RU.KOI8-R/htdocs/security/security.sgml b/ru_RU.KOI8-R/htdocs/security/security.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/security/security.sgml
rename to ru_RU.KOI8-R/htdocs/security/security.xml
index a396fc47dd..175490d2a7 100644
--- a/ru_RU.KOI8-R/htdocs/security/security.sgml
+++ b/ru_RU.KOI8-R/htdocs/security/security.xml
@@ -8,7 +8,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/www/ru/security/security.sgml,v 1.33 2004/09/21 07:31:12 den Exp $
+     $FreeBSDru: frdp/www/ru/security/security.xml,v 1.33 2004/09/21 07:31:12 den Exp $
 
      Original revision: 39327
 -->
diff --git a/ru_RU.KOI8-R/htdocs/send-pr.sgml b/ru_RU.KOI8-R/htdocs/send-pr.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/send-pr.sgml
rename to ru_RU.KOI8-R/htdocs/send-pr.xml
index fe88cf2df5..e4265127a8 100644
--- a/ru_RU.KOI8-R/htdocs/send-pr.sgml
+++ b/ru_RU.KOI8-R/htdocs/send-pr.xml
@@ -10,7 +10,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/send-pr.sgml,v 1.17 2008/06/21 19:32:52 marck Exp $
+     $FreeBSDru: frdp/www/ru/send-pr.xml,v 1.17 2008/06/21 19:32:52 marck Exp $
 
      Original revision: 1.39
 -->
diff --git a/ru_RU.KOI8-R/htdocs/snapshots/Makefile b/ru_RU.KOI8-R/htdocs/snapshots/Makefile
index f390637858..f70fa25b61 100644
--- a/ru_RU.KOI8-R/htdocs/snapshots/Makefile
+++ b/ru_RU.KOI8-R/htdocs/snapshots/Makefile
@@ -14,6 +14,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS?=	index.sgml
+DOCS?=	index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/snapshots/index.sgml b/ru_RU.KOI8-R/htdocs/snapshots/index.xml
similarity index 98%
rename from ru_RU.KOI8-R/htdocs/snapshots/index.sgml
rename to ru_RU.KOI8-R/htdocs/snapshots/index.xml
index f5e71b1813..1caa3bbd6a 100644
--- a/ru_RU.KOI8-R/htdocs/snapshots/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/snapshots/index.xml
@@ -10,7 +10,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/www/ru/snapshots/index.sgml,v 1.4 2006/01/17 07:27:20 gad Exp $
+     $FreeBSDru: frdp/www/ru/snapshots/index.xml,v 1.4 2006/01/17 07:27:20 gad Exp $
 
      Original revision: 1.8
 -->
diff --git a/ru_RU.KOI8-R/htdocs/support.sgml b/ru_RU.KOI8-R/htdocs/support.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/support.sgml
rename to ru_RU.KOI8-R/htdocs/support.xml
index ecac37776e..72e20b5ff5 100644
--- a/ru_RU.KOI8-R/htdocs/support.sgml
+++ b/ru_RU.KOI8-R/htdocs/support.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/support.sgml,v 1.69 2006/07/19 10:45:38 den Exp $
+     $FreeBSDru: frdp/www/ru/support.xml,v 1.69 2006/07/19 10:45:38 den Exp $
 
      Original revision: 1.354
 -->
diff --git a/ru_RU.KOI8-R/htdocs/support/Makefile b/ru_RU.KOI8-R/htdocs/support/Makefile
index 1bf4f6597e..3adb5b8668 100644
--- a/ru_RU.KOI8-R/htdocs/support/Makefile
+++ b/ru_RU.KOI8-R/htdocs/support/Makefile
@@ -9,6 +9,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/ru_RU.KOI8-R/htdocs/support/bugreports.sgml b/ru_RU.KOI8-R/htdocs/support/bugreports.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/support/bugreports.sgml
rename to ru_RU.KOI8-R/htdocs/support/bugreports.xml
index 31dc48ebc0..9c22a54b3f 100644
--- a/ru_RU.KOI8-R/htdocs/support/bugreports.sgml
+++ b/ru_RU.KOI8-R/htdocs/support/bugreports.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/support/bugreports.sgml,v 1.2 2006/01/17 07:27:20 gad Exp $
+     $FreeBSDru: frdp/www/ru/support/bugreports.xml,v 1.2 2006/01/17 07:27:20 gad Exp $
 
      Original revision: 1.5
 -->
diff --git a/ru_RU.KOI8-R/htdocs/support/webresources.sgml b/ru_RU.KOI8-R/htdocs/support/webresources.xml
similarity index 97%
rename from ru_RU.KOI8-R/htdocs/support/webresources.sgml
rename to ru_RU.KOI8-R/htdocs/support/webresources.xml
index 246aebb779..7ac3d26493 100644
--- a/ru_RU.KOI8-R/htdocs/support/webresources.sgml
+++ b/ru_RU.KOI8-R/htdocs/support/webresources.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/support/webresources.sgml,v 1.2 2006/06/08 08:14:55 gad Exp $
+     $FreeBSDru: frdp/www/ru/support/webresources.xml,v 1.2 2006/06/08 08:14:55 gad Exp $
 
      Original revision: 1.3
 -->
diff --git a/ru_RU.KOI8-R/htdocs/tutorials/Makefile b/ru_RU.KOI8-R/htdocs/tutorials/Makefile
index fa0121c6e2..6bdd38b9a2 100644
--- a/ru_RU.KOI8-R/htdocs/tutorials/Makefile
+++ b/ru_RU.KOI8-R/htdocs/tutorials/Makefile
@@ -16,6 +16,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS = index.sgml
+DOCS = index.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/ru_RU.KOI8-R/htdocs/tutorials/index.sgml b/ru_RU.KOI8-R/htdocs/tutorials/index.xml
similarity index 89%
rename from ru_RU.KOI8-R/htdocs/tutorials/index.sgml
rename to ru_RU.KOI8-R/htdocs/tutorials/index.xml
index 6168efd7b1..419cfb1d0e 100644
--- a/ru_RU.KOI8-R/htdocs/tutorials/index.sgml
+++ b/ru_RU.KOI8-R/htdocs/tutorials/index.xml
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/tutorials/index.sgml,v 1.14 2006/06/08 08:14:55 gad Exp $
+     $FreeBSDru: frdp/www/ru/tutorials/index.xml,v 1.14 2006/06/08 08:14:55 gad Exp $
 
      Original revision: 1.25
 -->
diff --git a/ru_RU.KOI8-R/htdocs/where.sgml b/ru_RU.KOI8-R/htdocs/where.xml
similarity index 99%
rename from ru_RU.KOI8-R/htdocs/where.sgml
rename to ru_RU.KOI8-R/htdocs/where.xml
index e527c0a9e6..787d4c5112 100644
--- a/ru_RU.KOI8-R/htdocs/where.sgml
+++ b/ru_RU.KOI8-R/htdocs/where.xml
@@ -8,7 +8,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSDru: frdp/www/ru/where.sgml,v 1.17 2006/07/19 09:33:24 den Exp $
+     $FreeBSDru: frdp/www/ru/where.xml,v 1.17 2006/07/19 09:33:24 den Exp $
 
      Original revision: 38826
 -->
diff --git a/ru_RU.KOI8-R/share/sgml/glossary.ent b/ru_RU.KOI8-R/share/sgml/glossary.ent
index cc9f2ac869..bfcc619d5d 100644
--- a/ru_RU.KOI8-R/share/sgml/glossary.ent
+++ b/ru_RU.KOI8-R/share/sgml/glossary.ent
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/share/sgml/glossary/freebsd-glossary.sgml,v 1.7 2006/02/04 14:55:43 gad Exp $
+     $FreeBSDru: frdp/doc/ru_RU.KOI8-R/share/sgml/glossary/freebsd-glossary.xml,v 1.7 2006/02/04 14:55:43 gad Exp $
 
      Original revision: r21959
 
diff --git a/ru_RU.KOI8-R/share/sgml/header.l10n.ent b/ru_RU.KOI8-R/share/sgml/header.l10n.ent
index 90ab985662..057011cfde 100644
--- a/ru_RU.KOI8-R/share/sgml/header.l10n.ent
+++ b/ru_RU.KOI8-R/share/sgml/header.l10n.ent
@@ -3,7 +3,7 @@
      The FreeBSD Russian Documentation Project
 
      $FreeBSD$
-     $FreeBSDru: frdp/www/ru/includes.sgml,v 1.27 2006/06/10 18:40:56 gad Exp $
+     $FreeBSDru: frdp/www/ru/includes.xml,v 1.27 2006/06/10 18:40:56 gad Exp $
 
      Original revision: 1.62
 
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index d9f76f0dc5..644b7394f9 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -13,13 +13,11 @@
 # Document-specific variables
 #
 #	DOC		This should be set to the name of the DocBook
-#			marked-up file, without the .sgml suffix.
+#			marked-up file, without the .xml suffix.
 #			
 #			It also determins the name of the output files -
 #			${DOC}.html.
 #
-#	DOCBOOKSUFFIX	The suffix of your document, defaulting to .sgml
-#
 #	SRCS		The names of all the files that are needed to
 #			build this document - This is useful if any of
 #			them need to be generated.  Changing any file in
@@ -51,9 +49,9 @@
 #	NO_TIDY		If you do not want to use tidy, set this to "YES".
 #
 #       GEN_INDEX       If this document has an index (HAS_INDEX) and this
-#                       variable is defined, then index.sgml will be added 
+#                       variable is defined, then index.xml will be added 
 #                       to the list of dependencies for source files, and 
-#                       collateindex.pl will be run to generate index.sgml.
+#                       collateindex.pl will be run to generate index.xml.
 #
 #	CSS_SHEET	Full path to a CSS stylesheet suitable for DocBook.
 #			Default is ${DOC_PREFIX}/share/misc/docbook.css
@@ -115,9 +113,7 @@
 # Documents should use the += format to access these.
 #
 
-DOCBOOKSUFFIX?= sgml
-
-MASTERDOC?=	${.CURDIR}/${DOC}.${DOCBOOKSUFFIX}
+MASTERDOC?=	${.CURDIR}/${DOC}.xml
 
 # List of supported SP_ENCODINGs
 SP_ENCODING_LIST?=	ISO-8859-2 KOI8-R
@@ -466,7 +462,7 @@ JADEFLAGS+=		-i chap.index
 HTML_SPLIT_INDEX?=	html-split.index
 HTML_INDEX?=		html.index
 PRINT_INDEX?=		print.index
-INDEX_SGML?=		index.sgml
+INDEX_SGML?=		index.xml
 
 CLEANFILES+= 		${INDEX_SGML} ${HTML_SPLIT_INDEX} ${HTML_INDEX} ${PRINT_INDEX}
 
@@ -504,19 +500,6 @@ NO_RTF=		yes
 .endif
 .endfor
 
-# XML --------------------------------------------------------------------
-
-# sx generates a lot of (spurious) errors of the form "reference to
-# internal SDATA entity ...".  So dump the errors to separate file, and
-# grep for any other errors to show them to the user.
-#
-# Better approaches to handling this would be most welcome
-
-${DOC}.xml: ${SRCS}
-	echo '<!DOCTYPE book SYSTEM "/usr/local/share/xml/docbook/4.2/docbookx.dtd">' > ${DOC}.xml
-	${SX} -xlower -xndata ${MASTERDOC} 2> .sxerr | tail -n +2 >> ${DOC}.xml 
-	@-grep -v 'reference to internal SDATA entity' .sxerr
-
 # HTML-SPLIT -------------------------------------------------------------
 
 .if ${STYLESHEET_TYPE} == "dsssl"
@@ -751,7 +734,7 @@ lint validate:
 # Generate a different .index file based on the format name
 #
 # If we're not generating an index (the default) then we need to create
-# an empty index.sgml file so that we can reference index.sgml in book.sgml
+# an empty index.xml file so that we can reference index.xml in book.sgml
 #
 
 
@@ -880,7 +863,7 @@ spellcheck-${_curformat}:
 spellcheck: ${FORMATS:C/^/spellcheck-/}
 
 indexreport:
-.for _entry in ${SRCS:M*.sgml}
+.for _entry in ${SRCS:M*.xml}
 	@echo "indexreport ${_entry}"
 	@${PERL} ${INDEXREPORTSCRIPT} ${.CURDIR}/${_entry}
 .endfor
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index dbd945da62..d3ae084be0 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -164,13 +164,13 @@ CATALOG+=	${DOC_PREFIX}/share/sgml/catalog
 # Transformation rules
 
 ###
-# file.sgml --> file.html
+# file.xml --> file.html
 #
-# Runs file.sgml through spam to validate and expand some entity
+# Runs file.xml through spam to validate and expand some entity
 # references are expanded.  file.html is added to the list of
 # things to install.
 
-.SUFFIXES:	.sgml .html
+.SUFFIXES:	.xml .html
 .if defined(REVCHECK)
 PREHTML?=	${DOC_PREFIX}/ja_JP.eucJP/htdocs/prehtml
 CANONPREFIX0!=	cd ${DOC_PREFIX}; ${ECHO_CMD} $${PWD};
@@ -187,10 +187,10 @@ PREHTML?=	${SED} -e 's/<!ENTITY base CDATA ".*">/<!ENTITY base CDATA "http:\/\/w
 .endif
 .endif
 
-GENDOCS+=	${DOCS:M*.sgml:S/.sgml$/.html/g}
-ORPHANS:=	${ORPHANS:N*.sgml}
+GENDOCS+=	${DOCS:M*.xml:S/.xml$/.html/g}
+ORPHANS:=	${ORPHANS:N*.xml}
 
-.sgml.html: ${_DEPENDSET.wwwstd} ${DOC_PREFIX}/share/sgml/xhtml.xsl
+.xml.html: ${_DEPENDSET.wwwstd} ${DOC_PREFIX}/share/sgml/xhtml.xsl
 .if defined(PREHTML)
 	${PREHTML} ${PREHTMLOPTS} ${.IMPSRC} > ${.IMPSRC}-tmp
 	${XMLLINT} ${XMLLINTOPTS} ${.IMPSRC}-tmp
diff --git a/share/pgpkeys/pgpkeys-core.sgml b/share/pgpkeys/pgpkeys-core.xml
similarity index 100%
rename from share/pgpkeys/pgpkeys-core.sgml
rename to share/pgpkeys/pgpkeys-core.xml
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.xml
similarity index 100%
rename from share/pgpkeys/pgpkeys-developers.sgml
rename to share/pgpkeys/pgpkeys-developers.xml
diff --git a/share/pgpkeys/pgpkeys-officers.sgml b/share/pgpkeys/pgpkeys-officers.xml
similarity index 100%
rename from share/pgpkeys/pgpkeys-officers.sgml
rename to share/pgpkeys/pgpkeys-officers.xml
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index e8e5d7a31b..3e1c383c55 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -394,6 +394,6 @@
 <!ENTITY pgpkey.zi SYSTEM "zi.key">
 <!ENTITY pgpkey.zml SYSTEM "zml.key">
 <!ENTITY pgpkey.zont SYSTEM "zont.key">
-<!ENTITY section.pgpkeys-core		SYSTEM "pgpkeys-core.sgml">
-<!ENTITY section.pgpkeys-developers	SYSTEM "pgpkeys-developers.sgml">
-<!ENTITY section.pgpkeys-officers	SYSTEM "pgpkeys-officers.sgml">
+<!ENTITY section.pgpkeys-core		SYSTEM "pgpkeys-core.xml">
+<!ENTITY section.pgpkeys-developers	SYSTEM "pgpkeys-developers.xml">
+<!ENTITY section.pgpkeys-officers	SYSTEM "pgpkeys-officers.xml">
diff --git a/share/sgml/bibliography.sgml b/share/sgml/bibliography.xml
similarity index 100%
rename from share/sgml/bibliography.sgml
rename to share/sgml/bibliography.xml
diff --git a/share/sgml/man-refs.ent b/share/sgml/man-refs.ent
index ca0eb055b9..c8513beea1 100644
--- a/share/sgml/man-refs.ent
+++ b/share/sgml/man-refs.ent
@@ -582,7 +582,7 @@
 <!ENTITY man.setvar.1 "<citerefentry><refentrytitle>setvar</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.setxkbmap.1 "<citerefentry vendor='xorg'><refentrytitle>setxkbmap</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.sftp.1 "<citerefentry><refentrytitle>sftp</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
-<!ENTITY man.sgmlnorm.1 "<citerefentry vendor='ports'><refentrytitle>sgmlnorm</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
+<!ENTITY man.xmlnorm.1 "<citerefentry vendor='ports'><refentrytitle>sgmlnorm</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.sgsc.1 "<citerefentry><refentrytitle>sgsc</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.sh.1 "<citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.sha1.1 "<citerefentry><refentrytitle>sha1</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
diff --git a/share/sgml/mirrors-master.xsl b/share/sgml/mirrors-master.xsl
index cac68ae377..4eed64c5a1 100644
--- a/share/sgml/mirrors-master.xsl
+++ b/share/sgml/mirrors-master.xsl
@@ -32,12 +32,12 @@
 
   <xsl:template match="/">
     <xsl:choose>
-      <xsl:when test="$target = 'handbook/mirrors/chapter.sgml'">
+      <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
 	<xsl:call-template name="mirrors-docbook-country-index-all" />
 	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
 	<xsl:call-template name="mirrors-docbook-variablelist" />
       </xsl:when>
-      <xsl:when test="$target = 'handbook/eresources/chapter.sgml'">
+      <xsl:when test="$target = 'handbook/eresources/chapter.xml'">
 	<xsl:call-template name="mirrors-docbook-country-index-all" />
 	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
 	<xsl:call-template name="mirrors-docbook-itemizedlist" />
diff --git a/share/sgml/release.ent b/share/sgml/release.ent
index 5ae2a1e18b..6a80b55ba1 100644
--- a/share/sgml/release.ent
+++ b/share/sgml/release.ent
@@ -8,9 +8,9 @@
 
 	- similar entity in the Handbook
 	- similar entity in the Relnotes
-	- releases/index.sgml has the date of the current release
+	- releases/index.xml has the date of the current release
 	- the FAQ has links to the release FTP url
-	- "versions supported" in security.sgml
+	- "versions supported" in security.xml
 
      (If you're the release engineer, feel free to update this list with
      other doc-related things you had to do.  It'll save you time and
diff --git a/sr_YU.ISO8859-2/books/faq/Makefile b/sr_YU.ISO8859-2/books/faq/Makefile
index 68d979fc6d..4615625902 100644
--- a/sr_YU.ISO8859-2/books/faq/Makefile
+++ b/sr_YU.ISO8859-2/books/faq/Makefile
@@ -18,7 +18,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/tr_TR.ISO8859-9/articles/explaining-bsd/Makefile b/tr_TR.ISO8859-9/articles/explaining-bsd/Makefile
index 886e21cc9d..1cc1eb84e1 100644
--- a/tr_TR.ISO8859-9/articles/explaining-bsd/Makefile
+++ b/tr_TR.ISO8859-9/articles/explaining-bsd/Makefile
@@ -7,7 +7,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS= article.sgml
+SRCS= article.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
diff --git a/tr_TR.ISO8859-9/articles/explaining-bsd/article.sgml b/tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
similarity index 100%
rename from tr_TR.ISO8859-9/articles/explaining-bsd/article.sgml
rename to tr_TR.ISO8859-9/articles/explaining-bsd/article.xml
diff --git a/tr_TR.ISO8859-9/htdocs/Makefile b/tr_TR.ISO8859-9/htdocs/Makefile
index 8ea2955c02..df5cf8ccda 100644
--- a/tr_TR.ISO8859-9/htdocs/Makefile
+++ b/tr_TR.ISO8859-9/htdocs/Makefile
@@ -11,9 +11,9 @@
 
 # These are turned into validated, normalized HTML files.
 
-DOCS= docs.sgml
-DOCS+= features.sgml
-DOCS+= mailto.sgml
+DOCS= docs.xml
+DOCS+= features.xml
+DOCS+= mailto.xml
 
 XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
 DEPENDSET.index=transtable mirrors news press events \
diff --git a/tr_TR.ISO8859-9/htdocs/docs.sgml b/tr_TR.ISO8859-9/htdocs/docs.xml
similarity index 100%
rename from tr_TR.ISO8859-9/htdocs/docs.sgml
rename to tr_TR.ISO8859-9/htdocs/docs.xml
diff --git a/tr_TR.ISO8859-9/htdocs/features.sgml b/tr_TR.ISO8859-9/htdocs/features.xml
similarity index 100%
rename from tr_TR.ISO8859-9/htdocs/features.sgml
rename to tr_TR.ISO8859-9/htdocs/features.xml
diff --git a/tr_TR.ISO8859-9/htdocs/index.xsl b/tr_TR.ISO8859-9/htdocs/index.xsl
index 1fc4b71cd3..f55cb57cf4 100644
--- a/tr_TR.ISO8859-9/htdocs/index.xsl
+++ b/tr_TR.ISO8859-9/htdocs/index.xsl
@@ -54,7 +54,7 @@
 		<select name="goto">
 		  <!--  Only list TRUE mirrrors here! Native language pages
 		        which are not mirrored should be listed in
-		        support.sgml.  -->
+		        support.xml.  -->
 
 		  <option value="http://www2.at.FreeBSD.org/">IPv6 Avusturya</option>
 		  <option value="http://www.dk.FreeBSD.org/">IPv6 Danimarka</option>
diff --git a/tr_TR.ISO8859-9/htdocs/mailto.sgml b/tr_TR.ISO8859-9/htdocs/mailto.xml
similarity index 100%
rename from tr_TR.ISO8859-9/htdocs/mailto.sgml
rename to tr_TR.ISO8859-9/htdocs/mailto.xml
diff --git a/zh_CN.GB2312/articles/contributing/Makefile b/zh_CN.GB2312/articles/contributing/Makefile
index 119a6776a3..917c12fe11 100644
--- a/zh_CN.GB2312/articles/contributing/Makefile
+++ b/zh_CN.GB2312/articles/contributing/Makefile
@@ -14,7 +14,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/zh_CN.GB2312/articles/contributing/article.sgml b/zh_CN.GB2312/articles/contributing/article.xml
similarity index 100%
rename from zh_CN.GB2312/articles/contributing/article.sgml
rename to zh_CN.GB2312/articles/contributing/article.xml
diff --git a/zh_CN.GB2312/articles/cvs-freebsd/Makefile b/zh_CN.GB2312/articles/cvs-freebsd/Makefile
index c6018991d4..ce7b36b13f 100644
--- a/zh_CN.GB2312/articles/cvs-freebsd/Makefile
+++ b/zh_CN.GB2312/articles/cvs-freebsd/Makefile
@@ -14,7 +14,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/zh_CN.GB2312/articles/cvs-freebsd/article.sgml b/zh_CN.GB2312/articles/cvs-freebsd/article.xml
similarity index 99%
rename from zh_CN.GB2312/articles/cvs-freebsd/article.sgml
rename to zh_CN.GB2312/articles/cvs-freebsd/article.xml
index 6eac98e591..237b39a975 100644
--- a/zh_CN.GB2312/articles/cvs-freebsd/article.sgml
+++ b/zh_CN.GB2312/articles/cvs-freebsd/article.xml
@@ -9,7 +9,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Chinese (Simplified) Documentation Project
 
-     From FreeBSD: doc/zh_TW.Big5/articles/cvs-freebsd/article.sgml,v 1.2 2006/01/31 01:30:59 vanilla
+     From FreeBSD: doc/zh_TW.Big5/articles/cvs-freebsd/article.xml,v 1.2 2006/01/31 01:30:59 vanilla
      Original Revision: 1.17
 -->
 
diff --git a/zh_CN.GB2312/articles/linux-users/Makefile b/zh_CN.GB2312/articles/linux-users/Makefile
index 1eb74f01f0..7655a1e45c 100644
--- a/zh_CN.GB2312/articles/linux-users/Makefile
+++ b/zh_CN.GB2312/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/zh_CN.GB2312/articles/linux-users/article.sgml b/zh_CN.GB2312/articles/linux-users/article.xml
similarity index 100%
rename from zh_CN.GB2312/articles/linux-users/article.sgml
rename to zh_CN.GB2312/articles/linux-users/article.xml
diff --git a/zh_CN.GB2312/articles/nanobsd/Makefile b/zh_CN.GB2312/articles/nanobsd/Makefile
index cd1bbd1910..dcb5195f26 100644
--- a/zh_CN.GB2312/articles/nanobsd/Makefile
+++ b/zh_CN.GB2312/articles/nanobsd/Makefile
@@ -20,7 +20,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/zh_CN.GB2312/articles/nanobsd/article.sgml b/zh_CN.GB2312/articles/nanobsd/article.xml
similarity index 100%
rename from zh_CN.GB2312/articles/nanobsd/article.sgml
rename to zh_CN.GB2312/articles/nanobsd/article.xml
diff --git a/zh_CN.GB2312/articles/rc-scripting/Makefile b/zh_CN.GB2312/articles/rc-scripting/Makefile
index 9f5c5f18f9..6ac2a1559d 100644
--- a/zh_CN.GB2312/articles/rc-scripting/Makefile
+++ b/zh_CN.GB2312/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/zh_CN.GB2312/articles/rc-scripting/article.sgml b/zh_CN.GB2312/articles/rc-scripting/article.xml
similarity index 100%
rename from zh_CN.GB2312/articles/rc-scripting/article.sgml
rename to zh_CN.GB2312/articles/rc-scripting/article.xml
diff --git a/zh_CN.GB2312/articles/remote-install/Makefile b/zh_CN.GB2312/articles/remote-install/Makefile
index ea7523cc27..5fc385e414 100644
--- a/zh_CN.GB2312/articles/remote-install/Makefile
+++ b/zh_CN.GB2312/articles/remote-install/Makefile
@@ -11,7 +11,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/zh_CN.GB2312/articles/remote-install/article.sgml b/zh_CN.GB2312/articles/remote-install/article.xml
similarity index 100%
rename from zh_CN.GB2312/articles/remote-install/article.sgml
rename to zh_CN.GB2312/articles/remote-install/article.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/Makefile b/zh_CN.GB2312/books/arch-handbook/Makefile
index 50d77e3695..a59182bcc6 100644
--- a/zh_CN.GB2312/books/arch-handbook/Makefile
+++ b/zh_CN.GB2312/books/arch-handbook/Makefile
@@ -22,23 +22,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/zh_CN.GB2312/books/arch-handbook/book.sgml b/zh_CN.GB2312/books/arch-handbook/book.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/book.sgml
rename to zh_CN.GB2312/books/arch-handbook/book.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/boot/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/boot/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/chapters.ent b/zh_CN.GB2312/books/arch-handbook/chapters.ent
index 39ecd9549f..03de4f95ce 100644
--- a/zh_CN.GB2312/books/arch-handbook/chapters.ent
+++ b/zh_CN.GB2312/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.
 
@@ -14,27 +14,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/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/driverbasics/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/isa/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/isa/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/isa/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/jail/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/jail/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/jail/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/kobj/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/kobj/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/kobj/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/locking/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/locking/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/locking/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/mac/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/newbus/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/newbus/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/newbus/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/pccard/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/pccard/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/pccard/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/pci/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/pci/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/pci/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/scsi/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/scsi/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/scsi/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/smp/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/smp/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/smp/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/sound/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/sound/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/sound/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/sysinit/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/sysinit/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/usb/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/usb/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/usb/chapter.xml
diff --git a/zh_CN.GB2312/books/arch-handbook/vm/chapter.sgml b/zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/arch-handbook/vm/chapter.sgml
rename to zh_CN.GB2312/books/arch-handbook/vm/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/Makefile b/zh_CN.GB2312/books/handbook/Makefile
index ca7d4bccb3..1a1706fffb 100644
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@@ -17,7 +17,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
@@ -27,8 +27,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
 #
 # ------------------------------------------------------------------------
 
@@ -204,44 +204,44 @@ IMAGES_LIB+= callouts/15.png
 #
 
 # SGML content
-SRCS+= audit/chapter.sgml
-SRCS+= book.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+= 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
@@ -249,12 +249,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 ${MASTERDOC}
 
 DOC_PREFIX?= ${.CURDIR}/../../..
@@ -272,9 +272,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}
@@ -282,20 +282,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/zh_CN.GB2312/books/handbook/advanced-networking/Makefile b/zh_CN.GB2312/books/handbook/advanced-networking/Makefile
index 068f0fefb9..6609ef5fd0 100644
--- a/zh_CN.GB2312/books/handbook/advanced-networking/Makefile
+++ b/zh_CN.GB2312/books/handbook/advanced-networking/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	advanced-networking/chapter.sgml
+CHAPTERS= 	advanced-networking/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml b/zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml
rename to zh_CN.GB2312/books/handbook/advanced-networking/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/audit/Makefile b/zh_CN.GB2312/books/handbook/audit/Makefile
index 44183fada9..f8d86e4cfa 100644
--- a/zh_CN.GB2312/books/handbook/audit/Makefile
+++ b/zh_CN.GB2312/books/handbook/audit/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	audit/chapter.sgml
+CHAPTERS= 	audit/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/audit/chapter.sgml b/zh_CN.GB2312/books/handbook/audit/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/audit/chapter.sgml
rename to zh_CN.GB2312/books/handbook/audit/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/basics/Makefile b/zh_CN.GB2312/books/handbook/basics/Makefile
index 8c29323b92..ff10a46c63 100644
--- a/zh_CN.GB2312/books/handbook/basics/Makefile
+++ b/zh_CN.GB2312/books/handbook/basics/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	basics/chapter.sgml
+CHAPTERS= 	basics/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/basics/chapter.sgml b/zh_CN.GB2312/books/handbook/basics/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/basics/chapter.sgml
rename to zh_CN.GB2312/books/handbook/basics/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/bibliography/Makefile b/zh_CN.GB2312/books/handbook/bibliography/Makefile
index 8b2751b9b7..8e3cd38fc9 100644
--- a/zh_CN.GB2312/books/handbook/bibliography/Makefile
+++ b/zh_CN.GB2312/books/handbook/bibliography/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	bibliography/chapter.sgml
+CHAPTERS= 	bibliography/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml b/zh_CN.GB2312/books/handbook/bibliography/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/bibliography/chapter.sgml
rename to zh_CN.GB2312/books/handbook/bibliography/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/book.sgml b/zh_CN.GB2312/books/handbook/book.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/book.sgml
rename to zh_CN.GB2312/books/handbook/book.xml
diff --git a/zh_CN.GB2312/books/handbook/boot/Makefile b/zh_CN.GB2312/books/handbook/boot/Makefile
index 84225cae6f..ad776ef7da 100644
--- a/zh_CN.GB2312/books/handbook/boot/Makefile
+++ b/zh_CN.GB2312/books/handbook/boot/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	boot/chapter.sgml
+CHAPTERS= 	boot/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/boot/chapter.sgml b/zh_CN.GB2312/books/handbook/boot/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/boot/chapter.sgml
rename to zh_CN.GB2312/books/handbook/boot/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/chapters.ent b/zh_CN.GB2312/books/handbook/chapters.ent
index 3b256c7429..d0c9d534ed 100644
--- a/zh_CN.GB2312/books/handbook/chapters.ent
+++ b/zh_CN.GB2312/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,140 +53,140 @@
 <!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.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/zh_CN.GB2312/books/handbook/colophon.sgml b/zh_CN.GB2312/books/handbook/colophon.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/colophon.sgml
rename to zh_CN.GB2312/books/handbook/colophon.xml
diff --git a/zh_CN.GB2312/books/handbook/config/Makefile b/zh_CN.GB2312/books/handbook/config/Makefile
index bacbb8e8dd..1dd3907876 100644
--- a/zh_CN.GB2312/books/handbook/config/Makefile
+++ b/zh_CN.GB2312/books/handbook/config/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	config/chapter.sgml
+CHAPTERS= 	config/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/config/chapter.sgml b/zh_CN.GB2312/books/handbook/config/chapter.xml
similarity index 99%
rename from zh_CN.GB2312/books/handbook/config/chapter.sgml
rename to zh_CN.GB2312/books/handbook/config/chapter.xml
index e2f3728d39..0e9f07d5c2 100644
--- a/zh_CN.GB2312/books/handbook/config/chapter.sgml
+++ b/zh_CN.GB2312/books/handbook/config/chapter.xml
@@ -781,7 +781,7 @@ dc1: [ITHREAD]</screen>
 	  object)</primary></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>���ҵ��ǣ� ���೧��������Ϊ����������漰�������е���ҵ���ܣ�
 	  �����Բ�Ը�⽫������������Ϊ����Դ������ʽ�����������ǵ�ʱ�����
diff --git a/zh_CN.GB2312/books/handbook/cutting-edge/Makefile b/zh_CN.GB2312/books/handbook/cutting-edge/Makefile
index 6d1e5a6e98..be138f6378 100644
--- a/zh_CN.GB2312/books/handbook/cutting-edge/Makefile
+++ b/zh_CN.GB2312/books/handbook/cutting-edge/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	cutting-edge/chapter.sgml
+CHAPTERS= 	cutting-edge/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/cutting-edge/chapter.sgml
rename to zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/desktop/Makefile b/zh_CN.GB2312/books/handbook/desktop/Makefile
index 12e0bc3642..d50669be1c 100644
--- a/zh_CN.GB2312/books/handbook/desktop/Makefile
+++ b/zh_CN.GB2312/books/handbook/desktop/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	desktop/chapter.sgml
+CHAPTERS= 	desktop/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/desktop/chapter.sgml b/zh_CN.GB2312/books/handbook/desktop/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/desktop/chapter.sgml
rename to zh_CN.GB2312/books/handbook/desktop/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/disks/Makefile b/zh_CN.GB2312/books/handbook/disks/Makefile
index 7f815d8d4d..75c48f40f9 100644
--- a/zh_CN.GB2312/books/handbook/disks/Makefile
+++ b/zh_CN.GB2312/books/handbook/disks/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	disks/chapter.sgml
+CHAPTERS= 	disks/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/disks/chapter.sgml b/zh_CN.GB2312/books/handbook/disks/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/disks/chapter.sgml
rename to zh_CN.GB2312/books/handbook/disks/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/dtrace/Makefile b/zh_CN.GB2312/books/handbook/dtrace/Makefile
index 5781077dd1..5717189c4b 100644
--- a/zh_CN.GB2312/books/handbook/dtrace/Makefile
+++ b/zh_CN.GB2312/books/handbook/dtrace/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	dtrace/chapter.sgml
+CHAPTERS= 	dtrace/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/dtrace/chapter.sgml b/zh_CN.GB2312/books/handbook/dtrace/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/dtrace/chapter.sgml
rename to zh_CN.GB2312/books/handbook/dtrace/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/eresources/Makefile b/zh_CN.GB2312/books/handbook/eresources/Makefile
index 2009047f83..154668b908 100644
--- a/zh_CN.GB2312/books/handbook/eresources/Makefile
+++ b/zh_CN.GB2312/books/handbook/eresources/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	eresources/chapter.sgml
+CHAPTERS= 	eresources/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/eresources/chapter.sgml b/zh_CN.GB2312/books/handbook/eresources/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/eresources/chapter.sgml
rename to zh_CN.GB2312/books/handbook/eresources/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/filesystems/Makefile b/zh_CN.GB2312/books/handbook/filesystems/Makefile
index 1202253d55..cecf681dab 100644
--- a/zh_CN.GB2312/books/handbook/filesystems/Makefile
+++ b/zh_CN.GB2312/books/handbook/filesystems/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	filesystems/chapter.sgml
+CHAPTERS= 	filesystems/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/filesystems/chapter.sgml b/zh_CN.GB2312/books/handbook/filesystems/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/filesystems/chapter.sgml
rename to zh_CN.GB2312/books/handbook/filesystems/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/firewalls/Makefile b/zh_CN.GB2312/books/handbook/firewalls/Makefile
index 5be78a928d..a0fd77f3e5 100644
--- a/zh_CN.GB2312/books/handbook/firewalls/Makefile
+++ b/zh_CN.GB2312/books/handbook/firewalls/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	firewalls/chapter.sgml
+CHAPTERS= 	firewalls/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml b/zh_CN.GB2312/books/handbook/firewalls/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/firewalls/chapter.sgml
rename to zh_CN.GB2312/books/handbook/firewalls/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/geom/Makefile b/zh_CN.GB2312/books/handbook/geom/Makefile
index 05079dcc5b..b903bdac35 100644
--- a/zh_CN.GB2312/books/handbook/geom/Makefile
+++ b/zh_CN.GB2312/books/handbook/geom/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	geom/chapter.sgml
+CHAPTERS= 	geom/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/geom/chapter.sgml b/zh_CN.GB2312/books/handbook/geom/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/geom/chapter.sgml
rename to zh_CN.GB2312/books/handbook/geom/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/install/Makefile b/zh_CN.GB2312/books/handbook/install/Makefile
index bc80e45c4e..66f2a26576 100644
--- a/zh_CN.GB2312/books/handbook/install/Makefile
+++ b/zh_CN.GB2312/books/handbook/install/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	install/chapter.sgml
+CHAPTERS= 	install/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/install/chapter.sgml b/zh_CN.GB2312/books/handbook/install/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/install/chapter.sgml
rename to zh_CN.GB2312/books/handbook/install/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/introduction/Makefile b/zh_CN.GB2312/books/handbook/introduction/Makefile
index 471fbb6461..0e2da6536c 100644
--- a/zh_CN.GB2312/books/handbook/introduction/Makefile
+++ b/zh_CN.GB2312/books/handbook/introduction/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	introduction/chapter.sgml
+CHAPTERS= 	introduction/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/introduction/chapter.sgml b/zh_CN.GB2312/books/handbook/introduction/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/introduction/chapter.sgml
rename to zh_CN.GB2312/books/handbook/introduction/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/jails/chapter.sgml b/zh_CN.GB2312/books/handbook/jails/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/jails/chapter.sgml
rename to zh_CN.GB2312/books/handbook/jails/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/kernelconfig/Makefile b/zh_CN.GB2312/books/handbook/kernelconfig/Makefile
index c63975d774..8ea5a404a3 100644
--- a/zh_CN.GB2312/books/handbook/kernelconfig/Makefile
+++ b/zh_CN.GB2312/books/handbook/kernelconfig/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	kernelconfig/chapter.sgml
+CHAPTERS= 	kernelconfig/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml b/zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml
rename to zh_CN.GB2312/books/handbook/kernelconfig/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/l10n/Makefile b/zh_CN.GB2312/books/handbook/l10n/Makefile
index adce6d413f..09f7301e2b 100644
--- a/zh_CN.GB2312/books/handbook/l10n/Makefile
+++ b/zh_CN.GB2312/books/handbook/l10n/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	l10n/chapter.sgml
+CHAPTERS= 	l10n/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/l10n/chapter.sgml b/zh_CN.GB2312/books/handbook/l10n/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/l10n/chapter.sgml
rename to zh_CN.GB2312/books/handbook/l10n/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/linuxemu/Makefile b/zh_CN.GB2312/books/handbook/linuxemu/Makefile
index f960df52cf..8abcf7069a 100644
--- a/zh_CN.GB2312/books/handbook/linuxemu/Makefile
+++ b/zh_CN.GB2312/books/handbook/linuxemu/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	linuxemu/chapter.sgml
+CHAPTERS= 	linuxemu/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml b/zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/linuxemu/chapter.sgml
rename to zh_CN.GB2312/books/handbook/linuxemu/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/mac/Makefile b/zh_CN.GB2312/books/handbook/mac/Makefile
index fc6a90a182..e025a7beeb 100644
--- a/zh_CN.GB2312/books/handbook/mac/Makefile
+++ b/zh_CN.GB2312/books/handbook/mac/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mac/chapter.sgml
+CHAPTERS= 	mac/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/mac/chapter.sgml b/zh_CN.GB2312/books/handbook/mac/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/mac/chapter.sgml
rename to zh_CN.GB2312/books/handbook/mac/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/mail/Makefile b/zh_CN.GB2312/books/handbook/mail/Makefile
index bfebfae160..037de3c4c4 100644
--- a/zh_CN.GB2312/books/handbook/mail/Makefile
+++ b/zh_CN.GB2312/books/handbook/mail/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mail/chapter.sgml
+CHAPTERS= 	mail/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/mail/chapter.sgml b/zh_CN.GB2312/books/handbook/mail/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/mail/chapter.sgml
rename to zh_CN.GB2312/books/handbook/mail/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/mirrors/Makefile b/zh_CN.GB2312/books/handbook/mirrors/Makefile
index 37163e0627..0acc91de47 100644
--- a/zh_CN.GB2312/books/handbook/mirrors/Makefile
+++ b/zh_CN.GB2312/books/handbook/mirrors/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mirrors/chapter.sgml
+CHAPTERS= 	mirrors/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml b/zh_CN.GB2312/books/handbook/mirrors/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/mirrors/chapter.sgml
rename to zh_CN.GB2312/books/handbook/mirrors/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/multimedia/Makefile b/zh_CN.GB2312/books/handbook/multimedia/Makefile
index 7a74dfaf9a..1293afd120 100644
--- a/zh_CN.GB2312/books/handbook/multimedia/Makefile
+++ b/zh_CN.GB2312/books/handbook/multimedia/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	multimedia/chapter.sgml
+CHAPTERS= 	multimedia/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml b/zh_CN.GB2312/books/handbook/multimedia/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/multimedia/chapter.sgml
rename to zh_CN.GB2312/books/handbook/multimedia/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/network-servers/Makefile b/zh_CN.GB2312/books/handbook/network-servers/Makefile
index d1ea7b7f6e..93dee8eaae 100644
--- a/zh_CN.GB2312/books/handbook/network-servers/Makefile
+++ b/zh_CN.GB2312/books/handbook/network-servers/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	network-servers/chapter.sgml
+CHAPTERS= 	network-servers/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml b/zh_CN.GB2312/books/handbook/network-servers/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/network-servers/chapter.sgml
rename to zh_CN.GB2312/books/handbook/network-servers/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/pgpkeys/Makefile b/zh_CN.GB2312/books/handbook/pgpkeys/Makefile
index b92a3c3ccc..798f4b4fc1 100644
--- a/zh_CN.GB2312/books/handbook/pgpkeys/Makefile
+++ b/zh_CN.GB2312/books/handbook/pgpkeys/Makefile
@@ -5,7 +5,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/zh_CN.GB2312/books/handbook/pgpkeys/chapter.sgml b/zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/pgpkeys/chapter.sgml
rename to zh_CN.GB2312/books/handbook/pgpkeys/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/ports/Makefile b/zh_CN.GB2312/books/handbook/ports/Makefile
index c7f468104e..0ebbf9bdf8 100644
--- a/zh_CN.GB2312/books/handbook/ports/Makefile
+++ b/zh_CN.GB2312/books/handbook/ports/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	ports/chapter.sgml
+CHAPTERS= 	ports/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/ports/chapter.sgml b/zh_CN.GB2312/books/handbook/ports/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/ports/chapter.sgml
rename to zh_CN.GB2312/books/handbook/ports/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/ppp-and-slip/Makefile b/zh_CN.GB2312/books/handbook/ppp-and-slip/Makefile
index 548cbb3a68..ea265c5867 100644
--- a/zh_CN.GB2312/books/handbook/ppp-and-slip/Makefile
+++ b/zh_CN.GB2312/books/handbook/ppp-and-slip/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	ppp-and-slip/chapter.sgml
+CHAPTERS= 	ppp-and-slip/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml b/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml
rename to zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/preface/preface.sgml b/zh_CN.GB2312/books/handbook/preface/preface.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/preface/preface.sgml
rename to zh_CN.GB2312/books/handbook/preface/preface.xml
diff --git a/zh_CN.GB2312/books/handbook/printing/Makefile b/zh_CN.GB2312/books/handbook/printing/Makefile
index 80ce214947..d5eac7b066 100644
--- a/zh_CN.GB2312/books/handbook/printing/Makefile
+++ b/zh_CN.GB2312/books/handbook/printing/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	printing/chapter.sgml
+CHAPTERS= 	printing/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/printing/chapter.sgml b/zh_CN.GB2312/books/handbook/printing/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/printing/chapter.sgml
rename to zh_CN.GB2312/books/handbook/printing/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/security/Makefile b/zh_CN.GB2312/books/handbook/security/Makefile
index b1e706759c..976b9d8f7e 100644
--- a/zh_CN.GB2312/books/handbook/security/Makefile
+++ b/zh_CN.GB2312/books/handbook/security/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	security/chapter.sgml
+CHAPTERS= 	security/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/security/chapter.sgml b/zh_CN.GB2312/books/handbook/security/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/security/chapter.sgml
rename to zh_CN.GB2312/books/handbook/security/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/serialcomms/Makefile b/zh_CN.GB2312/books/handbook/serialcomms/Makefile
index e3cc528c84..786c1ffc80 100644
--- a/zh_CN.GB2312/books/handbook/serialcomms/Makefile
+++ b/zh_CN.GB2312/books/handbook/serialcomms/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	serialcomms/chapter.sgml
+CHAPTERS= 	serialcomms/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml b/zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml
rename to zh_CN.GB2312/books/handbook/serialcomms/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/users/Makefile b/zh_CN.GB2312/books/handbook/users/Makefile
index 7fbe5dd83d..301dfe919f 100644
--- a/zh_CN.GB2312/books/handbook/users/Makefile
+++ b/zh_CN.GB2312/books/handbook/users/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	users/chapter.sgml
+CHAPTERS= 	users/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/users/chapter.sgml b/zh_CN.GB2312/books/handbook/users/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/users/chapter.sgml
rename to zh_CN.GB2312/books/handbook/users/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/vinum/Makefile b/zh_CN.GB2312/books/handbook/vinum/Makefile
index d39fba7293..6635102919 100644
--- a/zh_CN.GB2312/books/handbook/vinum/Makefile
+++ b/zh_CN.GB2312/books/handbook/vinum/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	vinum/chapter.sgml
+CHAPTERS= 	vinum/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/vinum/chapter.sgml b/zh_CN.GB2312/books/handbook/vinum/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/vinum/chapter.sgml
rename to zh_CN.GB2312/books/handbook/vinum/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/virtualization/Makefile b/zh_CN.GB2312/books/handbook/virtualization/Makefile
index c8e2b9c25d..731c64e366 100644
--- a/zh_CN.GB2312/books/handbook/virtualization/Makefile
+++ b/zh_CN.GB2312/books/handbook/virtualization/Makefile
@@ -7,7 +7,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	virtualization/chapter.sgml
+CHAPTERS= 	virtualization/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/virtualization/chapter.sgml b/zh_CN.GB2312/books/handbook/virtualization/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/virtualization/chapter.sgml
rename to zh_CN.GB2312/books/handbook/virtualization/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/x11/Makefile b/zh_CN.GB2312/books/handbook/x11/Makefile
index cf0eafa4e7..3a5f7153e6 100644
--- a/zh_CN.GB2312/books/handbook/x11/Makefile
+++ b/zh_CN.GB2312/books/handbook/x11/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	x11/chapter.sgml
+CHAPTERS= 	x11/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_CN.GB2312/books/handbook/x11/chapter.sgml b/zh_CN.GB2312/books/handbook/x11/chapter.xml
similarity index 100%
rename from zh_CN.GB2312/books/handbook/x11/chapter.sgml
rename to zh_CN.GB2312/books/handbook/x11/chapter.xml
diff --git a/zh_CN.GB2312/books/porters-handbook/Makefile b/zh_CN.GB2312/books/porters-handbook/Makefile
index aec4704599..6e196aae86 100644
--- a/zh_CN.GB2312/books/porters-handbook/Makefile
+++ b/zh_CN.GB2312/books/porters-handbook/Makefile
@@ -23,7 +23,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 # Use the local DSSSL file
 DSLHTML?= 	${.CURDIR}/freebsd.dsl
diff --git a/zh_CN.GB2312/books/porters-handbook/book.sgml b/zh_CN.GB2312/books/porters-handbook/book.xml
similarity index 100%
rename from zh_CN.GB2312/books/porters-handbook/book.sgml
rename to zh_CN.GB2312/books/porters-handbook/book.xml
diff --git a/zh_CN.GB2312/htdocs/Makefile b/zh_CN.GB2312/htdocs/Makefile
index dae1ebd276..4a47527202 100644
--- a/zh_CN.GB2312/htdocs/Makefile
+++ b/zh_CN.GB2312/htdocs/Makefile
@@ -10,21 +10,21 @@
 
 # These are turned into validated, normalized HTML files.
 
-DOCS=  about.sgml
-DOCS+= applications.sgml
-DOCS+= art.sgml
-DOCS+= availability.sgml
-DOCS+= community.sgml
-DOCS+= docs.sgml
-DOCS+= features.sgml
-DOCS+= internet.sgml
-DOCS+= logo.sgml
-DOCS+= mailto.sgml
-# DOCS+= publish.sgml
-DOCS+= relnotes.sgml
-DOCS+= send-pr.sgml
-DOCS+= support.sgml
-DOCS+= where.sgml
+DOCS=  about.xml
+DOCS+= applications.xml
+DOCS+= art.xml
+DOCS+= availability.xml
+DOCS+= community.xml
+DOCS+= docs.xml
+DOCS+= features.xml
+DOCS+= internet.xml
+DOCS+= logo.xml
+DOCS+= mailto.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/zh_CN.GB2312/htdocs/about.sgml b/zh_CN.GB2312/htdocs/about.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/about.sgml
rename to zh_CN.GB2312/htdocs/about.xml
diff --git a/zh_CN.GB2312/htdocs/advocacy/Makefile b/zh_CN.GB2312/htdocs/advocacy/Makefile
index 8c4d7080d1..a3e03da6d4 100644
--- a/zh_CN.GB2312/htdocs/advocacy/Makefile
+++ b/zh_CN.GB2312/htdocs/advocacy/Makefile
@@ -9,7 +9,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   index.sgml
-DOCS+=	myths.sgml
+DOCS=   index.xml
+DOCS+=	myths.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/advocacy/index.sgml b/zh_CN.GB2312/htdocs/advocacy/index.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/advocacy/index.sgml
rename to zh_CN.GB2312/htdocs/advocacy/index.xml
diff --git a/zh_CN.GB2312/htdocs/advocacy/myths.sgml b/zh_CN.GB2312/htdocs/advocacy/myths.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/advocacy/myths.sgml
rename to zh_CN.GB2312/htdocs/advocacy/myths.xml
diff --git a/zh_CN.GB2312/htdocs/applications.sgml b/zh_CN.GB2312/htdocs/applications.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/applications.sgml
rename to zh_CN.GB2312/htdocs/applications.xml
diff --git a/zh_CN.GB2312/htdocs/art.sgml b/zh_CN.GB2312/htdocs/art.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/art.sgml
rename to zh_CN.GB2312/htdocs/art.xml
diff --git a/zh_CN.GB2312/htdocs/availability.sgml b/zh_CN.GB2312/htdocs/availability.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/availability.sgml
rename to zh_CN.GB2312/htdocs/availability.xml
diff --git a/zh_CN.GB2312/htdocs/community.sgml b/zh_CN.GB2312/htdocs/community.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/community.sgml
rename to zh_CN.GB2312/htdocs/community.xml
diff --git a/zh_CN.GB2312/htdocs/copyright/Makefile b/zh_CN.GB2312/htdocs/copyright/Makefile
index 45b459e76f..88f3e5a5b0 100644
--- a/zh_CN.GB2312/htdocs/copyright/Makefile
+++ b/zh_CN.GB2312/htdocs/copyright/Makefile
@@ -8,12 +8,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/zh_CN.GB2312/htdocs/copyright/copyright.sgml b/zh_CN.GB2312/htdocs/copyright/copyright.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/copyright/copyright.sgml
rename to zh_CN.GB2312/htdocs/copyright/copyright.xml
diff --git a/zh_CN.GB2312/htdocs/copyright/daemon.sgml b/zh_CN.GB2312/htdocs/copyright/daemon.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/copyright/daemon.sgml
rename to zh_CN.GB2312/htdocs/copyright/daemon.xml
diff --git a/zh_CN.GB2312/htdocs/copyright/freebsd-doc-license.sgml b/zh_CN.GB2312/htdocs/copyright/freebsd-doc-license.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/copyright/freebsd-doc-license.sgml
rename to zh_CN.GB2312/htdocs/copyright/freebsd-doc-license.xml
diff --git a/zh_CN.GB2312/htdocs/copyright/freebsd-license.sgml b/zh_CN.GB2312/htdocs/copyright/freebsd-license.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/copyright/freebsd-license.sgml
rename to zh_CN.GB2312/htdocs/copyright/freebsd-license.xml
diff --git a/zh_CN.GB2312/htdocs/copyright/license.sgml b/zh_CN.GB2312/htdocs/copyright/license.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/copyright/license.sgml
rename to zh_CN.GB2312/htdocs/copyright/license.xml
diff --git a/zh_CN.GB2312/htdocs/copyright/trademarks.sgml b/zh_CN.GB2312/htdocs/copyright/trademarks.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/copyright/trademarks.sgml
rename to zh_CN.GB2312/htdocs/copyright/trademarks.xml
diff --git a/zh_CN.GB2312/htdocs/developers.sgml b/zh_CN.GB2312/htdocs/developers.xml
similarity index 99%
rename from zh_CN.GB2312/htdocs/developers.sgml
rename to zh_CN.GB2312/htdocs/developers.xml
index 50468da6b2..937d3b728c 100644
--- a/zh_CN.GB2312/htdocs/developers.sgml
+++ b/zh_CN.GB2312/htdocs/developers.xml
@@ -543,7 +543,7 @@ $FreeBSD$
 <!ENTITY a.pavalos "Peter&nbsp;Avalos">
 <!ENTITY a.jwojdacki "Justin&nbsp;Wojdacki">
 
-<!-- Below we list the various hats.  This is used in internal/staff.sgml
+<!-- Below we list the various hats.  This is used in internal/staff.xml
 so that we may keep a list of hat owners and modify only this file. -->
 
 <!-- FreeBSD Bugmeister -->
diff --git a/zh_CN.GB2312/htdocs/docs.sgml b/zh_CN.GB2312/htdocs/docs.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/docs.sgml
rename to zh_CN.GB2312/htdocs/docs.xml
diff --git a/zh_CN.GB2312/htdocs/features.sgml b/zh_CN.GB2312/htdocs/features.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/features.sgml
rename to zh_CN.GB2312/htdocs/features.xml
diff --git a/zh_CN.GB2312/htdocs/internet.sgml b/zh_CN.GB2312/htdocs/internet.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/internet.sgml
rename to zh_CN.GB2312/htdocs/internet.xml
diff --git a/zh_CN.GB2312/htdocs/logo.sgml b/zh_CN.GB2312/htdocs/logo.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/logo.sgml
rename to zh_CN.GB2312/htdocs/logo.xml
diff --git a/zh_CN.GB2312/htdocs/mailto.sgml b/zh_CN.GB2312/htdocs/mailto.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/mailto.sgml
rename to zh_CN.GB2312/htdocs/mailto.xml
diff --git a/zh_CN.GB2312/htdocs/news/Makefile b/zh_CN.GB2312/htdocs/news/Makefile
index 19a77230f9..66fe74033f 100644
--- a/zh_CN.GB2312/htdocs/news/Makefile
+++ b/zh_CN.GB2312/htdocs/news/Makefile
@@ -10,10 +10,10 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS+= news.sgml
+DOCS+= news.xml
 
 # press releases
-DOCS+= pressreleases.sgml
+DOCS+= pressreleases.xml
 
 INDEXLINK= news.html
 
diff --git a/zh_CN.GB2312/htdocs/news/news.sgml b/zh_CN.GB2312/htdocs/news/news.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/news/news.sgml
rename to zh_CN.GB2312/htdocs/news/news.xml
diff --git a/zh_CN.GB2312/htdocs/news/pressreleases.sgml b/zh_CN.GB2312/htdocs/news/pressreleases.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/news/pressreleases.sgml
rename to zh_CN.GB2312/htdocs/news/pressreleases.xml
diff --git a/zh_CN.GB2312/htdocs/platforms/Makefile b/zh_CN.GB2312/htdocs/platforms/Makefile
index 986ed26a7c..0dabcaa26b 100644
--- a/zh_CN.GB2312/htdocs/platforms/Makefile
+++ b/zh_CN.GB2312/htdocs/platforms/Makefile
@@ -10,16 +10,16 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	alpha.sgml
-DOCS+=	amd64.sgml
-DOCS+=	arm.sgml
-DOCS+=	i386.sgml
-DOCS+=	index.sgml
-#DOCS+=	mips.sgml
-#DOCS+=	pc98.sgml
-#DOCS+=	ppc.sgml
-#DOCS+=	sparc.sgml
-#DOCS+=	xbox.sgml
+DOCS=	alpha.xml
+DOCS+=	amd64.xml
+DOCS+=	arm.xml
+DOCS+=	i386.xml
+DOCS+=	index.xml
+#DOCS+=	mips.xml
+#DOCS+=	pc98.xml
+#DOCS+=	ppc.xml
+#DOCS+=	sparc.xml
+#DOCS+=	xbox.xml
 
 SUBDIR=	amd64
 #SUBDIR+=ia64
diff --git a/zh_CN.GB2312/htdocs/platforms/alpha.sgml b/zh_CN.GB2312/htdocs/platforms/alpha.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/platforms/alpha.sgml
rename to zh_CN.GB2312/htdocs/platforms/alpha.xml
diff --git a/zh_CN.GB2312/htdocs/platforms/amd64.sgml b/zh_CN.GB2312/htdocs/platforms/amd64.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/platforms/amd64.sgml
rename to zh_CN.GB2312/htdocs/platforms/amd64.xml
diff --git a/zh_CN.GB2312/htdocs/platforms/amd64/Makefile b/zh_CN.GB2312/htdocs/platforms/amd64/Makefile
index 98d602d5b5..acb4e06ba5 100644
--- a/zh_CN.GB2312/htdocs/platforms/amd64/Makefile
+++ b/zh_CN.GB2312/htdocs/platforms/amd64/Makefile
@@ -9,6 +9,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	motherboards.sgml
+DOCS=	motherboards.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"
diff --git a/zh_CN.GB2312/htdocs/platforms/amd64/motherboards.sgml b/zh_CN.GB2312/htdocs/platforms/amd64/motherboards.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/platforms/amd64/motherboards.sgml
rename to zh_CN.GB2312/htdocs/platforms/amd64/motherboards.xml
diff --git a/zh_CN.GB2312/htdocs/platforms/arm.sgml b/zh_CN.GB2312/htdocs/platforms/arm.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/platforms/arm.sgml
rename to zh_CN.GB2312/htdocs/platforms/arm.xml
diff --git a/zh_CN.GB2312/htdocs/platforms/i386.sgml b/zh_CN.GB2312/htdocs/platforms/i386.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/platforms/i386.sgml
rename to zh_CN.GB2312/htdocs/platforms/i386.xml
diff --git a/zh_CN.GB2312/htdocs/platforms/index.sgml b/zh_CN.GB2312/htdocs/platforms/index.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/platforms/index.sgml
rename to zh_CN.GB2312/htdocs/platforms/index.xml
diff --git a/zh_CN.GB2312/htdocs/releases/5.4R/Makefile b/zh_CN.GB2312/htdocs/releases/5.4R/Makefile
index 33cbc77556..30fe1b4738 100644
--- a/zh_CN.GB2312/htdocs/releases/5.4R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/5.4R/Makefile
@@ -10,9 +10,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	relnotes.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
+DOCS=	relnotes.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
 
 DATA+=	errata.html
 DATA+=	migration-guide.html
diff --git a/zh_CN.GB2312/htdocs/releases/5.4R/hardware.sgml b/zh_CN.GB2312/htdocs/releases/5.4R/hardware.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/5.4R/hardware.sgml
rename to zh_CN.GB2312/htdocs/releases/5.4R/hardware.xml
diff --git a/zh_CN.GB2312/htdocs/releases/5.4R/installation.sgml b/zh_CN.GB2312/htdocs/releases/5.4R/installation.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/5.4R/installation.sgml
rename to zh_CN.GB2312/htdocs/releases/5.4R/installation.xml
diff --git a/zh_CN.GB2312/htdocs/releases/5.4R/relnotes.sgml b/zh_CN.GB2312/htdocs/releases/5.4R/relnotes.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/5.4R/relnotes.sgml
rename to zh_CN.GB2312/htdocs/releases/5.4R/relnotes.xml
diff --git a/zh_CN.GB2312/htdocs/releases/5.5R/Makefile b/zh_CN.GB2312/htdocs/releases/5.5R/Makefile
index 68b430b439..adaba70487 100644
--- a/zh_CN.GB2312/htdocs/releases/5.5R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/5.5R/Makefile
@@ -10,9 +10,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	relnotes.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
+DOCS=	relnotes.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
 
 DATA+=	errata.html
 DATA+=	hardware-amd64.html
diff --git a/zh_CN.GB2312/htdocs/releases/5.5R/hardware.sgml b/zh_CN.GB2312/htdocs/releases/5.5R/hardware.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/5.5R/hardware.sgml
rename to zh_CN.GB2312/htdocs/releases/5.5R/hardware.xml
diff --git a/zh_CN.GB2312/htdocs/releases/5.5R/installation.sgml b/zh_CN.GB2312/htdocs/releases/5.5R/installation.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/5.5R/installation.sgml
rename to zh_CN.GB2312/htdocs/releases/5.5R/installation.xml
diff --git a/zh_CN.GB2312/htdocs/releases/5.5R/relnotes.sgml b/zh_CN.GB2312/htdocs/releases/5.5R/relnotes.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/5.5R/relnotes.sgml
rename to zh_CN.GB2312/htdocs/releases/5.5R/relnotes.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.0R/Makefile b/zh_CN.GB2312/htdocs/releases/6.0R/Makefile
index 82566c79cb..ed15f8fe8c 100644
--- a/zh_CN.GB2312/htdocs/releases/6.0R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/6.0R/Makefile
@@ -10,9 +10,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	relnotes.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
+DOCS=	relnotes.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
 
 DATA+=	errata.html
 DATA+=	hardware-amd64.html
diff --git a/zh_CN.GB2312/htdocs/releases/6.0R/hardware.sgml b/zh_CN.GB2312/htdocs/releases/6.0R/hardware.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.0R/hardware.sgml
rename to zh_CN.GB2312/htdocs/releases/6.0R/hardware.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.0R/installation.sgml b/zh_CN.GB2312/htdocs/releases/6.0R/installation.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.0R/installation.sgml
rename to zh_CN.GB2312/htdocs/releases/6.0R/installation.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.0R/relnotes.sgml b/zh_CN.GB2312/htdocs/releases/6.0R/relnotes.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.0R/relnotes.sgml
rename to zh_CN.GB2312/htdocs/releases/6.0R/relnotes.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.1R/Makefile b/zh_CN.GB2312/htdocs/releases/6.1R/Makefile
index 68b430b439..adaba70487 100644
--- a/zh_CN.GB2312/htdocs/releases/6.1R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/6.1R/Makefile
@@ -10,9 +10,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	relnotes.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
+DOCS=	relnotes.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
 
 DATA+=	errata.html
 DATA+=	hardware-amd64.html
diff --git a/zh_CN.GB2312/htdocs/releases/6.1R/hardware.sgml b/zh_CN.GB2312/htdocs/releases/6.1R/hardware.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.1R/hardware.sgml
rename to zh_CN.GB2312/htdocs/releases/6.1R/hardware.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.1R/installation.sgml b/zh_CN.GB2312/htdocs/releases/6.1R/installation.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.1R/installation.sgml
rename to zh_CN.GB2312/htdocs/releases/6.1R/installation.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.1R/relnotes.sgml b/zh_CN.GB2312/htdocs/releases/6.1R/relnotes.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.1R/relnotes.sgml
rename to zh_CN.GB2312/htdocs/releases/6.1R/relnotes.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.2R/Makefile b/zh_CN.GB2312/htdocs/releases/6.2R/Makefile
index 08affd2ed7..6170e6b6ec 100644
--- a/zh_CN.GB2312/htdocs/releases/6.2R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/6.2R/Makefile
@@ -9,9 +9,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	relnotes.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
+DOCS=	relnotes.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
 
 DATA+=	errata.html
 DATA+=	hardware-amd64.html
diff --git a/zh_CN.GB2312/htdocs/releases/6.2R/hardware.sgml b/zh_CN.GB2312/htdocs/releases/6.2R/hardware.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.2R/hardware.sgml
rename to zh_CN.GB2312/htdocs/releases/6.2R/hardware.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.2R/installation.sgml b/zh_CN.GB2312/htdocs/releases/6.2R/installation.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.2R/installation.sgml
rename to zh_CN.GB2312/htdocs/releases/6.2R/installation.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.2R/relnotes.sgml b/zh_CN.GB2312/htdocs/releases/6.2R/relnotes.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.2R/relnotes.sgml
rename to zh_CN.GB2312/htdocs/releases/6.2R/relnotes.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.3R/Makefile b/zh_CN.GB2312/htdocs/releases/6.3R/Makefile
index 80c04e70f3..b968dc32bc 100644
--- a/zh_CN.GB2312/htdocs/releases/6.3R/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/6.3R/Makefile
@@ -9,9 +9,9 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	relnotes.sgml
-DOCS+=	hardware.sgml
-DOCS+=	installation.sgml
+DOCS=	relnotes.xml
+DOCS+=	hardware.xml
+DOCS+=	installation.xml
 
 DATA+=	errata.html
 DATA+=	hardware-amd64.html
diff --git a/zh_CN.GB2312/htdocs/releases/6.3R/hardware.sgml b/zh_CN.GB2312/htdocs/releases/6.3R/hardware.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.3R/hardware.sgml
rename to zh_CN.GB2312/htdocs/releases/6.3R/hardware.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.3R/installation.sgml b/zh_CN.GB2312/htdocs/releases/6.3R/installation.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.3R/installation.sgml
rename to zh_CN.GB2312/htdocs/releases/6.3R/installation.xml
diff --git a/zh_CN.GB2312/htdocs/releases/6.3R/relnotes.sgml b/zh_CN.GB2312/htdocs/releases/6.3R/relnotes.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/6.3R/relnotes.sgml
rename to zh_CN.GB2312/htdocs/releases/6.3R/relnotes.xml
diff --git a/zh_CN.GB2312/htdocs/releases/Makefile b/zh_CN.GB2312/htdocs/releases/Makefile
index 55e814a014..a5dc409d3a 100644
--- a/zh_CN.GB2312/htdocs/releases/Makefile
+++ b/zh_CN.GB2312/htdocs/releases/Makefile
@@ -9,7 +9,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/zh_CN.GB2312/htdocs/releases/index.sgml b/zh_CN.GB2312/htdocs/releases/index.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/releases/index.sgml
rename to zh_CN.GB2312/htdocs/releases/index.xml
diff --git a/zh_CN.GB2312/htdocs/relnotes.sgml b/zh_CN.GB2312/htdocs/relnotes.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/relnotes.sgml
rename to zh_CN.GB2312/htdocs/relnotes.xml
diff --git a/zh_CN.GB2312/htdocs/security/Makefile b/zh_CN.GB2312/htdocs/security/Makefile
index d0c866539b..dad5f90b21 100644
--- a/zh_CN.GB2312/htdocs/security/Makefile
+++ b/zh_CN.GB2312/htdocs/security/Makefile
@@ -8,8 +8,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	charter.sgml
-DOCS+=	security.sgml
+DOCS=	charter.xml
+DOCS+=	security.xml
 
 INDEXLINK=	security.html
 
diff --git a/zh_CN.GB2312/htdocs/security/charter.sgml b/zh_CN.GB2312/htdocs/security/charter.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/security/charter.sgml
rename to zh_CN.GB2312/htdocs/security/charter.xml
diff --git a/zh_CN.GB2312/htdocs/security/security.sgml b/zh_CN.GB2312/htdocs/security/security.xml
similarity index 99%
rename from zh_CN.GB2312/htdocs/security/security.sgml
rename to zh_CN.GB2312/htdocs/security/security.xml
index 1c7b1d5459..7e1ce3f9d0 100644
--- a/zh_CN.GB2312/htdocs/security/security.sgml
+++ b/zh_CN.GB2312/htdocs/security/security.xml
@@ -201,7 +201,7 @@
     ͨ��������ǰ����֧����Щ��֧��</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/zh_CN.GB2312/htdocs/send-pr.sgml b/zh_CN.GB2312/htdocs/send-pr.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/send-pr.sgml
rename to zh_CN.GB2312/htdocs/send-pr.xml
diff --git a/zh_CN.GB2312/htdocs/support.sgml b/zh_CN.GB2312/htdocs/support.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/support.sgml
rename to zh_CN.GB2312/htdocs/support.xml
diff --git a/zh_CN.GB2312/htdocs/where.sgml b/zh_CN.GB2312/htdocs/where.xml
similarity index 100%
rename from zh_CN.GB2312/htdocs/where.sgml
rename to zh_CN.GB2312/htdocs/where.xml
diff --git a/zh_TW.Big5/articles/contributing/Makefile b/zh_TW.Big5/articles/contributing/Makefile
index 8a614e1df9..72cfc4b491 100644
--- a/zh_TW.Big5/articles/contributing/Makefile
+++ b/zh_TW.Big5/articles/contributing/Makefile
@@ -14,7 +14,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/zh_TW.Big5/articles/contributing/article.sgml b/zh_TW.Big5/articles/contributing/article.xml
similarity index 100%
rename from zh_TW.Big5/articles/contributing/article.sgml
rename to zh_TW.Big5/articles/contributing/article.xml
diff --git a/zh_TW.Big5/articles/cvs-freebsd/Makefile b/zh_TW.Big5/articles/cvs-freebsd/Makefile
index 889dd48dfd..f7f1f12588 100644
--- a/zh_TW.Big5/articles/cvs-freebsd/Makefile
+++ b/zh_TW.Big5/articles/cvs-freebsd/Makefile
@@ -13,7 +13,7 @@ FORMATS?= html
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
-SRCS=	article.sgml
+SRCS=	article.xml
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/zh_TW.Big5/articles/cvs-freebsd/article.sgml b/zh_TW.Big5/articles/cvs-freebsd/article.xml
similarity index 100%
rename from zh_TW.Big5/articles/cvs-freebsd/article.sgml
rename to zh_TW.Big5/articles/cvs-freebsd/article.xml
diff --git a/zh_TW.Big5/articles/freebsd-questions/Makefile b/zh_TW.Big5/articles/freebsd-questions/Makefile
index 3dfaecabc8..e0524136c2 100644
--- a/zh_TW.Big5/articles/freebsd-questions/Makefile
+++ b/zh_TW.Big5/articles/freebsd-questions/Makefile
@@ -14,7 +14,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/zh_TW.Big5/articles/freebsd-questions/article.sgml b/zh_TW.Big5/articles/freebsd-questions/article.xml
similarity index 100%
rename from zh_TW.Big5/articles/freebsd-questions/article.sgml
rename to zh_TW.Big5/articles/freebsd-questions/article.xml
diff --git a/zh_TW.Big5/articles/hubs/Makefile b/zh_TW.Big5/articles/hubs/Makefile
index cded48ba4b..f04f8a971f 100644
--- a/zh_TW.Big5/articles/hubs/Makefile
+++ b/zh_TW.Big5/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/zh_TW.Big5/articles/hubs/article.sgml b/zh_TW.Big5/articles/hubs/article.xml
similarity index 100%
rename from zh_TW.Big5/articles/hubs/article.sgml
rename to zh_TW.Big5/articles/hubs/article.xml
diff --git a/zh_TW.Big5/articles/mailing-list-faq/Makefile b/zh_TW.Big5/articles/mailing-list-faq/Makefile
index a089bd63c7..6412bc5980 100644
--- a/zh_TW.Big5/articles/mailing-list-faq/Makefile
+++ b/zh_TW.Big5/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/zh_TW.Big5/articles/mailing-list-faq/article.sgml b/zh_TW.Big5/articles/mailing-list-faq/article.xml
similarity index 100%
rename from zh_TW.Big5/articles/mailing-list-faq/article.sgml
rename to zh_TW.Big5/articles/mailing-list-faq/article.xml
diff --git a/zh_TW.Big5/articles/nanobsd/Makefile b/zh_TW.Big5/articles/nanobsd/Makefile
index 57ff92810e..38de994f6c 100644
--- a/zh_TW.Big5/articles/nanobsd/Makefile
+++ b/zh_TW.Big5/articles/nanobsd/Makefile
@@ -20,7 +20,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/zh_TW.Big5/articles/nanobsd/article.sgml b/zh_TW.Big5/articles/nanobsd/article.xml
similarity index 100%
rename from zh_TW.Big5/articles/nanobsd/article.sgml
rename to zh_TW.Big5/articles/nanobsd/article.xml
diff --git a/zh_TW.Big5/articles/pr-guidelines/Makefile b/zh_TW.Big5/articles/pr-guidelines/Makefile
index 9aa329f736..17e369ff2c 100644
--- a/zh_TW.Big5/articles/pr-guidelines/Makefile
+++ b/zh_TW.Big5/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/zh_TW.Big5/articles/pr-guidelines/article.sgml b/zh_TW.Big5/articles/pr-guidelines/article.xml
similarity index 100%
rename from zh_TW.Big5/articles/pr-guidelines/article.sgml
rename to zh_TW.Big5/articles/pr-guidelines/article.xml
diff --git a/zh_TW.Big5/articles/problem-reports/Makefile b/zh_TW.Big5/articles/problem-reports/Makefile
index 081f20e0f8..ab12340558 100644
--- a/zh_TW.Big5/articles/problem-reports/Makefile
+++ b/zh_TW.Big5/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/zh_TW.Big5/articles/problem-reports/article.sgml b/zh_TW.Big5/articles/problem-reports/article.xml
similarity index 100%
rename from zh_TW.Big5/articles/problem-reports/article.sgml
rename to zh_TW.Big5/articles/problem-reports/article.xml
diff --git a/zh_TW.Big5/articles/remote-install/Makefile b/zh_TW.Big5/articles/remote-install/Makefile
index 8e8d035441..3efa3a5e93 100644
--- a/zh_TW.Big5/articles/remote-install/Makefile
+++ b/zh_TW.Big5/articles/remote-install/Makefile
@@ -13,7 +13,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/zh_TW.Big5/articles/remote-install/article.sgml b/zh_TW.Big5/articles/remote-install/article.xml
similarity index 100%
rename from zh_TW.Big5/articles/remote-install/article.sgml
rename to zh_TW.Big5/articles/remote-install/article.xml
diff --git a/zh_TW.Big5/books/developers-handbook/Makefile b/zh_TW.Big5/books/developers-handbook/Makefile
index 19890a39ee..c3883908f4 100644
--- a/zh_TW.Big5/books/developers-handbook/Makefile
+++ b/zh_TW.Big5/books/developers-handbook/Makefile
@@ -24,17 +24,17 @@ 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+= 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+= 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/zh_TW.Big5/books/developers-handbook/book.sgml b/zh_TW.Big5/books/developers-handbook/book.xml
similarity index 100%
rename from zh_TW.Big5/books/developers-handbook/book.sgml
rename to zh_TW.Big5/books/developers-handbook/book.xml
diff --git a/zh_TW.Big5/books/developers-handbook/chapters.ent b/zh_TW.Big5/books/developers-handbook/chapters.ent
index 419fadc34e..9958b94e6b 100644
--- a/zh_TW.Big5/books/developers-handbook/chapters.ent
+++ b/zh_TW.Big5/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.dma			SYSTEM "dma/chapter.sgml">
-<!ENTITY chap.kerneldebug		SYSTEM "kerneldebug/chapter.sgml">
+<!ENTITY chap.dma			SYSTEM "dma/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/zh_TW.Big5/books/developers-handbook/introduction/chapter.sgml b/zh_TW.Big5/books/developers-handbook/introduction/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/developers-handbook/introduction/chapter.sgml
rename to zh_TW.Big5/books/developers-handbook/introduction/chapter.xml
diff --git a/zh_TW.Big5/books/developers-handbook/ipv6/chapter.sgml b/zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/developers-handbook/ipv6/chapter.sgml
rename to zh_TW.Big5/books/developers-handbook/ipv6/chapter.xml
diff --git a/zh_TW.Big5/books/developers-handbook/kerneldebug/Makefile b/zh_TW.Big5/books/developers-handbook/kerneldebug/Makefile
index a6d190e942..0f3b90b3e1 100644
--- a/zh_TW.Big5/books/developers-handbook/kerneldebug/Makefile
+++ b/zh_TW.Big5/books/developers-handbook/kerneldebug/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	kerneldebug/chapter.sgml
+CHAPTERS= 	kerneldebug/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.sgml b/zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.sgml
rename to zh_TW.Big5/books/developers-handbook/kerneldebug/chapter.xml
diff --git a/zh_TW.Big5/books/developers-handbook/l10n/chapter.sgml b/zh_TW.Big5/books/developers-handbook/l10n/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/developers-handbook/l10n/chapter.sgml
rename to zh_TW.Big5/books/developers-handbook/l10n/chapter.xml
diff --git a/zh_TW.Big5/books/developers-handbook/policies/Makefile b/zh_TW.Big5/books/developers-handbook/policies/Makefile
index 0dd403f15f..771a262e60 100644
--- a/zh_TW.Big5/books/developers-handbook/policies/Makefile
+++ b/zh_TW.Big5/books/developers-handbook/policies/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	policies/chapter.sgml
+CHAPTERS= 	policies/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/developers-handbook/policies/chapter.sgml b/zh_TW.Big5/books/developers-handbook/policies/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/developers-handbook/policies/chapter.sgml
rename to zh_TW.Big5/books/developers-handbook/policies/chapter.xml
diff --git a/zh_TW.Big5/books/developers-handbook/secure/chapter.sgml b/zh_TW.Big5/books/developers-handbook/secure/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/developers-handbook/secure/chapter.sgml
rename to zh_TW.Big5/books/developers-handbook/secure/chapter.xml
diff --git a/zh_TW.Big5/books/developers-handbook/sockets/chapter.sgml b/zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/developers-handbook/sockets/chapter.sgml
rename to zh_TW.Big5/books/developers-handbook/sockets/chapter.xml
diff --git a/zh_TW.Big5/books/developers-handbook/testing/chapter.sgml b/zh_TW.Big5/books/developers-handbook/testing/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/developers-handbook/testing/chapter.sgml
rename to zh_TW.Big5/books/developers-handbook/testing/chapter.xml
diff --git a/zh_TW.Big5/books/developers-handbook/tools/chapter.sgml b/zh_TW.Big5/books/developers-handbook/tools/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/developers-handbook/tools/chapter.sgml
rename to zh_TW.Big5/books/developers-handbook/tools/chapter.xml
diff --git a/zh_TW.Big5/books/developers-handbook/x86/chapter.sgml b/zh_TW.Big5/books/developers-handbook/x86/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/developers-handbook/x86/chapter.sgml
rename to zh_TW.Big5/books/developers-handbook/x86/chapter.xml
diff --git a/zh_TW.Big5/books/faq/Makefile b/zh_TW.Big5/books/faq/Makefile
index b51fa825c5..2f239c0c0b 100644
--- a/zh_TW.Big5/books/faq/Makefile
+++ b/zh_TW.Big5/books/faq/Makefile
@@ -21,7 +21,7 @@ WITH_BIBLIOXREF_TITLE?=YES
 #
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/zh_TW.Big5/books/faq/book.sgml b/zh_TW.Big5/books/faq/book.xml
similarity index 99%
rename from zh_TW.Big5/books/faq/book.sgml
rename to zh_TW.Big5/books/faq/book.xml
index 9fb635eaa6..7d5c12af8e 100644
--- a/zh_TW.Big5/books/faq/book.sgml
+++ b/zh_TW.Big5/books/faq/book.xml
@@ -3,7 +3,7 @@
 	"../../../share/sgml/freebsd42.dtd" [
 <!ENTITY % entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//TW" "../../share/sgml/entities.ent">
 %entities;
-<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.sgml">
+<!ENTITY bibliography SYSTEM "../../../share/sgml/bibliography.xml">
 ]>
 
 <!-- The FreeBSD Traditional Chinese Documentation Project -->
diff --git a/zh_TW.Big5/books/fdp-primer/Makefile b/zh_TW.Big5/books/fdp-primer/Makefile
index 81d365c81a..7e7f024e08 100644
--- a/zh_TW.Big5/books/fdp-primer/Makefile
+++ b/zh_TW.Big5/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=  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.sgml
+SRCS+= examples/appendix.xml
 
 # Images from the cross-document image library
 IMAGES_LIB=	callouts/1.png
diff --git a/zh_TW.Big5/books/fdp-primer/book.sgml b/zh_TW.Big5/books/fdp-primer/book.xml
similarity index 99%
rename from zh_TW.Big5/books/fdp-primer/book.sgml
rename to zh_TW.Big5/books/fdp-primer/book.xml
index da6cef7a6b..b22c7f2a4a 100644
--- a/zh_TW.Big5/books/fdp-primer/book.sgml
+++ b/zh_TW.Big5/books/fdp-primer/book.xml
@@ -221,8 +221,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/zh_TW.Big5/books/fdp-primer/chapters.ent b/zh_TW.Big5/books/fdp-primer/chapters.ent
index e7128f7ce7..d0f050da4c 100644
--- a/zh_TW.Big5/books/fdp-primer/chapters.ent
+++ b/zh_TW.Big5/books/fdp-primer/chapters.ent
@@ -3,7 +3,7 @@
      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.
 
@@ -11,17 +11,17 @@
      Original revision: 1.6
 -->
 
-<!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/zh_TW.Big5/books/fdp-primer/doc-build/chapter.sgml b/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
similarity index 99%
rename from zh_TW.Big5/books/fdp-primer/doc-build/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
index 09dcf21738..c6eac0880e 100644
--- a/zh_TW.Big5/books/fdp-primer/doc-build/chapter.sgml
+++ b/zh_TW.Big5/books/fdp-primer/doc-build/chapter.xml
@@ -205,7 +205,7 @@ INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
-SRCS=  book.sgml
+SRCS=  book.xml
 
 DOC_PREFIX?= ${.CURDIR}/../../..
 
@@ -218,7 +218,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/zh_TW.Big5/books/fdp-primer/examples/appendix.sgml b/zh_TW.Big5/books/fdp-primer/examples/appendix.xml
similarity index 97%
rename from zh_TW.Big5/books/fdp-primer/examples/appendix.sgml
rename to zh_TW.Big5/books/fdp-primer/examples/appendix.xml
index b7b77dfe77..824ede709a 100644
--- a/zh_TW.Big5/books/fdp-primer/examples/appendix.sgml
+++ b/zh_TW.Big5/books/fdp-primer/examples/appendix.xml
@@ -165,7 +165,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"/> file.sgml &gt; file.html <co id="examples-co-jade-1-filename"/></userinput></screen>
+    -t sgml <co id="examples-co-jade-1-transform"/> file.xml &gt; file.html <co id="examples-co-jade-1-filename"/></userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-1-nochunks">
@@ -209,7 +209,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">
@@ -255,7 +255,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/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml b/zh_TW.Big5/books/fdp-primer/overview/chapter.xml
similarity index 99%
rename from zh_TW.Big5/books/fdp-primer/overview/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/overview/chapter.xml
index f2e3bb6edf..cc24a302dd 100644
--- a/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml
+++ b/zh_TW.Big5/books/fdp-primer/overview/chapter.xml
@@ -201,7 +201,7 @@
       </step>
 
       <step>
-	<para>�H�s�边�ӽs�g <filename>.sgml</filename> �ɡC</para>
+	<para>�H�s�边�ӽs�g <filename>.xml</filename> �ɡC</para>
       </step>
 
       <step>
diff --git a/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.sgml b/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
similarity index 98%
rename from zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
index ceee84a1a2..d632e8df37 100644
--- a/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.sgml
+++ b/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.xml
@@ -38,7 +38,7 @@
 
   <para>Recent versions of <application>Emacs</application> or <application>XEmacs</application> (available from the ports
     collection) contain a very useful package called PSGML. Automatically
-    invoked when a file with the <filename>.sgml</filename> extension is loaded,
+    invoked when a file with the <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/zh_TW.Big5/books/fdp-primer/see-also/chapter.sgml b/zh_TW.Big5/books/fdp-primer/see-also/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/fdp-primer/see-also/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/see-also/chapter.xml
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.sgml b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
similarity index 99%
rename from zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
index 8977c36a93..cb6ec77c97 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.sgml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.xml
@@ -1836,7 +1836,7 @@ This is the file called 'foo2'</screen>
 
 	  <programlisting><![ CDATA [<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 that
+  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>]]></programlisting>
@@ -1845,7 +1845,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 that directory.  You
+	    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>
 	</example>
@@ -2463,9 +2463,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 has
+	  <filename>chapter1/chapter.xml</filename>,
+	  <filename>chapter2/chapter.xml</filename>, and
+	  <filename>chapter3/chapter.xml</filename>.  If each chapter has
 	  images associated with it, I suggest you place those images in each
 	  chapter's subdirectory (<filename>chapter1/</filename>,
 	  <filename>chapter2/</filename>, and
@@ -2478,7 +2478,7 @@ IMAGES+= fig3.png
 	  element in your document.</para>
 
 	<para>For example, if you have <filename>chapter1/fig1.png</filename>,
-	  then <filename>chapter1/chapter.sgml</filename> should
+	  then <filename>chapter1/chapter.xml</filename> should
 	  contain:</para>
 
 	<programlisting>&lt;mediaobject>
diff --git a/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.sgml b/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
similarity index 95%
rename from zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
index 55b1c5ee90..634cef6dfe 100644
--- a/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.sgml
+++ b/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.xml
@@ -388,7 +388,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATA
 
       <procedure>
 	<step>
-	  <para>Create <filename>example.sgml</filename>, and enter the
+	  <para>Create <filename>example.xml</filename>, and enter the
             following text:</para>
 
 	  <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -426,7 +426,7 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATA
 	  <para>Use <command>nsgmls</command> to check that your document is
 	    valid:</para>
 
-          <screen>&prompt.user; <userinput>nsgmls -s example.sgml</userinput></screen>
+          <screen>&prompt.user; <userinput>nsgmls -s example.xml</userinput></screen>
 
 	  <para>As you will see, <command>nsgmls</command> returns without displaying any
 	    output.  This means that your document validated
@@ -438,9 +438,9 @@ setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATA
 	    removing the <sgmltag>title</sgmltag> and
 	    <sgmltag>/title</sgmltag> tags, and re-run the validation.</para>
 
-          <screen>&prompt.user; <userinput>nsgmls -s example.sgml</userinput>
-nsgmls:example.sgml:5:4:E: character data is not allowed here
-nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
+          <screen>&prompt.user; <userinput>nsgmls -s example.xml</userinput>
+nsgmls:example.xml:5:4:E: character data is not allowed here
+nsgmls:example.xml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
 	  <para>The error output from <command>nsgmls</command> is organized into
 	    colon-separated groups, or columns.</para>
@@ -893,13 +893,13 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
       <procedure>
 	<step>
-	  <para>Add some comments to <filename>example.sgml</filename>, and
+	  <para>Add some comments to <filename>example.xml</filename>, and
 	    check that the file still validates using <command>nsgmls</command>.</para>
 	</step>
 
 	<step>
 	  <para>Add some invalid comments to
-	    <filename>example.sgml</filename>, and see the error messages that
+	    <filename>example.xml</filename>, and see the error messages that
 	    <command>nsgmls</command> gives when it encounters an invalid comment.</para>
 	</step>
       </procedure>
@@ -1023,7 +1023,7 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <procedure>
 	<step>
 	  <para>Add a general entity to
-	    <filename>example.sgml</filename>.</para>
+	    <filename>example.xml</filename>.</para>
 
 	  <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY version "1.1">
@@ -1053,7 +1053,7 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	</step>
 
 	<step>
-	  <para>Load <filename>example.sgml</filename> into your web browser
+	  <para>Load <filename>example.xml</filename> into your web browser
 	    (you may need to copy it to <filename>example.html</filename>
 	    before your browser recognizes it as an HTML document).</para>
 
@@ -1077,7 +1077,7 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
 	  <para>You can use <command>sgmlnorm</command> to do this.</para>
 
-          <screen>&prompt.user; <userinput>sgmlnorm example.sgml &gt; example.html</userinput></screen>
+          <screen>&prompt.user; <userinput>sgmlnorm example.xml &gt; example.html</userinput></screen>
 
 	  <para>You should find a normalized (i.e., entity references
 	    expanded) copy of your document in
@@ -1091,7 +1091,7 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	    the start.  To include this you need to use the <option>-d</option>
 	    option:</para>
 
-          <screen>&prompt.user; <userinput>sgmlnorm -d example.sgml &gt; example.html</userinput></screen>
+          <screen>&prompt.user; <userinput>sgmlnorm -d example.xml &gt; example.html</userinput></screen>
 	</step>
       </procedure>
     </sect2>
@@ -1110,9 +1110,9 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
       <para>Suppose you have some content for an SGML book organized into
 	files, one file per chapter, called
-	<filename>chapter1.sgml</filename>,
-	<filename>chapter2.sgml</filename>, and so forth, with a
-	<filename>book.sgml</filename> file that will contain these
+	<filename>chapter1.xml</filename>,
+	<filename>chapter2.xml</filename>, and so forth, with a
+	<filename>book.xml</filename> file that will contain these
 	chapters.</para>
 
       <para>In order to use the contents of these files as the values for your
@@ -1124,9 +1124,9 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	<title>Using general entities to include files</title>
 
 	<programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!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 -->
 ]>
 
@@ -1142,8 +1142,8 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
       <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) <emphasis>must
+	  (<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.</para>
       </warning>
@@ -1177,9 +1177,9 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  <filename>chapters.ent</filename>.  This file contains the
 	  following:</para>
 
-	<programlisting><![ CDATA [<!ENTITY chapter.1 SYSTEM "chapter1.sgml">
-<!ENTITY chapter.2 SYSTEM "chapter2.sgml">
-<!ENTITY chapter.3 SYSTEM "chapter3.sgml">]]></programlisting>
+	<programlisting><![ CDATA [<!ENTITY chapter.1 SYSTEM "chapter1.xml">
+<!ENTITY chapter.2 SYSTEM "chapter2.xml">
+<!ENTITY chapter.3 SYSTEM "chapter3.xml">]]></programlisting>
 
 	<para>Now create a parameter entity to refer to the contents of the
 	  file.  Then use the parameter entity to load the file into the
@@ -1210,9 +1210,9 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
 	<procedure>
 	  <step>
-	    <para>Create three files, <filename>para1.sgml</filename>,
-	      <filename>para2.sgml</filename>, and
-	      <filename>para3.sgml</filename>.</para>
+	    <para>Create three files, <filename>para1.xml</filename>,
+	      <filename>para2.xml</filename>, and
+	      <filename>para3.xml</filename>.</para>
 
 	    <para>Put content similar to the following in each file:</para>
 
@@ -1220,14 +1220,14 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  </step>
 
 	  <step>
-	    <para>Edit <filename>example.sgml</filename> so that it looks like
+	    <para>Edit <filename>example.xml</filename> so that it looks like
 	      this:</para>
 
 	    <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
 <!ENTITY version "1.1">
-<!ENTITY para1 SYSTEM "para1.sgml">
-<!ENTITY para2 SYSTEM "para2.sgml">
-<!ENTITY para3 SYSTEM "para3.sgml">
+<!ENTITY para1 SYSTEM "para1.xml">
+<!ENTITY para2 SYSTEM "para2.xml">
+<!ENTITY para3 SYSTEM "para3.xml">
 ]>
 
 <html>
@@ -1247,15 +1247,15 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
 	  <step>
 	    <para>Produce <filename>example.html</filename> by normalizing
-	      <filename>example.sgml</filename>.</para>
+	      <filename>example.xml</filename>.</para>
 
-            <screen>&prompt.user; <userinput>sgmlnorm -d example.sgml &gt; example.html</userinput></screen>
+            <screen>&prompt.user; <userinput>sgmlnorm -d example.xml &gt; example.html</userinput></screen>
 	  </step>
 
 	  <step>
 	    <para>Load <filename>example.html</filename> into your web
 	      browser, and confirm that the
-	      <filename>para<replaceable>n</replaceable>.sgml</filename> files
+	      <filename>para<replaceable>n</replaceable>.xml</filename> files
 	      have been included in <filename>example.html</filename>.</para>
 	  </step>
 	</procedure>
@@ -1270,11 +1270,11 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
 	<procedure>
 	  <step>
-	    <para>Edit <filename>example.sgml</filename> so that it looks like
+	    <para>Edit <filename>example.xml</filename> so that it looks like
 	      this:</para>
 
 	    <programlisting><![ CDATA [<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
-<!ENTITY % entities SYSTEM "entities.sgml"> %entities;
+<!ENTITY % entities SYSTEM "entities.xml"> %entities;
 ]>
 
 <html>
@@ -1293,26 +1293,26 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	  </step>
 
 	  <step>
-	    <para>Create a new file, <filename>entities.sgml</filename>, with
+	    <para>Create a new file, <filename>entities.xml</filename>, with
 	      this content:</para>
 
 	    <programlisting><![ CDATA [<!ENTITY version "1.1">
-<!ENTITY para1 SYSTEM "para1.sgml">
-<!ENTITY para2 SYSTEM "para2.sgml">
-<!ENTITY para3 SYSTEM "para3.sgml">]]></programlisting>
+<!ENTITY para1 SYSTEM "para1.xml">
+<!ENTITY para2 SYSTEM "para2.xml">
+<!ENTITY para3 SYSTEM "para3.xml">]]></programlisting>
 	  </step>
 
 	  <step>
 	    <para>Produce <filename>example.html</filename> by normalizing
-	      <filename>example.sgml</filename>.</para>
+	      <filename>example.xml</filename>.</para>
 
-            <screen>&prompt.user; <userinput>sgmlnorm -d example.sgml &gt; example.html</userinput></screen>
+            <screen>&prompt.user; <userinput>sgmlnorm -d example.xml &gt; example.html</userinput></screen>
 	  </step>
 
 	  <step>
 	    <para>Load <filename>example.html</filename> into your web
 	      browser, and confirm that the
-	      <filename>para<replaceable>n</replaceable>.sgml</filename> files
+	      <filename>para<replaceable>n</replaceable>.xml</filename> files
 	      have been included in <filename>example.html</filename>.</para>
 	  </step>
 	</procedure>
@@ -1519,7 +1519,7 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
       <procedure>
 	<step>
-	  <para>Create a new file, <filename>section.sgml</filename>, that
+	  <para>Create a new file, <filename>section.xml</filename>, that
 	    contains the following:</para>
 
 	  <programlisting>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [
@@ -1553,7 +1553,7 @@ nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 	</step>
 
 	<step>
-	  <para>Normalize this file using &man.sgmlnorm.1; and examine the
+	  <para>Normalize this file using &man.xmlnorm.1; and examine the
 	    output.  Notice which paragraphs have appeared, which have
 	    disappeared, and what has happened to the content of the CDATA
 	    marked section.</para>
diff --git a/zh_TW.Big5/books/fdp-primer/structure/chapter.sgml b/zh_TW.Big5/books/fdp-primer/structure/chapter.xml
similarity index 94%
rename from zh_TW.Big5/books/fdp-primer/structure/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/structure/chapter.xml
index 472772f067..45a0add70e 100644
--- a/zh_TW.Big5/books/fdp-primer/structure/chapter.sgml
+++ b/zh_TW.Big5/books/fdp-primer/structure/chapter.xml
@@ -194,7 +194,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
@@ -202,7 +202,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="sgml-primer-parameter-entities">parameter
 	      entities</link> to load in the files with the
 	    <filename>.ent</filename> extension. These files (described later)
@@ -212,10 +212,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 directory from the
+	    <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>
 	    element.</para>
@@ -227,7 +227,7 @@
 ...
 </chapter>]]></programlisting>
 
-	  <para>then it will be called <filename>chapter.sgml</filename> in
+	  <para>then it will be called <filename>chapter.xml</filename> in
 	    the <filename>kernelconfiguration</filename> directory.  In
 	    general, the entire contents of the chapter will be held in this
 	    file.</para>
@@ -238,7 +238,7 @@
 	    the name of the directory.</para>
 
 	  <para>In earlier versions of the Handbook the files were stored in
-	    the same directory as <filename>book.sgml</filename>, and named
+	    the same directory as <filename>book.xml</filename>, and named
 	    after the value of the <literal>id</literal> attribute on the
 	    file's <sgmltag>chapter</sgmltag> element.  Moving them into
 	    separate directories prepares for future plans for the Handbook.
@@ -252,10 +252,10 @@
 	    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>
+	    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 fashion
@@ -266,7 +266,7 @@
 	      or demoted within the hierarchy).</para>
 	  </important>
 
-	  <para>Each <filename>chapter.sgml</filename> file will not be a
+	  <para>Each <filename>chapter.xml</filename> file will not be a
 	    complete SGML document.  In particular, they will not have their
 	    own DOCTYPE lines at the start of the files.</para>
 
diff --git a/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.sgml b/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/fdp-primer/stylesheets/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/stylesheets/chapter.xml
diff --git a/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml b/zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/the-website/chapter.xml
diff --git a/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml b/zh_TW.Big5/books/fdp-primer/tools/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/fdp-primer/tools/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/tools/chapter.xml
diff --git a/zh_TW.Big5/books/fdp-primer/translations/chapter.sgml b/zh_TW.Big5/books/fdp-primer/translations/chapter.xml
similarity index 98%
rename from zh_TW.Big5/books/fdp-primer/translations/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/translations/chapter.xml
index f837832657..56616a08e5 100644
--- a/zh_TW.Big5/books/fdp-primer/translations/chapter.sgml
+++ b/zh_TW.Big5/books/fdp-primer/translations/chapter.xml
@@ -210,7 +210,7 @@
                      books/
                            faq/
                                Makefile
-                               book.sgml</programlisting>
+                               book.xml</programlisting>
 
 	<para><literal>sv_SE.ISO8859-1</literal> �O�̷�
 	  <filename><replaceable>�y�t(lang)</replaceable>.<replaceable>�s�X(encoding)</replaceable></filename>
@@ -357,7 +357,7 @@
 	<programlisting>&lt;!--
      The FreeBSD Documentation Project
 
-     &dollar;FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v 1.5 2000/07/07 18:38:38 dannyboy Exp &dollar;
+     &dollar;FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml,v 1.5 2000/07/07 18:38:38 dannyboy Exp &dollar;
 --&gt;</programlisting>
 
 	<para>��ڤW�����e�i��y�����P�A���C����Z���|���W &dollar;FreeBSD&dollar; �o�@��H��
@@ -377,7 +377,7 @@
 	<programlisting>&lt;!--
      The FreeBSD Spanish Documentation Project
 
-     &dollar;FreeBSD: doc/es_ES.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v 1.3 1999/06/24 19:12:32 jesusr Exp &dollar;
+     &dollar;FreeBSD: doc/es_ES.ISO8859-1/books/fdp-primer/translations/chapter.xml,v 1.3 1999/06/24 19:12:32 jesusr Exp &dollar;
      Original revision: 1.11
 --&gt;</programlisting>
       </answer>
diff --git a/zh_TW.Big5/books/fdp-primer/writing-style/chapter.sgml b/zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/fdp-primer/writing-style/chapter.sgml
rename to zh_TW.Big5/books/fdp-primer/writing-style/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/Makefile b/zh_TW.Big5/books/handbook/Makefile
index 761f2f116d..c5d0bf7147 100644
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@@ -17,7 +17,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
@@ -196,42 +196,42 @@ IMAGES_LIB+= callouts/15.png
 #
 
 # SGML content
-SRCS+= audit/chapter.sgml
-SRCS+= book.sgml
-SRCS+= colophon.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+= 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+= colophon.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+= 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
@@ -239,12 +239,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 ${MASTERDOC}
 
 #
@@ -260,9 +260,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}
@@ -270,20 +270,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/zh_TW.Big5/books/handbook/advanced-networking/Makefile b/zh_TW.Big5/books/handbook/advanced-networking/Makefile
index a82d5c2f40..6bce63bf94 100644
--- a/zh_TW.Big5/books/handbook/advanced-networking/Makefile
+++ b/zh_TW.Big5/books/handbook/advanced-networking/Makefile
@@ -5,7 +5,7 @@
 # Original revision: 1.2
 #
 
-CHAPTERS= 	advanced-networking/chapter.sgml
+CHAPTERS= 	advanced-networking/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/advanced-networking/chapter.sgml b/zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/advanced-networking/chapter.sgml
rename to zh_TW.Big5/books/handbook/advanced-networking/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/audit/Makefile b/zh_TW.Big5/books/handbook/audit/Makefile
index 89a9b3981a..2d71ed91f5 100644
--- a/zh_TW.Big5/books/handbook/audit/Makefile
+++ b/zh_TW.Big5/books/handbook/audit/Makefile
@@ -5,7 +5,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	audit/chapter.sgml
+CHAPTERS= 	audit/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/audit/chapter.sgml b/zh_TW.Big5/books/handbook/audit/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/audit/chapter.sgml
rename to zh_TW.Big5/books/handbook/audit/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/basics/Makefile b/zh_TW.Big5/books/handbook/basics/Makefile
index bda20f79ba..69b6b899ac 100644
--- a/zh_TW.Big5/books/handbook/basics/Makefile
+++ b/zh_TW.Big5/books/handbook/basics/Makefile
@@ -5,7 +5,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	basics/chapter.sgml
+CHAPTERS= 	basics/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/basics/chapter.sgml b/zh_TW.Big5/books/handbook/basics/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/basics/chapter.sgml
rename to zh_TW.Big5/books/handbook/basics/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/bibliography/Makefile b/zh_TW.Big5/books/handbook/bibliography/Makefile
index 267941169b..e1ac7fd2e2 100644
--- a/zh_TW.Big5/books/handbook/bibliography/Makefile
+++ b/zh_TW.Big5/books/handbook/bibliography/Makefile
@@ -5,7 +5,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	bibliography/chapter.sgml
+CHAPTERS= 	bibliography/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/bibliography/chapter.sgml b/zh_TW.Big5/books/handbook/bibliography/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/bibliography/chapter.sgml
rename to zh_TW.Big5/books/handbook/bibliography/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/book.sgml b/zh_TW.Big5/books/handbook/book.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/book.sgml
rename to zh_TW.Big5/books/handbook/book.xml
diff --git a/zh_TW.Big5/books/handbook/boot/Makefile b/zh_TW.Big5/books/handbook/boot/Makefile
index 3c9b3cc58a..c405bb50c6 100644
--- a/zh_TW.Big5/books/handbook/boot/Makefile
+++ b/zh_TW.Big5/books/handbook/boot/Makefile
@@ -5,7 +5,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	boot/chapter.sgml
+CHAPTERS= 	boot/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/boot/chapter.sgml b/zh_TW.Big5/books/handbook/boot/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/boot/chapter.sgml
rename to zh_TW.Big5/books/handbook/boot/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/chapters.ent b/zh_TW.Big5/books/handbook/chapters.ent
index 77e8a66148..8868fe9a40 100644
--- a/zh_TW.Big5/books/handbook/chapters.ent
+++ b/zh_TW.Big5/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,140 +53,140 @@
 <!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.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/zh_TW.Big5/books/handbook/colophon.sgml b/zh_TW.Big5/books/handbook/colophon.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/colophon.sgml
rename to zh_TW.Big5/books/handbook/colophon.xml
diff --git a/zh_TW.Big5/books/handbook/config/Makefile b/zh_TW.Big5/books/handbook/config/Makefile
index 92d1e1c306..2d81feca5e 100644
--- a/zh_TW.Big5/books/handbook/config/Makefile
+++ b/zh_TW.Big5/books/handbook/config/Makefile
@@ -5,7 +5,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	config/chapter.sgml
+CHAPTERS= 	config/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/config/chapter.sgml b/zh_TW.Big5/books/handbook/config/chapter.xml
similarity index 99%
rename from zh_TW.Big5/books/handbook/config/chapter.sgml
rename to zh_TW.Big5/books/handbook/config/chapter.xml
index 26ff4835d5..d21c12bc31 100644
--- a/zh_TW.Big5/books/handbook/config/chapter.sgml
+++ b/zh_TW.Big5/books/handbook/config/chapter.xml
@@ -869,7 +869,7 @@ ukphy1:  10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto</screen>
 	  object)</primary></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/zh_TW.Big5/books/handbook/cutting-edge/Makefile b/zh_TW.Big5/books/handbook/cutting-edge/Makefile
index f2564b17e6..6ca842754f 100644
--- a/zh_TW.Big5/books/handbook/cutting-edge/Makefile
+++ b/zh_TW.Big5/books/handbook/cutting-edge/Makefile
@@ -5,7 +5,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	cutting-edge/chapter.sgml
+CHAPTERS= 	cutting-edge/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml b/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml
rename to zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/desktop/Makefile b/zh_TW.Big5/books/handbook/desktop/Makefile
index d1572f0a04..192ca2b156 100644
--- a/zh_TW.Big5/books/handbook/desktop/Makefile
+++ b/zh_TW.Big5/books/handbook/desktop/Makefile
@@ -5,7 +5,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	desktop/chapter.sgml
+CHAPTERS= 	desktop/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/desktop/chapter.sgml b/zh_TW.Big5/books/handbook/desktop/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/desktop/chapter.sgml
rename to zh_TW.Big5/books/handbook/desktop/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/disks/Makefile b/zh_TW.Big5/books/handbook/disks/Makefile
index fca1df5870..c9ed4c9594 100644
--- a/zh_TW.Big5/books/handbook/disks/Makefile
+++ b/zh_TW.Big5/books/handbook/disks/Makefile
@@ -5,7 +5,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	disks/chapter.sgml
+CHAPTERS= 	disks/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/disks/chapter.sgml b/zh_TW.Big5/books/handbook/disks/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/disks/chapter.sgml
rename to zh_TW.Big5/books/handbook/disks/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/eresources/Makefile b/zh_TW.Big5/books/handbook/eresources/Makefile
index e86118bc4c..7099b0c7d2 100644
--- a/zh_TW.Big5/books/handbook/eresources/Makefile
+++ b/zh_TW.Big5/books/handbook/eresources/Makefile
@@ -4,7 +4,7 @@
 # Original revision: 1.1
 #
 
-CHAPTERS= 	eresources/chapter.sgml
+CHAPTERS= 	eresources/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/eresources/chapter.sgml b/zh_TW.Big5/books/handbook/eresources/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/eresources/chapter.sgml
rename to zh_TW.Big5/books/handbook/eresources/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/firewalls/Makefile b/zh_TW.Big5/books/handbook/firewalls/Makefile
index 331f5bf8ec..9320a51f68 100644
--- a/zh_TW.Big5/books/handbook/firewalls/Makefile
+++ b/zh_TW.Big5/books/handbook/firewalls/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	firewalls/chapter.sgml
+CHAPTERS= 	firewalls/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/firewalls/chapter.sgml b/zh_TW.Big5/books/handbook/firewalls/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/firewalls/chapter.sgml
rename to zh_TW.Big5/books/handbook/firewalls/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/geom/Makefile b/zh_TW.Big5/books/handbook/geom/Makefile
index 59e5759cdc..f574c00011 100644
--- a/zh_TW.Big5/books/handbook/geom/Makefile
+++ b/zh_TW.Big5/books/handbook/geom/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	geom/chapter.sgml
+CHAPTERS= 	geom/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/geom/chapter.sgml b/zh_TW.Big5/books/handbook/geom/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/geom/chapter.sgml
rename to zh_TW.Big5/books/handbook/geom/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/install/Makefile b/zh_TW.Big5/books/handbook/install/Makefile
index 738cdb647d..9ca79617b2 100644
--- a/zh_TW.Big5/books/handbook/install/Makefile
+++ b/zh_TW.Big5/books/handbook/install/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	install/chapter.sgml
+CHAPTERS= 	install/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/install/chapter.sgml b/zh_TW.Big5/books/handbook/install/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/install/chapter.sgml
rename to zh_TW.Big5/books/handbook/install/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/introduction/Makefile b/zh_TW.Big5/books/handbook/introduction/Makefile
index 4c22f7ce8a..db1a5173b2 100644
--- a/zh_TW.Big5/books/handbook/introduction/Makefile
+++ b/zh_TW.Big5/books/handbook/introduction/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	introduction/chapter.sgml
+CHAPTERS= 	introduction/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/introduction/chapter.sgml b/zh_TW.Big5/books/handbook/introduction/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/introduction/chapter.sgml
rename to zh_TW.Big5/books/handbook/introduction/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/jails/chapter.sgml b/zh_TW.Big5/books/handbook/jails/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/jails/chapter.sgml
rename to zh_TW.Big5/books/handbook/jails/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/kernelconfig/Makefile b/zh_TW.Big5/books/handbook/kernelconfig/Makefile
index 95839d340a..e2c2e5cdf0 100644
--- a/zh_TW.Big5/books/handbook/kernelconfig/Makefile
+++ b/zh_TW.Big5/books/handbook/kernelconfig/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	kernelconfig/chapter.sgml
+CHAPTERS= 	kernelconfig/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/kernelconfig/chapter.sgml b/zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/kernelconfig/chapter.sgml
rename to zh_TW.Big5/books/handbook/kernelconfig/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/l10n/Makefile b/zh_TW.Big5/books/handbook/l10n/Makefile
index c6741a2341..45d3429ab1 100644
--- a/zh_TW.Big5/books/handbook/l10n/Makefile
+++ b/zh_TW.Big5/books/handbook/l10n/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	l10n/chapter.sgml
+CHAPTERS= 	l10n/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/l10n/chapter.sgml b/zh_TW.Big5/books/handbook/l10n/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/l10n/chapter.sgml
rename to zh_TW.Big5/books/handbook/l10n/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/linuxemu/Makefile b/zh_TW.Big5/books/handbook/linuxemu/Makefile
index 37adfa9af6..a477216e72 100644
--- a/zh_TW.Big5/books/handbook/linuxemu/Makefile
+++ b/zh_TW.Big5/books/handbook/linuxemu/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	linuxemu/chapter.sgml
+CHAPTERS= 	linuxemu/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/linuxemu/chapter.sgml b/zh_TW.Big5/books/handbook/linuxemu/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/linuxemu/chapter.sgml
rename to zh_TW.Big5/books/handbook/linuxemu/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/mac/Makefile b/zh_TW.Big5/books/handbook/mac/Makefile
index 74aca4172f..ecd40cd7e2 100644
--- a/zh_TW.Big5/books/handbook/mac/Makefile
+++ b/zh_TW.Big5/books/handbook/mac/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mac/chapter.sgml
+CHAPTERS= 	mac/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/mac/chapter.sgml b/zh_TW.Big5/books/handbook/mac/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/mac/chapter.sgml
rename to zh_TW.Big5/books/handbook/mac/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/mail/Makefile b/zh_TW.Big5/books/handbook/mail/Makefile
index 538dff091f..6138758090 100644
--- a/zh_TW.Big5/books/handbook/mail/Makefile
+++ b/zh_TW.Big5/books/handbook/mail/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mail/chapter.sgml
+CHAPTERS= 	mail/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/mail/chapter.sgml b/zh_TW.Big5/books/handbook/mail/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/mail/chapter.sgml
rename to zh_TW.Big5/books/handbook/mail/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/mirrors/Makefile b/zh_TW.Big5/books/handbook/mirrors/Makefile
index ad5c0e2abe..9197ba315d 100644
--- a/zh_TW.Big5/books/handbook/mirrors/Makefile
+++ b/zh_TW.Big5/books/handbook/mirrors/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	mirrors/chapter.sgml
+CHAPTERS= 	mirrors/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/mirrors/chapter.sgml b/zh_TW.Big5/books/handbook/mirrors/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/mirrors/chapter.sgml
rename to zh_TW.Big5/books/handbook/mirrors/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/multimedia/Makefile b/zh_TW.Big5/books/handbook/multimedia/Makefile
index f90e1cd2b0..d645e14d83 100644
--- a/zh_TW.Big5/books/handbook/multimedia/Makefile
+++ b/zh_TW.Big5/books/handbook/multimedia/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	multimedia/chapter.sgml
+CHAPTERS= 	multimedia/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/multimedia/chapter.sgml b/zh_TW.Big5/books/handbook/multimedia/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/multimedia/chapter.sgml
rename to zh_TW.Big5/books/handbook/multimedia/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/network-servers/Makefile b/zh_TW.Big5/books/handbook/network-servers/Makefile
index 150dbe3121..8f39ebad57 100644
--- a/zh_TW.Big5/books/handbook/network-servers/Makefile
+++ b/zh_TW.Big5/books/handbook/network-servers/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	network-servers/chapter.sgml
+CHAPTERS= 	network-servers/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/network-servers/chapter.sgml b/zh_TW.Big5/books/handbook/network-servers/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/network-servers/chapter.sgml
rename to zh_TW.Big5/books/handbook/network-servers/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/pgpkeys/Makefile b/zh_TW.Big5/books/handbook/pgpkeys/Makefile
index 4033713203..cd4e52bafd 100644
--- a/zh_TW.Big5/books/handbook/pgpkeys/Makefile
+++ b/zh_TW.Big5/books/handbook/pgpkeys/Makefile
@@ -3,7 +3,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/zh_TW.Big5/books/handbook/pgpkeys/chapter.sgml b/zh_TW.Big5/books/handbook/pgpkeys/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/pgpkeys/chapter.sgml
rename to zh_TW.Big5/books/handbook/pgpkeys/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/ports/Makefile b/zh_TW.Big5/books/handbook/ports/Makefile
index 93280bcae8..f5ebfe0a14 100644
--- a/zh_TW.Big5/books/handbook/ports/Makefile
+++ b/zh_TW.Big5/books/handbook/ports/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	ports/chapter.sgml
+CHAPTERS= 	ports/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/ports/chapter.sgml b/zh_TW.Big5/books/handbook/ports/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/ports/chapter.sgml
rename to zh_TW.Big5/books/handbook/ports/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/ppp-and-slip/Makefile b/zh_TW.Big5/books/handbook/ppp-and-slip/Makefile
index 1a44fcbd0c..4026603f90 100644
--- a/zh_TW.Big5/books/handbook/ppp-and-slip/Makefile
+++ b/zh_TW.Big5/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/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.sgml b/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/ppp-and-slip/chapter.sgml
rename to zh_TW.Big5/books/handbook/ppp-and-slip/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/preface/preface.sgml b/zh_TW.Big5/books/handbook/preface/preface.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/preface/preface.sgml
rename to zh_TW.Big5/books/handbook/preface/preface.xml
diff --git a/zh_TW.Big5/books/handbook/printing/Makefile b/zh_TW.Big5/books/handbook/printing/Makefile
index 72d9e9b80a..cbf5a174cc 100644
--- a/zh_TW.Big5/books/handbook/printing/Makefile
+++ b/zh_TW.Big5/books/handbook/printing/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	printing/chapter.sgml
+CHAPTERS= 	printing/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/printing/chapter.sgml b/zh_TW.Big5/books/handbook/printing/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/printing/chapter.sgml
rename to zh_TW.Big5/books/handbook/printing/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/security/Makefile b/zh_TW.Big5/books/handbook/security/Makefile
index bbf01aa7ab..3524819d48 100644
--- a/zh_TW.Big5/books/handbook/security/Makefile
+++ b/zh_TW.Big5/books/handbook/security/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	security/chapter.sgml
+CHAPTERS= 	security/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/security/chapter.sgml b/zh_TW.Big5/books/handbook/security/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/security/chapter.sgml
rename to zh_TW.Big5/books/handbook/security/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/serialcomms/Makefile b/zh_TW.Big5/books/handbook/serialcomms/Makefile
index b83d9a27bb..3dbd97ce6d 100644
--- a/zh_TW.Big5/books/handbook/serialcomms/Makefile
+++ b/zh_TW.Big5/books/handbook/serialcomms/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	serialcomms/chapter.sgml
+CHAPTERS= 	serialcomms/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/serialcomms/chapter.sgml b/zh_TW.Big5/books/handbook/serialcomms/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/serialcomms/chapter.sgml
rename to zh_TW.Big5/books/handbook/serialcomms/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/users/Makefile b/zh_TW.Big5/books/handbook/users/Makefile
index dfa2918b7b..b44bd80628 100644
--- a/zh_TW.Big5/books/handbook/users/Makefile
+++ b/zh_TW.Big5/books/handbook/users/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	users/chapter.sgml
+CHAPTERS= 	users/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/users/chapter.sgml b/zh_TW.Big5/books/handbook/users/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/users/chapter.sgml
rename to zh_TW.Big5/books/handbook/users/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/vinum/Makefile b/zh_TW.Big5/books/handbook/vinum/Makefile
index eca585a9aa..b970524581 100644
--- a/zh_TW.Big5/books/handbook/vinum/Makefile
+++ b/zh_TW.Big5/books/handbook/vinum/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	vinum/chapter.sgml
+CHAPTERS= 	vinum/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/vinum/chapter.sgml b/zh_TW.Big5/books/handbook/vinum/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/vinum/chapter.sgml
rename to zh_TW.Big5/books/handbook/vinum/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/virtualization/Makefile b/zh_TW.Big5/books/handbook/virtualization/Makefile
index 4c89488e9c..7f5a1fd58b 100644
--- a/zh_TW.Big5/books/handbook/virtualization/Makefile
+++ b/zh_TW.Big5/books/handbook/virtualization/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	virtualization/chapter.sgml
+CHAPTERS= 	virtualization/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/virtualization/chapter.sgml b/zh_TW.Big5/books/handbook/virtualization/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/virtualization/chapter.sgml
rename to zh_TW.Big5/books/handbook/virtualization/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/x11/Makefile b/zh_TW.Big5/books/handbook/x11/Makefile
index 06b452cd33..040a7ae2b2 100644
--- a/zh_TW.Big5/books/handbook/x11/Makefile
+++ b/zh_TW.Big5/books/handbook/x11/Makefile
@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-CHAPTERS= 	x11/chapter.sgml
+CHAPTERS= 	x11/chapter.xml
 
 VPATH=		..
 
diff --git a/zh_TW.Big5/books/handbook/x11/chapter.sgml b/zh_TW.Big5/books/handbook/x11/chapter.xml
similarity index 100%
rename from zh_TW.Big5/books/handbook/x11/chapter.sgml
rename to zh_TW.Big5/books/handbook/x11/chapter.xml
diff --git a/zh_TW.Big5/books/porters-handbook/Makefile b/zh_TW.Big5/books/porters-handbook/Makefile
index 949728f27e..241674c462 100644
--- a/zh_TW.Big5/books/porters-handbook/Makefile
+++ b/zh_TW.Big5/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/zh_TW.Big5/books/porters-handbook/book.sgml b/zh_TW.Big5/books/porters-handbook/book.xml
similarity index 100%
rename from zh_TW.Big5/books/porters-handbook/book.sgml
rename to zh_TW.Big5/books/porters-handbook/book.xml
diff --git a/zh_TW.Big5/htdocs/Makefile b/zh_TW.Big5/htdocs/Makefile
index f1a78930da..c014d18c12 100644
--- a/zh_TW.Big5/htdocs/Makefile
+++ b/zh_TW.Big5/htdocs/Makefile
@@ -10,16 +10,16 @@
 
 # These are turned into validated, normalized HTML files.
 
-DOCS=  about.sgml
-DOCS+= applications.sgml
-DOCS+= art.sgml
-DOCS+= availability.sgml
-DOCS+= community.sgml
-DOCS+= docs.sgml
-DOCS+= logo.sgml
-DOCS+= send-pr.sgml
-DOCS+= support.sgml
-DOCS+= where.sgml
+DOCS=  about.xml
+DOCS+= applications.xml
+DOCS+= art.xml
+DOCS+= availability.xml
+DOCS+= community.xml
+DOCS+= docs.xml
+DOCS+= logo.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/zh_TW.Big5/htdocs/about.sgml b/zh_TW.Big5/htdocs/about.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/about.sgml
rename to zh_TW.Big5/htdocs/about.xml
diff --git a/zh_TW.Big5/htdocs/applications.sgml b/zh_TW.Big5/htdocs/applications.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/applications.sgml
rename to zh_TW.Big5/htdocs/applications.xml
diff --git a/zh_TW.Big5/htdocs/art.sgml b/zh_TW.Big5/htdocs/art.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/art.sgml
rename to zh_TW.Big5/htdocs/art.xml
diff --git a/zh_TW.Big5/htdocs/availability.sgml b/zh_TW.Big5/htdocs/availability.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/availability.sgml
rename to zh_TW.Big5/htdocs/availability.xml
diff --git a/zh_TW.Big5/htdocs/community.sgml b/zh_TW.Big5/htdocs/community.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/community.sgml
rename to zh_TW.Big5/htdocs/community.xml
diff --git a/zh_TW.Big5/htdocs/developers.sgml b/zh_TW.Big5/htdocs/developers.xml
similarity index 99%
rename from zh_TW.Big5/htdocs/developers.sgml
rename to zh_TW.Big5/htdocs/developers.xml
index e364d1f69b..6a35512e81 100644
--- a/zh_TW.Big5/htdocs/developers.sgml
+++ b/zh_TW.Big5/htdocs/developers.xml
@@ -535,7 +535,7 @@ $FreeBSD$
 <!ENTITY a.pavalos "Peter&nbsp;Avalos">
 <!ENTITY a.jwojdacki "Justin&nbsp;Wojdacki">
 
-<!-- Below we list the various hats.  This is used in internal/staff.sgml
+<!-- Below we list the various hats.  This is used in internal/staff.xml
 so that we may keep a list of hat owners and modify only this file. -->
 
 <!-- FreeBSD Bugmeister -->
diff --git a/zh_TW.Big5/htdocs/docs.sgml b/zh_TW.Big5/htdocs/docs.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/docs.sgml
rename to zh_TW.Big5/htdocs/docs.xml
diff --git a/zh_TW.Big5/htdocs/docs/Makefile b/zh_TW.Big5/htdocs/docs/Makefile
index efc108e9be..c1587b3190 100644
--- a/zh_TW.Big5/htdocs/docs/Makefile
+++ b/zh_TW.Big5/htdocs/docs/Makefile
@@ -11,6 +11,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/zh_TW.Big5/htdocs/docs/books.sgml b/zh_TW.Big5/htdocs/docs/books.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/docs/books.sgml
rename to zh_TW.Big5/htdocs/docs/books.xml
diff --git a/zh_TW.Big5/htdocs/docs/webresources.sgml b/zh_TW.Big5/htdocs/docs/webresources.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/docs/webresources.sgml
rename to zh_TW.Big5/htdocs/docs/webresources.xml
diff --git a/zh_TW.Big5/htdocs/logo.sgml b/zh_TW.Big5/htdocs/logo.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/logo.sgml
rename to zh_TW.Big5/htdocs/logo.xml
diff --git a/zh_TW.Big5/htdocs/send-pr.sgml b/zh_TW.Big5/htdocs/send-pr.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/send-pr.sgml
rename to zh_TW.Big5/htdocs/send-pr.xml
diff --git a/zh_TW.Big5/htdocs/support.sgml b/zh_TW.Big5/htdocs/support.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/support.sgml
rename to zh_TW.Big5/htdocs/support.xml
diff --git a/zh_TW.Big5/htdocs/where.sgml b/zh_TW.Big5/htdocs/where.xml
similarity index 100%
rename from zh_TW.Big5/htdocs/where.sgml
rename to zh_TW.Big5/htdocs/where.xml