gnucash-docs master: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Thu Aug 27 08:26:36 EDT 2015


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/bf117a60 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/96e74507 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/3796b485 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/d569c249 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/bb253d0e (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5e5fbdd5 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/24eb5bff (commit)



commit bf117a6008024c6d2ff8653c48063b999fa4868c
Merge: 24eb5bf 96e7450
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu Aug 27 15:45:19 2015 +0200

    Merge branch 'maint'


commit 96e74507ba106e2a111cadf875fde527ca0fd0c4
Author: David <sunfish62 at yahoo.com>
Date:   Wed Aug 26 14:56:00 2015 +0000

    Bug 692961 - Update Chapter 6.3 in Tutorial

diff --git a/guide/C/ch_cc.xml b/guide/C/ch_cc.xml
index 94096ec..b685a43 100644
--- a/guide/C/ch_cc.xml
+++ b/guide/C/ch_cc.xml
@@ -140,27 +140,13 @@
     transaction between the credit card liability account and the appropriate
     expense account.</para>
 
-    <para>When you swipe that credit card through the machine at a store, you
-    are transferring money from your credit card company to that merchant.
-    This transaction increases the amount of money you owe the credit card
-    company. If you keep track of these types of transactions, you can
-    reconcile your credit card account with your monthly statement, and you
-    should quickly spot any transactions that look suspicious. So how should
-    you account for charges to your credit card?</para>
-
-    <para>One way is to manually enter all your receipts, either throughout
-    the month or all at once. This can be time-consuming, but it is probably
-    the best way to make sure that all of your charges are authorized. If you
-    consistently enter all your receipts, you can quickly catch any errors or
-    unauthorized transactions during your monthly reconciliation.</para>
-
-    <para>Another way is to import a credit card statement directly into your
-    account. If your credit card company supports a <acronym>QIF</acronym> file format for its
-    statements, you have the option of directly importing the statement. This
-    type of import is covered in the <application>&app;</application> manual, 
-    and it is a
-    convenient way to track your purchases without having to manually enter
-    all your receipts.</para>
+    <para>When you pay for goods or services with your credit card, you are telling the credit card company to pay the merchant for you. This transaction will increase the amount of money you owe the credit card company, and the credit card balance will increase. The other side of these transactions will in most cases be an expense account. For example, if you buy clothing from a store with your credit card for $50, you would be transferring that money from the credit account into Expenses:Clothing.</para>
+
+    <para>Entering these transactions into <application>&app;</application> allows you to track how much you owe the credit card company, as well as provides you a better picture of your overall accounts. It also allows you to monitor your account and ensure that fraud is avoided.</para>
+
+    <para>Adding transactions to a credit card account is similar to entering transactions in other accounts. You can enter them manually, or import them from your credit card company using a compatible import format.</para>
+
+    <para>For assistance with entering transactions, see Chapter 6 of the Help manual and <xref linkend="chapter_txns"></xref>.</para>
   </sect1>
 
   <sect1 id="cc-enterpay1">

commit 3796b48578ba7366b7f533c5ec6f3da02c7e3318
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu Aug 27 11:30:43 2015 +0200

    Fix xmllint errors in previous commit

diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 02f66d3..1ca318b 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -49,7 +49,7 @@
     very similar to the log used to track checkbooks.</para>
 
     <para>The account register is explained in the upcoming section,
-    <xref linkend="txns-registers1"/>.</para>
+    <xref linkend="txns-register-oview"/>.</para>
   </sect1>
 
   <sect1 id="txns-register-oview">
@@ -72,13 +72,13 @@
         style that most closely resembles other popular personal financial
         packages. You can choose a different register style from the <menuchoice><guimenu>View</guimenu></menuchoice> menu. There are two other view modes:</para>
     <itemizedlist>
-        <listitem><menuchoice><guimenu>View</guimenu><guimenuitem>Auto-Split Ledger</guimenuitem></menuchoice>
+        <listitem><para><menuchoice><guimenu>View</guimenu><guimenuitem>Auto-Split Ledger</guimenuitem></menuchoice>
         style expands the current transaction automatically. As you highlight a
         new transaction in the register, the transaction automatically expands to
-        show all splits.</listitem>
-        <listitem><menuchoice><guimenu>View</guimenu><guimenuitem>Transaction
-            Journal</guimenuitem></menuchoice> style shows all splits for all transactions in the register, which is more like an accounting journal.</listitem>
-        </itemizedlist>
+        show all splits.</para></listitem>
+    <listitem><para><menuchoice><guimenu>View</guimenu><guimenuitem>Transaction
+        Journal</guimenuitem></menuchoice> style shows all splits for all transactions in the register, which is more like an accounting journal.</para></listitem>
+    </itemizedlist>
     
     <para>All styles permit you to view your data in either single-line or
         double-line format. Select <menuchoice><guimenu>View</guimenu>
@@ -405,8 +405,6 @@
     exactly the same, but the transaction line now reflects the credit to
     the <emphasis>Income:Salary</emphasis> account.</para>
 
-</sect2>
-
     <sect2 id="txns-registers-twoaccount2">
       <title>Simple Transaction Example</title>
 

commit d569c249b842b486fa500e241689cab7e639e2de
Author: David <sunfish62 at yahoo.com>
Date:   Wed Aug 26 17:41:00 2015 +0000

    Bug 754136 - Tutorial Chapter 4 Edits
    
    The Tutorial Chapter on Transactions (Chapter 4) has a number of
    structural and logical problems with it. Attached is a patch to
    reorder and clarify several sections of the chapter.
    
    Included in the patch are changes that fix bug 744065
    by adding a note to section 4.5.

diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 1d3497b..02f66d3 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -52,28 +52,367 @@
     <xref linkend="txns-registers1"/>.</para>
   </sect1>
 
-  <sect1 id="txns-registers1">
+  <sect1 id="txns-register-oview">
     <title>The Account Register</title>
 
-    <para>The <emphasis>account register</emphasis> is the <application>&app;</application> window
-    which allows you to view or edit preexisting transactions, or add new
-    transactions for a particular account. To enter the account register,
-    simply highlight the account name in the account tree window and click the
-    <guibutton>Open</guibutton> button in the <emphasis>Toolbar</emphasis> or use the right mouse
-    button menu to open the account. <application>&app;</application> will display the account register
-    window.</para>
+    <para>The <emphasis>account register</emphasis> is the <application>&app;</application> window, which allows you to view or edit preexisting transactions, or add new transactions for a particular account. To open an account register from the Account Tree, double-click the account name, right click the account name and select Open Account from the menu, or use the Open button on the toolbar. <application>&app;</application> will display the account register window.</para>
+        <sect2 id="txns-registers-features2">
+            <title>Features of the Account Register</title>
+        
+            <para>The <emphasis>Titlebar</emphasis> of the account register displays the account name. Below the <emphasis>Titlebar</emphasis>, the <emphasis>Menubar</emphasis> displays the menu items available within the account register, and the <emphasis>Toolbar</emphasis> contains handy buttons that help you work with the account register.</para>
+        
+            <para>At the bottom left of the register window, <application>&app;</application> displays helpful messages as you move about the register. To the right, you can see the current account balance and the total of cleared splits.</para>
+        </sect2>
+<sect2 id="txns-regstyle1">
+    <title>Choosing a Register Style</title>
+    
+    <para><application>&app;</application> offers several options for viewing your registers. The
+        default style is <guilabel>Basic Ledger</guilabel> mode, which displays
+        only the summary of splits affecting the current account. This is the
+        style that most closely resembles other popular personal financial
+        packages. You can choose a different register style from the <menuchoice><guimenu>View</guimenu></menuchoice> menu. There are two other view modes:</para>
+    <itemizedlist>
+        <listitem><menuchoice><guimenu>View</guimenu><guimenuitem>Auto-Split Ledger</guimenuitem></menuchoice>
+        style expands the current transaction automatically. As you highlight a
+        new transaction in the register, the transaction automatically expands to
+        show all splits.</listitem>
+        <listitem><menuchoice><guimenu>View</guimenu><guimenuitem>Transaction
+            Journal</guimenuitem></menuchoice> style shows all splits for all transactions in the register, which is more like an accounting journal.</listitem>
+        </itemizedlist>
+    
+    <para>All styles permit you to view your data in either single-line or
+        double-line format. Select <menuchoice><guimenu>View</guimenu>
+            <guimenuitem>Double Line</guimenuitem></menuchoice>, and you will see your transaction
+        line expand to two register lines. Double-line mode will also display the transaction-level Notes field.</para>
+    
+    <para>Below are screenshots that demonstrate how the Basic Ledger and Transaction Journal views differ.
+    </para>
+    <para>For this example, let’s assume that you have purchased 3 pair of Jeans for $1,000, and have recorded the purchase as a split transaction with each pair entered on a separate split.</para>
+    <para>The below screenshots illustrate the different view modes.</para>
+    
+    <para>First let’s view the Jeans transaction from your checking account:</para>
+    
+    <screenshot id="txns-registersplit4">
+        <mediaobject>
+            <imageobject>
+                <imagedata fileref="figures/txns_registersplit4.png" format="PNG"
+                srccredit="Bengt Thuree" />
+            </imageobject>
+            
+            <textobject>
+                <phrase>3 Jeans purchases</phrase>
+            </textobject>
+            
+            <caption><para>
+                This image shows one split transaction with 3 Jeans purchases
+            </para></caption>
+        </mediaobject>
+    </screenshot>
+    
+    <para>Now, let's open the <emphasis>Expenses:Clothes</emphasis> account, and look at it in Basic view.</para>
+
+<screenshot id="txns-registersplit5">
+        <mediaobject>
+            <imageobject>
+                <imagedata fileref="figures/txns_registersplit5.png" format="PNG"
+                srccredit="Bengt Thuree" />
+            </imageobject>
+            
+            <textobject>
+                <phrase>A jump to the <emphasis>Expenses:Clothes</emphasis> account</phrase>
+            </textobject>
+            
+            <caption><para>This image shows <emphasis>Expenses:Clothes</emphasis> account
+                in Basic Ledger mode.</para></caption>
+        </mediaobject>
+    </screenshot>
+<para>Three entries appear here, but there was only the single split entry in the checking account. Further examination shows that each row has a different amount, $200, $300, and $500. This demonstrates that each row in this view reflects a single split from the original transaction.</para>
+
+    <para>Changing to Transaction Journal mode will display only the original split transaction.</para>
+    
+    <screenshot id="txns-registersplit6">
+        <mediaobject>
+            <imageobject>
+                <imagedata fileref="figures/txns_registersplit6.png" format="PNG"
+                srccredit="Bengt Thuree" />
+            </imageobject>
+            
+            <textobject>
+                <phrase>A jump to the <emphasis>Expenses:Clothes</emphasis> account</phrase>
+            </textobject>
+            
+            <caption><para>This image shows <emphasis>Expenses:Clothes</emphasis> account in
+                Transaction Journal mode.</para></caption>
+        </mediaobject>
+    </screenshot>
+    
+</sect2>
+
+<sect2 id="txns-shortcuts1">
+    <title>Using Entry Shortcuts</title>
+    
+    <para><application>&app;</application> provides several time-saving shortcuts for entering your
+        data. When you type the first few characters of a description that you
+        have used before, the QuickFill feature automatically fills in the rest of
+        the transaction as you last entered it. When you type in the first
+        characters of an account name in either the <guilabel>Transfer</guilabel>
+        field of the transaction line or the <guilabel>Account</guilabel> field of
+        the split line, QuickFill will automatically complete the name from your
+        account list. It also helps you with entering sub-accounts in these
+        fields: simply type the first characters of the parent account name
+        followed by a <keycap>:</keycap> (colon) and the first characters of the sub-account name. For
+        example, to enter <emphasis>Assets:Checking</emphasis>, you might type
+        <userinput>A:C</userinput> and let <application>&app;</application> fill in the rest.</para>
+    <warning><para>Because <keycap>:</keycap> is the account separator symbol,
+        you can not use it in your account names.</para></warning>
+    <tip><para>If you really need the colon in your account names, you can select another symbol by
+        <menuchoice><guimenu>Edit</guimenu><guisubmenu>Preferences</guisubmenu><guisubmenu>Accounts</guisubmenu>
+            <guilabel>Character</guilabel></menuchoice>.</para></tip>
+    <para>Register keyboard shortcuts also save you time, and <application>&app;</application> provides
+        several of them. In the date field, you can type:</para>
+    
+    <itemizedlist>
+        <listitem>
+            <para><keycap>+</keycap> or <keycap>=</keycap> to increment the date
+                and <keycap>-</keycap> or <keycap>_</keycap> to decrement the
+                date</para>
+        </listitem>
+        
+        <listitem>
+            <para><keycap>]</keycap> or <keycap>}</keycap> to increment the month
+                and <keycap>[</keycap> or <keycap>{</keycap> to decrement the
+                month</para>
+        </listitem>
+        
+        <listitem>
+            <para><keycap>M</keycap> or <keycap>m</keycap> to enter the first date
+                of the month</para>
+        </listitem>
+        
+        <listitem>
+            <para><keycap>H</keycap> or <keycap>h</keycap> to enter the last date
+                of the month</para>
+        </listitem>
+        
+        <listitem>
+            <para><keycap>Y</keycap> or <keycap>y</keycap> to enter the first date
+                of the year</para>
+        </listitem>
+        
+        <listitem>
+            <para><keycap>R</keycap> or <keycap>r</keycap> to enter the last date
+                of the year</para>
+        </listitem>
+        
+        <listitem>
+            <para><keycap>T</keycap> or <keycap>t</keycap> to enter today’s
+                date</para>
+        </listitem>
+    </itemizedlist>
+    
+    <para>In the <guilabel>Num</guilabel> field of the transaction line, you
+        can type <keycap>+</keycap> to increment the transaction number from the
+        last one you typed in. Typing <keycap>-</keycap> will decrement the
+        number. This will also work in the <guilabel>Action</guilabel> field of
+        the split line, if you choose to enter split numbers there. The
+        <guilabel>Action</guilabel> field also supports QuickFill - if you type
+        the first characters of a common action (such as
+        <guilabel>Deposit</guilabel>), <application>&app;</application> will fill in the rest.</para>
+    
+    <para>The <guilabel>Transfer</guilabel> field supports QuickFill
+        of account names.  You can start typing an account name and
+        <application>&app;</application> will fill in the remaining part of the name.  Typing the
+        separator character at any time will complete the current level of
+        the account name, leaving the cursor positioned to start the next
+        level of account name.  For example, typing <keycap>A:C</keycap> the
+        standard set of account names will complete to the
+        <emphasis>Assets:Checking</emphasis> account.  You can also type the
+        <keycap>Menu</keycap> or <keycombo><keycap>Ctrl</keycap><keycap>Down</keycap></keycombo> keys in this
+        field to pop up a list of all account names.</para>
+    
+    <para>In any of the amount fields, you can use a built-in calculator.
+        Simply type in the first value, followed by <keycap>+</keycap>,
+        <keycap>-</keycap>, <keycap>*</keycap>, or <keycap>/</keycap>, then type
+        in the second value. <application>&app;</application> will perform the calculation and return the
+        resulting value to the amount field when you press the
+        <keycap>Tab</keycap> key.</para>
+    
+    <para>All of the menu items have access keys defined, and these are marked
+        by underlined characters in the menu names. Press <keycap>Alt</keycap> +
+        [underlined character] to bring up the menu, then select an item by typing
+        its underlined character. For example, typing <keycombo>
+            <keycap>Alt</keycap>
+            
+            <keycap>A</keycap>
+        </keycombo> brings up the Actions menu, then typing
+        <keycap>P</keycap> will split the transaction. A few of the menu items
+        also have shortcut keys that immediately invoke the command (typically
+        using the <keycap>Ctrl</keycap> key).  These shortcuts are listed next
+        to the item.</para>
+    
+    <para>To move around the register, use these keys to save time:</para>
+    
+    <itemizedlist>
+        <listitem>
+            <para><keycap>Tab</keycap> to move to the next field, <keycombo>
+                <keycap>Shift</keycap>
+                
+                <keycap>Tab</keycap>
+            </keycombo> to move to the previous field</para>
+        </listitem>
+        
+        <listitem>
+            <para><keycap>Home</keycap> to move to the beginning of the field,
+                <keycap>End</keycap> to move to the end of the field</para>
+        </listitem>
+        
+        <listitem>
+            <para><keycap function="enter">Enter</keycap> or <keycap>↓</keycap> to move to the next
+                transaction, <keycap>↑</keycap> to move to the previous
+                transaction</para>
+        </listitem>
+        
+        <listitem>
+            <para><keycap>Page Up</keycap> to move up one screen, <keycap>Page
+                Down</keycap> to move down one screen</para>
+        </listitem>
+        
+        <listitem>
+            <para><keycombo>
+                <keycap>Shift</keycap>
+                
+                <keycap>Page Up</keycap>
+            </keycombo> to go to the first transaction, <keycombo>
+                <keycap>Shift</keycap>
+                
+                <keycap>Page Down</keycap>
+            </keycombo> to go to the last transaction</para>
+        </listitem>
+    </itemizedlist>
+    
+    <para>In the <guilabel>Reconcile</guilabel> window you can use these
+        keyboard shortcuts:</para>
+    
+    <itemizedlist>
+        <listitem>
+            <para><keycap>Tab</keycap> moves to the next box and
+                <keycombo><keycap>Shift</keycap><keycap>Tab</keycap></keycombo>
+                moves to the previous
+                box</para>
+        </listitem>
+        
+        <listitem>
+            <para>Space bar toggles the status between reconciled and not
+                reconciled</para>
+        </listitem>
+        
+        <listitem>
+            <para><keycap>↑</keycap> and <keycap>↓</keycap> navigate through the
+                entries within the current box</para>
+        </listitem>
+    </itemizedlist>
+</sect2>
+</sect1>
+    <sect1 id="txns-registers-txntypes">
+    <title>Simple vs. Split Transactions</title>
+    
+    <para>Every transaction in <application>&app;</application> has at least two splits, but a transaction can have more than two splits. A transaction with only two splits is called a <emphasis>simple transaction</emphasis>, since it only involves the current account and a single remote account. A transaction with three or more accounts is called a <emphasis>split transaction</emphasis>.</para>
+    <para>When the register is in Basic view, you will see a summary of the splits affecting the current account. For a simple transaction, the <guilabel>Transfer</guilabel> column will display the other account from which money is <emphasis>transferred</emphasis>. For a split transaction, the <guilabel>Transfer</guilabel> column will display <guilabel>-- Split Transaction --</guilabel>. You can see the individual splits of each
+        transaction by clicking the <guibutton>Split</guibutton> button in the
+        <emphasis>Toolbar</emphasis> while selecting the appropriate transaction.</para>
+    
+    <para>For split transactions, the first line of the transaction is the
+        <emphasis>transaction line</emphasis>. It contains a
+        <guilabel>Date</guilabel>, optional <guilabel>Num</guilabel> (such as a
+        check number), transaction <guilabel>Description</guilabel>, total
+        amount affecting the current account (<guilabel>Tot Deposit</guilabel>
+        here), and updated account <guilabel>Balance</guilabel> after the
+        current transaction. Note that in the expanded view, the
+        <guilabel>Transfer</guilabel> column heading disappears, and there is no
+        account name listed in that field. This line shows you only a summary of
+        the transaction’s effect on the current account. For more detailed
+        information, you need to look at the individual splits that make up the
+        transaction.</para>
+
+<para>The partial lines below the transaction line are the
+    <emphasis>split lines</emphasis>, and they are separated by gray lines.
+    As you highlight one of the split lines, the column headings change to
+    show the split-related fields:</para>
+
+<screenshot id="txns-registersplit2">
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="figures/txns_registersplit2.png" format="PNG"
+            srccredit="Bengt Thuree" />
+        </imageobject>
+        
+        <textobject>
+            <phrase>How split headings change</phrase>
+        </textobject>
+        
+        <caption><para>This image shows how split headings
+            change.</para></caption>
+    </mediaobject>
+</screenshot>
+
+<para>Each split contains an optional <guilabel>Action</guilabel>, or
+    type of split, which you can either type in or choose from a pull-down
+    list. The split also contains an optional <guilabel>Memo</guilabel>
+    which describes the split. Each split affects an
+    <guilabel>Account</guilabel>, which can be selected from a pull-down
+    list of your accounts. The <guilabel>R</guilabel> field indicates
+    whether the split has been reconciled. The last two columns show the
+    amount of the split and whether money is coming into or going out of the
+    account.</para>
+
+<para>As we discussed in <xref linkend="basics-accounting1" />, total
+    debits (left-column entries) must equal total credits (right-column
+    entries) for each transaction. In the example shown above, the total
+    debits equal the total credits, so this transaction is balanced. If you
+    notice, the transaction line contains the same debit amount as the
+    <guilabel>Checking</guilabel> split line. Why is this shown twice?
+    Because the transaction line is merely a <emphasis>summary</emphasis> of
+    the transaction’s effect on the current account. The same transaction in
+    a different account will have a different transaction line, one that
+    shows the effect on that particular account. You can see this by
+    highlighting another split line and clicking the
+    <guibutton>Jump</guibutton> button on the <emphasis>Toolbar</emphasis>.</para>
+
+<para>In this example, if you jump to the
+    <emphasis>Income:Salary</emphasis> account, <application>&app;</application> brings up the same
+    transaction in the <emphasis>Income:Salary</emphasis> - Register:</para>
+
+<screenshot id="txns-registersplit3">
+    <mediaobject>
+        <imageobject>
+            <imagedata fileref="figures/txns_registersplit3.png" format="PNG"
+            srccredit="Bengt Thuree" />
+        </imageobject>
+        
+        <textobject>
+            <phrase>A jump to the <emphasis>Income:Salary</emphasis> account</phrase>
+        </textobject>
+        
+        <caption><para>This image shows a jump to the
+            <emphasis>Income:Salary</emphasis> account.</para></caption>
+    </mediaobject>
+</screenshot>
+
+<para>Note that the transaction line total now summarizes the effect on
+    the <emphasis>Income:Salary</emphasis> account instead of the
+    <emphasis>Checking Account</emphasis>, because you are looking at the
+    <emphasis>Income:Salary</emphasis> account register. The splits are
+    exactly the same, but the transaction line now reflects the credit to
+    the <emphasis>Income:Salary</emphasis> account.</para>
 
-    <tip>
-      <para>A double click on a last level account (the ones without a symbol on the left of the 
-      accounts name) will open the register window for that account.</para>
-    </tip>
+</sect2>
 
     <sect2 id="txns-registers-twoaccount2">
-      <title>Simple Transaction</title>
+      <title>Simple Transaction Example</title>
 
-      <para>For example, starting with the chart of accounts we created in the
+      <para>Starting with the chart of accounts we created in the
       previous chapter <filename>gcashdata_3</filename>, double click on the
-      <guilabel>checking</guilabel> asset account. Let’s add a simple
+      <guilabel>Checking</guilabel> asset account. Let’s add a simple
       transaction to the checking account. When you first create your accounts
       in <application>&app;</application>, it is common to start them off with an initial
       balance.</para>
@@ -132,7 +471,7 @@
     </sect2>
 
     <sect2 id="txns-registers-multiaccount2">
-      <title>Split Transaction</title>
+      <title>Split Transaction Example</title>
 
       <para>The need for 3 or more splits in a transaction occurs when you need
       to split either the <quote>from</quote> or the <quote>to</quote> account in a transaction into
@@ -181,374 +520,6 @@
         </mediaobject>
       </figure>
     </sect2>
-
-    <sect2 id="txns-registers-features2">
-      <title>Features of the Account Register</title>
-
-      <para>The <emphasis>Titlebar</emphasis> of the account register displays the account name,
-      which in this case is <emphasis>Assets:Checking</emphasis>. Below the
-      <emphasis>Titlebar</emphasis>, the <emphasis>Menubar</emphasis> displays the menu items available within the
-      account register, and the <emphasis>Toolbar</emphasis> contains handy buttons that help you
-      work with the account register.</para>
-
-      <para>Although each transaction has at least two splits, all you see in
-      the basic register is a summary of the splits affecting the current
-      account. In the <guilabel>Transfer</guilabel> column, you can see the other account from
-      which money is <emphasis>transferred</emphasis> into or out of this
-      account. If the transaction affects more than two accounts, <application>&app;</application>
-      displays <guilabel>-- Split Transaction --</guilabel> to show it is a
-      multiple-split transaction. You can see the individual splits of each
-      transaction by clicking the <guibutton>Split</guibutton> button in the
-      <emphasis>Toolbar</emphasis> while selecting the appropriate transaction.</para>
-
-      <para>For split transactions, the first line of the transaction is the
-      <emphasis>transaction line</emphasis>. It contains a
-      <guilabel>Date</guilabel>, optional <guilabel>Num</guilabel> (such as a
-      check number), transaction <guilabel>Description</guilabel>, total
-      amount affecting the current account (<guilabel>Tot Deposit</guilabel>
-      here), and updated account <guilabel>Balance</guilabel> after the
-      current transaction. Note that in the expanded view, the
-      <guilabel>Transfer</guilabel> column heading disappears, and there is no
-      account name listed in that field. This line shows you only a summary of
-      the transaction’s effect on the current account. For more detailed
-      information, you need to look at the individual splits that make up the
-      transaction.</para>
-
-      <para>The partial lines below the transaction line are the
-      <emphasis>split lines</emphasis>, and they are separated by gray lines.
-      As you highlight one of the split lines, the column headings change to
-      show the split-related fields:</para>
-
-      <screenshot id="txns-registersplit2">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_registersplit2.png" format="PNG"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>How split headings change</phrase>
-          </textobject>
-
-          <caption><para>This image shows how split headings
-          change.</para></caption>
-        </mediaobject>
-      </screenshot>
-
-      <para>Each split contains an optional <guilabel>Action</guilabel>, or
-      type of split, which you can either type in or choose from a pull-down
-      list. The split also contains an optional <guilabel>Memo</guilabel>
-      which describes the split. Each split affects an
-      <guilabel>Account</guilabel>, which can be selected from a pull-down
-      list of your accounts. The <guilabel>R</guilabel> field indicates
-      whether the split has been reconciled. The last two columns show the
-      amount of the split and whether money is coming into or going out of the
-      account.</para>
-
-      <para>As we discussed in <xref linkend="basics-accounting1" />, total
-      debits (left-column entries) must equal total credits (right-column
-      entries) for each transaction. In the example shown above, the total
-      debits equal the total credits, so this transaction is balanced. If you
-      notice, the transaction line contains the same debit amount as the
-      <guilabel>Checking</guilabel> split line. Why is this shown twice?
-      Because the transaction line is merely a <emphasis>summary</emphasis> of
-      the transaction’s effect on the current account. The same transaction in
-      a different account will have a different transaction line, one that
-      shows the effect on that particular account. You can see this by
-      highlighting another split line and clicking the
-      <guibutton>Jump</guibutton> button on the <emphasis>Toolbar</emphasis>.</para>
-
-      <para>In this example, if you jump to the
-      <emphasis>Income:Salary</emphasis> account, <application>&app;</application> brings up the same
-      transaction in the <emphasis>Income:Salary</emphasis> - Register:</para>
-
-      <screenshot id="txns-registersplit3">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_registersplit3.png" format="PNG"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>A jump to the <emphasis>Income:Salary</emphasis> account</phrase>
-          </textobject>
-
-          <caption><para>This image shows a jump to the
-          <emphasis>Income:Salary</emphasis> account.</para></caption>
-        </mediaobject>
-      </screenshot>
-
-      <para>Note that the transaction line total now summarizes the effect on
-      the <emphasis>Income:Salary</emphasis> account instead of the
-      <emphasis>Checking Account</emphasis>, because you are looking at the
-      <emphasis>Income:Salary</emphasis> account register. The splits are
-      exactly the same, but the transaction line now reflects the credit to
-      the <emphasis>Income:Salary</emphasis> account.</para>
-
-      <para>At the bottom left of the register window, <application>&app;</application> displays
-      helpful messages as you move about the register. To the right, you can
-      see the current account balance and the total of cleared splits.</para>
-    </sect2>
-
-  </sect1>
-
-  <sect1 id="txns-regstyle1">
-    <title>Choosing a Register Style</title>
-
-    <para><application>&app;</application> offers several options for viewing your registers. The
-    default style is <guilabel>Basic Ledger</guilabel> mode, which displays
-    only the summary of splits affecting the current account. This is the
-    style that most closely resembles other popular personal financial
-    packages.</para>
-
-    <para>You can choose a different register style by selecting
-    <menuchoice><guimenu>View</guimenu><guimenuitem>Auto-Split Ledger</guimenuitem></menuchoice>
-    style expands the current transaction automatically. As you highlight a
-    new transaction in the register, the transaction automatically expands to
-    show all splits. The <menuchoice><guimenu>View</guimenu><guimenuitem>Transaction
-    Journal</guimenuitem></menuchoice> style is more like an accounting journal, in which
-    all splits are shown for all transactions.</para>
-
-    <para>All styles permit you to view your data in either single-line or
-    double-line format. Select <menuchoice><guimenu>View</guimenu>
-    <guimenuitem>Double Line</guimenuitem></menuchoice>, and you will see your transaction
-    line expand to two register lines.</para>
-    
-    <para>Let’s have a closer look at how the Basic Ledger and Transaction Journal view differs.
-    </para>
-    <para>For this example, let’s assume that you have a checking account with $10,000,
-    and have decided to really splurge by purchasing 3 pair of Jeans for $1,000.
-    Now, you can either record this as one simple transaction and move $1,000 to <emphasis>Expenses:Clothes</emphasis>.
-    Or, you can record a split transaction, and record each Jeans individually.</para>
-    <para>Technically they are the same, but from an accounting point of view, when you 
-    record each Jeans purchase separately, the <emphasis>Expenses:Clothes</emphasis> account will record three
-    different transactions.</para>
-    <para>The below screenshots will illustrate this a bit better</para>
-    
-    <para>First let’s purchase the Jeans from your checking account</para>
-    
-          <screenshot id="txns-registersplit4">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_registersplit4.png" format="PNG"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>3 Jeans purchases</phrase>
-          </textobject>
-
-          <caption><para>
-            This image shows one split transaction with 3 Jeans purchases
-          </para></caption>
-        </mediaobject>
-      </screenshot>
-      
-     <para>The we open the <emphasis>Expenses:Clothes</emphasis> account, and look at it from the default Basic Ledger view.
-     As you can see, we have three entries here, but there were only one entry in the checking account.
-     If you look carefully, you will see that each row have a different amount, $200, $300, and $500.
-     Each row’s transaction line reflects a one split row.</para> 
-      <screenshot id="txns-registersplit5">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_registersplit5.png" format="PNG"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>A jump to the <emphasis>Expenses:Clothes</emphasis> account</phrase>
-          </textobject>
-
-          <caption><para>This image shows <emphasis>Expenses:Clothes</emphasis> account
-          in Basic Ledger mode.</para></caption>
-        </mediaobject>
-      </screenshot>
-      
-      <para>If we view the <emphasis>Expenses:Clothes</emphasis> account in Transaction Journal mode, you will again, only see
-      the original split transaction.</para>
-      
-      <screenshot id="txns-registersplit6">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_registersplit6.png" format="PNG"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>A jump to the <emphasis>Expenses:Clothes</emphasis> account</phrase>
-          </textobject>
-
-          <caption><para>This image shows <emphasis>Expenses:Clothes</emphasis> account in
-          Transaction Journal mode.</para></caption>
-        </mediaobject>
-      </screenshot>
-
-    
-  </sect1>
-
-  <sect1 id="txns-shortcuts1">
-    <title>Using Entry Shortcuts</title>
-
-    <para><application>&app;</application> provides several time-saving shortcuts for entering your
-      data. When you type the first few characters of a description that you
-      have used before, the QuickFill feature automatically fills in the rest of
-      the transaction as you last entered it. When you type in the first
-      characters of an account name in either the <guilabel>Transfer</guilabel>
-      field of the transaction line or the <guilabel>Account</guilabel> field of
-      the split line, QuickFill will automatically complete the name from your
-      account list. It also helps you with entering sub-accounts in these
-      fields: simply type the first characters of the parent account name
-      followed by a <keycap>:</keycap> (colon) and the first characters of the sub-account name. For
-      example, to enter <emphasis>Assets:Checking</emphasis>, you might type
-      <userinput>A:C</userinput> and let <application>&app;</application> fill in the rest.</para>
-    <warning><para>Because <keycap>:</keycap> is the account separator symbol,
-      you can not use it in your account names.</para></warning>
-    <tip><para>If you really need the colon in your account names, you can select another symbol by
-      <menuchoice><guimenu>Edit</guimenu><guisubmenu>Preferences</guisubmenu><guisubmenu>Accounts</guisubmenu>
-      <guilabel>Character</guilabel></menuchoice>.</para></tip>
-    <para>Register keyboard shortcuts also save you time, and <application>&app;</application> provides
-      several of them. In the date field, you can type:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para><keycap>+</keycap> or <keycap>=</keycap> to increment the date
-        and <keycap>-</keycap> or <keycap>_</keycap> to decrement the
-        date</para>
-      </listitem>
-
-      <listitem>
-        <para><keycap>]</keycap> or <keycap>}</keycap> to increment the month
-        and <keycap>[</keycap> or <keycap>{</keycap> to decrement the
-        month</para>
-      </listitem>
-
-      <listitem>
-        <para><keycap>M</keycap> or <keycap>m</keycap> to enter the first date
-        of the month</para>
-      </listitem>
-
-      <listitem>
-        <para><keycap>H</keycap> or <keycap>h</keycap> to enter the last date
-        of the month</para>
-      </listitem>
-
-      <listitem>
-        <para><keycap>Y</keycap> or <keycap>y</keycap> to enter the first date
-        of the year</para>
-      </listitem>
-
-      <listitem>
-        <para><keycap>R</keycap> or <keycap>r</keycap> to enter the last date
-        of the year</para>
-      </listitem>
-
-      <listitem>
-        <para><keycap>T</keycap> or <keycap>t</keycap> to enter today’s
-        date</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>In the <guilabel>Num</guilabel> field of the transaction line, you
-    can type <keycap>+</keycap> to increment the transaction number from the
-    last one you typed in. Typing <keycap>-</keycap> will decrement the
-    number. This will also work in the <guilabel>Action</guilabel> field of
-    the split line, if you choose to enter split numbers there. The
-    <guilabel>Action</guilabel> field also supports QuickFill - if you type
-    the first characters of a common action (such as
-    <guilabel>Deposit</guilabel>), <application>&app;</application> will fill in the rest.</para>
-
-    <para>The <guilabel>Transfer</guilabel> field supports QuickFill
-    of account names.  You can start typing an account name and
-    <application>&app;</application> will fill in the remaining part of the name.  Typing the
-    separator character at any time will complete the current level of
-    the account name, leaving the cursor positioned to start the next
-    level of account name.  For example, typing <keycap>A:C</keycap> the
-    standard set of account names will complete to the
-    <emphasis>Assets:Checking</emphasis> account.  You can also type the
-    <keycap>Menu</keycap> or <keycombo><keycap>Ctrl</keycap><keycap>Down</keycap></keycombo> keys in this
-    field to pop up a list of all account names.</para>
-
-    <para>In any of the amount fields, you can use a built-in calculator.
-    Simply type in the first value, followed by <keycap>+</keycap>,
-    <keycap>-</keycap>, <keycap>*</keycap>, or <keycap>/</keycap>, then type
-    in the second value. <application>&app;</application> will perform the calculation and return the
-    resulting value to the amount field when you press the
-    <keycap>Tab</keycap> key.</para>
-
-    <para>All of the menu items have access keys defined, and these are marked
-    by underlined characters in the menu names. Press <keycap>Alt</keycap> +
-    [underlined character] to bring up the menu, then select an item by typing
-    its underlined character. For example, typing <keycombo>
-        <keycap>Alt</keycap>
-
-        <keycap>A</keycap>
-      </keycombo> brings up the Actions menu, then typing
-    <keycap>P</keycap> will split the transaction. A few of the menu items
-    also have shortcut keys that immediately invoke the command (typically
-    using the <keycap>Ctrl</keycap> key).  These shortcuts are listed next
-    to the item.</para>
-
-    <para>To move around the register, use these keys to save time:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para><keycap>Tab</keycap> to move to the next field, <keycombo>
-            <keycap>Shift</keycap>
-
-            <keycap>Tab</keycap>
-          </keycombo> to move to the previous field</para>
-      </listitem>
-
-      <listitem>
-        <para><keycap>Home</keycap> to move to the beginning of the field,
-        <keycap>End</keycap> to move to the end of the field</para>
-      </listitem>
-
-      <listitem>
-        <para><keycap function="enter">Enter</keycap> or <keycap>↓</keycap> to move to the next
-        transaction, <keycap>↑</keycap> to move to the previous
-        transaction</para>
-      </listitem>
-
-      <listitem>
-        <para><keycap>Page Up</keycap> to move up one screen, <keycap>Page
-        Down</keycap> to move down one screen</para>
-      </listitem>
-
-      <listitem>
-        <para><keycombo>
-            <keycap>Shift</keycap>
-
-            <keycap>Page Up</keycap>
-          </keycombo> to go to the first transaction, <keycombo>
-            <keycap>Shift</keycap>
-
-            <keycap>Page Down</keycap>
-          </keycombo> to go to the last transaction</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>In the <guilabel>Reconcile</guilabel> window you can use these
-    keyboard shortcuts:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para><keycap>Tab</keycap> moves to the next box and
-        <keycombo><keycap>Shift</keycap><keycap>Tab</keycap></keycombo>
-        moves to the previous
-        box</para>
-      </listitem>
-
-      <listitem>
-        <para>Space bar toggles the status between reconciled and not
-        reconciled</para>
-      </listitem>
-
-      <listitem>
-        <para><keycap>↑</keycap> and <keycap>↓</keycap> navigate through the
-        entries within the current box</para>
-      </listitem>
-    </itemizedlist>
   </sect1>
 
   <sect1 id="txns-reconcile1">
@@ -778,9 +749,11 @@
       other value, then either you have missed transactions, or some amounts
       may be incorrect in <application>&app;</application>. (Or, less likely, the bank may have made an
       error.)</para>
+      
+      <note><para>Under some circumstances, it may be difficult or impossible to determine why an account will not reconcile. If you are unable to correct the discrepancy between your books and a statement, <application>&app;</application> includes a <guibutton>Balance</guibutton> button on the <emphasis>Toolbar</emphasis> that will automatically create a balancing entry for you in the amount that cannot be reconciled.</para>
+          <para>To use this, carry out the full reconciliation (marking all transactions that you can identify) and then click this button. <application>&app;</application> will create a balancing entry for the remaining discrepancy that uses the <emphasis>Special Accounts:Orphan-XXX</emphasis> account (where "XXX" represents your currency). The Reconcile window will close; re-opening it will allow you to check the newly-created balancing entry and finish the process.</para></note>
 
-      <para>When you have marked off all the items on the bank statement, and
-      when the difference is 0.00, press the <guibutton>Finish</guibutton> button on the <emphasis>Toolbar</emphasis> or
+      <para>When you have marked off all the items on the bank statement and the difference is 0.00, press the <guibutton>Finish</guibutton> button on the <emphasis>Toolbar</emphasis> or
       select <menuchoice><guimenu>Reconcile</guimenu><guimenuitem>Finish</guimenuitem></menuchoice> from the menu. 
       The <guilabel>Reconcile</guilabel> window will close.
       In the register window, the <guilabel>R</guilabel> field of the reconciled transactions will

commit bb253d0ec4d064ec1c5df12ec1fea1fdb3b489e3
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu Aug 27 10:56:47 2015 +0200

    Fix xmllint errors introduced in previous commit

diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index dd5e2b0..21bbe89 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -170,8 +170,6 @@
       <para><application>&app;</application> includes a number of investment features that allow you to track all your investments. With <application>&app;</application> you can track stocks individually (one per account) or in a portfolio of accounts (a group of accounts that can be displayed together).</para>
       <para><application>&app;</application> supports online stock and mutual fund quotes. This means you no longer need to look up stock prices one at a
           time. The process can be automated, and you can see the latest value of your stocks.</para>
-        </listitem>
-      </itemizedlist>
     </sect2>
 
     <sect2 id="oview-featuresintl2">

commit 5e5fbdd55e5b7b635fb918940adc6ddbc4e76049
Author: David <sunfish62 at yahoo.com>
Date:   Wed Aug 26 15:28:00 2015 +0000

    Numerous editorial changes to improve Chapter 1: Overview in the Guide
    
    https://bugzilla.gnome.org/show_bug.cgi?id=744182

diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index 91702c6..dd5e2b0 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -167,22 +167,9 @@
     <sect2 id="oview-featuresinvest2">
       <title>Tracks Your Investments</title>
 
-      <para><application>&app;</application> has a number of investment features. From simple
-      certificates of deposit to publicly traded stocks, <application>&app;</application> will track
-      all your investments.</para>
-
-      <itemizedlist>
-        <listitem>
-          <para><emphasis>Stock/Mutual Fund Portfolios</emphasis>: Track
-          stocks individually (one per account) or in a portfolio of accounts
-          (a group of accounts that can be displayed together).</para>
-        </listitem>
-
-        <listitem>
-          <para><emphasis>On-line Stock and Mutual Fund Quotes</emphasis>:
-          With <application>&app;</application>, you no longer need look up your stock values one at a
-          time. The process can be automated, to always present you with the
-          latest value of your stocks.</para>
+      <para><application>&app;</application> includes a number of investment features that allow you to track all your investments. With <application>&app;</application> you can track stocks individually (one per account) or in a portfolio of accounts (a group of accounts that can be displayed together).</para>
+      <para><application>&app;</application> supports online stock and mutual fund quotes. This means you no longer need to look up stock prices one at a
+          time. The process can be automated, and you can see the latest value of your stocks.</para>
         </listitem>
       </itemizedlist>
     </sect2>
@@ -417,35 +404,34 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>Managing Your Personal Finances</emphasis></para>
+          <para><emphasis>Managing Personal Finances</emphasis></para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Managing Your Business Finances</emphasis>.</para>
+          <para><emphasis>Managing Business Finances</emphasis>.</para>
         </listitem>
       </itemizedlist></para>
 
     <para><emphasis>Getting Started</emphasis> provides you with the most
-    basic information needed to begin using <application>&app;</application>. Use this part as a
-    quick-start guide. Its chapters will get you up and running: <itemizedlist>
+        basic information needed to begin using <application>&app;</application>. The chapters in this section explain concepts that are fundamental to using <application>&app;</application>. New users of <application>&app;</application> should familiarize themselves with the information in these chapters to get you up and running: <itemizedlist>
         <listitem>
-           <para><xref linkend="chapter_oview"></xref></para>
+           <para><xref linkend="chapter_oview"></xref> - (this chapter) gives a general overview of <application>&app;</application></para>
        </listitem>
 
         <listitem>
-          <para><xref linkend="chapter_basics"></xref></para>
+          <para><xref linkend="chapter_basics"></xref> - gives users a very brief introduction to accounting principles, and then provides information about how <application>&app;</application> structures its data. There is also information on basic interface elements in <application>&app;</application>. Finally, this chapter explains how <application>&app;</application> stores and manages your data.</para>
         </listitem>
 
         <listitem>
-          <para><xref linkend="chapter_accts"></xref></para>
+          <para><xref linkend="chapter_accts"></xref> - gives further information about accounts and how to organize them.</para>
         </listitem>
 
         <listitem>
-          <para><xref linkend="chapter_txns"></xref></para>
+          <para><xref linkend="chapter_txns"></xref> - gives basic information about transactions and how to enter them.</para>
         </listitem>
       </itemizedlist></para>
 
-    <para><emphasis>Managing Your Personal Finances</emphasis> addresses
+    <para><emphasis>Managing Personal Finances</emphasis> addresses
     common applications and features of <application>&app;</application> in greater detail. You will
     see more specific cases, based on frequently asked questions about
     applying <application>&app;</application> to everyday situations. Here are the applications and
@@ -475,7 +461,7 @@
         </listitem>
       </itemizedlist></para>
 
-    <para><emphasis>Managing Your Business Finances</emphasis> discusses the
+    <para><emphasis>Managing Business Finances</emphasis> discusses the
     use of <application>&app;</application> in business accounting: <itemizedlist>
         <listitem>
           <para><xref linkend="chapter_dep"></xref></para>
@@ -502,7 +488,7 @@
         </listitem>
       </itemizedlist></para>
 
-    <para>This manual also has an appendix, which contains extra information
+    <para>This manual also includes several appendices, which contains extra information
     you might want to know:</para>
 
     <itemizedlist>
@@ -650,17 +636,9 @@
   <sect1 id="oview-install1">
     <title>Installation</title>
 
-    <para>Installation of <application>&app;</application> can be simple, as most modern linux
-    distributions come with <application>&app;</application> precompiled and ready to go. In fact, most
-    likely, <application>&app;</application> is already installed. If you do not have <application>&app;</application>
-    installed, the simplest method for installing it is to insert the
-    installation CD that came with your distribution and follow the
-    instructions.</para>
-
-    <para>The <ulink url="http://www.gnucash.org/"><citetitle><application>&app;</application> home
-    page</citetitle></ulink> contains detailed instructions on how to install
-    <application>&app;</application> in the event your current distribution does not include it or you
-    want to install a different version. You can also read the README file in
-    the source code.</para>
+    <para>Installation of <application>&app;</application> is usually simple.</para>
+
+    <para>The <ulink url="http://www.gnucash.org/download.phtml"><citetitle><application>&app;</application> download page</citetitle></ulink> contains detailed instructions on how to install
+    <application>&app;</application> for each operating system supported.</para>
   </sect1>
 </chapter>



Summary of changes:
 guide/C/ch_cc.xml    |  28 +-
 guide/C/ch_oview.xml |  58 ++--
 guide/C/ch_txns.xml  | 745 +++++++++++++++++++++++++--------------------------
 3 files changed, 382 insertions(+), 449 deletions(-)



More information about the gnucash-changes mailing list