r19679 - gnucash-docs/trunk/guide/C - Improved markup, updated Preferences section to GnuCash2.4 and minor changes for 2.4 release.

Cristian Marchi cmarchi at code.gnucash.org
Tue Oct 19 14:01:09 EDT 2010


Author: cmarchi
Date: 2010-10-19 14:01:08 -0400 (Tue, 19 Oct 2010)
New Revision: 19679
Trac: http://svn.gnucash.org/trac/changeset/19679

Modified:
   gnucash-docs/trunk/guide/C/ch_basics.xml
Log:
Improved markup, updated Preferences section to GnuCash2.4 and minor changes for 2.4 release.

Modified: gnucash-docs/trunk/guide/C/ch_basics.xml
===================================================================
--- gnucash-docs/trunk/guide/C/ch_basics.xml	2010-10-19 17:58:59 UTC (rev 19678)
+++ gnucash-docs/trunk/guide/C/ch_basics.xml	2010-10-19 18:01:08 UTC (rev 19679)
@@ -17,13 +17,13 @@
 
   <para>This chapter will introduce some of the basics of using <application>&app;</application>. It is
   recommended that you read through this chapter, before starting to do any
-  real work with <application>&app;</application>. The chapters which follow this will begin to show
+  real work with <application>&app;</application>. Next chapters will begin to show
   you hands on examples.</para>
 
   <sect1 id="basics-accounting1">
     <title>Accounting Concepts</title>
 
-    <para><application>&app;</application> is easy enough to use that you do not have to have a
+    <para><application>&app;</application> is easy enough to use that you do not need to have a
     complete understanding of accounting principles to find it useful.
     However, you will find that some basic accounting knowledge will prove to
     be invaluable as <application>&app;</application> was designed using these principles as a
@@ -175,7 +175,7 @@
       home data, but <application>&app;</application> will automatically save a backup copy for you
       each time you save that data file. <application>&app;</application> also provides log files which
       can be used to help reconstruct data. Backup and log files are described
-      later in this chapter.</para>
+      in <xref linkend="basics-backup1" />.</para>
 
       <para>An <emphasis>account</emphasis> is a place for keeping track of
       what you own, owe, spend or receive. Although you only have one main
@@ -225,7 +225,8 @@
       transferring money from your source of income to your bank
       account.</para>
 
-      <para>In <application>&app;</application>, these transfers are known as transactions, and each
+      <para>In <application>&app;</application>, these transfers are known as 
+      <emphasis>transactions</emphasis>, and each
       transaction requires at least two accounts. To enter the cash
       withdrawal, for example, you would enter a transfer of money from a bank
       account to a cash account. You would record the grocery check as a
@@ -443,7 +444,7 @@
       more information you provide when entering transactions, the more
       detailed your reports will be.</para>
 
-      <note> <!-- <sidebar> -->
+      <note id="acc-terminology"> <!-- <sidebar> -->
         <title>Accounting Terminology</title>
 
         <para>Accountants use the terms <emphasis>debit</emphasis> and
@@ -467,9 +468,8 @@
         however. <application>&app;</application> account registers default to common column headings
         such as deposit and withdrawal - if you are more comfortable with
         those headings, use them. If you prefer the credit and debit headings,
-        you can change the column headings to use accounting labels from the
-        menu item <guimenu>Edit</guimenu> -&gt;
-        <guimenuitem>Preferences</guimenuitem> <guibutton>General</guibutton>
+        you can change the column headings to use accounting labels in the <interface>General</interface>
+        tab under <interface>Preferences</interface>.
         (see <xref linkend="basics-prefs1"></xref> for more detail on setting 
         preferences).</para>
       </note> <!-- </sidebar> -->
@@ -477,20 +477,20 @@
   </sect1>
 
   <sect1 id="basics-interface1">
-    <title>The <application>&app;</application> Interface</title>
+    <title>Interface</title>
 
     <para>The very first time you open <application>&app;</application>, you will see the
-    <guilabel>Welcome to <application>&app;</application>!</guilabel> dialog. From there, <application>&app;</application>
+    <interface>Welcome to &app;!</interface> screen. From there, <application>&app;</application>
     provides other tools to help you easily find what you are looking for.
-    Let's take a look at some of the common screens and dialog boxes you will
+    Let's take a look at some of the common screens and screen boxes you will
     see.</para>
 
     <sect2 id="basics-setup2">
       <title>Create a new set of accounts</title>
 
-      <para>The <guilabel>New Account Hierarchy Setup</guilabel> druid allows
+      <para>The <interface>New Account Hierarchy Setup</interface> assistant allows
       you to create several accounts at once. When you open <application>&app;</application> the first
-      time, you will get this dialog:</para>
+      time, you will get this screen:</para>
 
       <screenshot id="basics-NewAccountHierarchySetup">
         <mediaobject>
@@ -500,18 +500,18 @@
           </imageobject>
 
           <textobject>
-            <phrase>The New Account Hierarchy Setup Druid</phrase>
+            <phrase>The New Account Hierarchy Setup assistant</phrase>
           </textobject>
 
           <caption>
-            <para>This image shows the first screen of the <guilabel>New
-            Account Hierarchy Setup</guilabel> Druid.</para>
+            <para>This image shows the first screen of the <interface>New
+            Account Hierarchy Setup</interface> assistant.</para>
           </caption>
         </mediaobject>
       </screenshot>
 
-      <para>Click <guibutton>Next</guibutton> and follow the instructions
-      provided in the dialog. The dialog provides a default set of accounts
+      <para>Click <guibutton>Forward</guibutton> and follow the instructions
+      provided in the screen. The screen provides a default set of accounts
       with predefined account types, and you simply select the accounts you
       want. For more information on account types, see 
       <xref linkend="accts-types1"></xref>.</para>
@@ -524,19 +524,19 @@
           </imageobject>
 
           <textobject>
-            <phrase>The New Account Hierarchy Setup Druid - Currency</phrase>
+            <phrase>The New Account Hierarchy Setup assistant - Currency</phrase>
           </textobject>
 
           <caption>
-            <para>This image shows the second screen of the <guilabel>New
-            Account Hierarchy Setup</guilabel> Druid where you select the
+            <para>This image shows the second screen of the <interface>New
+            Account Hierarchy Setup</interface> assistant where you select the
             currency.</para>
           </caption>
         </mediaobject>
       </screenshot>
 
       <para>The currency you select here, will be assigned to all the
-      <guilabel>accounts</guilabel> created in this druid.</para>
+      <guilabel>accounts</guilabel> created in this assistant.</para>
 
       <screenshot id="basics-NewAccountHierarchySetup-Accounts">
         <mediaobject>
@@ -546,13 +546,13 @@
           </imageobject>
 
           <textobject>
-            <phrase>The New Account Hierarchy Setup Druid - Choose
+            <phrase>The New Account Hierarchy Setup assistant - Choose
             accounts</phrase>
           </textobject>
 
           <caption>
-            <para>This image shows the third screen of the <guilabel>New
-            Account Hierarchy Setup</guilabel> Druid where you choose the
+            <para>This image shows the third screen of the <interface>New
+            Account Hierarchy Setup</interface> assistant where you choose the
             various accounts.</para>
           </caption>
         </mediaobject>
@@ -570,19 +570,19 @@
           </imageobject>
 
           <textobject>
-            <phrase>The New Account Hierarchy Setup Druid - Configure</phrase>
+            <phrase>The New Account Hierarchy Setup assistant - Configure</phrase>
           </textobject>
 
           <caption>
-            <para>This image shows the fourth screen of the <guilabel>New
-            Account Hierarchy Setup</guilabel> Druid where you can set
+            <para>This image shows the fourth screen of the <interface>New
+            Account Hierarchy Setup</interface> assistant where you can set
             <guilabel>Opening Balance</guilabel>.</para>
           </caption>
         </mediaobject>
       </screenshot>
 
-      <para>In this dialog you will be able to set an <guilabel>Opening
-      Balance</guilabel> on each of the accounts, as well as indicate if it
+      <para>In this screen you will be able to set an <guilabel>Opening
+      Balance</guilabel> on each of the accounts, as well as indicate if
       the account should be a <guilabel>Placeholder</guilabel> (only
       sub-accounts allowed, no transactions. Like Current Assets in above
       image)</para>
@@ -595,18 +595,18 @@
           </imageobject>
 
           <textobject>
-            <phrase>The New Account Hierarchy Setup Druid - Finish</phrase>
+            <phrase>The New Account Hierarchy Setup assistant - Finish</phrase>
           </textobject>
 
           <caption>
-            <para>This image shows the Last screen of the <guilabel>New
-            Account Hierarchy Setup</guilabel> Druid.</para>
+            <para>This image shows the Last screen of the <interface>New
+            Account Hierarchy Setup</interface> assistant.</para>
           </caption>
         </mediaobject>
       </screenshot>
 
       <para>Click <guibutton>Apply</guibutton> to create all the accounts and
-      leave the druid.</para>
+      leave the assistant.</para>
 
       <para>If you intend to import your data from another program and you
       want to keep the same account names you used in that program, you may
@@ -618,7 +618,7 @@
     <sect2 id="basics-tip2">
       <title>Tip of the Day</title>
 
-      <para><application>&app;</application> provides a <guilabel>Tip of the Day</guilabel> dialog to
+      <para><application>&app;</application> provides a <interface>Tip of the Day</interface> screen to
       give helpful hints for using the program:</para>
 
       <screenshot id="basics-TipOfDay">
@@ -640,11 +640,11 @@
       </screenshot>
 
       <para>These tips provide useful information for beginning users. To view
-      more of the tips, click <guibutton>Next</guibutton> to continue. If you
-      do not wish to see this dialog box on start-up, deselect the box next to
+      more of the tips, click <guibutton>Forward</guibutton> to continue. If you
+      do not wish to see this screen box on start-up, deselect the box next to
       <guilabel>Show tips at startup</guilabel>. When you have
       finished viewing the helpful tips, click <guibutton>Close</guibutton> to
-      close the Tip dialog.</para>
+      close the <interface>Tip of the Day</interface> screen.</para>
     </sect2>
 
     <sect2 id="basics-main2">
@@ -667,7 +667,7 @@
           </textobject>
 
           <caption>
-            <para>This image shows the <guilabel>Accounts</guilabel>
+            <para>This image shows the <interface>Accounts</interface>
             window.</para>
           </caption>
         </mediaobject>
@@ -682,11 +682,11 @@
       <para>At the top of this window is the title bar, which displays the
       file name (once you have saved the file.) Below that is the menu bar.
       You can access the menu options by either clicking on these menu
-      headings or by using shortcuts and access key combinations, covered
-      later in this chapter. Next is the tool bar, which contains buttons
+      headings or by using shortcuts and access keys (see <xref linkend="basics-shortcut2" />. 
+      Next is the Toolbar, which contains buttons
       for the most common functions.</para>
       
-      <para>The account tree appears below the tool bar. Once you have
+      <para>The account tree appears below the Toolbar. Once you have
       started creating accounts, the account names will appear in the account
       tree. You can customize which headings show up by using the
       small <guiicon>down-arrow</guiicon> at the far right just above the account tree.</para>
@@ -704,7 +704,7 @@
       <para>The Account Register windows are used to enter and edit your
       account data. As the name suggests, they look similar to a checkbook
       register. When you double-click an account name in the
-      <guilabel>Accounts</guilabel> window, the <guilabel>Register</guilabel>
+      <interface>Accounts</interface> window, the <interface>Register</interface>
       window for that account will open.</para>
 
       <screenshot id="basics-CheckAccount">
@@ -719,7 +719,7 @@
           </textobject>
 
           <caption>
-            <para>This image shows The <guilabel>Checking Account - Register
+            <para>This image shows the <guilabel>Checking Account - Register
             </guilabel> with several transactions.</para>
           </caption>
         </mediaobject>
@@ -731,25 +731,27 @@
       register window are similar to the parts of the account tree window
       described earlier. The title bar at the top contains the account name.
       Below that, the menu bar contains menu options related to the account
-      register. Tool bar buttons simplify common data entry functions. The
+      register. Toolbar buttons simplify common data entry functions. The
       status bar at the bottom of the window, displays some account balances
       covered in <xref linkend="chapter_txns"></xref>. At the bottom of the 
       account register window,
       information appears about the current location of the cursor.</para>
       
-      <para>You can resize the various columns that <application>&app;</application> displays, but keep
-      in mind that the description column will automatically expand to fill all unused
+      <note>
+      <para>In the register windows, you can resize the various columns that 
+        <application>&app;</application> displays, but keep in mind that 
+        the description column will automatically expand to fill all unused
         space.  Therefore you should increase the size of all your other columns
-        first and then decrease the size of the description column.
-      </para>
+        first and then decrease the size of the description column.</para>
+      </note>
       
     </sect2>
 
     <sect2 id="basics-toolbar2">
-      <title>Tool Bar Buttons</title>
+      <title>Toolbar Buttons</title>
 
       <para>Both the account tree window and the account register window
-      contain tool bar buttons. These buttons provide quick access to common
+      contain Toolbar buttons. These buttons provide quick access to common
       functions such as <guibutton>Save</guibutton> and
       <guibutton>Open</guibutton> in the account tree window and
       <guibutton>Record</guibutton> and <guibutton>Delete</guibutton> in the
@@ -761,12 +763,12 @@
 
       <itemizedlist>
         <listitem>
-          <para><guibutton>Save</guibutton> - Use this function often to save
+          <para><guibutton>Save</guibutton> - Save
           the current file to disk.</para>
         </listitem>
 
         <listitem>
-          <para><guibutton>Close</guibutton> - Use this function to close the
+          <para><guibutton>Close</guibutton> - Close the
           current notebook page.</para>
         </listitem>
 
@@ -792,7 +794,7 @@
       <para>You can click on the account tree menu headings and then move the
       mouse pointer over the menu items to see what they do. As the pointer
       moves over a menu item, a description of the item appears in the lower
-      left-hand corner of the window. To select a menu item, click on
+      left-hand corner of the window (inside the Status bar). To select a menu item, click on
       it.</para>
 
       <para>You can also access the most common menu items in a window by
@@ -811,66 +813,200 @@
       <keycap>Alt</keycap> key with the underlined character in the menu
       heading will bring up the menu items for that heading. Once the menu
       items are displayed, type the underlined character in the menu item to
-      activate it. For example, typing <keycombo>
-          <keycap>Alt</keycap>
-
-          <keycap>F</keycap>
-        </keycombo> in the main window brings up the <guimenu>File</guimenu>
+      activate it. For example, typing <keycombo><keycap>Alt</keycap>
+      <keycap>F</keycap></keycombo> in the main window brings up the <guimenu>File</guimenu>
       menu, then typing <keycap>S</keycap> will save the file.  Access keys
-       are fixed and may not be changed by users.</para>
+      are fixed and may not be changed by users.</para>
 
       <para>Some of the more commonly used menu items also have shortcut keys
       that directly activate the command without having to traverse the menu
       structure.  These shortcuts typically use the <keycap>Ctrl</keycap>
       key, although they can use any key combination.  Menu shortcuts are
-      displayed at the end of each menu item.  These shortcuts may be edited
-      by users by setting a preference in the "Menu and Toolbar" preference
-      panel.</para>
-
-      <para>&app;, as a Gnome application, also allows you to define your
-      own menu shortcuts. To define a shortcut, first go to the "Menu and
-      Toolbar" preference panel and select the "Editable menu accelerators"
-      check box.  Then return to <application>&app;</application>, click on the menu header and move
-      the mouse pointer over the menu item. While the menu item is
-      highlighted, press a key or key combination to set the shortcut. You
-      should now see your shortcut choice next to the item in the menu. To
-      delete a shortcut, press the <keycap>Delete</keycap> key while the menu
-      item is highlighted.  Be careful when setting shortcuts as Gnome does
-      no checking on the key values pressed, and you can easily do things
-      like set a letter of the alphabet as your shortcut.</para>
+      displayed at the end of each menu item.</para>
     </sect2>
   </sect1>
 
   <sect1 id="basics-prefs1">
     <title>Setting Preferences</title>
 
-    <para><application>&app;</application> allows you to customize your session by setting several
-    preference options. From the menu select <guimenu>Edit</guimenu> -&gt;
-    <guimenuitem>Preferences</guimenuitem>, then make your desired changes
-    using the list of items shown on the left. The changes you made will be
-    applied directly. To close the preference window press the
+    <para>The <interface>&app; Preferences</interface> window allows you to customize your <application>&app;</application> 
+    session by setting several options. From the <application>&app;</application> menu
+    select <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>. 
+    The <interface>&app; Preferences</interface> window will open. 
+    Using the tabs on the left make your desired changes.</para>
+    <tip>
+      <para>Pausing the cursor for a couple of seconds over options in these windows
+      will display a tooltip with in-depth information on the choice.</para>
+    </tip>
+    <note>
+      <para>The changes you made will be applied directly.</para>
+    </note>  
+    <para>To close the <interface>&app; Preferences</interface> window press the
     <guibutton>Close</guibutton> button.</para>
 
-    <sect2 id="basics-acctprefs2">
+    <para>The <interface>&app; Preferences</interface> window contains the following
+    tabs.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><guilabel>Accounting Period</guilabel> - <xref
+          linkend="prefs-accounting-period"></xref></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Account</guilabel> - <xref
+          linkend="prefs-accounts"></xref></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Business</guilabel> - <xref
+          linkend="prefs-biz"></xref></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Date/Time</guilabel> - <xref
+          linkend="prefs-date-time"></xref></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>General</guilabel> - <xref
+          linkend="basics-general2"></xref></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>On-line Banking</guilabel> - <xref 
+          linkend="prefs-online"></xref></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Printing</guilabel> - <xref
+          linkend="prefs-printing"></xref></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Register</guilabel> - <xref
+          linkend="prefs-reg"></xref></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Register Default</guilabel> - <xref
+          linkend="prefs-reg-def"></xref></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Reports</guilabel> - <xref
+          linkend="prefs-reports"></xref></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Scheduled Transactions</guilabel> - <xref
+          linkend="prefs-sched"></xref></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Windows</guilabel> - <xref
+          linkend="prefs-window"></xref></para>
+        </listitem>
+
+      </itemizedlist>
+
+    <sect2 id="prefs-accounting-period">
+      <title>Accounting Period</title>
+
+      <para>In <guilabel>Accounting Period</guilabel>, you will see the
+      default settings shown here:</para>
+
+      <screenshot id="Prefer_Accounting-Period">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/basics_Preferences_AccountingPeriod.png" format="PNG"
+                       srccredit="Cristian Marchi" ></imagedata>
+          </imageobject>
+
+          <textobject>
+            <phrase><application>&app;</application> Preferences - Accounting Period</phrase>
+          </textobject>
+
+          <caption>
+            <para>This image shows the <guilabel>Preferences - Accounting
+            Period</guilabel> tab</para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+
+      <itemizedlist>
+        <listitem>
+        <para><guilabel>Summarybar content</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Include grand total</guilabel> - If checked, show in the Summarybar a grand total of all
+              accounts converted to the default currency.</para>
+            </listitem>
+
+            <listitem>
+              <para><guilabel>Include non-currency totals</guilabel> - if this
+              option is selected, <application>&app;</application> will include in the Summarybar a total 
+              for non-currency items (for instance number of shares).</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+          <listitem>
+            <para><guilabel>Start Date</guilabel> - This item sets the accounting period's start date.</para>
+             <itemizedlist>
+              <listitem>
+               <para><guilabel>Relative</guilabel> - Use the specified relative starting date for profit/loss
+                calculations.  Also use this date for net assets calculations.  Relative defines
+                start by today or start of current/previous year, quarter, month.</para>
+              </listitem>
+
+              <listitem>
+               <para><guilabel>Absolute</guilabel> - Use the specified absolute starting date for profit/loss
+                calculations.  Also use this date for net assets calculations.</para>
+              </listitem>
+             </itemizedlist>
+
+          </listitem>
+
+          <listitem>
+            <para><guilabel>End Date</guilabel> - This item sets the accounting period's end date.</para>
+             <itemizedlist>
+              <listitem>
+               <para><guilabel>Relative</guilabel> - Use the specified relative ending date for profit/loss
+                calculations.  Also use this date for net assets calculations.</para>
+              </listitem>
+
+              <listitem>
+               <para><guilabel>Absolute</guilabel> - Use the specified absolute ending date for profit/loss
+                calculations.  Also use this date for net assets calculations.</para>
+              </listitem>
+             </itemizedlist>
+
+          </listitem>
+
+      </itemizedlist>
+    </sect2>
+
+    <sect2 id="prefs-accounts">
       <title>Accounts</title>
 
       <para>In <guilabel>Accounts</guilabel>, you will see the default
       settings shown here:</para>
 
-      <screenshot id="basics-Preferences-Accounts">
+      <screenshot id="Prefer_Accounts">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/basics_Preferences_Accounts.png"
-                       format="PNG" srccredit="Bengt Thuree" ></imagedata>
+            <imagedata fileref="figures/basics_Preferences_Accounts.png" format="PNG"
+                       srccredit="Cristian Marchin" ></imagedata>
           </imageobject>
-
+          
           <textobject>
             <phrase><application>&app;</application> Preferences - Accounts</phrase>
           </textobject>
 
           <caption>
-            <para>This image shows The <guilabel>Preferences -
-            Accounts</guilabel></para>
+            <para>This image shows the <guilabel>Preferences -
+            Accounts</guilabel> tab</para>
           </caption>
         </mediaobject>
       </screenshot>
@@ -880,10 +1016,10 @@
           <para><guilabel>Separator Character</guilabel> - The account
           separator is the character that separates a parent account from its
           sub-account, for example Utilities:Electric. The default is a
-          <guibutton>:(Colon)</guibutton>, but you can also select
-          <guibutton>/(Slash)</guibutton>,
-          <guibutton>\(Backslash)</guibutton>, <guibutton>-(Dash)</guibutton>
-          or <guibutton>.(Period)</guibutton>, or any single non alphanumeric
+          <keycap>:(Colon)</keycap>, but you can also select
+          <keycap>/(Slash)</keycap>,
+          <keycap>\(Backslash)</keycap>, <keycap>-(Dash)</keycap>
+          or <keycap>.(Period)</keycap>, or any single non alphanumeric
           unicode. Parent accounts and sub-accounts are discussed in 
           <xref linkend="accts-types1"></xref></para>
         </listitem>
@@ -891,12 +1027,14 @@
         <listitem>
           <para><guilabel>Reverse Balanced accounts</guilabel> - This option
           lets you determine whether account balances will display as positive
-          or negative numbers: <itemizedlist>
+          or negative numbers: 
+            <itemizedlist>
               <listitem>
-                <para><guilabel>None</guilabel> shows all credit balances as
-                negative and all debit balances as positive. (See Accounting
-                Terminology note in this chapter for more information on
-                debits and credits.)</para>
+                <para><guilabel>Income &amp; Expense</guilabel> assigns a
+                positive credit balance to income account balances and a
+                negative debit balance to expense account balances. See
+                <xref linkend="chapter_accts"></xref> for more information 
+                on these account types.</para>
               </listitem>
 
               <listitem>
@@ -908,20 +1046,24 @@
               </listitem>
 
               <listitem>
-                <para><guilabel>Income &amp; Expense</guilabel> assigns a
-                positive credit balance to income account balances and a
-                negative debit balance to expense account balances. See
-                <xref linkend="chapter_accts"></xref> for more information 
-                on these account types.</para>
+                <para><guilabel>None</guilabel> shows all credit balances as
+                negative and all debit balances as positive. (See the
+                <link linkend="acc-terminology">accounting
+                Terminology note</link> in this chapter for more information on
+                debits and credits.)</para>
               </listitem>
             </itemizedlist></para>
         </listitem>
 
         <listitem>
           <para><guilabel>Labels</guilabel> - Select this option if you want
-          column headings to refer to debits and credits instead of the
-          default informal headings. (See Accounting Terminology note in this
-          chapter for more information on debits and credits.)</para>
+          column headings in the register to refer to <interface>debits</interface> and 
+          <interface>credits</interface> instead of the default informal headings such
+          as <interface>withdrawal</interface>
+          and <interface>deposit</interface>. (See the
+          <link linkend="acc-terminology">accounting
+          Terminology note</link> in this chapter for more information on
+          debits and credits.)</para>
         </listitem>
 
         <listitem>
@@ -931,13 +1073,13 @@
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Locale</guilabel> will use whatever currency is
-              specified in your system.</para>
+              <para><guilabel>Locale</guilabel> - Use the system locale currency for 
+              all newly created accounts.</para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Choose</guilabel> will let you specify a
-              specific currency to use, independent of your system
+              <para><guilabel>Choose</guilabel> - specify the
+              currency to use, independent of your system
               settings.</para>
             </listitem>
           </itemizedlist>
@@ -945,17 +1087,17 @@
       </itemizedlist>
     </sect2>
 
-    <sect2 id="basics-business2">
+    <sect2 id="prefs-biz">
       <title>Business</title>
 
       <para>In <guilabel>Business</guilabel>, you will see the default
       settings shown here:</para>
 
-      <screenshot id="basics-Preferences-Business">
+      <screenshot id="Prefer_Business">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/basics_Preferences_Business.png"
-                       format="PNG" srccredit="Bengt Thuree" ></imagedata>
+            <imagedata fileref="figures/basics_Preferences_Business.png" format="PNG"
+                       srccredit="Cristian Marchi" ></imagedata>
           </imageobject>
 
           <textobject>
@@ -963,65 +1105,77 @@
           </textobject>
 
           <caption>
-            <para>This image shows The <guilabel>Preferences -
-            Business</guilabel></para>
+            <para>This image shows the <guilabel>Preferences -
+            Business</guilabel> tab</para>
           </caption>
         </mediaobject>
       </screenshot>
 
       <itemizedlist>
         <listitem>
-          <para><guilabel>Open in a new window</guilabel> - If checked, each
-          invoice will be opened in its own top level window. If clear, the
-          invoice will be opened in the current window.</para>
-        </listitem>
+        <para><guilabel>Invoices</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Open in new window</guilabel> - If checked, each
+              invoice will be opened in its own top level window. If clear, the
+              invoice will be opened in the current window.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Accumulate splits on post</guilabel> - Whether
-          multiple entries in an invoice which transfer to the same account
-          should be accumulated into a single split by default.</para>
-        </listitem>
+            <listitem>
+              <para><guilabel>Accumulate splits on post</guilabel> - Whether
+              multiple entries in an invoice which transfer to the same account
+              should be accumulated into a single split by default.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Number of rows</guilabel> - Default number of
-          register rows to display in invoices.</para>
-        </listitem>
+            <listitem>
+              <para><guilabel>Number of rows</guilabel> - Default number of
+              register rows to display in invoices.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Tax Included (Invoices)</guilabel> - Whether tax are
-          included by default in entries on invoices. This setting is
-          inherited by new customers and vendors.</para>
+            <listitem>
+              <para><guilabel>Tax Included</guilabel> - Whether tax are
+              included by default in entries on invoices. This setting is
+              inherited by new customers and vendors.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><guilabel>Notify when due</guilabel> - Lets you set whether
-          you want to be notified of when a bill is soon to be due.</para>
-        </listitem>
+          <para><guilabel>Bills</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Notify when due</guilabel> - Lets you set whether
+              you want to be notified at <application>&ap;</application> startup 
+              of when a bill is soon to be due.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Days in advance</guilabel> - How many days in the
-          future to warn about bills coming due.</para>
-        </listitem>
+            <listitem>
+              <para><guilabel>Days in advance</guilabel> - How many days in the
+              future to warn about bills coming due.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Tax Included (Bills)</guilabel> - Whether tax are
-          included by default in entries on bills. This setting is inherited
-          by new customers and vendors.</para>
+            <listitem>
+              <para><guilabel>Tax Included</guilabel> - Whether tax are
+              included by default in entries on bills. This setting is inherited
+              by new customers and vendors.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
       </itemizedlist>
+    
     </sect2>
 
-    <sect2 id="basics-datetime2">
+    <sect2 id="prefs-date-time">
       <title>Date/Time</title>
 
       <para>In <guilabel>Date/Time</guilabel>, you will see the default
       settings shown here:</para>
 
-      <screenshot id="basics-Preferences-DateTime">
+      <screenshot id="Prefer_DateTime">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/basics_Preferences_DateTime.png"
-                       format="PNG" srccredit="Bengt Thuree" ></imagedata>
+            <imagedata fileref="figures/basics_Preferences_DateTime.png" format="PNG"
+                       srccredit="Cristian Marchi" ></imagedata>
           </imageobject>
 
           <textobject>
@@ -1029,24 +1183,49 @@
           </textobject>
 
           <caption>
-            <para>This image shows The <guilabel>Preferences -
-            Date/Time</guilabel></para>
+            <para>This image shows the <guilabel>Preferences -
+            Date/Time</guilabel> tab</para>
           </caption>
         </mediaobject>
       </screenshot>
 
       <itemizedlist>
         <listitem>
-          <para><guilabel>Time Format</guilabel> - lets you specify if you
-          want to use 24 or 12 hours time format. That is if 23:00 should be
-          represented as 11PM or 23.</para>
+          <para><guilabel>Time Format</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Use 24-hour clock</guilabel> - Lets you specify if you
+              want to use 24 or 12 hours time format. That is if 23:00 should be
+              represented as 11PM or 23.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><guilabel>Date Format</guilabel> - This item controls the
-          appearance of the date. The available options are US, UK, Europe,
-          ISO, and Locale. Choosing "Locale" will automatically determine the
-          date format based on your operating system settings.</para>
+          <para><guilabel>Date Format</guilabel> - This option controls the
+          appearance of the date (you could see a preview of the date beside any of the choices).
+          The available choices are:</para>
+            <itemizedlist>
+             <listitem>
+              <para><guilabel>Locale</guilabel> - Use the date format specified by the system locale.</para>
+             </listitem>
+
+             <listitem>
+              <para><guilabel>US</guilabel> - Use the date format common in the United States.</para>
+             </listitem>
+
+             <listitem>
+              <para><guilabel>UK</guilabel> - Use the date format common in the United Kingdom.</para>
+             </listitem>
+
+             <listitem>
+              <para><guilabel>Europe</guilabel> - Use the date format common in continental Europe.</para>
+             </listitem>
+
+             <listitem>
+              <para><guilabel>ISO</guilabel> - Use the date format specified by the ISO-8601 standard.</para>
+             </listitem>
+            </itemizedlist>
         </listitem>
       </itemizedlist>
     </sect2>
@@ -1057,11 +1236,11 @@
       <para>In <guilabel>General</guilabel>, you will see the default settings
       shown here:</para>
 
-      <screenshot id="basics-Preferences-General">
+      <screenshot id="Prefer_General">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/basics_Preferences_General.png"
-                       format="PNG" srccredit="Bengt Thuree" ></imagedata>
+            <imagedata fileref="figures/basics_Preferences_General.png" format="PNG"
+                       srccredit="Cristian Marchi" ></imagedata>
           </imageobject>
 
           <textobject>
@@ -1069,151 +1248,277 @@
           </textobject>
 
           <caption>
-            <para>This image shows The <guilabel>Preferences -
-            General</guilabel></para>
+            <para>This image shows the <guilabel>Preferences -
+            General</guilabel> tab</para>
           </caption>
         </mediaobject>
       </screenshot>
 
       <itemizedlist>
         <listitem>
-          <para><guilabel>Display "tip of the Day"</guilabel> - You can turn
-          on or off the option to display the <quote>Tip of the Day</quote>
-          dialog on start-up.</para>
-        </listitem>
+        <para><guilabel>General</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Display "tip of the Day" screen</guilabel> - This option displays or hides the 
+              <interface>Tip of the Day</interface> screen when <application>&app;</application> is started.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Perform account list setup on new file</guilabel> -
-          This option turns off the display of the <guilabel>New Account
-          Hierarchy Setup</guilabel> druid when <guimenu>File</guimenu> -&gt;
-          <guimenuitem>New File</guimenuitem> is selected.</para>
-        </listitem>
+            <listitem>
+              <para><guilabel>Show splash screen</guilabel> - With this option you
+              can enable or disable the visualization of the startup screen while
+              <application>&app;</application> is starting up.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Show close button on notebook tabs</guilabel> - Adds
-          a small close icon on each tab, to make it easier to close the
-          various tabs.</para>
+            <listitem>
+              <para><guilabel>Perform account list setup on new file</guilabel> -
+              This option turns off the display of the <interface>New Account
+              Hierarchy Setup</interface> assistant when the entry <menuchoice><guimenu>File</guimenu>
+              <guimenuitem>New File</guimenuitem></menuchoice> is selected from the 
+              <application>&app;</application> menu.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><guilabel>Enable Euro support</guilabel> - If selected,
-          enables support for the European Union EURO currency. Needed if you
-          have any accounts with EURO currency.</para>
-        </listitem>
+          <para><guilabel>Numbers</guilabel></para>
+            <itemizedlist>
+              <listitem>
+                <para><guilabel>Display negative amounts in red</guilabel> - If you
+                turn off this option, <application>&app;</application> will display negative numbers in
+                black.</para>
+              </listitem>
 
-        <listitem>
-          <para><guilabel>Display negative amounts in red</guilabel> - If you
-          turn off this option, <application>&app;</application> will display negative numbers in
-          black.</para>
-        </listitem>
+              <listitem>
+                <para><guilabel>Automatic Decimal Point</guilabel> - This option
+                will automatically insert a decimal point into numbers you type
+                in.</para>
+              </listitem>
 
-        <listitem>
-          <para><guilabel>Automatic Decimal Point</guilabel> - This option
-          will automatically insert a decimal point into numbers you type
-          in.</para>
-        </listitem>
+              <listitem>
+                <para><guilabel>Decimal Places</guilabel> - This field allows you
+                to set the number of decimal places to be used.</para>
+              </listitem>
+            </itemizedlist>
+        </listitem> 
 
         <listitem>
-          <para><guilabel>Decimal Places</guilabel> - This option allows you
-          to set the number of decimal places to be used.</para>
-        </listitem>
+        <para><guilabel>Files</guilabel></para>
+               <note>
+                <para>The following options are only relevant for files saved in xml format.</para>
+              </note>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Compress files</guilabel> - This option determines
+              whether the <application>&app;</application> data file will be compressed or not.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Compress files</guilabel> - This option determines
-          whether the <application>&app;</application> data file will be compressed or not.</para>
-        </listitem>
+            <listitem>
+              <para><guilabel>Show auto-save confirmation question</guilabel> -
+              If this option is enabled, <application>&app;</application> will show you a confirmation screen
+              each time the auto-save process is started.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Retain log files</guilabel> - This option deletes
-          log files (and backup files) after the number of days set
-          here.</para>
+            <listitem>
+              <para><guilabel>Auto-save time interval</guilabel> -
+              This field sets the number of minutes between each automatic saving of the file.
+              Set to 0 to disable the auto-save feature.</para>
+            </listitem>
+
+            <listitem>
+              <para><guilabel>Retain log files</guilabel> - In this section you could set
+              your preferences about the log files using the provided radio buttons.</para> 
+              <itemizedlist>
+                <listitem>
+                  <para><guilabel>Never</guilabel> - Disable the creation of log files.</para>
+                </listitem>
+
+                <listitem>
+                  <para><guilabel>For:</guilabel> - Enter a specific number of days for which keep the files.</para>
+                </listitem>
+
+                <listitem>
+                  <para><guilabel>Forever</guilabel> - Disable the auto deletion of log files; retains the log file forever.</para>
+                </listitem>
+              </itemizedlist>
+               
+              <note>   
+                <para>See <xref linkend="basics-backuplog2" />
+                to gain more information about log files.</para>
+              </note>  
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><guilabel>New search limit</guilabel> - Defaults to 'new
-          search' if fewer than this number of items is returned.</para>
-        </listitem>
+        <para><guilabel>Search</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>New search limit</guilabel> - Defaults to "new
+              search" if fewer than this number of items is returned.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem> 
       </itemizedlist>
     </sect2>
 
-    <sect2 id="basics-onlinebank2">
-      <title>On-line Banking</title>
+    <sect2 id="prefs-online">
+      <title>Online Banking</title>
 
-      <para>In <guilabel>Online banking</guilabel>, you will see the default
+      <para>In <guilabel>Online Banking</guilabel>, you will see the default
       settings shown here:</para>
 
-      <screenshot id="basics-Preferences-OnlineBanking">
+      <screenshot id="Prefer_OnlineBanking">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_Preferences_OnlineBanking.png"
-                       format="PNG" srccredit="Bengt Thuree" ></imagedata>
+                       format="PNG" srccredit="Cristian Marchi" ></imagedata>
           </imageobject>
 
           <textobject>
-            <phrase><application>&app;</application> Preferences - Online banking</phrase>
+            <phrase><application>&app;</application> Preferences - Online Banking</phrase>
           </textobject>
 
           <caption>
-            <para>This image shows The <guilabel>Preferences - Online
-            banking</guilabel></para>
+            <para>This image shows the <guilabel>Preferences - Online
+            Banking</guilabel> tab</para>
           </caption>
         </mediaobject>
       </screenshot>
 
       <itemizedlist>
         <listitem>
-          <para><guilabel>Show documentation</guilabel> - The first time you
-          use the QIF importer (discussed later in this chapter), you may
-          notice that the importer has detailed instructions on how to import
-          a file. Once you have become familiar with using the importer, you
-          might want to turn off this option. Turning off the option gives you
-          less detail in the importer dialogs.</para>
+        <para><guilabel>QIF Import</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Show documentation</guilabel> - The first time you
+              use the QIF importer you may
+              notice that the importer has detailed instructions on how to import
+              a file. Once you have become familiar with using the importer, you
+              might want to turn off this option. Turning off the option gives you
+              less detail in the importer screens.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><guilabel>Use Bayesian matching</guilabel> - Use Bayesian
-          algorithms to match new transactions with existing accounts.</para>
+        <para><guilabel>Generic Importer</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Use Bayesian matching</guilabel> - Use Bayesian
+               algorithms to match new transactions with existing accounts.</para>
+            </listitem>
+
+            <listitem>
+              <para><guilabel>Match display threshold</guilabel> - The minimal
+              score a potential match must have to be displayed in the match
+              list.</para>
+            </listitem>
+
+            <listitem>
+              <para><guilabel>Auto-add threshold</guilabel> - A transaction whose
+              best match's score is in the red zone (above display threshold, but
+              below or equal to Auto-add threshold) will be added by
+              default.</para>
+            </listitem>
+
+            <listitem>
+              <para><guilabel>Auto-clear threshold</guilabel> - A transaction
+              whose best match's score is in the green zone (above or equal to
+              Auto-clear threshold) will be cleared by default.</para>
+            </listitem>
+
+            <listitem>
+              <para><guilabel>Commercial ATM fees threshold</guilabel> -
+              In some places commercial ATMs (not
+              belonging to a financial institution) are installed in places like convenience
+              store.  These ATM add its fee directly to the amount instead of showing up as a
+              separate transaction or in your monthly banking fees.  For example, you withdraw
+              $100, and you are charged $101.50 plus Interac fees.  If you manually entered
+              that $100, the amounts won't match.  You should set this to whatever is the
+              maximum such fee in your area (in units of your local currency), so the
+              transaction will be recognized as a match by 
+              <application>&app;</application>.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><guilabel>Match display threshold</guilabel> - The minimal
-          score a potential match must have to be displayed in the match
-          list.</para>
-        </listitem>
+        <para><guilabel>Online Banking</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Remember PIN</guilabel> - Enable this option if you
+              want <application>&app;</application> to remember the PIN you
+              enter for online banking authentication.</para>
+            </listitem>
 
+            <listitem>
+              <para><guilabel>Verbose debug messages</guilabel> - Enable this option if you
+              want <application>&app;</application> to show more information about the online
+              banking operations.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>            
+      </itemizedlist>
+    </sect2>
+
+    <sect2 id="prefs-printing">
+      <title>Printing</title>
+      <para>
+      In this tab you could set some options that affects the printing on paper of checks.
+      </para>
+      
+      <para>In <guilabel>Printing</guilabel>, you will see the default
+      settings shown here:</para>
+
+      <screenshot id="Prefer_Printing">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/basics_Preferences_Printing.png"
+                       format="PNG" srccredit="Cristian Marchi" ></imagedata>
+          </imageobject>
+
+          <textobject>
+            <phrase><application>&app;</application> Preferences - Printing</phrase>
+          </textobject>
+
+          <caption>
+            <para>This image shows the <guilabel>Preferences -
+            Printing</guilabel> tab</para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Auto-add threshold</guilabel> - A transaction whose
-          best match's score is in the red zone (above display threshold, but
-          below or equal to Auto-add threshold) will be added by
-          default.</para>
+          <para><guilabel>Print date format</guilabel> - Enable this option
+          if you want to print on the check, below the actual date, its format in 8 point type.
+          </para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Auto-clear threshold</guilabel> - A transaction
-          whose best match's score is in the green zone (above or equal to
-          Auto-clear threshold) will be cleared by default.</para>
+          <para><guilabel>Print blocking chars</guilabel> - Enable this option to print
+          a series of three asterisks before and after each text field in the check.</para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Commercial Cash Machine fees threshold </guilabel> -
-          If the ATM machine automatically adds a small transaction fee,
-          <application>&app;</application> will still be able to match it to the transaction as long as
-          the difference is below this threshold</para>
+          <para><guilabel>Default font:</guilabel> - Click the button on the left to open
+          a <interface>Pick a Font</interface> screen in which you can customize the font
+          that will be used to print checks.</para>
         </listitem>
       </itemizedlist>
     </sect2>
 
-    <sect2 id="basics-regprefs2">
+    <sect2 id="prefs-reg">
       <title>Register</title>
 
       <para>In <guilabel>Register</guilabel>, you will see the default
       settings shown here:</para>
 
-      <screenshot id="basics-Preferences-Register">
+      <screenshot id="Prefer_Register">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_Preferences_Register.png"
-                       format="PNG" srccredit="Bengt Thuree" ></imagedata>
+                       format="PNG" srccredit="Cristian Marchi" ></imagedata>
           </imageobject>
 
           <textobject>
@@ -1221,73 +1526,103 @@
           </textobject>
 
           <caption>
-            <para>This image shows The <guilabel>Preferences -
-            Register</guilabel></para>
+            <para>This image shows the <guilabel>Preferences -
+            Register</guilabel> tab</para>
           </caption>
         </mediaobject>
       </screenshot>
 
       <itemizedlist>
         <listitem>
-          <para><guilabel>'Enter' moves to blank transaction</guilabel> - If
-          selected, move to the blank transaction after the user presses
-          'enter', otherwise move down on row.</para>
-        </listitem>
+        <para><guilabel>Actions</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>'Enter' moves to blank transaction</guilabel> - If
+              selected, move the cursor to the blank transaction at the end of the register
+              after the user presses the <keycap>Enter</keycap> key. Otherwise the cursor will be moved
+              down one row.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Auto-raise lists</guilabel> - If selected, all lists
-          will automatically be expanded when input focus is in the list
-          field.</para>
-        </listitem>
+            <listitem>
+              <para><guilabel>Auto-raise lists</guilabel> - If selected, all lists
+              will automatically be expanded when input focus is in the list
+              field.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Check cleared transactions</guilabel> - If selected,
-          automatically check off cleared transactions when
-          reconciling.</para>
+            <listitem>
+              <para><guilabel>Tab order includes Transfer on Memorised Transaction</guilabel> - 
+              If selected, when the transaction is auto filled, pressing the 
+              <keycap>Tab</keycap> key in the register the cursor's jump 
+              will include the <guilabel>Transfer</guilabel> field.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><guilabel>Automatic interest transfer</guilabel> - If
-          selected, prior to reconciling an account which charges or pays
-          interest, prompt the user to enter a transaction for the interest
-          charge or payment. Currently only enabled for Bank, Credit, Mutual,
-          Asset, Receivable, Payable, and Liability accounts.</para>
-        </listitem>
+        <para><guilabel>Reconciling</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Check cleared transactions</guilabel> - If selected,
+              automatically check off cleared transactions when
+              reconciling.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Automatic credit card payments</guilabel> - If
-          selected, after reconciling a credit card statement, prompt the user
-          to enter a credit card payment.</para>
-        </listitem>
+            <listitem>
+              <para><guilabel>Automatic interest transfer</guilabel> - If
+              selected, prior to reconciling an account which charges or pays
+              interest, prompt the user to enter a transaction for the interest
+              charge or payment. Currently only enabled for Bank, Credit, Mutual,
+              Asset, Receivable, Payable, and Liability accounts.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Use system theme colours</guilabel> - If selected,
-          <application>&app;</application> will use the system theme colours instead of the default
-          colours.</para>
+            <listitem>
+              <para><guilabel>Automatic credit card payments</guilabel> - If
+              selected, after reconciling a credit card statement, prompt the user
+              to enter a credit card payment.</para>
+            </listitem>
+            
+            <listitem>
+              <para><guilabel>Always reconcile to today</guilabel> - If
+              selected, always open the reconcile screen with today's date for
+              statement date, regardless of previous reconciliation.</para>
+             </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><guilabel>Double mode colors alternate with
-          transactions</guilabel> - If selected, configures the register
-          window to alternate between the primary and secondary colors with
-          each transaction, instead of each row.</para>
-        </listitem>
+        <para><guilabel>Graphics</guilabel></para>
+          <itemizedlist>
+          
+            <listitem>
+              <para><guilabel>Use system theme colors</guilabel> - If selected, 
+              the system color theme will be applied to register windows. Otherwise
+              the original <application>&app;</application> register color will be used.</para>
+            </listitem>
+            
+            <listitem>
+              <para><guilabel>Double mode colors alternate with
+              transactions</guilabel> - If selected, configures the register
+              window to alternate between the primary and secondary colors with
+              each transaction, instead of each row.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Draw horizontal lines between rows</guilabel> - If
-          selected, <application>&app;</application> will draw a horizontal line between each
-          row.</para>
-        </listitem>
+            <listitem>
+              <para><guilabel>Draw horizontal lines between rows</guilabel> - If
+              selected, <application>&app;</application> will draw a horizontal line between each
+              row.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Draw vertical lines between cells</guilabel> - If
-          selected, <application>&app;</application> will draw a vertical line between the cells in
-          each row.</para>
+            <listitem>
+              <para><guilabel>Draw vertical lines between columns</guilabel> - If
+              selected, <application>&app;</application> will draw a vertical line between the cells in
+              each row.</para>
+             </listitem>
+          </itemizedlist>
         </listitem>
       </itemizedlist>
     </sect2>
 
-    <sect2 id="basics-regdefaults2">
+    <sect2 id="prefs-reg-def">
       <title>Register Defaults</title>
 
       <para>The <guilabel>Register Defaults</guilabel> preferences item
@@ -1298,11 +1633,11 @@
       <para>In <guilabel>Register</guilabel>, you will see the default
       settings shown here:</para>
 
-      <screenshot id="basics-Preferences-RegisterDefaults">
+      <screenshot id="Prefer_RegisterDefaults">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_Preferences_RegisterDefaults.png"
-                       format="PNG" srccredit="Bengt Thuree" ></imagedata>
+                       format="PNG" srccredit="Cristian Marchi" ></imagedata>
           </imageobject>
 
           <textobject>
@@ -1310,63 +1645,88 @@
           </textobject>
 
           <caption>
-            <para>This image shows The <guilabel>Preferences - Register
-            Defaults</guilabel></para>
+            <para>This image shows the <guilabel>Preferences - Register
+            Defaults</guilabel> tab</para>
           </caption>
         </mediaobject>
       </screenshot>
-
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default Style</guilabel> - you can choose from 3
-          different styles for register windows, <guilabel>Basic
-          Ledger</guilabel> (default), <guilabel>Auto-Split Ledger</guilabel>,
-          and <guilabel>Transaction Journal</guilabel>. The basic style is a
-          standard one-line register where everything appears on a single
-          line. The auto-split style is similar to the basic style except that
-          the current transaction is split-expanded. The journal style has
-          every transaction split-expanded.</para>
-        </listitem>
+        <para><guilabel>Default Style</guilabel></para>
+          <para>Here you can choose from 3
+          different styles for register windows:
+            <itemizedlist>
+             <listitem>
+              <para><guilabel>Basic ledger</guilabel> - Show all transactions on one line. (Two in double line
+               mode.)</para>
+             </listitem>
 
-        <listitem>
-          <para><guilabel>Register opens in a new window</guilabel> - If
-          selected, Register will be in a separate window instead of in a
-          tab.</para>
-        </listitem>
+             <listitem>
+              <para><guilabel>Auto-split ledger</guilabel> - Automatically expand the current transaction to show
+               all splits.  All other transactions are shown on one line. (Two in double line
+               mode.)</para>
+             </listitem>
 
-        <listitem>
-          <para><guilabel>Double Line Mode</guilabel> - If selected, show two
-          lines of information for each transaction instead of one.</para>
+             <listitem>
+              <para><guilabel>Transaction journal</guilabel> - All transactions are expanded to show all splits.
+              </para>
+             </listitem>
+            </itemizedlist>
+            </para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Number of transactions</guilabel> - How many
-          transactions to show in a register</para>
-        </listitem>
+        <para><guilabel>Other Defaults</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Register opens in a new window</guilabel> - If
+              selected, Register will be in a separate window instead of in a
+              tab.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Number of rows</guilabel> - How many rows to display
-          when the register is opened.</para>
+            <listitem>
+              <para><guilabel>Double Line Mode</guilabel> - If selected, show two
+              lines of information for each transaction instead of one.</para>
+            </listitem>
+
+            <listitem>
+              <para><guilabel>Only display leaf account names</guilabel> - If selected, only the name of the leaf
+              accounts will be displayed in the <guilabel>Account</guilabel> selection popup.
+              The default behavoir is to display the full account name including the path in the account tree.</para>
+              <warning>
+                <para>
+                Enabling this option implies that you use unique leaf account names.
+                </para>
+              </warning>
+            </listitem>
+            
+            <listitem>
+              <para><guilabel>Number of transactions</guilabel> - How many
+              transactions to show in a register. Set to 0 to show all transactions.</para>
+            </listitem>
+
+            <listitem>
+              <para><guilabel>Number of rows</guilabel> - How many rows to display
+              when the register is created.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
       </itemizedlist>
     </sect2>
 
-    <sect2 id="basics-reports2">
+    <sect2 id="prefs-reports">
       <title>Reports</title>
-
       <para>The <guilabel>Reports</guilabel> preferences item affects the
-      behavior of the transaction register windows. More information about the
-      transaction register can be found in <xref linkend="txns-registers1"></xref>
-      of this guide.</para>
+      behavior of the reports window.</para>
 
       <para>In <guilabel>Reports</guilabel>, you will see the default settings
       shown here:</para>
 
-      <screenshot id="basics-Preferences-Reports">
+      <screenshot id="Prefer_Reports">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_Preferences_Reports.png"
-                       format="PNG" srccredit="Bengt Thuree" ></imagedata>
+                       format="PNG" srccredit="Cristian Marchi" ></imagedata>
           </imageobject>
 
           <textobject>
@@ -1374,8 +1734,8 @@
           </textobject>
 
           <caption>
-            <para>This image shows The <guilabel>Preferences -
-            Reports</guilabel></para>
+            <para>This image shows the <guilabel>Preferences -
+            Reports</guilabel> tab</para>
           </caption>
         </mediaobject>
       </screenshot>
@@ -1384,90 +1744,47 @@
         <listitem>
           <para><guilabel>Default Report Currency</guilabel> - This item
           determines which currency will be used by default when creating
-          reports. You can choose between <guilabel>Locale</guilabel> which
-          uses system settings, or <guilabel>Choose</guilabel> which lets you
-          specify your own default report currency.</para>
-        </listitem>
+          reports. You can choose:</para>
+           <itemizedlist>
+            <listitem>
+             <para><guilabel>Locale</guilabel> - Use the system locale currency for all 
+             newly created reports.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Location</guilabel> - if you select this option, the
-          reports will open up in a new window, instead of in a tab.</para>
+            <listitem>
+             <para><guilabel>Choose</guilabel> - Use the specified currency for all 
+             newly created reports.</para>
+            </listitem>
+           </itemizedlist>          
         </listitem>
-      </itemizedlist>
-    </sect2>
 
-    <sect2 id="basics-accountingPeriod2">
-      <title>Accounting Period</title>
-
-      <para>In <guilabel>Accounting Period</guilabel>, you will see the
-      default settings shown here:</para>
-
-      <screenshot id="basics-Preferences-AccountingPeriod">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/basics_Preferences_AccountingPeriod.png"
-                       format="PNG" srccredit="Bengt Thuree" ></imagedata>
-          </imageobject>
-
-          <textobject>
-            <phrase><application>&app;</application> Preferences - Accounting Period</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows The <guilabel>Preferences - Accounting
-            Period</guilabel></para>
-          </caption>
-        </mediaobject>
-      </screenshot>
-
-      <itemizedlist>
         <listitem>
-          <para><guilabel>Include grand total</guilabel> - if this item is
-          selected, <application>&app;</application> will include a grand total on the report.</para>
+          <para><guilabel>Location</guilabel></para>
+            <itemizedlist>
+             <listitem>
+               <para><guilabel>Report opens in a new window</guilabel> - if you select this option, the
+               reports will open up in a new window, instead of in a tab.</para>
+             </listitem>
+           </itemizedlist>
         </listitem>
-
-        <listitem>
-          <para><guilabel>Include non-currency totals</guilabel> - if this
-          item is selected, <application>&app;</application> will include a total of non-currency items
-          (for instance number of shares) in the report.</para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>Start Date</guilabel> - This item determines which
-          from which start date the report will report from. You can choose
-          between <guilabel>Relative</guilabel> which uses a dynamic start
-          date (like "start of this year", "start of this month" etc), or
-          <guilabel>Absolute</guilabel> which lets you specify a specific
-          start date (which will not change as time goes by).</para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>End Date</guilabel> - This item determines which to
-          which end date the report will report to. You can choose between
-          <guilabel>Relative</guilabel> which uses a dynamic end date (like
-          "end of this year", "end of this month" etc), or
-          <guilabel>Absolute</guilabel> which lets you specify a specific end
-          date (which will not change as time goes by).</para>
-        </listitem>
       </itemizedlist>
     </sect2>
-
-    <sect2 id="basics-schedtrans2">
+    
+    <sect2 id="prefs-sched">
       <title>Scheduled Transactions</title>
-
       <para>The <guilabel>Scheduled Transactions</guilabel> preferences item
       affects the behavior of <application>&app;</application> for scheduling transactions. More
       information about scheduled transactions can be found in 
-      <xref linkend="txns-registers1"></xref> of this guide.</para>
+      <xref linkend="txns-sxn1"></xref> of this guide.</para>
 
       <para>In <guilabel>Scheduled Transactions</guilabel>, you will see the
       default settings shown here:</para>
 
-      <screenshot id="basics-Preferences-ScheduledTransactions">
+      <screenshot id="Prefer_ScheduledTransactions">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_Preferences_ScheduledTransactions.png"
-                       format="PNG" srccredit="Bengt Thuree" ></imagedata>
+                       format="PNG" srccredit="Cristian Marchi" ></imagedata>
           </imageobject>
 
           <textobject>
@@ -1475,52 +1792,63 @@
           </textobject>
 
           <caption>
-            <para>This image shows The <guilabel>Preferences - Scheduled
-            Transactions</guilabel></para>
+            <para>This image shows the <guilabel>Preferences - Scheduled
+            Transactions</guilabel> tab</para>
           </caption>
         </mediaobject>
       </screenshot>
 
       <itemizedlist>
         <listitem>
-          <para><guilabel>Run when data file opened</guilabel> - If selected,
-          the "Since-Last-Run" window will appear on <application>&app;</application> start-up (or
-          rather when <application>&app;</application> opens the file).</para>
+        <para><guilabel>Since Last Run Dialog</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Run when data file opened</guilabel> - If selected,
+              the <interface>Since-Last-Run</interface> window will appear on <application>&app;</application> start-up (or
+              rather when <application>&app;</application> opens the file).
+              </para>
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><guilabel>Auto-Create new transactions</guilabel> - If
-          selected, new Scheduled Transactions will automatically be entered
-          into the register. Also, if selected <guilabel>Notify before
-          transactions are created</guilabel> can be set to allow the user to
-          confirm creating the transactions.</para>
-        </listitem>
+        <para><guilabel>Transaction Editor Defaults</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Auto-Create new transactions</guilabel> - If
+              selected, new scheduled transactions will automatically be entered
+              into the register. If the auto-create option is enabled, you could also check
+              <guilabel>Notify before transactions are created</guilabel> so that you will be
+              able to confirm creating the transactions.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Create in advance, days</guilabel> - The default
-          number of days in advance to create new Scheduled
-          Transactions.</para>
-        </listitem>
+            <listitem>
+              <para><guilabel>Create in advance, days</guilabel> - The default
+              number of days in advance to create the registered scheduled
+              transactions.</para>
+            </listitem>
 
-        <listitem>
-          <para><guilabel>Remind in advance, days</guilabel> - The default
-          number of days in advance to remind on new Scheduled
-          Transactions.</para>
+            <listitem>
+              <para><guilabel>Remind in advance, days</guilabel> - The default
+              number of days in advance to remind on new scheduled
+              transactions.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
       </itemizedlist>
     </sect2>
 
-    <sect2 id="basics-windows2">
+    <sect2 id="prefs-window">
       <title>Windows</title>
 
       <para>In <guilabel>Windows</guilabel>, you will see the default settings
       shown here:</para>
 
-      <screenshot id="basics-Preferences-Windows">
+      <screenshot id="Prefer_Windows">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_Preferences_Windows.png"
-                       format="PNG" srccredit="Bengt Thuree" ></imagedata>
+                       format="PNG" srccredit="Cristian Marchi" ></imagedata>
           </imageobject>
 
           <textobject>
@@ -1528,26 +1856,88 @@
           </textobject>
 
           <caption>
-            <para>This image shows The <guilabel>Preferences -
-            Windows</guilabel></para>
+            <para>This image shows the <guilabel>Preferences -
+            Windows</guilabel> tab</para>
           </caption>
         </mediaobject>
       </screenshot>
 
       <itemizedlist>
         <listitem>
-          <para><guilabel>Save window size and position</guilabel> - If
-          selected, next time <application>&app;</application> starts it will re-use the window size
-          and position of the last run.</para>
+        <para><guilabel>Window Geometry</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Save window size and position</guilabel> - If
+              selected, next time <application>&app;</application> starts will re-use the windows size
+              and position configured in the last run.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><guilabel>Toolbar Style</guilabel> - you can choose from 5
-          different styles for the toolbar, <guilabel>Use system
-          default</guilabel> (default), <guilabel>Text below icons</guilabel>,
-          <guilabel>Text beside icons</guilabel>, <guilabel>Icons
-          only</guilabel>, and <guilabel>Text only</guilabel>.</para>
+          <para><guilabel>Toolbar style</guilabel></para>
+          <para>You can choose from five different styles for the toolbar:</para>
+           <itemizedlist>
+            <listitem>
+             <para><guilabel>Use system default</guilabel> (default) - Use the system setting 
+             for displaying toolbar items.
+             </para>
+            </listitem>
+
+            <listitem>
+             <para><guilabel>Text below icons</guilabel> - Display toolbar items with the text label below the icon.
+              Labels are shown for all items.</para>
+            </listitem>
+
+            <listitem>
+             <para><guilabel>Text beside icons</guilabel> - Display toolbar items with the text label
+              beside the icon.  Labels are only shown for the most important items.</para>
+            </listitem>
+
+            <listitem>
+             <para><guilabel>Icons only</guilabel> - Display toolbar items as icons only.</para>
+            </listitem>
+
+            <listitem>
+             <para><guilabel>Text only</guilabel> - Display toolbar items as text only.</para>
+            </listitem>
+           </itemizedlist>
         </listitem>
+        
+        <listitem>
+        <para><guilabel>Tabs</guilabel></para>
+          <itemizedlist>
+            <listitem>
+              <para><guilabel>Show close button on notebook tabs</guilabel> - Adds
+              a small close icon on each tab, to make it easier to close the
+              various tabs.</para>
+            </listitem>
+            
+            <listitem>
+              <para><guilabel>Bring the most recent tab to the front</guilabel> - If
+              selected, the newly created tab will be shown over the other tabs.</para>
+            </listitem>
+            
+            <listitem>
+              <para><guilabel>Width:</guilabel> - The width of tab label 
+              expressed in characters.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+        
+        <listitem>
+          <para><guilabel>Tab Position</guilabel></para>
+          <para>Position the tabs at the
+          <guilabel>Top</guilabel> (default), <guilabel>Bottom</guilabel>,
+          <guilabel>Left</guilabel> or <guilabel>Right</guilabel>.</para>
+        </listitem>
+        
+        <listitem>
+          <para><guilabel>Summary Bar Position</guilabel></para>
+          <para>Position the Summary Bar at the
+          <guilabel>Top</guilabel> or at the <guilabel>Bottom</guilabel> (default) of
+          the <application>&app;</application> main window.</para>
+        </listitem>
       </itemizedlist>
     </sect2>
   </sect1>
@@ -1555,8 +1945,8 @@
   <sect1 id="basics-help1">
     <title>Getting Help</title>
 
-    <para><application>&app;</application> offers help in many ways. We have already covered the
-    <guilabel>Tip of the Day</guilabel> dialog that gives you helpful hints
+    <para><application>&app;</application> offers help in many ways. We have already covered the <link linkend="basics-TipOfDay">
+    <interface>Tip of the Day</interface></link> screen that gives you helpful hints
     upon start-up of your <application>&app;</application> session. <application>&app;</application> also offers an extensive
     help manual.</para>
 
@@ -1579,10 +1969,10 @@
     <sect2 id="basics-web2">
       <title>Web Access</title>
 
-      <para>The <guilabel><application>&app;</application> Help</guilabel> window also acts as a simple
+      <para>The <guilabel>&app; Help</guilabel> window also acts as a simple
       web browser, so you can pull up a web site for additional information.
       You can open any web site under this window by clicking the
-      <guibutton>Open</guibutton> tool bar button and then typing in the URL.
+      <guibutton>Open</guibutton> Toolbar button and then typing in the URL.
       Use the <guibutton>Back</guibutton>, <guibutton>Forward</guibutton>,
       <guibutton>Reload</guibutton>, <guibutton>Stop</guibutton>, and
       <guibutton>Print</guibutton> buttons as you would in a standard
@@ -1601,7 +1991,7 @@
       user list</citetitle></ulink>, and someone on the list will attempt to
       answer you.</para>
 
-      <para>The most updated <guilabel><application>&app;</application> FAQ</guilabel> is also located
+      <para>The most updated <guilabel>&app; FAQ</guilabel> is also located
       on the <ulink url="http://wiki.gnucash.org/wiki/FAQ"><citetitle>&app;
       FAQ website</citetitle></ulink>, and contains answers to the popular
       questions.</para>
@@ -1628,8 +2018,8 @@
 
     <orderedlist>
       <listitem>
-        <para>Choose <guimenu>File</guimenu> -&gt; <guimenuitem>Save
-        As...</guimenuitem> from the menu bar or select the
+        <para>Choose <menuchoice><guimenu>File</guimenu> <guimenuitem>Save
+        As...</guimenuitem></menuchoice> from the menu bar or select the
         <guibutton>Save</guibutton> toolbar button. <application>&app;</application> will bring up this
         window:</para>
 
@@ -1641,12 +2031,12 @@
             </imageobject>
 
             <textobject>
-              <phrase>The Save dialog</phrase>
+              <phrase>The Save screen</phrase>
             </textobject>
 
             <caption>
-              <para>This image shows the <guilabel>Save</guilabel>
-              dialog.</para>
+              <para>This image shows the <interface>Save</interface>
+              screen.</para>
             </caption>
           </mediaobject>
         </screenshot>
@@ -1670,8 +2060,8 @@
 
     <orderedlist>
       <listitem>
-        <para>From the main menu, choose <guimenu>File</guimenu> -&gt;
-        <guimenuitem>New File</guimenuitem>.</para>
+        <para>From the main menu, choose <menuchoice><guimenu>File</guimenu>
+        <guimenuitem>New File</guimenuitem></menuchoice>.</para>
       </listitem>
 
       <listitem>
@@ -1681,20 +2071,37 @@
     </orderedlist>
 
     <para>Before ending each <application>&app;</application> session, be sure to save your data
-    changes using <guimenu>File</guimenu> -&gt;
-    <guimenuitem>Save</guimenuitem> or the <guibutton>Save</guibutton> toolbar
-    button. In fact, it is a good idea to save your data changes often, since
-    <application>&app;</application> does not permanently record your changes until you save them. To
-    open an existing file, select <guimenu>File</guimenu> -&gt;
-    <guimenuitem>Open</guimenuitem> and choose your file from the list.</para>
+    changes using <menuchoice><guimenu>File</guimenu>
+    <guimenuitem>Save</guimenuitem></menuchoice> or the <guibutton>Save</guibutton> toolbar
+    button.
+    <note>
+        <para>As it is very important to save your data frequently to avoid loosing them for whatever reason,
+        <application>&app;</application> is able to automatically save the opened file every a certain amount of time.
+        This interval can be set in the <link linkend="basics-general2">General</link> tab under 
+        <interface>Preferences</interface>. Keep in mind that this option is relevant only if you are saving in xml format.
+        If you are working with a database the <guibutton>Save</guibutton> button and the <guimenuitem>Save</guimenuitem>
+        menu entry will be grayed out because changes are stored right away.</para>
+    </note>
+    </para>
+    <para>To open an existing file, select <menuchoice><guimenu>File</guimenu>
+    <guimenuitem>Open</guimenuitem></menuchoice> from the menu and choose your file from the list.</para>
 
-    <para><application>&app;</application> is storing its data file without any extension. If you name
-    your <application>&app;</application> file to <filename>MyBudget</filename>, the actual file name
-    will be <filename>MyBudget.</filename><note>
-        <para>Ensure that you do not specify an extension when you specify
-        the file name. Per the above example, only specify
+    <para><application>&app;</application> is storing its data with the extension <filename>.gnucash</filename>.</para>
+      <note>
+        <para>The <filename>.gnucash</filename> extension was introduced with version 2.4 of <application>&app;</application>.
+        For already existing files, the extension will never be changed. So if you open an existing file named 
+        <filename>Myoldfile</filename>, that name won't be changed if the file is saved. You might use the 
+        <guimenuitem>Save As...</guimenuitem> command and give the file a new name in order to have it saved with the 
+        extension <filename>.gnucash</filename>.</para>
+      </note>
+    
+    <para>If you name your <application>&app;</application> file to <filename>MyBudget</filename>, the actual file name
+    will be <filename>MyBudget.gnucash</filename></para>
+      <note>
+        <para>It is not necessary to specify an extension when you write
+        the file name. Per the above example, it is enough to only specify
         <filename>MyBudget</filename> as the filename.</para>
-      </note></para>
+      </note>
   </sect1>
 
   <sect1 id="basics-import1">
@@ -1737,11 +2144,11 @@
         <para>Load all of the QIF files containing data you wish to
         import.</para>
 
-        <para>To do this, select <guimenu>File</guimenu> -&gt;
-        <guisubmenu>Import</guisubmenu> -&gt; <guimenuitem>Import
-        QIF...</guimenuitem> from the menu. When the <guilabel>QIF
-        Import</guilabel> dialog box appears, click
-        <guibutton>Next</guibutton> and follow the instructions to guide you
+        <para>To do this, select <menuchoice><guimenu>File</guimenu>
+        <guisubmenu>Import</guisubmenu> <guimenuitem>Import
+        QIF...</guimenuitem></menuchoice> from the menu. When the <interface>QIF
+        Import</interface> screen box appears, click
+        <guibutton>Forward</guibutton> and follow the instructions to guide you
         through the process of loading your files.</para>
 
         <screenshot id="basics-QIF-Import-welcome">
@@ -1752,22 +2159,22 @@
             </imageobject>
 
             <textobject>
-              <phrase>The QIF Import Druid</phrase>
+              <phrase>The QIF Import assistant</phrase>
             </textobject>
 
             <caption>
-              <para>This image shows the start of the <guilabel>QIF
-              Import</guilabel> Druid.</para>
+              <para>This image shows the start of the <interface>QIF
+              Import</interface> assistant.</para>
             </caption>
           </mediaobject>
         </screenshot>
 
         <para>You will be prompted for a filename to load. Use the
         <guibutton>Select</guibutton> button to select your QIF file and click
-        <guibutton>Next</guibutton> to load it. Once the file is loaded,
+        <guibutton>Forward</guibutton> to load it. Once the file is loaded,
         select <guibutton>Load another file</guibutton> if you have more files
         to load. When you have loaded all your QIF files, click
-        <guibutton>Next</guibutton> to continue with the import
+        <guibutton>Forward</guibutton> to continue with the import
         process.</para>
       </listitem>
 
@@ -1776,16 +2183,16 @@
 
         <para>The importer then matches up your QIF accounts and categories
         with <application>&app;</application> accounts and gives you a brief description of the
-        matching process. Clicking <guibutton>Next</guibutton> will bring you
+        matching process. Clicking <guibutton>Forward</guibutton> will bring you
         to a view comparing your QIF accounts with the corresponding <application>&app;</application>
         accounts created. To change an account name, select the row containing
-        that account name and edit the name in the dialog box provided. Click
-        <guibutton>Next</guibutton> when you have finished making changes, and
+        that account name and edit the name in the screen box provided. Click
+        <guibutton>Forward</guibutton> when you have finished making changes, and
         proceed through a similar category matching process. QIF income and
         expense categories import as <application>&app;</application> income and expense accounts (see
         <xref linkend="accts-concepts1"></xref> for more on this). 
         Make changes to these account names if
-        necessary, and click <guibutton>Next</guibutton> to continue.</para>
+        necessary, and click <guibutton>Forward</guibutton> to continue.</para>
 
         <note>
           <para>If you are not sure what changes are needed, it is safe to
@@ -1794,13 +2201,13 @@
         </note>
 
         <para>From the drop-down list, select a standard currency to be used
-        for imported accounts and click <guibutton>Next</guibutton> to
+        for imported accounts and click <guibutton>Forward</guibutton> to
         continue. If you have stocks, mutual funds, or other securities, you
-        will be prompted for additional information. The importer dialog will
+        will be prompted for additional information. The importer screen will
         ask for the exchange or listing (i.e. NASDAQ), the security's full
         name, and the ticker symbol. If you do not have this information
         handy, you can edit the account information later, once the import is
-        complete. Click <guibutton>Next</guibutton> to continue.</para>
+        complete. Click <guibutton>Forward</guibutton> to continue.</para>
       </listitem>
 
       <listitem>
@@ -1808,7 +2215,7 @@
 
         <para>The last step is the import. Once you have verified your account
         names and investment information, click <guibutton>Finish</guibutton>
-        in the <guilabel>Update your <application>&app;</application> accounts</guilabel> page to
+        in the <guilabel>Update your &app; accounts</guilabel> page to
         complete the import process. Depending upon the size of your file, the
         import might take a few minutes to complete, so a progress bar
         displays the percentage finished. When the import process is complete,
@@ -1822,10 +2229,14 @@
     <title>Backing Up and Recovering Data</title>
 
     <para><application>&app;</application> creates several types of files to help ensure that your data
-    is not lost. You may see files with the following file extensions: xac,
-    log, LCK, LNK in the same directory as your primary data file. What each
-    of these files does is presented below.</para>
+    is not lost. You may see files with the following file extensions: <filename>.xac</filename> or <filename>.gnucash</filename>,
+    <filename>.log</filename>, <filename>.LCK</filename>, <filename>.LNK</filename> in the same directory 
+    as your primary data file. What each of these files does is presented below.</para>
     
+    <note>
+    <para>The following sections are relevant only if you are saving your financial data in the xml format</para>
+    </note>
+    
     <programlisting>
       $ ls 
       gcashdata
@@ -1840,27 +2251,34 @@
     </programlisting>
 
     <sect2 id="basics-backupxac2">
-      <title>Backup file (.xac)</title>
+      <title>Backup file (.xac or .gnucash)</title>
 
       <para>Each time you save your data file, a backup copy will also be
-      saved with the extension xac. This backup file is a complete copy of
+      saved with the extension xac or gnucash. This backup file is a complete copy of
       your previous data file, and the filename format refers to the data
       file, year, month, day and time of the backup. For example, the filename
       <filename>gcashdata.20060414185747.xac</filename> indicates this is a
-      backup copy of the file gcashdata saved in the year 2006, April 14, at
-      6:57:47 p.m.</para>
+      backup copy of the file <filename>gcashdata</filename> saved in the year 
+      2006, April 14, at 6:57:47 p.m.</para>
 
-      <para>To restore an old backup file, simply open the .xac file with the
+      <para>To restore an old backup file, simply open the .xac or . gnucash file with the
       date to which you wish to return. Be sure and save this file under a
       different name; do not use a .xac extension for a regular data file
       name.</para>
+      
+      <note>
+        <para>Starting from version 2.4 <application>&app;</application> does not create anymore
+        backup files with the extension <filename>.xac</filename> but with the extension 
+        <filename>.gnucash</filename>. So if you upgrade from <application>&app;</application> version 
+        2.2.x to 2.4 you may end up with both xac and gnucash backup files in your directory.</para>
+      </note>
     </sect2>
 
     <sect2 id="basics-backuplog2">
       <title>Log file (.log)</title>
 
-      <para>Each time you open a file in <application>&app;</application>, a .log is created and saved
-      with the same name format as the .xac backup files. As you make changes
+      <para>Each time you open a file in <application>&app;</application>, a <filename>.log</filename> is created and saved
+      with the same name format as the <filename>.xac</filename> backup files. As you make changes
       to the open data file, the log file saves only those changes. Log files
       are not a full backup of your data file - they simply record changes you
       have made to the data file in the current <application>&app;</application> session.</para>
@@ -1870,49 +2288,50 @@
       work since the last time you saved your <application>&app;</application> file using this log
       file. This is the procedure:</para>
 
-      <itemizedlist>
+      <orderedlist>
         <listitem>
           <para>Open the last saved <application>&app;</application> file.</para>
         </listitem>
 
         <listitem>
-          <para>Go to "File" -&gt; "Import" -&gt; "Replay <application>&app;</application> .log file"
+          <para>Go to <menuchoice><guimenu>File</guimenu> <guisubmenu>Import</guisubmenu> 
+          <guimenuitem>Replay &app; .log file</guimenuitem></menuchoice>
           and select the one .log file with the same date as the saved file
           you just opened. Make sure that you picked the right .log file, or
           you will possibly wreak havoc in your accounts.</para>
         </listitem>
-      </itemizedlist>
+      </orderedlist>
 
       <para>Log replaying will recover any transaction affecting the balance
       entered since the last save, including those created from scheduled
       transactions and business features (invoices, bills, etc.).</para>
 
-      <note>
-        <para>Warning: Changes to the scheduled transactions, invoices or
+      <warning>
+        <para>Changes to the scheduled transactions, invoices or
         bills themselves are NOT recovered, and their transactions that were
         recovered may not be properly associated with them, and should thus be
         double-checked. Especially for business transactions, you may have to
         delete and re-create some of them. If you do not, although the balance
         will be correct, some reports may not.</para>
-      </note>
+      </warning>
     </sect2>
 
     <sect2 id="basics-backuplock2">
       <title>Lock files (.LNK and .LCK)</title>
 
-      <para>You may occasionally see .LNK and .LCK files appear. These do not
+      <para>You may occasionally see <filename>.LNK</filename> and <filename>.LCK</filename> files appear. These do not
       store any data, but they are created to prevent more than one user from
       opening the same file at the same time. These files are automatically
       created when you open the file, to lock it so no one else can access it.
       When you close your <application>&app;</application> session or open another file, <application>&app;</application>
-      unlocks the first data file by deleting the LCK and LNK files.</para>
+      unlocks the first data file by deleting the <filename>.LCK</filename> and <filename>.LNK</filename> files.</para>
 
-      <para>If <application>&app;</application> crashes while you have a data file open, the LCK and
-      LNK files are not deleted. The next time you try to open <application>&app;</application>, you
+      <para>If <application>&app;</application> crashes while you have a data file open, the <filename>.LCK</filename> and
+      <filename>.LNK</filename> files are not deleted. The next time you try to open <application>&app;</application>, you
       will get a warning message that the file is locked. The warning message
-      appears because the LNK and LCK files are still in your directory. It is
-      safe to choose Yes to open the file, but you should delete the .LNK and
-      .LCK files (using a terminal window or your file manager.) Once those
+      appears because the <filename>.LNK</filename> and <filename>.LCK</filename> files are still in your directory. It is
+      safe to choose <guibutton>Yes</guibutton> to open the file, but you should delete the <filename>.LNK</filename> and
+      <filename>.LCK</filename> files (using a terminal window or your file manager.) Once those
       files are deleted, you will not get the warning message again unless
       <application>&app;</application> crashes.</para>
     </sect2>
@@ -1921,19 +2340,20 @@
       <title>File Management</title>
 
       <para>So which files should you keep around? Keep your main data file,
-      of course - data files do not have an automatic file extension. It's a
-      good idea to keep some of the more recent .xac files, but you can safely
-      delete the .log files since they are not complete copies of your data.
-      You should also delete any .LCK and .LNK files that you see after
+      of course - data files have the extension <filename>.gnucash</filename>. It's a
+      good idea to keep some of the more recent <filename>.xac</filename> files, but you can safely
+      delete the <filename>.log</filename> files since they are not complete copies of your data.
+      You should also delete any <filename>.LCK</filename> and <filename>.LNK</filename> files that you see after
       closing <application>&app;</application>. If you decide to back up your data file to another
-      disk manually, you only need to back up the main data file - not the .xac
+      disk manually, you only need to back up the main data file - not the <filename>.xac</filename>
       files.</para>
 
       <note>
-        <para><application>&app;</application> will automatically delete any .xac, .log files that are
-        older than 30 days. You can change this behavior in the <application>&app;</application>
-        preferences.</para>
+        <para><application>&app;</application> will automatically delete any <filename>.xac</filename>, <filename>.log</filename> 
+        files that are older than 30 days. You can change this behavior in the <application>&app;</application>
+        preferences under the <link linkend="basics-general2">General</link> tab.</para>
       </note>
+      
     </sect2>
   </sect1>
 
@@ -1954,8 +2374,8 @@
     <orderedlist>
       <listitem>
         <para>First, let's create a file to store your real data. Open <application>&app;</application>
-        and go through the <guilabel>New Account Hierarchy Setup</guilabel>
-        dialog. You will create a file and accounts to be used for your home
+        and go through the <interface>New Account Hierarchy Setup</interface>
+        screen. You will create a file and accounts to be used for your home
         finances, so choose the accounts that pertain to you. If you are not
         sure what accounts you will need, click the <guibutton>Select
         All</guibutton> option to create all of the accounts provided. When
@@ -1966,7 +2386,7 @@
       <listitem>
         <para>Next, create a file to store test data. This is the file that
         will be used in the tutorials throughout this manual. Click
-        <guimenu>File</guimenu> -&gt; <guimenuitem>New</guimenuitem> to create
+        <menuchoice><guimenu>File</guimenu> <guimenuitem>New</guimenuitem></menuchoice> to create
         a new file, and name it <filename>gcashdata_1</filename>. Your main
         window should now look something like this:</para>
 
@@ -1983,7 +2403,7 @@
 
             <caption>
               <para>This image shows the Account Tree window with a set of
-              accounts loaded from the druid.</para>
+              accounts loaded from the assistant.</para>
             </caption>
           </mediaobject>
         </screenshot>
@@ -1991,11 +2411,11 @@
 
       <listitem>
         <para>Now, adjust some preferences in the account tree window. Select
-        <guimenu>Edit</guimenu> -&gt; <guimenuitem>Preferences</guimenuitem>
-        -&gt; <guimenuitem>Windows</guimenuitem> and change the toolbar Style
+        <menuchoice><guimenu>Edit</guimenu> <guimenuitem>Preferences</guimenuitem>
+        <guimenuitem>Windows</guimenuitem></menuchoice> and change the toolbar Style
         so that they display only text, not icons. The change will take place
-        directly, so look at the tool bar buttons in the main window. Return
-        to the <guilabel>Preferences</guilabel> dialog and change the tool bar
+        directly, so look at the Toolbar buttons in the main window. Return
+        to the <interface>Preferences</interface> screen and change the Toolbar
         buttons back to the default setting by clicking <guibutton>Use system
         default</guibutton>. From the column header row, select
         <guibutton>Arrow down</guibutton> and select <quote>Type</quote>
@@ -2026,7 +2446,7 @@
       <listitem>
         <para>If you plan to import QIF data from another program, let's try a
         practice file first. (If not, skip to the next chapter on account
-        setup (<xref linkend="chapter_accts"></xref>).)</para>
+        setup (<xref linkend="chapter_accts"></xref>.)</para>
 
         <orderedlist>
           <listitem>
@@ -2038,9 +2458,9 @@
           </listitem>
 
           <listitem>
-            <para>From the main menu, select <guimenu>File</guimenu> -&gt;
-            <guisubmenu>Import</guisubmenu> -&gt; <guimenuitem>Import
-            QIF...</guimenuitem> to start the import.</para>
+            <para>From the main menu, select <menuchoice><guimenu>File</guimenu>
+            <guisubmenu>Import</guisubmenu> <guimenuitem>Import
+            QIF...</guimenuitem></menuchoice> to start the import.</para>
           </listitem>
 
           <listitem>
@@ -2053,7 +2473,7 @@
           </listitem>
 
           <listitem>
-            <para>In the following dialogs, ensure that each transaction has a
+            <para>In the following screens, ensure that each transaction has a
             valid account, if in doubt, just use the default ones.</para>
           </listitem>
 
@@ -2082,9 +2502,11 @@
           </mediaobject>
         </screenshot>
 
-        <para>If after the import the screen is blank, go to <guimenu>File -&gt; New -&gt; New Accounts page</guimenu>
-         to display a new Accounts tab.</para>
-
+        <note>
+          <para>If after the import the screen is blank, go to <menuchoice><guimenu>File</guimenu>
+          <guisubmenu>New</guisubmenu> <guimenuitem>New Accounts page</guimenuitem></menuchoice>
+           to display a new Accounts tab.</para>
+        </note>
         <para>Save your file.</para>
 
       </listitem>



More information about the gnucash-changes mailing list