gnucash-docs master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/58af6237 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/ae909c87 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/11f88a2d (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/ef88bb0a (commit)



commit 58af623786c319b7124fd7a250130780aebb6f11
Merge: ef88bb0 ae909c8
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Oct 5 14:24:01 2015 -0700

    Merge branch 'maint'


commit ae909c873743c5b080b86191e9e26535699f00bb
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Oct 5 10:55:33 2015 -0700

    Release 2.6.9

diff --git a/ChangeLog b/ChangeLog
index 5a02ef3..cb58b1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+2015-10-05 John Ralls 
+
+	* Add cc_cbook.xml to build. (HEAD, maint)
+
+2015-10-03 John Ralls 
+
+	* Fix stray '>'. (origin/maint)
+
+2015-10-03 Mechtilde 
+
+	* add ch_cc.xml to de/Makefile.am
+
+2015-10-03 Mechtilde 
+
+	* screenshots in German
+
+2015-10-02 Mechtilde 
+
+	* small corrections and German screenshots
+
+2015-10-02 John Ralls 
+
+	* Fix stray close-comment mark.
+
+2015-10-02 Mechtilde 
+
+	* translation amd screenshots in German
+
+2015-10-02 Mechtilde 
+
+	* ch_cc unlockes in overvoew and guide
+
+2015-09-28 Mechtilde Stehmann 
+
+	* some small corections
+
+2015-09-27 Mechtilde Stehmann 
+
+	* small corrections
+
+2015-09-27 Mechtilde Stehmann 
+
+	* Screenshots in German
+
+2015-09-27 Mechtilde Stehmann 
+
+	* added screenshots
+
+2015-09-27 Mechtilde Stehmann 
+
+	* finishing translation
+
+2015-09-27 Mechtilde Stehmann 
+
+	* some more translations
+
+2015-09-27 Mechtilde Stehmann 
+
+	* unlock chapter cbook in overview and guide
+
+2015-09-27 Mechtilde Stehmann 
+
+	* more translation
+
+2015-09-26 Mechtilde Stehmann 
+
+	* starting translation
+
 2015-09-25 Mechtilde Stehmann 
 
 	* add screenshots and translation finished (HEAD, origin/maint, maint)
diff --git a/NEWS b/NEWS
index 5b1ab42..2a3ec01 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,13 @@
 Version History
 ---------------
+ 2.6.9  - 06 October 2015
+        o - More German Translations from Mechtilde Stehmann
  2.6.8  - 27 September 2015
         o - Extensive German Translation improvements -- Mechtilde Stehmann
 	o - Bug 705309 - A/R & A/P Need Warnings, Sales Tax Table and
  	    Billing Terms Editor need documentation -- Chris Good
 	o - Expand Help for Transfer Dialog, Multicurrency, and Price Editor -- John Ralls, David Carlson, Geert Janssens
- 2.6.6  - 28 June 2015
+ 2.6.7  - 28 June 2015
         o No significant changes.
  2.6.6  - 29 March 2015
  	o Explain sorting by TXF code within Tax Form Sections -- Mark Simpson
diff --git a/configure.ac b/configure.ac
index ddc1647..33583b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # copyright (c) 2003-2013 GnuCash Development Team
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(gnucash-docs, 2.6.8)
+AC_INIT(gnucash-docs, 2.6.9)
 
 dnl ==========================================================================
 dnl

commit 11f88a2d3ea71b813cd1ea434a28a73637f7fdd1
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Oct 5 10:54:19 2015 -0700

    Add cc_cbook.xml to build.

diff --git a/guide/de/Makefile.am b/guide/de/Makefile.am
index d3cd679..2fac0a3 100644
--- a/guide/de/Makefile.am
+++ b/guide/de/Makefile.am
@@ -8,6 +8,7 @@ entities = \
  ch_bus_ap.xml \
  ch_bus_ar.xml \
  ch_capgain.xml \
+ ch_cbook.xml \
  ch_cc.xml \
  ch_loans.xml \
  ch_invest.xml \



Summary of changes:
 ChangeLog            | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 NEWS                 |  4 +++-
 guide/de/Makefile.am |  1 +
 3 files changed, 72 insertions(+), 1 deletion(-)