gnucash-docs master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Sat Feb 24 04:56:21 EST 2018
Updated via https://github.com/Gnucash/gnucash-docs/commit/e5b343a0 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/f2298baa (commit)
via https://github.com/Gnucash/gnucash-docs/commit/50ed4eb3 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/9f2f37d5 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/6f6a9dd3 (commit)
from https://github.com/Gnucash/gnucash-docs/commit/e85643b9 (commit)
commit e5b343a092b251e34ca9ff1e7e99605b9aa6297e
Merge: 50ed4eb f2298ba
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Feb 24 10:54:12 2018 +0100
Merge branch 'maint'
commit f2298baa0c6d28cb67d171c11393fff8b7293117
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Feb 24 10:50:14 2018 +0100
Revert "Fix remaining references to General Ledger as per David Carlson's suggestion"
This reverts commit c1c068f5b0c0adf7a90d885630bd5069319e327e.
diff --git a/help/C/Help_ch_GUIMenus.xml b/help/C/Help_ch_GUIMenus.xml
index 1f1dd4e..2bcd98e 100644
--- a/help/C/Help_ch_GUIMenus.xml
+++ b/help/C/Help_ch_GUIMenus.xml
@@ -1319,7 +1319,7 @@
<para><guimenuitem>General Ledger</guimenuitem></para></entry>
<entry namest="c3">
-<!-- <para>See <xref linkend="general-journal-report"></xref></para>-->
+<!-- <para>See <xref linkend="general-ledger-report"></xref></para>-->
</entry>
</row>
@@ -1749,9 +1749,9 @@
</row>
<row>
- <entry><para><guimenuitem>General Journal</guimenuitem></para></entry>
+ <entry><para><guimenuitem>General Ledger</guimenuitem></para></entry>
- <entry><para>See <xref linkend="general-journal"></xref></para></entry>
+ <entry><para>See <xref linkend="general-ledger"></xref></para></entry>
</row>
</tbody>
</tgroup>
@@ -2002,10 +2002,10 @@
</sect1>
<sect1>
- <title>Account Register/General Journal</title>
+ <title>Account Register/General Ledger</title>
<sect2 id="account-register">
- <title>Account Register & General Journal Window</title>
+ <title>Account Register & General Ledger Window</title>
<para>This window is used to enter and edit your account data. It also
provides tools for scheduling future transactions, finding and reporting
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index e335563..c44c82c 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -950,7 +950,7 @@
</listitem>
<listitem>
- <para>General Journal:</para>
+ <para>General Ledger:</para>
</listitem>
<listitem>
diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index cda5472..0ab99e3 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -870,16 +870,16 @@ Translators:
</sect1>
- <sect1 id="general-journal">
- <title>General Journal</title>
- <para>The General Journal is an advanced register used to enter transactions without needing to open
- individual accounts. The General Journal shows the transaction entries for all accounts on one register.</para>
+ <sect1 id="general-ledger">
+ <title>General Ledger</title>
+ <para>The General Ledger is an advanced register used to enter transactions without needing to open
+ individual accounts. The General Ledger shows the transaction entries for all accounts on one register.</para>
- <para>Entering transactions in the General Journal is more complicated than entering them in the individual
- account registers. The advantage is the General Journal provides a more comprehensive view of the
+ <para>Entering transactions in the General Ledger is more complicated than entering them in the individual
+ account registers. The advantage is the General Ledger provides a more comprehensive view of the
transactions you have entered in all your accounts.</para>
- <para>The General Journal defaults to showing only the previous month of transactions. This is changeable
+ <para>The General Ledger defaults to showing only the previous month of transactions. This is changeable
by using the "Filter By..." on the View menu.</para>
</sect1>
commit 50ed4eb3133ba7fa977fb1a8b209bf5fe566d504
Merge: e85643b 9f2f37d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Feb 24 10:50:50 2018 +0100
Merge branch 'maint'
commit 9f2f37d5df47255cfb9bc21a68580ba9b01320ff
Author: fell <frank.h.ellenberger at gmail.com>
Date: Wed Feb 14 09:34:58 2018 +0100
Link the referenced 'Simple Transaction Example' in Transactions
'Opening Balances'
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index b425dbd..1cd1225 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -1264,7 +1264,8 @@
<sect2 id="txns-puttoget-open2">
<title>Opening Balances</title>
- <para>As shown earlier with the <emphasis>Assets:Checking</emphasis>
+ <para>As shown earlier in <xref linkend="txns-registers-twoaccount2"/>
+ with the <emphasis>Assets:Checking</emphasis>
account, the starting balances in an account are typically assigned to a
special account called <emphasis>Equity:Opening Balance</emphasis>. To
start filling in this chart of account, begin by setting the starting
commit 6f6a9dd37bfcb3516502e04ec8bd11815c44c9d6
Author: fell <frank.h.ellenberger at gmail.com>
Date: Wed Feb 14 08:50:41 2018 +0100
Add a link from '8.5.1. Loan Specifications' to '8.3. Calculations'
Some people have problems to find the calculator:
https://lists.gnucash.org/logs/2018/02/14.html#T01:50:21
diff --git a/guide/C/ch_loans.xml b/guide/C/ch_loans.xml
index ef8cd79..6b3f485 100644
--- a/guide/C/ch_loans.xml
+++ b/guide/C/ch_loans.xml
@@ -570,8 +570,8 @@ The simple case for when PMT == 0 gives the solution:
<para>You have a number of different options, like paper and pen,
Linux Calculator, Open Office’s Calc module, but the easiest is to use
- <application>&app;</application> <guilabel>Loan Repayment Calculator</guilabel>. This tells you that the Monthly Payment
- should be $115.56.</para>
+ <application>&app;</application> <link linkend="loans_calcs1"><guilabel>Loan Repayment Calculator</guilabel></link>.
+ This tells you that the Monthly Payment should be $115.56.</para>
<para>But you need to know how much of this is Interest and how much is
Principal to be able to do a proper bookkeeping. For this you need a
Summary of changes:
guide/C/ch_loans.xml | 4 ++--
guide/C/ch_txns.xml | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
More information about the gnucash-changes
mailing list