aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsabell Long <issyl0@FreeBSD.org>2012-10-06 17:52:37 +0000
committerIsabell Long <issyl0@FreeBSD.org>2012-10-06 17:52:37 +0000
commit2be1e25fc2a430392e2b23bfca1c8f5403ac7096 (patch)
treea55219004cb3ecf9c074ef06153a73939e671398
parented974d372267a26a1fea12284ecc665607ad321b (diff)
downloaddoc-2be1e25fc2a430392e2b23bfca1c8f5403ac7096.tar.gz
doc-2be1e25fc2a430392e2b23bfca1c8f5403ac7096.zip
Replace 'SGML' with 'XML' in Makefile code and comments. A consequence of
this was that 'SGMLFLAGS' had to be changed to 'XMLFLAGS' in share/mk/doc.docbook.mk so that everything continued to build OK. Approved by: gabor (mentor)
Notes
Notes: svn path=/head/; revision=39665
-rw-r--r--bn_BD.ISO10646-1/articles/explaining-bsd/Makefile2
-rw-r--r--da_DK.ISO8859-1/htdocs/Makefile2
-rw-r--r--de_DE.ISO8859-1/books/developers-handbook/Makefile4
-rw-r--r--de_DE.ISO8859-1/books/faq/Makefile4
-rw-r--r--de_DE.ISO8859-1/books/fdp-primer/Makefile4
-rw-r--r--de_DE.ISO8859-1/books/handbook/Makefile8
-rw-r--r--de_DE.ISO8859-1/books/porters-handbook/Makefile4
-rw-r--r--de_DE.ISO8859-1/htdocs/Makefile4
-rw-r--r--el_GR.ISO8859-7/articles/mailing-list-faq/Makefile4
-rw-r--r--el_GR.ISO8859-7/books/faq/Makefile4
-rw-r--r--el_GR.ISO8859-7/books/handbook/Makefile8
-rw-r--r--el_GR.ISO8859-7/htdocs/Makefile2
-rw-r--r--en_US.ISO8859-1/articles/mailing-list-faq/Makefile4
-rw-r--r--en_US.ISO8859-1/books/arch-handbook/Makefile4
-rw-r--r--en_US.ISO8859-1/books/bibliography/Makefile4
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/Makefile4
-rw-r--r--en_US.ISO8859-1/books/faq/Makefile4
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/Makefile4
-rw-r--r--en_US.ISO8859-1/books/handbook/Makefile8
-rw-r--r--en_US.ISO8859-1/books/pmake/Makefile6
-rw-r--r--en_US.ISO8859-1/books/porters-handbook/Makefile4
-rw-r--r--en_US.ISO8859-1/htdocs/Makefile4
-rw-r--r--es_ES.ISO8859-1/articles/explaining-bsd/Makefile4
-rw-r--r--es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile2
-rw-r--r--es_ES.ISO8859-1/articles/mailing-list-faq/Makefile4
-rw-r--r--es_ES.ISO8859-1/books/faq/Makefile4
-rwxr-xr-xes_ES.ISO8859-1/books/handbook/Makefile6
-rw-r--r--es_ES.ISO8859-1/htdocs/Makefile2
-rw-r--r--fr_FR.ISO8859-1/articles/releng-packages/Makefile2
-rw-r--r--fr_FR.ISO8859-1/articles/releng/Makefile2
-rw-r--r--fr_FR.ISO8859-1/books/developers-handbook/Makefile4
-rw-r--r--fr_FR.ISO8859-1/books/faq/Makefile4
-rw-r--r--fr_FR.ISO8859-1/books/fdp-primer/Makefile4
-rw-r--r--fr_FR.ISO8859-1/books/handbook/Makefile8
-rw-r--r--fr_FR.ISO8859-1/books/porters-handbook/Makefile4
-rw-r--r--fr_FR.ISO8859-1/htdocs/Makefile2
-rw-r--r--hu_HU.ISO8859-2/books/faq/Makefile4
-rw-r--r--hu_HU.ISO8859-2/books/fdp-primer/Makefile4
-rw-r--r--hu_HU.ISO8859-2/books/handbook/Makefile8
-rw-r--r--hu_HU.ISO8859-2/htdocs/Makefile2
-rw-r--r--it_IT.ISO8859-15/books/handbook/Makefile8
-rw-r--r--it_IT.ISO8859-15/books/unix-introduction/Makefile4
-rw-r--r--it_IT.ISO8859-15/htdocs/Makefile2
-rw-r--r--ja_JP.eucJP/books/faq/Makefile4
-rw-r--r--ja_JP.eucJP/books/fdp-primer/Makefile4
-rw-r--r--ja_JP.eucJP/books/handbook/Makefile8
-rw-r--r--ja_JP.eucJP/books/porters-handbook/Makefile4
-rw-r--r--ja_JP.eucJP/htdocs/Makefile4
-rw-r--r--mn_MN.UTF-8/books/handbook/Makefile8
-rw-r--r--nl_NL.ISO8859-1/books/handbook/Makefile8
-rw-r--r--nl_NL.ISO8859-1/htdocs/Makefile2
-rw-r--r--pl_PL.ISO8859-2/books/handbook/Makefile8
-rw-r--r--pt_BR.ISO8859-1/books/faq/Makefile4
-rwxr-xr-xpt_BR.ISO8859-1/books/fdp-primer/Makefile4
-rw-r--r--pt_BR.ISO8859-1/books/handbook/Makefile6
-rw-r--r--pt_BR.ISO8859-1/htdocs/Makefile2
-rw-r--r--ru_RU.KOI8-R/articles/mailing-list-faq/Makefile4
-rw-r--r--ru_RU.KOI8-R/books/developers-handbook/Makefile4
-rw-r--r--ru_RU.KOI8-R/books/faq/Makefile4
-rw-r--r--ru_RU.KOI8-R/books/fdp-primer/Makefile4
-rw-r--r--ru_RU.KOI8-R/books/handbook/Makefile8
-rw-r--r--ru_RU.KOI8-R/books/porters-handbook/Makefile4
-rw-r--r--ru_RU.KOI8-R/htdocs/Makefile4
-rw-r--r--share/mk/doc.docbook.mk8
-rw-r--r--sr_YU.ISO8859-2/books/faq/Makefile4
-rw-r--r--tr_TR.ISO8859-9/htdocs/Makefile4
-rw-r--r--zh_CN.GB2312/books/arch-handbook/Makefile4
-rw-r--r--zh_CN.GB2312/books/handbook/Makefile8
-rw-r--r--zh_CN.GB2312/books/porters-handbook/Makefile4
-rw-r--r--zh_CN.GB2312/htdocs/Makefile4
-rw-r--r--zh_TW.Big5/articles/mailing-list-faq/Makefile4
-rw-r--r--zh_TW.Big5/books/developers-handbook/Makefile4
-rw-r--r--zh_TW.Big5/books/faq/Makefile4
-rw-r--r--zh_TW.Big5/books/fdp-primer/Makefile4
-rw-r--r--zh_TW.Big5/books/handbook/Makefile8
-rw-r--r--zh_TW.Big5/books/porters-handbook/Makefile4
-rw-r--r--zh_TW.Big5/htdocs/Makefile4
77 files changed, 173 insertions, 173 deletions
diff --git a/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile b/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile
index 815f5d9a8d..d83d4430f3 100644
--- a/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile
+++ b/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile
@@ -11,7 +11,7 @@ FORMATS?= html
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-# SGML content
+# XML content
SRCS= article.xml
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/da_DK.ISO8859-1/htdocs/Makefile b/da_DK.ISO8859-1/htdocs/Makefile
index ca4ae87349..105931eede 100644
--- a/da_DK.ISO8859-1/htdocs/Makefile
+++ b/da_DK.ISO8859-1/htdocs/Makefile
@@ -8,7 +8,7 @@
.endif
# Subdirectories
-# SGML
+# XML
.if !defined(WEB_ONLY) || empty(WEB_ONLY)
SUBDIR= doc
.endif
diff --git a/de_DE.ISO8859-1/books/developers-handbook/Makefile b/de_DE.ISO8859-1/books/developers-handbook/Makefile
index d95d600e9a..375e408711 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/Makefile
+++ b/de_DE.ISO8859-1/books/developers-handbook/Makefile
@@ -23,11 +23,11 @@ INSTALL_ONLY_COMPRESSED?=
IMAGES_EN= sockets/layers.eps sockets/sain.eps sockets/sainfill.eps sockets/sainlsb.eps sockets/sainmsb.eps sockets/sainserv.eps sockets/serv.eps sockets/serv2.eps sockets/slayers.eps
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= introduction/chapter.xml
SRCS+= ipv6/chapter.xml
diff --git a/de_DE.ISO8859-1/books/faq/Makefile b/de_DE.ISO8859-1/books/faq/Makefile
index ab4bd96f55..ab7732fd7e 100644
--- a/de_DE.ISO8859-1/books/faq/Makefile
+++ b/de_DE.ISO8859-1/books/faq/Makefile
@@ -20,11 +20,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_BIBLIOXREF_TITLE?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
URL_RELPREFIX?= ../../../..
diff --git a/de_DE.ISO8859-1/books/fdp-primer/Makefile b/de_DE.ISO8859-1/books/fdp-primer/Makefile
index e65b36fd2a..eab8b29286 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/Makefile
+++ b/de_DE.ISO8859-1/books/fdp-primer/Makefile
@@ -15,11 +15,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= overview/chapter.xml
SRCS+= psgml-mode/chapter.xml
diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index da7fdbe8f5..8d10125d59 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -224,11 +224,11 @@ IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= bsdinstall/chapter.xml
@@ -275,8 +275,8 @@ SRCS+= chapters.ent
# alle Kapitel bauen
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/de_DE.ISO8859-1/books/porters-handbook/Makefile b/de_DE.ISO8859-1/books/porters-handbook/Makefile
index 06df80a74d..82650b4629 100644
--- a/de_DE.ISO8859-1/books/porters-handbook/Makefile
+++ b/de_DE.ISO8859-1/books/porters-handbook/Makefile
@@ -15,11 +15,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
# Use the local DSSSL file
diff --git a/de_DE.ISO8859-1/htdocs/Makefile b/de_DE.ISO8859-1/htdocs/Makefile
index 8ac43c6614..994a4a20c8 100644
--- a/de_DE.ISO8859-1/htdocs/Makefile
+++ b/de_DE.ISO8859-1/htdocs/Makefile
@@ -36,7 +36,7 @@ DOCS+= where.xml
#DATA+= vendors.html
# Subdirectories
-# SGML
+# XML
SUBDIR= community
SUBDIR+= developers
SUBDIR+= docproj
@@ -61,7 +61,7 @@ SUBDIR+= doc
SUBDIR+= relnotes
.endif
-# Non-SGML
+# Non-XML
SUBDIR+= gifs
WEBDIR?= data/de
diff --git a/el_GR.ISO8859-7/articles/mailing-list-faq/Makefile b/el_GR.ISO8859-7/articles/mailing-list-faq/Makefile
index 998dcfc305..9219c6df86 100644
--- a/el_GR.ISO8859-7/articles/mailing-list-faq/Makefile
+++ b/el_GR.ISO8859-7/articles/mailing-list-faq/Makefile
@@ -16,11 +16,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_ARTICLE_TOC?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= article.xml
URL_RELPREFIX?= ../../../..
diff --git a/el_GR.ISO8859-7/books/faq/Makefile b/el_GR.ISO8859-7/books/faq/Makefile
index 88c4409936..22b1c3e369 100644
--- a/el_GR.ISO8859-7/books/faq/Makefile
+++ b/el_GR.ISO8859-7/books/faq/Makefile
@@ -19,11 +19,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_BIBLIOXREF_TITLE?=YES
#
-# Η λίστα SRCS περιέχει όλα τα SGML αρχεία που αποτελούν μέρη του κειμένου.
+# Η λίστα SRCS περιέχει όλα τα XML αρχεία που αποτελούν μέρη του κειμένου.
# Αλλαγές σε οποιοδήποτε από αυτά τα αρχεία προκαλούν rebuild.
#
-# SGML content
+# XML content
SRCS= book.xml
URL_RELPREFIX?= ../../../..
diff --git a/el_GR.ISO8859-7/books/handbook/Makefile b/el_GR.ISO8859-7/books/handbook/Makefile
index 0372086e1d..00b8ae191e 100644
--- a/el_GR.ISO8859-7/books/handbook/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/Makefile
@@ -246,11 +246,11 @@ IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
#
-# Η λίστα SRCS περιέχει όλα τα SGML αρχεία που αποτελούν μέρη του κειμένου.
+# Η λίστα SRCS περιέχει όλα τα XML αρχεία που αποτελούν μέρη του κειμένου.
# Αλλαγές σε οποιοδήποτε από αυτά τα αρχεία προκαλούν rebuild.
#
-# SGML content
+# XML content
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= bsdinstall/chapter.xml
@@ -299,8 +299,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/el_GR.ISO8859-7/htdocs/Makefile b/el_GR.ISO8859-7/htdocs/Makefile
index 07d422c49c..d3647c99f8 100644
--- a/el_GR.ISO8859-7/htdocs/Makefile
+++ b/el_GR.ISO8859-7/htdocs/Makefile
@@ -15,7 +15,7 @@
.endif
# Subdirectories
-# SGML
+# XML
SUBDIR= FAQ
.if !defined(WEB_ONLY) || empty(WEB_ONLY)
SUBDIR+= doc
diff --git a/en_US.ISO8859-1/articles/mailing-list-faq/Makefile b/en_US.ISO8859-1/articles/mailing-list-faq/Makefile
index 6412bc5980..53a873470a 100644
--- a/en_US.ISO8859-1/articles/mailing-list-faq/Makefile
+++ b/en_US.ISO8859-1/articles/mailing-list-faq/Makefile
@@ -13,11 +13,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_ARTICLE_TOC?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= article.xml
URL_RELPREFIX?= ../../../..
diff --git a/en_US.ISO8859-1/books/arch-handbook/Makefile b/en_US.ISO8859-1/books/arch-handbook/Makefile
index 7c1f296a6c..9ad49d0e62 100644
--- a/en_US.ISO8859-1/books/arch-handbook/Makefile
+++ b/en_US.ISO8859-1/books/arch-handbook/Makefile
@@ -16,11 +16,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= boot/chapter.xml
SRCS+= driverbasics/chapter.xml
diff --git a/en_US.ISO8859-1/books/bibliography/Makefile b/en_US.ISO8859-1/books/bibliography/Makefile
index c638bf7fff..3a4bb68350 100644
--- a/en_US.ISO8859-1/books/bibliography/Makefile
+++ b/en_US.ISO8859-1/books/bibliography/Makefile
@@ -13,11 +13,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/books/developers-handbook/Makefile b/en_US.ISO8859-1/books/developers-handbook/Makefile
index 436231ffd9..2d673e307e 100644
--- a/en_US.ISO8859-1/books/developers-handbook/Makefile
+++ b/en_US.ISO8859-1/books/developers-handbook/Makefile
@@ -19,11 +19,11 @@ INSTALL_ONLY_COMPRESSED?=
IMAGES_EN= sockets/layers.eps sockets/sain.eps sockets/sainfill.eps sockets/sainlsb.eps sockets/sainmsb.eps sockets/sainserv.eps sockets/serv.eps sockets/serv2.eps sockets/slayers.eps
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= introduction/chapter.xml
SRCS+= ipv6/chapter.xml
diff --git a/en_US.ISO8859-1/books/faq/Makefile b/en_US.ISO8859-1/books/faq/Makefile
index e2e7548a0a..cfea6ba431 100644
--- a/en_US.ISO8859-1/books/faq/Makefile
+++ b/en_US.ISO8859-1/books/faq/Makefile
@@ -16,11 +16,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_BIBLIOXREF_TITLE?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
URL_RELPREFIX?= ../../../..
diff --git a/en_US.ISO8859-1/books/fdp-primer/Makefile b/en_US.ISO8859-1/books/fdp-primer/Makefile
index 7e7f024e08..60eaeea096 100644
--- a/en_US.ISO8859-1/books/fdp-primer/Makefile
+++ b/en_US.ISO8859-1/books/fdp-primer/Makefile
@@ -14,11 +14,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= overview/chapter.xml
SRCS+= psgml-mode/chapter.xml
diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index c95d4c46b8..d90bc2b9fd 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -243,11 +243,11 @@ IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= bsdinstall/chapter.xml
@@ -296,8 +296,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${XMLDECL} ${MASTERDOC}
diff --git a/en_US.ISO8859-1/books/pmake/Makefile b/en_US.ISO8859-1/books/pmake/Makefile
index c1c4e60a94..0c7297d2be 100644
--- a/en_US.ISO8859-1/books/pmake/Makefile
+++ b/en_US.ISO8859-1/books/pmake/Makefile
@@ -1,7 +1,7 @@
#
# $FreeBSD$
#
-# This is an SGML version of the pmake tutorial by Adam de Boor that is
+# This is an XML version of the pmake tutorial by Adam de Boor that is
# also part of the src/share/doc/psd collection of docs.
#
@@ -12,10 +12,10 @@ FORMATS?= html-split
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-# SRCS lists the individual SGML files that make up the document.
+# SRCS lists the individual XML files that make up the document.
# Changes to any of these files will force a rebuild.
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= answers/chapter.xml
SRCS+= basics/chapter.xml
diff --git a/en_US.ISO8859-1/books/porters-handbook/Makefile b/en_US.ISO8859-1/books/porters-handbook/Makefile
index e90f27f118..4fe2d4775d 100644
--- a/en_US.ISO8859-1/books/porters-handbook/Makefile
+++ b/en_US.ISO8859-1/books/porters-handbook/Makefile
@@ -14,11 +14,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
# Use the local DSSSL file
diff --git a/en_US.ISO8859-1/htdocs/Makefile b/en_US.ISO8859-1/htdocs/Makefile
index ee360af9d6..f8769da01c 100644
--- a/en_US.ISO8859-1/htdocs/Makefile
+++ b/en_US.ISO8859-1/htdocs/Makefile
@@ -46,7 +46,7 @@ DATA+= robots.txt
DATA+= vendors.html
# Subdirectories
-# SGML
+# XML
SUBDIR= FAQ
SUBDIR+= advocacy
SUBDIR+= commercial
@@ -84,7 +84,7 @@ SUBDIR+= ports
SUBDIR+= relnotes
.endif
-# Non-SGML
+# Non-XML
SUBDIR+= cgi
SUBDIR+= gifs
SUBDIR+= layout
diff --git a/es_ES.ISO8859-1/articles/explaining-bsd/Makefile b/es_ES.ISO8859-1/articles/explaining-bsd/Makefile
index de52273f00..154240807d 100644
--- a/es_ES.ISO8859-1/articles/explaining-bsd/Makefile
+++ b/es_ES.ISO8859-1/articles/explaining-bsd/Makefile
@@ -13,12 +13,12 @@ WITH_ARTICLE_TOC?=YES
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-# SRCS incluye todos y cada uno de los ficheros SGML que conforman el
+# SRCS incluye todos y cada uno de los ficheros XML que conforman el
# documento. Cualquier cambio en cualquiera de ellos implica volver a
# generar el documento.
#
-# SGML content
+# XML content
SRCS= article.xml
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile b/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile
index 849ccd3ff9..6a579af189 100644
--- a/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile
+++ b/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile
@@ -15,7 +15,7 @@ INSTALL_ONLY_COMPRESSED?=
#
WITH_ARTICLE_TOC?=YES
-# SGML content
+# XML content
SRCS= article.xml fase_1.sh fase_2.sh fase_3.mk
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile b/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile
index 8ccd93beec..6b5c81bcb3 100644
--- a/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile
+++ b/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile
@@ -15,11 +15,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_ARTICLE_TOC?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= article.xml
URL_RELPREFIX?= ../../../..
diff --git a/es_ES.ISO8859-1/books/faq/Makefile b/es_ES.ISO8859-1/books/faq/Makefile
index 9785978664..0290c60668 100644
--- a/es_ES.ISO8859-1/books/faq/Makefile
+++ b/es_ES.ISO8859-1/books/faq/Makefile
@@ -14,11 +14,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/es_ES.ISO8859-1/books/handbook/Makefile b/es_ES.ISO8859-1/books/handbook/Makefile
index 397a8d5803..4b13f0b455 100755
--- a/es_ES.ISO8859-1/books/handbook/Makefile
+++ b/es_ES.ISO8859-1/books/handbook/Makefile
@@ -151,11 +151,11 @@ IMAGES_LIB+= callouts/9.png
IMAGES_LIB+= callouts/10.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= colophon.xml
@@ -201,7 +201,7 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/es_ES.ISO8859-1/htdocs/Makefile b/es_ES.ISO8859-1/htdocs/Makefile
index 8295f22913..8c04ae54bd 100644
--- a/es_ES.ISO8859-1/htdocs/Makefile
+++ b/es_ES.ISO8859-1/htdocs/Makefile
@@ -25,7 +25,7 @@ DOCS+= where.xml
CLEANFILES+=atoz.xml site.xml
# Subdirectories
-# SGML
+# XML
SUBDIR= security
SUBDIR+= docproj
SUBDIR+= news
diff --git a/fr_FR.ISO8859-1/articles/releng-packages/Makefile b/fr_FR.ISO8859-1/articles/releng-packages/Makefile
index da204fd84a..a78b18c28e 100644
--- a/fr_FR.ISO8859-1/articles/releng-packages/Makefile
+++ b/fr_FR.ISO8859-1/articles/releng-packages/Makefile
@@ -15,7 +15,7 @@ FORMATS?= html
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-# SGML content
+# XML content
SRCS= article.xml
CSS_SHEET_ADDITIONS= extra.css
diff --git a/fr_FR.ISO8859-1/articles/releng/Makefile b/fr_FR.ISO8859-1/articles/releng/Makefile
index 580803f8b9..96ff38019f 100644
--- a/fr_FR.ISO8859-1/articles/releng/Makefile
+++ b/fr_FR.ISO8859-1/articles/releng/Makefile
@@ -17,7 +17,7 @@ INSTALL_ONLY_COMPRESSED?=
JADEFLAGS+= -V %generate-article-toc%
-# SGML content
+# XML content
SRCS= article.xml branches.ascii
# IMAGES
diff --git a/fr_FR.ISO8859-1/books/developers-handbook/Makefile b/fr_FR.ISO8859-1/books/developers-handbook/Makefile
index b38ea8f908..db3f39712d 100644
--- a/fr_FR.ISO8859-1/books/developers-handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/developers-handbook/Makefile
@@ -21,11 +21,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
# Entities
diff --git a/fr_FR.ISO8859-1/books/faq/Makefile b/fr_FR.ISO8859-1/books/faq/Makefile
index a099596a95..60f422df93 100644
--- a/fr_FR.ISO8859-1/books/faq/Makefile
+++ b/fr_FR.ISO8859-1/books/faq/Makefile
@@ -17,11 +17,11 @@ INSTALL_ONLY_COMPRESSED?=
JADEFLAGS+=-Vbiblio-xref-title
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/fr_FR.ISO8859-1/books/fdp-primer/Makefile b/fr_FR.ISO8859-1/books/fdp-primer/Makefile
index 0bbf90cf22..3b239076d3 100644
--- a/fr_FR.ISO8859-1/books/fdp-primer/Makefile
+++ b/fr_FR.ISO8859-1/books/fdp-primer/Makefile
@@ -18,11 +18,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= overview/chapter.xml
SRCS+= psgml-mode/chapter.xml
diff --git a/fr_FR.ISO8859-1/books/handbook/Makefile b/fr_FR.ISO8859-1/books/handbook/Makefile
index ed494b737b..c686b96a12 100644
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@@ -177,11 +177,11 @@ IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= colophon.xml
@@ -228,8 +228,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/fr_FR.ISO8859-1/books/porters-handbook/Makefile b/fr_FR.ISO8859-1/books/porters-handbook/Makefile
index d82ba2816d..ce788f016c 100644
--- a/fr_FR.ISO8859-1/books/porters-handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/porters-handbook/Makefile
@@ -15,11 +15,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
# Use the local DSSSL file
diff --git a/fr_FR.ISO8859-1/htdocs/Makefile b/fr_FR.ISO8859-1/htdocs/Makefile
index 3e0c79a989..641bf6809f 100644
--- a/fr_FR.ISO8859-1/htdocs/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/Makefile
@@ -37,7 +37,7 @@ DATA+= freebsd.css
DATA+= vendors.html
# Subdirectories
-# SGML
+# XML
SUBDIR= security
SUBDIR+= commercial
SUBDIR+= community
diff --git a/hu_HU.ISO8859-2/books/faq/Makefile b/hu_HU.ISO8859-2/books/faq/Makefile
index 232f5b447d..ee9666705e 100644
--- a/hu_HU.ISO8859-2/books/faq/Makefile
+++ b/hu_HU.ISO8859-2/books/faq/Makefile
@@ -20,11 +20,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_BIBLIOXREF_TITLE?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
URL_RELPREFIX?= ../../../..
diff --git a/hu_HU.ISO8859-2/books/fdp-primer/Makefile b/hu_HU.ISO8859-2/books/fdp-primer/Makefile
index bdc300ffed..760d0fc5c8 100644
--- a/hu_HU.ISO8859-2/books/fdp-primer/Makefile
+++ b/hu_HU.ISO8859-2/books/fdp-primer/Makefile
@@ -19,11 +19,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= overview/chapter.xml
SRCS+= psgml-mode/chapter.xml
diff --git a/hu_HU.ISO8859-2/books/handbook/Makefile b/hu_HU.ISO8859-2/books/handbook/Makefile
index 2ac5df9bd8..00a705f322 100644
--- a/hu_HU.ISO8859-2/books/handbook/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/Makefile
@@ -209,11 +209,11 @@ IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= colophon.xml
@@ -261,8 +261,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/hu_HU.ISO8859-2/htdocs/Makefile b/hu_HU.ISO8859-2/htdocs/Makefile
index ce650b040b..c128d33051 100644
--- a/hu_HU.ISO8859-2/htdocs/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/Makefile
@@ -27,7 +27,7 @@ DOCS+= support.xml
DOCS+= where.xml
# Subdirectories
-# SGML
+# XML
SUBDIR+= advocacy
SUBDIR+= community
SUBDIR+= copyright
diff --git a/it_IT.ISO8859-15/books/handbook/Makefile b/it_IT.ISO8859-15/books/handbook/Makefile
index 3f44821085..cdb9231eca 100644
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@@ -179,11 +179,11 @@ IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
#
-# SRCS lista i singoli files SGML che compongono il documento. Modifiche
+# SRCS lista i singoli files XML che compongono il documento. Modifiche
# a qualunque di questi files obbligano la ricreazione
#
-# Contenuto SGML
+# Contenuto XML
SRCS = book.xml
SRCS+= colophon.xml
SRCS+= advanced-networking/chapter.xml
@@ -229,8 +229,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Attiva tutti i capitoli.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/it_IT.ISO8859-15/books/unix-introduction/Makefile b/it_IT.ISO8859-15/books/unix-introduction/Makefile
index 1aa021cfad..76cb3e1b17 100644
--- a/it_IT.ISO8859-15/books/unix-introduction/Makefile
+++ b/it_IT.ISO8859-15/books/unix-introduction/Makefile
@@ -14,11 +14,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lista i singoli files SGML che compongono il documento. Modifiche
+# SRCS lista i singoli files XML che compongono il documento. Modifiche
# a qualunque di questi files obbligano la ricreazione
#
-# Contenuto SGML
+# Contenuto XML
SRCS = book.xml
SRCS+= bibliography/chapter.xml
SRCS+= command-summary/chapter.xml
diff --git a/it_IT.ISO8859-15/htdocs/Makefile b/it_IT.ISO8859-15/htdocs/Makefile
index a77e0743ef..c51b5e1aaa 100644
--- a/it_IT.ISO8859-15/htdocs/Makefile
+++ b/it_IT.ISO8859-15/htdocs/Makefile
@@ -24,7 +24,7 @@ DEPENDSET.usergroups=transtable usergroups
PARAMS.usergroups= --param pagename "'FreeBSD User Groups'"
# Subdirectories
-# SGML
+# XML
SUBDIR= copyright
SUBDIR+= docs
SUBDIR+= platforms
diff --git a/ja_JP.eucJP/books/faq/Makefile b/ja_JP.eucJP/books/faq/Makefile
index 4134fea3b3..404cc2254e 100644
--- a/ja_JP.eucJP/books/faq/Makefile
+++ b/ja_JP.eucJP/books/faq/Makefile
@@ -18,11 +18,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_BIBLIOXREF_TITLE?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/ja_JP.eucJP/books/fdp-primer/Makefile b/ja_JP.eucJP/books/fdp-primer/Makefile
index f0ce50515d..5eae709ae5 100644
--- a/ja_JP.eucJP/books/fdp-primer/Makefile
+++ b/ja_JP.eucJP/books/fdp-primer/Makefile
@@ -16,11 +16,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= overview/chapter.xml
SRCS+= psgml-mode/chapter.xml
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index 3e390930ea..72dfc94960 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -244,11 +244,11 @@ IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
#SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= bsdinstall/chapter.xml
@@ -301,8 +301,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/ja_JP.eucJP/books/porters-handbook/Makefile b/ja_JP.eucJP/books/porters-handbook/Makefile
index bc8d220752..5b43c3b471 100644
--- a/ja_JP.eucJP/books/porters-handbook/Makefile
+++ b/ja_JP.eucJP/books/porters-handbook/Makefile
@@ -15,11 +15,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
# Use the local DSSSL file
diff --git a/ja_JP.eucJP/htdocs/Makefile b/ja_JP.eucJP/htdocs/Makefile
index b071fbfaf8..9d80679c06 100644
--- a/ja_JP.eucJP/htdocs/Makefile
+++ b/ja_JP.eucJP/htdocs/Makefile
@@ -50,7 +50,7 @@ DATA+= freebsd.css
#DATA+= vendors.html
# Subdirectories
-# SGML
+# XML
SUBDIR= FAQ
#SUBDIR+= advocacy
SUBDIR+= commercial
@@ -91,7 +91,7 @@ SUBDIR+= ports
# SUBDIR+= relnotes
.endif
-# Non-SGML
+# Non-XML
#SUBDIR+= cgi
#SUBDIR+= gifs
#SUBDIR+= layout
diff --git a/mn_MN.UTF-8/books/handbook/Makefile b/mn_MN.UTF-8/books/handbook/Makefile
index a231aeb032..040fab1286 100644
--- a/mn_MN.UTF-8/books/handbook/Makefile
+++ b/mn_MN.UTF-8/books/handbook/Makefile
@@ -246,11 +246,11 @@ IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= bsdinstall/chapter.xml
@@ -299,8 +299,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/nl_NL.ISO8859-1/books/handbook/Makefile b/nl_NL.ISO8859-1/books/handbook/Makefile
index c83efce5cb..7808d2a973 100644
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@@ -246,11 +246,11 @@ IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
#
-# SRCS-lijsten van de individuele SGML-bestanden die het document vormen.
+# SRCS-lijsten van de individuele XML-bestanden die het document vormen.
# Veranderingen aan een van deze bestanden zal een nieuwe build afdwingen
#
-# SGML-inhoud
+# XML-inhoud
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= bsdinstall/chapter.xml
@@ -299,8 +299,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Neem alle hoofdstukken mee.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${XMLDECL} ${MASTERDOC}
diff --git a/nl_NL.ISO8859-1/htdocs/Makefile b/nl_NL.ISO8859-1/htdocs/Makefile
index 3fa404cefd..4e6bb5d704 100644
--- a/nl_NL.ISO8859-1/htdocs/Makefile
+++ b/nl_NL.ISO8859-1/htdocs/Makefile
@@ -48,7 +48,7 @@ DEPENDSET.community=usergroups events
DATA+= vendors.html
# Subdirectories
-# SGML
+# XML
#SUBDIR= FAQ
#SUBDIR+= advocacy
#SUBDIR+= commercial
diff --git a/pl_PL.ISO8859-2/books/handbook/Makefile b/pl_PL.ISO8859-2/books/handbook/Makefile
index 4a3ad49426..8dab766f92 100644
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@@ -149,11 +149,11 @@ IMAGES_LIB+= callouts/9.png
IMAGES_LIB+= callouts/10.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= colophon.xml
@@ -197,8 +197,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/pt_BR.ISO8859-1/books/faq/Makefile b/pt_BR.ISO8859-1/books/faq/Makefile
index 519a6a583c..eaad518875 100644
--- a/pt_BR.ISO8859-1/books/faq/Makefile
+++ b/pt_BR.ISO8859-1/books/faq/Makefile
@@ -21,11 +21,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_BIBLIOXREF_TITLE?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/pt_BR.ISO8859-1/books/fdp-primer/Makefile b/pt_BR.ISO8859-1/books/fdp-primer/Makefile
index 714803341b..0a8344590f 100755
--- a/pt_BR.ISO8859-1/books/fdp-primer/Makefile
+++ b/pt_BR.ISO8859-1/books/fdp-primer/Makefile
@@ -17,11 +17,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= overview/chapter.xml
SRCS+= psgml-mode/chapter.xml
diff --git a/pt_BR.ISO8859-1/books/handbook/Makefile b/pt_BR.ISO8859-1/books/handbook/Makefile
index 5e80d94636..eec5933db2 100644
--- a/pt_BR.ISO8859-1/books/handbook/Makefile
+++ b/pt_BR.ISO8859-1/books/handbook/Makefile
@@ -112,11 +112,11 @@ INSTALL_ONLY_COMPRESSED?=
#IMAGES_LIB+= callouts/5.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= advanced-networking/chapter.xml
SRCS+= basics/chapter.xml
@@ -152,7 +152,7 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/pt_BR.ISO8859-1/htdocs/Makefile b/pt_BR.ISO8859-1/htdocs/Makefile
index 0c24b9d865..e224614537 100644
--- a/pt_BR.ISO8859-1/htdocs/Makefile
+++ b/pt_BR.ISO8859-1/htdocs/Makefile
@@ -13,7 +13,7 @@
.endif
# Subdirectories
-# SGML
+# XML
SUBDIR+= FAQ
.if !defined(WEB_ONLY) || empty(WEB_ONLY)
diff --git a/ru_RU.KOI8-R/articles/mailing-list-faq/Makefile b/ru_RU.KOI8-R/articles/mailing-list-faq/Makefile
index b0cd2b0c64..d51bed8d0e 100644
--- a/ru_RU.KOI8-R/articles/mailing-list-faq/Makefile
+++ b/ru_RU.KOI8-R/articles/mailing-list-faq/Makefile
@@ -18,11 +18,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_ARTICLE_TOC?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= article.xml
URL_RELPREFIX?= ../../../..
diff --git a/ru_RU.KOI8-R/books/developers-handbook/Makefile b/ru_RU.KOI8-R/books/developers-handbook/Makefile
index ef18349463..1fa6b0331c 100644
--- a/ru_RU.KOI8-R/books/developers-handbook/Makefile
+++ b/ru_RU.KOI8-R/books/developers-handbook/Makefile
@@ -24,11 +24,11 @@ INSTALL_ONLY_COMPRESSED?=
IMAGES_EN = sockets/layers.eps sockets/sain.eps sockets/sainfill.eps sockets/sainlsb.eps sockets/sainmsb.eps sockets/sainserv.eps sockets/serv.eps sockets/serv2.eps sockets/slayers.eps
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= dma/chapter.xml
SRCS+= introduction/chapter.xml
diff --git a/ru_RU.KOI8-R/books/faq/Makefile b/ru_RU.KOI8-R/books/faq/Makefile
index c99d18a86c..b53ad64917 100644
--- a/ru_RU.KOI8-R/books/faq/Makefile
+++ b/ru_RU.KOI8-R/books/faq/Makefile
@@ -21,11 +21,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_BIBLIOXREF_TITLE?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
URL_RELPREFIX?= ../../../..
diff --git a/ru_RU.KOI8-R/books/fdp-primer/Makefile b/ru_RU.KOI8-R/books/fdp-primer/Makefile
index bee02179ad..1a724aaa8f 100644
--- a/ru_RU.KOI8-R/books/fdp-primer/Makefile
+++ b/ru_RU.KOI8-R/books/fdp-primer/Makefile
@@ -19,11 +19,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= overview/chapter.xml
SRCS+= psgml-mode/chapter.xml
diff --git a/ru_RU.KOI8-R/books/handbook/Makefile b/ru_RU.KOI8-R/books/handbook/Makefile
index 52bdb32c5c..af2c69dc35 100644
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@@ -156,11 +156,11 @@ IMAGES_LIB+= callouts/9.png
IMAGES_LIB+= callouts/10.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= colophon.xml
@@ -205,8 +205,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/ru_RU.KOI8-R/books/porters-handbook/Makefile b/ru_RU.KOI8-R/books/porters-handbook/Makefile
index 735afce33d..1dbd9c19ad 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/Makefile
+++ b/ru_RU.KOI8-R/books/porters-handbook/Makefile
@@ -21,11 +21,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
# Entities
diff --git a/ru_RU.KOI8-R/htdocs/Makefile b/ru_RU.KOI8-R/htdocs/Makefile
index 8442d8f8e5..b3b75870b7 100644
--- a/ru_RU.KOI8-R/htdocs/Makefile
+++ b/ru_RU.KOI8-R/htdocs/Makefile
@@ -52,7 +52,7 @@ DEPENDSET.community=usergroups events
#DATA+= vendors.html
# Subdirectories
-# SGML
+# XML
SUBDIR= FAQ
#SUBDIR+= advocacy
SUBDIR+= commercial
@@ -89,7 +89,7 @@ SUBDIR+= ports
#SUBDIR+= relnotes
.endif
-# Non-SGML
+# Non-XML
#SUBDIR+= cgi
#SUBDIR+= gifs
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 4669dff66e..b36258c9e5 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -31,7 +31,7 @@
#
# Variables used by both users and documents:
#
-# SGMLFLAGS Additional options to pass to various SGML
+# XMLFLAGS Additional options to pass to various XML
# processors (e.g., jade, nsgmls). Typically
# used to define "IGNORE" entities to "INCLUDE"
# with "-i<entity-name>"
@@ -44,7 +44,7 @@
# used to set "-raw" flag to handle 8bit characters.
#
# EXTRA_CATALOGS Additional catalog files that should be used by
-# any SGML processing applications.
+# any XML processing applications.
#
# NO_TIDY If you do not want to use tidy, set this to "YES".
#
@@ -176,8 +176,8 @@ IMAGES_LIB?=
CATALOGS+= -c ${c}
.endif
.endfor
-SGMLFLAGS+= -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
-JADEOPTS= ${JADEFLAGS} ${SGMLFLAGS} ${CATALOGS}
+XMLFLAGS+= -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR}
+JADEOPTS= ${JADEFLAGS} ${XMLFLAGS} ${CATALOGS}
XSLTPROCOPTS= ${XSLTPROCFLAGS}
KNOWN_FORMATS= html html.tar html-split html-split.tar \
diff --git a/sr_YU.ISO8859-2/books/faq/Makefile b/sr_YU.ISO8859-2/books/faq/Makefile
index 4615625902..e3254ccf1a 100644
--- a/sr_YU.ISO8859-2/books/faq/Makefile
+++ b/sr_YU.ISO8859-2/books/faq/Makefile
@@ -13,11 +13,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/tr_TR.ISO8859-9/htdocs/Makefile b/tr_TR.ISO8859-9/htdocs/Makefile
index df5cf8ccda..9304602607 100644
--- a/tr_TR.ISO8859-9/htdocs/Makefile
+++ b/tr_TR.ISO8859-9/htdocs/Makefile
@@ -27,7 +27,7 @@ DEPENDSET.index=transtable mirrors news press events \
#DATA+= vendors.html
# Subdirectories
-# SGML
+# XML
#SUBDIR= security
#SUBDIR+= commercial
#SUBDIR+= docproj
@@ -62,7 +62,7 @@ SUBDIR= doc
#SUBDIR+= tutorials
#.endif
-# Non-SGML
+# Non-XML
#SUBDIR+= gifs
#SUBDIR+= cgi
diff --git a/zh_CN.GB2312/books/arch-handbook/Makefile b/zh_CN.GB2312/books/arch-handbook/Makefile
index a59182bcc6..84eab680a2 100644
--- a/zh_CN.GB2312/books/arch-handbook/Makefile
+++ b/zh_CN.GB2312/books/arch-handbook/Makefile
@@ -17,11 +17,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= boot/chapter.xml
SRCS+= driverbasics/chapter.xml
diff --git a/zh_CN.GB2312/books/handbook/Makefile b/zh_CN.GB2312/books/handbook/Makefile
index f2eaba6091..1e23793554 100644
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@@ -199,11 +199,11 @@ IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= colophon.xml
@@ -251,8 +251,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/zh_CN.GB2312/books/porters-handbook/Makefile b/zh_CN.GB2312/books/porters-handbook/Makefile
index 6e196aae86..a565d9c5e0 100644
--- a/zh_CN.GB2312/books/porters-handbook/Makefile
+++ b/zh_CN.GB2312/books/porters-handbook/Makefile
@@ -18,11 +18,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
# Use the local DSSSL file
diff --git a/zh_CN.GB2312/htdocs/Makefile b/zh_CN.GB2312/htdocs/Makefile
index 4a47527202..c160afc4ba 100644
--- a/zh_CN.GB2312/htdocs/Makefile
+++ b/zh_CN.GB2312/htdocs/Makefile
@@ -35,7 +35,7 @@ DEPENDSET.usergroups=transtable usergroups
PARAMS.usergroups= --param pagename "'FreeBSD User Groups'"
# Subdirectories
-# SGML
+# XML
# SUBDIR= FAQ
SUBDIR+= advocacy
# SUBDIR+= commercial
@@ -73,7 +73,7 @@ SUBDIR+= doc
# SUBDIR+= relnotes
# .endif
-# # Non-SGML
+# # Non-XML
# SUBDIR+= cgi
# SUBDIR+= gifs
SUBDIR+= layout
diff --git a/zh_TW.Big5/articles/mailing-list-faq/Makefile b/zh_TW.Big5/articles/mailing-list-faq/Makefile
index 6412bc5980..53a873470a 100644
--- a/zh_TW.Big5/articles/mailing-list-faq/Makefile
+++ b/zh_TW.Big5/articles/mailing-list-faq/Makefile
@@ -13,11 +13,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_ARTICLE_TOC?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= article.xml
URL_RELPREFIX?= ../../../..
diff --git a/zh_TW.Big5/books/developers-handbook/Makefile b/zh_TW.Big5/books/developers-handbook/Makefile
index c3883908f4..8fa12fe44a 100644
--- a/zh_TW.Big5/books/developers-handbook/Makefile
+++ b/zh_TW.Big5/books/developers-handbook/Makefile
@@ -19,11 +19,11 @@ INSTALL_ONLY_COMPRESSED?=
IMAGES_EN= sockets/layers.eps sockets/sain.eps sockets/sainfill.eps sockets/sainlsb.eps sockets/sainmsb.eps sockets/sainserv.eps sockets/serv.eps sockets/serv2.eps sockets/slayers.eps
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= introduction/chapter.xml
SRCS+= ipv6/chapter.xml
diff --git a/zh_TW.Big5/books/faq/Makefile b/zh_TW.Big5/books/faq/Makefile
index 2f239c0c0b..7ff38e9d1b 100644
--- a/zh_TW.Big5/books/faq/Makefile
+++ b/zh_TW.Big5/books/faq/Makefile
@@ -16,11 +16,11 @@ INSTALL_ONLY_COMPRESSED?=
WITH_BIBLIOXREF_TITLE?=YES
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/zh_TW.Big5/books/fdp-primer/Makefile b/zh_TW.Big5/books/fdp-primer/Makefile
index 7e7f024e08..60eaeea096 100644
--- a/zh_TW.Big5/books/fdp-primer/Makefile
+++ b/zh_TW.Big5/books/fdp-primer/Makefile
@@ -14,11 +14,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
SRCS+= overview/chapter.xml
SRCS+= psgml-mode/chapter.xml
diff --git a/zh_TW.Big5/books/handbook/Makefile b/zh_TW.Big5/books/handbook/Makefile
index 10639b23bb..c7a3585dc2 100644
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@@ -191,11 +191,11 @@ IMAGES_LIB+= callouts/14.png
IMAGES_LIB+= callouts/15.png
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS+= audit/chapter.xml
SRCS+= book.xml
SRCS+= colophon.xml
@@ -241,8 +241,8 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
# Turn on all the chapters.
CHAPTERS?= ${SRCS:M*chapter.xml}
-SGMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
-SGMLFLAGS+= -i chap.freebsd-glossary
+XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
+XMLFLAGS+= -i chap.freebsd-glossary
pgpkeyring: pgpkeys/chapter.xml
@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
diff --git a/zh_TW.Big5/books/porters-handbook/Makefile b/zh_TW.Big5/books/porters-handbook/Makefile
index 241674c462..7d3466c14b 100644
--- a/zh_TW.Big5/books/porters-handbook/Makefile
+++ b/zh_TW.Big5/books/porters-handbook/Makefile
@@ -14,11 +14,11 @@ INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
-# SRCS lists the individual SGML files that make up the document. Changes
+# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
-# SGML content
+# XML content
SRCS= book.xml
# Use the local DSSSL file
diff --git a/zh_TW.Big5/htdocs/Makefile b/zh_TW.Big5/htdocs/Makefile
index c014d18c12..c72632c846 100644
--- a/zh_TW.Big5/htdocs/Makefile
+++ b/zh_TW.Big5/htdocs/Makefile
@@ -30,14 +30,14 @@ DOCS+= where.xml
#PARAMS.usergroups= --param pagename "'FreeBSD User Groups'"
# Subdirectories
-# SGML
+# XML
SUBDIR+= docs
.if !defined(WEB_ONLY) || empty(WEB_ONLY)
SUBDIR+= doc
.endif
-# Non-SGML
+# Non-XML
SUBDIR+= layout
WEBDIR?= data/zh_TW