From 4bb258caabd4a2be9740acd95142ae4ad7b577b1 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Mon, 28 Apr 2014 08:55:13 +0200
Subject: [PATCH] manual: got rid of the sgml bits. Go XML !

---
 src/doc/user/Makefile                         |  5 ++-
 src/doc/user/Makefile.fbsd                    | 32 -------------------
 .../user/{usermanual.sgml => usermanual.xml}  |  9 ++----
 src/doc/user/xmlmake.sh                       | 10 ------
 4 files changed, 6 insertions(+), 50 deletions(-)
 delete mode 100644 src/doc/user/Makefile.fbsd
 rename src/doc/user/{usermanual.sgml => usermanual.xml} (99%)

diff --git a/src/doc/user/Makefile b/src/doc/user/Makefile
index d9b87a66..7ff97ea7 100644
--- a/src/doc/user/Makefile
+++ b/src/doc/user/Makefile
@@ -1,2 +1,5 @@
-usermanual.html: usermanual.sgml
+usermanual.html: usermanual.xml
 	sh xmlmake.sh
+
+clean:
+	rm -f RCL.*.html usermanual.pdf usermanual.html index.html
diff --git a/src/doc/user/Makefile.fbsd b/src/doc/user/Makefile.fbsd
deleted file mode 100644
index 5c1d49fb..00000000
--- a/src/doc/user/Makefile.fbsd
+++ /dev/null
@@ -1,32 +0,0 @@
-# 
-# @(#$Id: Makefile,v 1.1 2006-01-04 11:09:53 dockes Exp $
-#
-#
-
-MAINTAINER=jfd@recoll.org
-
-DOC?= usermanual
-LANGCODE?= en_US.ISO_8859-1
-FORMATS?= html txt html-split pdf
-JADEFLAGS+=	-V %generate-article-toc%
-
-# The purpose for this is to replace the FreeBSD file which contains the 
-# blurb about file being hosted on FreeBSD.org. To work, it also
-# needs a modification to /usr/doc/share/mk/doc.docbook.mk. Around line
-# 121, replace LANGUAGECATALOG= with LANGUAGECATALOG?=
-LANGUAGECATALOG=/usr/doc/share/sgml/catalog
-
-#INSTALL_COMPRESSED?= gz
-INSTALL_ONLY_COMPRESSED?=
-
-# 
-# SRCS lists the individual SGML files that make up the document. Changes
-# to any of these files will force a rebuild
-#
-
-# SGML content
-SRCS=  usermanual.sgml
-
-# ${.CURDIR}/../../..
-DOC_PREFIX?= /usr/doc
-.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/src/doc/user/usermanual.sgml b/src/doc/user/usermanual.xml
similarity index 99%
rename from src/doc/user/usermanual.sgml
rename to src/doc/user/usermanual.xml
index ea08b381..f71bba8a 100644
--- a/src/doc/user/usermanual.sgml
+++ b/src/doc/user/usermanual.xml
@@ -1,10 +1,5 @@
-<!-- Use this header for the FreeBSD sgml toolchain -->
-<!-- NOTE: the sgml version should be saved as ISO-8859-1. -->
-<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-
-<!-- Use this header for going XML -->
-<!-- <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ -->
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY RCL "<application>Recoll</application>">
 <!ENTITY RCLAPPS "<ulink url='http://www.recoll.org/features.html'>http://www.recoll.org/features.html</ulink>">
diff --git a/src/doc/user/xmlmake.sh b/src/doc/user/xmlmake.sh
index 94380dc4..2b6e66b3 100644
--- a/src/doc/user/xmlmake.sh
+++ b/src/doc/user/xmlmake.sh
@@ -28,16 +28,6 @@ XSLDIR="/usr/share/xml/docbook/stylesheet/docbook-xsl/"
 dochunky=1
 test $# -eq 1 && dochunky=0
 
-# Remove the SGML header and uncomment the XML one. Also used to iconv
-# from iso-8859-1 to UTF-8, but the SGML manual is now UTF-8 ? Would
-# that work with the sgml toolchain ??
-echo '<?xml version="1.0" encoding="UTF-8"?>' > usermanual.xml
-sed -e '\!//FreeBSD//DTD!d' \
-    -e '\!DTD DocBook XML!s/<!--//' \
-    -e '\!/docbookx.dtd!s/-->//' \
-    < usermanual.sgml \
-    >> usermanual.xml
-
 # Options common to the single-file and chunked versions
 commonoptions="--stringparam section.autolabel 1 \
   --stringparam section.autolabel.max.depth 3 \