doc/xmlwf.1: Migrate from SGML to XML

diff --git a/expat/MANIFEST b/expat/MANIFEST
index 209152706efc89e873c96bed248589159ff7d061..afb9acacdf06a002e9dcbd9999a7e18212ce974a 100644 (file)
--- a/expat/MANIFEST
+++ b/expat/MANIFEST
@@ -44,7 +44,7 @@ doc/reference.html
 doc/style.css
 doc/valid-xhtml10.png
 doc/xmlwf.1
-doc/xmlwf.sgml
+doc/xmlwf.xml
 CMakeLists.txt
 CMake.README
 COPYING

diff --git a/expat/doc/.gitignore b/expat/doc/.gitignore
index 2c77c808ff4a908bbb44cbe1a3097f96dd4c4fad..65c1472dab3170025e1d5e882aa3c42366ad1bd6 100644 (file)
--- a/expat/doc/.gitignore
+++ b/expat/doc/.gitignore
@@ -1,3 +1,2 @@
 /XMLWF.1
 /xmlwf.1
-/xmlwf.xml

diff --git a/expat/doc/Makefile b/expat/doc/Makefile
index 994b8b1d4d8110f039006a799c301fad69ce2516..01e5c23981a9b4ddabe71a70060a38f8584a44d3 100644 (file)
--- a/expat/doc/Makefile
+++ b/expat/doc/Makefile
@@ -2,7 +2,6 @@
 # Licensed under MIT/X License
 
 DOCBOOK_TO_MAN = docbook2x-man
-SGML_TO_XML = sgml2xml-isoent
 
 .PHONY: all
 all: xmlwf.1
@@ -11,14 +10,8 @@ xmlwf.1: XMLWF.1
        cp $< $@
 
 XMLWF.1: xmlwf.xml
-       which $(DOCBOOK_TO_MAN)
-       $(DOCBOOK_TO_MAN) xmlwf.xml > $@ || { rm $@ ; exit 1; }
-
-xmlwf.xml: xmlwf.sgml
-       which $(SGML_TO_XML)
-       $(SGML_TO_XML) xmlwf.sgml > $@ || true
-       grep -q '^<?xml' $@
+       $(DOCBOOK_TO_MAN) xmlwf.xml
 
 .PHONY: clean
 clean:
-       $(RM) xmlwf.1 XMLWF.1 xmlwf.xml
+       $(RM) xmlwf.1 XMLWF.1

diff --git a/expat/doc/xmlwf.sgml b/expat/doc/xmlwf.xml
similarity index 94%
rename from expat/doc/xmlwf.sgml
rename to expat/doc/xmlwf.xml
index e1f779e1f3bca418559a256fed9e4f06c1f6700e..92ea8b592964305f2ef253d9edacbd940283a03e 100644 (file)
--- a/expat/doc/xmlwf.sgml
+++ b/expat/doc/xmlwf.xml
@@ -1,14 +1,4 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-       docbook-to-man $< > $@
-  -->
-
+<!DOCTYPE refentry [
   <!-- Fill in your name for FIRSTNAME and SURNAME. -->
   <!ENTITY dhfirstname "<firstname>Scott</firstname>">
   <!ENTITY dhsurname   "<surname>Bronson</surname>">
@@ -448,20 +438,3 @@ The W3 XML specification:   http://www.w3.org/TR/REC-xml
        </para>
   </refsect1>
 </refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->