gnucash-docs maint: Multiple changes pushed

Sun Dec 30 10:35:39 EST 2018

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/1fb8e171 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/1e968cd3 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/918a3ccf (commit)



commit 1fb8e171bbd9bae057b84442e4e1e4e615043c7e
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 30 07:35:03 2018 -0800

    Release GnuCash Documentation for version 3.4.

diff --git a/ChangeLog b/ChangeLog
index b58a7b1..e7793d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,75 @@
+2018-10-22 Frank H. Ellenberger 
+
+	* Add abstract and localization note to tax report (HEAD -> maint, origin/maint)
+
+2018-10-22 Frank H. Ellenberger 
+
+	* Add comments about subchapters for better cross checking
+
+2018-10-14 Geert Janssens 
+
+	* Fix DOCTYPE handling
+
+2018-10-14 Frank H. Ellenberger 
+
+	* Use "Authors" as already in the guide
+
+2018-10-14 Frank H. Ellenberger 
+
+	* Add ids to book.preface and tips.sect2
+
+2018-10-12 Geert Janssens 
+
+	* Drop html entity declarations
+
+2018-10-12 Geert Janssens 
+
+	* Convert help documents to use XInclude instead of SYSTEM entities
+
+2018-10-12 Geert Janssens 
+
+	* Convert guide and its translations to use XInclude instead of SYSTEM entities
+
+2018-10-12 Geert Janssens 
+
+	* Drop old DocBook xsl 1.75.2 stylesheet
+
+2018-10-12 Geert Janssens 
+
+	* Base gnucash custom style sheet on DocBook xsl 1.79.2
+
+2018-10-12 Geert Janssens 
+
+	* Add DocBook xsl v1.79.2 (taken from Fedora 27 installation)
+
+2018-10-12 Geert Janssens 
+
+	* Extract common entity declarations into a custom DTD
+
+2018-10-12 Geert Janssens 
+
+	* Update to DocBook XML spec 4.5
+
+2018-10-12 Frank H. Ellenberger 
+
+	* Minor fixes in Getting Help
+
+2018-10-12 Frank H. Ellenberger 
+
+	* Update several URLs in configure.ac
+
+2018-10-12 Frank H. Ellenberger 
+
+	* remove space from "web site"
+
+2018-10-12 Frank H. Ellenberger 
+
+	* Minor fixes in "Accessing Help"
+
+2018-09-18 Frank H. Ellenberger 
+
+	* Add Wiki Search page to Getting Help
+
 2018-09-29 John Ralls 
 
 	* Release Documentation 3.3. (HEAD -> maint, tag: 3.3, origin/maint)
diff --git a/NEWS b/NEWS
index 9020a71..c4e966c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,17 @@
 Version History
 ---------------
- 3.3    - 20 September 2018
+ 3.4    - 30 December 2018
+        o Convert help documents to use XInclude instead of SYSTEM entities
+        o Convert Guide and its translations to use XInclude instead of
+          SYSTEM entities
+        o Drop old DocBook xsl 1.75.2 stylesheet
+        o Base gnucash custom style sheet on DocBook xsl 1.79.2
+        o Add DocBook xsl v1.79.2
+        o Extract common entity declarations into a custom DTD
+          This custom DTD is based on the DocBook V4.5 DTD and is intended
+          to be used by all our documentation xml files.
+        o Update to DocBook XML spec 4.5
+ 3.3    - 30 September 2018
         o Bug 791169 - Add Reconciliation definition to glossary.
         o Bug 796800 - None of the "GnuCash Tutorial and Concepts Guide"
           graphics (.png files) display.
diff --git a/configure.ac b/configure.ac
index 635e390..6c757be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # copyright (c) 2003-2016 GnuCash Development Team
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gnucash-docs], [3.3], [https://bugs.gnucash.org/describecomponents.cgi?product=Documentation], , [https://www.gnucash.org/])
+AC_INIT([gnucash-docs], [3.4], [https://bugs.gnucash.org/describecomponents.cgi?product=Documentation], , [https://www.gnucash.org/])
 AC_CANONICAL_HOST
 
 dnl ==========================================================================

commit 1e968cd37d00b8606e891b0faa29db782f431084
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 30 07:34:56 2018 -0800

    Pass --path to xmllint so that it can find gnc-docbookx.dtd.
    
    Instead of linking it to every source dir, which fails distcheck.

diff --git a/configure.ac b/configure.ac
index a7460db..635e390 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,19 +226,4 @@ Makefile])
 
 AC_CONFIG_FILES([guide/ja/fop.xconf])
 
-dnl Set up links to our dtd in each book directory to make
-dnl xmllint and friends work properly
-AC_CONFIG_LINKS([
-$srcdir/help/C/gnc-docbookx.dtd:docbook/gnc-docbookx.dtd
-$srcdir/help/de/gnc-docbookx.dtd:docbook/gnc-docbookx.dtd
-$srcdir/help/it/gnc-docbookx.dtd:docbook/gnc-docbookx.dtd
-$srcdir/help/pt/gnc-docbookx.dtd:docbook/gnc-docbookx.dtd
-$srcdir/guide/C/gnc-docbookx.dtd:docbook/gnc-docbookx.dtd
-$srcdir/guide/de/gnc-docbookx.dtd:docbook/gnc-docbookx.dtd
-$srcdir/guide/it/gnc-docbookx.dtd:docbook/gnc-docbookx.dtd
-$srcdir/guide/ja/gnc-docbookx.dtd:docbook/gnc-docbookx.dtd
-$srcdir/guide/pt/gnc-docbookx.dtd:docbook/gnc-docbookx.dtd
-$srcdir/guide/ru/gnc-docbookx.dtd:docbook/gnc-docbookx.dtd
-])
-
 AC_OUTPUT
diff --git a/xmldocs.make b/xmldocs.make
index e703b32..42ce28b 100644
--- a/xmldocs.make
+++ b/xmldocs.make
@@ -53,11 +53,6 @@ gnomehelp_DATA =  $(xml_files)
 gnomehelpfiguresdir = $(gnomehelpdir)/$(figdir)
 gnomehelpfigures_DATA = $(shell ls ${srcdir}/${figdir}/*.png)
 
-# At install time copy our dtd next to the xml files
-install-data-hook:
-	$(mkinstalldirs) "$(DESTDIR)$(gnomehelpdir)"
-	$(INSTALL_DATA) "${top_srcdir}/docbook/gnc-docbookx.dtd" "$(DESTDIR)$(gnomehelpdir)/gnc-docbookx.dtd"
-
 uninstall-hook:
 	rmdir --ignore-fail-on-non-empty "$(DESTDIR)$(gnomehelpfiguresdir)"
 	rmdir --ignore-fail-on-non-empty "$(DESTDIR)$(gnomehelpdir)"
@@ -156,4 +151,4 @@ uninstall-html:
 	fi
 
 check:
-	xmllint --postvalid --xinclude --noout ${srcdir}/${docname}.xml
+	xmllint --postvalid --xinclude --noout --path ${top_srcdir}/docbook ${srcdir}/${docname}.xml



Summary of changes:
 ChangeLog    | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NEWS         | 13 ++++++++++-
 configure.ac | 17 +-------------
 xmldocs.make |  7 +-----
 4 files changed, 86 insertions(+), 23 deletions(-)

