gnucash-docs master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sat Jun 29 20:56:57 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/90f4fdd5 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7d4eea62 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/63e94c8b (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/42d78625 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/c0a8bec5 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/a2cc0d65 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/f1e84d43 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/3634474a (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/c855c4f9 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/4099a8d8 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/0539a203 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/007ab934 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/af662264 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/e903525f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/1a8c502d (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5e2c5e58 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b48da530 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/f92b8168 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/4c453cb8 (commit)



commit 90f4fdd55f7ba280e878413933974d08f25bc137
Merge: 4c453cb 7d4eea6
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 29 17:56:42 2019 -0700

    Merge branch 'maint'


commit 7d4eea62e406937cc64e0abfa1237ee620c40a81
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 29 17:17:43 2019 -0700

    Release Documentation for GnuCash 3.6.

diff --git a/ChangeLog b/ChangeLog
index 2260661..057ffe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10356,3 +10356,67 @@
 	* help/gnucash-docs/C/Makefile.am: added to repository
 	* help/gnucash-docs/C/fdl-appendix.xml: added to repository
 	* help/gnucash-docs/C/legal.xml: added to repository
+2019-06-27 Frank H. Ellenberger 
+
+	* Use url-bug-* entities instead of http: (HEAD -> maint, origin/maint)
+
+2019-06-27 Frank H. Ellenberger 
+
+	* A few more URL entities
+
+2019-06-24 Frank H. Ellenberger 
+
+	* Replace a broken link to bugzilla (en,de)
+
+2019-06-24 Frank H. Ellenberger 
+
+	* Minor improvement of german translation feedback
+
+2019-06-24 Frank H. Ellenberger 
+
+	* Add common URLs to gnc-docbook.dtd
+
+2019-06-23 Frank H. Ellenberger 
+
+	* Guide: Move the FDL appendix into the appendix part
+
+2019-06-23 Frank H. Ellenberger 
+
+	* Guide Bus: Add IDs to tables
+
+2019-06-23 Frank H. Ellenberger 
+
+	* Use <equation> instead of <emphasis> in chapter basics
+
+2019-06-22 Frank H. Ellenberger 
+
+	* Add table id
+
+2019-05-30 David Cousens 
+
+	* Draft Debit and Credits section
+
+2019-05-13 Frank H. Ellenberger 
+
+	* Add screenshots of book options in help
+
+2019-05-09 Frank H. Ellenberger 
+
+	* Update README
+
+2019-03-31 Frank H. Ellenberger 
+
+	* Use full words and sentences for reconciliation state in Help Transactions
+
+2019-04-30 Frank H. Ellenberger 
+
+	* Guide/C: remove obsolete Report_Screen.png
+
+2019-04-30 Frank H. Ellenberger 
+
+	* Help: Update 2 Preference images
+
+2019-03-30 Frank H. Ellenberger 
+
+	* Replace most occurences of <emphasis> in help:transactions
+
diff --git a/NEWS b/NEWS
index 9faecd0..c4bef07 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,20 @@
 Version History
 ---------------
+ 3.6    - 20 June 2019
+        o Guide: Move the FDL appendix into the appendix part
+        o Guide Bus: Add IDs to tables so that they will appear in the
+          "List of Tables"
+        o Use <equation> instead of <emphasis> in chapter basics
+          To generate a "List of Equations" in most outut formats
+        o New Debit and Credits section
+          Debit and Credit section showing which account types have debit
+          balances and which haave credit balances and the effect of debits and
+          credits on each account type.
+        o Add screenshots of book options in help
+        o New Dependencies: FontBox for ru pdf
+        o Use full words and sentences for reconciliation state in
+          Help Transactions
+
  3.5    - 31 March 2019
         o Bug 796855 Bringing Chapter 3 of Help into Chapter 2 of Guide 
         o Bug 796856 Help Ch6 section added for importing from files
diff --git a/configure.ac b/configure.ac
index d6e0025..0ce198b 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.5], [https://bugs.gnucash.org/describecomponents.cgi?product=Documentation], , [https://www.gnucash.org/])
+AC_INIT([gnucash-docs], [3.6], [https://bugs.gnucash.org/describecomponents.cgi?product=Documentation], , [https://www.gnucash.org/])
 AC_CANONICAL_HOST
 
 dnl ==========================================================================
diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index b86abc0..038e214 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -32,10 +32,10 @@ own entity definitions to use across all of our DocBook pages. -->
   
   1. Publication - should only be changed by the release manager!
 -->
-<!ENTITY manrevision "3.5">
-<!ENTITY date "31 March 2019">
+<!ENTITY manrevision "3.6">
+<!ENTITY date "30 June 2019">
 <!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "3.5">
+<!ENTITY vers-stable "3.6">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "3">
 
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 70a2328..72e494b 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -89,6 +89,14 @@
   </authorgroup>
 
   <revhistory>
+      <revision>
+        <revnumber>&app; Tutorial and Concepts Guide v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&app; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&app; Tutorial and Concepts Guide v3.5</revnumber>
         <date>31 March 2019</date>
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 7e5b84e..2d5c3cb 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -106,6 +106,14 @@
   </authorgroup>
 
   <revhistory>
+      <revision>
+        <revnumber>&app; Tutorial and Concepts Guide v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&app; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&app; Tutorial and Concepts Guide v3.1</revnumber>
         <date>31 March 2019</date>
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index 36b3ed3..769ba27 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -104,6 +104,14 @@
   </authorgroup>
 
   <revhistory>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Autori multipli</para>
+          <para role="publisher">Gruppo della documentazione di &app;</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>GnuCash Tutorial and Concepts Guide v3.1</revnumber>
         <date>28 April 2018</date>
diff --git a/guide/pt/gnucash-guide.xml b/guide/pt/gnucash-guide.xml
index 99e7741..e1af565 100644
--- a/guide/pt/gnucash-guide.xml
+++ b/guide/pt/gnucash-guide.xml
@@ -90,6 +90,14 @@
   </authorgroup>
 
   <revhistory>
+      <revision>
+        <revnumber>&app;Tutorial e guia de conceitos v3.6</revnumber>
+        <date>30 de junho de 2018</date>
+        <revdescription>
+          <para role="author">Múltiplos autores</para>
+          <para role="publisher">Equipa de documentação do &app;</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&app;Tutorial e guia de conceitos v3.1</revnumber>
         <date>28 de abril de 2018</date>
diff --git a/guide/ru/gnucash-guide.xml b/guide/ru/gnucash-guide.xml
index 15dcec0..9dd0ff9 100644
--- a/guide/ru/gnucash-guide.xml
+++ b/guide/ru/gnucash-guide.xml
@@ -100,6 +100,14 @@
   </authorgroup>
 
   <revhistory>
+      <revision>
+        <revnumber>&app; Tutorial and Concepts Guide v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&app; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&app; Tutorial and Concepts Guide v3.1</revnumber>
         <date>28 April 2018</date>
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index 6b3b53f..407c10e 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -48,6 +48,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&app; Help Manual v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&app; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&app; Help Manual v3.5</revnumber>
         <date>31 March 2019</date>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index bad9327..83209e0 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -78,6 +78,14 @@
 
     <revhistory>
 
+      <revision>
+        <revnumber>&app; Hilfe v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Multiple Authors </para>
+          <para role="publisher">&app; Development Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&app; Hilfe v3.1</revnumber>
         <date>28 April 2018</date>
@@ -86,7 +94,7 @@
           <para role="publisher">&app; Development Team</para>
         </revdescription>
       </revision>
-      <revision>
+       <revision>
         <revnumber>&app; Hilfe v3.0</revnumber>
         <date>1 April 2018</date>
         <revdescription>
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index 82a7dc2..232849c 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -176,6 +176,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>GnuCash Help Manual v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Vari autori</para>
+          <para role="publisher">Gruppo della documentazione di &app;</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>GnuCash Help Manual v3.1</revnumber>
         <date>28 April 2018</date>
diff --git a/help/pt/gnucash-help.xml b/help/pt/gnucash-help.xml
index 1f73a09..007cf5e 100644
--- a/help/pt/gnucash-help.xml
+++ b/help/pt/gnucash-help.xml
@@ -54,6 +54,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>Manual de ajuda do &app; v3.6</revnumber>
+        <date>31 de junho de 2019</date>
+        <revdescription>
+          <para role="author">Múltiplos autores</para>
+          <para role="publisher">Equipa de documentação do &app;</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>Manual de ajuda do &app; v3.5</revnumber>
         <date>31 de março de 2019</date>

commit 63e94c8b2c360854c7a0a28f683493b677feafbe
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Jun 27 03:33:38 2019 +0200

    Use url-bug-* entities instead of http:
    
    For italian, only the output was patched, not the po.

diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index 2eda64a..36b3ed3 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -286,7 +286,7 @@
   <releaseinfo>Questa guida contiene un esempio pratico di utilizzo di &app; e descrive i concetti su cui &app; si basa.</releaseinfo>
   <legalnotice>
     <title>Feedback</title>
-      <para>Per segnalare dei bug o proporre dei suggerimenti riguardanti questo programma o questo manuale, seguire le indicazioni fornite in <ulink url="http://bugs.gnucash.org">&app; Bug Tracking System</ulink>.</para>
+      <para>Per segnalare dei bug o proporre dei suggerimenti riguardanti questo programma o questo manuale, seguire le indicazioni fornite in <ulink url="&url-bug-start;">&app; Bug Tracking System</ulink>.</para>
 <!-- Translators may also add here a feedback address for translations -->
   </legalnotice>
 
@@ -12802,7 +12802,7 @@ work on earlier versions, too.</para>
 
       <sect2 id="appendixb_general_newFeatures">
         <title>D: Vorrei usare la funzione XYZ ma <application>&app;</application> non ce l’ha. Come posso fare?</title>
-        <para>R: Chiedi gentilmente. :-) Puoi presentare una richiesta qui <ulink url="http://bugs.gnucash.org/enter_bug.cgi?product=gnucash"/>. Ricorda di descrivere il più dettagliatamente possibile la caratteristica che vorresti vedere implementata. Il trucco sta tutto nel riuscire a fornire più informazioni possibili ai programmatori sulle caratteristiche della funzionalità da implementare. Se vuoi accelerare lo sviluppo, considera la possibilità di effettuare una donazione come descritto nella <application>&app;</application>Development.</para>
+        <para>R: Chiedi gentilmente. :-) Puoi presentare una richiesta qui <ulink url="&url-bug-start;"/>. Ricorda di descrivere il più dettagliatamente possibile la caratteristica che vorresti vedere implementata. Il trucco sta tutto nel riuscire a fornire più informazioni possibili ai programmatori sulle caratteristiche della funzionalità da implementare. Se vuoi accelerare lo sviluppo, considera la possibilità di effettuare una donazione come descritto nella <application>&app;</application>Development.</para>
       </sect2>
 
       <sect2 id="appendixb_software_web">
@@ -12822,8 +12822,8 @@ work on earlier versions, too.</para>
 
       <sect2 id="appendixb_software_bugs">
         <title>D: Credo di aver trovato un bug. Come posso comunicarlo?</title>
-        <para>R: Prima di tutto, cerca di verificare che si tratti realmente di un bug e che non sia già stato messo in evidenza in passato. Cerca nell’archivio delle liste di discussione (vedi domanda più sopra). Poi passa a cercare in <ulink url="http://bugs.gnucash.org">&app; Bugzilla</ulink> database.</para>
-        <para>Se sei convinto di aver trovato realmente un nuovo bug, puoi comunicarlo all’indirizzo <ulink url="http://bugs.gnucash.org/enter_bug.cgi?product=gnucash"/>. Per favore ricorda di descrivere il bug con il massimo dettaglio possibile. Il trucco sta nel riuscire a fornire più informazioni possibili ai programmatori per riuscire a riprodurre il bug. Un programmatore è in genere in grado di risolvere un bug solo quando lo vede, se non riesci a mostrarlo al programmatore, non verrà tolto!</para>
+        <para>R: Prima di tutto, cerca di verificare che si tratti realmente di un bug e che non sia già stato messo in evidenza in passato. Cerca nell’archivio delle liste di discussione (vedi domanda più sopra). Poi passa a cercare in <ulink url="&url-bug-start;">&app; Bugzilla</ulink> database.</para>
+        <para>Se sei convinto di aver trovato realmente un nuovo bug, puoi comunicarlo all’indirizzo <ulink url="&url-bug-start;"/>. Per favore ricorda di descrivere il bug con il massimo dettaglio possibile. Il trucco sta nel riuscire a fornire più informazioni possibili ai programmatori per riuscire a riprodurre il bug. Un programmatore è in genere in grado di risolvere un bug solo quando lo vede, se non riesci a mostrarlo al programmatore, non verrà tolto!</para>
       </sect2>
 
     </sect1>
diff --git a/guide/ja/gnucash-guide.xml b/guide/ja/gnucash-guide.xml
index e350ac4..6661c4c 100644
--- a/guide/ja/gnucash-guide.xml
+++ b/guide/ja/gnucash-guide.xml
@@ -180,8 +180,8 @@ Lyttle</holder> </copyright>
   </releaseinfo>
   <legalnotice>
     <title>フィードバック</title>
-      <para>本パッケージおよび本書に関してバグを報告する、または提案を行う際には <ulink url=" http://bugs.gnucash.org
-">GNOME バグ追跡システム</ulink>を使用してください。
+      <para>本パッケージおよび本書に関してバグを報告する、または提案を行う際には <ulink url="&url-bug-start;
+">&appname; バグ追跡システム</ulink>を使用してください。
       </para>
 
   <!-- Translators may also add here a feedback address for translations -->
diff --git a/guide/pt/gnucash-guide.xml b/guide/pt/gnucash-guide.xml
index 8023e27..99e7741 100644
--- a/guide/pt/gnucash-guide.xml
+++ b/guide/pt/gnucash-guide.xml
@@ -275,7 +275,7 @@
   <legalnotice>
     <title>Comentários</title>
       <para>Para reportar um erro ou fazer uma sugestão a respeito deste pacote ou deste guia, siga as instruções no 
-      <ulink url="http://bugs.gnucash.org">Sistema de rastreio de erros do GNOME</ulink>.
+      <ulink url="&url-bug-start;">Sistema de rastreio de erros do &appname;</ulink>.
       </para>
 <!-- Translators may also add here a feedback address for translations -->
   </legalnotice>
@@ -385,7 +385,7 @@
 <part>
     <title>Gerir as finanças da empresa</title>
        <subtitle>Os capítulos relativos a negócios ainda não estão traduzidos. Se tiver interesse em colaborar na tradução, consulte 
-              <ulink url="http://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">Gnucash wiki: How to translate the GnuCash guide and/or help files</ulink>
+              <ulink url="&url-wiki;Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">Gnucash wiki: How to translate the GnuCash guide and/or help files</ulink>
         </subtitle>
     <xi:include href="ch_bus_intro.xml" />
     <xi:include href="ch_bus_setup.xml" />
diff --git a/guide/ru/gnucash-guide.xml b/guide/ru/gnucash-guide.xml
index bffebd1..15dcec0 100644
--- a/guide/ru/gnucash-guide.xml
+++ b/guide/ru/gnucash-guide.xml
@@ -300,12 +300,17 @@
   </releaseinfo>
   <legalnotice>
     <title>Feedback</title>
-      <para>To report a bug or make a suggestion regarding this package or
-        this manual, follow the directions at the
-        <ulink url="http://bugs.gnucash.org"
-          >&app; Bug Tracking System</ulink>.
+      <para>To report a bug or make a suggestion regarding the program or
+        this documentation, follow the instructions at the
+        <ulink url="&url-bug-wiki;">Bugzilla page of the GnuCash wiki</ulink>
+        and use the
+        <ulink url="&url-bug-start;">&appname; Bug Tracking System</ulink>. At first
+        you want to <ulink url="&url-bug-browse;">browse</ulink> or 
+        <ulink url="&url-bug-search;">search</ulink> it for already existing 
+        bugs. Select the product <emphasis>&appname;</emphasis> for the program or
+        <emphasis>Documentation</emphasis> for any parts of this documentation.
       </para>
-<!-- Translators may also add here a feedback address for translations -->
+<!-- Translators may also add here a feedback address for translations. -->
   </legalnotice>
 
 </bookinfo>
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index 67a3a78..82a7dc2 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -336,7 +336,7 @@
     <releaseinfo>Questo manuale descrive l’utilizzo del programma finanziario &app;.</releaseinfo>
     <legalnotice>
       <title>Commenti</title>
-      <para>Per avvertire della presenza di un bug o per proporre dei suggerimenti a riguardo di questo programma o del manuale, seguire le istruzioni fornite nel <ulink url="http://bugs.gnucash.org">sistema di tracciamento dei bug di GNOME</ulink>. Per contribuire alla traduzione del manuale segnalando eventuali errori, inviare un messaggio alla lista Italiana di <application>&app;</application> contattabile inviando una mail all’indirizzo <email>gnucash-it at gnucash.org</email></para>
+      <para>Per avvertire della presenza di un bug o per proporre dei suggerimenti a riguardo di questo programma o del manuale, seguire le istruzioni fornite nel <ulink url="http://bugs.gnucash.org">sistema di tracciamento dei bug di &appname;</ulink>. Per contribuire alla traduzione del manuale segnalando eventuali errori, inviare un messaggio alla lista Italiana di <application>&app;</application> contattabile inviando una mail all’indirizzo <email>gnucash-it at gnucash.org</email></para>
 <!-- Translators may also add here feedback address for translations -->
     </legalnotice>
 
diff --git a/help/pt/gnucash-help.xml b/help/pt/gnucash-help.xml
index b1de0a5..1f73a09 100644
--- a/help/pt/gnucash-help.xml
+++ b/help/pt/gnucash-help.xml
@@ -233,7 +233,7 @@
       <title>Comentários</title>
       <para>Para reportar um erro ou fazer sugestões sobre este pacote ou este 
         manual, siga as instruções no 
-        <ulink url="http://bugs.gnucash.org">Sistema de rastreio de erros do GNOME</ulink>.
+        <ulink url="&url-bug-start;">Sistema de rastreio de erros do &appname;</ulink>.
       </para>
 <!-- Translators may also add here feedback address for translations -->
     </legalnotice>

commit 42d78625c480d0ba63e9771cd1afe20765d8ffc0
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Jun 27 03:25:04 2019 +0200

    A few more URL entities

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 361619a..b86abc0 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -40,34 +40,44 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY series-stable "3">
 
 <!-- 
-  Some common URLs - should be changed on demand.
+  2. Some common URLs - should be changed on demand.
   
   Translators can add localized instances by adding -<lang>,
-  An example is url-wiki-ml-de for the german wiki page about mailin lists.
+  An example is url-wiki-ml-de for the german wiki page about mailing lists.
   We might later use http://itstool.org/documentation/its.html#localefilter instead.
 -->
 <!ENTITY url-www "https://www.gnucash.org/">
 <!ENTITY url-docs "https://www.gnucash.org/docs/">
-<!ENTITY url-wiki "https://wiki.gnucash.org/wiki/"> <!-- Append the desired topic -->
+<!-- Fixme: a dirty hack to reference the other document
+            Replace them after olink setup
+     append {guide|help}/<html-page>                      -->
+<!ENTITY url-docs-build-C "https://code.gnucash.org/docs/C/gnucash-">
+<!ENTITY url-docs-build-de "https://code.gnucash.org/docs/de/gnucash-">
+<!ENTITY url-docs-build-it "https://code.gnucash.org/docs/it/gnucash-">
+<!ENTITY url-docs-build-ja "https://code.gnucash.org/docs/ja/gnucash-">
+<!ENTITY url-docs-build-pt "https://code.gnucash.org/docs/pt/gnucash-">
+<!ENTITY url-docs-build-ru "https://code.gnucash.org/docs/ru/gnucash-">
+
+<!ENTITY url-wiki "https://wiki.gnucash.org/wiki/">  <!-- Append the desired topic -->
 <!ENTITY url-bug-wiki "https://wiki.gnucash.org/wiki/Bugzilla">
   <!-- The wiki page explaining the usage of bugzilla -->
 <!ENTITY url-bug-start "https://bugs.gnucash.org/">
 <!ENTITY url-bug-search "https://bugs.gnucash.org/query.cgi">
 <!ENTITY url-bug-browse "https://bugs.gnucash.org/describecomponents.cgi">
-<!ENTITY url-gnome-dev "https://developer.gnome.org/"> <!-- Append the desired topic -->
+<!ENTITY url-gnome-dev "https://developer.gnome.org/">  <!-- Append the desired topic -->
 <!ENTITY url-gnu "https://www.gnu.org/"> <!-- Append the desired topic -->
 <!ENTITY url-wiki-faq "https://wiki.gnucash.org/wiki/FAQ">
-<!ENTITY url-mail-li "https://lists.gnucash.org/mailman/listinfo/"> <!-- Append the desired list -->
+<!ENTITY url-mail-li "https://lists.gnucash.org/mailman/listinfo/">  <!-- Append the desired list -->
 <!ENTITY url-wiki-ml "https://wiki.gnucash.org/wiki/Mailiing_Lists">
 <!ENTITY url-wiki-ml-de "https://wiki.gnucash.org/wiki/De/Feedback#Auf_der_Mailingliste">
 <!ENTITY url-logs-irc "https://lists.gnucash.org/logs/">
   <!-- for IRC. If someone needs build logs, scan https://code.gnucash.org/builds/ -->
-<!ENTITY url-wp-en "https://en.wikipedia.org/wiki/"> <!-- Append the desired topic -->
+<!ENTITY url-wp-en "https://en.wikipedia.org/wiki/">  <!-- Append the desired topic -->
 
 <!--
   Translators:
-    "&app;" replaces all occurences of "GnuCash" in the guide, so
-   transliterate "GnuCash" here.
+    "&appname;" replaces all occurences of "GnuCash" in the docs,
+    so transliterate "GnuCash" here.
 -->
 <!ENTITY app "GnuCash"> <!-- This is deprecated and will later contain "<app>GnuCash</app>" -->
 <!ENTITY appname "GnuCash">
@@ -83,25 +93,25 @@ own entity definitions to use across all of our DocBook pages. -->
 -->
 <!ENTITY untranslated 'Dear Reader, we are really sorry, but nobody offered a translation
   for the following parts. If you would like to help us, follow the instructions at <ulink
-    url="http://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
+    url="https://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
   <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
   Questions can be discussed at the gnucash-XX at gnucash.org mailing list.'>
 
 <!ENTITY untranslated-de 'Geehrte Leser, leider hat bisher niemand eine Ãœbersetzung
   der folgenden Teile erstellt. Falls Sie uns dabei helfen möchten, folgen Sie
   bitte der Anleitung in <ulink
-    url="http://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
+    url="https://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
     <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
   Fragen können auf der deutschsprachigen Mailingliste gnucash-de at gnucash.org diskutiert werden.'>
 
 <!ENTITY untranslated-pt 'Caro leitor, lamentamos, ainda ninguém ofereceu uma tradução
   para as secções seguintes. Se quiser ajudar, siga as instruções na <ulink
-  url="http://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
+  url="https://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
   <citetitle>Wiki do Gnucash: como traduzir o guia e/ou os ficheiros de ajuda do GnuCash</citetitle></ulink>.
   Questões podem ser discutidas na lista gnucash-user at gnucash.org o gnucash-br at gnucash.org.'>
 
 <!ENTITY untranslated-ru 'Дорогой пользователь, нам очень жаль, но никто не перевел до сих пор
   следующие части документации. Если вы хотите помочь нам, следуйте инструкциям на
-  <ulink url="http://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
+  <ulink url="https://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
   <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
   Свои вопросы вы можете задать в списке рассылки gnucash-user at gnucash.org.'>

commit c0a8bec5ad3d6b4898827f0b5c8f87acf8ccdbbb
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Jun 24 10:33:49 2019 +0200

    Replace a broken link to bugzilla (en,de)
    
    Because I changed slightly the paragraph, I can not patch other
    translations

diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index ecb0c2f..70a2328 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -345,14 +345,15 @@
   </releaseinfo>
   <legalnotice>
     <title>Feedback</title>
-      <para>To report a bug or make a suggestion regarding this package or
-        this manual, follow the instructions at the
-        <ulink url="https://wiki.gnucash.org/wiki/Bugzilla"
-          >Bugzilla page of the GnuCash wiki</ulink> and use the
-        <ulink url="https://bugs.gnucash.org/browse.cgi?product=GnuCash"
-          >&app; Bug Tracking System</ulink>. There select the component
-        <emphasis>Documentation</emphasis><!-- Translators uncomment the next line: -->
-        <!--  or <emphasis>Translations</emphasis> -->.
+      <para>To report a bug or make a suggestion regarding the program or
+        this documentation, follow the instructions at the
+        <ulink url="&url-bug-wiki;">Bugzilla page of the GnuCash wiki</ulink>
+        and use the
+        <ulink url="&url-bug-start;">&appname; Bug Tracking System</ulink>. At first
+        you want to <ulink url="&url-bug-browse;">browse</ulink> or 
+        <ulink url="&url-bug-search;">search</ulink> it for already existing 
+        bugs. Select the product <emphasis>&appname;</emphasis> for the program or
+        <emphasis>Documentation</emphasis> for any parts of this documentation.
       </para>
 <!-- Translators may also add here a feedback address for translations. -->
   </legalnotice>
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 2b386d0..7e5b84e 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -338,12 +338,16 @@
   </releaseinfo>
   <legalnotice>
     <title>Rückmeldung</title>
-      <para>Um bezüglich dieser Dokumentation einen Fehler zu melden oder einen
-        Verbesserungsvorschlag einzureichen, folgen Sie den Anweisungen auf der
-        <ulink url="https://wiki.gnucash.org/wiki/De/Feedback"
+      <para>Um bezüglich des Programms oder dieser Dokumentation einen Fehler
+        zu melden oder einen Verbesserungsvorschlag einzureichen, folgen Sie den
+        Anweisungen auf der <ulink url="https://wiki.gnucash.org/wiki/De/Feedback"
           >Feedbackseite des GnuCash-Wikis</ulink> und verwenden das
-        <ulink url="https://bugs.gnucash.org/browse.cgi?product=GnuCash"
-          >&app; Bug Tracking System</ulink>. Dort wählen Sie, je nach Ursache, die Komponente <emphasis>Documentation</emphasis> oder <emphasis>Translations</emphasis>.
+        <ulink url="&url-bug-start;">&appname; Bug Tracking System</ulink>. Zunächst
+        <ulink url="&url-bug-browse;">blättern</ulink> oder 
+        <ulink url="&url-bug-search;">suchen</ulink> Sie, um festzustellen,
+        ob das Problem bereits gemeldet wurde. Dort wählen Sie die Komponente
+        <emphasis>&appname;</emphasis> für das Programm oder
+        <emphasis>Documentation</emphasis> für diese Dokumentation.
       </para>
 <!-- Translators may also add here a feedback address for translations -->
       <para>Falls Sie einen Ãœbersetzungsfehler finden, melden sie diesen bitte
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index 948a09b..6b3b53f 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -276,8 +276,8 @@
       <title>Feedback</title>
       <para>To report a bug or make a suggestion regarding this package or
         this manual, follow the directions at the
-        <ulink url="http://bugs.gnucash.org"
-          >&app; Bug Tracking System</ulink>.
+        <ulink url="&url-bug-start;"
+          >&appname; Bug Tracking System</ulink>.
       </para>
 <!-- Translators may also add here feedback address for translations -->
     </legalnotice>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index 18a204a..bad9327 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -228,16 +228,15 @@
     <legalnotice>
       <title>Feedback</title>
       <para>Um Fehler zu berichten oder anderes Feedback zu geben, benutzen Sie
-        bitte das &app; Bug-Tracking System
-        <ulink url="http://bugs.gnucash.org/enter_bug.cgi?product=GnuCash"
-          >Bugzilla</ulink>.
+        bitte das englischsprachige
+        <ulink url="&url-bug-start;">&appname; Bug-Tracking System</ulink>.
       </para>
 <!-- Translators may also add here feedback address for translations -->
       <para>Für spezifisch deutsche Fehler oder Verbesserungsvorschläge
         (Ãœbersetzung, Kontenrahmen, ...), benutzen Sie bitte die deutsche
         &appname; Email-Liste
         <ulink url="&url-mail-li;gnucash-de">&appname;-de</ulink>.
-        Tips zu ihrer Benutzung finden Sie auf
+        Tips zu ihrer Benutzung finden Sie in
         <ulink url="&url-wiki-ml-de;">Feedback auf der Mailingliste</ulink>.
       </para>
     </legalnotice>
@@ -4594,7 +4593,7 @@
           </listitem>
         </itemizedlist>
         <para />
-        <para>Die aktuell geöffnete Web-Seite wird im rechten Bereich des Hilfefensters angezeigt. Der linke Bereich enthält die Karteiseiten "Themen" und "Suchen". Wenn Sie auf der Karteiseite "Themen" ein Hilfethema auswählen, wird die entsprechende Web-Seite im rechten Bereich geladen. Die Liste der Hilfethemen enthält außerdem einen Link auf die GnuCash-Fehlerberichtsseite (http://bugs.gnucash.org).</para>
+        <para>Die aktuell geöffnete Web-Seite wird im rechten Bereich des Hilfefensters angezeigt. Der linke Bereich enthält die Karteiseiten "Themen" und "Suchen". Wenn Sie auf der Karteiseite "Themen" ein Hilfethema auswählen, wird die entsprechende Web-Seite im rechten Bereich geladen. Die Liste der Hilfethemen enthält außerdem einen Link auf die GnuCash-Fehlerberichtsseite (&url-bug-start;).</para>
         <para />
         <para>Die Karteiseite "Suchen" ermöglicht es, die Hilfe nach Dokumenten zu durchsuchen, welche die von Ihnen angegebenen Begriffe enthalten. Geben Sie den zu suchenden Begriff im Feld "Suchausdruck" ein und betätigen Sie den Knopf "Suchen". Sie erhalten eine Liste der Seiten, welche diesen Begriff enthalten. Wenn Sie einen der gefundenen Verweise in der Liste "Suchergebnisse" anklicken, wird die entsprechende Web-Seite geladen.</para>
       </sect3>

commit a2cc0d65e00bc03d25ad7cc351f2fc7145b1e952
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Jun 24 09:32:50 2019 +0200

    Minor improvement of german translation feedback

diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 7d00dbd..2b386d0 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -346,6 +346,10 @@
           >&app; Bug Tracking System</ulink>. Dort wählen Sie, je nach Ursache, die Komponente <emphasis>Documentation</emphasis> oder <emphasis>Translations</emphasis>.
       </para>
 <!-- Translators may also add here a feedback address for translations -->
+      <para>Falls Sie einen Ãœbersetzungsfehler finden, melden sie diesen bitte
+        auf der deutschsprachigen Mailingliste, siehe
+        <ulink url="&url-wiki-ml-de;">Feedback auf der Mailingliste</ulink>.
+      </para>
   </legalnotice>
 
 </bookinfo>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index 9770eaf..18a204a 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -233,10 +233,12 @@
           >Bugzilla</ulink>.
       </para>
 <!-- Translators may also add here feedback address for translations -->
-      <para>Für spezifisch deutsche Fehler oder Verbesserungsvorschläge (Übersetzung, Kontenrahmen, ...),
-        benutzen Sie bitte die deutsche &app; Email-Liste
-        <ulink url="https://lists.gnucash.org/mailman/listinfo/gnucash-de"
-           >&app;-de</ulink>.
+      <para>Für spezifisch deutsche Fehler oder Verbesserungsvorschläge
+        (Ãœbersetzung, Kontenrahmen, ...), benutzen Sie bitte die deutsche
+        &appname; Email-Liste
+        <ulink url="&url-mail-li;gnucash-de">&appname;-de</ulink>.
+        Tips zu ihrer Benutzung finden Sie auf
+        <ulink url="&url-wiki-ml-de;">Feedback auf der Mailingliste</ulink>.
       </para>
     </legalnotice>
 

commit f1e84d4397a0f9fd481990c7eb83daab98055ea2
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Jun 24 07:25:07 2019 +0200

    Add common URLs to gnc-docbook.dtd
    
    So changes can be applied easier and is also part of the preparation to
    use itstools.

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 9998b7a..361619a 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -28,7 +28,9 @@ own entity definitions to use across all of our DocBook pages. -->
 
 <!--
   Some global declarations which are used in the files. For easier
-  maintenance they should be collected here.
+  maintenance they are collected here.
+  
+  1. Publication - should only be changed by the release manager!
 -->
 <!ENTITY manrevision "3.5">
 <!ENTITY date "31 March 2019">
@@ -36,12 +38,39 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY vers-stable "3.5">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "3">
+
+<!-- 
+  Some common URLs - should be changed on demand.
+  
+  Translators can add localized instances by adding -<lang>,
+  An example is url-wiki-ml-de for the german wiki page about mailin lists.
+  We might later use http://itstool.org/documentation/its.html#localefilter instead.
+-->
+<!ENTITY url-www "https://www.gnucash.org/">
+<!ENTITY url-docs "https://www.gnucash.org/docs/">
+<!ENTITY url-wiki "https://wiki.gnucash.org/wiki/"> <!-- Append the desired topic -->
+<!ENTITY url-bug-wiki "https://wiki.gnucash.org/wiki/Bugzilla">
+  <!-- The wiki page explaining the usage of bugzilla -->
+<!ENTITY url-bug-start "https://bugs.gnucash.org/">
+<!ENTITY url-bug-search "https://bugs.gnucash.org/query.cgi">
+<!ENTITY url-bug-browse "https://bugs.gnucash.org/describecomponents.cgi">
+<!ENTITY url-gnome-dev "https://developer.gnome.org/"> <!-- Append the desired topic -->
+<!ENTITY url-gnu "https://www.gnu.org/"> <!-- Append the desired topic -->
+<!ENTITY url-wiki-faq "https://wiki.gnucash.org/wiki/FAQ">
+<!ENTITY url-mail-li "https://lists.gnucash.org/mailman/listinfo/"> <!-- Append the desired list -->
+<!ENTITY url-wiki-ml "https://wiki.gnucash.org/wiki/Mailiing_Lists">
+<!ENTITY url-wiki-ml-de "https://wiki.gnucash.org/wiki/De/Feedback#Auf_der_Mailingliste">
+<!ENTITY url-logs-irc "https://lists.gnucash.org/logs/">
+  <!-- for IRC. If someone needs build logs, scan https://code.gnucash.org/builds/ -->
+<!ENTITY url-wp-en "https://en.wikipedia.org/wiki/"> <!-- Append the desired topic -->
+
 <!--
   Translators:
     "&app;" replaces all occurences of "GnuCash" in the guide, so
    transliterate "GnuCash" here.
 -->
-<!ENTITY app "GnuCash">
+<!ENTITY app "GnuCash"> <!-- This is deprecated and will later contain "<app>GnuCash</app>" -->
+<!ENTITY appname "GnuCash">
 
 <!--
   Translators:

commit 3634474a7a2da7d3eacbe45777f34a7b19c186f5
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Jun 23 23:11:06 2019 +0200

    Guide: Move the FDL appendix into the appendix part
    
    Several languages had it separate

diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index c85c248..ecb0c2f 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -477,7 +477,7 @@
 <xi:include href="appendixb.xml" />
 <xi:include href="appendixc.xml" />
 <xi:include href="appendixd.xml" />
-</part>
 <xi:include href="fdl-appendix.xml" />
+</part>
 
 </book>
diff --git a/guide/pt/gnucash-guide.xml b/guide/pt/gnucash-guide.xml
index a720dee..8023e27 100644
--- a/guide/pt/gnucash-guide.xml
+++ b/guide/pt/gnucash-guide.xml
@@ -404,7 +404,7 @@
     <xi:include href="appendixb.xml" />
     <xi:include href="appendixc.xml" />
     <xi:include href="appendixd.xml" />
+    <xi:include href="fdl-appendix.xml" />
 </part>
-<xi:include href="fdl-appendix.xml" />
 
 </book>
diff --git a/guide/ru/gnucash-guide.xml b/guide/ru/gnucash-guide.xml
index 7440852..bffebd1 100644
--- a/guide/ru/gnucash-guide.xml
+++ b/guide/ru/gnucash-guide.xml
@@ -450,7 +450,7 @@
     <xi:include href="appendixb.xml" />
     <xi:include href="appendixc.xml" />
     <xi:include href="appendixd.xml" />
+    <xi:include href="fdl-appendix.xml" />
 </part>
-<xi:include href="fdl-appendix.xml" />
 
 </book>

commit c855c4f9694d3f0ad7885984a6da21cfade20e04
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Jun 23 23:09:16 2019 +0200

    Guide Bus: Add IDs to tables
    
    Then they will appear in the "List of Tables"
    
    Additional update: In 2007 the EC became the EU

diff --git a/guide/C/ch_bus_features.xml b/guide/C/ch_bus_features.xml
index 9644cd4..ac0d14f 100644
--- a/guide/C/ch_bus_features.xml
+++ b/guide/C/ch_bus_features.xml
@@ -218,8 +218,8 @@ Basic A/R and A/P Account Hierarchy:
       may be used as starting points to determine the setup
       appropriate for a particular jurisdiction.</para>
 
-      <table frame='all'>
-        <title>Sample Tax Table Entries for EC country (e.g. 21% / 6%
+      <table frame='all' id="bus-tax-tbl-eu">
+        <title>Sample Tax Table Entries for EU country (e.g. 21% / 6%
         / 0% Belgium, 20% / 5% / 0% UK etc.)  (2017)</title>
         <tgroup cols='3' align='left' colsep='1' rowsep='1'>
           <thead>
@@ -273,7 +273,7 @@ Basic A/R and A/P Account Hierarchy:
         </tgroup>
       </table>
 
-      <table frame='all'>
+      <table frame='all' id="bus-tax-tbl-au">
         <title>Sample Tax Table Entries for Australia (2017)
         </title>
         <tgroup cols='3' align='left' colsep='1' rowsep='1'>
@@ -309,7 +309,7 @@ Basic A/R and A/P Account Hierarchy:
         </tgroup>
       </table>
 
-      <table frame='all'>
+      <table frame='all' id="bus-tax-tbl-us">
         <title>Sample Tax Table Entries for Cook County, Illinois (2017)</title>
         <tgroup cols='3' align='left' colsep='1' rowsep='1'>
           <thead>
@@ -1432,7 +1432,7 @@ Basic A/R and A/P Account Hierarchy:
            <para>With the deductions list from above, an employee split transaction map can be generated. Each of the items in the list is mapped to a <application>&app;</application> account.</para>
            
            <para>
-              <table>
+              <table id="bus-payroll-txn-tbl">
                  <title>Payroll Transaction Map</title>
                  <tgroup cols="3">
                     <thead>
@@ -1529,7 +1529,7 @@ Basic A/R and A/P Account Hierarchy:
            </itemizedlist>
            
            <para>
-              <table>
+              <table id="bus-payroll-txn-empl-tbl">
                  <title>Payroll Transaction Map for Employee 1</title>
                  <tgroup cols="3">
                     <thead>

commit 4099a8d8375fc4da93b4891328ba48767d3be3dc
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Jun 23 22:39:12 2019 +0200

    Use <equation> instead of <emphasis> in chapter basics
    
    This will allow us to link to equations
    and generates a "List of Equations" in most outut formats

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 0d922bb..204e6fe 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -97,7 +97,10 @@
       equity is defined by assets and liability. That is, your net worth is
       calculated by subtracting your liabilities from your assets:</para>
 
-      <para><emphasis>Assets - Liabilities = Equity</emphasis></para>
+      <equation id="accounting_equation_static">
+        <title>The static accounting equation</title>
+        <mathphrase>Assets - Liabilities = Equity</mathphrase>
+      </equation>
 
       <para>Furthermore, you can increase your equity through income, and
       decrease equity through expenses. This makes sense of course, when you
@@ -105,8 +108,10 @@
       become <quote>poorer</quote>. This is expressed mathematically in what is known as
       the Accounting Equation:</para>
 
-      <para><emphasis>Assets - Liabilities = Equity + (Income -
-      Expenses)</emphasis></para>
+      <equation id="accounting_equation_dynamic">
+        <title>The (dynamic) accounting equation</title>
+        <mathphrase>Assets - Liabilities = Equity + (Income - Expenses)</mathphrase>
+      </equation>
 
       <para>This equation must always be balanced, a condition that can only
       be satisfied if you enter values to multiple accounts. For example: if
@@ -153,8 +158,10 @@
        transposing any account type with a negative sign to the other side to obtain:
       </para>
       
-      <para><emphasis> Assets + Expenses = Liabilities + Equity + Income</emphasis>.
-      </para>
+      <equation id="accounting_equation_rearranged">
+        <title>The rearranged accounting equation</title>
+        <mathphrase> Assets + Expenses = Liabilities + Equity + Income</mathphrase>
+      </equation>
       
       <para>With the accounting equation in this form, the accounts on the left hand side of the equal sign 
       are known as <emphasis>debit balance accounts</emphasis> in accounting practice,

commit 0539a20346245fc9b51383662a4b9b39f01aee29
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jun 22 07:36:47 2019 +0200

    Add table id
    
    Without it is not shown in the list of tables.
    Added also a missing space.

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 68b1c89..0d922bb 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -167,7 +167,8 @@
       the accounts of these types. Again debit entries to accounts of these types will reduce the balance in the account.
       </para>
       
-      <table frame='all'><title>Summary of effect of debits (Dr) and credits (Cr)on the balance of accounts of the 5 account types</title>
+      <table frame='all' id="basics-debits-credits-effect-tbl">
+        <title>Summary of effect of debits (Dr) and credits (Cr) on the balance of accounts of the 5 account types</title>
         <tgroup cols='3' align='left' colsep='1' rowsep='1'>
         <colspec colname='c1'/><colspec colname='c2'/><colspec colname='c3'/>
           <thead>

commit 007ab93440a4617317f3281dbc3a4a9dc469cff0
Author: David Cousens <davidcousens at bigpond.com>
Date:   Thu May 30 16:42:42 2019 +1000

    Draft Debit and Credits section
    
    Debit and Credit section showing which accounmt types have debit balances and which haave credit balances and the effect of debits and credits on each account type.
    Debits and Credits section
    
    Minor fix to missing tag
    Double Entry section
    
    Add a reference to the debit and credit section above

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 164ae29..68b1c89 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -142,7 +142,49 @@
         </screenshot>
       </figure>
     </sect2>
-
+    
+    <sect2 id="basics-debits-credits">
+      <title>Debits and Credits</title>
+      
+      <para>The use of debits and credits in accounting and their effect on accounts of different types
+       is often confusing when first encountered in acccounting. The accounting equation introduced above
+       is the key to understanding which accounts types are debited or credited and when. First of all we need
+       to rearrange the expanded form a little bit with Assets on the left hand side of the equal sign and 
+       transposing any account type with a negative sign to the other side to obtain:
+      </para>
+      
+      <para><emphasis> Assets + Expenses = Liabilities + Equity + Income</emphasis>.
+      </para>
+      
+      <para>With the accounting equation in this form, the accounts on the left hand side of the equal sign 
+      are known as <emphasis>debit balance accounts</emphasis> in accounting practice,
+      that is the normal positive balance for these accounts is increased by <emphasis>debit</emphasis> entries to accounts of these types. 
+      Conversely credit entries to accounts of these types will decrease the balance of accounts of these types.
+      </para>
+      
+      <para>Similarly, the account types on the right hand side of the equal sign are known as <emphasis>credit balance
+      accounts</emphasis>, that is the normal positive balance for these account types is increased by <emphasis>credit</emphasis> entries to
+      the accounts of these types. Again debit entries to accounts of these types will reduce the balance in the account.
+      </para>
+      
+      <table frame='all'><title>Summary of effect of debits (Dr) and credits (Cr)on the balance of accounts of the 5 account types</title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+        <colspec colname='c1'/><colspec colname='c2'/><colspec colname='c3'/>
+          <thead>
+          <row><entry>Account Type</entry><entry namest="c2" nameend="c3" align ="center">Effect on Account Balance</entry></row>
+          <row><entry> </entry><entry>Debit (Dr)</entry><entry>Credit (Cr)</entry></row>
+          </thead>
+          <tbody>
+          <row><entry>Assets</entry><entry morerows='1' valign='middle'>Increase</entry><entry morerows='1' valign='middle'>Decrease</entry></row>
+          <row><entry>Expenses</entry></row>
+          <row><entry>Liabilities</entry><entry morerows='2' valign='middle'>Decrease</entry><entry morerows='2' valign='middle'>Increase</entry></row>
+          <row><entry>Equity</entry></row>
+          <row><entry>Income</entry></row>
+          </tbody>      
+        </tgroup>
+      </table>    
+    </sect2>
+    
     <sect2 id="basics-accountingdouble2">
       <title>Double Entry</title>
 
@@ -160,7 +202,7 @@
       Accounting <firstterm>debits</firstterm> and
       <firstterm>credits</firstterm> do not mean <quote>decrease</quote>
       and <quote>increase</quote>. Debits and credits each increase certain
-      types of accounts and decrease others. In asset and expense accounts,
+      types of accounts and decrease others as described in the previous section. In asset and expense accounts,
       debits increase the balance and credits decrease the balance. In
       liability, equity and income accounts, credits increase the balance
       and debits decrease the balance.</para>

commit af6622646f6e27fb8cca73189ecc47eb05f146af
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon May 13 16:50:06 2019 +0200

    Add screenshots of book options in help

diff --git a/help/C/Help_ch_Customize.xml b/help/C/Help_ch_Customize.xml
index 9c4bd16..b385779 100644
--- a/help/C/Help_ch_Customize.xml
+++ b/help/C/Help_ch_Customize.xml
@@ -938,7 +938,7 @@
             </listitem>
 
             <listitem>
-              <para><guilabel>Tab order includes Transfer on Memorised Transaction:</guilabel>
+              <para><guilabel>Tab order includes Transfer on Memorized Transaction:</guilabel>
               If selected, when the transaction is auto filled, pressing the
               <keycap>Tab</keycap> key in the register the cursor’s jump
               will include the <guilabel>Transfer</guilabel> field.</para>
@@ -1370,6 +1370,20 @@
       <sect2 id="accounts-book-options">
         <title>Accounts Book Options Tab</title>
 
+      <figure id="book-opt-acc-fig">
+        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>
+          Accounts</guilabel> tab
+        </title>
+        <screenshot id="Book_Options_Accounts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/Help_Book_Options_Accounts.png"
+                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+
         <para>The <guilabel>Accounts</guilabel> tab of this dialog allows
           the selection of options that affect how accounting registers function.
         </para>
@@ -1496,6 +1510,20 @@
       <sect2 id="budgeting-book-options">
         <title>Budgeting Book Options Tab</title>
 
+      <figure id="book-opt-bud-fig">
+        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>
+          Budgeting</guilabel> tab
+        </title>
+        <screenshot id="Book_Options_Budgeting">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
+                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+
         <para>The <guilabel>Budgeting</guilabel> tab allows you to specify the
          budget to be used for reports when none has otherwise been specified.</para>
       </sect2>
@@ -1503,13 +1531,27 @@
       <sect2 id="business-book-options">
         <title>Business Book Options Tab</title>
 
+      <figure id="book-opt-bus-fig">
+        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>
+          Business</guilabel> tab
+        </title>
+        <screenshot id="Book_Options_Business">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/Help_Book_Options_Business.png"
+                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+
         <para>The <guilabel>Business</guilabel> tab allows you to enter values
         that are in turn used by the business features of <application>&app;</application>:</para>
 
       <variablelist>
         <varlistentry>
           <term>Company Name</term>
-          <listitem><para>The name of the company.</para></listitem>
+          <listitem><para>The name of the company is used in many reports.</para></listitem>
         </varlistentry>
 
         <varlistentry>
@@ -1563,6 +1605,20 @@
       <sect2 id="counters-book-options">
         <title>Counters Book Options Tab</title>
 
+      <figure id="book-opt-count-fig">
+        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>
+          Counters</guilabel> tab
+        </title>
+        <screenshot id="Book_Options_Counters">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/Help_Book_Options_Counters.png"
+                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+
         <para>The <guilabel>Counters</guilabel> tab allows you to set the
          'previous' value for each number indicated: Bill, Customer, Employee,
          etc. These counters are used by the <xref linkend="chapter_busnss" /> of
diff --git a/help/C/figures/Help_Book_Options_Accounts.png b/help/C/figures/Help_Book_Options_Accounts.png
new file mode 100644
index 0000000..76c8390
Binary files /dev/null and b/help/C/figures/Help_Book_Options_Accounts.png differ
diff --git a/help/C/figures/Help_Book_Options_Budgeting.png b/help/C/figures/Help_Book_Options_Budgeting.png
new file mode 100644
index 0000000..a144496
Binary files /dev/null and b/help/C/figures/Help_Book_Options_Budgeting.png differ
diff --git a/help/C/figures/Help_Book_Options_Business.png b/help/C/figures/Help_Book_Options_Business.png
new file mode 100644
index 0000000..2608c4a
Binary files /dev/null and b/help/C/figures/Help_Book_Options_Business.png differ
diff --git a/help/C/figures/Help_Book_Options_Counters.png b/help/C/figures/Help_Book_Options_Counters.png
new file mode 100644
index 0000000..64bcd7f
Binary files /dev/null and b/help/C/figures/Help_Book_Options_Counters.png differ

commit e903525f16096c9f717cca6b439e51336a217e99
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu May 9 03:59:55 2019 +0200

    Update README
    
    Dependencies:
    new: FontBox for ru pdf
    downgrade rarian
    
    Known issues:
    remove outdated list
    update Bug URL

diff --git a/README b/README
index c5fba20..2e34554 100644
--- a/README
+++ b/README
@@ -24,12 +24,14 @@ Requirements
 * libxslt [Debian packed the required xsltproc in a separate package, 
            which depends on libxslt]
 * docbook-xsl
+* yelp (for viewing)
+
+Only Gnome <=2 based desktops:
 * rarian or
   scrollkeeper >=0.3.4 (its ancestor)
-* yelp (for viewing)
 
 Optional:
-* gnome-doc-utils (contains xml2po for the use of po editors like in the it translation)
+* gnome-doc-utils (contains xml2po for the use of po editors like in the italian translation)
 
 Additional Requirements for Generating Mobipocket:
 
@@ -50,6 +52,11 @@ other Japanese fonts you can use the with-japanese-fonts-dir,
 options to select them. fop's TTFReader can't, as of version 1.1
 anyway, handle OpenType fonts.
 
+** FontBox
+ from the Apache PDFBox [https://pdfbox.apache.org/download.cgi]
+ can handle OpenType fonts, which are as default used for the russian PDF.
+ Some distributions call it [lib]fontbox[-java].
+
 Notes
 #####
 
@@ -183,27 +190,19 @@ xmlto html-nochunks gnucash-help.xml
 Known Problems
 ##############
 
-Please send feedback to gnucash-devel at gnucash.org for any difficulties, 
-hints or suggestions with the docs. There are a few known problems.
-
-- Help documentation missing documentation for multi-currency support,
-  Business module and OFX import. Menu description incomplete.
-
-- Guide needs some updates still.
-
-- Full list: 
-https://bugzilla.gnome.org/buglist.cgi?product=GnuCash&component=Documentation
+- See the full list: 
+https://bugs.gnucash.org/buglist.cgi?quicksearch=product%3DDocumentation
 
-That's it for now! Please report any new problems to the Gnome bugzilla at 
-https://bugzilla.gnome.org/browse.cgi?product=GnuCash. Then choose the 
-component Documentation.
+- Please report any new problems to Gnucash's Bugzilla at 
+https://bugs.gnucash.org/describecomponents.cgi?product=Documentation. Then
+choose a component.
 
-Feel free to append your updates also there or open a pull request.
-Only docs about future features should go in branch master.
+- Feel free to append your fixes and improvements also there or open a pull
+request. Only docs about future features should go in branch master.
 So here is the link for branch stable:
 https://github.com/Gnucash/gnucash-docs/pull/new/maint.
 
-With any problems you have, you can contact us in the following ways:
+- With any problems you have, you can contact us in the following ways:
  
 * quick questions via IRC
 ** en: irc://irc.gnome.org/gnucash 

commit 1a8c502d6793aa463c6614cb606356e5bdbb30a2
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Mar 31 19:37:41 2019 +0200

    Use full words and sentences for reconciliation state in Help
    Transactions

diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index 6d09c8c..2da6bd8 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -574,14 +574,14 @@ Author:
 
   <sect1 id="trans-stts">
     <title>Setting the reconcile status (<guilabel>R</guilabel> field) of a transaction</title>
-    <para>In the <application>&app;</application> register there is a column named <guilabel>R</guilabel>. This field
+    <para>In the <application>&app;</application> register there is a column labeled <guilabel>R</guilabel>. This field
     indicates the status of a transaction. Possible values are:</para>
 
     <variablelist>
       <varlistentry>
         <term><guilabel>n</guilabel></term>
         <listitem>
-          <para>Default status when a transaction is created</para>
+          <para>No. This is the default status when a transaction is created.</para>
         </listitem>
       </varlistentry>
 
@@ -595,7 +595,7 @@ Author:
       <varlistentry>
         <term><guilabel>y</guilabel></term>
         <listitem>
-          <para>Status assigned solely by the reconciliation process (see <xref linkend="acct-reconcile" />).
+          <para>Yes, reconciled. This status is solely assigned by the reconciliation process (see <xref linkend="acct-reconcile" />).
           Places limits optionally requiring confirmation on editing fields in that line of a transaction.</para>
         </listitem>
       </varlistentry>

commit 5e2c5e583f48dc43718b22fa6f7f46d33a426454
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Apr 30 20:44:02 2019 +0200

    Guide/C: remove obsolete Report_Screen.png

diff --git a/help/C/figures/Report_Screen.png b/help/C/figures/Report_Screen.png
deleted file mode 100644
index 48e68ba..0000000
Binary files a/help/C/figures/Report_Screen.png and /dev/null differ

commit b48da530a3eb7684251b19de4bde3a3830d3631e
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Apr 30 01:35:58 2019 +0200

    Help: Update 2 Preference images
    
    They had the full (unrelated) screen instead of the current window

diff --git a/help/C/figures/Help_Pref_Business.png b/help/C/figures/Help_Pref_Business.png
index 3ae20ea..f156a75 100644
Binary files a/help/C/figures/Help_Pref_Business.png and b/help/C/figures/Help_Pref_Business.png differ
diff --git a/help/C/figures/Help_Pref_OnlineBanking.png b/help/C/figures/Help_Pref_OnlineBanking.png
index 0cb9875..8c1c395 100755
Binary files a/help/C/figures/Help_Pref_OnlineBanking.png and b/help/C/figures/Help_Pref_OnlineBanking.png differ

commit f92b8168d10d8ceba386e284dc380f4ce0fc8b88
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Mar 30 23:02:28 2019 +0100

    Replace most occurences of <emphasis> in help:transactions
    
    Usually there are more specific tags available

diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index cda53e3..6d09c8c 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -3,18 +3,20 @@
 
 <!--
     (Do not remove this comment block.)
-    Version: 2.0.x
-    Last modified: April 15th 2007
+    Version: 3.5
+    Last modified: March 30th 2019
+    modified: April 15th 2007
     modified: August 12th 2006
     modified: February 28th 2005
 
 Maintainers:
-Chris Lyttle <chris at wilddev.net>
-Neil Williams <linux at codehelp.co.uk>
+  Frank H. Ellenberger
+  Chris Lyttle <chris at wilddev.net>
+  Neil Williams <linux at codehelp.co.uk>
 
 Author:
-Chris Lyttle <chris at wilddev.net>
-Translators:
+  Chris Lyttle <chris at wilddev.net>
+  Translators:
 (translators put your name and email here)
 -->
 
@@ -90,7 +92,7 @@ Translators:
       <listitem><para><guilabel>Memo:</guilabel> Additional information you
       might want to note about the transaction. Anything entered here
       will be added to the <guilabel>Memo</guilabel> fields of
-      <emphasis role="italic">both</emphasis> splits.</para></listitem>
+      <emphasis>both</emphasis> splits.</para></listitem>
     </itemizedlist>
     </sect2>
     <sect2><title>Transfer Accounts</title>
@@ -138,7 +140,7 @@ Translators:
       Rate</guilabel> button.</para></listitem>
       <listitem><para>Select the
       <guilabel>To Amount</guilabel> radio button if you want to enter
-      the amount of the <emphasis role="italic">To Account</emphasis>
+      the amount of the <emphasis>To Account</emphasis>
       split.</para></listitem>
       <listitem><para>Enter the price/exchange rate or the amount in the
       numeric entry corresponding to radio button you
@@ -256,7 +258,7 @@ Translators:
         </listitem>
 
         <listitem>
-          <para>The next field (R) is used for reconciliation. This is described in the <guimenu>Reconcile an
+          <para>The next field <guilabel>R</guilabel> is used for reconciliation. This is described in the <guimenu>Reconcile an
           Account to a Statement</guimenu> section.  <xref linkend="acct-reconcile"></xref></para>
         </listitem>
 
@@ -336,7 +338,7 @@ Translators:
 
       <listitem>
         <para>When typing in the <guilabel>Transfer</guilabel> field <application>&app;</application> will also attempt to automatically match the account.
-        It does this alphabetically, so typing <emphasis>Ex</emphasis> will match the <emphasis>Expenses</emphasis> section of the account list.
+        It does this alphabetically, so typing <userinput>Ex</userinput> will match the <computeroutput>Expenses</computeroutput> section of the account list.
         When the section is matched, it is possible to move to a child account by pressing <keycap>:</keycap> (colon).
         If after typing <emphasis>Ex</emphasis> you press <keycap>:</keycap> then the cursor will move to the first child account in the
         list.  Typing combinations of letters and <keycap>:</keycap> will allow movement down the tree of accounts
@@ -638,8 +640,7 @@ Translators:
     <title>Scheduling Transactions</title>
 
     <para>Scheduled Transactions provide the ability to have reminders scheduled or transactions scheduled to be
-    entered at a specified date. This is combined with the <emphasis role="bold">Since Last Run
-    </emphasis> assistant (<xref linkend="trans-sched-slr"></xref>) to review and enter the transactions. The
+    entered at a specified date. This is combined with the <guilabel>Since Last Run</guilabel> assistant (<xref linkend="trans-sched-slr"></xref>) to review and enter the transactions. The
     <guilabel>Mortgage & Loan Repayment</guilabel> assistant (<xref linkend="trans-sched-loans"></xref>) is used
     to setup a scheduled transaction to repay a compounding interest loan. The Scheduled Transaction Editor
     (<xref linkend="sched-editor"></xref>) is used to create and edit transactions that are to be added to the
@@ -722,26 +723,26 @@ Translators:
   </sect1>
   <sect1 id="sched-editor">
     <title>Edit Scheduled Transaction Window</title>
-
+<!-- Todo: has been redesigned --> 
     <para>The Edit Scheduled Transaction Window is divided into a Name area, Options area, Occurrences area,
     Recurrence Frequency area, mini calendar and Template Transaction pane.</para>
 
-    <para>The <emphasis role="bold">Name</emphasis> field is used to enter the name for the scheduled transaction. This will be
+    <para>The <guilabel>Name</guilabel> field is used to enter the name for the scheduled transaction. This will be
     used in the <guilabel>Description</guilabel> of the transaction.</para>
 
-    <para>The <emphasis role="bold">Options</emphasis> area contains check-boxes to set if the transaction is
+    <para>The <guilabel>Options</guilabel> area contains check-boxes to set if the transaction is
     automatically created and how many days in advance the transaction is created and/or a reminder posted.
     </para>
 
-    <para>The <emphasis role="bold">Occurrences</emphasis> area contains selections to set for dates limits on
+    <para>The <guilabel>Occurrences</guilabel> area contains selections to set for dates limits on
     transactions to be entered or the number of transactions to be entered.</para>
 
-    <para>The <emphasis role="bold">Recurrence Frequency</emphasis> area contains selections to set how
+    <para>The <guilabel>Recurrence Frequency</guilabel> area contains selections to set how
     often the transaction is scheduled to be added and on what dates this occurs.</para>
 
     <para>The mini calendar provides a visual indication of what transactions are already scheduled.</para>
 
-    <para>The <emphasis role="bold">Template Transaction</emphasis> pane allows you to setup the transaction
+    <para>The <guilabel>Template Transaction</guilabel> pane allows you to setup the transaction
     as you would like it to be entered into the register.</para>
 
     <para>These options are described in more detail in <xref linkend="trans-sched"></xref></para>
@@ -892,9 +893,9 @@ Translators:
                (.csv)  Comma Separated Values;</para></listitem>
         </itemizedlist>
       
-      <para>These import methods can be accessed from the <emphasis role="bold">Import</emphasis> submenu
-            of the main menu <emphasis role="bold">File</emphasis> entry, along with methods for importing
-            other types of data. Select the appropriate entry in the <emphasis role="bold">Import</emphasis>
+      <para>These import methods can be accessed from the <guisubmenu>Import</guisubmenu> submenu
+            of the main menu <guimenu>File</guimenu> entry, along with methods for importing
+            other types of data. Select the appropriate entry in the <guisubmenu>Import</guisubmenu>
             sub menu to initiate importing transactions.
       </para>      
     </sect2>
@@ -908,9 +909,16 @@ Translators:
       <sect3><title>To import QIF files:</title><para> </para></sect3>
       <sect3>
         <title>Load all of the QIF files containing data you wish to import</title>
-        <para>To do this, select <emphasis role="bold">File -> Import -> Import QIF...</emphasis> from the menu. When the QIF Import dialog
-              box appears, click <emphasis role="bold">Next</emphasis> and follow the instructions to guide you through the process of loading
-              your files.
+        <para>To do this, select
+          <menuchoice>
+            <guimenu>File</guimenu>
+            <guisubmenu>Import</guisubmenu>
+            <guimenuitem>Import QIF...</guimenuitem>
+          </menuchoice>
+          from the menu. When the QIF Import dialog box appears, click
+          <guibutton>Next</guibutton>
+          button and follow the instructions to guide you through the process
+          of loading your files.
         </para>
         <para>This image shows the start of the QIF Import Druid.<!--FIXME put an image of the import druid in --> </para>
         <para>You will be prompted for a filename to load. Use the Select button to select your QIF file and
@@ -928,21 +936,21 @@ Translators:
               income and expense categories import as GnuCash income and expense accounts <!--(see section 3.1 FIXME for 
               more on this).--> Make changes to these account names if necessary, and click Next to continue.
         </para>
-        <para><emphasis role="bold">Note:</emphasis> If you are not sure what changes are needed, it is safe to
+        <note><para>If you are not sure what changes are needed, it is safe to
               accept the GnuCash account names. It is easy to edit the accounts later if you find you need to make
               a change.
-        </para>
-        <para>From the drop-down list, select a standard currency to be used for the  imported accounts and click <emphasis role="bold">Next</emphasis>
+        </para></note>
+        <para>From the drop-down list, select a standard currency to be used for the imported accounts and click <guibutton>Next</guibutton>
               to continue. If you have stocks, mutual funds, or other securities, you will be prompted for additional
               information. The importer dialog will ask for the exchange or listing (i.e. Nasdaq), the security's 
               full name, and the ticker symbol. If you do not have this information handy, you can edit the account
-              information later, once the import is complete. Click <emphasis role="bold">Next</emphasis> to continue.
+              information later, once the import is complete. Click <guibutton>Next</guibutton> button to continue.
         </para>
       </sect3>
       <sect3>
         <title>Tell GnuCash to import the data.</title>
         <para>The last step is the import. Once you have verified your account names and investment information, 
-              click <emphasis role="bold">Finish</emphasis> in the Update your GnuCash accounts page to complete the import process. Depending 
+              click <guibutton>Finish</guibutton> button in the Update your GnuCash accounts page to complete the import process. Depending 
               upon the size of your file, the import might take a few minutes to complete, so a progress bar 
               displays the percentage finished. When the import process is complete, GnuCash will return you 
               to the main window, which should now display the names of the accounts you imported.
@@ -952,9 +960,9 @@ Translators:
     <sect2 id="trans-import-ofx">
       <title>Import OFX/QFX</title>
       <para>This opens a file selection dialog. Navigate to the file you wish to import, select a file with 
-        the appropriate extension (.ofx  or .qfx), then press the <emphasis role="bold">Import</emphasis> button.</para>
+        the appropriate extension (.ofx  or .qfx), then press the <guibutton>Import</guibutton> button button.</para>
       <para>Gnucash opens an Account Selection dialog to select an account in your CoA corresponding to data source. Select
-        the appropriate account from the account tree and press the <emphasis role="bold">OK</emphasis> button. On subsequent import of files from the 
+        the appropriate account from the account tree and press the <guibutton>OK</guibutton> button. On subsequent import of files from the 
         same source (identified by tags in the file), the source is remembered and the account selection dialog is not
         displayed.</para>
       <para>The generic import transaction matcher dialog is opened next. See the <link linkend="trans-import-matcher">
@@ -964,9 +972,9 @@ Translators:
     </sect2>
     <sect2 id="trans-import-csv">
       <title>Import CSV</title>
-      <para>Clicking on <emphasis role="bold">Import CSV</emphasis> in the Import menu will bring up the Import Assistant dialog. The first step brings up a file selection 
+      <para>Clicking on <guimenuitem>Import CSV...</guimenuitem> in the Import menu will bring up the Import Assistant dialog. The first step brings up a file selection 
             dialog. Navigate to the location where the file you wish to import is located and select the file to import then click the 
-            <emphasis role="bold">OK</emphasis> button.
+            <guibutton>OK</guibutton> button.
       </para>
       <para>The next window will allow you to set parameters for the importing of the file. All widgets have tooltips which explain what 
             the setting affects and the options for the setting.
@@ -974,10 +982,10 @@ Translators:
       <sect3 id="trans-import-csv-save">
           <title>Load and Save Settings</title>
           <para>If this import is a regular occurrence, once you have set the other import paramters, you can save these settings by typing
-                in a setting name in the <emphasis role="bold">Load and Save Settings Entry</emphasis> combo box and pressing the <emphasis role="bold">Save</emphasis> button just to the right of the box. 
+                in a setting name in the <guilabel>Load and Save Settings Entry</guilabel> combo box and pressing the <guibutton>Save</guibutton> button just to the right of the box. 
                 Previously defined settings can be retrieved by selecting the appropriate setting name from the dropdown list activated by
                 the down arrow at the right end of the text box. The trash can button to the right of the Save button can be used to remove
-                the settings selected from the drop down list for the box. The settings group <emphasis role="bold">"GnuCash Export Settings"</emphasis> define a setting 
+                the settings selected from the drop down list for the box. The settings group <computeroutput>"GnuCash Export Settings"</computeroutput> define a setting 
                 group for the export and reimport of GnuCash transaction data - use this if importing data previously exported from GnuCash.
           </para>
       </sect3>
@@ -993,22 +1001,22 @@ Translators:
         </para>
         <itemizedlist>
           <listitem>
-            <para><emphasis role="bold">Fixed width columns</emphasis> Selecting this radio button will allow you to define 
+            <para><guilabel>Fixed width columns</guilabel>: Selecting this radio button will allow you to define 
                  column boundaries by double clicking at the appropriate positions in the sample records displayed in the 
                  panel below. Single clicking in a column will narrow, widen or merge the column.
             </para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Separators</emphasis> Selecting this radio button will allow you to define characters
+            <para><guilabel>Separators</guilabel>: Selecting this radio button will allow you to define characters
                   which will be used to distinguish columns in the input file. The default is comma separated however spaces,
                   tabs,colons or semicolons or any combination of them may be used to separate columns in the input file by 
                   selecting the appropriate check boxes. You may also define custom separators by typing the required characters
-                  into the text box and selecting the <emphasis role="bold">Custom</emphasis> checkbox. This may be used in combination with any of the 
+                  into the text box and selecting the <guilabel>Custom</guilabel> checkbox. This may be used in combination with any of the 
                   predefined separators.
             </para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Multi-split</emphasis> Selecting this check box allows the splits for a single transaction
+            <para><guilabel>Multi-split</guilabel>: Selecting this check box allows the splits for a single transaction
                  to be defined on consecutive lines within the file with each line defining a single split. If not selected each
                  line is assumed to contain the information for a single transaction including one or two splits.
             </para>
@@ -1020,12 +1028,12 @@ Translators:
         <para>The miscellaneous settings allow you to set:
         </para>
         <itemizedlist>
-          <listitem><para><emphasis role="bold">Encoding</emphasis>This is usually the UTF-8 variant for your locale;</para></listitem>
-          <listitem><para><emphasis role="bold">Date Format</emphasis> This does not default to the Locale setting so check it matches the data you are importing;</para></listitem>
-          <listitem><para><emphasis role="bold">Currency Format</emphasis>;</para></listitem>
-          <listitem><para><emphasis role="bold">Leading Lines to Skip</emphasis>;</para></listitem>
-          <listitem><para><emphasis role="bold">Trailing Lines to Skip</emphasis>;</para></listitem>
-          <listitem><para><emphasis role="bold">Skip alternate lines</emphasis>;</para></listitem>
+          <listitem><para><guilabel>Encoding</guilabel>: This is usually the UTF-8 variant for your locale;</para></listitem>
+          <listitem><para><guilabel>Date Format</guilabel>: This does not default to the Locale setting so check it matches the data you are importing;</para></listitem>
+          <listitem><para><guilabel>Currency Format</guilabel>: </para></listitem>
+          <listitem><para><guilabel>Leading Lines to Skip</guilabel>: </para></listitem>
+          <listitem><para><guilabel>Trailing Lines to Skip</guilabel>: </para></listitem>
+          <listitem><para><guilabel>Skip alternate lines</guilabel>: </para></listitem>
           </itemizedlist>
          <para>to match the settings for the file you are importing. Tooltips may also contain information on the setting and options.</para>
       </sect3>
@@ -1034,21 +1042,21 @@ Translators:
         <para>The import panel shows the data being imported as it is interpreted using the settings chosen to define columns and formats.
             The dropdown lists in the headers for each column of the import allow you to associate a specific column in the imported data
             with a specific field in the display of a transaction in an account register. At a minimum to import data, columns in the 
-            imported data containing the following information <emphasis role="bold">must</emphasis> be specified:
+            imported data containing the following information <emphasis>must</emphasis> be specified:
         </para>
         <itemizedlist>
-          <listitem><para><emphasis role="bold">Date </emphasis>of transaction;</para></listitem>
-          <listitem><para><emphasis role="bold">Account</emphasis> into which transaction is to be imported (or alternatively set the base account as above);</para></listitem>
-          <listitem><para><emphasis role="bold">Description</emphasis> of the transaction;</para></listitem>
-          <listitem><para><emphasis role="bold">Deposit or Withdrawal</emphasis> column.</para></listitem>
+          <listitem><para><guilabel>Date</guilabel>: of transaction;</para></listitem>
+          <listitem><para><guilabel>Account</guilabel>: into which transaction is to be imported (or alternatively set the base account as above);</para></listitem>
+          <listitem><para><guilabel>Description</guilabel>: of the transaction;</para></listitem>
+          <listitem><para><guilabel>Deposit or Withdrawal</guilabel>: column.</para></listitem>
         </itemizedlist>
-        <para>The <emphasis role="bold">Skip Errors</emphasis> check box will skip trying to import any rows with errors in matching the columns.
+        <para>The <guilabel>Skip Errors</guilabel> check box will skip trying to import any rows with errors in matching the columns.
         </para>
         <para>When you are happy with all the import settings, <link linkend="trans-import-csv-save">save</link> them
-             if you will use the same settings again, then press the <emphasis role="bold">Next</emphasis> button. 
+             if you will use the same settings again, then press the <guibutton>Next</guibutton> button. 
             This will bring up a window which allows you to map the accounts identified in the account column (Account Id) with accounts 
             in the GnuCash account tree (Account name). Double click on a row to bring up a dialog to select the matching GnuCash account. 
-            When you have selected a match for all accounts, click on the <emphasis role="bold">Next</emphasis> button.
+            When you have selected a match for all accounts, click on the <guibutton>Next</guibutton> button.
         </para>
         <para>The Transaction Information panel allows review of data entry settings so far.
         </para>
@@ -1076,16 +1084,16 @@ Translators:
         account must be specified for these transactions.
       </para>
      <sect3><title>Assign a Destination Account to a Single Transaction</title>
-        <para>The currently selected row is selected by Left-clicking it. It is displayed with a mid dark green background.</para>
-        <para><emphasis role="bold">Double click</emphasis> on a row. This will select it and open an Account Selection
-              dialog. Select the desired destination account in the dialog and click <emphasis role="bold">OK</emphasis>. The row 
+        <para>The currently selected row is selected by <mousebutton>left</mousebutton> clicking it. It is displayed with a mid dark green background.</para>
+        <para>Double <mousebutton>left</mousebutton> click on a row. This will select it and open an Account Selection
+              dialog. Select the desired destination account in the dialog and click <guibutton>OK</guibutton>. The row 
               background will change to a light green and the assigned destination account will be displayed 
               in the Info column.
         </para>
-        <para>or alternatively, <emphasis role="bold">Left-click</emphasis> on a row to select it followed by a 
-           <emphasis role="bold">Right-click </emphasis>to bring up a popup menu then select
-          "Assign a transfer account" to display the Account Selection dialog, select the destination account and
-           click the <emphasis role="bold">OK</emphasis> button.
+        <para>or alternatively, <mousebutton>left</mousebutton> click on a row to select it followed by a 
+           <mousebutton>right</mousebutton> click to bring up a popup menu then select
+          <guimenuitem>Assign a transfer account</guimenuitem> to display the <guilabel>Account Selection</guilabel> dialog, select the destination account and
+           click the <guibutton>OK</guibutton> button.
         </para>
       </sect3>
       <sect3>
@@ -1098,21 +1106,33 @@ Translators:
         <para>Multiple rows may be selected to have the same destination account assigned to them.</para>
         <para>To select rows either:</para>
         <itemizedlist>
-          <listitem><para><emphasis role="bold">Left click</emphasis> on first row and then 
-          <emphasis role="bold">Ctrl-Left click</emphasis> on other rows to add to the selection or</para></listitem>
-          <listitem><para><emphasis role="bold">Left-click</emphasis> on a first row and then 
-          <emphasis role="bold">Shift-Left-click</emphasis> on another row to select all rows between them.</para></listitem>
-        </itemizedlist>
-        <para>then <emphasis role="bold">Right-click</emphasis> to display a popup menu and then select 
-          <emphasis role="bold">"Assign a transfer account"</emphasis> to open the Account 
-           Selection dialog. Select the desired destination account and click the <emphasis role="bold">OK</emphasis>
+          <listitem><para>
+            <mousebutton>Left</mousebutton>
+            click on first row and then
+            <keycombo action='simul'>
+              <keycap>Ctrl</keycap>
+              <mousebutton>Left</mousebutton>
+            </keycombo>
+            click on other rows to add to the selection or
+          </para></listitem>
+          <listitem><para>
+            <mousebutton>left</mousebutton> click on first row and then
+            <keycombo action='simul'>
+              <keycap>Shift</keycap>
+              <mousebutton>Left</mousebutton>
+            </keycombo> click on another row to select all rows between them.
+           </para></listitem>
+       </itemizedlist>
+        <para>then <mousebutton>right</mousebutton> click to display a popup menu and then select 
+          <guimenuitem>"Assign a transfer account"</guimenuitem> to open the Account 
+           Selection dialog. Select the desired destination account and click the <guibutton>OK</guibutton>
            button in the Account Selection dialog.</para>
       </sect3>
       <sect3>
         <title>Completing the Import</title>
       <para>Once you have assigned destination accounts for all the imported transactions using the above methods 
         (all row backgrounds will be a light green colour), check that the assigned destination acounts are correct 
-        and then press the <emphasis role="bold">OK</emphasis> button at the bottom of the Generic Import Matcher 
+        and then press the <guibutton>OK</guibutton> button at the bottom of the Generic Import Matcher 
         window. The transactions selected for import will have their splits added to the selected source 
         and destination accounts.
       </para>



Summary of changes:
 ChangeLog                                      |  64 ++++++++++
 NEWS                                           |  15 +++
 README                                         |  35 +++---
 docbook/gnc-docbookx.dtd                       |  61 +++++++--
 guide/C/ch_basics.xml                          |  60 ++++++++-
 guide/C/ch_bus_features.xml                    |  12 +-
 guide/C/gnucash-guide.xml                      |  27 ++--
 guide/de/gnucash-guide.xml                     |  26 +++-
 guide/it/gnucash-guide.xml                     |  16 ++-
 guide/ja/gnucash-guide.xml                     |   4 +-
 guide/pt/gnucash-guide.xml                     |  14 ++-
 guide/ru/gnucash-guide.xml                     |  25 +++-
 help/C/Help_ch_Customize.xml                   |  60 ++++++++-
 help/C/Help_ch_Transactions.xml                | 164 ++++++++++++++-----------
 help/C/figures/Help_Book_Options_Accounts.png  | Bin 0 -> 23303 bytes
 help/C/figures/Help_Book_Options_Budgeting.png | Bin 0 -> 17913 bytes
 help/C/figures/Help_Book_Options_Business.png  | Bin 0 -> 64712 bytes
 help/C/figures/Help_Book_Options_Counters.png  | Bin 0 -> 50081 bytes
 help/C/figures/Help_Pref_Business.png          | Bin 182261 -> 47232 bytes
 help/C/figures/Help_Pref_OnlineBanking.png     | Bin 223822 -> 62542 bytes
 help/C/figures/Report_Screen.png               | Bin 58838 -> 0 bytes
 help/C/gnucash-help.xml                        |  12 +-
 help/de/gnucash-help.xml                       |  27 ++--
 help/it/gnucash-help.xml                       |  10 +-
 help/pt/gnucash-help.xml                       |  10 +-
 25 files changed, 486 insertions(+), 156 deletions(-)
 create mode 100644 help/C/figures/Help_Book_Options_Accounts.png
 create mode 100644 help/C/figures/Help_Book_Options_Budgeting.png
 create mode 100644 help/C/figures/Help_Book_Options_Business.png
 create mode 100644 help/C/figures/Help_Book_Options_Counters.png
 delete mode 100644 help/C/figures/Report_Screen.png



More information about the gnucash-changes mailing list