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)

8 files changed, 19 insertions, 19 deletions

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