gnucash-docs maint: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Tue Mar 26 14:08:17 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/dd334574 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7a371898 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/fffe876d (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/cdd8d9a9 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/4ed28fad (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/c06064e9 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/48638656 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/755d33c9 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/0a164303 (commit)



commit dd334574b76d97c716fc13bad6d83f7bd46bf79b
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Mar 26 19:01:56 2019 +0100

    Pure whitespace cleanups to keep them separate from content changes
    
    Replace tabs with spaces
    Remove any trailing whitespace

diff --git a/guide/C/ch_importing.xml b/guide/C/ch_importing.xml
index d89c88c..755e0b2 100644
--- a/guide/C/ch_importing.xml
+++ b/guide/C/ch_importing.xml
@@ -8,7 +8,7 @@
        modified: July 9th 2006
   Maintainers:
   Author:
-  		
+
   Translators:
                (translators put your name and email here)
 -->
@@ -17,14 +17,14 @@
   <para>This chapter will detail procedures for importing data into <application>&app;</application>.</para>
   <sect1 id="importing-from-files">
   <title>Importing Transactions from Files</title>
-  
-  <para>Imported transactions will generally be to a specific account in your account tree. In the following 
-          this will be referred to as the <emphasis role="bold">import</emphasis> or 
+
+  <para>Imported transactions will generally be to a specific account in your account tree. In the following
+          this will be referred to as the <emphasis role="bold">import</emphasis> or
           <emphasis role="bold">base</emphasis> account. It may or may not be
           specified in the data being imported, depending on the import format. It is usually the first split
           of a transaction being imported.
   </para>
-  <para>All transactions will also must have a <emphasis role="bold">destination</emphasis> account for 
+  <para>All transactions will also must have a <emphasis role="bold">destination</emphasis> account for
           at least matching splits. This may or may not be supplied in the imported data. If it is not,
           an account can be assigned on the basis of the previous import history by matching to infomation in
           the imported data. The user may always over-ride this assignment.
@@ -36,52 +36,52 @@
     <title>File Import Formats</title>
     <para>Gnucash allows transactions to be imported in the following formats:</para>
       <itemizedlist>
-        <listitem><para><emphasis role="bold"><link linkend="importing-qif">QIF</link></emphasis> 
+        <listitem><para><emphasis role="bold"><link linkend="importing-qif">QIF</link></emphasis>
              (.qif) Quicken Interchange format - import data from Quicken financial software;</para></listitem>
-        <listitem><para><emphasis role="bold"><link linkend="importing-ofx">OFX/QFX</link></emphasis> 
+        <listitem><para><emphasis role="bold"><link linkend="importing-ofx">OFX/QFX</link></emphasis>
              (.ofx,.qfx) Open Financial eXchange format (QXF is an Intuit/Quicken proprietary version of OFX);
         </para></listitem>
-        <listitem><para><emphasis role="bold"><link linkend="importing-csv">CSV</link></emphasis> 
+        <listitem><para><emphasis role="bold"><link linkend="importing-csv">CSV</link></emphasis>
              (.csv)  Comma Separated Values;</para></listitem>
-         <listitem><para><emphasis role="bold"><link linkend="importing-mt940">MT940</link></emphasis> 
+         <listitem><para><emphasis role="bold"><link linkend="importing-mt940">MT940</link></emphasis>
               MT940</para></listitem>
-          <listitem><para><emphasis role="bold"><link linkend="importing-mt942">MT942</link></emphasis> 
+          <listitem><para><emphasis role="bold"><link linkend="importing-mt942">MT942</link></emphasis>
                MT942</para></listitem>
-           <listitem><para><emphasis role="bold"><link linkend="importing-dtaus">DTAUS</link></emphasis> 
+           <listitem><para><emphasis role="bold"><link linkend="importing-dtaus">DTAUS</link></emphasis>
                 DTAUS</para></listitem>
       </itemizedlist>
-    
+
     <para>These import methods can be accessed from <menuchoice><guimenu>File</guimenu>
-		<guisubmenu>Import ...</guisubmenu></menuchoice>.</para>      
+        <guisubmenu>Import ...</guisubmenu></menuchoice>.</para>
   </sect2>
 
   <sect2 id="importing-matcher">
     <title>Import Matcher</title>
-    <para>Several of the Import Assistants use an Import Matcher to implement a Bayesian approach to assign 
-		destination accounts, if such accounts are not specified in 
+    <para>Several of the Import Assistants use an Import Matcher to implement a Bayesian approach to assign
+        destination accounts, if such accounts are not specified in
         the imported data, to each imported transaction based on the previous import history of the import account.
         It also attempts to match the transactions being imported to any existing transactions
         based on the date and the description fields<!-- FIXME add any other fields used in matching -->.
     </para>
-    <para>Transaction rows which match existing transactions already in the import account are flagged not to be imported. They 
-      will have a light green background and the A and U+R checkboxes will be unchecked and the R checkbox will be 
-      checked. To override and import the transaction, check the A checkbox. The U and R boxes will be unchecked 
+    <para>Transaction rows which match existing transactions already in the import account are flagged not to be imported. They
+      will have a light green background and the A and U+R checkboxes will be unchecked and the R checkbox will be
+      checked. To override and import the transaction, check the A checkbox. The U and R boxes will be unchecked
       automatically. The reliability of the match is indicated by a bar display in the Info column. If a destination
       account for the second split is assigned by the matcher if will be appended to the info column.
     </para>
     <para>Transaction rows which do not match existing transactions in the import account, for which an assignment
-      of a destination account cannot be made on the basis of the previous import history to the account, will be 
-      displayed with an orange-yellow background and the A box will be checked and U+R and R unchecked. A destination 
+      of a destination account cannot be made on the basis of the previous import history to the account, will be
+      displayed with an orange-yellow background and the A box will be checked and U+R and R unchecked. A destination
       account must be specified for these transactions.
     </para>
    <sect3><title>Assign a Destination Account to a Single Transaction</title>
       <para>The currently selected row is selected by Left-clicking it. It is displayed with a mid dark green background.</para>
       <para><emphasis role="bold">Double click</emphasis> on a row. This will select it and open an Account Selection
-            dialog. Select the desired destination account in the dialog and click <guilabel>OK</guilabel>. The row 
-            background will change to a light green and the assigned destination account will be displayed 
+            dialog. Select the desired destination account in the dialog and click <guilabel>OK</guilabel>. The row
+            background will change to a light green and the assigned destination account will be displayed
             in the Info column.
       </para>
-      <para>or alternatively, <emphasis role="bold">Left-click</emphasis> on a row to select it followed by a 
+      <para>or alternatively, <emphasis role="bold">Left-click</emphasis> on a row to select it followed by a
          <emphasis role="bold">Right-click </emphasis>to bring up a popup menu then select
         "Assign a transfer account" to display the Account Selection dialog, select the destination account and
          click the <guilabel>OK</guilabel> button.
@@ -97,36 +97,36 @@
       <para>Multiple rows may be selected to have the same destination account assigned to them.</para>
       <para>To select rows either:</para>
       <itemizedlist>
-        <listitem><para><emphasis role="bold">Left click</emphasis> on first row and then 
+        <listitem><para><emphasis role="bold">Left click</emphasis> on first row and then
         <emphasis role="bold">Ctrl-Left click</emphasis> on other rows to add to the selection or</para></listitem>
-        <listitem><para><emphasis role="bold">Left-click</emphasis> on a first row and then 
+        <listitem><para><emphasis role="bold">Left-click</emphasis> on a first row and then
         <emphasis role="bold">Shift-Left-click</emphasis> on another row to select all rows between them.</para></listitem>
       </itemizedlist>
-      <para>then <emphasis role="bold">Right-click</emphasis> to display a popup menu and then select 
-        <emphasis role="bold">"Assign a transfer account"</emphasis> to open the Account 
+      <para>then <emphasis role="bold">Right-click</emphasis> to display a popup menu and then select
+        <emphasis role="bold">"Assign a transfer account"</emphasis> to open the Account
          Selection dialog. Select the desired destination account and click the <guilabel>OK</guilabel>
          button in the Account Selection dialog.</para>
     </sect3>
     <sect3>
       <title>Completing the Import</title>
-    <para>Once you have assigned destination accounts for all the imported transactions using the above methods 
-      (all row backgrounds will be a light green colour), check that the assigned destination acounts are correct 
-      and then press the <guilabel>OK</guilabel> button at the bottom of the Generic Import Matcher 
-      window. The transactions selected for import will have their splits added to the selected source 
+    <para>Once you have assigned destination accounts for all the imported transactions using the above methods
+      (all row backgrounds will be a light green colour), check that the assigned destination acounts are correct
+      and then press the <guilabel>OK</guilabel> button at the bottom of the Generic Import Matcher
+      window. The transactions selected for import will have their splits added to the selected source
       and destination accounts.
     </para>
-    <para>The choices made for the destination accounts and description/memo fields are remembered and stored and 
-      used for future imports to the same account to automatically assign a destination account for transaction 
+    <para>The choices made for the destination accounts and description/memo fields are remembered and stored and
+      used for future imports to the same account to automatically assign a destination account for transaction
       records not containing destination account information.
     </para>
     </sect3>
   </sect2>
 
- 
+
   <sect2 id="importing-qif">
     <title>Import QIF</title>
     <para>To import data from Quicken®, MS Money, or other programs that use QIF(Quicken® Interchange Format),
-          you must first export your data to a QIF file. One way to do this is to export each account as a 
+          you must first export your data to a QIF file. One way to do this is to export each account as a
           separate QIF file. An easier way, available in Quicken® 98 and beyond, is to export all accounts at
           once into a single QIF file. Check your program's manual to determine if this option is available.
     </para>
@@ -139,18 +139,18 @@
       </para>
       <para>This image shows the start of the QIF Import assistant.<!--FIXME put an image of the import druid in --> </para>
       <para>You will be prompted for a filename to load. Use the Select button to select your QIF file and
-           click Next to load it. Once the file is loaded, select Load another file if you have more files 
+           click Next to load it. Once the file is loaded, select Load another file if you have more files
            to load. When you have loaded all your QIF files, click Next to continue with the import process.
       </para>
     </sect3>
     <sect3>
       <title>Review the GnuCash accounts to be created.</title>
-      <para>The importer then matches up your QIF accounts and categories with GnuCash accounts and gives 
+      <para>The importer then matches up your QIF accounts and categories with GnuCash accounts and gives
             you a brief description of the matching process. Clicking Next will bring you to a view comparing
             your QIF accounts with the corresponding GnuCash accounts created. To change an account name, select
-            the row containing that account name and edit the name in the dialog box provided. Click Next when 
-            you have finished making changes, and proceed through a similar category matching process. QIF 
-            income and expense categories import as GnuCash income and expense accounts <!--(see section 3.1 FIXME for 
+            the row containing that account name and edit the name in the dialog box provided. Click Next when
+            you have finished making changes, and proceed through a similar category matching process. QIF
+            income and expense categories import as GnuCash income and expense accounts <!--(see section 3.1 FIXME for
             more on this).--> Make changes to these account names if necessary, and click Next to continue.
       </para>
       <para><emphasis role="bold">Note:</emphasis> If you are not sure what changes are needed, it is safe to
@@ -159,424 +159,424 @@
       </para>
       <para>From the drop-down list, select a standard currency to be used for the  imported accounts and click <emphasis role="bold">Next</emphasis>
             to continue. If you have stocks, mutual funds, or other securities, you will be prompted for additional
-            information. The importer dialog will ask for the exchange or listing (i.e. Nasdaq), the security's 
+            information. The importer dialog 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 <emphasis role="bold">Next</emphasis> to continue.
       </para>
     </sect3>
     <sect3>
       <title>Tell GnuCash to import the data.</title>
-      <para>The last step is the import. Once you have verified your account names and investment information, 
-            click <emphasis role="bold">Finish</emphasis> in the Update your GnuCash accounts 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, GnuCash will return you 
+      <para>The last step is the import. Once you have verified your account names and investment information,
+            click <emphasis role="bold">Finish</emphasis> in the Update your GnuCash accounts 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, GnuCash will return you
             to the main window, which should now display the names of the accounts you imported.
       </para>
     </sect3>
   </sect2>
-  
+
   <!--
   <sect2 id="importing-qif-from-help">
     <title>Importing Quicken QIF Files</title>
 
-		<para>Many users seek to import their financial data from Quicken.</para>
-		<para>This Assistant helps you import Quicken <acronym>QIF</acronym> files. It will appear if
-		you choose <guibutton>Import my QIF files</guibutton> in the
-		<guilabel>Welcome to &app;!</guilabel> menu, as well as from <menuchoice><guimenu>File</guimenu>
-		<guisubmenu>Import ...</guisubmenu> <guimenuitem>Import QIF...</guimenuitem></menuchoice>.</para>
-
-	        <para>The import process involves several steps, which are presented in a 
-				series of screens that are described below.</para>
-
-	  <orderedlist>
-	  <listitem>
-
-	        <para><guilabel>Import QIF files</guilabel> screen briefly describes the assistant. 
-			The three buttons at the very bottom of the screen are used throughout the process
-	        to navigate.</para>
-
-	      <itemizedlist>
-	        <listitem>
-	          <para><guibutton>Cancel</guibutton>: exit the process and cancel importing
-	          <acronym>QIF</acronym> files.</para>
-	          <warning>
-	            <para>If you choose to cancel at any point in the assistant, any selections you have made up to
-	            this point will be lost.</para>
-	          </warning>
-	        </listitem>
-
-	        <listitem>
-	          <para><guibutton>Back</guibutton>: return to the previous screen.</para>
-	        </listitem>
-
-	        <listitem>
-	          <para><guibutton>Next</guibutton> move to the next screen.</para>
-	        </listitem>
-	      </itemizedlist>
-
-	  </listitem>
-	  <listitem>
-
-	        <para><guilabel>Select a QIF file to load</guilabel> allows you to choose the
-			source <acronym>QIF</acronym> file. The <guibutton>Select...</guibutton> button on this
-	        screen is used to access a list of files in your system. The
-	        <guibutton>Select...</guibutton> button brings up the <guilabel>Select
-	        QIF File</guilabel> dialog.</para>
-
-	        <para>Navigate to where you have stored your <acronym>QIF</acronym> files and select the
-	        first one then click <guibutton>Import</guibutton>. The next screen will
-	        display it in the <guilabel>Select a QIF File to Load</guilabel>
-	        field.</para>
-
-	        <note>
-	          <para>If the file you are loading does not have an <acronym>QIF</acronym> date listed
-	          in it you will see the <guilabel>Set a date format for this QIF file</guilabel>
-	          screen. Select the proper format from the pull down list and continue.</para>
-	        </note>
-
-	        <note>
-	          <para>If the file you are loading does not have an account name listed
-	          in it you will see the <guilabel>Set the default QIF account
-	          name</guilabel> screen. Otherwise you will skip this screen and go on
-	          to the screen in the next section that shows loaded <acronym>QIF</acronym> files.</para>
-
-	          <itemizedlist>
-	            <listitem>
-	              <para>The <guilabel>Account name:</guilabel> field is used to set
-	              an account name for this <acronym>QIF</acronym> file.</para>
-	            </listitem>
-	          </itemizedlist>
-	        </note>
-
-	  </listitem>
-	  <listitem>
-	        <para>The next screen shows you the <guilabel>QIF files you have
-	        loaded</guilabel>. You can use this screen to return to the previous
-	        screen and load more <acronym>QIF</acronym> files. It will also let you unload any files
-	        you have loaded by mistake.</para>
-
-	        <itemizedlist>
-	          <listitem>
-	            <para>The top panel shows the list of <guilabel>QIF Files</guilabel>
-	            you have loaded.</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The <guibutton>Load another file</guibutton> button takes you
-	            back to the previous screen to load another <acronym>QIF</acronym> file.</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The <guibutton>Unload selected file</guibutton> button allows you to
-	            select a file from the top panel and remove it from the list.</para>
-	          </listitem>
-	        </itemizedlist>
-
-	        <para>When you have selected all the <acronym>QIF</acronym> files to be imported, click the
-	        <guibutton>Forward</guibutton> button.</para>
-
-	  </listitem>
-	  <listitem>
-
-	        <para>Depending on the type of data contained in the
-	        <acronym>QIF</acronym> files to be imported, you may see only one or all of the following screens:</para>
-
-	  <variablelist termlength="8">
-	    <varlistentry>
-	    <term><guilabel>Accounts and stock holdings</guilabel></term>
-	      <listitem>
-	        <para>This screen gives a description of the <guilabel>Accounts and stock
-	        holdings</guilabel> matching process on the following <guilabel>Match QIF
-	        accounts with &app; accounts</guilabel> screen.</para>
-
-	        <tip>
-	          <para>This and other informational screens in the
-	          <guilabel>Import QIF files</guilabel> assistant
-	          can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
-	          under <guilabel>&app; Preferences</guilabel>.</para>
-	        </tip>
-
-	        <para>The next screen lets you <guilabel>Match QIF accounts with &app;
-	        accounts</guilabel>. You will see a list of <guilabel>QIF account
-	        names</guilabel> on the left and suggested <guilabel>&app; account
-	        names</guilabel> on the right. The <guilabel>New?</guilabel> column
-	        indicates if the <application>&app;</application> account name will be created by the <acronym>QIF</acronym>
-	        Import.</para>
-
-	        <para>To change the <application>&app;</application> account to a different one select the <acronym>QIF</acronym>
-	        account. A screen will pop up to select another account or create a new
-	        one.</para>
-
-	        <itemizedlist>
-	          <listitem>
-	            <para>Select an account from the list to choose a already existing
-	            account.</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The <guibutton>New Account</guibutton> button allows you to
-	            add a new account name as a sub-account (child of selected) of the
-	            selected account.</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The <guibutton>OK</guibutton> button is used to confirm your
-	            selection.</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The <guibutton>Cancel</guibutton> button is used to exit the
-	            dialog without using any changes you have made.</para>
-	          </listitem>
-	        </itemizedlist>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	    <term><guilabel>Income and Expense categories</guilabel></term>
-	      <listitem>
-	        <para>This screen gives a description of the <guilabel>Income and
-	        Expense categories</guilabel> matching process on the following <guilabel>Match
-	        QIF categories with &app; accounts</guilabel> screen.</para>
-
-	        <tip>
-	          <para>This and other informational screens in the
-	          <guilabel>Import QIF files</guilabel> assistant
-	          can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
-	          under <guilabel>&app; Preferences</guilabel>.</para>
-	        </tip>
-
-	        <para>The next screen lets you <guilabel>Match QIF categories with
-	        &app; accounts</guilabel>. You will see a list of <guilabel>QIF
-	        category names</guilabel> on the left and suggested <guilabel>&app;
-	        account names</guilabel> on the right. The <guilabel>New?</guilabel>
-	        column indicates if the <application>&app;</application> account name will be created by the QIF
-	        Import.</para>
-
-	        <para>To change the <application>&app;</application> account to a different one select the QIF
-	        category. A dialog will pop up to select another account or create a new
-	        one.</para>
-
-	        <itemizedlist>
-	          <listitem>
-	            <para>Select an account from the list to choose a already existing
-	            account.</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The <guibutton>New Account</guibutton> button allows you to
-	            add a new account name as a sub-account (child of selected) of the
-	            selected account.</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The <guibutton>OK</guibutton> button is used to confirm your
-	            selection.</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The <guibutton>Cancel</guibutton> button is used to exit the
-	            dialog without using any changes you have made.</para>
-	          </listitem>
-	        </itemizedlist>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	    <term><guilabel>Payees and memos</guilabel></term>
-	    <listitem>
-	        <para>This screen gives a description of the <guilabel>Payees and
-	        memos</guilabel> matching process on the following <guilabel>Match payees/memos to
-	        &app; accounts</guilabel> screen.</para>
-
-	        <tip>
-	          <para>This and other informational screens in the
-	          <guilabel>Import QIF files</guilabel> assistant
-	          can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
-	          under <guilabel>&app; Preferences</guilabel>.</para>
-	        </tip>
-
-	        <para>The next screen lets you <guilabel>Match payees/memos to &app;
-	        accounts</guilabel>. You will see a list of <guilabel>QIF payee/memo
-	        names</guilabel> on the left and suggested <guilabel>&app; account
-	        names</guilabel> on the right. The default <application>&app;</application> account used is
-	        called <guilabel>Unspecified</guilabel>. The <guilabel>New?</guilabel> column indicates if
-	        the <application>&app;</application> account name will be created by the QIF Import.</para>
-
-	        <para>To change the <application>&app;</application> account to a different one select the QIF
-	        payee/memo. A dialog will pop up to select another account or create a
-	        new one.</para>
-
-	        <itemizedlist>
-	          <listitem>
-	            <para>Select an account from the list to choose a already existing
-	            account.</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The <guibutton>New Account</guibutton> button allows you to
-	            add a new account name as a sub-account of the selected
-	            account.</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The <guibutton>OK</guibutton> button is used to confirm your
-	            selection.</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The <guibutton>Cancel</guibutton> button is used to exit the
-	            dialog without using any changes you have made.</para>
-	          </listitem>
-	        </itemizedlist>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-	  </listitem>
-	  <listitem>
-
-	        <para>The next screen allows you to <guilabel>Enter the QIF file
-	        currency</guilabel>. The drop down list defaults to the currency
-	        configured in the <guilabel>Accounts</guilabel> tab (see <xref linkend="configuring-preferences-accounts"/>) under
-	        <guilabel>&app; Preferences</guilabel>. If you wish the new accounts
-	        to use a different currency, select one from the list.</para>
-
-	        <para>When you have selected the currency, click the
-	        <guibutton>Forward</guibutton> button.</para>
-
-	  </listitem>
-	  <listitem>
-
-	        <para>Depending on the type of data contained in the
-	        <acronym>QIF</acronym> files to be imported, you may or may not see one or more of the following screens:</para>
-
-	  <variablelist termlength="8">
-	    <varlistentry>
-	    <term><guilabel>Tradable Commodities</guilabel></term>
-	      <listitem>
-	        <para>This screen gives a description of the <guilabel>Tradable
-	        Commodities</guilabel> process on the screen.</para>
-
-	        <tip>
-	          <para>This and other informational screens in the
-	          <guilabel>Import QIF files</guilabel> assistant
-	          can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
-	          under <guilabel>&app; Preferences</guilabel>.</para>
-	        </tip>
-
-	        <para>A series of screens, one for each of the stock, mutual fund, or
-	        commodity, displays the exchange, full name, and symbol for each of the commodities
-	        listed in the <acronym>QIF</acronym> file you are importing so that you can
-	        check them before proceeding.</para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	    <term><guilabel>Match duplicate transactions</guilabel></term>
-	      <listitem>
-	        <para>This screen gives a description of the <guilabel>Match
-	        duplicate transactions</guilabel> process on the following <guilabel>Select
-	        possible duplicates</guilabel> screen.</para>
-
-	        <tip>
-	          <para>This and other informational screens in the
-	          <guilabel>Import QIF files</guilabel> assistant
-	          can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
-	          under <guilabel>&app; Preferences</guilabel>.</para>
-	        </tip>
-
-	        <para>The next screen lets you <guilabel>Select possible duplicate
-	        transactions</guilabel>. Imported transactions are shown on the left
-	        panel and possible matches to each selected transaction are shown on the
-	        right.</para>
-
-	        <itemizedlist>
-	          <listitem>
-	            <para>The left panel shows the list of Imported transactions to
-	            select from for matching duplicates</para>
-	          </listitem>
-
-	          <listitem>
-	            <para>The right panel shows the list of <emphasis>possible</emphasis> duplicates for the
-	            selected imported transaction. Select the one that most closely
-	            matches</para>
-	          </listitem>
-	        </itemizedlist>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-	  </listitem>
-	  <listitem>
-
-	        <para>The last screen, <guibutton>Update your &app;
-	        accounts</guibutton>, gives you a list of three choices to finish the
-	        assistant.</para>
-
-	      <itemizedlist>
-	        <listitem>
-	          <para><guibutton>Cancel:</guibutton> exit the process and cancel importing
-	          <acronym>QIF</acronym> files.</para>
-	          <warning>
-	            <para>If you click this button, any selections you have made up to
-	            this point will be lost.</para>
-	          </warning>
-	        </listitem>
-
-	        <listitem>
-	          <para><guibutton>Back:</guibutton> brings up the previous screen so
-	          that you can change a previous selection until the first screen.</para>
-	        </listitem>
-
-	        <listitem>
-	          <para><guibutton>Forward:</guibutton> imports the data and creates the
-	          accounts you have specified.</para>
-	        </listitem>
-	      </itemizedlist>
-
-	  </listitem>
-	  </orderedlist>
-
-	        <para>You should now have successfully imported your accounts.</para>
-
-	        <tip>
-	          <para>Imported transactions might need to be <emphasis role="strong">reconciled</emphasis>.
-	          This process is described in the <application>&app;</application> Tutorial and Concepts guide.</para>
-	        </tip>
-
-	    </sect2>
-	  -->
-  
+        <para>Many users seek to import their financial data from Quicken.</para>
+        <para>This Assistant helps you import Quicken <acronym>QIF</acronym> files. It will appear if
+        you choose <guibutton>Import my QIF files</guibutton> in the
+        <guilabel>Welcome to &app;!</guilabel> menu, as well as from <menuchoice><guimenu>File</guimenu>
+        <guisubmenu>Import ...</guisubmenu> <guimenuitem>Import QIF...</guimenuitem></menuchoice>.</para>
+
+            <para>The import process involves several steps, which are presented in a
+                series of screens that are described below.</para>
+
+      <orderedlist>
+      <listitem>
+
+            <para><guilabel>Import QIF files</guilabel> screen briefly describes the assistant.
+            The three buttons at the very bottom of the screen are used throughout the process
+            to navigate.</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><guibutton>Cancel</guibutton>: exit the process and cancel importing
+              <acronym>QIF</acronym> files.</para>
+              <warning>
+                <para>If you choose to cancel at any point in the assistant, any selections you have made up to
+                this point will be lost.</para>
+              </warning>
+            </listitem>
+
+            <listitem>
+              <para><guibutton>Back</guibutton>: return to the previous screen.</para>
+            </listitem>
+
+            <listitem>
+              <para><guibutton>Next</guibutton> move to the next screen.</para>
+            </listitem>
+          </itemizedlist>
+
+      </listitem>
+      <listitem>
+
+            <para><guilabel>Select a QIF file to load</guilabel> allows you to choose the
+            source <acronym>QIF</acronym> file. The <guibutton>Select...</guibutton> button on this
+            screen is used to access a list of files in your system. The
+            <guibutton>Select...</guibutton> button brings up the <guilabel>Select
+            QIF File</guilabel> dialog.</para>
+
+            <para>Navigate to where you have stored your <acronym>QIF</acronym> files and select the
+            first one then click <guibutton>Import</guibutton>. The next screen will
+            display it in the <guilabel>Select a QIF File to Load</guilabel>
+            field.</para>
+
+            <note>
+              <para>If the file you are loading does not have an <acronym>QIF</acronym> date listed
+              in it you will see the <guilabel>Set a date format for this QIF file</guilabel>
+              screen. Select the proper format from the pull down list and continue.</para>
+            </note>
+
+            <note>
+              <para>If the file you are loading does not have an account name listed
+              in it you will see the <guilabel>Set the default QIF account
+              name</guilabel> screen. Otherwise you will skip this screen and go on
+              to the screen in the next section that shows loaded <acronym>QIF</acronym> files.</para>
+
+              <itemizedlist>
+                <listitem>
+                  <para>The <guilabel>Account name:</guilabel> field is used to set
+                  an account name for this <acronym>QIF</acronym> file.</para>
+                </listitem>
+              </itemizedlist>
+            </note>
+
+      </listitem>
+      <listitem>
+            <para>The next screen shows you the <guilabel>QIF files you have
+            loaded</guilabel>. You can use this screen to return to the previous
+            screen and load more <acronym>QIF</acronym> files. It will also let you unload any files
+            you have loaded by mistake.</para>
+
+            <itemizedlist>
+              <listitem>
+                <para>The top panel shows the list of <guilabel>QIF Files</guilabel>
+                you have loaded.</para>
+              </listitem>
+
+              <listitem>
+                <para>The <guibutton>Load another file</guibutton> button takes you
+                back to the previous screen to load another <acronym>QIF</acronym> file.</para>
+              </listitem>
+
+              <listitem>
+                <para>The <guibutton>Unload selected file</guibutton> button allows you to
+                select a file from the top panel and remove it from the list.</para>
+              </listitem>
+            </itemizedlist>
+
+            <para>When you have selected all the <acronym>QIF</acronym> files to be imported, click the
+            <guibutton>Forward</guibutton> button.</para>
+
+      </listitem>
+      <listitem>
+
+            <para>Depending on the type of data contained in the
+            <acronym>QIF</acronym> files to be imported, you may see only one or all of the following screens:</para>
+
+      <variablelist termlength="8">
+        <varlistentry>
+        <term><guilabel>Accounts and stock holdings</guilabel></term>
+          <listitem>
+            <para>This screen gives a description of the <guilabel>Accounts and stock
+            holdings</guilabel> matching process on the following <guilabel>Match QIF
+            accounts with &app; accounts</guilabel> screen.</para>
+
+            <tip>
+              <para>This and other informational screens in the
+              <guilabel>Import QIF files</guilabel> assistant
+              can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
+              under <guilabel>&app; Preferences</guilabel>.</para>
+            </tip>
+
+            <para>The next screen lets you <guilabel>Match QIF accounts with &app;
+            accounts</guilabel>. You will see a list of <guilabel>QIF account
+            names</guilabel> on the left and suggested <guilabel>&app; account
+            names</guilabel> on the right. The <guilabel>New?</guilabel> column
+            indicates if the <application>&app;</application> account name will be created by the <acronym>QIF</acronym>
+            Import.</para>
+
+            <para>To change the <application>&app;</application> account to a different one select the <acronym>QIF</acronym>
+            account. A screen will pop up to select another account or create a new
+            one.</para>
+
+            <itemizedlist>
+              <listitem>
+                <para>Select an account from the list to choose a already existing
+                account.</para>
+              </listitem>
+
+              <listitem>
+                <para>The <guibutton>New Account</guibutton> button allows you to
+                add a new account name as a sub-account (child of selected) of the
+                selected account.</para>
+              </listitem>
+
+              <listitem>
+                <para>The <guibutton>OK</guibutton> button is used to confirm your
+                selection.</para>
+              </listitem>
+
+              <listitem>
+                <para>The <guibutton>Cancel</guibutton> button is used to exit the
+                dialog without using any changes you have made.</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+        <term><guilabel>Income and Expense categories</guilabel></term>
+          <listitem>
+            <para>This screen gives a description of the <guilabel>Income and
+            Expense categories</guilabel> matching process on the following <guilabel>Match
+            QIF categories with &app; accounts</guilabel> screen.</para>
+
+            <tip>
+              <para>This and other informational screens in the
+              <guilabel>Import QIF files</guilabel> assistant
+              can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
+              under <guilabel>&app; Preferences</guilabel>.</para>
+            </tip>
+
+            <para>The next screen lets you <guilabel>Match QIF categories with
+            &app; accounts</guilabel>. You will see a list of <guilabel>QIF
+            category names</guilabel> on the left and suggested <guilabel>&app;
+            account names</guilabel> on the right. The <guilabel>New?</guilabel>
+            column indicates if the <application>&app;</application> account name will be created by the QIF
+            Import.</para>
+
+            <para>To change the <application>&app;</application> account to a different one select the QIF
+            category. A dialog will pop up to select another account or create a new
+            one.</para>
+
+            <itemizedlist>
+              <listitem>
+                <para>Select an account from the list to choose a already existing
+                account.</para>
+              </listitem>
+
+              <listitem>
+                <para>The <guibutton>New Account</guibutton> button allows you to
+                add a new account name as a sub-account (child of selected) of the
+                selected account.</para>
+              </listitem>
+
+              <listitem>
+                <para>The <guibutton>OK</guibutton> button is used to confirm your
+                selection.</para>
+              </listitem>
+
+              <listitem>
+                <para>The <guibutton>Cancel</guibutton> button is used to exit the
+                dialog without using any changes you have made.</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+        <term><guilabel>Payees and memos</guilabel></term>
+        <listitem>
+            <para>This screen gives a description of the <guilabel>Payees and
+            memos</guilabel> matching process on the following <guilabel>Match payees/memos to
+            &app; accounts</guilabel> screen.</para>
+
+            <tip>
+              <para>This and other informational screens in the
+              <guilabel>Import QIF files</guilabel> assistant
+              can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
+              under <guilabel>&app; Preferences</guilabel>.</para>
+            </tip>
+
+            <para>The next screen lets you <guilabel>Match payees/memos to &app;
+            accounts</guilabel>. You will see a list of <guilabel>QIF payee/memo
+            names</guilabel> on the left and suggested <guilabel>&app; account
+            names</guilabel> on the right. The default <application>&app;</application> account used is
+            called <guilabel>Unspecified</guilabel>. The <guilabel>New?</guilabel> column indicates if
+            the <application>&app;</application> account name will be created by the QIF Import.</para>
+
+            <para>To change the <application>&app;</application> account to a different one select the QIF
+            payee/memo. A dialog will pop up to select another account or create a
+            new one.</para>
+
+            <itemizedlist>
+              <listitem>
+                <para>Select an account from the list to choose a already existing
+                account.</para>
+              </listitem>
+
+              <listitem>
+                <para>The <guibutton>New Account</guibutton> button allows you to
+                add a new account name as a sub-account of the selected
+                account.</para>
+              </listitem>
+
+              <listitem>
+                <para>The <guibutton>OK</guibutton> button is used to confirm your
+                selection.</para>
+              </listitem>
+
+              <listitem>
+                <para>The <guibutton>Cancel</guibutton> button is used to exit the
+                dialog without using any changes you have made.</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      </listitem>
+      <listitem>
+
+            <para>The next screen allows you to <guilabel>Enter the QIF file
+            currency</guilabel>. The drop down list defaults to the currency
+            configured in the <guilabel>Accounts</guilabel> tab (see <xref linkend="configuring-preferences-accounts"/>) under
+            <guilabel>&app; Preferences</guilabel>. If you wish the new accounts
+            to use a different currency, select one from the list.</para>
+
+            <para>When you have selected the currency, click the
+            <guibutton>Forward</guibutton> button.</para>
+
+      </listitem>
+      <listitem>
+
+            <para>Depending on the type of data contained in the
+            <acronym>QIF</acronym> files to be imported, you may or may not see one or more of the following screens:</para>
+
+      <variablelist termlength="8">
+        <varlistentry>
+        <term><guilabel>Tradable Commodities</guilabel></term>
+          <listitem>
+            <para>This screen gives a description of the <guilabel>Tradable
+            Commodities</guilabel> process on the screen.</para>
+
+            <tip>
+              <para>This and other informational screens in the
+              <guilabel>Import QIF files</guilabel> assistant
+              can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
+              under <guilabel>&app; Preferences</guilabel>.</para>
+            </tip>
+
+            <para>A series of screens, one for each of the stock, mutual fund, or
+            commodity, displays the exchange, full name, and symbol for each of the commodities
+            listed in the <acronym>QIF</acronym> file you are importing so that you can
+            check them before proceeding.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+        <term><guilabel>Match duplicate transactions</guilabel></term>
+          <listitem>
+            <para>This screen gives a description of the <guilabel>Match
+            duplicate transactions</guilabel> process on the following <guilabel>Select
+            possible duplicates</guilabel> screen.</para>
+
+            <tip>
+              <para>This and other informational screens in the
+              <guilabel>Import QIF files</guilabel> assistant
+              can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
+              under <guilabel>&app; Preferences</guilabel>.</para>
+            </tip>
+
+            <para>The next screen lets you <guilabel>Select possible duplicate
+            transactions</guilabel>. Imported transactions are shown on the left
+            panel and possible matches to each selected transaction are shown on the
+            right.</para>
+
+            <itemizedlist>
+              <listitem>
+                <para>The left panel shows the list of Imported transactions to
+                select from for matching duplicates</para>
+              </listitem>
+
+              <listitem>
+                <para>The right panel shows the list of <emphasis>possible</emphasis> duplicates for the
+                selected imported transaction. Select the one that most closely
+                matches</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      </listitem>
+      <listitem>
+
+            <para>The last screen, <guibutton>Update your &app;
+            accounts</guibutton>, gives you a list of three choices to finish the
+            assistant.</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><guibutton>Cancel:</guibutton> exit the process and cancel importing
+              <acronym>QIF</acronym> files.</para>
+              <warning>
+                <para>If you click this button, any selections you have made up to
+                this point will be lost.</para>
+              </warning>
+            </listitem>
+
+            <listitem>
+              <para><guibutton>Back:</guibutton> brings up the previous screen so
+              that you can change a previous selection until the first screen.</para>
+            </listitem>
+
+            <listitem>
+              <para><guibutton>Forward:</guibutton> imports the data and creates the
+              accounts you have specified.</para>
+            </listitem>
+          </itemizedlist>
+
+      </listitem>
+      </orderedlist>
+
+            <para>You should now have successfully imported your accounts.</para>
+
+            <tip>
+              <para>Imported transactions might need to be <emphasis role="strong">reconciled</emphasis>.
+              This process is described in the <application>&app;</application> Tutorial and Concepts guide.</para>
+            </tip>
+
+        </sect2>
+      -->
+
   <sect2 id="importing-ofx">
     <title>Import OFX/QFX</title>
-    <para>This opens a file selection dialog. Navigate to the file you wish to import, select a file with 
+    <para>This opens a file selection dialog. Navigate to the file you wish to import, select a file with
       the appropriate extension (.ofx  or .qfx), then press the <emphasis role="bold">Import</emphasis> button.</para>
     <para>Gnucash opens an Account Selection dialog to select an account in your CoA corresponding to data source. Select
-      the appropriate account from the account tree and press the <emphasis role="bold">OK</emphasis> button. On subsequent import of files from the 
+      the appropriate account from the account tree and press the <emphasis role="bold">OK</emphasis> button. On subsequent import of files from the
       same source (identified by tags in the file), the source is remembered and the account selection dialog is not
       displayed.</para>
     <para>The generic import transaction matcher dialog is opened next. See the <link linkend="importing-matcher">
           Import Matcher</link> section (common to both OFX/QFX and CSV import formats) following the Import CSV
           section to continue the import process.
-    </para>      
+    </para>
   </sect2>
   <sect2 id="importing-csv">
     <title>Import CSV</title>
-    <para>Clicking on <emphasis role="bold">Import CSV</emphasis> in the Import menu will bring up the Import Assistant dialog. The first step brings up a file selection 
-          dialog. Navigate to the location where the file you wish to import is located and select the file to import then click the 
+    <para>Clicking on <emphasis role="bold">Import CSV</emphasis> in the Import menu will bring up the Import Assistant dialog. The first step brings up a file selection
+          dialog. Navigate to the location where the file you wish to import is located and select the file to import then click the
           <emphasis role="bold">OK</emphasis> button.
     </para>
-    <para>The next window will allow you to set parameters for the importing of the file. All widgets have tooltips which explain what 
+    <para>The next window will allow you to set parameters for the importing of the file. All widgets have tooltips which explain what
           the setting affects and the options for the setting.
-    </para> 
+    </para>
     <sect3 id="importing-csv-save">
         <title>Load and Save Settings</title>
         <para>If this import is a regular occurrence, once you have set the other import paramters, you can save these settings by typing
-              in a setting name in the <emphasis role="bold">Load and Save Settings Entry</emphasis> combo box and pressing the <emphasis role="bold">Save</emphasis> button just to the right of the box. 
+              in a setting name in the <emphasis role="bold">Load and Save Settings Entry</emphasis> combo box and pressing the <emphasis role="bold">Save</emphasis> button just to the right of the box.
               Previously defined settings can be retrieved by selecting the appropriate setting name from the dropdown list activated by
               the down arrow at the right end of the text box. The trash can button to the right of the Save button can be used to remove
-              the settings selected from the drop down list for the box. The settings group <emphasis role="bold">"GnuCash Export Settings"</emphasis> define a setting 
+              the settings selected from the drop down list for the box. The settings group <emphasis role="bold">"GnuCash Export Settings"</emphasis> define a setting
               group for the export and reimport of GnuCash transaction data - use this if importing data previously exported from GnuCash.
         </para>
     </sect3>
@@ -592,17 +592,17 @@
       </para>
       <itemizedlist>
         <listitem>
-          <para><emphasis role="bold">Fixed width columns</emphasis> Selecting this radio button will allow you to define 
-               column boundaries by double clicking at the appropriate positions in the sample records displayed in the 
+          <para><emphasis role="bold">Fixed width columns</emphasis> Selecting this radio button will allow you to define
+               column boundaries by double clicking at the appropriate positions in the sample records displayed in the
                panel below. Single clicking in a column will narrow, widen or merge the column.
           </para>
         </listitem>
         <listitem>
           <para><emphasis role="bold">Separators</emphasis> Selecting this radio button will allow you to define characters
                 which will be used to distinguish columns in the input file. The default is comma separated however spaces,
-                tabs,colons or semicolons or any combination of them may be used to separate columns in the input file by 
+                tabs,colons or semicolons or any combination of them may be used to separate columns in the input file by
                 selecting the appropriate check boxes. You may also define custom separators by typing the required characters
-                into the text box and selecting the <emphasis role="bold">Custom</emphasis> checkbox. This may be used in combination with any of the 
+                into the text box and selecting the <emphasis role="bold">Custom</emphasis> checkbox. This may be used in combination with any of the
                 predefined separators.
           </para>
         </listitem>
@@ -611,7 +611,7 @@
                to be defined on consecutive lines within the file with each line defining a single split. If not selected each
                line is assumed to contain the information for a single transaction including one or two splits.
           </para>
-        </listitem>                  
+        </listitem>
       </itemizedlist>
     </sect3>
     <sect3>
@@ -632,7 +632,7 @@
       <title>Import Panel</title>
       <para>The import panel shows the data being imported as it is interpreted using the settings chosen to define columns and formats.
           The dropdown lists in the headers for each column of the import allow you to associate a specific column in the imported data
-          with a specific field in the display of a transaction in an account register. At a minimum to import data, columns in the 
+          with a specific field in the display of a transaction in an account register. At a minimum to import data, columns in the
           imported data containing the following information <emphasis role="bold">must</emphasis> be specified:
       </para>
       <itemizedlist>
@@ -644,9 +644,9 @@
       <para>The <emphasis role="bold">Skip Errors</emphasis> check box will skip trying to import any rows with errors in matching the columns.
       </para>
       <para>When you are happy with all the import settings, <link linkend="importing-csv-save">save</link> them
-           if you will use the same settings again, then press the <emphasis role="bold">Next</emphasis> button. 
-          This will bring up a window which allows you to map the accounts identified in the account column (Account Id) with accounts 
-          in the GnuCash account tree (Account name). Double click on a row to bring up a dialog to select the matching GnuCash account. 
+           if you will use the same settings again, then press the <emphasis role="bold">Next</emphasis> button.
+          This will bring up a window which allows you to map the accounts identified in the account column (Account Id) with accounts
+          in the GnuCash account tree (Account name). Double click on a row to bring up a dialog to select the matching GnuCash account.
           When you have selected a match for all accounts, click on the <emphasis role="bold">Next</emphasis> button.
       </para>
       <para>The Transaction Information panel allows review of data entry settings so far.

commit 7a3718985cb41dc7593d11667a18df0b8512ce66
Author: David Thomas <sunfish62 at yahoo.com>
Date:   Tue Mar 26 16:09:43 2019 +0100

    Guide - make Account and Transactions chapters subsections of the Basics chapter

diff --git a/guide/C/ch_accts.xml b/guide/C/ch_accts.xml
index 8828946..01fd41f 100644
--- a/guide/C/ch_accts.xml
+++ b/guide/C/ch_accts.xml
@@ -16,17 +16,17 @@ Originally written by
 Translators:
        (translators put your name and email here)
 -->
-<chapter id="chapter_accts">
+<sect1 id="chapter_accts">
   <title>Accounts</title>
 
-  <para>This chapter will discuss some useful concepts for organizing your
+  <para>This section discusses some useful concepts for organizing your
   accounts. Since <application>&app;</application> does not impose any specific account tree layout,
   you are free to design your account structure in any manner you wish.
   However, there are a few basic accounting concepts which you will probably
   want to follow when designing your accounts to maximize their
   utility.</para>
 
-  <sect1 id="accts-concepts1">
+  <sect2 id="accts-concepts1">
     <title>Basic Accounting Concepts</title>
 
     <para>As we saw in the previous chapter, accounting is based on 5 basic
@@ -69,7 +69,7 @@ Translators:
       </mediaobject>
     </screenshot>
 
-    <sect2 id="accts-bsa2">
+    <sect3 id="accts-bsa2">
       <title>Balance Sheet Accounts</title>
 
       <para>The three so-called <emphasis>Balance Sheet Accounts</emphasis>
@@ -91,9 +91,9 @@ Translators:
       represents what is left over after you subtract your liabilities from
       your assets. It can be thought of as the portion of your assets that you
       own outright, without any debt.</para>
-    </sect2>
+    </sect3>
 
-    <sect2 id="accts-ie2">
+    <sect3 id="accts-ie2">
       <title>Income and Expense Accounts</title>
 
       <para>The two <guilabel>Income and Expense Accounts</guilabel> are used
@@ -123,10 +123,10 @@ Translators:
     Then you should introduce it here in a separate paragraph
     and replace 'income and expense' by it in the latter sections of this book.
 -->
-    </sect2>
-  </sect1>
+    </sect3>
+  </sect2>
 
-  <sect1 id="accts-types1">
+  <sect2 id="accts-types1">
     <title><application>&app;</application> Accounts</title>
 
     <para>This section will show how the <application>&app;</application> definition of an account fits
@@ -158,7 +158,7 @@ Translators:
     <para>These <application>&app;</application> account types are presented in more detail
     below.</para>
 
-    <sect2 id="accts-gc-bsa2">
+    <sect3 id="accts-gc-bsa2">
       <title>Balance Sheet Accounts</title>
 
       <para>The first balance sheet account we will examine is
@@ -333,9 +333,9 @@ Translators:
         minus the <emphasis>things you owe</emphasis> equals your
         <emphasis>net worth</emphasis>.</para>
       </note>
-    </sect2>
+    </sect3>
 
-    <sect2 id="accts-gc-ie2">
+    <sect3 id="accts-gc-ie2">
       <title>Income and Expense Accounts</title>
 
       <para><emphasis>Income</emphasis> is the payment you receive for your
@@ -411,9 +411,9 @@ Translators:
             </caption>
           </mediaobject>
         </screenshot>
-    </sect2>
+    </sect3>
 
-    <sect2 id="accts-other-types">
+    <sect3 id="accts-other-types">
       <title>Other Account Types</title>
 
       <para>There are some special other account types.</para>
@@ -428,11 +428,11 @@ Translators:
         </emphasis>are used only in the OFX importer, apparently for
         completeness with the specification.
       </para>
-    </sect2>
+    </sect3>
 
-  </sect1>
+  </sect2>
 
-  <sect1 id="accts-examples1">
+  <sect2 id="accts-examples1">
     <title>Putting It All Together</title>
 
     <para>Let’s go through the process of building a common personal finance
@@ -443,7 +443,7 @@ Translators:
     track into the basic account types of accounting. This is fairly simple,
     let’s go through an example.</para>
 
-    <sect2 id="accts-examples-situation2">
+    <sect3 id="accts-examples-situation2">
       <title>Simple Example</title>
 
       <para>Let us assume you have a checking and a savings account at a bank,
@@ -462,9 +462,9 @@ Translators:
       form of a salary, and <guilabel>expenses</guilabel> in the form of
       groceries, rent, electricity, phone, and taxes (Federal, Social
       Security, Medicare) on your salary.</para>
-    </sect2>
+    </sect3>
 
-    <sect2 id="accts-examples-toplevel2">
+    <sect3 id="accts-examples-toplevel2">
       <title>The Basic Top Level Accounts</title>
 
       <para>Now, you must decide how you want to group these accounts. Most
@@ -554,9 +554,9 @@ Translators:
           </caption>
         </mediaobject>
       </screenshot>
-    </sect2>
+    </sect3>
 
-    <sect2 id="accts-examples-organization2">
+    <sect3 id="accts-examples-organization2">
       <title>Making Sub-Accounts</title>
 
       <para>You can now add to this basic top-level tree structure by inserting
@@ -687,6 +687,6 @@ Translators:
       household budget. With this basic framework in place, we can now begin
       to populate the accounts with transactions. The next chapter will cover
       this subject in greater detail.</para>
-    </sect2>
-  </sect1>
-</chapter>
+    </sect3>
+  </sect2>
+</sect1>
diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 0cad3e4..164ae29 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -252,7 +252,7 @@
     <sect2 id="basics-accounts2">
       <title>Accounts</title>
 
-      <para>An <firstterm>account</firstterm> keeps track of what you own,
+      <para>An <glossterm linkend="gnc-gl_account">account</glossterm> keeps track of what you own,
       owe, spend or receive. Each <application>&app;</application> file can
       contain any number of accounts, and each account can contain many
       sub-accounts up to an arbitrary number of levels. This simple feature
@@ -1518,8 +1518,8 @@
             </mediaobject>
           </screenshot>
     </listitem>
-
   </orderedlist>
-
-  </sect1>
+</sect1>
+<xi:include href="ch_accts.xml" />
+<xi:include href="ch_txns.xml" />
 </chapter>
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 88349c9..c5aef68 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -14,7 +14,7 @@
   Translators:
                (translators put your name and email here)
 -->
-<chapter id="chapter_txns">
+<sect1 id="chapter_txns">
   <title>Transactions</title>
 
   <para>This chapter will give you the basic information you need to
@@ -22,7 +22,7 @@
   framework and structure of a chart of accounts, transactions are the data
   which fills each account.</para>
 
-  <sect1 id="txns-concepts1">
+  <sect2 id="txns-concepts1">
     <title>Basic Concepts</title>
 
     <para>A <emphasis>transaction</emphasis> in a double entry accounting
@@ -53,49 +53,64 @@
 
     <para>The account register is explained in the upcoming section,
     <xref linkend="txns-register-oview"/>.</para>
-  </sect1>
+  </sect2>
 
-  <sect1 id="txns-register-oview">
+  <sect2 id="txns-register-oview">
     <title>The Account Register</title>
-
-    <para>The <emphasis>account register</emphasis> is the <application>&app;</application> window, which allows you to view or edit preexisting transactions, or add new transactions for a particular account. To open an account register from the Account Tree, double-click the account name, right click the account name and select Open Account from the menu, or use the Open button on the toolbar. <application>&app;</application> will display the account register window.</para>
-        <sect2 id="txns-registers-features2">
-            <title>Features of the Account Register</title>
-
-            <para>The <emphasis>Titlebar</emphasis> of the account register displays the account name. Below the <emphasis>Titlebar</emphasis>, the <emphasis>Menubar</emphasis> displays the menu items available within the account register, and the <emphasis>Toolbar</emphasis> contains handy buttons that help you work with the account register.</para>
-
-            <para>At the bottom left of the register window, <application>&app;</application> displays helpful messages as you move about the register. To the right, you can see the current account balance and the total of cleared splits.</para>
-        </sect2>
-<sect2 id="txns-regstyle1">
-    <title>Choosing a Register Style</title>
-
-    <para><application>&app;</application> offers several options for viewing your registers. The
+	<para>The <emphasis>account register</emphasis> is the window that allows you to view 
+	or edit preexisting transactions, or add new transactions for a particular account. To open 
+	an account register from the Account Tree, double-click the account name, right click the 
+	account name and select Open Account from the menu, or use the Open button on the toolbar. 
+	<application>&app;</application> will display the account register window.</para>
+	
+	<sect3 id="txns-registers-features2">
+		<title>Features of the Account Register</title>
+
+		<para>The <emphasis>Titlebar</emphasis> of the account register displays the account 
+		name. Below the <emphasis>Titlebar</emphasis>, the <emphasis>Menubar</emphasis> displays 
+		the menu items available within the account register, and the <emphasis>Toolbar</emphasis> 
+		contains handy buttons that help you work with the account register.</para>
+
+		<para>At the bottom left of the register window, <application>&app;</application> displays 
+		helpful messages as you move about the register. To the right, you can see the current account 
+		balance and the total of cleared splits.</para>
+	</sect3>
+	<sect3 id="txns-regstyle1">
+		<title>Choosing a Register Style</title>
+		<para><application>&app;</application> offers several options for viewing your registers. The
         default style is <guilabel>Basic Ledger</guilabel> mode, which displays
         only the summary of splits affecting the current account. This is the
         style that most closely resembles other popular personal financial
-        packages. You can choose a different register style from the <menuchoice><guimenu>View</guimenu></menuchoice> menu. There are two other view modes:</para>
-    <itemizedlist>
-        <listitem><para><menuchoice><guimenu>View</guimenu><guimenuitem>Auto-Split Ledger</guimenuitem></menuchoice>
-        style expands the current transaction automatically. As you highlight a
-        new transaction in the register, the transaction automatically expands to
-        show all splits.</para></listitem>
-    <listitem><para><menuchoice><guimenu>View</guimenu><guimenuitem>Transaction
-        Journal</guimenuitem></menuchoice> style shows all splits for all transactions in the register, which is more like an accounting journal.</para></listitem>
-    </itemizedlist>
-
-    <para>All styles permit you to view your data in either single-line or
+        packages. You can choose a different register style from the <menuchoice><guimenu>View</guimenu></menuchoice> menu. 
+		There are two other view modes:</para>
+		<itemizedlist>
+			<listitem>
+				<para><menuchoice><guimenu>View</guimenu><guimenuitem>Auto-Split Ledger</guimenuitem></menuchoice>
+				style expands the current transaction automatically. As you highlight a
+				new transaction in the register, the transaction automatically expands to
+				show all splits.</para>
+			</listitem>
+			<listitem>
+				<para><menuchoice><guimenu>View</guimenu><guimenuitem>Transaction
+				Journal</guimenuitem></menuchoice> style shows all splits for all transactions in 
+				the register, which is more like an accounting journal.</para>
+			</listitem>
+		</itemizedlist>
+
+		<para>All styles permit you to view your data in either single-line or
         double-line format. Select <menuchoice><guimenu>View</guimenu>
-            <guimenuitem>Double Line</guimenuitem></menuchoice>, and you will see your transaction
-        line expand to two register lines. Double-line mode will also display the transaction-level Notes field.</para>
+		<guimenuitem>Double Line</guimenuitem></menuchoice>, and you will see your transaction
+		line expand to two register lines. Double-line mode will also display the transaction-level Notes field.</para>
 
-    <para>Below are screenshots that demonstrate how the Basic Ledger and Transaction Journal views differ.
-    </para>
-    <para>For this example, let’s assume that you have purchased 3 pair of Jeans for $1,000, and have recorded the purchase as a split transaction with each pair entered on a separate split.</para>
-    <para>The below screenshots illustrate the different view modes.</para>
+		<para>Below are screenshots that demonstrate how the Basic Ledger and Transaction Journal views differ.</para>
+		<para>For this example, let’s assume that you have purchased 3 pair of Jeans for 
+			$1,000, and have recorded the purchase as a split transaction with each pair entered 
+			on a separate split.</para>
+		<para>The below screenshots illustrate the different view modes.</para>
 
-    <para>First let’s view the Jeans transaction from your checking account:</para>
+		<para>First let’s view the Jeans transaction from your checking account:</para>
 
-    <screenshot id="txns-registersplit4">
+		<screenshot id="txns-registersplit4">
         <mediaobject>
             <imageobject>
                 <imagedata fileref="figures/txns_registersplit4.png" format="PNG"
@@ -110,12 +125,12 @@
                 This image shows one split transaction with 3 Jeans purchases
             </para></caption>
         </mediaobject>
-    </screenshot>
+		</screenshot>
 
-    <para>Now, let's open the <emphasis>Expenses:Clothes</emphasis> account, and look at it in Basic view.</para>
+		<para>Now, let’s open the <emphasis>Expenses:Clothes</emphasis> account, and look at it in Basic view.</para>
 
-<screenshot id="txns-registersplit5">
-        <mediaobject>
+		<screenshot id="txns-registersplit5">
+		<mediaobject>
             <imageobject>
                 <imagedata fileref="figures/txns_registersplit5.png" format="PNG"
                 srccredit="Bengt Thuree" />
@@ -128,30 +143,30 @@
             <caption><para>This image shows <emphasis>Expenses:Clothes</emphasis> account
                 in Basic Ledger mode.</para></caption>
         </mediaobject>
-    </screenshot>
-<para>Three entries appear here, but there was only the single split entry in the checking account. Further examination shows that each row has a different amount, $200, $300, and $500. This demonstrates that each row in this view reflects a single split from the original transaction.</para>
+		</screenshot>
+		<para>Three entries appear here, but there was only the single split entry in the 
+			checking account. Further examination shows that each row has a different amount, 
+			$200, $300, and $500. This demonstrates that each row in this view reflects a single 
+			split from the original transaction.</para>
 
-    <para>Changing to Transaction Journal mode will display only the original split transaction.</para>
+		<para>Changing to Transaction Journal mode will display only the original split transaction.</para>
 
-    <screenshot id="txns-registersplit6">
+		<screenshot id="txns-registersplit6">
         <mediaobject>
             <imageobject>
                 <imagedata fileref="figures/txns_registersplit6.png" format="PNG"
                 srccredit="Bengt Thuree" />
             </imageobject>
-
             <textobject>
                 <phrase>A jump to the <emphasis>Expenses:Clothes</emphasis> account</phrase>
             </textobject>
-
             <caption><para>This image shows <emphasis>Expenses:Clothes</emphasis> account in
                 Transaction Journal mode.</para></caption>
         </mediaobject>
-    </screenshot>
-
-</sect2>
+		</screenshot>
 
-<sect2 id="txns-shortcuts1">
+	</sect3>
+	<sect3 id="txns-shortcuts1">
     <title>Using Entry Shortcuts</title>
 
     <para><application>&app;</application> provides several time-saving shortcuts for entering your
@@ -254,8 +269,8 @@
         resulting value to the amount field when you press the
         <keycap>Tab</keycap> key.</para>
 
-    <para>All of the menu items have access keys defined, and these are marked
-        by underlined characters in the menu names. Press <keycap>Alt</keycap> +
+	<para>All of the menu items have access keys defined, and these are marked
+		by underlined characters in the menu names. Press <keycap>Alt</keycap> +
         [underlined character] to bring up the menu, then select an item by typing
         its underlined character. For example, typing <keycombo>
             <keycap>Alt</keycap>
@@ -310,13 +325,8 @@
     <para>In the <guilabel>Reconcile</guilabel> window you can use these
         keyboard shortcuts:</para>
 
-    <itemizedlist>
-        <listitem>
-            <para><keycap>Tab</keycap> moves to the next box and
-                <keycombo><keycap>Shift</keycap><keycap>Tab</keycap></keycombo>
-                moves to the previous
-                box</para>
-        </listitem>
+    <itemizedlist> <listitem> <para><keycap>Tab</keycap> moves to the next box and
+    <keycombo><keycap>Shift</keycap><keycap>Tab</keycap></keycombo> moves to the previous box</para> </listitem>
 
         <listitem>
             <para>Space bar toggles the status between reconciled and not
@@ -328,9 +338,9 @@
                 entries within the current box</para>
         </listitem>
     </itemizedlist>
-</sect2>
-</sect1>
-    <sect1 id="txns-registers-txntypes">
+	</sect3>
+	</sect2>
+    <sect2 id="txns-registers-txntypes">
     <title>Simple vs. Split Transactions</title>
 
     <para>Every transaction in <application>&app;</application> has at least two splits, but a transaction can have more than two splits. A transaction with only two splits is called a <emphasis>simple transaction</emphasis>, since it only involves the current account and a single remote account. A transaction with three or more accounts is called a <emphasis>split transaction</emphasis>.</para>
@@ -430,7 +440,7 @@
     exactly the same, but the transaction line now reflects the credit to
     the <emphasis>Income:Salary</emphasis> account.</para>
 
-    <sect2 id="txns-registers-twoaccount2">
+    <sect3 id="txns-registers-twoaccount2">
       <title>Simple Transaction Example</title>
 
       <para>Starting with the chart of accounts we created in the
@@ -491,9 +501,9 @@
           groceries.</para></caption>
         </mediaobject>
       </screenshot>
-    </sect2>
+    </sect3>
 
-    <sect2 id="txns-registers-multiaccount2">
+    <sect3 id="txns-registers-multiaccount2">
       <title>Split Transaction Example</title>
 
       <para>The need for 3 or more splits in a transaction occurs when you need
@@ -542,10 +552,10 @@
           </textobject>
         </mediaobject>
       </figure>
-    </sect2>
-  </sect1>
+    </sect3>
+  </sect2>
 
-  <sect1 id="txns-reconcile1">
+  <sect2 id="txns-reconcile1">
     <title>Reconciliation</title>
 
       <para>Once transactions have been entered into <application>&app;</application>, it is important to verify
@@ -597,7 +607,7 @@
         <emphasis role="strong">reconciled</emphasis> balances will be thrown off.</para>
       </warning>
 
-    <sect2 id="txns-reconcile-window2">
+    <sect3 id="txns-reconcile-window2">
       <title>Reconcile windows</title>
 
       <para>The reconciliation windows are used to reconcile a <application>&app;</application> account
@@ -815,10 +825,10 @@
           reconciliation.</para></caption>
         </mediaobject>
       </screenshot>
-    </sect2>
-  </sect1>
+    </sect3>
+  </sect2>
 
-  <sect1 id="txns-sxn1">
+  <sect2 id="txns-sxn1">
     <title>Scheduled Transactions</title>
 
     <para>Scheduled transactions are made to help entering repetitive money
@@ -835,7 +845,7 @@
     <link linkend="txns-sxn-ledger2">from the ledger</link> or from the
     <link linkend="txns-sxn-editor2">Scheduled Transactions Editor</link>.</para>
 
-    <sect2 id="txns-sxn-ledger2">
+    <sect3 id="txns-sxn-ledger2">
       <title>Creating from the Ledger</title>
 
       <para>Enter the first occurrence of your to-schedule transaction in the
@@ -927,9 +937,9 @@
       <application>&app;</application> now has memorized this scheduled transaction and on the 28th of
       next month, it will pop up a window asking if it should create it (see
       far below for a screenshot of this window).</para>
-    </sect2>
+    </sect3>
 
-    <sect2 id="txns-sxn-editor2">
+    <sect3 id="txns-sxn-editor2">
       <title>Creating from the Editor</title>
 
       <para>Another way of entering a scheduled transaction is from the
@@ -1228,10 +1238,10 @@
         by selecting <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice> and
         choosing the previously saved <filename>gcashdata_3</filename> <application>&app;</application> file.</para>
       </note>
-    </sect2>
-  </sect1>
+    </sect3>
+  </sect2>
 
-  <sect1 id="txns-puttoget1">
+  <sect2 id="txns-puttoget1">
     <title>Putting It All Together</title>
 
     <para>In the previous sections of this chapter the concepts and mechanics
@@ -1240,7 +1250,7 @@
     chapter, by setting some opening balances, adding transactions and a
     scheduled transaction.</para>
 
-    <sect2 id="txns-puttoget-openfile">
+    <sect3 id="txns-puttoget-openfile">
       <title>Open <application>&app;</application> file</title>
 
       <para>Start with opening the previous datafile we stored,
@@ -1263,9 +1273,9 @@
           section.</para></caption>
         </mediaobject>
       </screenshot>
-    </sect2>
+    </sect3>
 
-    <sect2 id="txns-puttoget-open2">
+    <sect3 id="txns-puttoget-open2">
       <title>Opening Balances</title>
 
       <para>As shown earlier in <xref linkend="txns-registers-twoaccount2"/>
@@ -1333,9 +1343,9 @@
           balances.</para></caption>
         </mediaobject>
       </screenshot>
-    </sect2>
+    </sect3>
 
-    <sect2 id="txns-puttoget-add2">
+    <sect3 id="txns-puttoget-add2">
       <title>Additional Transaction Examples</title>
 
       <para>Now add some more transactions to simulate a month’s expenses.
@@ -1455,16 +1465,16 @@
           linkend="chapter_txns" />.</para></caption>
         </mediaobject>
       </screenshot>
-    </sect2>
+    </sect3>
 
-    <sect2 id="txns-puttoget-save">
+    <sect3 id="txns-puttoget-save">
       <title>Save file</title>
 
       <para>Before we go to the report section, let’s save the <application>&app;</application> data
       file (<filename>gcashdata_4</filename>).</para>
-    </sect2>
+    </sect3>
 
-    <sect2 id="txns-puttoget-reports">
+    <sect3 id="txns-puttoget-reports">
       <title>Reports</title>
 
       <para>But only having data available on the computer screen will not
@@ -1557,6 +1567,6 @@
           </screenshot>
         </listitem>
       </orderedlist>
-    </sect2>
-  </sect1>
-</chapter>
+    </sect3>
+  </sect2>
+</sect1>
\ No newline at end of file
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 80d9e69..6087f54 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -439,8 +439,6 @@
     <title>Getting Started</title>
 <xi:include href="ch_oview.xml" />
 <xi:include href="ch_basics.xml" />
-<xi:include href="ch_accts.xml" />
-<xi:include href="ch_txns.xml" />
 <xi:include href="ch_importing.xml" />
 <xi:include href="ch_configuring.xml" />
 </part>

commit fffe876d1e7035ca66f77b0dfe3059f1dd3f75d3
Author: David Thomas <sunfish62 at yahoo.com>
Date:   Tue Mar 26 18:35:21 2019 +0100

    Bug 796856 Help Ch6 section added for importing from files
    
    Move this section to the guide in the newly created import chapter.

diff --git a/guide/C/ch_importing.xml b/guide/C/ch_importing.xml
index 92d1075..d89c88c 100644
--- a/guide/C/ch_importing.xml
+++ b/guide/C/ch_importing.xml
@@ -14,15 +14,169 @@
 -->
 <chapter id="chapter_importing">
   <title>Importing Data into <application>&app;</application></title>
-
   <para>This chapter will detail procedures for importing data into <application>&app;</application>.</para>
-
-  <sect1 id="importing-overview">
-    <title>Overview</title>
-
-    <para>Importing stuff is fun.</para>
-
+  <sect1 id="importing-from-files">
+  <title>Importing Transactions from Files</title>
+  
+  <para>Imported transactions will generally be to a specific account in your account tree. In the following 
+          this will be referred to as the <emphasis role="bold">import</emphasis> or 
+          <emphasis role="bold">base</emphasis> account. It may or may not be
+          specified in the data being imported, depending on the import format. It is usually the first split
+          of a transaction being imported.
+  </para>
+  <para>All transactions will also must have a <emphasis role="bold">destination</emphasis> account for 
+          at least matching splits. This may or may not be supplied in the imported data. If it is not,
+          an account can be assigned on the basis of the previous import history by matching to infomation in
+          the imported data. The user may always over-ride this assignment.
+  </para>
+  <para>Multi-split data previously exported from GnuCash may have both the import and destination accounts
+          for transaction splits specified in the data file.
+  </para>
+  <sect2>
+    <title>File Import Formats</title>
+    <para>Gnucash allows transactions to be imported in the following formats:</para>
+      <itemizedlist>
+        <listitem><para><emphasis role="bold"><link linkend="importing-qif">QIF</link></emphasis> 
+             (.qif) Quicken Interchange format - import data from Quicken financial software;</para></listitem>
+        <listitem><para><emphasis role="bold"><link linkend="importing-ofx">OFX/QFX</link></emphasis> 
+             (.ofx,.qfx) Open Financial eXchange format (QXF is an Intuit/Quicken proprietary version of OFX);
+        </para></listitem>
+        <listitem><para><emphasis role="bold"><link linkend="importing-csv">CSV</link></emphasis> 
+             (.csv)  Comma Separated Values;</para></listitem>
+         <listitem><para><emphasis role="bold"><link linkend="importing-mt940">MT940</link></emphasis> 
+              MT940</para></listitem>
+          <listitem><para><emphasis role="bold"><link linkend="importing-mt942">MT942</link></emphasis> 
+               MT942</para></listitem>
+           <listitem><para><emphasis role="bold"><link linkend="importing-dtaus">DTAUS</link></emphasis> 
+                DTAUS</para></listitem>
+      </itemizedlist>
+    
+    <para>These import methods can be accessed from <menuchoice><guimenu>File</guimenu>
+		<guisubmenu>Import ...</guisubmenu></menuchoice>.</para>      
+  </sect2>
+
+  <sect2 id="importing-matcher">
+    <title>Import Matcher</title>
+    <para>Several of the Import Assistants use an Import Matcher to implement a Bayesian approach to assign 
+		destination accounts, if such accounts are not specified in 
+        the imported data, to each imported transaction based on the previous import history of the import account.
+        It also attempts to match the transactions being imported to any existing transactions
+        based on the date and the description fields<!-- FIXME add any other fields used in matching -->.
+    </para>
+    <para>Transaction rows which match existing transactions already in the import account are flagged not to be imported. They 
+      will have a light green background and the A and U+R checkboxes will be unchecked and the R checkbox will be 
+      checked. To override and import the transaction, check the A checkbox. The U and R boxes will be unchecked 
+      automatically. The reliability of the match is indicated by a bar display in the Info column. If a destination
+      account for the second split is assigned by the matcher if will be appended to the info column.
+    </para>
+    <para>Transaction rows which do not match existing transactions in the import account, for which an assignment
+      of a destination account cannot be made on the basis of the previous import history to the account, will be 
+      displayed with an orange-yellow background and the A box will be checked and U+R and R unchecked. A destination 
+      account must be specified for these transactions.
+    </para>
+   <sect3><title>Assign a Destination Account to a Single Transaction</title>
+      <para>The currently selected row is selected by Left-clicking it. It is displayed with a mid dark green background.</para>
+      <para><emphasis role="bold">Double click</emphasis> on a row. This will select it and open an Account Selection
+            dialog. Select the desired destination account in the dialog and click <guilabel>OK</guilabel>. The row 
+            background will change to a light green and the assigned destination account will be displayed 
+            in the Info column.
+      </para>
+      <para>or alternatively, <emphasis role="bold">Left-click</emphasis> on a row to select it followed by a 
+         <emphasis role="bold">Right-click </emphasis>to bring up a popup menu then select
+        "Assign a transfer account" to display the Account Selection dialog, select the destination account and
+         click the <guilabel>OK</guilabel> button.
+      </para>
+    </sect3>
+    <sect3>
+      <title>Assign a Destination Account to Multiple Transactions</title>
+      <para>Sometimes you will have several transactions which will have the same destination account. Gnucash
+            allows you to select multiple transactions and apply the same destination account to all transactions
+            in the selection.
+      </para>
+      <para>Rows in a selection are displayed with a mid dark green background.</para>
+      <para>Multiple rows may be selected to have the same destination account assigned to them.</para>
+      <para>To select rows either:</para>
+      <itemizedlist>
+        <listitem><para><emphasis role="bold">Left click</emphasis> on first row and then 
+        <emphasis role="bold">Ctrl-Left click</emphasis> on other rows to add to the selection or</para></listitem>
+        <listitem><para><emphasis role="bold">Left-click</emphasis> on a first row and then 
+        <emphasis role="bold">Shift-Left-click</emphasis> on another row to select all rows between them.</para></listitem>
+      </itemizedlist>
+      <para>then <emphasis role="bold">Right-click</emphasis> to display a popup menu and then select 
+        <emphasis role="bold">"Assign a transfer account"</emphasis> to open the Account 
+         Selection dialog. Select the desired destination account and click the <guilabel>OK</guilabel>
+         button in the Account Selection dialog.</para>
+    </sect3>
+    <sect3>
+      <title>Completing the Import</title>
+    <para>Once you have assigned destination accounts for all the imported transactions using the above methods 
+      (all row backgrounds will be a light green colour), check that the assigned destination acounts are correct 
+      and then press the <guilabel>OK</guilabel> button at the bottom of the Generic Import Matcher 
+      window. The transactions selected for import will have their splits added to the selected source 
+      and destination accounts.
+    </para>
+    <para>The choices made for the destination accounts and description/memo fields are remembered and stored and 
+      used for future imports to the same account to automatically assign a destination account for transaction 
+      records not containing destination account information.
+    </para>
+    </sect3>
+  </sect2>
+
+ 
   <sect2 id="importing-qif">
+    <title>Import QIF</title>
+    <para>To import data from Quicken®, MS Money, or other programs that use QIF(Quicken® Interchange Format),
+          you must first export your data to a QIF file. One way to do this is to export each account as a 
+          separate QIF file. An easier way, available in Quicken® 98 and beyond, is to export all accounts at
+          once into a single QIF file. Check your program's manual to determine if this option is available.
+    </para>
+    <sect3><title>To import QIF files:</title><para> </para></sect3>
+    <sect3>
+      <title>Load all of the QIF files containing data you wish to import</title>
+      <para>To do this, select <emphasis role="bold">File -> Import -> Import QIF...</emphasis> from the menu. When the QIF Import dialog
+            box appears, click <emphasis role="bold">Next</emphasis> and follow the instructions to guide you through the process of loading
+            your files.
+      </para>
+      <para>This image shows the start of the QIF Import assistant.<!--FIXME put an image of the import druid in --> </para>
+      <para>You will be prompted for a filename to load. Use the Select button to select your QIF file and
+           click Next to load it. Once the file is loaded, select Load another file if you have more files 
+           to load. When you have loaded all your QIF files, click Next to continue with the import process.
+      </para>
+    </sect3>
+    <sect3>
+      <title>Review the GnuCash accounts to be created.</title>
+      <para>The importer then matches up your QIF accounts and categories with GnuCash accounts and gives 
+            you a brief description of the matching process. Clicking Next will bring you to a view comparing
+            your QIF accounts with the corresponding GnuCash accounts created. To change an account name, select
+            the row containing that account name and edit the name in the dialog box provided. Click Next when 
+            you have finished making changes, and proceed through a similar category matching process. QIF 
+            income and expense categories import as GnuCash income and expense accounts <!--(see section 3.1 FIXME for 
+            more on this).--> Make changes to these account names if necessary, and click Next to continue.
+      </para>
+      <para><emphasis role="bold">Note:</emphasis> If you are not sure what changes are needed, it is safe to
+            accept the GnuCash account names. It is easy to edit the accounts later if you find you need to make
+            a change.
+      </para>
+      <para>From the drop-down list, select a standard currency to be used for the  imported accounts and click <emphasis role="bold">Next</emphasis>
+            to continue. If you have stocks, mutual funds, or other securities, you will be prompted for additional
+            information. The importer dialog 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 <emphasis role="bold">Next</emphasis> to continue.
+      </para>
+    </sect3>
+    <sect3>
+      <title>Tell GnuCash to import the data.</title>
+      <para>The last step is the import. Once you have verified your account names and investment information, 
+            click <emphasis role="bold">Finish</emphasis> in the Update your GnuCash accounts 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, GnuCash will return you 
+            to the main window, which should now display the names of the accounts you imported.
+      </para>
+    </sect3>
+  </sect2>
+  
+  <!--
+  <sect2 id="importing-qif-from-help">
     <title>Importing Quicken QIF Files</title>
 
 		<para>Many users seek to import their financial data from Quicken.</para>
@@ -392,5 +546,130 @@
 	        </tip>
 
 	    </sect2>
-	</sect1>
+	  -->
+  
+  <sect2 id="importing-ofx">
+    <title>Import OFX/QFX</title>
+    <para>This opens a file selection dialog. Navigate to the file you wish to import, select a file with 
+      the appropriate extension (.ofx  or .qfx), then press the <emphasis role="bold">Import</emphasis> button.</para>
+    <para>Gnucash opens an Account Selection dialog to select an account in your CoA corresponding to data source. Select
+      the appropriate account from the account tree and press the <emphasis role="bold">OK</emphasis> button. On subsequent import of files from the 
+      same source (identified by tags in the file), the source is remembered and the account selection dialog is not
+      displayed.</para>
+    <para>The generic import transaction matcher dialog is opened next. See the <link linkend="importing-matcher">
+          Import Matcher</link> section (common to both OFX/QFX and CSV import formats) following the Import CSV
+          section to continue the import process.
+    </para>      
+  </sect2>
+  <sect2 id="importing-csv">
+    <title>Import CSV</title>
+    <para>Clicking on <emphasis role="bold">Import CSV</emphasis> in the Import menu will bring up the Import Assistant dialog. The first step brings up a file selection 
+          dialog. Navigate to the location where the file you wish to import is located and select the file to import then click the 
+          <emphasis role="bold">OK</emphasis> button.
+    </para>
+    <para>The next window will allow you to set parameters for the importing of the file. All widgets have tooltips which explain what 
+          the setting affects and the options for the setting.
+    </para> 
+    <sect3 id="importing-csv-save">
+        <title>Load and Save Settings</title>
+        <para>If this import is a regular occurrence, once you have set the other import paramters, you can save these settings by typing
+              in a setting name in the <emphasis role="bold">Load and Save Settings Entry</emphasis> combo box and pressing the <emphasis role="bold">Save</emphasis> button just to the right of the box. 
+              Previously defined settings can be retrieved by selecting the appropriate setting name from the dropdown list activated by
+              the down arrow at the right end of the text box. The trash can button to the right of the Save button can be used to remove
+              the settings selected from the drop down list for the box. The settings group <emphasis role="bold">"GnuCash Export Settings"</emphasis> define a setting 
+              group for the export and reimport of GnuCash transaction data - use this if importing data previously exported from GnuCash.
+        </para>
+    </sect3>
+    <sect3>
+      <title>Account</title>
+      <para>This combo box allows you to select the base or import account into which the transactions will be imported.  It may be left unset
+            if the imported data contains a column listing the accounts associated with each split or the import data
+            specifies the account for first split of the transaction.</para>
+    </sect3>
+    <sect3>
+      <title>File Format</title>
+      <para>This section allows you to define whether the file has:
+      </para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Fixed width columns</emphasis> Selecting this radio button will allow you to define 
+               column boundaries by double clicking at the appropriate positions in the sample records displayed in the 
+               panel below. Single clicking in a column will narrow, widen or merge the column.
+          </para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Separators</emphasis> Selecting this radio button will allow you to define characters
+                which will be used to distinguish columns in the input file. The default is comma separated however spaces,
+                tabs,colons or semicolons or any combination of them may be used to separate columns in the input file by 
+                selecting the appropriate check boxes. You may also define custom separators by typing the required characters
+                into the text box and selecting the <emphasis role="bold">Custom</emphasis> checkbox. This may be used in combination with any of the 
+                predefined separators.
+          </para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Multi-split</emphasis> Selecting this check box allows the splits for a single transaction
+               to be defined on consecutive lines within the file with each line defining a single split. If not selected each
+               line is assumed to contain the information for a single transaction including one or two splits.
+          </para>
+        </listitem>                  
+      </itemizedlist>
+    </sect3>
+    <sect3>
+      <title>Miscellaneous</title>
+      <para>The miscellaneous settings allow you to set:
+      </para>
+      <itemizedlist>
+        <listitem><para><emphasis role="bold">Encoding</emphasis>This is usually the UTF-8 variant for your locale;</para></listitem>
+        <listitem><para><emphasis role="bold">Date Format</emphasis> This does not default to the Locale setting so check it matches the data you are importing;</para></listitem>
+        <listitem><para><emphasis role="bold">Currency Format</emphasis>;</para></listitem>
+        <listitem><para><emphasis role="bold">Leading Lines to Skip</emphasis>;</para></listitem>
+        <listitem><para><emphasis role="bold">Trailing Lines to Skip</emphasis>;</para></listitem>
+        <listitem><para><emphasis role="bold">Skip alternate lines</emphasis>;</para></listitem>
+        </itemizedlist>
+       <para>to match the settings for the file you are importing. Tooltips may also contain information on the setting and options.</para>
+    </sect3>
+    <sect3>
+      <title>Import Panel</title>
+      <para>The import panel shows the data being imported as it is interpreted using the settings chosen to define columns and formats.
+          The dropdown lists in the headers for each column of the import allow you to associate a specific column in the imported data
+          with a specific field in the display of a transaction in an account register. At a minimum to import data, columns in the 
+          imported data containing the following information <emphasis role="bold">must</emphasis> be specified:
+      </para>
+      <itemizedlist>
+        <listitem><para><emphasis role="bold">Date </emphasis>of transaction;</para></listitem>
+        <listitem><para><emphasis role="bold">Account</emphasis> into which transaction is to be imported (or alternatively set the base account as above);</para></listitem>
+        <listitem><para><emphasis role="bold">Description</emphasis> of the transaction;</para></listitem>
+        <listitem><para><emphasis role="bold">Deposit or Withdrawal</emphasis> column.</para></listitem>
+      </itemizedlist>
+      <para>The <emphasis role="bold">Skip Errors</emphasis> check box will skip trying to import any rows with errors in matching the columns.
+      </para>
+      <para>When you are happy with all the import settings, <link linkend="importing-csv-save">save</link> them
+           if you will use the same settings again, then press the <emphasis role="bold">Next</emphasis> button. 
+          This will bring up a window which allows you to map the accounts identified in the account column (Account Id) with accounts 
+          in the GnuCash account tree (Account name). Double click on a row to bring up a dialog to select the matching GnuCash account. 
+          When you have selected a match for all accounts, click on the <emphasis role="bold">Next</emphasis> button.
+      </para>
+      <para>The Transaction Information panel allows review of data entry settings so far.
+      </para>
+      <para>Clicking on Match Transactions will then bring up the main <link linkend="importing-matcher">Import Matcher</link>
+            window described in the next section.
+      </para>
+    </sect3>
+  </sect2>
+
+  <sect2 id="importing-mt940">
+    <title>Import MT940</title>
+    <para>Use this option to import MT940 data.</para>
+  </sect2>
+
+  <sect2 id="importing-mt942">
+    <title>Import MT942</title>
+    <para>Use this option to import MT942 data.</para>
+  </sect2>
+
+  <sect2 id="importing-dtaus">
+    <title>Import DTAUS</title>
+    <para>Use this option to import DTAUS data.</para>
+  </sect2>
+</sect1>
 </chapter>
diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index 8a6e351..5a7bfd4 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -862,267 +862,6 @@ Translators:
     to print the check.</para>
 
   </sect1>
-  <sect1 id="trans-import">
-    <title>Importing Transactions from Files</title>
-    
-    <para>Imported transactions will generally be to a specific account in your account tree. In the following 
-            this will be referred to as the <emphasis role="bold">import</emphasis> or 
-            <emphasis role="bold">base</emphasis> account. It may or may not be
-            specified in the data being imported depending on the import format. It is usually the first split
-            of a transaction being imported.
-    </para>
-    <para>All transactions will also need to have a <emphasis role="bold">destination</emphasis> account for 
-            at least a matching splits. This may or may not be supplied in the imported data. If it is not,
-            an account can be assigned on the basis of the previous import history by matching to infomation in
-            the imported data. The user may always over-ride this assignment.
-    </para>
-    <para>Multi-split data previously exported from GnuCash may have both the import and destination accounts
-            for transaction splits specified in the data file.
-    </para>
-    <sect2>
-      <title>Import Formats</title>
-      <para>Gnucash allows transactions to be imported in the following formats:</para>
-        <itemizedlist>
-          <listitem><para><emphasis role="bold"><link linkend="trans-import-qif">QIF</link></emphasis> 
-               (.qif) Quicken Interchange format - import data from Quicken financial software;</para></listitem>
-          <listitem><para><emphasis role="bold"><link linkend="trans-import-ofx">OFX/QFX</link></emphasis> 
-               (.ofx,.qfx) Open Financial eXchange format (QXF is an Intuit/Quicken proprietary version of OFX);
-          </para></listitem>
-          <listitem><para><emphasis role="bold"><link linkend="trans-import-csv">CSV</link></emphasis> 
-               (.csv)  Comma Separated Values;</para></listitem>
-        </itemizedlist>
-      
-      <para>These import methods can be accessed from the <emphasis role="bold">Import</emphasis> submenu
-            of the main menu <emphasis role="bold">File</emphasis> entry, along with methods for importing
-            other types of data. Select the appropriate entry in the <emphasis role="bold">Import</emphasis>
-            sub menu to initiate importing transactions.
-      </para>      
-    </sect2>
-    <sect2 id="trans-import-qif">
-      <title>Import QIF</title>
-      <para>To import data from Quicken®, MS Money, or other programs that use QIF(Quicken® Interchange Format),
-            you must first export your data to a QIF file. One way to do this is to export each account as a 
-            separate QIF file. An easier way, available in Quicken® 98 and beyond, is to export all accounts at
-            once into a single QIF file. Check your program's manual to determine if this option is available.
-      </para>
-      <sect3><title>To import QIF files:</title><para> </para></sect3>
-      <sect3>
-        <title>Load all of the QIF files containing data you wish to import</title>
-        <para>To do this, select <emphasis role="bold">File -> Import -> Import QIF...</emphasis> from the menu. When the QIF Import dialog
-              box appears, click <emphasis role="bold">Next</emphasis> and follow the instructions to guide you through the process of loading
-              your files.
-        </para>
-        <para>This image shows the start of the QIF Import Druid.<!--FIXME put an image of the import druid in --> </para>
-        <para>You will be prompted for a filename to load. Use the Select button to select your QIF file and
-             click Next to load it. Once the file is loaded, select Load another file if you have more files 
-             to load. When you have loaded all your QIF files, click Next to continue with the import process.
-        </para>
-      </sect3>
-      <sect3>
-        <title>Review the GnuCash accounts to be created.</title>
-        <para>The importer then matches up your QIF accounts and categories with GnuCash accounts and gives 
-              you a brief description of the matching process. Clicking Next will bring you to a view comparing
-              your QIF accounts with the corresponding GnuCash accounts created. To change an account name, select
-              the row containing that account name and edit the name in the dialog box provided. Click Next when 
-              you have finished making changes, and proceed through a similar category matching process. QIF 
-              income and expense categories import as GnuCash income and expense accounts <!--(see section 3.1 FIXME for 
-              more on this).--> Make changes to these account names if necessary, and click Next to continue.
-        </para>
-        <para><emphasis role="bold">Note:</emphasis> If you are not sure what changes are needed, it is safe to
-              accept the GnuCash account names. It is easy to edit the accounts later if you find you need to make
-              a change.
-        </para>
-        <para>From the drop-down list, select a standard currency to be used for the  imported accounts and click <emphasis role="bold">Next</emphasis>
-              to continue. If you have stocks, mutual funds, or other securities, you will be prompted for additional
-              information. The importer dialog 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 <emphasis role="bold">Next</emphasis> to continue.
-        </para>
-      </sect3>
-      <sect3>
-        <title>Tell GnuCash to import the data.</title>
-        <para>The last step is the import. Once you have verified your account names and investment information, 
-              click <emphasis role="bold">Finish</emphasis> in the Update your GnuCash accounts 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, GnuCash will return you 
-              to the main window, which should now display the names of the accounts you imported.
-        </para>
-      </sect3>
-    </sect2>
-    <sect2 id="trans-import-ofx">
-      <title>Import OFX/QFX</title>
-      <para>This opens a file selection dialog. Navigate to the file you wish to import, select a file with 
-        the appropriate extension (.ofx  or .qfx), then press the <emphasis role="bold">Import</emphasis> button.</para>
-      <para>Gnucash opens an Account Selection dialog to select an account in your CoA corresponding to data source. Select
-        the appropriate account from the account tree and press the <emphasis role="bold">OK</emphasis> button. On subsequent import of files from the 
-        same source (identified by tags in the file), the source is remembered and the account selection dialog is not
-        displayed.</para>
-      <para>The generic import transaction matcher dialog is opened next. See the <link linkend="trans-import-matcher">
-            Import Matcher</link> section (common to both OFX/QFX and CSV import formats) following the Import CSV
-            section to continue the import process.
-      </para>      
-    </sect2>
-    <sect2 id="trans-import-csv">
-      <title>Import CSV</title>
-      <para>Clicking on <emphasis role="bold">Import CSV</emphasis> in the Import menu will bring up the Import Assistant dialog. The first step brings up a file selection 
-            dialog. Navigate to the location where the file you wish to import is located and select the file to import then click the 
-            <emphasis role="bold">OK</emphasis> button.
-      </para>
-      <para>The next window will allow you to set parameters for the importing of the file. All widgets have tooltips which explain what 
-            the setting affects and the options for the setting.
-      </para> 
-      <sect3 id="trans-import-csv-save">
-          <title>Load and Save Settings</title>
-          <para>If this import is a regular occurrence, once you have set the other import paramters, you can save these settings by typing
-                in a setting name in the <emphasis role="bold">Load and Save Settings Entry</emphasis> combo box and pressing the <emphasis role="bold">Save</emphasis> button just to the right of the box. 
-                Previously defined settings can be retrieved by selecting the appropriate setting name from the dropdown list activated by
-                the down arrow at the right end of the text box. The trash can button to the right of the Save button can be used to remove
-                the settings selected from the drop down list for the box. The settings group <emphasis role="bold">"GnuCash Export Settings"</emphasis> define a setting 
-                group for the export and reimport of GnuCash transaction data - use this if importing data previously exported from GnuCash.
-          </para>
-      </sect3>
-      <sect3>
-        <title>Account</title>
-        <para>This combo box allows you to select the base or import account into which the transactions will be imported.  It may be left unset
-              if the imported data contains a column listing the accounts associated with each split or the import data
-              specifies the account for first split of the transaction.</para>
-      </sect3>
-      <sect3>
-        <title>File Format</title>
-        <para>This section allows you to define whether the file has:
-        </para>
-        <itemizedlist>
-          <listitem>
-            <para><emphasis role="bold">Fixed width columns</emphasis> Selecting this radio button will allow you to define 
-                 column boundaries by double clicking at the appropriate positions in the sample records displayed in the 
-                 panel below. Single clicking in a column will narrow, widen or merge the column.
-            </para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Separators</emphasis> Selecting this radio button will allow you to define characters
-                  which will be used to distinguish columns in the input file. The default is comma separated however spaces,
-                  tabs,colons or semicolons or any combination of them may be used to separate columns in the input file by 
-                  selecting the appropriate check boxes. You may also define custom separators by typing the required characters
-                  into the text box and selecting the <emphasis role="bold">Custom</emphasis> checkbox. This may be used in combination with any of the 
-                  predefined separators.
-            </para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Multi-split</emphasis> Selecting this check box allows the splits for a single transaction
-                 to be defined on consecutive lines within the file with each line defining a single split. If not selected each
-                 line is assumed to contain the information for a single transaction including one or two splits.
-            </para>
-          </listitem>                  
-        </itemizedlist>
-      </sect3>
-      <sect3>
-        <title>Miscellaneous</title>
-        <para>The miscellaneous settings allow you to set:
-        </para>
-        <itemizedlist>
-          <listitem><para><emphasis role="bold">Encoding</emphasis> This is usually the UTF-8 variant for your locale;</para></listitem>
-          <listitem><para><emphasis role="bold">Date Format</emphasis> This does not default to the Locale setting so check it matches the data you are importing;</para></listitem>
-          <listitem><para><emphasis role="bold">Currency Format</emphasis>;</para></listitem>
-          <listitem><para><emphasis role="bold">Leading Lines to Skip</emphasis>;</para></listitem>
-          <listitem><para><emphasis role="bold">Trailing Lines to Skip</emphasis>;</para></listitem>
-          <listitem><para><emphasis role="bold">Skip alternate lines</emphasis>;</para></listitem>
-          </itemizedlist>
-         <para>to match the settings for the file you are importing. Tooltips may also contain information on the setting and options.</para>
-      </sect3>
-      <sect3>
-        <title>Import Panel</title>
-        <para>The import panel shows the data being imported as it is interpreted using the settings chosen to define columns and formats.
-            The dropdown lists in the headers for each column of the import allow you to associate a specific column in the imported data
-            with a specific field in the display of a transaction in an account register. At a minimum to import data, columns in the 
-            imported data containing the following information <emphasis role="bold">must</emphasis> be specified:
-        </para>
-        <itemizedlist>
-          <listitem><para><emphasis role="bold">Date </emphasis>of transaction;</para></listitem>
-          <listitem><para><emphasis role="bold">Account</emphasis> into which transaction is to be imported (or alternatively set the base account as above);</para></listitem>
-          <listitem><para><emphasis role="bold">Description</emphasis> of the transaction;</para></listitem>
-          <listitem><para><emphasis role="bold">Deposit or Withdrawal</emphasis> column.</para></listitem>
-        </itemizedlist>
-        <para>The <emphasis role="bold">Skip Errors</emphasis> check box will skip trying to import any rows with errors in matching the columns.
-        </para>
-        <para>When you are happy with all the import settings, <link linkend="trans-import-csv-save">save</link> them
-             if you will use the same settings again, then press the <emphasis role="bold">Next</emphasis> button. 
-            This will bring up a window which allows you to map the accounts identified in the account column (Account Id) with accounts 
-            in the GnuCash account tree (Account name). Double click on a row to bring up a dialog to select the matching GnuCash account. 
-            When you have selected a match for all accounts, click on the <emphasis role="bold">Next</emphasis> button.
-        </para>
-        <para>The Transaction Information panel allows review of data entry settings so far.
-        </para>
-        <para>Clicking on Match Transactions will then bring up the main <link linkend="trans-import-matcher">Import Matcher</link>
-              window described in the next section.
-        </para>
-      </sect3>
-    </sect2>
-    <sect2 id="trans-import-matcher">
-      <title>Import Matcher</title>
-      <para>The Import Matcher uses a Bayesian approach to assign a destination account, if it is not specified in 
-          the imported data, to each imported transaction based on the previous import history of the import account.
-          It also attempts to match the transactions being imported to any existing transactions
-          based on the date and the description fields<!-- FIXME add any other fields used in matching -->.
-      </para>
-      <para>Transaction rows which match existing transactions already in the import account are flagged not to be imported. They 
-        will have a light green background and the A and U+R checkboxes will be unchecked and the R checkbox will be 
-        checked. To override and import the transaction, check the A checkbox. The U and R boxes will be unchecked 
-        automatically. The reliability of the match is indicated by a bar display in the Info column. If a destination
-        account for the second split is assigned by the matcher if will be appended to the info column.
-      </para>
-      <para>Transaction rows which do not match existing transactions in the import account, for which an assignment
-        of a destination account cannot be made on the basis of the previous import history to the account, will be 
-        displayed with an orange-yellow background and the A box will be checked and U+R and R unchecked. A destination 
-        account must be specified for these transactions.
-      </para>
-     <sect3><title>Assign a Destination Account to a Single Transaction</title>
-        <para>The currently selected row is selected by Left-clicking it. It is displayed with a mid dark green background.</para>
-        <para><emphasis role="bold">Double click</emphasis> on a row. This will select it and open an Account Selection
-              dialog. Select the desired destination account in the dialog and click <emphasis role="bold">OK</emphasis>. The row 
-              background will change to a light green and the assigned destination account will be displayed 
-              in the Info column.
-        </para>
-        <para>or alternatively, <emphasis role="bold">Left-click</emphasis> on a row to select it followed by a 
-           <emphasis role="bold">Right-click </emphasis>to bring up a popup menu then select
-          "Assign a transfer account" to display the Account Selection dialog, select the destination account and
-           click the <emphasis role="bold">OK</emphasis> button.
-        </para>
-      </sect3>
-      <sect3>
-        <title>Assign a Destination Account to Multiple Transaction</title>
-        <para>Sometimes you will have several transactions which will have the same destination account. Gnucash
-              allows you to select multiple transactions and apply the same destination account to all transactions
-              in the selection.
-        </para>
-        <para>Rows in a selection are displayed with a mid dark green background.</para>
-        <para>Multiple rows may be selected to have the same destination account assigned to them.</para>
-        <para>To select rows either:</para>
-        <itemizedlist>
-          <listitem><para><emphasis role="bold">Left click</emphasis> on first row and then 
-          <emphasis role="bold">Ctrl-Left click</emphasis> on other rows to add to the selection or</para></listitem>
-          <listitem><para><emphasis role="bold">Left-click</emphasis> on a first row and then 
-          <emphasis role="bold">Shift-Left-click</emphasis> on another row to select all rows between them.</para></listitem>
-        </itemizedlist>
-        <para>then <emphasis role="bold">Right-click</emphasis> to display a popup menu and then select 
-          <emphasis role="bold">"Assign a transfer account"</emphasis> to open the Account 
-           Selection dialog. Select the desired destination account and click the <emphasis role="bold">OK</emphasis>
-           button in the Account Selection dialog.</para>
-      </sect3>
-      <sect3>
-        <title>Completing the Import</title>
-      <para>Once you have assigned destination accounts for all the imported transactions using the above methods 
-        (all row backgrounds will be a light green colour), check that the assigned destination acounts are correct 
-        and then press the <emphasis role="bold">OK</emphasis> button at the bottom of the Generic Import Matcher 
-        window. The transactions selected for import will have their splits added to the selected source 
-        and destination accounts.
-      </para>
-      <para>The choices made for the destination accounts and description/memo fields are remembered and stored and 
-        used for future imports to the same account to automatically assign a destination account for transaction 
-        records not containing destination account information.
-      </para>
-      </sect3>
-    </sect2>
-  </sect1>
 
   <sect1 id="trans-online">
     <title>Online Actions ...</title>

commit cdd8d9a9db33105bb3ec5c33903f14d97ac95a58
Author: David Thomas <sunfish62 at yahoo.com>
Date:   Tue Mar 26 17:52:09 2019 +0100

    Merge 'Basics - Getting Help' in 'Overview - Getting More Help'

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 3733c50..0cad3e4 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -684,73 +684,6 @@
     </sect2>
   </sect1>
 
-  <sect1 id="basics-help1">
-    <title>Getting Help</title>
-
-    <para><application>&app;</application> offers help in many ways. We have already covered the <link linkend="basics-tip2">
-    <guilabel>Tip of the Day</guilabel></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>
-
-    <sect2 id="basics-manual2">
-      <title>Help Manual</title>
-
-      <para>Once you have opened <application>&app;</application>, you will see the <guilabel>Account
-      Tree</guilabel> window <guilabel>Help</guilabel> menu heading, which
-      opens the Help manual. The Help manual is organized by topic, and
-      you can expand each topic into its subtopics.</para>
-
-      <para>Topics are listed on the left side. To select a topic or subtopic,
-      click on it, and you should see the text for that topic appear on the
-      right. Use the <guibutton>Back</guibutton> and
-      <guibutton>Forward</guibutton> buttons to navigate through your topic
-      choices, and print any text using the <guibutton>Print</guibutton>
-      button.</para>
-    </sect2>
-
-    <sect2 id="basics-web2">
-      <title>Web Access</title>
-
-      <para>The <guilabel>&app; Help</guilabel> window also acts as a simple
-      web browser, so you can pull up a website for additional information.
-      You can open any website under this window by clicking the
-      <guibutton>Open</guibutton> <emphasis>Toolbar</emphasis> 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
-      browser.</para>
-
-      <para>The <ulink
-      url="https://www.gnucash.org"><citetitle>&app;</citetitle> website</ulink>
-      contains helpful information about the program and about any
-      updates to it. It also contains links to the <application>&app;</application> mailing lists for
-      developers and users, and you can search the <ulink
-      url="https://lists.gnucash.org/cgi-bin/namazu.cgi"><citetitle>archives
-      of <application>&app;</application> mailing lists</citetitle></ulink> for discussions on a
-      particular topic. If you don’t find the answers you are looking for, you
-      can post your question to the <ulink
-      url="https://lists.gnucash.org/mailman/listinfo/gnucash-user"><citetitle>&app;
-      user list</citetitle></ulink>, and someone on the list will attempt to
-      answer you.</para>
-
-      <para>The most updated <guilabel>&app; FAQ</guilabel> is also located
-      on the <ulink url="https://wiki.gnucash.org/wiki/FAQ"><citetitle>&app;
-      FAQ website</citetitle></ulink>, and contains answers to the popular
-      questions.</para>
-    </sect2>
-
-    <sect2 id="basics-topic2">
-      <title>Topic Search</title>
-
-      <para>The online manual also provides a search function. To search for a
-      particular topic, click the <guilabel>Search</guilabel> tab at the
-      bottom of the help window and type in your topic in the field provided.
-      Click the <guibutton>Search</guibutton> button to complete your search.
-      A list of choices should appear in the box below, clicking a choice will
-      bring up its text on the right.</para>
-    </sect2>
-  </sect1>
-
   <sect1 id="basics-files1">
     <title>Storing your financial data</title>
 	<sect2 id="basics-files1-overview">
diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index ec8bb04..7d748c7 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -445,16 +445,35 @@
 
   <sect1 id="more_help">
     <title>Getting More Help</title>
+
+    <para><application>&app;</application> offers help in many ways, including the <link linkend="basics-tip2">
+    <guilabel>Tip of the Day</guilabel></link>, context help, a website, a wiki, the mailing lists, and IRC chat.</para>
+
     <sect2 id="online_help">
-      <title>Online Help</title>
-      <para>The online help is the counterpart to this guide. It
-      provides the detailed instructions for using
+      <title>Context Help</title>
+      <para>The context help provides detailed instructions for using
       <application>&app;'s</application> menus, windows, and
       controls. To open online help, select <menuchoice><guimenu>Help</guimenu>
       <guimenuitem>Contents</guimenuitem></menuchoice>.</para>
+      <para>The <guilabel>&app; Help</guilabel> window also acts as a simple
+      web browser, so you can pull up a website for additional information.
+      You can open any website under this window by clicking the
+      <guibutton>Open</guibutton> <emphasis>Toolbar</emphasis> 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
+      browser.</para>
+    </sect2>
 
-   </sect2>
-   <sect2 id="wiki">
+    <sect2 id="website">
+      <title><application>&app;</application> Website</title>
+      <para>The <ulink
+      url="http://www.gnucash.org"><citetitle>&app;</citetitle></ulink> website
+      contains helpful information about the program and about any
+      updates to it. It also contains links to other online resources.</para>
+    </sect2>
+
+    <sect2 id="wiki">
      <title><application>&app;</application> Wiki</title>
      <para>An immense amount of less-formal documenation, both of
      <application>&app;</application> itself and its maintenance and
@@ -490,8 +509,19 @@
         to additional useful resources such as the <application>&app;</application> wiki
         and bug tracking system.</para>
     </sect2>
+    <sect2 id="topic-search">
+      <title>Topic Search</title>
+
+      <para>The online manual also provides a search function. To search for a
+      particular topic, click the <guilabel>Search</guilabel> tab at the
+      bottom of the help window and type in your topic in the field provided.
+      Click the <guibutton>Search</guibutton> button to complete your search.
+      A list of choices should appear in the box below, clicking a choice will
+      bring up its text on the right.</para>
+    </sect2>
+
   </sect1>
-  
+
   <sect1 id="oview-install1">
     <title>Installation</title>
 

commit 4ed28fad55706cc140bc072fc908c0fa55ee8f63
Author: David Thomas <sunfish62 at yahoo.com>
Date:   Tue Mar 26 17:43:56 2019 +0100

    Bug 796855 Bringing Chapter 3 of Help into Chapter 2 of Guide - step 4
    
    Make the necessary editorial changes to better integrate the moved sections into the guide.

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index c913241..3733c50 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -304,33 +304,34 @@
   <sect1 id="basics-running-gnucash">
     <title>Running <application>&app;</application></title>
     <para><application>&app;</application> can be run from your desktop main menu by selecting the associated menu entry.</para>
-    <para>Alternatively it can be run from a shell (command line) with the command <command>gnucash</command>.</para>
+    <para>Alternatively it can be run from a command line prompt with the command <command>gnucash</command>.</para>
 
-    <para>During the loading of the <application>&app;</application> main window you will see the
-    <emphasis>&app; Splash Screen</emphasis> where some information
-    about the program itself and the loading process are displayed.</para>
+    <para>During start up, <application>&app;</application> will display the
+    Splash Screen, where some information about the program (version number, build, etc.)
+    and the loading process are displayed.</para>
 
-    <sect2 id="welcome-to-gnucash">
+    <sect2 id="basics-welcome-to-gnucash">
     <title><guilabel>Welcome to &app;</guilabel> dialog</title>
-    <para>Next you will be presented with
-    the <guilabel>Welcome to &app;!</guilabel> dialog with three choices:</para>
+    <para>The very first time you open <application>&app;</application>, you will see the
+    <guilabel>Welcome to &app;!</guilabel> screen. This dialog includes three choices:</para>
+    <!-- Recommend screen shot here of Welcome to GnuCash! dialog -->
 
-      <itemizedlist id="CreateAccounts">
+      <itemizedlist id="welcome-screen-options">
         <listitem>
-          <para><guilabel>Create a new set of accounts:</guilabel> Runs the
+          <para><guilabel>Create a new set of accounts</guilabel> - Runs the
           <guilabel>New Account Hierarchy Setup</guilabel> assistant (see <xref linkend="basics-acct-hierarchy"/>). Select
           this option if you want to be assisted in creating a set of accounts.</para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Import my QIF files:</guilabel> Runs the
+          <para><guilabel>Import my QIF files</guilabel> - Runs the
           <guilabel>Import QIF Files</guilabel> assistant (see <xref linkend="importing-qif"/>). Select this option
-          if you already have Quicken files (<filename>.qif</filename> files) from another
-          financial application and wish to import them into <application>&app;</application>.</para>
+          if you already have Quicken files (<filename>.qif</filename> files) and wish
+          to import them into <application>&app;</application>.</para>
         </listitem>
 
         <listitem>
-            <para><guilabel>Open the new user tutorial:</guilabel>
+            <para><guilabel>Open the new user tutorial</guilabel> -
             Opens the <application>&app;</application> Tutorial and Concepts Guide. Select this
             option if you are completely new to <application>&app;</application> and
             accounting concepts.</para>
@@ -338,82 +339,45 @@
       </itemizedlist>
 
       <note>
-        <para>It is possible to run these items after you have made a choice here,
+        <para>It is possible to access each of these items after you have left this screen,
         but the <guilabel>Welcome to &app;!</guilabel> screen will not reappear.
-        To try one of the other choices later, read
-        <xref linkend="basics-acct-hierarchy" />, <xref linkend="importing-qif" /> and
-        <xref linkend="tutorial" /> to see how to start them from the
-        <application>&app;</application> menu.</para>
+        To create a new set of accounts, see <xref linkend="basics-acct-hierarchy" />. To import
+        QIF files, see <xref linkend="importing-qif" />.</para>
       </note>
-
-      <para>The very first time you open <application>&app;</application>, you will see the
-      <guilabel>Welcome to &app;!</guilabel> 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 screen boxes you will
-      see.</para>
     </sect2>
 
     <sect2 id="basics-acct-hierarchy">
       <title>New Account Hierarchy Setup</title>
 
-      <para>This assistant helps you to create a set of <application>&app;</application> accounts. It will
+      <para>The <emphasis>New Account Hierarchy Setup</emphasis> assistant helps you
+      to create a set of <application>&app;</application> accounts. It will
       appear if you choose <guibutton>Create a new set of accounts</guibutton>
-      in the <guilabel>Welcome to &app;!</guilabel> menu.</para>
-      <para>This will create a new blank <application>&app;</application> file and then automatically start
-      the <guilabel>New Account Hierarchy Setup</guilabel> assistant.</para>
-
-      <tip>
-          <para>To start this assistant manually, go to <menuchoice><guimenu>File</guimenu>
-                  <guimenuitem>New</guimenuitem></menuchoice> if you need to create a new file.
-              If you want to run the assistant within the opened file, go to
-              <menuchoice><guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy...</guimenuitem></menuchoice>
-              when the accounts tree tab is displayed.</para>
-      </tip>
+      in the <guilabel>Welcome to &app;!</guilabel> menu, or when you select
+      <menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem></menuchoice>.</para>
+      <para>This assistant will create a new blank <application>&app;</application> file and
+      guide you through the creation of a <emphasis>Chart of Accounts</emphasis>. There are several
+      steps in the assistant, which are outlined below.</para>
 
       <orderedlist>
           <listitem>
-              <para>The <guilabel>New Account Hierarchy Setup</guilabel> assistant opens
-              with a screen that briefly describes what this assistant does. The three
-              buttons at the very bottom of the screen will not change while using the
-              assistant.</para>
-              <itemizedlist>
-                  <listitem>
-                      <para><guibutton>Cancel:</guibutton> exit the process and cancel creating
-                      a new set of accounts.</para>
-                      <warning>
-                          <para>If you click this button, any selections you have made up to
-                          this point will be lost.</para>
-                      </warning>
-                  </listitem>
-                  <listitem>
-                      <para><guibutton>Back:</guibutton> brings up the previous screen so
-                      that you can change a previous selection until the first screen.</para>
-                  </listitem>
-                  <listitem>
-                      <para><guibutton>Forward:</guibutton> brings up the next
-                      screen so you can continue through the assistant.</para>
-                  </listitem>
-              </itemizedlist>
+              <para>The first screen briefly describes what this assistant does. </para>
           </listitem>
           <listitem>
-              <para>The next screen allows you to <guilabel>Choose Currency</guilabel>
-              to use as default for your accounts.</para>
-              <itemizedlist>
-                  <listitem>
-                      <para>The <guilabel>Currency:</guilabel> drop down list defaults to the currency
-                      configured in the <guilabel>Accounts</guilabel> tab under
-                      <guilabel>&app; Preferences</guilabel> (see <xref linkend="configuring-preferences-accounts"/>). If you wish your accounts to
-                      use a different default currency, select one from the list.</para>
-                  </listitem>
-                  <listitem>
-                      <para>The <guibutton>Forward </guibutton>button is used to confirm
-                      your selection and continue to the next screen.</para>
-                  </listitem>
-              </itemizedlist>
+              <para><guilabel>New Book Options</guilabel> allows you to set different attributes
+              for your file that affect the file as a whole. This screen has four tabs:
+              Accounts, Budgeting, Business, and Counters. These items are explained elsewhere in
+              the Guide, and can be changed at a later point.</para>
+          </listitem>
+          <listitem>
+              <para><guilabel>Choose Currency</guilabel> sets the default currency for new accounts.
+              This is based on the computer locale settings, and can be modified later in the
+              <guilabel>Accounts</guilabel> tab under <guilabel>Preferences</guilabel>
+              (see <xref linkend="configuring-preferences-accounts"/>).</para>
           </listitem>
           <listitem>
-              <para>The next screen is used to <guilabel>Choose accounts to create</guilabel>.</para>
-              <para>You will see a screen divided into three parts.</para>
+              <para><guilabel>Choose accounts to create</guilabel> allows you to create
+              an initial set of accounts. These can be edited as needed afterward.
+              The screen is divided into three parts.</para>
               <itemizedlist>
                   <listitem>
                       <para>The left upper portion has a list of
@@ -429,34 +393,26 @@
                   </listitem>
                   <listitem>
                       <para>The right side has a list of the <guilabel>Accounts</guilabel>
-                      that will be created from the selected category.</para>
-                  </listitem>
-                  <listitem>
-                      <para>The <guibutton>Select All</guibutton> button allows you to
-                      include all of the account categories.</para>
-                  </listitem>
-                  <listitem>
-                      <para>The <guibutton>Clear All </guibutton>button allows you to
-                      deselect all of the categories selected.</para>
+                      that will be created from a selected category. Note that the accounts
+                      listed here are <emphasis>only</emphasis> the selected category; your
+                      final data file will include <emphasis>all</emphasis> of the accounts
+                      for all of the selected Categories.</para>
                   </listitem>
               </itemizedlist>
           </listitem>
           <listitem>
-              <para>The next screen allows you to <guilabel>Setup selected accounts</guilabel>
-              by entering the opening balances and by selecting if the account is a placeholder.</para>
+              <para><guilabel>Setup selected accounts</guilabel> lists all the accounts you
+              selected on <guilabel>Choose accounts to create</guilabel>, and allows you to
+              enter opening balances and to designate <emphasis>Placeholder</emphasis> accounts.</para>
               <note>
-                  <para>Equity accounts do not have opening balances so the
-                      opening balance value for this kind of accounts
-                      is locked and set to <guilabel>zero</guilabel> by
-                      <application>&app;</application></para>
+                  <para>Equity accounts do not have opening balances, so the
+                      opening balance value for this kind of account
+                      is locked and set to zero.</para>
               </note>
               <note id="placeholder-acct">
                   <para><emphasis>Placeholder</emphasis> accounts are used to create a hierarchy of accounts and
                   normally do not have transactions or opening balances.</para>
               </note>
-              <para>Follow the instructions in the display on how to select the
-              account and entering an opening balance for the account. A single
-              click is used to highlight an account.</para>
               <itemizedlist>
                   <listitem>
                       <para>The left side of the screen has a list of <guilabel>Account
@@ -475,30 +431,14 @@
               </itemizedlist>
           </listitem>
           <listitem>
-              <para>The <guilabel>Finish account setup</guilabel> is the last screen and
-              gives you a final list of the three choices to finish the assistant.</para>
-              <itemizedlist>
-                  <listitem>
-                      <para><guibutton>Cancel:</guibutton> exits the assistant and cancels creating
-                      a new set of accounts.</para>
-                      <warning>
-                          <para>If you click this button, any selections you have made up to
-                          this point will be lost.</para>
-                      </warning>
-                  </listitem>
-                  <listitem>
-                      <para><guibutton>Back:</guibutton> brings up the previous screen so
-                      that you can change a previous selection until the first screen.</para>
-                  </listitem>
-                  <listitem>
-                      <para><guibutton>Apply:</guibutton> creates the accounts you have selected.</para>
-                  </listitem>
-              </itemizedlist>
+              <para><guilabel>Finish account setup</guilabel> is the last screen and
+              gives you a final option to cancel the process.</para>
+              <warning>
+                  <para>If you choose to cancel, any selections you have made up to
+                  this point will be lost.</para>
+              </warning>
           </listitem>
       </orderedlist>
-
-      <para>You should now have a hierarchy of accounts in your main <application>&app;</application>
-      account window.</para>
     </sect2>
 
     <sect2 id="basics-tip2">

commit c06064e984b6db000ce11e03d3f1e2834f21e76c
Author: David Thomas <sunfish62 at yahoo.com>
Date:   Tue Mar 26 17:38:56 2019 +0100

    Bug 796855 Bringing Chapter 3 of Help into Chapter 2 of Guide - step 3
    
    Pure whitespace cleanup to keep it separate from content changes.

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 97720d2..c913241 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -302,65 +302,65 @@
   </sect1> <!-- basics-entry1 -->
 
   <sect1 id="basics-running-gnucash">
-      <title>Running <application>&app;</application></title>
-      <para><application>&app;</application> can be run from your desktop main menu by selecting the associated menu entry.</para>
-      <para>Alternatively it can be run from a shell (command line) with the command <command>gnucash</command>.</para>
-
-      <para>During the loading of the <application>&app;</application> main window you will see the
-          <emphasis>&app; Splash Screen</emphasis> where some information
-          about the program itself and the loading process are displayed.</para>
-
-      <sect2 id="welcome-to-gnucash">
-          <title><guilabel>Welcome to &app;</guilabel> dialog</title>
-          <para>Next you will be presented with
-              the <guilabel>Welcome to &app;!</guilabel> dialog with three choices:</para>
-
-          <itemizedlist id="CreateAccounts">
-              <listitem>
-                  <para><guilabel>Create a new set of accounts:</guilabel> Runs the
-                      <guilabel>New Account Hierarchy Setup</guilabel> assistant (see <xref linkend="basics-acct-hierarchy"/>). Select
-                      this option if you want to be assisted in creating a set of accounts.</para>
-              </listitem>
-
-              <listitem>
-                  <para><guilabel>Import my QIF files:</guilabel> Runs the
-                      <guilabel>Import QIF Files</guilabel> assistant (see <xref linkend="importing-qif"/>). Select this option
-                      if you already have Quicken files (<filename>.qif</filename> files) from another
-                      financial application and wish to import them into <application>&app;</application>.</para>
-              </listitem>
-
-              <listitem>
-                  <para><guilabel>Open the new user tutorial:</guilabel>
-                      Opens the <application>&app;</application> Tutorial and Concepts Guide. Select this
-                      option if you are completely new to <application>&app;</application> and
-                      accounting concepts.</para>
-              </listitem>
-          </itemizedlist>
-
-          <note>
-              <para>It is possible to run these items after you have made a choice here,
-                  but the <guilabel>Welcome to &app;!</guilabel> screen will not reappear.
-                  To try one of the other choices later, read
-                  <xref linkend="basics-acct-hierarchy" />, <xref linkend="importing-qif" /> and
-                  <xref linkend="tutorial" /> to see how to start them from the
-                  <application>&app;</application> menu.</para>
-          </note>
-
-    <para>The very first time you open <application>&app;</application>, you will see the
-    <guilabel>Welcome to &app;!</guilabel> 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 screen boxes you will
-    see.</para>
+    <title>Running <application>&app;</application></title>
+    <para><application>&app;</application> can be run from your desktop main menu by selecting the associated menu entry.</para>
+    <para>Alternatively it can be run from a shell (command line) with the command <command>gnucash</command>.</para>
+
+    <para>During the loading of the <application>&app;</application> main window you will see the
+    <emphasis>&app; Splash Screen</emphasis> where some information
+    about the program itself and the loading process are displayed.</para>
+
+    <sect2 id="welcome-to-gnucash">
+    <title><guilabel>Welcome to &app;</guilabel> dialog</title>
+    <para>Next you will be presented with
+    the <guilabel>Welcome to &app;!</guilabel> dialog with three choices:</para>
+
+      <itemizedlist id="CreateAccounts">
+        <listitem>
+          <para><guilabel>Create a new set of accounts:</guilabel> Runs the
+          <guilabel>New Account Hierarchy Setup</guilabel> assistant (see <xref linkend="basics-acct-hierarchy"/>). Select
+          this option if you want to be assisted in creating a set of accounts.</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Import my QIF files:</guilabel> Runs the
+          <guilabel>Import QIF Files</guilabel> assistant (see <xref linkend="importing-qif"/>). Select this option
+          if you already have Quicken files (<filename>.qif</filename> files) from another
+          financial application and wish to import them into <application>&app;</application>.</para>
+        </listitem>
+
+        <listitem>
+            <para><guilabel>Open the new user tutorial:</guilabel>
+            Opens the <application>&app;</application> Tutorial and Concepts Guide. Select this
+            option if you are completely new to <application>&app;</application> and
+            accounting concepts.</para>
+        </listitem>
+      </itemizedlist>
+
+      <note>
+        <para>It is possible to run these items after you have made a choice here,
+        but the <guilabel>Welcome to &app;!</guilabel> screen will not reappear.
+        To try one of the other choices later, read
+        <xref linkend="basics-acct-hierarchy" />, <xref linkend="importing-qif" /> and
+        <xref linkend="tutorial" /> to see how to start them from the
+        <application>&app;</application> menu.</para>
+      </note>
+
+      <para>The very first time you open <application>&app;</application>, you will see the
+      <guilabel>Welcome to &app;!</guilabel> 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 screen boxes you will
+      see.</para>
     </sect2>
 
     <sect2 id="basics-acct-hierarchy">
       <title>New Account Hierarchy Setup</title>
 
       <para>This assistant helps you to create a set of <application>&app;</application> accounts. It will
-          appear if you choose <guibutton>Create a new set of accounts</guibutton>
-          in the <guilabel>Welcome to &app;!</guilabel> menu.</para>
+      appear if you choose <guibutton>Create a new set of accounts</guibutton>
+      in the <guilabel>Welcome to &app;!</guilabel> menu.</para>
       <para>This will create a new blank <application>&app;</application> file and then automatically start
-          the <guilabel>New Account Hierarchy Setup</guilabel> assistant.</para>
+      the <guilabel>New Account Hierarchy Setup</guilabel> assistant.</para>
 
       <tip>
           <para>To start this assistant manually, go to <menuchoice><guimenu>File</guimenu>
@@ -373,57 +373,47 @@
       <orderedlist>
           <listitem>
               <para>The <guilabel>New Account Hierarchy Setup</guilabel> assistant opens
-                  with a screen that briefly describes what this assistant does. The three
-                  buttons at the very bottom of the screen will not change while using the
-                  assistant.</para>
-
+              with a screen that briefly describes what this assistant does. The three
+              buttons at the very bottom of the screen will not change while using the
+              assistant.</para>
               <itemizedlist>
                   <listitem>
                       <para><guibutton>Cancel:</guibutton> exit the process and cancel creating
-                          a new set of accounts.</para>
+                      a new set of accounts.</para>
                       <warning>
                           <para>If you click this button, any selections you have made up to
-                              this point will be lost.</para>
+                          this point will be lost.</para>
                       </warning>
                   </listitem>
-
                   <listitem>
                       <para><guibutton>Back:</guibutton> brings up the previous screen so
-                          that you can change a previous selection until the first screen.</para>
+                      that you can change a previous selection until the first screen.</para>
                   </listitem>
-
                   <listitem>
                       <para><guibutton>Forward:</guibutton> brings up the next
-                          screen so you can continue through the assistant.</para>
+                      screen so you can continue through the assistant.</para>
                   </listitem>
               </itemizedlist>
-
           </listitem>
           <listitem>
-
               <para>The next screen allows you to <guilabel>Choose Currency</guilabel>
-                  to use as default for your accounts.</para>
-
+              to use as default for your accounts.</para>
               <itemizedlist>
                   <listitem>
                       <para>The <guilabel>Currency:</guilabel> drop down list defaults to the currency
-                          configured in the <guilabel>Accounts</guilabel> tab under
-                          <guilabel>&app; Preferences</guilabel> (see <xref linkend="configuring-preferences-accounts"/>). If you wish your accounts to
-                          use a different default currency, select one from the list.</para>
+                      configured in the <guilabel>Accounts</guilabel> tab under
+                      <guilabel>&app; Preferences</guilabel> (see <xref linkend="configuring-preferences-accounts"/>). If you wish your accounts to
+                      use a different default currency, select one from the list.</para>
                   </listitem>
-
                   <listitem>
                       <para>The <guibutton>Forward </guibutton>button is used to confirm
-                          your selection and continue to the next screen.</para>
+                      your selection and continue to the next screen.</para>
                   </listitem>
               </itemizedlist>
-
           </listitem>
           <listitem>
-
               <para>The next screen is used to <guilabel>Choose accounts to create</guilabel>.</para>
               <para>You will see a screen divided into three parts.</para>
-
               <itemizedlist>
                   <listitem>
                       <para>The left upper portion has a list of
@@ -432,90 +422,74 @@
                           use. You can select as many of the categories of accounts as you
                           wish.</para>
                   </listitem>
-
                   <listitem>
                       <para>The left lower section has a <guilabel>Category
-                              Description</guilabel> that displays a detailed description of the
+                          Description</guilabel> that displays a detailed description of the
                           category currently highlighted.</para>
                   </listitem>
-
                   <listitem>
                       <para>The right side has a list of the <guilabel>Accounts</guilabel>
-                          that will be created from the selected category.</para>
+                      that will be created from the selected category.</para>
                   </listitem>
-
                   <listitem>
                       <para>The <guibutton>Select All</guibutton> button allows you to
-                          include all of the account categories.</para>
+                      include all of the account categories.</para>
                   </listitem>
-
                   <listitem>
                       <para>The <guibutton>Clear All </guibutton>button allows you to
-                          deselect all of the categories selected.</para>
+                      deselect all of the categories selected.</para>
                   </listitem>
               </itemizedlist>
-
           </listitem>
           <listitem>
-
               <para>The next screen allows you to <guilabel>Setup selected accounts</guilabel>
-                  by entering the opening balances and by selecting if the account is a placeholder.</para>
-
+              by entering the opening balances and by selecting if the account is a placeholder.</para>
               <note>
                   <para>Equity accounts do not have opening balances so the
                       opening balance value for this kind of accounts
                       is locked and set to <guilabel>zero</guilabel> by
                       <application>&app;</application></para>
               </note>
-
               <note id="placeholder-acct">
                   <para><emphasis>Placeholder</emphasis> accounts are used to create a hierarchy of accounts and
-                      normally do not have transactions or opening balances.</para>
+                  normally do not have transactions or opening balances.</para>
               </note>
-
               <para>Follow the instructions in the display on how to select the
-                  account and entering an opening balance for the account. A single
-                  click is used to highlight an account.</para>
-
+              account and entering an opening balance for the account. A single
+              click is used to highlight an account.</para>
               <itemizedlist>
                   <listitem>
                       <para>The left side of the screen has a list of <guilabel>Account
-                              Names</guilabel>. Select an account by "clicking" once in the
-                          <guilabel>Account Names</guilabel> column with the account highlighted. This will open
-                          the account name for changes.</para>
+                      Names</guilabel>. Select an account by "clicking" once in the
+                      <guilabel>Account Names</guilabel> column with the account highlighted. This will open
+                      the account name for changes.</para>
                   </listitem>
-
                   <listitem>
                       <para>The right side of the screen has a check-box to make an
-                          account a <guilabel>Placeholder</guilabel> and a box to add the
-                          <guilabel>Opening Balance</guilabel> for the selected account. Again
-                          a single click in the <guilabel>Opening Balance</guilabel> or
-                          <guilabel>Placeholder</guilabel> column will
-                          open the field for changes.</para>
+                      account a <guilabel>Placeholder</guilabel> and a box to add the
+                      <guilabel>Opening Balance</guilabel> for the selected account. Again
+                      a single click in the <guilabel>Opening Balance</guilabel> or
+                      <guilabel>Placeholder</guilabel> column will
+                      open the field for changes.</para>
                   </listitem>
               </itemizedlist>
-
           </listitem>
           <listitem>
-
               <para>The <guilabel>Finish account setup</guilabel> is the last screen and
-                  gives you a final list of the three choices to finish the assistant.</para>
-
+              gives you a final list of the three choices to finish the assistant.</para>
               <itemizedlist>
                   <listitem>
                       <para><guibutton>Cancel:</guibutton> exits the assistant and cancels creating
-                          a new set of accounts.</para>
+                      a new set of accounts.</para>
                       <warning>
                           <para>If you click this button, any selections you have made up to
-                              this point will be lost.</para>
+                          this point will be lost.</para>
                       </warning>
                   </listitem>
-
                   <listitem>
                       <para><guibutton>Back:</guibutton> brings up the previous screen so
-                          that you can change a previous selection until the first screen.</para>
+                      that you can change a previous selection until the first screen.</para>
                   </listitem>
-
                   <listitem>
                       <para><guibutton>Apply:</guibutton> creates the accounts you have selected.</para>
                   </listitem>
@@ -524,7 +498,7 @@
       </orderedlist>
 
       <para>You should now have a hierarchy of accounts in your main <application>&app;</application>
-          account window.</para>
+      account window.</para>
     </sect2>
 
     <sect2 id="basics-tip2">

commit 48638656014cd93976c3dd236b45300afdf90247
Author: David Thomas <sunfish62 at yahoo.com>
Date:   Tue Mar 26 17:12:48 2019 +0100

    Bug 796855 Bringing Chapter 3 of Help into Chapter 2 of Guide - step 2
    
    Fix links in moved content.

diff --git a/guide/C/Makefile.am b/guide/C/Makefile.am
index 2770cfd..3b9c528 100644
--- a/guide/C/Makefile.am
+++ b/guide/C/Makefile.am
@@ -15,6 +15,8 @@ entities = \
 	ch_basics.xml \
 	ch_accts.xml \
 	ch_txns.xml \
+	ch_importing.xml \
+	ch_configuring.xml \
 	ch_cbook.xml \
 	ch_cc.xml \
 	ch_expenses.xml \
diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index c143e75..97720d2 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -318,13 +318,13 @@
           <itemizedlist id="CreateAccounts">
               <listitem>
                   <para><guilabel>Create a new set of accounts:</guilabel> Runs the
-                      <guilabel>New Account Hierarchy Setup</guilabel> assistant (see <xref linkend="acct-hierarchy"/>). Select
+                      <guilabel>New Account Hierarchy Setup</guilabel> assistant (see <xref linkend="basics-acct-hierarchy"/>). Select
                       this option if you want to be assisted in creating a set of accounts.</para>
               </listitem>
 
               <listitem>
                   <para><guilabel>Import my QIF files:</guilabel> Runs the
-                      <guilabel>Import QIF Files</guilabel> assistant (see <xref linkend="import-qif"/>). Select this option
+                      <guilabel>Import QIF Files</guilabel> assistant (see <xref linkend="importing-qif"/>). Select this option
                       if you already have Quicken files (<filename>.qif</filename> files) from another
                       financial application and wish to import them into <application>&app;</application>.</para>
               </listitem>
@@ -341,7 +341,7 @@
               <para>It is possible to run these items after you have made a choice here,
                   but the <guilabel>Welcome to &app;!</guilabel> screen will not reappear.
                   To try one of the other choices later, read
-                  <xref linkend="acct-hierarchy" />, <xref linkend="import-qif" /> and
+                  <xref linkend="basics-acct-hierarchy" />, <xref linkend="importing-qif" /> and
                   <xref linkend="tutorial" /> to see how to start them from the
                   <application>&app;</application> menu.</para>
           </note>
@@ -408,7 +408,7 @@
                   <listitem>
                       <para>The <guilabel>Currency:</guilabel> drop down list defaults to the currency
                           configured in the <guilabel>Accounts</guilabel> tab under
-                          <guilabel>&app; Preferences</guilabel> (see <xref linkend="prefs-accounts"/>). If you wish your accounts to
+                          <guilabel>&app; Preferences</guilabel> (see <xref linkend="configuring-preferences-accounts"/>). If you wish your accounts to
                           use a different default currency, select one from the list.</para>
                   </listitem>
 
diff --git a/guide/C/ch_configuring.xml b/guide/C/ch_configuring.xml
new file mode 100644
index 0000000..e148b9c
--- /dev/null
+++ b/guide/C/ch_configuring.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+
+<!--
+      (Do not remove this comment block.)
+  Version: 2.0.0
+  Last modified: December 7th 2009
+       modified: July 9th 2006
+  Maintainers:
+  Author:
+  		
+  Translators:
+               (translators put your name and email here)
+-->
+<chapter id="chapter_configuring">
+  <title>Configuring <application>&app;</application></title>
+
+  <para>This chapter will detail preference settings for <application>&app;</application>.</para>
+
+  <sect1 id="configuring-overview">
+    <title>Overview</title>
+
+    <para>Configuring is fun.</para>
+
+  </sect1>
+  <sect1 id="configuring-screens">
+    <title>Main Configuration Screens</title>
+
+		<para><application>&app;</application> stores settings in two main locations. </para>
+		<sect2 id="configuring-preferences-accounting-period">
+			<title>Preferences: Accounting Period Tab</title>
+			<para> Stuff about the Accounting Period tab</para>
+		</sect2>
+		<sect2 id="configuring-preferences-accounts">
+			<title>Preferences: Accounts Tab</title>
+			<para> Stuff about the Accounts tab. Need this stub for the link in The Basics. More later.</para>
+		</sect2>
+		<sect2 id="configuring-preferences-online-banking">
+			<title>Preferences: Online Banking</title>
+			<para> Stuff about the Accounts tab. Need this stub for the link in The Basics. More later.</para>
+		</sect2>
+  </sect1>
+  
+
+</chapter>
diff --git a/guide/C/ch_importing.xml b/guide/C/ch_importing.xml
new file mode 100644
index 0000000..92d1075
--- /dev/null
+++ b/guide/C/ch_importing.xml
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+
+<!--
+      (Do not remove this comment block.)
+  Version: 2.0.0
+  Last modified: December 7th 2009
+       modified: July 9th 2006
+  Maintainers:
+  Author:
+  		
+  Translators:
+               (translators put your name and email here)
+-->
+<chapter id="chapter_importing">
+  <title>Importing Data into <application>&app;</application></title>
+
+  <para>This chapter will detail procedures for importing data into <application>&app;</application>.</para>
+
+  <sect1 id="importing-overview">
+    <title>Overview</title>
+
+    <para>Importing stuff is fun.</para>
+
+  <sect2 id="importing-qif">
+    <title>Importing Quicken QIF Files</title>
+
+		<para>Many users seek to import their financial data from Quicken.</para>
+		<para>This Assistant helps you import Quicken <acronym>QIF</acronym> files. It will appear if
+		you choose <guibutton>Import my QIF files</guibutton> in the
+		<guilabel>Welcome to &app;!</guilabel> menu, as well as from <menuchoice><guimenu>File</guimenu>
+		<guisubmenu>Import ...</guisubmenu> <guimenuitem>Import QIF...</guimenuitem></menuchoice>.</para>
+
+	        <para>The import process involves several steps, which are presented in a 
+				series of screens that are described below.</para>
+
+	  <orderedlist>
+	  <listitem>
+
+	        <para><guilabel>Import QIF files</guilabel> screen briefly describes the assistant. 
+			The three buttons at the very bottom of the screen are used throughout the process
+	        to navigate.</para>
+
+	      <itemizedlist>
+	        <listitem>
+	          <para><guibutton>Cancel</guibutton>: exit the process and cancel importing
+	          <acronym>QIF</acronym> files.</para>
+	          <warning>
+	            <para>If you choose to cancel at any point in the assistant, any selections you have made up to
+	            this point will be lost.</para>
+	          </warning>
+	        </listitem>
+
+	        <listitem>
+	          <para><guibutton>Back</guibutton>: return to the previous screen.</para>
+	        </listitem>
+
+	        <listitem>
+	          <para><guibutton>Next</guibutton> move to the next screen.</para>
+	        </listitem>
+	      </itemizedlist>
+
+	  </listitem>
+	  <listitem>
+
+	        <para><guilabel>Select a QIF file to load</guilabel> allows you to choose the
+			source <acronym>QIF</acronym> file. The <guibutton>Select...</guibutton> button on this
+	        screen is used to access a list of files in your system. The
+	        <guibutton>Select...</guibutton> button brings up the <guilabel>Select
+	        QIF File</guilabel> dialog.</para>
+
+	        <para>Navigate to where you have stored your <acronym>QIF</acronym> files and select the
+	        first one then click <guibutton>Import</guibutton>. The next screen will
+	        display it in the <guilabel>Select a QIF File to Load</guilabel>
+	        field.</para>
+
+	        <note>
+	          <para>If the file you are loading does not have an <acronym>QIF</acronym> date listed
+	          in it you will see the <guilabel>Set a date format for this QIF file</guilabel>
+	          screen. Select the proper format from the pull down list and continue.</para>
+	        </note>
+
+	        <note>
+	          <para>If the file you are loading does not have an account name listed
+	          in it you will see the <guilabel>Set the default QIF account
+	          name</guilabel> screen. Otherwise you will skip this screen and go on
+	          to the screen in the next section that shows loaded <acronym>QIF</acronym> files.</para>
+
+	          <itemizedlist>
+	            <listitem>
+	              <para>The <guilabel>Account name:</guilabel> field is used to set
+	              an account name for this <acronym>QIF</acronym> file.</para>
+	            </listitem>
+	          </itemizedlist>
+	        </note>
+
+	  </listitem>
+	  <listitem>
+	        <para>The next screen shows you the <guilabel>QIF files you have
+	        loaded</guilabel>. You can use this screen to return to the previous
+	        screen and load more <acronym>QIF</acronym> files. It will also let you unload any files
+	        you have loaded by mistake.</para>
+
+	        <itemizedlist>
+	          <listitem>
+	            <para>The top panel shows the list of <guilabel>QIF Files</guilabel>
+	            you have loaded.</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The <guibutton>Load another file</guibutton> button takes you
+	            back to the previous screen to load another <acronym>QIF</acronym> file.</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The <guibutton>Unload selected file</guibutton> button allows you to
+	            select a file from the top panel and remove it from the list.</para>
+	          </listitem>
+	        </itemizedlist>
+
+	        <para>When you have selected all the <acronym>QIF</acronym> files to be imported, click the
+	        <guibutton>Forward</guibutton> button.</para>
+
+	  </listitem>
+	  <listitem>
+
+	        <para>Depending on the type of data contained in the
+	        <acronym>QIF</acronym> files to be imported, you may see only one or all of the following screens:</para>
+
+	  <variablelist termlength="8">
+	    <varlistentry>
+	    <term><guilabel>Accounts and stock holdings</guilabel></term>
+	      <listitem>
+	        <para>This screen gives a description of the <guilabel>Accounts and stock
+	        holdings</guilabel> matching process on the following <guilabel>Match QIF
+	        accounts with &app; accounts</guilabel> screen.</para>
+
+	        <tip>
+	          <para>This and other informational screens in the
+	          <guilabel>Import QIF files</guilabel> assistant
+	          can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
+	          under <guilabel>&app; Preferences</guilabel>.</para>
+	        </tip>
+
+	        <para>The next screen lets you <guilabel>Match QIF accounts with &app;
+	        accounts</guilabel>. You will see a list of <guilabel>QIF account
+	        names</guilabel> on the left and suggested <guilabel>&app; account
+	        names</guilabel> on the right. The <guilabel>New?</guilabel> column
+	        indicates if the <application>&app;</application> account name will be created by the <acronym>QIF</acronym>
+	        Import.</para>
+
+	        <para>To change the <application>&app;</application> account to a different one select the <acronym>QIF</acronym>
+	        account. A screen will pop up to select another account or create a new
+	        one.</para>
+
+	        <itemizedlist>
+	          <listitem>
+	            <para>Select an account from the list to choose a already existing
+	            account.</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The <guibutton>New Account</guibutton> button allows you to
+	            add a new account name as a sub-account (child of selected) of the
+	            selected account.</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The <guibutton>OK</guibutton> button is used to confirm your
+	            selection.</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The <guibutton>Cancel</guibutton> button is used to exit the
+	            dialog without using any changes you have made.</para>
+	          </listitem>
+	        </itemizedlist>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	    <term><guilabel>Income and Expense categories</guilabel></term>
+	      <listitem>
+	        <para>This screen gives a description of the <guilabel>Income and
+	        Expense categories</guilabel> matching process on the following <guilabel>Match
+	        QIF categories with &app; accounts</guilabel> screen.</para>
+
+	        <tip>
+	          <para>This and other informational screens in the
+	          <guilabel>Import QIF files</guilabel> assistant
+	          can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
+	          under <guilabel>&app; Preferences</guilabel>.</para>
+	        </tip>
+
+	        <para>The next screen lets you <guilabel>Match QIF categories with
+	        &app; accounts</guilabel>. You will see a list of <guilabel>QIF
+	        category names</guilabel> on the left and suggested <guilabel>&app;
+	        account names</guilabel> on the right. The <guilabel>New?</guilabel>
+	        column indicates if the <application>&app;</application> account name will be created by the QIF
+	        Import.</para>
+
+	        <para>To change the <application>&app;</application> account to a different one select the QIF
+	        category. A dialog will pop up to select another account or create a new
+	        one.</para>
+
+	        <itemizedlist>
+	          <listitem>
+	            <para>Select an account from the list to choose a already existing
+	            account.</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The <guibutton>New Account</guibutton> button allows you to
+	            add a new account name as a sub-account (child of selected) of the
+	            selected account.</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The <guibutton>OK</guibutton> button is used to confirm your
+	            selection.</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The <guibutton>Cancel</guibutton> button is used to exit the
+	            dialog without using any changes you have made.</para>
+	          </listitem>
+	        </itemizedlist>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	    <term><guilabel>Payees and memos</guilabel></term>
+	    <listitem>
+	        <para>This screen gives a description of the <guilabel>Payees and
+	        memos</guilabel> matching process on the following <guilabel>Match payees/memos to
+	        &app; accounts</guilabel> screen.</para>
+
+	        <tip>
+	          <para>This and other informational screens in the
+	          <guilabel>Import QIF files</guilabel> assistant
+	          can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
+	          under <guilabel>&app; Preferences</guilabel>.</para>
+	        </tip>
+
+	        <para>The next screen lets you <guilabel>Match payees/memos to &app;
+	        accounts</guilabel>. You will see a list of <guilabel>QIF payee/memo
+	        names</guilabel> on the left and suggested <guilabel>&app; account
+	        names</guilabel> on the right. The default <application>&app;</application> account used is
+	        called <guilabel>Unspecified</guilabel>. The <guilabel>New?</guilabel> column indicates if
+	        the <application>&app;</application> account name will be created by the QIF Import.</para>
+
+	        <para>To change the <application>&app;</application> account to a different one select the QIF
+	        payee/memo. A dialog will pop up to select another account or create a
+	        new one.</para>
+
+	        <itemizedlist>
+	          <listitem>
+	            <para>Select an account from the list to choose a already existing
+	            account.</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The <guibutton>New Account</guibutton> button allows you to
+	            add a new account name as a sub-account of the selected
+	            account.</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The <guibutton>OK</guibutton> button is used to confirm your
+	            selection.</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The <guibutton>Cancel</guibutton> button is used to exit the
+	            dialog without using any changes you have made.</para>
+	          </listitem>
+	        </itemizedlist>
+	      </listitem>
+	    </varlistentry>
+	  </variablelist>
+
+	  </listitem>
+	  <listitem>
+
+	        <para>The next screen allows you to <guilabel>Enter the QIF file
+	        currency</guilabel>. The drop down list defaults to the currency
+	        configured in the <guilabel>Accounts</guilabel> tab (see <xref linkend="configuring-preferences-accounts"/>) under
+	        <guilabel>&app; Preferences</guilabel>. If you wish the new accounts
+	        to use a different currency, select one from the list.</para>
+
+	        <para>When you have selected the currency, click the
+	        <guibutton>Forward</guibutton> button.</para>
+
+	  </listitem>
+	  <listitem>
+
+	        <para>Depending on the type of data contained in the
+	        <acronym>QIF</acronym> files to be imported, you may or may not see one or more of the following screens:</para>
+
+	  <variablelist termlength="8">
+	    <varlistentry>
+	    <term><guilabel>Tradable Commodities</guilabel></term>
+	      <listitem>
+	        <para>This screen gives a description of the <guilabel>Tradable
+	        Commodities</guilabel> process on the screen.</para>
+
+	        <tip>
+	          <para>This and other informational screens in the
+	          <guilabel>Import QIF files</guilabel> assistant
+	          can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
+	          under <guilabel>&app; Preferences</guilabel>.</para>
+	        </tip>
+
+	        <para>A series of screens, one for each of the stock, mutual fund, or
+	        commodity, displays the exchange, full name, and symbol for each of the commodities
+	        listed in the <acronym>QIF</acronym> file you are importing so that you can
+	        check them before proceeding.</para>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+	    <term><guilabel>Match duplicate transactions</guilabel></term>
+	      <listitem>
+	        <para>This screen gives a description of the <guilabel>Match
+	        duplicate transactions</guilabel> process on the following <guilabel>Select
+	        possible duplicates</guilabel> screen.</para>
+
+	        <tip>
+	          <para>This and other informational screens in the
+	          <guilabel>Import QIF files</guilabel> assistant
+	          can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="configuring-preferences-online-banking"/>)
+	          under <guilabel>&app; Preferences</guilabel>.</para>
+	        </tip>
+
+	        <para>The next screen lets you <guilabel>Select possible duplicate
+	        transactions</guilabel>. Imported transactions are shown on the left
+	        panel and possible matches to each selected transaction are shown on the
+	        right.</para>
+
+	        <itemizedlist>
+	          <listitem>
+	            <para>The left panel shows the list of Imported transactions to
+	            select from for matching duplicates</para>
+	          </listitem>
+
+	          <listitem>
+	            <para>The right panel shows the list of <emphasis>possible</emphasis> duplicates for the
+	            selected imported transaction. Select the one that most closely
+	            matches</para>
+	          </listitem>
+	        </itemizedlist>
+	      </listitem>
+	    </varlistentry>
+	  </variablelist>
+
+	  </listitem>
+	  <listitem>
+
+	        <para>The last screen, <guibutton>Update your &app;
+	        accounts</guibutton>, gives you a list of three choices to finish the
+	        assistant.</para>
+
+	      <itemizedlist>
+	        <listitem>
+	          <para><guibutton>Cancel:</guibutton> exit the process and cancel importing
+	          <acronym>QIF</acronym> files.</para>
+	          <warning>
+	            <para>If you click this button, any selections you have made up to
+	            this point will be lost.</para>
+	          </warning>
+	        </listitem>
+
+	        <listitem>
+	          <para><guibutton>Back:</guibutton> brings up the previous screen so
+	          that you can change a previous selection until the first screen.</para>
+	        </listitem>
+
+	        <listitem>
+	          <para><guibutton>Forward:</guibutton> imports the data and creates the
+	          accounts you have specified.</para>
+	        </listitem>
+	      </itemizedlist>
+
+	  </listitem>
+	  </orderedlist>
+
+	        <para>You should now have successfully imported your accounts.</para>
+
+	        <tip>
+	          <para>Imported transactions might need to be <emphasis role="strong">reconciled</emphasis>.
+	          This process is described in the <application>&app;</application> Tutorial and Concepts guide.</para>
+	        </tip>
+
+	    </sect2>
+	</sect1>
+</chapter>
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 26446f6..80d9e69 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -441,6 +441,8 @@
 <xi:include href="ch_basics.xml" />
 <xi:include href="ch_accts.xml" />
 <xi:include href="ch_txns.xml" />
+<xi:include href="ch_importing.xml" />
+<xi:include href="ch_configuring.xml" />
 </part>
 <part>
     <title>Managing Personal Finances</title>

commit 755d33c97b0a72b64e5c5ab6992bd86bed107301
Author: David Thomas <sunfish62 at yahoo.com>
Date:   Tue Mar 26 16:58:51 2019 +0100

    Bug 796855 Bringing Chapter 3 of Help into Chapter 2 of Guide - step 1
    
    Barring a couple of section tag corrections the text
    is copied verbatim from the help document.
    Links to other sections are still failing. This will
    be fixed in a follow-up commit.

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 6b45895..c143e75 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -301,14 +301,231 @@
     </sect2> <!-- basics-transactions2 -->
   </sect1> <!-- basics-entry1 -->
 
-  <sect1 id="basics-interface1">
-    <title>Interface</title>
+  <sect1 id="basics-running-gnucash">
+      <title>Running <application>&app;</application></title>
+      <para><application>&app;</application> can be run from your desktop main menu by selecting the associated menu entry.</para>
+      <para>Alternatively it can be run from a shell (command line) with the command <command>gnucash</command>.</para>
+
+      <para>During the loading of the <application>&app;</application> main window you will see the
+          <emphasis>&app; Splash Screen</emphasis> where some information
+          about the program itself and the loading process are displayed.</para>
+
+      <sect2 id="welcome-to-gnucash">
+          <title><guilabel>Welcome to &app;</guilabel> dialog</title>
+          <para>Next you will be presented with
+              the <guilabel>Welcome to &app;!</guilabel> dialog with three choices:</para>
+
+          <itemizedlist id="CreateAccounts">
+              <listitem>
+                  <para><guilabel>Create a new set of accounts:</guilabel> Runs the
+                      <guilabel>New Account Hierarchy Setup</guilabel> assistant (see <xref linkend="acct-hierarchy"/>). Select
+                      this option if you want to be assisted in creating a set of accounts.</para>
+              </listitem>
+
+              <listitem>
+                  <para><guilabel>Import my QIF files:</guilabel> Runs the
+                      <guilabel>Import QIF Files</guilabel> assistant (see <xref linkend="import-qif"/>). Select this option
+                      if you already have Quicken files (<filename>.qif</filename> files) from another
+                      financial application and wish to import them into <application>&app;</application>.</para>
+              </listitem>
+
+              <listitem>
+                  <para><guilabel>Open the new user tutorial:</guilabel>
+                      Opens the <application>&app;</application> Tutorial and Concepts Guide. Select this
+                      option if you are completely new to <application>&app;</application> and
+                      accounting concepts.</para>
+              </listitem>
+          </itemizedlist>
+
+          <note>
+              <para>It is possible to run these items after you have made a choice here,
+                  but the <guilabel>Welcome to &app;!</guilabel> screen will not reappear.
+                  To try one of the other choices later, read
+                  <xref linkend="acct-hierarchy" />, <xref linkend="import-qif" /> and
+                  <xref linkend="tutorial" /> to see how to start them from the
+                  <application>&app;</application> menu.</para>
+          </note>
 
     <para>The very first time you open <application>&app;</application>, you will see the
     <guilabel>Welcome to &app;!</guilabel> 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 screen boxes you will
     see.</para>
+    </sect2>
+
+    <sect2 id="basics-acct-hierarchy">
+      <title>New Account Hierarchy Setup</title>
+
+      <para>This assistant helps you to create a set of <application>&app;</application> accounts. It will
+          appear if you choose <guibutton>Create a new set of accounts</guibutton>
+          in the <guilabel>Welcome to &app;!</guilabel> menu.</para>
+      <para>This will create a new blank <application>&app;</application> file and then automatically start
+          the <guilabel>New Account Hierarchy Setup</guilabel> assistant.</para>
+
+      <tip>
+          <para>To start this assistant manually, go to <menuchoice><guimenu>File</guimenu>
+                  <guimenuitem>New</guimenuitem></menuchoice> if you need to create a new file.
+              If you want to run the assistant within the opened file, go to
+              <menuchoice><guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy...</guimenuitem></menuchoice>
+              when the accounts tree tab is displayed.</para>
+      </tip>
+
+      <orderedlist>
+          <listitem>
+              <para>The <guilabel>New Account Hierarchy Setup</guilabel> assistant opens
+                  with a screen that briefly describes what this assistant does. The three
+                  buttons at the very bottom of the screen will not change while using the
+                  assistant.</para>
+
+              <itemizedlist>
+                  <listitem>
+                      <para><guibutton>Cancel:</guibutton> exit the process and cancel creating
+                          a new set of accounts.</para>
+                      <warning>
+                          <para>If you click this button, any selections you have made up to
+                              this point will be lost.</para>
+                      </warning>
+                  </listitem>
+
+                  <listitem>
+                      <para><guibutton>Back:</guibutton> brings up the previous screen so
+                          that you can change a previous selection until the first screen.</para>
+                  </listitem>
+
+                  <listitem>
+                      <para><guibutton>Forward:</guibutton> brings up the next
+                          screen so you can continue through the assistant.</para>
+                  </listitem>
+              </itemizedlist>
+
+          </listitem>
+          <listitem>
+
+              <para>The next screen allows you to <guilabel>Choose Currency</guilabel>
+                  to use as default for your accounts.</para>
+
+              <itemizedlist>
+                  <listitem>
+                      <para>The <guilabel>Currency:</guilabel> drop down list defaults to the currency
+                          configured in the <guilabel>Accounts</guilabel> tab under
+                          <guilabel>&app; Preferences</guilabel> (see <xref linkend="prefs-accounts"/>). If you wish your accounts to
+                          use a different default currency, select one from the list.</para>
+                  </listitem>
+
+                  <listitem>
+                      <para>The <guibutton>Forward </guibutton>button is used to confirm
+                          your selection and continue to the next screen.</para>
+                  </listitem>
+              </itemizedlist>
+
+          </listitem>
+          <listitem>
+
+              <para>The next screen is used to <guilabel>Choose accounts to create</guilabel>.</para>
+              <para>You will see a screen divided into three parts.</para>
+
+              <itemizedlist>
+                  <listitem>
+                      <para>The left upper portion has a list of
+                          <guilabel>Categories</guilabel> for commonly used hierarchies of
+                          accounts. Select from this list the types of accounts you wish to
+                          use. You can select as many of the categories of accounts as you
+                          wish.</para>
+                  </listitem>
+
+                  <listitem>
+                      <para>The left lower section has a <guilabel>Category
+                              Description</guilabel> that displays a detailed description of the
+                          category currently highlighted.</para>
+                  </listitem>
+
+                  <listitem>
+                      <para>The right side has a list of the <guilabel>Accounts</guilabel>
+                          that will be created from the selected category.</para>
+                  </listitem>
+
+                  <listitem>
+                      <para>The <guibutton>Select All</guibutton> button allows you to
+                          include all of the account categories.</para>
+                  </listitem>
+
+                  <listitem>
+                      <para>The <guibutton>Clear All </guibutton>button allows you to
+                          deselect all of the categories selected.</para>
+                  </listitem>
+              </itemizedlist>
+
+          </listitem>
+          <listitem>
+
+              <para>The next screen allows you to <guilabel>Setup selected accounts</guilabel>
+                  by entering the opening balances and by selecting if the account is a placeholder.</para>
+
+              <note>
+                  <para>Equity accounts do not have opening balances so the
+                      opening balance value for this kind of accounts
+                      is locked and set to <guilabel>zero</guilabel> by
+                      <application>&app;</application></para>
+              </note>
+
+              <note id="placeholder-acct">
+                  <para><emphasis>Placeholder</emphasis> accounts are used to create a hierarchy of accounts and
+                      normally do not have transactions or opening balances.</para>
+              </note>
+
+              <para>Follow the instructions in the display on how to select the
+                  account and entering an opening balance for the account. A single
+                  click is used to highlight an account.</para>
+
+              <itemizedlist>
+                  <listitem>
+                      <para>The left side of the screen has a list of <guilabel>Account
+                              Names</guilabel>. Select an account by "clicking" once in the
+                          <guilabel>Account Names</guilabel> column with the account highlighted. This will open
+                          the account name for changes.</para>
+                  </listitem>
+
+                  <listitem>
+                      <para>The right side of the screen has a check-box to make an
+                          account a <guilabel>Placeholder</guilabel> and a box to add the
+                          <guilabel>Opening Balance</guilabel> for the selected account. Again
+                          a single click in the <guilabel>Opening Balance</guilabel> or
+                          <guilabel>Placeholder</guilabel> column will
+                          open the field for changes.</para>
+                  </listitem>
+              </itemizedlist>
+
+          </listitem>
+          <listitem>
+
+              <para>The <guilabel>Finish account setup</guilabel> is the last screen and
+                  gives you a final list of the three choices to finish the assistant.</para>
+
+              <itemizedlist>
+                  <listitem>
+                      <para><guibutton>Cancel:</guibutton> exits the assistant and cancels creating
+                          a new set of accounts.</para>
+                      <warning>
+                          <para>If you click this button, any selections you have made up to
+                              this point will be lost.</para>
+                      </warning>
+                  </listitem>
+
+                  <listitem>
+                      <para><guibutton>Back:</guibutton> brings up the previous screen so
+                          that you can change a previous selection until the first screen.</para>
+                  </listitem>
+
+                  <listitem>
+                      <para><guibutton>Apply:</guibutton> creates the accounts you have selected.</para>
+                  </listitem>
+              </itemizedlist>
+          </listitem>
+      </orderedlist>
+
+      <para>You should now have a hierarchy of accounts in your main <application>&app;</application>
+          account window.</para>
+    </sect2>
 
     <sect2 id="basics-tip2">
       <title>Tip of the Day</title>
diff --git a/help/C/Help_ch_GettingStarted.xml b/help/C/Help_ch_GettingStarted.xml
index 7bc3d85..617382b 100644
--- a/help/C/Help_ch_GettingStarted.xml
+++ b/help/C/Help_ch_GettingStarted.xml
@@ -23,49 +23,7 @@
   <title>Getting Started</title>
 
   <sect1 id="first-time">
-    <title>Running <application>&app;</application></title>
-    <para><application>&app;</application> can be run from your desktop main menu by selecting the associated menu entry.</para>
-    <para>Alternatively it can be run from a shell (command line) with the command <command>gnucash</command>.</para>
-
-    <para>During the loading of the <application>&app;</application> main window you will see the
-    <emphasis>&app; Splash Screen</emphasis> where some information
-    about the program itself and the loading process are displayed.</para>
-
-    <sect2 id="welcome-to-gnucash">
-    <title><guilabel>Welcome to &app;</guilabel> dialog</title>
-      <para>Next you will be presented with
-      the <guilabel>Welcome to &app;!</guilabel> dialog with three choices:</para>
-
-      <itemizedlist id="CreateAccounts">
-        <listitem>
-          <para><guilabel>Create a new set of accounts:</guilabel> Runs the
-          <guilabel>New Account Hierarchy Setup</guilabel> assistant (see <xref linkend="acct-hierarchy"/>). Select
-          this option if you want to be assisted in creating a set of accounts.</para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>Import my QIF files:</guilabel> Runs the
-          <guilabel>Import QIF Files</guilabel> assistant (see <xref linkend="import-qif"/>). Select this option
-          if you already have Quicken files (<filename>.qif</filename> files) from another
-          financial application and wish to import them into <application>&app;</application>.</para>
-        </listitem>
-
-        <listitem>
-            <para><guilabel>Open the new user tutorial:</guilabel>
-            Opens the <application>&app;</application> Tutorial and Concepts Guide. Select this
-            option if you are completely new to <application>&app;</application> and
-            accounting concepts.</para>
-        </listitem>
-      </itemizedlist>
-
-      <note>
-        <para>It is possible to run these items after you have made a choice here,
-        but the <guilabel>Welcome to &app;!</guilabel> screen will not reappear.
-        To try one of the other choices later, read
-        <xref linkend="acct-hierarchy" />, <xref linkend="import-qif" /> and
-        <xref linkend="tutorial" /> to see how to start them from the
-        <application>&app;</application> menu.</para>
-      </note>
+    <title>Welcome to <application>&app;</application>! Screen</title>
 
       <para>This screen is intended for you to use to get up and running
       quickly. The <guibutton>Cancel</guibutton> button is used to exit the
@@ -82,8 +40,6 @@
         in <xref linkend="GUIMenus"></xref>.</para>
       </note>
 
-    </sect2>
-
    </sect1>
 
     <sect1 id="acct-hierarchy">
@@ -91,173 +47,8 @@
 
       <para>This assistant helps you to create a set of <application>&app;</application> accounts. It will
       appear if you choose <guibutton>Create a new set of accounts</guibutton>
-      in the <guilabel>Welcome to &app;!</guilabel> menu.</para>
-      <para>This will create a new blank <application>&app;</application> file and then automatically start
-      the <guilabel>New Account Hierarchy Setup</guilabel> assistant.</para>
-
-      <tip>
-        <para>To start this assistant manually, go to <menuchoice><guimenu>File</guimenu>
-        <guimenuitem>New</guimenuitem></menuchoice> if you need to create a new file.
-        If you want to run the assistant within the opened file, go to
-        <menuchoice><guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy...</guimenuitem></menuchoice>
-        when the accounts tree tab is displayed.</para>
-      </tip>
-
-<orderedlist>
-<listitem>
-      <para>The <guilabel>New Account Hierarchy Setup</guilabel> assistant opens
-      with a screen that briefly describes what this assistant does. The three
-      buttons at the very bottom of the screen will not change while using the
-      assistant.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para><guibutton>Cancel:</guibutton> exit the process and cancel creating
-        a new set of accounts.</para>
-        <warning>
-          <para>If you click this button, any selections you have made up to
-          this point will be lost.</para>
-        </warning>
-      </listitem>
-
-      <listitem>
-        <para><guibutton>Back:</guibutton> brings up the previous screen so
-        that you can change a previous selection until the first screen.</para>
-      </listitem>
-
-      <listitem>
-        <para><guibutton>Forward:</guibutton> brings up the next
-        screen so you can continue through the assistant.</para>
-      </listitem>
-    </itemizedlist>
-
-</listitem>
-<listitem>
-
-      <para>The next screen allows you to <guilabel>Choose Currency</guilabel>
-      to use as default for your accounts.</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>The <guilabel>Currency:</guilabel> drop down list defaults to the currency
-          configured in the <guilabel>Accounts</guilabel> tab under
-          <guilabel>&app; Preferences</guilabel> (see <xref linkend="prefs-accounts"/>). If you wish your accounts to
-          use a different default currency, select one from the list.</para>
-        </listitem>
-
-        <listitem>
-          <para>The <guibutton>Forward </guibutton>button is used to confirm
-          your selection and continue to the next screen.</para>
-        </listitem>
-      </itemizedlist>
-
-</listitem>
-<listitem>
-
-      <para>The next screen is used to <guilabel>Choose accounts to create</guilabel>.</para>
-      <para>You will see a screen divided into three parts.</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>The left upper portion has a list of
-          <guilabel>Categories</guilabel> for commonly used hierarchies of
-          accounts. Select from this list the types of accounts you wish to
-          use. You can select as many of the categories of accounts as you
-          wish.</para>
-        </listitem>
-
-        <listitem>
-          <para>The left lower section has a <guilabel>Category
-          Description</guilabel> that displays a detailed description of the
-          category currently highlighted.</para>
-        </listitem>
-
-        <listitem>
-          <para>The right side has a list of the <guilabel>Accounts</guilabel>
-          that will be created from the selected category.</para>
-        </listitem>
-
-        <listitem>
-          <para>The <guibutton>Select All</guibutton> button allows you to
-          include all of the account categories.</para>
-        </listitem>
-
-        <listitem>
-          <para>The <guibutton>Clear All </guibutton>button allows you to
-          deselect all of the categories selected.</para>
-        </listitem>
-      </itemizedlist>
-
-</listitem>
-<listitem>
-
-      <para>The next screen allows you to <guilabel>Setup selected accounts</guilabel>
-      by entering the opening balances and by selecting if the account is a placeholder.</para>
-
-      <note>
-        <para>Equity accounts do not have opening balances so the
-        opening balance value for this kind of accounts
-        is locked and set to <guilabel>zero</guilabel> by
-        <application>&app;</application></para>
-      </note>
-
-      <note id="placeholder-acct">
-        <para><emphasis>Placeholder</emphasis> accounts are used to create a hierarchy of accounts and
-        normally do not have transactions or opening balances.</para>
-      </note>
-
-      <para>Follow the instructions in the display on how to select the
-      account and entering an opening balance for the account. A single
-      click is used to highlight an account.</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>The left side of the screen has a list of <guilabel>Account
-          Names</guilabel>. Select an account by "clicking" once in the
-          <guilabel>Account Names</guilabel> column with the account highlighted. This will open
-          the account name for changes.</para>
-        </listitem>
-
-        <listitem>
-          <para>The right side of the screen has a check-box to make an
-          account a <guilabel>Placeholder</guilabel> and a box to add the
-          <guilabel>Opening Balance</guilabel> for the selected account. Again
-          a single click in the <guilabel>Opening Balance</guilabel> or
-          <guilabel>Placeholder</guilabel> column will
-          open the field for changes.</para>
-        </listitem>
-      </itemizedlist>
-
-</listitem>
-<listitem>
-
-      <para>The <guilabel>Finish account setup</guilabel> is the last screen and
-      gives you a final list of the three choices to finish the assistant.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para><guibutton>Cancel:</guibutton> exits the assistant and cancels creating
-        a new set of accounts.</para>
-        <warning>
-          <para>If you click this button, any selections you have made up to
-          this point will be lost.</para>
-        </warning>
-      </listitem>
-
-      <listitem>
-        <para><guibutton>Back:</guibutton> brings up the previous screen so
-        that you can change a previous selection until the first screen.</para>
-      </listitem>
-
-      <listitem>
-        <para><guibutton>Apply:</guibutton> creates the accounts you have selected.</para>
-      </listitem>
-    </itemizedlist>
-</listitem>
-</orderedlist>
-
-      <para>You should now have a hierarchy of accounts in your main <application>&app;</application>
-      account window.</para>
+      in the <guilabel>Welcome to &app;!</guilabel> menu, or if you select
+      <menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem></menuchoice> .</para>
     </sect1>
 
     <sect1 id="import-qif">



Summary of changes:
 guide/C/Makefile.am               |   2 +
 guide/C/ch_accts.xml              |  50 +--
 guide/C/ch_basics.xml             | 218 +++++++-----
 guide/C/ch_configuring.xml        |  45 +++
 guide/C/ch_importing.xml          | 675 ++++++++++++++++++++++++++++++++++++++
 guide/C/ch_oview.xml              |  42 ++-
 guide/C/ch_txns.xml               | 190 ++++++-----
 guide/C/gnucash-guide.xml         |   4 +-
 help/C/Help_ch_GettingStarted.xml | 215 +-----------
 help/C/Help_ch_Transactions.xml   | 261 ---------------
 10 files changed, 1029 insertions(+), 673 deletions(-)
 create mode 100644 guide/C/ch_configuring.xml
 create mode 100644 guide/C/ch_importing.xml



More information about the gnucash-changes mailing list