gnucash-docs master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/f332e997 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/c15a2c1c (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/6ac6de00 (commit)



commit f332e997002b562af426607390b3b3bb163306b1
Merge: 6ac6de0 c15a2c1
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Sep 22 16:21:16 2017 -0700

    Merge branch 'maint'

commit c15a2c1c72c9f6dcdcd3a738df570ea849fc40c8
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Sep 21 11:42:30 2017 -0700

    Release 2.6.18



Summary of changes:
 ChangeLog                  | 116 +++++++++++++++++++++++++++++++++++++++++++++
 NEWS                       |   8 ++++
 guide/C/gnucash-guide.xml  |  10 ++--
 guide/de/gnucash-guide.xml |  10 ++--
 help/C/gnucash-help.xml    |  10 ++--
 5 files changed, 139 insertions(+), 15 deletions(-)