- Rename .sgml files to .xml

- Reflect the rename in referencing files Approved by: doceng (implicit)
author: Gabor Kovesdan <gabor@FreeBSD.org> 2012-10-01 09:53:01 +0000
committer: Gabor Kovesdan <gabor@FreeBSD.org> 2012-10-01 09:53:01 +0000
commit: b4346b9b2dfe86a97907573086dff096850dcb1d (patch)
tree: 9b951977cbd22dada9b868ac83b1d56791ea3859 /share
parent: bee5d224febbeba11356aa848006a4f5f9e24b30 (diff)
10 files changed, 21 insertions, 38 deletions
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index d9f76f0dc5..644b7394f9 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -13,13 +13,11 @@
 # Document-specific variables
 #
 #	DOC		This should be set to the name of the DocBook
-#			marked-up file, without the .sgml suffix.
+#			marked-up file, without the .xml suffix.
 #			
 #			It also determins the name of the output files -
 #			${DOC}.html.
 #
-#	DOCBOOKSUFFIX	The suffix of your document, defaulting to .sgml
-#
 #	SRCS		The names of all the files that are needed to
 #			build this document - This is useful if any of
 #			them need to be generated.  Changing any file in
@@ -51,9 +49,9 @@
 #	NO_TIDY		If you do not want to use tidy, set this to "YES".
 #
 #       GEN_INDEX       If this document has an index (HAS_INDEX) and this
-#                       variable is defined, then index.sgml will be added 
+#                       variable is defined, then index.xml will be added 
 #                       to the list of dependencies for source files, and 
-#                       collateindex.pl will be run to generate index.sgml.
+#                       collateindex.pl will be run to generate index.xml.
 #
 #	CSS_SHEET	Full path to a CSS stylesheet suitable for DocBook.
 #			Default is ${DOC_PREFIX}/share/misc/docbook.css
@@ -115,9 +113,7 @@
 # Documents should use the += format to access these.
 #
 
-DOCBOOKSUFFIX?= sgml
-
-MASTERDOC?=	${.CURDIR}/${DOC}.${DOCBOOKSUFFIX}
+MASTERDOC?=	${.CURDIR}/${DOC}.xml
 
 # List of supported SP_ENCODINGs
 SP_ENCODING_LIST?=	ISO-8859-2 KOI8-R
@@ -466,7 +462,7 @@ JADEFLAGS+=		-i chap.index
 HTML_SPLIT_INDEX?=	html-split.index
 HTML_INDEX?=		html.index
 PRINT_INDEX?=		print.index
-INDEX_SGML?=		index.sgml
+INDEX_SGML?=		index.xml
 
 CLEANFILES+= 		${INDEX_SGML} ${HTML_SPLIT_INDEX} ${HTML_INDEX} ${PRINT_INDEX}
 
@@ -504,19 +500,6 @@ NO_RTF=		yes
 .endif
 .endfor
 
-# XML --------------------------------------------------------------------
-
-# sx generates a lot of (spurious) errors of the form "reference to
-# internal SDATA entity ...".  So dump the errors to separate file, and
-# grep for any other errors to show them to the user.
-#
-# Better approaches to handling this would be most welcome
-
-${DOC}.xml: ${SRCS}
-	echo '<!DOCTYPE book SYSTEM "/usr/local/share/xml/docbook/4.2/docbookx.dtd">' > ${DOC}.xml
-	${SX} -xlower -xndata ${MASTERDOC} 2> .sxerr | tail -n +2 >> ${DOC}.xml 
-	@-grep -v 'reference to internal SDATA entity' .sxerr
-
 # HTML-SPLIT -------------------------------------------------------------
 
 .if ${STYLESHEET_TYPE} == "dsssl"
@@ -751,7 +734,7 @@ lint validate:
 # Generate a different .index file based on the format name
 #
 # If we're not generating an index (the default) then we need to create
-# an empty index.sgml file so that we can reference index.sgml in book.sgml
+# an empty index.xml file so that we can reference index.xml in book.sgml
 #
 
 
@@ -880,7 +863,7 @@ spellcheck-${_curformat}:
 spellcheck: ${FORMATS:C/^/spellcheck-/}
 
 indexreport:
-.for _entry in ${SRCS:M*.sgml}
+.for _entry in ${SRCS:M*.xml}
 	@echo "indexreport ${_entry}"
 	@${PERL} ${INDEXREPORTSCRIPT} ${.CURDIR}/${_entry}
 .endfor
diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk
index dbd945da62..d3ae084be0 100644
--- a/share/mk/web.site.mk
+++ b/share/mk/web.site.mk
@@ -164,13 +164,13 @@ CATALOG+=	${DOC_PREFIX}/share/sgml/catalog
 # Transformation rules
 
 ###
-# file.sgml --> file.html
+# file.xml --> file.html
 #
-# Runs file.sgml through spam to validate and expand some entity
+# Runs file.xml through spam to validate and expand some entity
 # references are expanded.  file.html is added to the list of
 # things to install.
 
-.SUFFIXES:	.sgml .html
+.SUFFIXES:	.xml .html
 .if defined(REVCHECK)
 PREHTML?=	${DOC_PREFIX}/ja_JP.eucJP/htdocs/prehtml
 CANONPREFIX0!=	cd ${DOC_PREFIX}; ${ECHO_CMD} $${PWD};
@@ -187,10 +187,10 @@ PREHTML?=	${SED} -e 's/<!ENTITY base CDATA ".*">/<!ENTITY base CDATA "http:\/\/w
 .endif
 .endif
 
-GENDOCS+=	${DOCS:M*.sgml:S/.sgml$/.html/g}
-ORPHANS:=	${ORPHANS:N*.sgml}
+GENDOCS+=	${DOCS:M*.xml:S/.xml$/.html/g}
+ORPHANS:=	${ORPHANS:N*.xml}
 
-.sgml.html: ${_DEPENDSET.wwwstd} ${DOC_PREFIX}/share/sgml/xhtml.xsl
+.xml.html: ${_DEPENDSET.wwwstd} ${DOC_PREFIX}/share/sgml/xhtml.xsl
 .if defined(PREHTML)
 	${PREHTML} ${PREHTMLOPTS} ${.IMPSRC} > ${.IMPSRC}-tmp
 	${XMLLINT} ${XMLLINTOPTS} ${.IMPSRC}-tmp
diff --git a/share/pgpkeys/pgpkeys-core.sgml b/share/pgpkeys/pgpkeys-core.xml
index bb355324dd..bb355324dd 100644
--- a/share/pgpkeys/pgpkeys-core.sgml
+++ b/share/pgpkeys/pgpkeys-core.xml
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.xml
index 6c830d4bcd..6c830d4bcd 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.xml
diff --git a/share/pgpkeys/pgpkeys-officers.sgml b/share/pgpkeys/pgpkeys-officers.xml
index 950945d725..950945d725 100644
--- a/share/pgpkeys/pgpkeys-officers.sgml
+++ b/share/pgpkeys/pgpkeys-officers.xml
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index e8e5d7a31b..3e1c383c55 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -394,6 +394,6 @@
 <!ENTITY pgpkey.zi SYSTEM "zi.key">
 <!ENTITY pgpkey.zml SYSTEM "zml.key">
 <!ENTITY pgpkey.zont SYSTEM "zont.key">
-<!ENTITY section.pgpkeys-core		SYSTEM "pgpkeys-core.sgml">
-<!ENTITY section.pgpkeys-developers	SYSTEM "pgpkeys-developers.sgml">
-<!ENTITY section.pgpkeys-officers	SYSTEM "pgpkeys-officers.sgml">
+<!ENTITY section.pgpkeys-core		SYSTEM "pgpkeys-core.xml">
+<!ENTITY section.pgpkeys-developers	SYSTEM "pgpkeys-developers.xml">
+<!ENTITY section.pgpkeys-officers	SYSTEM "pgpkeys-officers.xml">
diff --git a/share/sgml/bibliography.sgml b/share/sgml/bibliography.xml
index 71900a016b..71900a016b 100644
--- a/share/sgml/bibliography.sgml
+++ b/share/sgml/bibliography.xml
diff --git a/share/sgml/man-refs.ent b/share/sgml/man-refs.ent
index ca0eb055b9..c8513beea1 100644
--- a/share/sgml/man-refs.ent
+++ b/share/sgml/man-refs.ent
@@ -582,7 +582,7 @@
 <!ENTITY man.setvar.1 "<citerefentry><refentrytitle>setvar</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.setxkbmap.1 "<citerefentry vendor='xorg'><refentrytitle>setxkbmap</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.sftp.1 "<citerefentry><refentrytitle>sftp</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
-<!ENTITY man.sgmlnorm.1 "<citerefentry vendor='ports'><refentrytitle>sgmlnorm</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
+<!ENTITY man.xmlnorm.1 "<citerefentry vendor='ports'><refentrytitle>sgmlnorm</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.sgsc.1 "<citerefentry><refentrytitle>sgsc</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.sh.1 "<citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.sha1.1 "<citerefentry><refentrytitle>sha1</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
diff --git a/share/sgml/mirrors-master.xsl b/share/sgml/mirrors-master.xsl
index cac68ae377..4eed64c5a1 100644
--- a/share/sgml/mirrors-master.xsl
+++ b/share/sgml/mirrors-master.xsl
@@ -32,12 +32,12 @@
 
   <xsl:template match="/">
     <xsl:choose>
-      <xsl:when test="$target = 'handbook/mirrors/chapter.sgml'">
+      <xsl:when test="$target = 'handbook/mirrors/chapter.xml'">
 	<xsl:call-template name="mirrors-docbook-country-index-all" />
 	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
 	<xsl:call-template name="mirrors-docbook-variablelist" />
       </xsl:when>
-      <xsl:when test="$target = 'handbook/eresources/chapter.sgml'">
+      <xsl:when test="$target = 'handbook/eresources/chapter.xml'">
 	<xsl:call-template name="mirrors-docbook-country-index-all" />
 	<para>(<xsl:call-template name="mirrors-lastmodified" />)</para>
 	<xsl:call-template name="mirrors-docbook-itemizedlist" />
diff --git a/share/sgml/release.ent b/share/sgml/release.ent
index 5ae2a1e18b..6a80b55ba1 100644
--- a/share/sgml/release.ent
+++ b/share/sgml/release.ent
@@ -8,9 +8,9 @@
 
 	- similar entity in the Handbook
 	- similar entity in the Relnotes
-	- releases/index.sgml has the date of the current release
+	- releases/index.xml has the date of the current release
 	- the FAQ has links to the release FTP url
-	- "versions supported" in security.sgml
+	- "versions supported" in security.xml
 
      (If you're the release engineer, feel free to update this list with
      other doc-related things you had to do.  It'll save you time and
author	Gabor Kovesdan <gabor@FreeBSD.org>	2012-10-01 09:53:01 +0000
committer	Gabor Kovesdan <gabor@FreeBSD.org>	2012-10-01 09:53:01 +0000
commit	b4346b9b2dfe86a97907573086dff096850dcb1d (patch)
tree	9b951977cbd22dada9b868ac83b1d56791ea3859 /share
parent	bee5d224febbeba11356aa848006a4f5f9e24b30 (diff)