378 files changed, 475 insertions, 475 deletions

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
index ed53580d31..ed53580d31 100644
--- a/fr_FR.ISO8859-1/articles/building-products/article.sgml
+++ b/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
index cd28efa7f9..cd28efa7f9 100644
--- a/fr_FR.ISO8859-1/articles/committers-guide/article.sgml
+++ b/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
index 36053bc391..36053bc391 100644
--- a/fr_FR.ISO8859-1/articles/contributing-ports/article.sgml
+++ b/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
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
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
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
index 6e2dd03a70..6e2dd03a70 100644
--- a/fr_FR.ISO8859-1/articles/explaining-bsd/article.sgml
+++ b/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
index dfdd88a4e8..dfdd88a4e8 100644
--- a/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml
+++ b/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
index be73b9b7a7..be73b9b7a7 100755
--- a/fr_FR.ISO8859-1/articles/fonts/article.sgml
+++ b/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
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
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
index 8792e43f71..8792e43f71 100644
--- a/fr_FR.ISO8859-1/articles/linux-users/article.sgml
+++ b/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
index b5a9a8d95f..b5a9a8d95f 100644
--- a/fr_FR.ISO8859-1/articles/mh/article.sgml
+++ b/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
index ad33d30b6d..ad33d30b6d 100644
--- a/fr_FR.ISO8859-1/articles/nanobsd/article.sgml
+++ b/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
index 674c0d490f..674c0d490f 100755
--- a/fr_FR.ISO8859-1/articles/new-users/article.sgml
+++ b/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
index dbcf7cf1e4..dbcf7cf1e4 100644
--- a/fr_FR.ISO8859-1/articles/pam/article.sgml
+++ b/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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
index bf4faee0c1..bf4faee0c1 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml
+++ b/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
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
index 5c79b71093..5c79b71093 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml
+++ b/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
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
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
index 4255e6939e..4255e6939e 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml
+++ b/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
index cf5a56b93f..cf5a56b93f 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml
+++ b/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
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
index 832c07f2d5..832c07f2d5 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
+++ b/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
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
index a2d21f8326..a2d21f8326 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml
+++ b/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
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
index 69636eb910..69636eb910 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml
+++ b/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
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
index a2c6f06d53..a2c6f06d53 100644
--- a/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml
+++ b/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
index f148ff7c60..f148ff7c60 100644
--- a/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml
+++ b/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
index d01562747c..d01562747c 100644
--- a/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml
+++ b/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
index c97ec3d68b..c97ec3d68b 100644
--- a/fr_FR.ISO8859-1/books/handbook/book.sgml
+++ b/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
index a669a14f65..a669a14f65 100644
--- a/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml
+++ b/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
index b4788e5303..b4788e5303 100644
--- a/fr_FR.ISO8859-1/books/handbook/colophon.sgml
+++ b/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
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
index 727e99804e..727e99804e 100644
--- a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/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
index 95f8d89ecb..95f8d89ecb 100644
--- a/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/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
index 5eb97a5822..5eb97a5822 100755
--- a/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml
+++ b/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
index b40d0164a5..b40d0164a5 100644
--- a/fr_FR.ISO8859-1/books/handbook/dtrace/chapter.sgml
+++ b/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
index a5bde54d41..a5bde54d41 100644
--- a/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml
+++ b/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
index cc942dde79..cc942dde79 100644
--- a/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.sgml
+++ b/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
index a82fe8ce2a..a82fe8ce2a 100644
--- a/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml
+++ b/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
index 657ea32ddc..657ea32ddc 100644
--- a/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/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
index c088d921a4..c088d921a4 100644
--- a/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml
+++ b/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
index 435cdfacbb..435cdfacbb 100644
--- a/fr_FR.ISO8859-1/books/handbook/jails/chapter.sgml
+++ b/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
index f5b6ce611f..f5b6ce611f 100755
--- a/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/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
index 6d14310f94..6d14310f94 100644
--- a/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml
+++ b/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
index e57131cdde..e57131cdde 100644
--- a/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml
+++ b/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
index 95cc5ee3d7..95cc5ee3d7 100644
--- a/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml
+++ b/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
index 99feb4e4d0..99feb4e4d0 100644
--- a/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/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
index 2bcec5bbd0..2bcec5bbd0 100644
--- a/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/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
index 4155773d9e..4155773d9e 100644
--- a/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml
+++ b/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
index 1459610b9c..1459610b9c 100644
--- a/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml
+++ b/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
index f4f623adcf..f4f623adcf 100644
--- a/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/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
index 3626333f8c..3626333f8c 100644
--- a/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/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
index d8ef215988..d8ef215988 100644
--- a/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+++ b/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
index ea04cf7aa8..ea04cf7aa8 100644
--- a/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml
+++ b/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
index 5e08df4535..5e08df4535 100755
--- a/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml
+++ b/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
index 784ac56c29..784ac56c29 100755
--- a/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml
+++ b/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
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
index 413638d912..413638d912 100644
--- a/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml
+++ b/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
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
index e5682a6873..e5682a6873 100644
--- a/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml
+++ b/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
index 710c3e7781..710c3e7781 100644
--- a/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml
+++ b/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
index 26c5cd6692..26c5cd6692 100644
--- a/fr_FR.ISO8859-1/books/porters-handbook/book.sgml
+++ b/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
index 2744473113..2744473113 100644
--- a/fr_FR.ISO8859-1/htdocs/about.sgml
+++ b/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
index e27c3c7835..e27c3c7835 100644
--- a/fr_FR.ISO8859-1/htdocs/advocacy/index.sgml
+++ b/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
index cda325d2dc..cda325d2dc 100644
--- a/fr_FR.ISO8859-1/htdocs/advocacy/myths.sgml
+++ b/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
index b3d56e3cf5..b3d56e3cf5 100644
--- a/fr_FR.ISO8859-1/htdocs/applications.sgml
+++ b/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
index 9d73f1f318..9d73f1f318 100644
--- a/fr_FR.ISO8859-1/htdocs/art.sgml
+++ b/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
index 6d80dacd21..6d80dacd21 100644
--- a/fr_FR.ISO8859-1/htdocs/auditors.sgml
+++ b/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
index 1f29d7a49e..1f29d7a49e 100644
--- a/fr_FR.ISO8859-1/htdocs/availability.sgml
+++ b/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
index 44fb6c101b..44fb6c101b 100644
--- a/fr_FR.ISO8859-1/htdocs/commercial/commercial.sgml
+++ b/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
index d2cb65451c..d2cb65451c 100644
--- a/fr_FR.ISO8859-1/htdocs/commercial/includes.sgml
+++ b/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
index 81b63a5a57..81b63a5a57 100644
--- a/fr_FR.ISO8859-1/htdocs/community.sgml
+++ b/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
index 99d16fcfc9..99d16fcfc9 100644
--- a/fr_FR.ISO8859-1/htdocs/community/irc.sgml
+++ b/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
index 5e495cf373..5e495cf373 100644
--- a/fr_FR.ISO8859-1/htdocs/community/mailinglists.sgml
+++ b/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
index 68b7bd5d4b..68b7bd5d4b 100644
--- a/fr_FR.ISO8859-1/htdocs/community/newsgroups.sgml
+++ b/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
index 47fc871f3f..47fc871f3f 100644
--- a/fr_FR.ISO8859-1/htdocs/community/webresources.sgml
+++ b/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
index f49da11c41..f49da11c41 100644
--- a/fr_FR.ISO8859-1/htdocs/copyright/copyright.sgml
+++ b/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
index 581dd9eb9a..581dd9eb9a 100644
--- a/fr_FR.ISO8859-1/htdocs/copyright/daemon.sgml
+++ b/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
index 097878c476..097878c476 100644
--- a/fr_FR.ISO8859-1/htdocs/copyright/freebsd-doc-license.sgml
+++ b/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
index 1438409b72..1438409b72 100644
--- a/fr_FR.ISO8859-1/htdocs/copyright/freebsd-license.sgml
+++ b/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
index 9fc4a4c5dd..9fc4a4c5dd 100644
--- a/fr_FR.ISO8859-1/htdocs/copyright/license.sgml
+++ b/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
index 6b6176f48c..6b6176f48c 100644
--- a/fr_FR.ISO8859-1/htdocs/copyright/trademarks.sgml
+++ b/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
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
index 580d0214ea..580d0214ea 100644
--- a/fr_FR.ISO8859-1/htdocs/developers/cvs.sgml
+++ b/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
index 0d80874410..0d80874410 100644
--- a/fr_FR.ISO8859-1/htdocs/docproj/current.sgml
+++ b/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
index 22050d1518..22050d1518 100644
--- a/fr_FR.ISO8859-1/htdocs/docproj/doc-set.sgml
+++ b/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
index b7d83e1617..b7d83e1617 100644
--- a/fr_FR.ISO8859-1/htdocs/docproj/docproj.sgml
+++ b/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
index 609ecb03bb..609ecb03bb 100644
--- a/fr_FR.ISO8859-1/htdocs/docproj/handbook.sgml
+++ b/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
index f7a72229df..f7a72229df 100644
--- a/fr_FR.ISO8859-1/htdocs/docproj/handbook3.sgml
+++ b/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
index 709d861194..709d861194 100644
--- a/fr_FR.ISO8859-1/htdocs/docproj/sgml.sgml
+++ b/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
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
index d124dbd1ed..d124dbd1ed 100644
--- a/fr_FR.ISO8859-1/htdocs/docproj/translations.sgml
+++ b/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
index b75cb0861c..b75cb0861c 100644
--- a/fr_FR.ISO8859-1/htdocs/docproj/who.sgml
+++ b/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
index babb1f55b1..babb1f55b1 100644
--- a/fr_FR.ISO8859-1/htdocs/docs.sgml
+++ b/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
index 3c446f64a3..3c446f64a3 100644
--- a/fr_FR.ISO8859-1/htdocs/docs/books.sgml
+++ b/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
index a8325cd868..a8325cd868 100644
--- a/fr_FR.ISO8859-1/htdocs/docs/man.sgml
+++ b/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
index 864f08dbc9..864f08dbc9 100644
--- a/fr_FR.ISO8859-1/htdocs/docs/webresources.sgml
+++ b/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
index b424ced4a4..b424ced4a4 100644
--- a/fr_FR.ISO8859-1/htdocs/donations/donors.sgml
+++ b/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
index d4a5802913..d4a5802913 100644
--- a/fr_FR.ISO8859-1/htdocs/donations/index.sgml
+++ b/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
index 667607c5b7..667607c5b7 100644
--- a/fr_FR.ISO8859-1/htdocs/donations/wantlist.sgml
+++ b/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
index 920f5fee58..920f5fee58 100644
--- a/fr_FR.ISO8859-1/htdocs/features.sgml
+++ b/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
index 954aa41be9..954aa41be9 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/contact.sgml
+++ b/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
index e3d950a7e7..e3d950a7e7 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/docs/22knownissues.sgml
+++ b/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
index 41c1dd1294..41c1dd1294 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/docs/bugging.sgml
+++ b/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
index d8a2876289..d8a2876289 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/docs/faq.sgml
+++ b/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
index 5c0102a6ec..5c0102a6ec 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/docs/faq2.sgml
+++ b/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
index 16642b060e..16642b060e 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/docs/gnome2_porting.sgml
+++ b/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
index ec2f8d781b..ec2f8d781b 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/docs/gnome_porting.sgml
+++ b/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
index a9d1b6ead2..a9d1b6ead2 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/docs/porting.sgml
+++ b/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
index 7654d46cef..7654d46cef 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/docs/volunteer.sgml
+++ b/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
index b388c256ce..b388c256ce 100644
--- a/fr_FR.ISO8859-1/htdocs/gnome/screenshots.sgml
+++ b/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
index 10ab947245..10ab947245 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/about.sgml
+++ b/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
index 1738750fe5..1738750fe5 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/bylaws.sgml
+++ b/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
index 853140b449..853140b449 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/core-vote.sgml
+++ b/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
index 6e01d4c9fc..6e01d4c9fc 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/developer.sgml
+++ b/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
index 821e48ef91..821e48ef91 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/expire-bits.sgml
+++ b/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
index 2a99901235..2a99901235 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/homepage.sgml
+++ b/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
index d10920b0b5..d10920b0b5 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/internal.sgml
+++ b/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
index c9d0bfbe3a..c9d0bfbe3a 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/machines.sgml
+++ b/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
index 936acf3241..936acf3241 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/mirror.sgml
+++ b/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
index 733cf180da..733cf180da 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/new-account.sgml
+++ b/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
index f552885acd..f552885acd 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/photos.sgml
+++ b/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
index 7b74bf8291..7b74bf8291 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/releng.sgml
+++ b/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
index e2af6bb8e6..e2af6bb8e6 100644
--- a/fr_FR.ISO8859-1/htdocs/internal/statistic.sgml
+++ b/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
index ad831f3568..ad831f3568 100644
--- a/fr_FR.ISO8859-1/htdocs/internet.sgml
+++ b/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
index fa1a968300..fa1a968300 100644
--- a/fr_FR.ISO8859-1/htdocs/java/advocacy.sgml
+++ b/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
index a3323f7984..a3323f7984 100644
--- a/fr_FR.ISO8859-1/htdocs/java/dists/15.sgml
+++ b/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
index 8837e83993..8837e83993 100644
--- a/fr_FR.ISO8859-1/htdocs/java/dists/index.sgml
+++ b/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
index d5dd775338..d5dd775338 100644
--- a/fr_FR.ISO8859-1/htdocs/java/docs/faq.sgml
+++ b/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
index d03d91d0cb..d03d91d0cb 100644
--- a/fr_FR.ISO8859-1/htdocs/java/docs/howtoports.sgml
+++ b/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
index 9bedc80a75..9bedc80a75 100644
--- a/fr_FR.ISO8859-1/htdocs/java/docs/newbies.sgml
+++ b/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
index 62ca7d52ca..62ca7d52ca 100644
--- a/fr_FR.ISO8859-1/htdocs/java/docs/performance.sgml
+++ b/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
index b172e0565f..b172e0565f 100644
--- a/fr_FR.ISO8859-1/htdocs/java/docs/tutorials.sgml
+++ b/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
index d2895e3159..d2895e3159 100644
--- a/fr_FR.ISO8859-1/htdocs/java/howhelp.sgml
+++ b/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
index c977b45a9e..c977b45a9e 100644
--- a/fr_FR.ISO8859-1/htdocs/java/index.sgml
+++ b/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
index 58804bef97..58804bef97 100644
--- a/fr_FR.ISO8859-1/htdocs/java/install.sgml
+++ b/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
index 925f449791..925f449791 100644
--- a/fr_FR.ISO8859-1/htdocs/java/links/api.sgml
+++ b/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
index fac08297f7..fac08297f7 100644
--- a/fr_FR.ISO8859-1/htdocs/java/links/development.sgml
+++ b/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
index a9549e6a1c..a9549e6a1c 100755
--- a/fr_FR.ISO8859-1/htdocs/java/links/documentation.sgml
+++ b/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
index c1e58412e3..c1e58412e3 100755
--- a/fr_FR.ISO8859-1/htdocs/java/links/freebsd.sgml
+++ b/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
index c7b3f0a654..c7b3f0a654 100644
--- a/fr_FR.ISO8859-1/htdocs/java/links/index.sgml
+++ b/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
index d9bc774d52..d9bc774d52 100755
--- a/fr_FR.ISO8859-1/htdocs/java/links/resources.sgml
+++ b/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
index 49af7f25bd..49af7f25bd 100755
--- a/fr_FR.ISO8859-1/htdocs/java/links/servlets.sgml
+++ b/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
index ba96f9ab5f..ba96f9ab5f 100644
--- a/fr_FR.ISO8859-1/htdocs/java/links/tools.sgml
+++ b/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
index 6dce441ac4..6dce441ac4 100644
--- a/fr_FR.ISO8859-1/htdocs/java/links/tutorials.sgml
+++ b/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
index 011495a99e..011495a99e 100644
--- a/fr_FR.ISO8859-1/htdocs/java/links/vendor.sgml
+++ b/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
index d5500eb9ef..d5500eb9ef 100644
--- a/fr_FR.ISO8859-1/htdocs/java/newsflash.sgml
+++ b/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
index 2ce22e5b2c..2ce22e5b2c 100644
--- a/fr_FR.ISO8859-1/htdocs/java/press.sgml
+++ b/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
index fc07a640c0..fc07a640c0 100644
--- a/fr_FR.ISO8859-1/htdocs/logo.sgml
+++ b/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
index 3ecd39ebd5..3ecd39ebd5 100644
--- a/fr_FR.ISO8859-1/htdocs/mailto.sgml
+++ b/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
index e8c72d48eb..e8c72d48eb 100644
--- a/fr_FR.ISO8859-1/htdocs/news/1996/index.sgml
+++ b/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
index b41bb0ac75..b41bb0ac75 100644
--- a/fr_FR.ISO8859-1/htdocs/news/1997/index.sgml
+++ b/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
index 04d8e948cd..04d8e948cd 100644
--- a/fr_FR.ISO8859-1/htdocs/news/1998/index.sgml
+++ b/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
index bb34e0cfd2..bb34e0cfd2 100644
--- a/fr_FR.ISO8859-1/htdocs/news/1999/index.sgml
+++ b/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
index 3f8b81a3a8..3f8b81a3a8 100644
--- a/fr_FR.ISO8859-1/htdocs/news/2000/index.sgml
+++ b/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
index ec8a3da3eb..ec8a3da3eb 100644
--- a/fr_FR.ISO8859-1/htdocs/news/news.sgml
+++ b/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
index a714c14796..a714c14796 100644
--- a/fr_FR.ISO8859-1/htdocs/news/press-rel-1.sgml
+++ b/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
index bef3407d80..bef3407d80 100644
--- a/fr_FR.ISO8859-1/htdocs/news/press-rel-2.sgml
+++ b/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
index 91f1891d70..91f1891d70 100644
--- a/fr_FR.ISO8859-1/htdocs/news/press-rel-3.sgml
+++ b/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
index 13ca8242bd..13ca8242bd 100644
--- a/fr_FR.ISO8859-1/htdocs/news/press-rel-4.sgml
+++ b/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
index 473f0226d7..473f0226d7 100644
--- a/fr_FR.ISO8859-1/htdocs/news/press-rel-5.sgml
+++ b/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
index a611e17b59..a611e17b59 100644
--- a/fr_FR.ISO8859-1/htdocs/news/press-rel-6.sgml
+++ b/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
index a18e96a91d..a18e96a91d 100644
--- a/fr_FR.ISO8859-1/htdocs/news/press-rel-7.sgml
+++ b/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
index 3bbe169b36..3bbe169b36 100644
--- a/fr_FR.ISO8859-1/htdocs/news/press-rel-8.sgml
+++ b/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
index fedec6f4ff..fedec6f4ff 100644
--- a/fr_FR.ISO8859-1/htdocs/news/press-rel-9.sgml
+++ b/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
index cb2601ed09..cb2601ed09 100644
--- a/fr_FR.ISO8859-1/htdocs/news/pressreleases.sgml
+++ b/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
index a4c0534e7c..a4c0534e7c 100644
--- a/fr_FR.ISO8859-1/htdocs/news/sou1999.sgml
+++ b/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
index 5334133532..5334133532 100644
--- a/fr_FR.ISO8859-1/htdocs/news/status/status.sgml
+++ b/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
index c76e526631..c76e526631 100644
--- a/fr_FR.ISO8859-1/htdocs/news/webchanges.sgml
+++ b/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
index 5e3af97812..5e3af97812 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/alpha.sgml
+++ b/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
index 740e537cfe..740e537cfe 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/amd64.sgml
+++ b/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
index 81924c2099..81924c2099 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/arm.sgml
+++ b/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
index 8481aca1eb..8481aca1eb 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/i386.sgml
+++ b/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
index 592272b5bd..592272b5bd 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/ia64.sgml
+++ b/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
index 43afccf143..43afccf143 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/ia64/index.sgml
+++ b/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
index c76aff6fc3..c76aff6fc3 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/ia64/machines.sgml
+++ b/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
index 9d28ee6a89..9d28ee6a89 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/ia64/refs.sgml
+++ b/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
index dcc0239aaa..dcc0239aaa 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/ia64/todo.sgml
+++ b/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
index fba5bb06e3..fba5bb06e3 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/index.sgml
+++ b/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
index 0c56cca7b4..0c56cca7b4 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/mips.sgml
+++ b/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
index 6a4fc7a005..6a4fc7a005 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/pc98.sgml
+++ b/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
index d73b55c5d6..d73b55c5d6 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/ppc.sgml
+++ b/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
index 901fffc1f6..901fffc1f6 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/sparc.sgml
+++ b/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
index b85abc06a2..b85abc06a2 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/sun4v.sgml
+++ b/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
index 68571b0b10..68571b0b10 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/x86-64.sgml
+++ b/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
index 21c17c2b2d..21c17c2b2d 100644
--- a/fr_FR.ISO8859-1/htdocs/platforms/xbox.sgml
+++ b/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
index 95da54fcc1..95da54fcc1 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/acpi/index.sgml
+++ b/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
index 0a88b53a1c..0a88b53a1c 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/busdma/index.sgml
+++ b/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
index 49725e949b..49725e949b 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/c99/index.sgml
+++ b/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
index 700781a97b..700781a97b 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/cvsweb.sgml
+++ b/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
index 83a57a77f1..83a57a77f1 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/libh.sgml
+++ b/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
index d8fadf16e1..d8fadf16e1 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/mips/index.sgml
+++ b/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
index 22f47d5d00..22f47d5d00 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/newbies.sgml
+++ b/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
index 25a404de42..25a404de42 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/projects.sgml
+++ b/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
index 29fab4fd46..29fab4fd46 100644
--- a/fr_FR.ISO8859-1/htdocs/projects/updater.sgml
+++ b/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
index 91dcdf0941..91dcdf0941 100644
--- a/fr_FR.ISO8859-1/htdocs/prstats/index.sgml
+++ b/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
index 7532d17cf1..7532d17cf1 100644
--- a/fr_FR.ISO8859-1/htdocs/publish.sgml
+++ b/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
index 8f7b75c37b..8f7b75c37b 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/2.0/credits.sgml
+++ b/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
index 44b250eeb9..44b250eeb9 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/2.2.8R/notes.sgml
+++ b/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
index 72dc711aca..72dc711aca 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/3.1R/notes.sgml
+++ b/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
index b8bc6187bb..b8bc6187bb 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/3.2R/notes.sgml
+++ b/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
index ed632d58ac..ed632d58ac 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/3.3R/notes.sgml
+++ b/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
index ecbb14128e..ecbb14128e 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/3.4R/notes.sgml
+++ b/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
index e621711b78..e621711b78 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/3.5R/notes.sgml
+++ b/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
index 29ef8b9739..29ef8b9739 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.0R/announce.sgml
+++ b/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
index d3926a3bb0..d3926a3bb0 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.0R/errata.sgml
+++ b/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
index bd285369a3..bd285369a3 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.0R/notes.sgml
+++ b/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
index d894424d5a..d894424d5a 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.1.1R/errata.sgml
+++ b/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
index 917b002fbb..917b002fbb 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.1R/announce.sgml
+++ b/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
index e8dff773cd..e8dff773cd 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.1R/errata.sgml
+++ b/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
index 8c0900662e..8c0900662e 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.1R/notes.sgml
+++ b/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
index 2935d6a3bc..2935d6a3bc 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.2R/announce.sgml
+++ b/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
index 17db084643..17db084643 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.2R/errata.sgml
+++ b/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
index 2f3d2bcad0..2f3d2bcad0 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.2R/notes.sgml
+++ b/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
index f9dbbb6c3a..f9dbbb6c3a 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.3R/announce.sgml
+++ b/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
index 4f28f7ab8e..4f28f7ab8e 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.3R/errata.sgml
+++ b/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
index 7811092547..7811092547 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.3R/notes.sgml
+++ b/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
index 676024362b..676024362b 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.4R/announce.sgml
+++ b/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
index 419af2f58a..419af2f58a 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.5R/announce.sgml
+++ b/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
index ee34963f3f..ee34963f3f 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.5R/notes.sgml
+++ b/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
index f1b0607752..f1b0607752 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.6.2R/relnotes.sgml
+++ b/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
index add513c7ac..add513c7ac 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.6R/relnotes.sgml
+++ b/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
index fecfde6224..fecfde6224 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/4.7R/announce.sgml
+++ b/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
index d5a36a8e1d..d5a36a8e1d 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/5.0R/DP1/relnotes.sgml
+++ b/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
index 15d8f0229a..15d8f0229a 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/5.1R/installation.sgml
+++ b/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
index 8e1cdfa740..8e1cdfa740 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/5.1R/relnotes.sgml
+++ b/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
index 9049891e71..9049891e71 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/index.sgml
+++ b/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
index e296d7d8fb..e296d7d8fb 100644
--- a/fr_FR.ISO8859-1/htdocs/releases/snapshots.sgml
+++ b/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
index 1b0caf9ca9..1b0caf9ca9 100644
--- a/fr_FR.ISO8859-1/htdocs/releng/charter.sgml
+++ b/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
index 054dceb4a3..054dceb4a3 100644
--- a/fr_FR.ISO8859-1/htdocs/releng/index.sgml
+++ b/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
index 934829bc4c..934829bc4c 100644
--- a/fr_FR.ISO8859-1/htdocs/relnotes.sgml
+++ b/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
index c7eca765d8..c7eca765d8 100644
--- a/fr_FR.ISO8859-1/htdocs/search/search-mid.sgml
+++ b/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
index 6a5173e1e7..6a5173e1e7 100644
--- a/fr_FR.ISO8859-1/htdocs/search/search.sgml
+++ b/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
index 1b7a6c1e48..1b7a6c1e48 100644
--- a/fr_FR.ISO8859-1/htdocs/search/searchhints.sgml
+++ b/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
index 1b1fcdb440..1b1fcdb440 100644
--- a/fr_FR.ISO8859-1/htdocs/security/advisories.sgml
+++ b/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
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
index d9285d4121..d9285d4121 100644
--- a/fr_FR.ISO8859-1/htdocs/send-pr.sgml
+++ b/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
index 1785e1684f..1785e1684f 100644
--- a/fr_FR.ISO8859-1/htdocs/snapshots/index.sgml
+++ b/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
index 0c7fa238b4..0c7fa238b4 100644
--- a/fr_FR.ISO8859-1/htdocs/support.sgml
+++ b/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
index ce6a0272c8..ce6a0272c8 100644
--- a/fr_FR.ISO8859-1/htdocs/support/bugreports.sgml
+++ b/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
index 054965bb60..054965bb60 100644
--- a/fr_FR.ISO8859-1/htdocs/support/webresources.sgml
+++ b/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
index 675a9555f3..675a9555f3 100644
--- a/fr_FR.ISO8859-1/htdocs/tutorials/index.sgml
+++ b/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
index 9c0dafd604..9c0dafd604 100644
--- a/fr_FR.ISO8859-1/htdocs/where.sgml
+++ b/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
index f3466691f5..f3466691f5 100644
--- a/fr_FR.ISO8859-1/share/sgml/copyright.sgml
+++ b/fr_FR.ISO8859-1/share/sgml/copyright.xml