gnucash-docs master: Multiple changes pushed

Frank H. Ellenberger fell at code.gnucash.org
Sat Apr 11 16:48:33 EDT 2015


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/59fd368b (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/e7905811 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5b9854ed (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/0f1ccf1c (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/854f0b8d (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/c615c874 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/9124f1af (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/874ac13b (commit)



commit 59fd368bfd081ae8ffeb76cb37e80cfe77a49664
Merge: 874ac13 e790581
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Apr 11 22:28:26 2015 +0200

    Merge branch 'maint'


commit e79058118cb36b1f23ab7d921073bf518bc849b0
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Apr 10 23:40:33 2015 +0200

    Verbessere Erklärung Soll & Haben

diff --git a/guide/de/ch_basics.xml b/guide/de/ch_basics.xml
index 72e24f0..fa60c17 100644
--- a/guide/de/ch_basics.xml
+++ b/guide/de/ch_basics.xml
@@ -179,13 +179,16 @@
       </note>
       <warning>
         <para>Die gemeine Nutzung der Worte <emphasis>Soll
-        </emphasis> und <emphasis>Haben</emphasis> stimmt nicht
-         damit überein, wie Buchhalter diese Worte nutzen. Im allgemeinen hat, 
-        <emphasis>Haben</emphasis> eine positive Bedeutung; in der Buchhaltung hat
-        <emphasis>Haben</emphasis> die Bedeutung <emphasis>auf der rechten Seite eines Kontos buchen</emphasis>,
-        was dann eine Abnahme bei den Aktiva und Aufwandskonten,
-        aber einer Zunahme bei den Ertragskonten und Passiva
-        (Fremd- und des Eigenkapitalskonten) bewirkt.</para>
+         </emphasis> und <emphasis>Haben</emphasis> stimmt nicht
+         damit überein, wie Buchhalter diese Worte nutzen. Im allgemeinen ist es angenehmer,
+         etwas zu <emphasis>haben</emphasis> als etwas zu <emphasis>sollen</emphasis>;
+         der Kaufmann hingegen verkürzt hier "Wir <emphasis>haben</emphasis> zu zahlen"
+         oder "Sie <emphasis>sollen</emphasis> zahlen".</para>
+        <para>Praktisch hat <emphasis>Haben</emphasis> in der Buchhaltung
+         die Bedeutung <emphasis>auf der rechten Seite eines Kontos buchen</emphasis>,
+         was dann eine Abnahme bei den Aktiva und Aufwandskonten,
+         aber einer Zunahme bei den Ertragskonten und Passiva
+         (Fremd- und des Eigenkapitalskonten) bewirkt.</para>
       </warning>
     </sect2>
   </sect1>

commit 5b9854edb708652563468f7f1b70efe11b981751
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Apr 10 20:47:42 2015 +0200

    Add source link and translator comment to Help_txf-categories.xml
    
    Doc part of cross linking

diff --git a/help/C/Help_txf-categories.xml b/help/C/Help_txf-categories.xml
index b5e0b3a..5b3c312 100644
--- a/help/C/Help_txf-categories.xml
+++ b/help/C/Help_txf-categories.xml
@@ -1,4 +1,8 @@
 <para>
+<!-- Translators: You will probably have your own codes.
+     Look for similar files as the source at the end of this file,
+     but in the directory with your country code.
+     Your tax authorities might also use a format different from TXF. -->
 <table>
 <title>Detailed <acronym>TXF</acronym> Category Descriptions</title>
 <tgroup cols="2">
@@ -979,3 +983,6 @@ The fair market value of donated property, such as used clothing or furniture.</
 </tgroup>
 </table>
 </para>
+<para>Source: 
+	<ulink url="https://github.com/Gnucash/gnucash/blob/maint/src/tax/us/txf-help.scm"></ulink>
+</para>

commit 0f1ccf1c0e3543940d8848c1b49f0e47539d6f4f
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Mar 29 14:47:15 2015 -0700

    Release 2.6.6

diff --git a/AUTHORS b/AUTHORS
index 5746d0b..71946f3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,11 +5,14 @@ Yawar Amin
 J. Alex Aycinena <alex.aycinena at gmail.com>
 Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
 Mike Evans <mikee at saxicola.co.uk>
+Chris Good <chris.good at ozemail.com.au>
 Geert Janssens <janssens-geert at telenet.be>
 Cristian Marchi <cri79 at libero.it>
 John Ralls <jralls at ceridwen.us>
 Robert Ratliff <ratliff.bobby at gmail.com>
+Mark Simpson <verdammelt at gmail.com>
 Christian Stimming <stimming at tuhh.de>
+David T.<sunfish62 at yahoo.com>
 
 Past -
 Bill Gribble <grib at billgribble.com>
diff --git a/NEWS b/NEWS
index 7446602..90f12ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 Version History
 ---------------
+ 2.6.6  - 29 March 2015
+ 	o Explain sorting by TXF code within Tax Form Sections -- Mark Simpson
+	o Insert Part designations and update the Basics Chapter -- David T.
+	o Document latest changes to the Advanced Portfolio Report -- Chris Good
+	o Remove obolete sections about "Cannot find default values" left over from gconf. -- Geert Janssens
  2.6.5  - 16 December 2014
         o Fix a path of freshly added XML files
         o Add some comments about translation to the German documents where the translation wasn't updated to match the English version.
diff --git a/configure.ac b/configure.ac
index 5fbb1d1..91f86db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # copyright (c) 2003-2013 GnuCash Development Team
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(gnucash-docs, 2.6.5)
+AC_INIT(gnucash-docs, 2.6.6)
 
 dnl ==========================================================================
 dnl
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 09f6780..c45d7ef 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -38,10 +38,10 @@
   Some global declarations which are used in the files. For easier
   maintainance they should be collected here.
 -->
-<!ENTITY manrevision "2.6.5">
-<!ENTITY date "16 December 2014">
+<!ENTITY manrevision "2.6.6">
+<!ENTITY date "29 March 2015">
 <!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.5">
+<!ENTITY vers-stable "2.6.6">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "2.6">
 <!--
@@ -72,8 +72,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.5
-  Last modified: 16 December 2014
+  Version: 2.6.6
+  Last modified: 29 March 2015
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
@@ -87,7 +87,7 @@
   <edition>V&manrevision;</edition>
 
   <copyright>
-   <year>2009-2014</year>
+   <year>2009-2015</year>
    <holder>&app; Documentation Team</holder>
   </copyright>
 
@@ -269,7 +269,16 @@
       </affiliation>
      <email>bengt at thuree.com</email>
     </author>
-    
+
+    <author>
+	<firstname>David</firstname>
+	<surname>T</surname>
+	<affiliation>
+	  <orgname>&app; Documentation Team</orgname>
+	</affiliation>
+	<email>sunfish62 at yahoo.com</email>
+      </author>
+
 <!-- This is appropriate place for other contributors: translators,
       maintainers,  etc. Commented out by default.
        <othercredit role="translator">
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 13dff4c..5c649ee 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -45,10 +45,10 @@
   Some global declarations which are used in the files. For easier
   maintainance they should be collected here.
 -->
-<!ENTITY manrevision "2.6.5">
-<!ENTITY date "16 December 2014">
+<!ENTITY manrevision "2.6.6">
+<!ENTITY date "29 March 2015">
 <!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.5">
+<!ENTITY vers-stable "2.6.6">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "2.6">
 <!--
@@ -82,8 +82,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.5
-  Last modified: 16 December 2014
+  Version: 2.6.6
+  Last modified: 29 March 2015
   Maintainers:
       GnuCash Development Team <gnucash-devel at gnucash.org>
   Translators:
@@ -99,7 +99,7 @@
   <edition>V&manrevision;</edition>
 
   <copyright>
-   <year>2009-2014</year>
+   <year>2009-2015</year>
    <holder>&app; Documentation Team</holder>
   </copyright>
 
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index c9f2f74..8cfddeb 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -31,10 +31,10 @@
 <!--
   Some global declarations which are used in the files. For easier
   maintainance they should be collected here.
---><!ENTITY manrevision "2.6.5">
-<!ENTITY date "16 December 2014">
+--><!ENTITY manrevision "2.6.6">
+<!ENTITY date "29 March 2015">
 <!ENTITY vers-unstable "trunk">
-<!ENTITY vers-stable "2.6.5">
+<!ENTITY vers-stable "2.6.6">
 <!ENTITY series-unstable "trunk">
 <!ENTITY series-stable "2.6">
 <!--
@@ -52,8 +52,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.5
-  Last modified: 16 December 2014
+  Version: 2.6.6
+  Last modified: 29 March 2015
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
@@ -64,10 +64,10 @@
 <!-- appropriate code -->
  <bookinfo>
   <title>Guida ai concetti e manuale di <application>&app;</application></title>
-  <edition>V2.6.1</edition>
+  <edition>V2.6.6</edition>
 
   <copyright>
-   <year>2009-2014</year>
+   <year>2009-2015</year>
    <holder>Gruppo della documentazione di &app;</holder>
   </copyright>
 
diff --git a/guide/ja/gnucash-guide.xml b/guide/ja/gnucash-guide.xml
index 4b0e643..d508e9a 100644
--- a/guide/ja/gnucash-guide.xml
+++ b/guide/ja/gnucash-guide.xml
@@ -37,10 +37,10 @@
   Some global declarations which are used in the files. For easier
   maintainance they should be collected here.
 -->
-<!ENTITY manrevision "2.6.0">
-<!ENTITY date "29 December 2013">
+<!ENTITY manrevision "2.6.6">
+<!ENTITY date "29 March 2015">
 <!ENTITY vers-unstable "trunk">
-<!ENTITY vers-stable "2.6.0">
+<!ENTITY vers-stable "2.6.6">
 <!ENTITY series-unstable "trunk">
 <!ENTITY series-stable "2.6">
 <!--
@@ -62,7 +62,7 @@
 <!--
       (Do not remove this comment block.)
   Version: 2.6.0
-  Last modified: 29 December 2013
+  Last modified: 29 March 2015
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
@@ -77,7 +77,7 @@
 <title><application>&app;</application>チュートリアル・コンセプトガイド</title>
   <copyright>
 
-   <year>2010-2011</year>
+   <year>2010-2012</year>
    <holder>Yasuaki Taniguchi/谷口康明 (日本語訳)</holder>
   </copyright>
   <!-- translators: uncomment this:
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index 0e215a5..0bfddbc 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -29,10 +29,10 @@
   Some global declarations which are used in the files. For easier
   maintainance they should be collected here.
 -->
-<!ENTITY manrevision "2.6.5">
-<!ENTITY date "16 December 2014">
+<!ENTITY manrevision "2.6.6">
+<!ENTITY date "29 March 2015">
 <!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.5">
+<!ENTITY vers-stable "2.6.6">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "2.6">
 <!--
@@ -63,8 +63,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.5
-  Last modified: 16 December 2014
+  Version: 2.6.6
+  Last modified: 29 March 2015
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
@@ -80,7 +80,7 @@
    <edition>v&manrevision;</edition>
 
    <copyright>
-     <year>2002-2014</year>
+     <year>2002-2015</year>
      <holder>GnuCash Documentation Team</holder>
    </copyright>
 
@@ -131,6 +131,15 @@
       </author>
 
       <author>
+	<firstname>Chris</firstname>
+	<surname>Good</surname>
+	<affiliation>
+	  <orgname>&app; Documentation Team</orgname>
+	</affiliation>
+	<email>chris.good at ozemail.com.au</email>
+      </author>
+
+      <author>
         <firstname>Dave</firstname>
         <surname>Herman</surname>
         <affiliation>
@@ -183,6 +192,15 @@
       </author>
 
       <author>
+	<firstname>Mark</firstname>
+	<surname>Simpson</surname>
+	<affiliation>
+	  <orgname>&app; Documentation Team</orgname>
+	</affiliation>
+	<email>verdammelt at gmail.com</email>
+      </author>
+
+      <author>
 	<firstname>Christian</firstname>
 	<surname>Stimming</surname>
 	<affiliation>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index 6ea9a4f..65c75fd 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -28,10 +28,10 @@
   Some global declarations which are used in the files. For easier
   maintainance they should be collected here.
 -->
-<!ENTITY manrevision "2.6.5">
-<!ENTITY date "16 December 2014">
+<!ENTITY manrevision "2.6.6">
+<!ENTITY date "29 March 2015">
 <!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.5">
+<!ENTITY vers-stable "2.6.6">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "2.6">
 <!--
@@ -63,8 +63,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.5
-  Last modified: 16 December 2014
+  Version: 2.6.6
+  Last modified: 29 March 2015
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
@@ -86,7 +86,7 @@
     <edition>v&manrevision;</edition>
 
    <copyright>
-     <year>2014</year>
+     <year>2014-2015</year>
      <holder>&app; Documentation Team</holder>
      
    </copyright>
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index 84efbd8..84e2fc8 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -23,10 +23,10 @@
   Some global declarations which are used in the files. For easier
   maintainance they should be collected here.
 -->
-<!ENTITY manrevision "2.6.5">
-<!ENTITY date "16 December 2014">
+<!ENTITY manrevision "2.6.6">
+<!ENTITY date "29 March 2015">
 <!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.5">
+<!ENTITY vers-stable "2.6.6">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "2.6">
 <!--
@@ -45,8 +45,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.5
-  Last modified: 16 December 2014
+  Version: 2.6.6
+  Last modified: 29 March 2015
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
@@ -60,7 +60,7 @@
    <title>Manuale di aiuto di <application>&app;</application></title>
 
    <copyright>
-     <year>2002-2014</year>
+     <year>2002-2016</year>
      <holder>Gruppo della documentazione di &app;</holder>
    </copyright><copyright><year>2011</year><holder>Cristian Marchi</holder></copyright>
 

commit 854f0b8db2eee62ef2776eb4e7426cc8957d3bbc
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Fri Mar 27 19:11:50 2015 +0100

    Remove obsolete sections about 'Cannot find default values' screen
    
    These were part of the gconf integration. Since
    we have switched to gsettings the dialogs referred to
    are no longer in the gnucash code base.

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 3975fa7..df87337 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -632,8 +632,7 @@
         assistant will start.</para>
         <note>
           <para>If you are running <application>&app;</application> for the first time, you will be presented 
-          with the <guilabel>Cannot find default values</guilabel> screen or with the 
-          <guilabel>Welcome to &app;!</guilabel> screen. Both are described in detail in the 
+          with the <guilabel>Welcome to &app;!</guilabel> screen. This screen is described in detail in the 
           <application>&app;</application> manual.</para>
         </note>
       </listitem>
diff --git a/help/C/Help_ch_GettingStarted.xml b/help/C/Help_ch_GettingStarted.xml
index c216f96..d5ec928 100644
--- a/help/C/Help_ch_GettingStarted.xml
+++ b/help/C/Help_ch_GettingStarted.xml
@@ -28,117 +28,9 @@
     <emphasis>&app; Splash Screen</emphasis> where some information
     about the program itself and the loading process are displayed.</para>
 
-    <sect2 id="cannot-find-default">
-    <title><guilabel>Cannot find default values</guilabel> screen</title>
-      <para>The very first time you run <application>&app;</application> you will be presented with the
-      <guilabel>Cannot find default values</guilabel> screen that contains three
-      buttons:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para><guibutton>Quit</guibutton> — exits
-          <application>&app;</application>.</para>
-        </listitem>
-
-        <listitem>
-          <para><guibutton>Skip</guibutton> — continue
-          without setting default display values for <application>&app;</application>.</para>
-        </listitem>
-
-        <listitem>
-          <para><guibutton>Setup</guibutton> — will open the
-          <guilabel>Update &app; Configuration Data</guilabel> assistant (see <xref linkend="update-configuration-data"/>) to start
-          the setup process for a new set of default settings.</para>
-        </listitem>
-      </itemizedlist>
-
-    </sect2>
-
-    <sect2 id="update-configuration-data" >
-    <title><guilabel>Update &app; Configuration Data</guilabel> assistant</title>
-      <para>The first screen of <guilabel>Update &app; Configuration Data</guilabel>
-      describes the assistant. While the data on the screen will change, the three
-      buttons at the very bottom of the assistant will not.</para>
-
-      <itemizedlist>
-        <listitem>
-          <para><guibutton>Cancel</guibutton> — exits the assistant.</para>
-          <warning>
-            <para>If you click this button, any selections you have made up to
-            this point will be lost.</para>
-          </warning>
-        </listitem>
-
-        <listitem>
-          <para><guibutton>Back</guibutton> — brings up the previous screen so
-          that you can change a previous selection until the first screen.</para>
-        </listitem>
-
-        <listitem>
-          <para><guibutton>Forward</guibutton> — brings up the next
-          screen so you can continue through the assistant.</para>
-        </listitem>
-      </itemizedlist>
-
-      <para id="gconf">The second screen allows you to <guilabel>Choose a Method</guilabel>
-      of setting gconf configuration for <application>&app;</application>.
-      The <guibutton>Update Search Path</guibutton> button will
-      modify <filename class="directory">.gconf</filename> path in the user’s
-      home directory. The <guibutton>Install in
-      Home Directory</guibutton> button on this screen will install the
-      configuration files in the <filename class="directory">.gconf</filename>
-      directory in the user’s home directory.</para>
-
-      <para>After making your selection click the <guibutton>Forward</guibutton>
-      button to display the next screen.</para>
-
-      <para>If you selected <guilabel>Install in Home Directory</guilabel> the next screen presents
-      you with three options:
-
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>&app; will install the data.</guilabel></para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>You will install the data yourself.</guilabel></para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>The data has already been loaded.</guilabel></para>
-          </listitem>
-        </itemizedlist>
-      </para>
-
-      <para>If you selected <guilabel>Update Search Path</guilabel> the next screen presents you
-      with three options:
-
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>&app; will update search path.</guilabel></para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>You will update search path yourself.</guilabel></para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>The update search path has already been updated.</guilabel></para>
-        </listitem>
-      </itemizedlist>
-      </para>
-
-    <para>The final screen has the usual three buttons, with the difference
-    that <guibutton>Forward</guibutton> has changed to
-    <guibutton>Apply</guibutton>. Click the <guibutton>Apply</guibutton> button to complete
-    the initial defaults setting process. The
-    <guilabel>Welcome to &app;</guilabel> screen (see <xref linkend="welcome-to-gnucash"/>) will now be opened.</para>
-
-    </sect2>
-
     <sect2 id="welcome-to-gnucash">
     <title><guilabel>Welcome to &app;</guilabel> dialog</title>
-      <para>After the initial defaults are completed, you will be presented with
+      <para>Next you will be presented with
       the <guilabel>Welcome to &app;!</guilabel> dialog with three choices:</para>
 
       <itemizedlist id="CreateAccounts">

commit c615c874d2f4a2bd3b9f4f5076e095ac8a1e6a99
Author: Chris Good <chris.good at ozemail.com.au>
Date:   Sun Mar 1 15:16:04 2015 +1100

    Document Mike Alexander mod to Advanced Portfolio Report
    
    Mike has modified advanced-portfolio.scm so that in some
    circumstances it is not necessary to add a dummy stock split to an
    income transaction in order for the income to be automatically
    included. This was done as part of multiple bugs.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=744918

diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 6e8ab28..72876db 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -137,8 +137,29 @@
 
             <listitem><para><guilabel>Income</guilabel> — Total of all income transactions associated with a stock account.</para>
               <note>
-                <para>To include income from dividends which are not reinvested:</para>
-                <para>Ensure there is a dummy transaction split to the stock account with quantity 0 price 1 value 0 in the dividend transaction. You can just enter the dummy stock split with no values in the dividend account and it will create the transaction with price 1 even though you cannot see the Price column in that register.</para>
+                <para>To include income from dividends which are not reinvested (if there is no split to the stock account in the income transaction, the report has no way of associating the income with a particular stock) :
+                </para>
+		<para>Ensure there is a dummy transaction split to the stock         account with quantity 0, price 1 and value 0 in the dividend transaction. Enter the dummy stock split with no values in the dividend account and it will create the transaction with price 1 even though you cannot see the Price column in that register.
+		</para>
+                <para>In GnuCash 2.6.6, this report was modified to simplify the recording of dividend and interest payments. With this
+                change it may not be necessary to include the dummy stock split in the transaction. The report will find income (and expense) transactions that are in the parent account of the stock account being reported on. This is done by looking in the parent account for transactions that have exactly two splits (not counting trading account splits) where the other split is to an income or expense account with the same name as the stock's account.
+                </para>
+                <para>For example given an account structure like
+                </para>
+                <literallayout>
+                Assets (type ASSET)
+                  Broker (type ASSET)
+                    Widget Stock (type STOCK)
+                Income (type INCOME)
+                  Dividends (type INCOME)
+                    Widget Stock (type INCOME)
+                </literallayout>
+                <para>A transaction that debits the "Assets:Broker" account and credits the "Income:Dividends:Widget Stock" account will count as income even though it doesn't have a split with account "Assets:Broker:Widget Stock".
+                </para>
+                <para>This only works if the parent account ("Assets:Broker" in this case) is a Bank or Asset account and the Income/Expense account has the same name as the stock account. It won't double count transactions that have a dummy split since they won't have exactly two split transactions.
+                </para>
+                <para>It will not work if the income or expense account split is to a subaccount of the account with the same name as the stock account i.e. "Income:Dividends:Widget Stock:Franked"
+                </para>
 	      </note>
 	    </listitem>
 

commit 9124f1af4d5dfdcf99c2902484b1d1dbc3d56a5e
Author: David T <sunfish62 at yahoo.com>
Date:   Sun Mar 1 19:58:45 2015 -0800

    Tutorial Basics CHapter edits 2015-03-01

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 881eff6..3975fa7 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -365,25 +365,19 @@
         </mediaobject>
       </screenshot>
 
-      <para>The Account Tree window provides an overview of the data contained
+      <para>The Account Tree window (also known as a Chart of Accounts, or CoA) provides an overview of the data contained
       in the current file. It contains a list of account names and their
       current balances.</para>
-      <para>From this window, you can open the <xref linkend="basics-register2" /> of any 
-      account by right clicking on it and selecting <guilabel>Open Account</guilabel> from the 
-      menu or by using the <guibutton>Open</guibutton> button on the toolbar.</para>
+      <para>From this window, you can open the register of any
+      account either by double-clicking the account name, right clicking the account name and selecting <guilabel>Open Account</guilabel> from the
+      menu, or by using the <guibutton>Open</guibutton> button on the toolbar. <application>&app;</application> allows you to have as many account registers open as you wish. For more information on using account registers, see <xref linkend="basics-register2" />.</para>
 
       <tip>
-        <para>A double click on parent accounts (the ones that have a small sign on the 
-        left of the name) will expand the tree view showing child accounts.</para>
-      </tip>
-
-      <tip>
-        <para>A double click on last level account will open the register 
-        window for that account.</para>
+        <para>Clicking the small triangle to the left of an account that has children will expand the tree view showing child accounts.</para>
       </tip>
       
       <para>At the top of this window is the <emphasis>Titlebar</emphasis>, which displays the
-      file name (once you have saved the file.) Below that is the <emphasis>Menubar</emphasis>.
+      file name for this set of accounts (once you have saved the file.) Below that is the <emphasis>Menubar</emphasis>.
       You can access the menu options by either clicking on these menu
       headings or by using shortcuts and access keys (see <xref linkend="basics-shortcut2" />). 
       Next is the <emphasis>Toolbar</emphasis>, which contains buttons
@@ -404,16 +398,9 @@
     <sect2 id="basics-register2">
       <title>Account Register Window</title>
 
-      <para>The Account Register windows are used to enter and edit your
+      <para>Account Register windows are used to enter and edit your
       account data. As the name suggests, they look similar to a checkbook
-      register. To open an account register window, right click on the account name in the
-      <xref linkend="basics-main2" />, then select <guilabel>Open Account</guilabel> or use the
-      <guibutton>Open</guibutton> button in the toolbar.</para>
-
-      <tip>
-        <para><application>&app;</application> allows you to have as many account registers
-        open as you wish.</para>
-      </tip>
+      register.</para>
 
       <screenshot id="basics-CheckAccount">
         <mediaobject>
@@ -500,10 +487,23 @@
         </varlistentry>
       </variablelist>
       
-      <para>Register buttons are discussed in <xref linkend="chapter_txns"></xref>.
+      <para>Register-specific buttons are discussed in <xref linkend="chapter_txns"></xref>.
       </para>
     </sect2>
 
+    <sect2 id="basics-tabbar">
+      <title>Tab Bar</title>
+      
+      <para><application>&app;</application> uses a tabbed model that allows you to open multiple account registers and reports simultaneously. Each open window (which can include account registers, reports, or Scheduled Transactions windows) is given a tab on this bar that you can click to view that window. Tabs can be configured in Preferences to appear along any side of the <application>&app;</application> window.</para>
+    
+    <para>To see the full name for a tab, hover the mouse pointer over an account window tab.</para>
+    
+    <para>If more screens are open than can be displayed across the screen, some tabs
+        will not display.  You can move through all tabs by clicking the arrows on
+        either end of the tab bar. A complete list of tabs can be viewed by
+        right-clicking the Tab Bar and any tab can be selected by clicking it.</para>
+    </sect2>
+
     <sect2 id="basics-options2">
       <title>Menu Items</title>
 
@@ -559,7 +559,7 @@
 
       <para>Once you have opened <application>&app;</application>, you will see the <guilabel>Account
       Tree</guilabel> window <guilabel>Help</guilabel> menu heading, which
-      opens the on-line manual. The on-line manual is organized by topic, and
+      opens the Help manual. The Help manual is organized by topic, and
       you can expand each topic into its subtopics.</para>
 
       <para>Topics are listed on the left side. To select a topic or subtopic,



Summary of changes:
 AUTHORS                           |   3 ++
 NEWS                              |   5 ++
 guide/C/ch_basics.xml             |  49 +++++++++--------
 guide/C/gnucash-guide.xml         |  23 +++++---
 guide/de/ch_basics.xml            |  17 +++---
 guide/de/gnucash-guide.xml        |  12 ++---
 guide/it/gnucash-guide.xml        |  14 ++---
 guide/ja/gnucash-guide.xml        |  10 ++--
 help/C/Help_ch_GettingStarted.xml | 110 +-------------------------------------
 help/C/Help_ch_Reports.xml        |  25 ++++++++-
 help/C/Help_txf-categories.xml    |   7 +++
 help/C/gnucash-help.xml           |  30 ++++++++---
 help/de/gnucash-help.xml          |  12 ++---
 help/it/gnucash-help.xml          |  12 ++---
 14 files changed, 143 insertions(+), 186 deletions(-)



More information about the gnucash-changes mailing list