From 5a5b157ba3ee4107d1411b3e2e0c597a60c7dbd8 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Sat, 18 Jun 2016 01:21:50 +0200
Subject: [PATCH] doc/xmlwf.1: Migrate from SGML to XML

---
 expat/MANIFEST                      |  2 +-
 expat/doc/.gitignore                |  1 -
 expat/doc/Makefile                  | 11 ++---------
 expat/doc/{xmlwf.sgml => xmlwf.xml} | 29 +----------------------------
 4 files changed, 4 insertions(+), 39 deletions(-)
 rename expat/doc/{xmlwf.sgml => xmlwf.xml} (94%)

diff --git a/expat/MANIFEST b/expat/MANIFEST
index 20915270..afb9acac 100644
--- 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 2c77c808..65c1472d 100644
--- 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 994b8b1d..01e5c239 100644
--- 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 e1f779e1..92ea8b59 100644
--- 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:
--->
-- 
2.40.0