gnucash-docs master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Tue Dec 29 16:21:25 EST 2020


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/78858c95 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/784726d0 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/e4fef3f7 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/487d66de (commit)



commit 78858c951e5afd8c7e536b36a680768bb9df97bf
Merge: 487d66d 784726d
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Dec 29 13:21:14 2020 -0800

    Merge branch 'maint'


commit 784726d02d996f5672ff62ec1747284d58659da2
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Dec 29 13:16:08 2020 -0800

    Documentation for GnuCash 4.4.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 735c298..f811f73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.5)
 # We don't actually use C, but GNUInstallDirs doesn't work if we don't
 # specify a language.
 project (gnucash-docs
-    VERSION 4.3
+    VERSION 4.4
     LANGUAGES C)
 
 set (PACKAGE_NAME GnuCash Docs)
diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 7d33c28..65ba543 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. a) Publication - should only be changed by the release manager!
 -->
-<!ENTITY manrevision "4.3">
-<!ENTITY date "27 December 2020">
+<!ENTITY manrevision "4.4">
+<!ENTITY date "28 December 2020">
 <!ENTITY vers-unstable "">
-<!ENTITY vers-stable "4.3">
+<!ENTITY vers-stable "4.4">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "4">
 
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index c0e4c7d..181b052 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -89,6 +89,14 @@
   </authorgroup>
 
   <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.3</revnumber>
         <date>27 December 2020</date>
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index b09a6a5..1d81b6a 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -106,6 +106,14 @@
   </authorgroup>
 
   <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide v4.3</revnumber>
         <date>27 December 2020</date>
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index 2765619..33acbdf 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -104,6 +104,14 @@
   </authorgroup>
 
   <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>GnuCash Tutorial and Concepts Guide v4.3</revnumber>
         <date>27 December 2020</date>
diff --git a/guide/ja/gnucash-guide.xml b/guide/ja/gnucash-guide.xml
index b6366eb..5e4d87a 100644
--- a/guide/ja/gnucash-guide.xml
+++ b/guide/ja/gnucash-guide.xml
@@ -69,6 +69,14 @@ Lyttle</holder> </copyright>
 </authorgroup>
 
   <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide v4.3</revnumber>
         <date>27 December 2020</date>
diff --git a/guide/pt/gnucash-guide.xml b/guide/pt/gnucash-guide.xml
index 010fdd0..14b5faf 100644
--- a/guide/pt/gnucash-guide.xml
+++ b/guide/pt/gnucash-guide.xml
@@ -91,7 +91,15 @@
 
   <revhistory>
       <revision>
-        <revnumber>&appname; Tutorial e guia de conceitos 4.2</revnumber>
+        <revnumber>&appname; Tutorial e guia de conceitos 4.4</revnumber>
+        <date>28 de decembro de 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos 4.3</revnumber>
         <date>27 de decembro de 2020</date>
         <revdescription>
           <para role="author">Múltiplos autores</para>
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index e4e0c82..468d882 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -48,6 +48,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Help Manual 4.3</revnumber>
         <date>27 December 2020</date>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index c9fbdb6..3e79554 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -65,6 +65,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Hilfe 4.3</revnumber>
         <date>27 December 2020</date>
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index c538480..b018c0f 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -176,6 +176,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>GnuCash Help Manual v4.3</revnumber>
         <date>27 December 2020</date>
diff --git a/help/pt/gnucash-help.xml b/help/pt/gnucash-help.xml
index aa52aa4..34e0f90 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 &appname; v4.4</revnumber>
+        <date>28 de decembro de 2020</date>
+        <revdescription>
+          <para role="author">Múltiplos autores</para>
+          <para role="publisher">Equipa de documentação do &appname;</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.3</revnumber>
         <date>27 de decembro de 2020</date>

commit e4fef3f74e76512be00971a7af813b57af7eafc9
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Dec 28 18:46:32 2020 +0100

    Bug 798038 - Incorrect spelling in german account templates 'common' and
    'full', part 3: docs

diff --git a/guide/de/ch_accts.xml b/guide/de/ch_accts.xml
index 58f5ee6..4bf0baf 100644
--- a/guide/de/ch_accts.xml
+++ b/guide/de/ch_accts.xml
@@ -657,7 +657,7 @@
           </listitem>
 
           <listitem>
-            <para>Kontobezeichnung <guilabel>Einkommenssteuer</guilabel> (Kontoart
+            <para>Kontobezeichnung <guilabel>Einkommensteuer</guilabel> (Kontoart
             <guilabel>Aufwand</guilabel>, Hauptkonto
             <emphasis>Aufwand:Steuer</emphasis>)</para>
           </listitem>
diff --git a/guide/de/ch_cbook.xml b/guide/de/ch_cbook.xml
index af8f2cc..157ff16 100644
--- a/guide/de/ch_cbook.xml
+++ b/guide/de/ch_cbook.xml
@@ -77,7 +77,7 @@
     In diesem Fall sollten Sie ein Ertragskonto für den Arbeitslohn und ein anderes für die Zinserträge haben.</para>
 
     <tip>
-      <para>Vergewissern Sie sich, dass Sie das Kästchen steuerrelevant angehakt und eine  entsprechende Steuerkategorie im  Einkommenssteuerinformation-Dialog (<menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Optionen Steuerbericht</guimenuitem></menuchoice>) zugewiesen haben, wenn Sie steuerpflichtige Einkünfte haben. 
+      <para>Vergewissern Sie sich, dass Sie das Kästchen steuerrelevant angehakt und eine entsprechende Steuerkategorie im Einkommensteuerinformation-Dialog (<menuchoice><guimenu>Bearbeiten</guimenu><guimenuitem>Optionen Steuerbericht</guimenuitem></menuchoice>) zugewiesen haben, wenn Sie steuerpflichtige Einkünfte haben.
       Einige Arten von Einkünfte wie Schenkungen, müssen nicht immer steuerpflichtig sein. 
       Überprüfen Sie die entsprechenden Steuerregeln, um zu entscheiden, was steuerpflichtig ist. Für die Art und Weise, wie Einkünfte aus Kapitalveräußerungen zu beobachten sind, finden Sie Informationen unter <xref linkend="chapter_capgain"></xref>.</para>
     </tip>
diff --git a/guide/de/ch_txns.xml b/guide/de/ch_txns.xml
index 3f57020..bb01b1f 100644
--- a/guide/de/ch_txns.xml
+++ b/guide/de/ch_txns.xml
@@ -1389,7 +1389,7 @@
           Zeile zuerst das Buchungsdatum (14. März) und die Beschreibung der Buchung ein 
           (Zum Beispiel <quote>Arbeitgeber</quote>). In den folgenden Zeilen der
           Teilbuchungen geben sie die Einzahlung auf das Konto <emphasis>Aktiva:Girokonto</emphasis>
-          (670 €), gefolgt von den verschiedenen Abgaben <emphasis>Aufwendungen:Steuern:Einkommenssteuer</emphasis>
+          (670 €), gefolgt von den verschiedenen Abgaben <emphasis>Aufwendungen:Steuern:Einkommensteuer</emphasis>
           (180 €), <emphasis>Aufwendungen:Steuern:Krankenversicherung</emphasis> (90 €), und
           <emphasis>Aufwendungen:Steuern:Rentenversicherung</emphasis> (60 €) und zuletzt das
           Bruttogehalt (1000 €) als Abbuchung von Ihrem Konto <emphasis>Ertrag:Gehalt</emphasis>.</para>



Summary of changes:
 docbook/gnc-docbookx.dtd   |  6 +++---
 guide/C/gnucash-guide.xml  |  8 ++++++++
 guide/de/ch_accts.xml      |  2 +-
 guide/de/ch_cbook.xml      |  2 +-
 guide/de/ch_txns.xml       |  2 +-
 guide/de/gnucash-guide.xml |  8 ++++++++
 guide/it/gnucash-guide.xml |  8 ++++++++
 guide/ja/gnucash-guide.xml |  8 ++++++++
 guide/pt/gnucash-guide.xml | 10 +++++++++-
 help/C/gnucash-help.xml    |  8 ++++++++
 help/de/gnucash-help.xml   |  8 ++++++++
 help/it/gnucash-help.xml   |  8 ++++++++
 help/pt/gnucash-help.xml   |  8 ++++++++
 13 files changed, 79 insertions(+), 7 deletions(-)



More information about the gnucash-changes mailing list