gnucash-docs master: Multiple changes pushed

Frank H.Ellenberger fell at code.gnucash.org
Tue Oct 22 23:39:18 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/d2df753a (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7b03d466 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/ef70f931 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/99217203 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/ac841139 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5bd804af (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/9288c2ca (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/56dced3c (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/4fed391c (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/fa593d88 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/57881423 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/4b85e45a (commit)



commit d2df753ad4e0ce3462545a8a5d742ef67b1a2c64
Merge: 4b85e45 7b03d46
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Oct 23 05:08:14 2019 +0200

    Merge branch 'maint'


commit 7b03d466160bbd48717184b47a263b5e3d3b7c6e
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Oct 23 04:18:32 2019 +0200

    L12N:de: Unify Preface - Vereinheitliche Verfasser-Seite

diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 3af9cdc..6aaac88 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -375,13 +375,12 @@
 </bookinfo>
 <preface>
   <title>Ãœber die Verfasser</title>
-  <para>
- 	Das Dokumentationsteam von &app; ist eine selbsternannte Gruppe von &app;-Nutzern 
-  und -Entwicklern, die sich angeboten haben, diese Dokumentation zu schreiben, 
-  zum Wohle der breiten Nutzerschaft. Menschen, die daran intressiert sind,
-  dieser Gruppe bezutreten, werden ermutigt, ihr Interesse auf einer der &app;
-  Mailinglisten <email>gnucash-devel at gnucash.org</email> (englische Dokumentation) oder <email>gnucash-de at gnucash.org</email> (Ãœbersetzung) 
-  für weitere Anleitungen kundzutun.
+  <para>Das Dokumentationsteam von &app; ist eine selbsternannte Gruppe von &app;-Nutzern 
+    und -Entwicklern, die sich angeboten haben, diese Dokumentation zu schreiben, 
+    zum Wohle der breiten Nutzerschaft. Menschen, die daran intressiert sind,
+    dieser Gruppe bezutreten, werden ermutigt, ihr Interesse auf einer der &app;
+    Mailinglisten <email>gnucash-devel at gnucash.org</email> (englische Dokumentation) oder <email>gnucash-de at gnucash.org</email> (Ãœbersetzung) 
+    für weitere Anleitungen kundzutun.
   </para>
 
   <para>Beitragende im Team sind bisher:
@@ -436,14 +435,13 @@
     <author>
       <firstname>Bengt</firstname> <surname>Thuree</surname>
     </author>.
-
-<!-- This is appropriate place for other contributors: translators,
+  </para>
+<!-- This is the appropriate place for other contributors: translators,
       maintainers,  etc. Commented out by default.
       Note: Do not use the addess tag, if you do not want to be contacted
             with user questions over decades. -->
-  </para>
-  <para> Diese (immer noch unvollständge) Übersetzung wurde vom
-      Deutschen &app;-Übersetzungsteam erstellt. Dazu gehören bisher
+  <para>Diese (immer noch unvollständige) Übersetzung wurde vom
+    Deutschen &app;-Übersetzungsteam erstellt. Dazu gehören bisher
 <!--    <author role="translator">
         <firstname>Latin</firstname>
         <surname>Translator 1</surname>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index f02a82b..6e9014e 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -247,17 +247,16 @@
 
   </bookinfo>
   <preface id="authors">
-    <title>About the Authors</title>
-    <para>
-   	The &appname; Documentation Team is a self-designated
-  	group of &appname; users and developers who have volunteered to
-  	write this documentation for the benefit of the broader user
-  	base. People who are interested in joining this group are
-  	encouraged to express their interest on the &appname; lists
-  	(gnucash-users and gnucash-devel) for further direction.
+    <title>Ãœber die Verfasser</title>
+    <para>Das Dokumentationsteam von &app; ist eine selbsternannte Gruppe von &app;-Nutzern 
+      und -Entwicklern, die sich angeboten haben, diese Dokumentation zu schreiben, 
+      zum Wohle der breiten Nutzerschaft. Menschen, die daran intressiert sind,
+      dieser Gruppe bezutreten, werden ermutigt, ihr Interesse auf einer der &app;
+      Mailinglisten <email>gnucash-devel at gnucash.org</email> (englische Dokumentation) oder <email>gnucash-de at gnucash.org</email> (Ãœbersetzung) 
+      für weitere Anleitungen kundzutun.
     </para>
-    <para>
-      Contributors on the team so far have been:
+  
+    <para>Beitragende im Team sind bisher:
       <author>
         <firstname>Yawar</firstname> <surname>Amin</surname>
       </author>,
@@ -293,14 +292,18 @@
       </author>,
       <author>
         <firstname>Mark</firstname> <surname>Simpson</surname>
-      </author>, and
+      </author> und
       <author>
         <firstname>Christian</firstname> <surname>Stimming</surname>
       </author>.
-
-      <!-- This is appropriate place for other contributors: translators,
-        maintainers,  etc. Commented out by default.
-      <othercredit role="translator">
+    </para>
+<!-- This is the appropriate place for other contributors: translators,
+  maintainers,  etc. Commented out by default.
+  Note: Do not use the addess tag, if you do not want to be contacted
+        with user questions over decades. -->
+    <para>Diese (immer noch unvollständige) Übersetzung wurde vom
+      Deutschen &app;-Übersetzungsteam erstellt. Dazu gehören bisher
+<!--    <author role="translator">
         <firstname>Latin</firstname>
         <surname>Translator 1</surname>
         <affiliation>
@@ -308,24 +311,25 @@
           <address> <email>translator at gnome.org</email> </address>
         </affiliation>
         <contrib>Latin translation</contrib>
-     </othercredit>
-      -->
+        <email>email at address.com</email>
+    </author>,
+-->
       <othercredit role="translator">
         <firstname>Frank H.</firstname> <surname>Ellenberger</surname>
         <contrib>Deutsche Ãœbersetzung</contrib>
-      </othercredit>
+      </othercredit>,
       <othercredit role="translator">
         <firstname>Holger</firstname> <surname>Stöhr</surname>
         <contrib>Deutsche Ãœbersetzung</contrib>
-      </othercredit>
+      </othercredit>,
       <othercredit role="translator">
         <firstname>Andreas</firstname> <surname>Fahle</surname>
         <contrib>Deutsche Ãœbersetzung</contrib>
-      </othercredit>
+      </othercredit> und
       <othercredit role="translator">
         <firstname>Christian</firstname> <surname>Stimming</surname>
         <contrib>Deutsche Ãœbersetzung</contrib>
-      </othercredit>
+      </othercredit>.
     </para>
   </preface>
 

commit ef70f931ebc1d18d1897b0e48045ad230aa46bb6
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Oct 23 04:04:13 2019 +0200

    I18n: Improve the other credit template of the preface
    
    Before translators were probably added as a space separated list behind
    the authors.

diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 6aa36ed..d2985b7 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -438,26 +438,25 @@
     <author>
       <firstname>Bengt</firstname> <surname>Thuree</surname>
     </author>.
-
-<!-- This is appropriate place for other contributors: translators,
-      maintainers,  etc. Commented out by default.
-      Note: Do not use the addess tag, if you do not want to be contacted
-            with user questions over decades. -->
+  </para>
+<!-- This is the appropriate place for other contributors: translators,
+  maintainers,  etc. Commented out by default.
+  Note: Do not use the addess tag, if you do not want to be contacted
+        with user questions over decades. -->
 <!-- 
+  <para>This - still incomplete - translation was created by the
+    Latin &appname; translation team, which included until now
+    <othercredit role="translator">
+      <firstname>Latin</firstname>
+      <surname>Translator 1</surname>
+      <affiliation>
+        <orgname>Latin &appname; Translation Team</orgname>
+        <address> <email>translator at gnome.org</email> </address>
+      </affiliation>
+      <contrib>Latin translation</contrib>
+    </othercredit>.
   </para>
-  <para> This translation was provided by
-        <author role="translator">
-        <firstname>Latin</firstname>
-        <surname>Translator 1</surname>
-        <affiliation>
-          <orgname>Latin Translation Team</orgname>
-          <address> <email>translator at gnome.org</email> </address>
-        </affiliation>
-        <contrib>Latin translation</contrib>
-        <email>email at address.com</email>
-      </author>.
 -->
-  </para>
 </preface>
 
 <part>
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index 20e8bc9..065a52a 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -350,20 +350,25 @@
       <author>
         <firstname>Christian</firstname> <surname>Stimming</surname>
       </author>.
-
-      <!-- This is appropriate place for other contributors: translators,
-        maintainers,  etc. Commented out by default.
-      <othercredit role="translator">
-        <firstname>Latin</firstname>
-        <surname>Translator 1</surname>
-        <affiliation>
-          <orgname>Latin Translation Team</orgname>
-          <address> <email>translator at gnome.org</email> </address>
-        </affiliation>
-        <contrib>Latin translation</contrib>
-     </othercredit>
-      -->
-    </para>
+  </para>
+<!-- This is the appropriate place for other contributors: translators,
+  maintainers,  etc. Commented out by default.
+  Note: Do not use the addess tag, if you do not want to be contacted
+        with user questions over decades. -->
+<!-- 
+  <para>This - still incomplete - translation was created by the
+    Latin &appname; translation team, which included until now
+    <othercredit role="translator">
+      <firstname>Latin</firstname>
+      <surname>Translator 1</surname>
+      <affiliation>
+        <orgname>Latin &appname; Translation Team</orgname>
+        <address> <email>translator at gnome.org</email> </address>
+      </affiliation>
+      <contrib>Latin translation</contrib>
+    </othercredit>.
+  </para>
+-->
   </preface>
 
 <xi:include href="Help_ch_Intro.xml" />

commit 992172030005ee567be93c296912d8a39bf5588b
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Oct 23 02:10:56 2019 +0200

    Partial synchronization of de/gnucash-help with C
    
    Format, missing Author, ...

diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index 61b15e6..f02a82b 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book SYSTEM "gnc-docbookx.dtd">
+
 <!--
       (Do not remove this comment block.)
   Template Maintained by the GNOME Documentation Project:
@@ -14,11 +15,11 @@
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
-               Frank H. Ellenberger (frank.h.ellenberger at gmail.com)
-               Andreas Fahle (fahle at web.de)
-               Holger Stöhr (stoerpser at gmx.de
-               Christian Stimming (stimming at tuhh.de)
-	       Mechtilde Stehmann (ooo at mechtilde.de)
+        Frank H. Ellenberger (frank.h.ellenberger at gmail.com)
+        Andreas Fahle (fahle at web.de)
+        Mechtilde Stehmann (ooo at mechtilde.de)
+        Holger Stöhr (stoerpser at gmx.de
+        Christian Stimming (stimming at tuhh.de)
 -->
 <!--
     Structure of translation adjusted to rev 19776
@@ -34,9 +35,8 @@
     <edition>v&manrevision;</edition>
 
    <copyright>
-     <year>2014-2018</year>
-     <holder>&app; Documentation Team</holder>
-     
+     <year>2002-2019</year>
+     <holder>&appname; Documentation Team</holder>
    </copyright>
    <copyright>
      <year>2002-2007</year>
@@ -63,7 +63,7 @@
    </copyright>
 
     <publisher>
-       <publishername>&app; Documentation Team</publishername>
+       <publishername>&appname; Documentation Team</publishername>
        <address>
          <email>gnucash-user at gnucash.org</email>
        </address>
@@ -72,174 +72,162 @@
     <xi:include href="Help_legal.xml" />
 
     <authorgroup>
-      <author><surname>The &app; Documentation Team</surname>
+      <author><surname>The &appname; Documentation Team</surname>
       </author>
     </authorgroup>
 
     <revhistory>
-
       <revision>
-        <revnumber>&app; Hilfe v3.7</revnumber>
+        <revnumber>&appname; Hilfe v3.7</revnumber>
         <date>8 September 2019</date>
         <revdescription>
           <para role="author">Multiple Authors </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>&app; Hilfe v3.6</revnumber>
+        <revnumber>&appname; Hilfe v3.6</revnumber>
         <date>30 June 2019</date>
         <revdescription>
           <para role="author">Multiple Authors </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>&app; Hilfe v3.1</revnumber>
+        <revnumber>&appname; Hilfe v3.1</revnumber>
         <date>28 April 2018</date>
         <revdescription>
           <para role="author">Multiple Authors </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
        <revision>
-        <revnumber>&app; Hilfe v3.0</revnumber>
+        <revnumber>&appname; Hilfe v3.0</revnumber>
         <date>1 April 2018</date>
         <revdescription>
           <para role="author">Multiple Authors </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>&app; Hilfe v2.6.20</revnumber>
+        <revnumber>&appname; Hilfe v2.6.20</revnumber>
         <date>1 April 2018</date>
         <revdescription>
           <para role="author">Multiple Authors </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
-
       <revision>
-        <revnumber>&app; Hilfe v2.6.16</revnumber>
+        <revnumber>&appname; Hilfe v2.6.16</revnumber>
         <date>26 March 2017</date>
         <revdescription>
           <para role="author">Multiple Authors </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
-
       <revision>
-        <revnumber>&app; Hilfe v2.6.11</revnumber>
+        <revnumber>&appname; Hilfe v2.6.11</revnumber>
         <date>11 January 2016</date>
         <revdescription>
           <para role="author">Multiple Authors </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
-
       <revision>
-	<revnumber>&app; Hilfe v2.6.8</revnumber>
+	<revnumber>&appname; Hilfe v2.6.8</revnumber>
         <date>27 September 2015</date>
         <revdescription>
           <para role="author">Multiple Authors
           </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
-
       <revision>
-        <revnumber>&app; Hilfe v2.6.5</revnumber>
+        <revnumber>&appname; Hilfe v2.6.5</revnumber>
         <date>16 December 2014</date>
         <revdescription>
           <para role="author">Multiple Authors
           </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
-
       <revision>
-        <revnumber>&app; Hilfe v2.6.3</revnumber>
+        <revnumber>&appname; Hilfe v2.6.3</revnumber>
         <date>30 March 2014</date>
         <revdescription>
           <para role="author">Multiple Authors
           </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
-
       <revision>
-        <revnumber>&app; Hilfe v2.6.2</revnumber>
+        <revnumber>&appname; Hilfe v2.6.2</revnumber>
         <date>2 March 2014</date>
         <revdescription>
           <para role="author">Multiple Authors
           </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
-
       <revision>
-        <revnumber>&app; Hilfe v2.6.1</revnumber>
+        <revnumber>&appname; Hilfe v2.6.1</revnumber>
         <date>26 January 2016</date>
         <revdescription>
           <para role="author">Multiple Authors
           </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
-
     <revision>
-         <revnumber>&app; Hilfe v2.6.0</revnumber>
+         <revnumber>&appname; Hilfe v2.6.0</revnumber>
         <date>29 December 2013</date>
         <revdescription>
           <para role="author">Multiple Authors
           </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
-
       <revision>
-        <revnumber>&app; Hilfe v2.4.2</revnumber>
+        <revnumber>&appname; Hilfe v2.4.2</revnumber>
         <date>17 November 2012</date>
         <revdescription>
           <para role="author">Geert Janssens
           </para>
-          <para role="publisher">&app; Development Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
-
       <revision>
-        <revnumber>&app; Hilfe v2.3.16</revnumber>
+        <revnumber>&appname; Hilfe v2.3.16</revnumber>
         <date>01. January 2011</date>
         <revdescription>
           <para role="author">Andreas Fahle
           </para>
             <para role="translator">Christian Stimming</para>
-            <para role="publisher">Deutsches &app; Team</para>
+            <para role="publisher">Deutsches &appname; Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>&app; Hilfe v1.8.0</revnumber>
+        <revnumber>&appname; Hilfe v1.8.0</revnumber>
         <date>02. Februar 2003</date>
         <revdescription>
           <para role="author">Chris Lyttle
           </para>
-          <para role="translator">Christian Stimming</para>
-          <para role="publisher">&app; Documentation Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
       <revision>
-        <revnumber>&app; User Manual</revnumber>
+        <revnumber>&appname; User Manual</revnumber>
         <date>June 2002</date>
         <revdescription>
-          <para role="author">&app; Developers and Documentors
+          <para role="author">&appname; Developers and Documentors
           </para>
-          <para role="publisher">&app; Documentation Team</para>
+          <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
     </revhistory>
 
-    <releaseinfo>Diese Hilfedatei beschreibt die private Finanzsoftware
-      &app;.
+    <releaseinfo>Diese Hilfedatei beschreibt die Finanzsoftware
+      &appname;.
     </releaseinfo>
     <legalnotice>
       <title>Feedback</title>
@@ -258,66 +246,69 @@
     </legalnotice>
 
   </bookinfo>
-  <preface>
-    <title>About the Author</title>
-  <para>
- 	The GnuCash Documentation Team is a self-designated
-	group of GnuCash users and developers who have volunteered to
-	write this documentation for the benefit of the broader user
-	base. People who are interested in joining this group are
-	encouraged to express their interest on the GnuCash lists
-	(gnucash-users and gnucash-devel) for further direction.
-  </para>
-
-  <para>Contributors on the team so far have been:
+  <preface id="authors">
+    <title>About the Authors</title>
+    <para>
+   	The &appname; Documentation Team is a self-designated
+  	group of &appname; users and developers who have volunteered to
+  	write this documentation for the benefit of the broader user
+  	base. People who are interested in joining this group are
+  	encouraged to express their interest on the &appname; lists
+  	(gnucash-users and gnucash-devel) for further direction.
+    </para>
+    <para>
+      Contributors on the team so far have been:
       <author>
-	<firstname>Yawar</firstname> <surname>Amin</surname>
+        <firstname>Yawar</firstname> <surname>Amin</surname>
       </author>,
       <author>
-	<firstname>J. Alex</firstname> <surname>Aycinena</surname>
+        <firstname>J. Alex</firstname> <surname>Aycinena</surname>
       </author>,
       <author>
-	<firstname>Frank</firstname> <surname>Ellenberger</surname>
+        <firstname>David</firstname> <surname>Cousens</surname>
       </author>,
       <author>
-	<firstname>Chris</firstname> <surname>Good</surname>
+        <firstname>Frank</firstname> <othername role='mi'>H.</othername> <surname>Ellenberger</surname>
       </author>,
       <author>
-	<firstname>Dave</firstname> <surname>Herman</surname>
+        <firstname>Chris</firstname> <surname>Good</surname>
       </author>,
       <author>
-	<firstname>Geert</firstname> <surname>Janssens</surname>
+        <firstname>Dave</firstname> <surname>Herman</surname>
       </author>,
       <author>
-	<firstname>Chris</firstname> <surname>Lyttle</surname>
+        <firstname>Geert</firstname> <surname>Janssens</surname>
       </author>,
       <author>
-	<firstname>Cristian</firstname> <surname>Marchi</surname>
+        <firstname>Chris</firstname> <surname>Lyttle</surname>
       </author>,
       <author>
-	<firstname>John</firstname> <surname>Ralls</surname>
+        <firstname>Cristian</firstname> <surname>Marchi</surname>
       </author>,
       <author>
-	<firstname>Robert</firstname> <surname>Ratliff</surname>
+        <firstname>John</firstname> <surname>Ralls</surname>
       </author>,
       <author>
-	<firstname>Mark</firstname> <surname>Simpson</surname>
+        <firstname>Robert</firstname> <surname>Ratliff</surname>
+      </author>,
+      <author>
+        <firstname>Mark</firstname> <surname>Simpson</surname>
       </author>, and
       <author>
-	<firstname>Christian</firstname> <surname>Stimming</surname>
+        <firstname>Christian</firstname> <surname>Stimming</surname>
       </author>.
 
       <!-- This is appropriate place for other contributors: translators,
-	   maintainers,  etc. Commented out by default.
-	   <othercredit role="translator">
-	   <firstname>Latin</firstname>
-	   <surname>Translator 1</surname>
-	   <affiliation>
-	   <orgname>Latin Translation Team</orgname>
-	   <address> <email>translator at gnome.org</email> </address>
-	   </affiliation>
-	   <contrib>Latin translation</contrib>
-	   </othercredit>
+        maintainers,  etc. Commented out by default.
+      <othercredit role="translator">
+        <firstname>Latin</firstname>
+        <surname>Translator 1</surname>
+        <affiliation>
+          <orgname>Latin Translation Team</orgname>
+          <address> <email>translator at gnome.org</email> </address>
+        </affiliation>
+        <contrib>Latin translation</contrib>
+     </othercredit>
       -->
       <othercredit role="translator">
         <firstname>Frank H.</firstname> <surname>Ellenberger</surname>

commit ac841139d9d26d23b0010ac2a9e9cf3fa79f6dea
Merge: 56dced3 5bd804a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Sep 30 18:11:22 2019 +0200

    Merge branch PR #127 into maint


commit 5bd804afbcc07024c22349296137bc9dab0f7e35
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Sep 30 18:05:48 2019 +0200

    run adjust-dpi.sh and optipng on help/C/figures

diff --git a/help/C/figures/Help_Book_Options_Accounts.png b/help/C/figures/Help_Book_Options_Accounts.png
index 87b674a..b442eba 100644
Binary files a/help/C/figures/Help_Book_Options_Accounts.png and b/help/C/figures/Help_Book_Options_Accounts.png differ
diff --git a/help/C/figures/Help_Book_Options_Budgeting.png b/help/C/figures/Help_Book_Options_Budgeting.png
index 2260883..70bf954 100644
Binary files a/help/C/figures/Help_Book_Options_Budgeting.png and b/help/C/figures/Help_Book_Options_Budgeting.png differ
diff --git a/help/C/figures/Help_Book_Options_Business.png b/help/C/figures/Help_Book_Options_Business.png
index 7707cb9..a6a705a 100644
Binary files a/help/C/figures/Help_Book_Options_Business.png and b/help/C/figures/Help_Book_Options_Business.png differ
diff --git a/help/C/figures/Help_Book_Options_Counters.png b/help/C/figures/Help_Book_Options_Counters.png
index 84c8e1f..81e0c14 100644
Binary files a/help/C/figures/Help_Book_Options_Counters.png and b/help/C/figures/Help_Book_Options_Counters.png differ
diff --git a/help/C/figures/Help_CSV_Import_Transactions_Delete.png b/help/C/figures/Help_CSV_Import_Transactions_Delete.png
index bef8f6a..8506d00 100644
Binary files a/help/C/figures/Help_CSV_Import_Transactions_Delete.png and b/help/C/figures/Help_CSV_Import_Transactions_Delete.png differ
diff --git a/help/C/figures/Help_CSV_Import_Transactions_Save.png b/help/C/figures/Help_CSV_Import_Transactions_Save.png
index c061eb9..4430fb1 100644
Binary files a/help/C/figures/Help_CSV_Import_Transactions_Save.png and b/help/C/figures/Help_CSV_Import_Transactions_Save.png differ
diff --git a/help/C/figures/Help_CSV_Import_transactions_Preview.png b/help/C/figures/Help_CSV_Import_transactions_Preview.png
index 11c6493..a122d4e 100644
Binary files a/help/C/figures/Help_CSV_Import_transactions_Preview.png and b/help/C/figures/Help_CSV_Import_transactions_Preview.png differ
diff --git a/help/C/figures/Help_CSV_Transaction_Import_Assistant.png b/help/C/figures/Help_CSV_Transaction_Import_Assistant.png
index 5b4a595..2d6dce5 100644
Binary files a/help/C/figures/Help_CSV_Transaction_Import_Assistant.png and b/help/C/figures/Help_CSV_Transaction_Import_Assistant.png differ
diff --git a/help/C/figures/Help_Choose_Export_Settings.png b/help/C/figures/Help_Choose_Export_Settings.png
index 50a6270..fb299af 100644
Binary files a/help/C/figures/Help_Choose_Export_Settings.png and b/help/C/figures/Help_Choose_Export_Settings.png differ
diff --git a/help/C/figures/Help_Import_Map_Editor.png b/help/C/figures/Help_Import_Map_Editor.png
index bae5355..48ad633 100644
Binary files a/help/C/figures/Help_Import_Map_Editor.png and b/help/C/figures/Help_Import_Map_Editor.png differ
diff --git a/help/C/figures/Help_Import_MatchPicker.png b/help/C/figures/Help_Import_MatchPicker.png
index e214650..c9bd89f 100644
Binary files a/help/C/figures/Help_Import_MatchPicker.png and b/help/C/figures/Help_Import_MatchPicker.png differ
diff --git a/help/C/figures/Help_Import_QIF_Druid.png b/help/C/figures/Help_Import_QIF_Druid.png
index 0624f25..3b6aff1 100644
Binary files a/help/C/figures/Help_Import_QIF_Druid.png and b/help/C/figures/Help_Import_QIF_Druid.png differ
diff --git a/help/C/figures/Help_Import_Transaction_matcher_1.png b/help/C/figures/Help_Import_Transaction_matcher_1.png
index f720698..d91a02a 100644
Binary files a/help/C/figures/Help_Import_Transaction_matcher_1.png and b/help/C/figures/Help_Import_Transaction_matcher_1.png differ

commit 9288c2ca4f86e826bfac3d701ea82c24a87e1ef3
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Sep 30 15:53:35 2019 +0200

    Review of PR #127

diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index cf452f6..402eb1f 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -489,14 +489,14 @@ Author:
     <menuchoice><guimenu>Actions</guimenu><guimenuitem>Split Transaction</guimenuitem></menuchoice>. The part of the
     transaction that needs to be deleted can be then selected for deletion.</para>
   </sect1>
-  
+
   <sect1 id="trans-reverse">
      <title>Add Reversing Transaction</title>
-     
+
      <para>In formal accounting, transactions should never be deleted or altered. Instead, when a mistake is made, the original transaction remains in the ledger, and a reversing transaction is added to the ledger. This <emphasis>reversing transaction</emphasis> restores the ledger to its state before the error, allowing the user to enter the transaction again correctly.</para>
-        
+
       <para>While a user can certainly enter reversing transactions manually, <application>&appname;</application> includes a menu option (<menuchoice><guimenu>Transaction</guimenu><guimenuitem>Add Reversing Transaction</guimenuitem></menuchoice>) that can quickly create the reversing transaction for you. This option only appears when you are in an account register. When you are in the transaction that needs to be reversed, all you need to do is select this menu item, and a duplicate transaction that reverses the active transaction is immediately created.</para>
-        
+
         <note><para>Once you choose the menu item, a reversing transaction is immediately created in the account using the current date. You may wish to locate the new transaction at the end of the register, and add explanatory notes to it.</para></note>
   </sect1>
 
@@ -723,7 +723,7 @@ Author:
   </sect1>
   <sect1 id="sched-editor">
     <title>Edit Scheduled Transaction Window</title>
-<!-- Todo: has been redesigned --> 
+<!-- Todo: has been redesigned -->
     <para>The Edit Scheduled Transaction Window is divided into a Name area, Options area, Occurrences area,
     Recurrence Frequency area, mini calendar and Template Transaction pane.</para>
 
@@ -865,19 +865,19 @@ Author:
   </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 
+
+    <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 
+    <para>All transactions will also need to have a <emphasis role="bold">destination</emphasis> account for
             any other splits associated with the tansaction. These may or may not be supplied in the imported data,
             depending upon the data source and the format of the data. If it is not, <application>&appname;</application>
             may be able to assign an account on the basis of the previous import history by matching infomation in
-            the imported data to data associated with previous account assignments in the importer. The user may 
-            always over-ride this automatic assignment or where no assignment can be made automatically assign an account manually. 
+            the imported data to data associated with previous account assignments in the importer. The user may
+            always over-ride this automatic assignment or where no assignment can be made automatically assign an account manually.
     </para>
     <para>Multi-split data  exported from <application>&appname;</application> in CSV format will normally have both the import
        and destination accountsfor transaction splits specified in the data file.
@@ -885,35 +885,35 @@ Author:
     <sect2 id="trans-import-formats">
       <title>Import Formats</title>
       <para><application>&appname;</application> allows transactions to be imported in a number of structured formats
-        for the exchange of financial data as well as in the unstructured CSV format, a plain text tabular format 
+        for the exchange of financial data as well as in the unstructured CSV format, a plain text tabular format
         commonly used for the import and export of data to and from  spreadsheets:
       </para>
       <itemizedlist>
-        <listitem><para><emphasis role="bold"><link linkend="trans-import-qif">QIF</link></emphasis> 
+        <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> 
+        <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> 
+        <listitem><para><emphasis role="bold"><link linkend="trans-import-csv">CSV</link></emphasis>
              (.csv)  Comma Separated Values;</para></listitem>
-        <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">MT940</link></emphasis> 
+        <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">MT940</link></emphasis>
                SWIFT MT940 Customer End of Day Statement Message;</para></listitem>
-        <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">MT942</link></emphasis> 
+        <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">MT942</link></emphasis>
                SWIFT MT942 Customer Intra-day Transaction Report;</para></listitem>
-        <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">DTAUS</link></emphasis> 
+        <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">DTAUS</link></emphasis>
              (.DTAUS)  Banking data Exchange File;</para></listitem>
-      </itemizedlist>      
+      </itemizedlist>
       <para>These import methods can be accessed from the <guisubmenu>Import</guisubmenu> submenu
             of the main menu <guimenu>File</guimenu> entry, along with methods for importing
             other types of data. Select the appropriate entry in the <guisubmenu>Import</guisubmenu>
             sub menu to initiate importing transactions.
-      </para>      
+      </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 
+            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>
@@ -928,7 +928,7 @@ Author:
           from the menu to open the QIF Import dialog box illustrated below.
         </para>
         <figure pgwide="1">
-          <title>Import QIF files dialog window.</title>
+          <title>The Import QIF Files Assistent</title>
           <screenshot id="ImportQIFDruid">
             <mediaobject>
               <imageobject role="html">
@@ -942,7 +942,7 @@ Author:
         </figure>
         <formalpara>
           <title>Dialog Navigation</title>
-        	<para>The right hand pane will display some or all of the following navigation buttons:
+          <para>The right hand pane will display some or all of the following navigation buttons:
           <itemizedlist>
             <listitem><para><emphasis role="bold"><guibutton>Cancel</guibutton></emphasis>: Exit the dialog;</para>
             </listitem>
@@ -961,35 +961,35 @@ Author:
           in the left hand pane. The import process steps are:
           <itemizedlist>
             <listitem>
-              <para><emphasis role="bold"><guilabel>Import of QIF files</guilabel></emphasis>: Initial informational panel. 
+              <para><emphasis role="bold"><guilabel>Import of QIF files</guilabel></emphasis>: Initial informational panel.
                 Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to proceed;
               </para>
             </listitem>
             <listitem>
-              <para><emphasis role="bold"><guilabel>Select a QIF file to load</guilabel></emphasis>: Open a file selection dialog. 
+              <para><emphasis role="bold"><guilabel>Select a QIF file to load</guilabel></emphasis>: Open a file selection dialog.
                 Navigate to and select the file you wish to import and click <emphasis role="bold"><guibutton>Import</guibutton></emphasis>.
                 Then click <emphasis role="bold"><guibutton>Next</guibutton></emphasis>;
               </para>
             </listitem>
             <listitem>
               <para><emphasis role="bold"><guilabel>Load QIF files</guilabel></emphasis>: Click the <emphasis role="bold"><guibutton>Start</guibutton></emphasis>
-                button to load the file. The file will be parsed and loaded. If errors or warnings occur you may have to remove the file, edit it and reimport it. If there are no 
+                button to load the file. The file will be parsed and loaded. If errors or warnings occur you may have to remove the file, edit it and reimport it. If there are no
                 errors click <emphasis role="bold"><guibutton>Next</guibutton></emphasis>;
               </para>
             </listitem>
             <listitem>
-              <para><emphasis role="bold"><guilabel>Set a date format for the file</guilabel></emphasis>: Select a date format (m-d-y or d-m-y) 
+              <para><emphasis role="bold"><guilabel>Set a date format for the file</guilabel></emphasis>: Select a date format (m-d-y or d-m-y)
                 appropriate to the locale of the source of your QIF file. In the US this is generally m-d-y and in Europe d-m-y;
               </para>
             </listitem>
             <listitem>
               <para><emphasis role="bold"><guilabel>Set the default QIF account name</guilabel></emphasis>: If the QIF file does
-                not specify an account name, enteran account name. If importing data 
+                not specify an account name, enter an account name. If importing data
                 from another accounting program you should use the name used in that program;
               </para>
             </listitem>
             <listitem>
-              <para><emphasis role="bold"><guilabel>QIF files you have loaded</guilabel></emphasis>: This step allows you to edit the 
+              <para><emphasis role="bold"><guilabel>QIF files you have loaded</guilabel></emphasis>: This step allows you to edit the
                 list of files to be imported and to load additional files. To remove a file,
                 click on the row and then click on <emphasis role="bold"><guibutton>Unload selected file</guibutton></emphasis>. To load another
                 file click the <emphasis role="bold"><guibutton>Load another file</guibutton></emphasis>. When you have all the files you wish
@@ -1004,7 +1004,7 @@ Author:
             <listitem>
               <para><emphasis role="bold"><guilabel>Match QIF accounts with &appname; accounts</guilabel></emphasis>: QIF account
                 names are matched to <application>&appname;</application> accounts if possible. New <application>&appname;</application>
-                accounts are created if no matching accounts are found. For stock, the required account structures are also created. 
+                accounts are created if no matching accounts are found. For stock, the required account structures are also created.
                 Created accounts are indicated by checking the checkbox in the New column. Assigned accounts may be edited by
                 selecting the appropriate the row and clicking on the <emphasis role="bold"><guibutton>Change &appname; Account</guibutton></emphasis>
                 button to to run the account selection dialog;
@@ -1013,15 +1013,15 @@ Author:
             <listitem>
               <para><emphasis role="bold"><guilabel>Income and Expense categories</guilabel></emphasis>: Information panel.
                 Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to proceed;
-           	</para>
+              </para>
             </listitem>
             <listitem>
-              <para><emphasis role="bold"><guilabel>Match QIF categories to GnuCash accounts</guilabel></emphasis>: QIF categories
+              <para><emphasis role="bold"><guilabel>Match QIF categories to &appname; accounts</guilabel></emphasis>: QIF categories
                 are matched to <application>&appname;</application> accounts where possible. New <application>&appname;</application>
                 accounts are created where no matching <application>&appname;</application> account is found. Created accounts are
                 indicated by the checkbox in the New column being checked. If you are not sure what changes are needed, it is safe to
                 accept the <application>&appname;</application> account names. These may be changed later in <application>&appname;</application>.
-                Assigned accounts may be edited by selecting the appropriate row and clicking on the 
+                Assigned accounts may be edited by selecting the appropriate row and clicking on the
                 <emphasis role="bold"><guibutton>Change &appname; Account</guibutton></emphasis> button to run the account selection dialog;
               </para>
             </listitem>
@@ -1030,9 +1030,9 @@ Author:
                 Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to proceed;</para>
             </listitem>
             <listitem>
-              <para><emphasis role="bold"><guilabel>Match payees/memos to GnuCash accounts</guilabel></emphasis>: QIF payees and memos are 
-                matched to GnuCash accounts where possible and new accounts are created where this is not possible again
-                indicated by the checkbox in the New column. The assigned account may be changed by selecting a row and clicking on the 
+              <para><emphasis role="bold"><guilabel>Match payees/memos to &appname; accounts</guilabel></emphasis>: QIF payees and memos are
+                matched to &appname; accounts where possible and new accounts are created where this is not possible again
+                indicated by the checkbox in the New column. The assigned account may be changed by selecting a row and clicking on the
                 <emphasis role="bold"><guibutton>Change &appname; Account</guibutton></emphasis> button to to run the account selection dialog;
               </para>
             </listitem>
@@ -1046,8 +1046,8 @@ Author:
               </para><!--FIXME when implemented.-->
             </listitem>
             <listitem>
-              <para><emphasis role="bold"><guilabel>QIF Import</guilabel></emphasis>
-                : Click on <emphasis role="bold"><guibutton>Start</guibutton></emphasis> to begin the import. <application>&appname;</application> 
+              <para><emphasis role="bold"><guilabel>QIF Import</guilabel></emphasis>:
+                Click on <emphasis role="bold"><guibutton>Start</guibutton></emphasis> to begin the import. <application>&appname;</application>
                 currently proceeds to the Update your <application>&appname;</application> accounts tab if the import is successful;
               </para>
             </listitem>
@@ -1060,7 +1060,7 @@ Author:
               </para><!--FIXME when implemented.-->
             </listitem>
             <listitem>
-              <para><emphasis role="bold"><guilabel>Update yourGnuCash accounts</guilabel></emphasis>: Click
+              <para><emphasis role="bold"><guilabel>Update your &appname; accounts</guilabel></emphasis>: Click
                 <emphasis role="bold"><guibutton>Apply</guibutton></emphasis> to complete the import. 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,
@@ -1070,7 +1070,7 @@ Author:
               <para>Other features are not currently implemented;<!--FIXME when implemented.--></para>
             </listitem>
             <listitem>
-              <para><emphasis role="bold"><guilabel>QIF Import Summary</guilabel></emphasis>: Click on 
+              <para><emphasis role="bold"><guilabel>QIF Import Summary</guilabel></emphasis>: Click on
                 <emphasis role="bold"><guibutton>Close</guibutton></emphasis> to exit the wizard.
               </para>
             </listitem>
@@ -1079,29 +1079,29 @@ Author:
         </formalpara>
       </sect3>
     </sect2>
-    
+
     <sect2 id="trans-import-ofx">
       <title>Import OFX/QFX</title>
       <para><guimenu>File</guimenu>-><guisubmenu>Import</guisubmenu>-><guimenuitem>Import OFX/QFX transactions</guimenuitem>
-        opens a file selection dialog. Navigate to the file you wish to import, select a file with 
+        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"><guibutton>Import</guibutton></emphasis> button.</para>
       <para><application>&appname;</application> then opens an Account Selection dialog to select an account in your CoA to match to an account name in the import file. Select
-        the appropriate account from the account tree and press the <emphasis role="bold"><guibutton>OK</guibutton></emphasis> button. On subsequent import of files from the 
+        the appropriate account from the account tree and press the <emphasis role="bold"><guibutton>OK</guibutton></emphasis> button. On subsequent import of files from the
         same source account, the mapped <application>&appname;</application> account 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>      
+      </para>
     </sect2>
-    
+
     <sect2 id="trans-import-csv">
       <title>Import CSV</title>
       <para>Clicking on <emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Import</guisubmenu>-><guimenuitem>Import Transactions from CSV</guimenuitem></emphasis>
         will bring up the CSV Transaction Import Assistant dialog illustrated below.
       </para>
       <figure pgwide="1">
-        <title>CSV Transaction Import Assistant</title>
+        <title>The CSV Transaction Import Assistant - Introduction</title>
         <screenshot id="CSV_Transaction_Import_Assistant">
           <mediaobject>
             <imageobject role="html">
@@ -1115,7 +1115,7 @@ Author:
       </figure>
       <para>The CSV Transaction import Assistant is largely self explanatory with information panes which describe the functionality.</para>
       <formalpara>
-      <title>Dialog Navigation</title>  
+      <title>Dialog Navigation</title>
         <para>Each pane displays a selction of the following navigation buttons at the bottom right:
         <itemizedlist>
           <listitem><para><emphasis role="bold"><guibutton>Cancel</guibutton></emphasis> Exit the CSV Transaction Import Assistant;</para></listitem>
@@ -1128,25 +1128,25 @@ Author:
       <formalpara>
       <title>CSV Import Process Steps</title>
       <para>
-        The steps in the CSV import process are listed in the left hand pane with the current step highlighted. 
+        The steps in the CSV import process are listed in the left hand pane with the current step highlighted.
         Explanatory text and the widgets to setup and carry out the step are displayed in the right hand pane.
         The function of the controls in each step is explained below, in the explanatory information in the panes or in tooltips on some controls.
         The steps in the CSV import process are:
       <itemizedlist>
-        <listitem><para><emphasis role="bold">Transaction Import Assistant</emphasis>: Introductory information panel. 
+        <listitem><para><emphasis role="bold">Transaction Import Assistant</emphasis>: Introductory information panel.
           Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to continue;</para>
         </listitem>
         <listitem>
           <para><emphasis role="bold"><guilabel>Select File for Import</guilabel></emphasis>: Display the File selection dialog.
-            Navigate to the file you wish to import then click 
+            Navigate to the file you wish to import then click
             the <emphasis role="bold"><guibutton>Next</guibutton></emphasis> button;
           </para>
         </listitem>
         <listitem>
           <para><emphasis role="bold">Import Preview</emphasis>: The Import Preview pane controls set options
-     	  for the import of CSV data and provides a preview of the data to be imported.
+            for the import of CSV data and provides a preview of the data to be imported.
             <figure pgwide="1">
-              <title>Import Preview Pane with settings to import the data shown.</title>
+              <title>The CSV Import Preview Pane</title>
               <screenshot id="CSV_Import_Preview">
                 <mediaobject>
                   <imageobject role="html">
@@ -1155,6 +1155,7 @@ Author:
                   <imageobject role="fo">
                     <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" format="PNG" srccredit="David Cousens" ></imagedata>
                   </imageobject>
+                  <caption>The CSV Import Preview Pane with settings to import the shown data.</caption>
                 </mediaobject>
               </screenshot>
             </figure>
@@ -1164,7 +1165,7 @@ Author:
                 <para id="trans-import-csv-save"><emphasis role="bold"><guilabel>Load and Save Settings</guilabel></emphasis>: Once you
                   have set all the import parameters, you can save these settings by typing
                   in a setting a unique name in the <guilabel>Load and Save Settings Entry</guilabel> combo box and clicking the
-                  Save icon just to the right of the box. A previously defined settings group can be retrieved by selecting the 
+                  Save icon just to the right of the box. A previously defined settings group can be retrieved by selecting the
                   appropriate setting group name from the dropdown list activated by
                   the down arrow at the right end of the text box. This will set all other settings to the stored values.
                 </para>
@@ -1172,8 +1173,8 @@ Author:
                   the saved settings group selected from the drop down list for the box.
                 </para>
                 <para> The settings group <emphasis role="bold"><guilabel>&appname; Export Settings</guilabel></emphasis>
-                  defines a setting group for used for the export and reimport of <application>&appname;</application> transaction data - use this if 
-                  importing data previously exported from <application>&appname;</application>;  
+                  defines a setting group for used for the export and reimport of <application>&appname;</application> transaction data - use this if
+                  importing data previously exported from <application>&appname;</application>;
                 </para>
               </listitem>
               <listitem>
@@ -1184,12 +1185,13 @@ Author:
                 </para>
               </listitem>
               <listitem>
-                <para><emphasis role="bold"><guilabel>File Format</guilabel></emphasis>:                
+                <para><emphasis role="bold"><guilabel>File Format</guilabel></emphasis>:
                   <itemizedlist>
                     <listitem>
-                      <para><emphasis role="bold"><guilabel>Separators</guilabel></emphasis>: Selecting this radio button will allow 
+                      <para><emphasis role="bold"><guilabel>Separators</guilabel></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
+                        separated. In countries using the comma as decimal separator the semicolon is common as column separator.
+                        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 <guilabel>Custom</guilabel> checkbox. This may
                         be used in combination with any of the predefined separators;
@@ -1214,28 +1216,28 @@ Author:
                 <para><emphasis role="bold"><guilabel>Miscellaneous</guilabel></emphasis>: The miscellaneous settings allow you to set:
                 <itemizedlist>
                   <listitem>
-                    <para><emphasis role="bold"><guilabel>Encoding</guilabel></emphasis>
-                      : This is usually the UTF-8 variant for your locale;</para>
+                    <para><emphasis role="bold"><guilabel>Encoding</guilabel></emphasis>:
+                      This is usually UTF-8, but may differ for files from other sources;</para>
                   </listitem>
                   <listitem>
-                    <para><emphasis role="bold"><guilabel>Date Format</guilabel></emphasis>
-                      : This does not default to the Locale setting so check it matches the data you are importing;</para>
+                    <para><emphasis role="bold"><guilabel>Date Format</guilabel></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"><guilabel>Currency Format</guilabel></emphasis>
-                      : Select the format of the decimal separator (full stop or comma or other) for the currency if the correct value is not supplied by Locale;</para>
+                    <para><emphasis role="bold"><guilabel>Currency Format</guilabel></emphasis>:
+                      Select the format of the decimal separator (full stop or comma or other) for the currency if the correct value is not supplied by Locale;</para>
                   </listitem>
                   <listitem>
-                    <para><emphasis role="bold"><guilabel>Leading Lines to Skip</guilabel></emphasis>
-                      : Select the number of header lines to skip in the imported file;</para>
+                    <para><emphasis role="bold"><guilabel>Leading Lines to Skip</guilabel></emphasis>:
+                      Select the number of header lines to skip in the imported file;</para>
                   </listitem>
                   <listitem>
-                    <para><emphasis role="bold"><guilabel>Trailing Lines to Skip</guilabel></emphasis>
-                      : Select the number of trailing lines to skip in the import file;</para>
+                    <para><emphasis role="bold"><guilabel>Trailing Lines to Skip</guilabel></emphasis>:
+                      Select the number of trailing lines to skip in the import file;</para>
                   </listitem>
                   <listitem>
-                    <para><emphasis role="bold"><guilabel>Skip alternate lines</guilabel></emphasis>
-                      : Use to skip every second line in the import file.</para>                   
+                    <para><emphasis role="bold"><guilabel>Skip alternate lines</guilabel></emphasis>:
+                      Use to skip every second line in the import file.</para>
                   </listitem>
                 </itemizedlist>
                   to match the settings for the file you are importing. Tooltips may also contain information on the setting and options.
@@ -1245,7 +1247,7 @@ Author:
           </para>
           <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>must</emphasis> be specified:
             <itemizedlist>
               <listitem><para><guilabel>Date</guilabel>: of transaction;</para></listitem>
@@ -1260,53 +1262,53 @@ Author:
               <listitem>
                 <para><emphasis role="bold"><guilabel>None</guilabel></emphasis>: The column is not assigned to a transaction
                   data field and is not imported;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Date</guilabel></emphasis>: Ensure the date format in the column matches
                   the Miscellaneous date Format Setting;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
-                <para><emphasis role="bold"><guilabel>Num</guilabel></emphasis>: Transaction Num field - Use for check numbers etc.; </para>                   
+                <para><emphasis role="bold"><guilabel>Num</guilabel></emphasis>: Transaction Num field - Use for check numbers etc.; </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Description</guilabel></emphasis>;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Notes</guilabel></emphasis>;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Transaction Commodity</guilabel></emphasis>;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Void Reason</guilabel></emphasis>;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Action</guilabel></emphasis>;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Account</guilabel></emphasis>: This header should be matched to a column
                   specifying the source account for a transaction if it is present. Otherwise, set the source account in the
                   <emphasis role="bold"><guilabel>Account</guilabel></emphasis> combo box;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Deposit</guilabel></emphasis>: Apply this header to a column containing
-                  the amount of the transaction. Positive amounts in the column generally represent an increase in the account 
-                  balance and negative amounts a decrease in the balance (asset accounts: Checking, Savings). 
+                  the amount of the transaction. Positive amounts in the column generally represent an increase in the account
+                  balance and negative amounts a decrease in the balance (asset accounts: Checking, Savings).
                   In external statements supplied by a bank for a check or savings account, a credit (Cr)
-                  is normally an increase in the account balance and a debit (Dr) a decrease in the 
+                  is normally an increase in the account balance and a debit (Dr) a decrease in the
                   account balance. In the banks eyes, your savings or checking account is a Liability to them;
                 </para>
                 <para>
                   If the amount data is in separate columns for debits and credits you will have
-                  to apply both this heading and the Withdrawal heading. </para>                   
+                  to apply both this heading and the Withdrawal heading. </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Withdrawal</guilabel></emphasis>: Apply this header to a column with the
@@ -1321,48 +1323,48 @@ Author:
               <listitem>
                 <para><emphasis role="bold"><guilabel>Price</guilabel></emphasis>: The price for commodity transactions and/or
                   transactions involving currency exchange;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Memo</guilabel></emphasis>: Additional column containing descriptive
-                  information relevant to one split of a transaction. If in the first line of a multi-split import it will apply 
+                  information relevant to one split of a transaction. If in the first line of a multi-split import it will apply
                   to the source account. In subsequent lines/splits it is applied to the transfer account defined in that
-                  line or allocated to it in the matcher;</para>                   
+                  line or allocated to it in the matcher;</para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Reconciled</guilabel></emphasis>: Apply to a column indicating the
                 reconciliation status of the transaction. This generally only applies to data exported from <application>&appname;</application>;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
-                <para><emphasis role="bold"><guilabel>Reconcile Date</guilabel></emphasis>: Apply to a column which specifies the 
-                  date of reconciliation, generally only for <application>&appname;</application> exported data;</para>                   
+                <para><emphasis role="bold"><guilabel>Reconcile Date</guilabel></emphasis>: Apply to a column which specifies the
+                  date of reconciliation, generally only for <application>&appname;</application> exported data;</para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Transfer Action</guilabel></emphasis>;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>: This header should be applied
                   to a column which specifies the transfer account for the second split of a single line import and/or for
-                  subsequent splits in multiline exported transactions;</para>                   
+                  subsequent splits in multiline exported transactions;</para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Transfer Memo</guilabel></emphasis>: Apply to a column with descriptive
                   information relevant to a split to  a transfer account specified by
-                  <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>;</para>                   
+                  <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>;</para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Transfer Reconciled</guilabel></emphasis>: Apply to a column with
                   reconciliation status information relevant to a split to a transfer account specified by <emphasis role="bold">
                   <guilabel>Transfer Account</guilabel></emphasis>;
-                </para>                   
+                </para>
               </listitem>
               <listitem>
                 <para><emphasis role="bold"><guilabel>Transfer Reconcile Date</guilabel></emphasis>: Apply to a column containing
                   a reconciliation date relevant to a split to a transfer account previously specified in
                   <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>.
-                </para>                   
+                </para>
               </listitem>
             </itemizedlist>
           </para>
@@ -1405,16 +1407,16 @@ Author:
       </formalpara>
       <caution>
         <para>Multi-split imports of multicurrency transactions and commodity
-          transactions are experimental and may currently experience some errors. 
+          transactions are experimental and may currently experience some errors.
           Please experiment and report any bugs encountered.
         </para><!--FIXME remove when bug fixes are incorporated.-->
       </caution>
     </sect2>
-    
+
     <sect2 id="trans-import-MT940-MT942-DTAUS">
-      <title>Import MT940 and MT942 SWIFT and  DTAUS format files</title>
-      <para> The SWIFT MT940 format is used for an end of day statement by banks using the SWIFT network for data exchange. 
-        MT942 is used for an intra-day statement in the same system. DTAUS is a format used with 9 track magnetic tapes 
+      <title>Import MT940 and MT942 SWIFT and DTAUS format files</title>
+      <para> The SWIFT MT940 format is used for an end of day statement by banks using the SWIFT network for data exchange.
+        MT942 is used for an intra-day statement in the same system. DTAUS is a format used with 9 track magnetic tapes
         since 1976 and later with other removable media (floppy disks). DTAUS has not been supported by banks since 1 February 2016.
       </para><!--FIXME replace with link to glossary if and when extended to help -->
       <para>When you select <emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Import</guisubmenu>-></emphasis>
@@ -1424,17 +1426,17 @@ Author:
           <listitem><para><emphasis role="bold"><guimenuitem>Import DTAUS</guimenuitem></emphasis>.</para></listitem>
         </itemizedlist>
         from the menu, <application>&appname;</application> opens a file selection dialog. Navigate to the MT940, MT942 or DTAUS format file
-        you wish to import and then click on the <emphasis role="bold"><guibutton>Import</guibutton></emphasis> button. On the first import of data to a given account specification in the import file, <application>&appname;</application> will 
+        you wish to import and then click on the <emphasis role="bold"><guibutton>Import</guibutton></emphasis> button. On the first import of data to a given account specification in the import file, <application>&appname;</application> will
         bring up an account selection dialog to select an appropriate account into which to import the transactions in the file.
         <application>&appname;</application> will map the account description in the import file onto the selected account and use it for future imports from the same account. The imported transactions
         will then be displayed in the <link linkend="trans-import-matcher"><emphasis role="bold"><guimenuitem>Generic Import Transaction Matcher</guimenuitem></emphasis></link> for review.
       </para>
     </sect2>
-    
+
     <sect2 id="trans-import-matcher">
       <title>Generic Transaction Import Matcher</title>
-      <figure pgwide="1">
-        <title>This is an image of the import transaction matcher window after opening a file to import.</title>
+      <figure id="fig-fil-imp-match" pgwide="1">
+        <title>The Generic Transaction Import Matcher Window</title>
         <screenshot id="ImportMatcherScreenShot">
           <mediaobject>
             <imageobject role="html">
@@ -1443,44 +1445,51 @@ Author:
             <imageobject role="fo">
                         <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" format="PNG" srccredit="David Cousens"></imagedata>
             </imageobject>
+            <caption>This is an image of the import transaction matcher window after opening a file to import.</caption>
           </mediaobject>
         </screenshot>
       </figure>
-      <para>The Import Matcher checks whether an imported transaction matches an existing transaction already recorded in <application>&appname;</application> 
-          within a predefined time window (~+_42 days) for the account into which the transactions are being imported. A match probablity is 
+      <para>The Import Matcher checks whether an imported transaction matches an existing transaction already recorded in <application>&appname;</application>
+          within a predefined time window (~+_42 days) for the account into which the transactions are being imported. A match probablity is
           calculated based on the Date, Amount, Transaction ID's(if present), Check numbers (if present) and the Description
           and split Memo fields. Exact matches will generate a high match probability and flag a transaction as matching an existing
           transaction and therefore not to be imported. If there is a lower quality match to an existing transaction, the imported transaction
           may be flagged for updating of non-matching information in the <application>&appname;</application> record of the matching transaction. These decisions can be overridden by the user.
-      </para> 
+      </para>
       <para>If no matching transaction can be identified the transaction will be flagged for import. The matcher will attempt to assign
           a transfer account based on matches between tokenized information for previously imported transactions stored in lists associated
-          with the transfer accounts which were assigned to them on import. If a good match is obtained, the transfer account is assigned and
-          the transaction is flagged as ready to import. If a transfer account cannot be assigned, the transaction will be flagged for import and manual
+          with the transfer accounts which were assigned to them on import.
+        <itemizedlist>
+          <listitem><para>If a good match is obtained, the transfer account is assigned and
+          the transaction is flagged as ready to import.</para></listitem>
+        <listitem><para>If a transfer account cannot be assigned, the transaction will be flagged for import and manual
           assignment of the transfer account by the user. By default, if no transfer account is assigned, transactions will be assigned to an Imbalance
-          account on import. This is to indicate that they need an appropriate account assigned to them.
+          account on import. This is to indicate that they need an appropriate account assigned to them.</para></listitem>
+        </itemizedlist>
       </para>
       <para>The generic import transaction matcher is invoked when transaction data is imported using any of the following import formats:
-        <itemizedlist>
+        <itemizedlist spacing="compact">
           <listitem><para>QIF;</para></listitem>
           <listitem><para>OFX/QXF;</para></listitem>
           <listitem><para>CSV;</para></listitem>
           <listitem><para>MT940;</para></listitem>
           <listitem><para>MT942;</para></listitem>
           <listitem><para>DTAUS.</para></listitem>
-        </itemizedlist>
-        This window has the following controls:
+        </itemizedlist></para>
+        <para>This window has the following
         <itemizedlist>
+        <title>Controls:</title>
+          <listitem><para><emphasis role="bold"><guilabel>List of downloaded transactions</guilabel></emphasis>: Table containing information from the imported transactions. </para></listitem>
+          <listitem><para><emphasis role="bold"><guibutton>Show the Source Account column</guibutton></emphasis>: Checkbox to displays the account into which the transactions are being
+            imported. This is the second column labelled Account in the screenshot;</para></listitem>
           <listitem><para><emphasis role="bold"><guibutton>Help</guibutton></emphasis>: Display a popup help window;</para></listitem>
           <listitem><para><emphasis role="bold"><guibutton>Cancel</guibutton></emphasis>: Close this window without importing transaction data;</para></listitem>
           <listitem><para><emphasis role="bold"><guibutton>OK</guibutton></emphasis>: Close this window importing transaction data;</para></listitem>
-          <listitem><para><emphasis role="bold"><guibutton>Checkbox-Show the Source Account column</guibutton></emphasis>: This option displays the account into which the transactions are being
-           imported. This is the second column labelled Account in the screenshot;</para></listitem>
-           <listitem><para><emphasis role="bold"><guibutton>List of downloaded transactions</guibutton></emphasis>Table containing information from the imported transactions. </para></listitem>
         </itemizedlist>
       </para>
-      <para> The List of downloaded transactions has the following columns which display the following information for each of the downloaded transactions:</para>
+      <para> The <guilabel>List of downloaded transactions</guilabel> has the following columns which display the following information for each of the downloaded transactions:</para>
       <itemizedlist>
+        <title id="trans-match-col">Columns in <quote>List of Downloaded Transactions</quote></title>
         <listitem><para><emphasis role="bold"><guilabel>Date</guilabel></emphasis> - The date supplied with the downloaded transaction;</para></listitem>
         <listitem><para><emphasis role="bold"><guilabel>Account</guilabel></emphasis> - The import or base account to which the transactions will be imported (optional see above);</para></listitem>
         <listitem><para><emphasis role="bold"><guilabel>Amount</guilabel></emphasis> - The amount of the transaction (split to the import or base account);</para></listitem>
@@ -1496,7 +1505,7 @@ Author:
       <para>In addition to the checkboxes, the import status of each transaction is indicated by the background color of the transaction row. The checkbox state,
         background colors and their meaning are described in <xref linkend="match_status"/>.</para>
       <table id="match_status" frame="all" >
-        <title>Status of transactions</title>
+        <title>Import Status of Transactions</title>
         <tgroup cols="3" rowsep="1" >
           <colspec colwidth="1*+ 1cm" align="center" colsep="1" />
           <colspec colwidth="15*" align="left" colsep="1" />
@@ -1512,27 +1521,27 @@ Author:
             <row>
               <entry morerows='1' valign='middle'><emphasis role="strong">A</emphasis></entry>
               <entry><?dbhtml bgcolor="#FFD700"?><?dbfo bgcolor="#FFD700"?>Gold</entry>
-              <entry><?dbhtml bgcolor="#FFD700"?><?dbfo bgcolor="#FFD700"?>No matches, flagged for input and no transfer account matched – 
+              <entry><?dbhtml bgcolor="#FFD700"?><?dbfo bgcolor="#FFD700"?>No matches, flagged for input and no transfer account matched –
                 Import as a new transaction. Intervention required to select a transfer account.
               </entry>
             </row>
             <row>
               <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>DarkSeaGreen1</entry>
-              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>No matches dtected, flagged for input and a transfer account is matched – 
-                Import as a new transaction. Reconciliation status will be set as cleared(c) on import. Intervention is not required.
+              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>No matches detected, flagged for input and a transfer account is matched –
+                Import as a new transaction. Reconciliation status will be set as cleared (c) on import. Intervention is not required.
               </entry>
             </row>
             <row>
               <entry  valign='middle'><emphasis role="strong">U+C</emphasis></entry>
               <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>DarkSeaGreen1</entry>
-              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>Matches an existing transaction but not exactly on date and/or amount – 
-                Intervention not required, import and update.  Reconciliation status will be set as cleared(n) on import.
+              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>Matches an existing transaction but not exactly on date and/or amount –
+                Intervention not required, import and update.  Reconciliation status will be set as cleared (n) on import.
               </entry>
             </row>
             <row>
               <entry  valign='middle'><emphasis role="strong">C</emphasis></entry>
               <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>DarkSeaGreen1</entry>
-              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>Matches an existing transaction: – 
+              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>Matches an existing transaction: –
                 Not to be imported. The existing transaction reconciliation status will be as cleared (c) on import. Intervention is not required
               </entry>
             </row>
@@ -1550,85 +1559,85 @@ Author:
             </row>
           </tbody>
         </tgroup>
-      </table>    
+      </table>
       <note><para>The colors illustrated here are the defaults for <application>&appname;</application> specified in
         <ulink url="https://github.com/Gnucash/gnucash/blob/maint/gnucash/gnucash-fallback-310.css">gnucash-fallback-310.css</ulink>.
         You may experience different colors if the gtk-3.0 CSS files have been modified</para>
       </note>
-      <para>You may always intervene manually to:
+      <para>You may always intervene manually to
         <itemizedlist>
-          <listitem><para>Change the import action by selecting another checkbox (or none); and/or;</para></listitem>
-          <listitem><para>Manually assign a different transfer account.</para></listitem>
+          <listitem><para>change the import action by selecting another checkbox (or none) and/or</para></listitem>
+          <listitem><para>manually assign a different transfer account</para></listitem>
         </itemizedlist>
         after reviewing the matched transactions and accounts and the automatically selected actions.
       </para>
       <para>Multi row selection is enabled for the list of downloaded transactions. The following operations can be performed on the list of downloaded transactions:</para>
       <itemizedlist>
         <listitem>
-          <para><emphasis role="bold"><keycombo action="click"><mousebutton>Button 1</mousebutton></keycombo> on a row</emphasis>
-        	  : Select this row (row is displayed with a blue background);
-   	     </para>
-   	   </listitem>
+          <para><emphasis role="bold">Click <mousebutton>Button1</mousebutton> on a row</emphasis>:
+           Select this row (row is displayed with a blue background);
+          </para>
+        </listitem>
         <listitem>
-          <para><emphasis role="bold"><keycombo action="double-click"><mousebutton>Button 1</mousebutton></keycombo> on a row</emphasis>
-            : If the transactions is flagged for import (see below) this will open an account selection dialog to select
+          <para><emphasis role="bold">Double-click <mousebutton>Button1</mousebutton> on a row</emphasis>:
+            If the transactions is flagged for import (see below) this will open an account selection dialog to select
             a destination/transfer account to be used in the second split of the imported transaction. You may create a new
             account if necessary in this dialog using the <emphasis role="bold"><guibutton>New Account</guibutton></emphasis>
-            buttonIf the transaction is flagged as matching an existing transaction either for import or updating, 
+            buttonIf the transaction is flagged as matching an existing transaction either for import or updating,
             the match picker dialog is opened to allow the matched transactions to be examined and a correct match selected;
           </para>
         </listitem>
         <listitem>
-          <para><emphasis role="bold"><keycombo action="simul"><keycap>Ctrl</keycap><mousebutton>Button 1</mousebutton></keycombo> on a row</emphasis>
-            : Add the row to a selection of rows (displayed with a blue background) to which a single destination/transfer account may be applied;
+          <para><emphasis role="bold"><keycombo action="simul"><keycap>Ctrl</keycap><mousebutton>Button1</mousebutton></keycombo> on a row</emphasis>:
+            Add the row to a selection of rows (displayed with a blue background) to which a single destination/transfer account may be applied;
           </para>
         </listitem>
         <listitem>
-          <para><emphasis role="bold"><keycombo action="simul"><keycap>Shift</keycap><mousebutton>Button 1</mousebutton></keycombo> on a row</emphasis>
-            : Select all rows between the last selected row and this row and add them to the current selection of rows;
+          <para><emphasis role="bold"><keycombo action="simul"><keycap>Shift</keycap><mousebutton>Button1</mousebutton></keycombo> on a row</emphasis>:
+            Select all rows between the last selected row and this row and add them to the current selection of rows;
           </para>
         </listitem>
         <listitem>
-          <para><emphasis role="bold"><keycombo action="simul"><mousebutton>Button2</mousebutton></keycombo> in the window</emphasis>
-            : Display a popup menu which when clicked in turn opens a dialog to select a single destination/transfer
+          <para><emphasis role="bold">Click <mousebutton>Button2</mousebutton> in the window</emphasis>:
+            Display a popup menu which when clicked in turn opens a dialog to select a single destination/transfer
             account which will be applied to all rows currently selected.
           </para>
         </listitem>
       </itemizedlist>
-      <tip>
+      <important>
         <para>It is important to assign a transfer account to each transaction prior to import of the transactions. Otherwise the tokenized information from the imported transaction
           will not be appended to the list of tokens for an assigned account for use in future matching of transactions to transfer accounts.
         </para>
-      </tip>
+      </important>
       <note>
         <para>Note that "reconciled" in this context does not mean the same as "reconciled" in the process of reconciling an account to an external statement. The reconciliation status of an imported transaction is set to cleared (c) on import of a new transaction
         </para>
       </note>
-    
-      <para>Where a row has been matched to an existing transaction or is to update an existing transaction it will have a DarkSeaGreen background
-        double clicking on the row will bring up the Match Picker dialog which displays detail of the imported . If you,
-        feel the wrong transfer account has been assigned or the matcher has not produced a valid result, you may change the
+
+      <para>Where a row has been matched to an existing transaction or is to update an existing transaction it will have a DarkSeaGreen background.
+        <emphasis role="bold">Double-clicking <mousebutton>Button1</mousebutton></emphasis> on the row will bring up the Match Picker dialog which displays detail of the imported.
+        If you, feel the wrong transfer account has been assigned or the matcher has not produced a valid result, you may change the
         checkbox selection if you disagree with the matcher decisions and you may reassign an assigned transfer account (see below).
       </para>
-      <para>Double clicking on a row marked as New with a <phrase>DarkSeaGreen1</phrase> background
+      <para><emphasis role="bold">Double-clicking <mousebutton>Button1</mousebutton></emphasis> on a row marked as New with a <phrase>DarkSeaGreen1</phrase> background
         and a transfer account assigned to it will bring up the account selection dialog to allow you to
         choose a different transfer account for the second split.
       </para>
-      <para>Double clicking on a row marked New with no transfer account matched with a <phrase>Gold</phrase>
-        background will also bring up the account selection dialog to allow you to assign a suitable 
+      <para><emphasis role="bold">Double-clicking <mousebutton>Button1</mousebutton></emphasis> on a row marked New with no transfer account matched with a <phrase>Gold</phrase>
+        background will also bring up the account selection dialog to allow you to assign a suitable
         transfer account to the transaction.
-      </para> 
+      </para>
      <sect3><title>Assign a Destination Account to a Single Transaction</title>
-        <para>The currently selected row is selected by <mousebutton>left</mousebutton> clicking it. It is displayed with a 
+        <para>The currently selected row is selected by <mousebutton>left</mousebutton> clicking it. It is displayed with a
           <phrase><?dbhtml bgcolor="#6495ED"?><?dbfo bgcolor="#6495ED"?>Cornflower Blue</phrase> background color.</para>
         <para>Double <mousebutton>left</mousebutton> clicking  on a row will select it and open an Account Selection
-          dialog to allow you to assign a transfer account. Select the desired transfer account in the dialog and click <emphasis role="bold"><guibutton>OK</guibutton></emphasis>. 
-          The dialog has a <emphasis role="bold"><guibutton>New Account</guibutton></emphasis> button which will 
-          allow you to create a suitable account if there is no existing account which can be applied as the transfer account.The row 
-          background will change to a <phrase><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>DarkSeaGreen1</phrase> and the assigned destination account will be displayed 
+          dialog to allow you to assign a transfer account. Select the desired transfer account in the dialog and click <emphasis role="bold"><guibutton>OK</guibutton></emphasis>.
+          The dialog has a <emphasis role="bold"><guibutton>New Account</guibutton></emphasis> button which will
+          allow you to create a suitable account if there is no existing account which can be applied as the transfer account.The row
+          background will change to a <phrase><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>DarkSeaGreen1</phrase> and the assigned destination account will be displayed
           in the Info column.
         </para>
-        <para>or alternatively, <mousebutton>left</mousebutton> click on a row to select it followed by a 
+        <para>or alternatively, <mousebutton>left</mousebutton> click on a row to select it followed by a
            <mousebutton>right</mousebutton> click to bring up a popup menu then select
           <guimenuitem>Assign a transfer account</guimenuitem> to display the <guilabel>Account Selection</guilabel> dialog, select the destination account and
            click the <emphasis role="bold"><guibutton>OK</guibutton></emphasis> button.
@@ -1643,68 +1652,67 @@ Author:
         <para>Rows in a selection are displayed with a <phrase><?dbhtml bgcolor="#6495ED"?><?dbfo bgcolor="#6495ED"?>Cornflower Blue</phrase> background.</para>
         <para>Only rows which have the <emphasis role="strong">A</emphasis> checkbox checked and either a <phrase><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>DarkSeaGreen1</phrase>
          or <phrase><?dbhtml bgcolor="#FFD700"?><?dbfo bgcolor="#FFD700"?>Gold</phrase> background colour can be selected for inclusion in a multiple selection. Rows with a
-          <phrase><?dbhtml bgcolor="#FF4040"?><?dbfo bgcolor="#FF4040"?>Brown1</phrase> background or with the <emphasis role="strong">U+C</emphasis>  or <emphasis role="strong">C</emphasis> 
+          <phrase><?dbhtml bgcolor="#FF4040"?><?dbfo bgcolor="#FF4040"?>Brown1</phrase> background or with the <emphasis role="strong">U+C</emphasis>  or <emphasis role="strong">C</emphasis>
           checkboxes checked cannot be selected in a multiple  selection.
         </para>
         <para>To select rows and add rows to a selection either:</para>
         <itemizedlist>
           <listitem>
             <para>
-              <emphasis role="bold"><keycombo action="click"><mousebutton>Button 1</mousebutton></keycombo></emphasis>
+              <emphasis role="bold">Click <mousebutton>Button1</mousebutton></emphasis>
               on first row and then
               <emphasis role="bold"><keycombo action='simul'>
                 <keycap>Ctrl</keycap>
-                <mousebutton>Button 1</mousebutton></keycombo>
+                <mousebutton>Button1</mousebutton></keycombo>
               </emphasis>
               on other rows to add to the selection; or
             </para>
           </listitem>
           <listitem>
             <para>
-              <emphasis role="bold"><keycombo action="click"><mousebutton>Button 1</mousebutton></keycombo></emphasis> on first row and then
+              <emphasis role="bold">Click <mousebutton>Button1</mousebutton></emphasis> on first row and then
               <emphasis role="bold">
                 <keycombo action='simul'>
                   <keycap>Shift</keycap>
-                  <mousebutton>Button 1</mousebutton>
+                  <mousebutton>Button1</mousebutton>
                 </keycombo>
               </emphasis> on another row to select all rows between them.
             </para>
            </listitem>
            <listitem>
             <para>Rubber banding is also enabled so you may also <emphasis role="bold">
-              <keycombo action="press"><mousebutton>Button 1 and Drag</mousebutton></keycombo></emphasis> over rows to create a selection. To
-              add more rows, <emphasis role="bold"><keycombo action="press"><keycap>Ctrl</keycap><mousebutton>Button 1 </mousebutton></keycombo> and
+              hold <mousebutton>Button1</mousebutton> and drag</emphasis> over rows to create a selection. To
+              add more rows, <emphasis role="bold"><keycombo action="press"><keycap>Ctrl</keycap><mousebutton>Button1</mousebutton></keycombo> and
               drag</emphasis> over more rows.
             </para>
            </listitem>
          </itemizedlist>
-        <para>then <emphasis role="bold"><keycombo action="click"><mousebutton>Button 2</mousebutton></keycombo></emphasis> to display a popup menu and then select 
-          <guimenuitem>"Assign a transfer account"</guimenuitem> to open the Account 
+        <para>then <emphasis role="bold"><keycombo action="click"><mousebutton>Button2</mousebutton></keycombo></emphasis> to display a popup menu and then select
+          <guimenuitem>Assign a transfer account</guimenuitem> to open the Account
            Selection dialog. Select the desired destination account (create a new account if necessary) and click the <emphasis role="bold"><guibutton>OK</guibutton></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 <guibutton>OK</guibutton> 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>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 <guibutton>OK</guibutton> button at the bottom of <xref linkend="fig-fil-imp-match"/>.
+          The transactions selected for import will have their splits added to the selected source and destination accounts.
         </para>
-        <para>The tokenized data from the transactions assigned to a given transfer account is stored on exiting from the matcher and is used to 
+        <para>The tokenized data from the transactions assigned to a given transfer account is stored on exiting from the matcher and is used to
           match transactions to the appropriate transfer account in future imports.
         </para>
       </sect3>
     </sect2>
     <sect2 id="trans_match_picker">
       <title>Match Picker</title>
-      <para>The Match Picker allows you to review and edit existing <application>&appname;</application> transactions which have been matched to a transaction being imported. 
+      <para>The Match Picker allows you to review and edit existing <application>&appname;</application> transactions which have been matched to a transaction being imported.
         <keycombo action ="double-click"><mousebutton>Button1</mousebutton></keycombo> on a row with the
-        C checkbox checked to bring this dialog up.
+        <guilabel>C</guilabel> checkbox checked to bring this dialog up.
       </para>
       <figure pgwide="1">
-        <title>The Match Picker dialog window showing existing <application>&appname;</application> transactions matching an imported transaction.</title>
+        <title>The Match Picker Dialog</title>
         <screenshot id="ImportMatcherPicker">
           <mediaobject>
             <imageobject role="html">
@@ -1713,6 +1721,7 @@ Author:
             <imageobject role="fo">
                         <imagedata fileref="figures/Help_Import_MatchPicker.png" format="PNG" srccredit="David Cousens"></imagedata>
             </imageobject>
+            <caption>The Match Picker dialog window showing existing &appname; transactions matching an imported transaction.</caption>
           </mediaobject>
         </screenshot>
       </figure>
@@ -1725,12 +1734,12 @@ Author:
           <listitem><para><emphasis role="bold"><guilabel>Memo</guilabel></emphasis></para></listitem>
           <listitem><para><emphasis role="bold"><guilabel>Balanced</guilabel></emphasis></para></listitem><!--FIXME ????-->
         </itemizedlist>
-        are the same and have the same meaning as in the Generic Import Matcher window with the exception of the Balanced column which
+        are the same and have the same meaning as in <xref linkend="trans-match-col"/> with the exception of the Balanced column which
         gives the amount of the balancing split for the transaction.<!--FIXME not sure what happens here with multisplit transactions -->
       </para>
       <para>The lower pane displays the details of existing <application>&appname;</application> transactions which match this transaction. If no transactions are displayed check the
         <emphasis role="bold"><guilabel>Show Reconciled</guilabel></emphasis> checkbox at the bottom of the panel. The first row in
-        this pane will normally be the auto-matched transaction with the best match score. Other rows will display other existing 
+        this pane will normally be the auto-matched transaction with the best match score. Other rows will display other existing
         transactions which might also be matches for the transaction being imported. The columns in this pane are:
         <itemizedlist>
           <listitem><para><emphasis role="bold"><guilabel>Confidence</guilabel></emphasis>: This column indicateds the confidence of the
@@ -1750,11 +1759,11 @@ Author:
           <!--FIXME  not sure what this column really indicates. Doesn't seem to display the actual action proposed i.e. whether it is to skip importing or to update an existing transaction.-->
         </itemizedlist>
       </para>
-      <para>If you are not happy with the existing transaction that was auto-matched, <keycombo action="click"><mousebutton>Button1</mousebutton></keycombo> on your preferred 
+      <para>If you are not happy with the existing transaction that was auto-matched, <keycombo action="click"><mousebutton>Button1</mousebutton></keycombo> on your preferred
         match to select it and then <keycombo action="click"><mousebutton>Button1</mousebutton></keycombo> the <emphasis role="bold"><guibutton>OK</guibutton></emphasis>.
         The transaction will then be marked as a (manual) match in the Info column of the Import Matcher.
         To exit the dialog without changing the auto-match <keycombo action="click"><mousebutton>Button1</mousebutton></keycombo> on the <emphasis role="bold"><guibutton>Cancel</guibutton></emphasis>.
-      </para>        
+      </para>
     </sect2>
     <sect2 id="ImportMatchEditor">
       <title>Import Match Editor</title>
@@ -1765,7 +1774,7 @@ Author:
         the menu.
       </para>
       <figure pgwide="1">
-        <title>Import Map Editor illustrating typical entries for the Bayesian matcher.</title>
+        <title>The Import Map Editor</title>
         <screenshot>
           <mediaobject>
             <imageobject role="html">
@@ -1774,28 +1783,29 @@ Author:
             <imageobject role="fo">
                         <imagedata fileref="figures/Help_Import_Map_Editor.png" format="PNG" srccredit="David Cousens"></imagedata>
             </imageobject>
+            <caption>The Import Map Editor illustrating typical entries for the Bayesian matcher.</caption>
           </mediaobject>
         </screenshot>
       </figure>
       <para>The three radio buttons at the top of the dialog select the type of data being displayed and edited:
         <itemizedlist>
           <listitem>
-            <para><emphasis role="bold"><guilabel>Bayesian</guilabel></emphasis>
-              : The Bayesian matcher matches a transfer or destination account using
+            <para><emphasis role="bold"><guilabel>Bayesian</guilabel></emphasis>:
+              The Bayesian matcher matches a transfer or destination account using
               the frequency of association of a token string with an assigned transfer/destination account in the Import matcher
-              for a specific source account (the account that the first split of the imported transactionis directed to); 
+              for a specific source account (the account that the first split of the imported transactionis directed to);
             </para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold"><guilabel>Non-Bayesian</guilabel></emphasis>
-              : The Non Bayesian matcher matches the transfer account on the basis of the occurrence of a token string in
+            <para><emphasis role="bold"><guilabel>Non-Bayesian</guilabel></emphasis>:
+              The Non Bayesian matcher matches the transfer account on the basis of the occurrence of a token string in
               transactions assigned to a transfer/destination account and does not record the frequency of association. This
               was the original <application>&appname;</application> matching process and has now been superceeded by the Bayesian matcher in more recent versions;
             </para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold"><guilabel>OnlineiD</guilabel></emphasis>
-              : Online ids are specific strings which identify specific accounts in information downloaded from online sources.
+            <para><emphasis role="bold"><guilabel>OnlineiD</guilabel></emphasis>:
+              Online ids are specific strings which identify specific accounts in information downloaded from online sources.
             they may include account numbers and specific instiution identifiers.
             </para>
           </listitem>
@@ -1804,32 +1814,32 @@ Author:
       <para>The <emphasis role="bold"><guilabel>Bayesian</guilabel></emphasis> matcher data columns are:
         <itemizedlist>
           <listitem>
-            <para><emphasis role="bold"><guilabel>Source Account</guilabel></emphasis>
-              : This is the account into which a transaction has been imported and is normally the first split in an
-              imported record. It may either be specified in the record itself or during the import setup for all 
+            <para><emphasis role="bold"><guilabel>Source Account</guilabel></emphasis>:
+              This is the account into which a transaction has been imported and is normally the first split in an
+              imported record. It may either be specified in the record itself or during the import setup for all
               transactions to be imported. The arrow control at the left of each entry in this column may be used
               to display all the data used in matching a transfer or destination account for transactions which have
               this account as their source split;
             </para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
-              : This column displays a specific token string that has been associated with the allocation of the
+            <para><emphasis role="bold"><guilabel>Match String</guilabel></emphasis>:
+              This column displays a specific token string that has been associated with the allocation of the
               account in the <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis> column as
               a transfer/destination account for transfers to the <guilabel>Source Account</guilabel>;
             </para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>
-              : The account name in this column is a <application>&appname;</application> account name which has been allocated as a 
+            <para><emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>:
+              The account name in this column is a <application>&appname;</application> account name which has been allocated as a
               transfer/destination account in association with the token string in the
               <emphasis role="bold"><guilabel>Match String</guilabel></emphasis> column;
             </para>
           </listitem>
           <listitem>
-             <para><emphasis role="bold"><guilabel>Count of Match String Usage</guilabel></emphasis>
-             : This is the number of times the token string in the <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
-              column has occurred in association with the transfer/destination account specified in the 
+             <para><emphasis role="bold"><guilabel>Count of Match String Usage</guilabel></emphasis>:
+             This is the number of times the token string in the <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
+              column has occurred in association with the transfer/destination account specified in the
               <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis> column for transactions imported to <application>&appname;</application>.
             </para>
           </listitem>
@@ -1844,8 +1854,8 @@ Author:
             <para><emphasis role="bold"><guilabel>Source Account</guilabel></emphasis>;</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold"><guilabel>Based on</guilabel></emphasis>
-              : This identifies the import process in which the <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
+            <para><emphasis role="bold"><guilabel>Based on</guilabel></emphasis>:
+              This identifies the import process in which the <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
               was associated with the transfer destination account in the <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>
               column;
             </para>
@@ -1856,7 +1866,7 @@ Author:
           <listitem>
             <para><emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>.</para>
           </listitem>
-        </itemizedlist> 
+        </itemizedlist>
       </para>
       <para><emphasis role="bold"><guilabel>Online ID</guilabel></emphasis> displays the same columns with the same data as the Non-Bayesian matcher.
       </para>
@@ -1880,7 +1890,7 @@ Author:
       Transactions can be exported in either a single line format (simple layout) which can only be used for transactions with
       two splits and may not allow all the data associated with a transaction to be exported or in a multiline format where
       two or more lines are used for transactions with two or more splits with each splits information on separate lines.
-      Transaction data can be exported either from the currently selected active register or from selected accounts. 
+      Transaction data can be exported either from the currently selected active register or from selected accounts.
       The menu commands to export transactions are:
       <itemizedlist>
         <listitem><para><emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Export</guisubmenu>-><guimenuitem>Export Transactions to CSV</guimenuitem></emphasis>;</para></listitem>
@@ -1921,20 +1931,20 @@ Author:
         </listitem>
       </itemizedlist>
     </para>
-    <para>Navigation between the steps uses the buttons displayed in the right hand lower corner of the wizard. 
+    <para>Navigation between the steps uses the buttons displayed in the right hand lower corner of the wizard.
       Which of the following buttons are displayed will depend on what is permissible from the step:
       <itemizedlist>
         <listitem>
-          <para><emphasis role="bold"><guilabel>Cancel</guilabel></emphasis>
-            : Exit the wizard without exporting any transactions;</para>
+          <para><emphasis role="bold"><guilabel>Cancel</guilabel></emphasis>:
+            Exit the wizard without exporting any transactions;</para>
         </listitem>
         <listitem>
-          <para><emphasis role="bold"><guilabel>Back</guilabel></emphasis>
-            : Return to the previous step in the wizard;</para>
+          <para><emphasis role="bold"><guilabel>Back</guilabel></emphasis>:
+            Return to the previous step in the wizard;</para>
         </listitem>
         <listitem>
-         <para><emphasis role="bold"><guilabel>Next</guilabel></emphasis>
-           : Proceed to the next step.</para>
+         <para><emphasis role="bold"><guilabel>Next</guilabel></emphasis>:
+           Proceed to the next step.</para>
         </listitem>
      </itemizedlist>
     </para>
@@ -1943,11 +1953,11 @@ Author:
       <para>This step allows you to choose various options in the formattig of the transactions being exported.</para>
       <para>The <emphasis role="bold"><guilabel>Options</guilabel></emphasis> checkboxes may be selected singly or both may be selected together:
         <itemizedlist>
-          <listitem><para><emphasis role="bold"><guilabel>Quotes</guilabel></emphasis>
-            : Surround each data field in quotes;</para>
+          <listitem><para><emphasis role="bold"><guilabel>Quotes</guilabel></emphasis>:
+            Surround each data field in quotes;</para>
           </listitem>
-          <listitem><para><emphasis role="bold"><guilabel>Simple layout</guilabel></emphasis>
-            : If checked, the ouput transaction data will be as displayed in the single row register
+          <listitem><para><emphasis role="bold"><guilabel>Simple layout</guilabel></emphasis>:
+            If checked, the ouput transaction data will be as displayed in the single row register
               view option and some of the transfer detail may be lost.
             </para>
             <para>The column headers for data exported in <emphasis role="bold"><guilabel>Simple layout</guilabel></emphasis> format are:</para>
@@ -1972,7 +1982,7 @@ Author:
                 </listitem>
               </orderedlist>
             <para> If <emphasis role="bold"><guilabel>Simple layout</guilabel></emphasis> is not checked the transaction data will be exported
-              in a multi-line format. 
+              in a multi-line format.
             </para>
             <para>The column headers for a multiline output for a transaction are:</para>
               <orderedlist>
@@ -2007,7 +2017,7 @@ Author:
                 <listitem><para><emphasis role="bold"><guilabel>Reconcile Date</guilabel></emphasis>: first line and subsequent lines;</para>
                 </listitem>
                 <listitem><para><emphasis role="bold"><guilabel>Rate/Price</guilabel></emphasis>: first line and subsequent lines;</para>
-                </listitem>                
+                </listitem>
               </orderedlist>
             <para>Each line contains the data relevant to a single split with the first line also having
               transaction data relevant to all splits in the first 7 columns.
@@ -2017,17 +2027,17 @@ Author:
       </para>
       <para>The <emphasis role="bold"><guilabel>Separators</guilabel></emphasis> radio buttons allow the choice of an alternative column separator:
         <itemizedlist>
-          <listitem><para><emphasis role="bold"><guilabel>Comma(,)</guilabel></emphasis>
-              : This is the default separator;</para>
+          <listitem><para><emphasis role="bold"><guilabel>Comma(,)</guilabel></emphasis>:
+              This is the default separator;</para>
           </listitem>
-          <listitem><para><emphasis role="bold"><guilabel>Colon(:)</guilabel></emphasis>
-              : Use a colon to separate the columns;</para>
+          <listitem><para><emphasis role="bold"><guilabel>Colon(:)</guilabel></emphasis>:
+              Use a colon to separate the columns;</para>
           </listitem>
-          <listitem><para><emphasis role="bold"><guilabel>Semicolon(;)</guilabel></emphasis>
-              : Use a semicolon to separate the columns;</para>
+          <listitem><para><emphasis role="bold"><guilabel>Semicolon(;)</guilabel></emphasis>:
+              Use a semicolon to separate the columns;</para>
           </listitem>
-          <listitem><para><emphasis role="bold"><guilabel>Custom</guilabel></emphasis>
-              : Define a custom character to separate the columns by entering it in the textbox.</para>
+          <listitem><para><emphasis role="bold"><guilabel>Custom</guilabel></emphasis>:
+              Define a custom character to separate the columns by entering it in the textbox.</para>
           </listitem>
         </itemizedlist>
       </para>
@@ -2040,13 +2050,13 @@ Author:
       </para>
       <para>The <emphasis role="bold"><guilabel>Accounts</guilabel></emphasis> panel displays an account
         tree which allows one or more accounts to be selected for export. (<keycombo action="click"><keycap>Ctrl</keycap><mousebutton>Button1></mousebutton></keycombo>
-        and <keycombo action="click"><keycap>Shift</keycap><mousebutton>Button1</mousebutton></keycombo> 
+        and <keycombo action="click"><keycap>Shift</keycap><mousebutton>Button1</mousebutton></keycombo>
         may be used to select accounts). The <emphasis role="bold"><guibutton>Select Subaccounts</guibutton></emphasis>
         button will select all subaccounts of a selected account. The <emphasis role="bold"><guibutton>Select All</guibutton></emphasis>
         button will select all accounts in the account tree for export. The number of accounts which have been selected is indicated.
       </para>
       <para>The <emphasis role="bold"><guilabel>Dates</guilabel></emphasis> panel allows selection of either all
-        transactions or only those within a selected date range in the selected accounts to be exported. 
+        transactions or only those within a selected date range in the selected accounts to be exported.
       </para>
     </sect2>
     <sect2 id="trans-export-choosefile">
@@ -2056,7 +2066,7 @@ Author:
     </sect2>
     <sect2 id="trans-export-now"><title>Export Now...</title>
       <para>The filename and path of the file to be exported and the number of accounts to be exported is displayed.
-        To continue with the export <keycombo action="click"><mousebutton>Button1</mousebutton></keycombo> the <emphasis role="bold"><guibutton>Apply</guibutton></emphasis> button.        
+        To continue with the export <keycombo action="click"><mousebutton>Button1</mousebutton></keycombo> the <emphasis role="bold"><guibutton>Apply</guibutton></emphasis> button.
       </para>
     </sect2>
     <sect2 id="trans-export-summary">
@@ -2090,4 +2100,4 @@ Author:
     by using the "Filter By..." on the View menu.</para>
   </sect1>
 
-</chapter>
\ No newline at end of file
+</chapter>

commit 56dced3c8dae9d23ddbfd3eb574373a2ef3e8f3f
Merge: f1e2ea7 5788142
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Sep 26 22:35:25 2019 +0200

    Merge PR #123 into maint


commit 4fed391c9dc566edf83ebbf701e5a74e4d3227f0
Author: David Cousens <davidcousens at bigpond.com>
Date:   Thu Sep 26 07:44:47 2019 +1000

    Edits to help manual Import and Export TXns to fix comments from fellen

diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index bb4e320..cf452f6 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -28,15 +28,15 @@ Author:
   <title>Common Transaction Operations</title>
 
   <para>A <emphasis>transaction</emphasis> represents the movement of money from one account to another account. Whenever you spend or
-  receive money, or transfer money between accounts, that is a transaction. In <application>&app;</application> transactions always involve
+  receive money, or transfer money between accounts, that is a transaction. In <application>&appname;</application> transactions always involve
   at least two accounts.</para>
 
-  <para><application>&app;</application> uses accounts as a way of grouping or organizing the recording of transactions.
-  This section describes the methods <application>&app;</application> has to help enter transactions
+  <para><application>&appname;</application> uses accounts as a way of grouping or organizing the recording of transactions.
+  This section describes the methods <application>&appname;</application> has to help enter transactions
   quickly into the register. </para>
   <para></para>
 
-  <para><application>&app;</application> has several methods available for entering transactions.</para>
+  <para><application>&appname;</application> has several methods available for entering transactions.</para>
 
   <itemizedlist>
     <listitem>
@@ -66,7 +66,7 @@ Author:
     <guimenuitem>Transfer...</guimenuitem></menuchoice> or its
     shortcut or by pressing the <guibutton>Transfer</guibutton> icon
     from the account register tab, serves two purposes in
-    <application>&app;</application>: <itemizedlist><listitem><para>A way to
+    <application>&appname;</application>: <itemizedlist><listitem><para>A way to
     create a simple (i.e. two-split) transaction between arbitrary
     accounts.</para></listitem> <listitem><para>Collect exchange rate or amount
     information in a multi-currency transaction (see <xref
@@ -117,7 +117,7 @@ Author:
     <para> The <guilabel>Currency Transfer</guilabel> pane is used to
     collect the needed information to enter the amount of the
     <guilabel>Transfer To</guilabel> split. You may enter either a
-    price or an amount and <application>&app;</application> will
+    price or an amount and <application>&appname;</application> will
     compute the other. If you have Online Price Retrieval installed
     (see <xref linkend="Online-price-setup"/>) you can use the
     <guilabel>Fetch Rate</guilabel> button to retrieve a current
@@ -144,7 +144,7 @@ Author:
       split.</para></listitem>
       <listitem><para>Enter the price/exchange rate or the amount in the
       numeric entry corresponding to radio button you
-      selected. <application>&app;</application> will calculate the
+      selected. <application>&appname;</application> will calculate the
       other amount for you when you exit the field. If it's enabled
       you can use the <guilabel>Fetch Rate</guilabel> button to
       retrieve a current quote.</para></listitem>
@@ -154,7 +154,7 @@ Author:
       linkend="invest-stockprice-manual"/>) for the current date quote
       retrieval will not update that price. You must first delete the
       manually-created price in the <guilabel>Price Editor</guilabel>
-      before clicking the <guibutton>Fetch Rate</guibutton>
+      before you <keycombo action="click"><mousebutton>Button1</mousebutton></keycombo>on the <guibutton>Fetch Rate</guibutton>
       button.</para></note>
       <note><para>The <guibutton>Fetch
       Rate</guibutton> button will immediately create or replace a
@@ -190,7 +190,7 @@ Author:
       in the <guilabel>date</guilabel> field by default when the register window is opened.</para>
 
       <note>
-        <para>When working on transactions in <application>&app;</application>, be aware that the
+        <para>When working on transactions in <application>&appname;</application>, be aware that the
         <keycap function="enter">Enter</keycap> key and the <keycap function="tab">Tab</keycap> key behave
         differently, and perform different actions.</para>
         <para>The <keycap function="enter">Enter</keycap> key moves to the first field of the next split,
@@ -209,7 +209,7 @@ Author:
           <para>Selecting the small icon on the right of the date field drops down a date selection calendar.
           Use the arrows to select the correct month and year for the transaction then select the date.
           Selecting the icon once more will close the date selection calendar. It is also possible to
-          type in the date or part of the date and let <application>&app;</application> fill the rest.</para>
+          type in the date or part of the date and let <application>&appname;</application> fill the rest.</para>
         </listitem>
 
         <listitem>
@@ -225,10 +225,10 @@ Author:
         </listitem>
 
         <listitem>
-          <para>At this stage one of two things will happen if tab is pressed. If <application>&app;</application> matches an existing
+          <para>At this stage one of two things will happen if tab is pressed. If <application>&appname;</application> matches an existing
           transaction the cursor will jump to one of the amount fields, automatically filling in the transfer
           account.  Selecting any field with the mouse instead of tabbing will not automatically fill the
-          transferring account field.  If there is no matching (existing) transaction, <application>&app;</application> will move the
+          transferring account field.  If there is no matching (existing) transaction, <application>&appname;</application> will move the
           cursor to the <guilabel>Transfer</guilabel> field with only one line of the transaction supplied.</para>
         </listitem>
 
@@ -241,7 +241,7 @@ Author:
           your chart of accounts, you may want to set the account also to be
           a placeholder account so that it doesn't display here.
           </para>
-          <para> When typing, <application>&app;</application> will
+          <para> When typing, <application>&appname;</application> will
           fill in available accounts as you type. For example, if you
           have <emphasis>Equity</emphasis> and
           <emphasis>Expenses</emphasis> top-level accounts, typing
@@ -300,7 +300,7 @@ Author:
     <title>Multiple Split Transactions</title>
 
     <para>The register window will look slightly different depending on the style options you have chosen.
-    The following describes entering transactions with multiple splits in the basic ledger style. <application>&app;</application> describes
+    The following describes entering transactions with multiple splits in the basic ledger style. <application>&appname;</application> describes
     as a <quote>Split</quote> when money is transferred to or from more than two accounts in a transaction.
     The cursor is placed in the date field by default when the register window is opened.</para>
 
@@ -313,7 +313,7 @@ Author:
         <para>Selecting the triangle icon on the right of the date field drops down a date selection dialog.
         Use the arrows to select the correct month and year for the transaction then select the date. Selecting
         the icon once more will close the date selection calendar. It is also possible to type in the
-        date or part of the date and let <application>&app;</application> fill the rest.</para>
+        date or part of the date and let <application>&appname;</application> fill the rest.</para>
       </listitem>
 
       <listitem>
@@ -329,15 +329,15 @@ Author:
       </listitem>
 
       <listitem>
-        <para>At this stage one of two things will happen if tab is pressed. If <application>&app;</application> matches an existing
+        <para>At this stage one of two things will happen if tab is pressed. If <application>&appname;</application> matches an existing
         transaction the cursor will jump to one of the amount fields, automatically filling in the transfer
         account.  Selecting any field with the mouse instead of tabbing will not automatically fill the
-        transferring account field.  If there is no matching (existing) transaction, <application>&app;</application> will move the
+        transferring account field.  If there is no matching (existing) transaction, <application>&appname;</application> will move the
         cursor to the <guilabel>Transfer</guilabel> field with only one line of the transaction supplied.</para>
       </listitem>
 
       <listitem>
-        <para>When typing in the <guilabel>Transfer</guilabel> field <application>&app;</application> will also attempt to automatically match the account.
+        <para>When typing in the <guilabel>Transfer</guilabel> field <application>&appname;</application> will also attempt to automatically match the account.
         It does this alphabetically, so typing <userinput>Ex</userinput> will match the <computeroutput>Expenses</computeroutput> section of the account list.
         When the section is matched, it is possible to move to a child account by pressing <keycap>:</keycap> (colon).
         If after typing <emphasis>Ex</emphasis> you press <keycap>:</keycap> then the cursor will move to the first child account in the
@@ -375,7 +375,7 @@ Author:
         column name will be blank. The first line contains the description and the amount of the transaction.
         The second line contains the currently opened account name in the <guilabel>Account</guilabel> field and the amount of
         the transaction. The third line contains the transfer account name in the <guilabel>Account</guilabel> field. If the
-        amount is not balanced, <application>&app;</application> will indicate this by placing gray check-boxes in the amount columns
+        amount is not balanced, <application>&appname;</application> will indicate this by placing gray check-boxes in the amount columns
         with the unbalanced amount in a blank last row.</para>
       </listitem>
 
@@ -437,9 +437,9 @@ Author:
     respectively if you've enabled <guilabel>Use formal accounting
     labels</guilabel> in the <guilabel>Accounts</guilabel> tab of
     <guilabel>Preferences</guilabel>). Enter any two and
-    <application>&app;</application> will calculate the other for
+    <application>&appname;</application> will calculate the other for
     you; if you enter 3 and the result doesn't balance
-    <application>&app;</application> will ask which one to change
+    <application>&appname;</application> will ask which one to change
     to make the split balance.</para>
     <para>Registers of other types have only
     <guilabel>Credit</guilabel> and <guilabel>Debit</guilabel> (the
@@ -495,7 +495,7 @@ Author:
      
      <para>In formal accounting, transactions should never be deleted or altered. Instead, when a mistake is made, the original transaction remains in the ledger, and a reversing transaction is added to the ledger. This <emphasis>reversing transaction</emphasis> restores the ledger to its state before the error, allowing the user to enter the transaction again correctly.</para>
         
-      <para>While a user can certainly enter reversing transactions manually, <application>&app;</application> includes a menu option (<menuchoice><guimenu>Transaction</guimenu><guimenuitem>Add Reversing Transaction</guimenuitem></menuchoice>) that can quickly create the reversing transaction for you. This option only appears when you are in an account register. When you are in the transaction that needs to be reversed, all you need to do is select this menu item, and a duplicate transaction that reverses the active transaction is immediately created.</para>
+      <para>While a user can certainly enter reversing transactions manually, <application>&appname;</application> includes a menu option (<menuchoice><guimenu>Transaction</guimenu><guimenuitem>Add Reversing Transaction</guimenuitem></menuchoice>) that can quickly create the reversing transaction for you. This option only appears when you are in an account register. When you are in the transaction that needs to be reversed, all you need to do is select this menu item, and a duplicate transaction that reverses the active transaction is immediately created.</para>
         
         <note><para>Once you choose the menu item, a reversing transaction is immediately created in the account using the current date. You may wish to locate the new transaction at the end of the register, and add explanatory notes to it.</para></note>
   </sect1>
@@ -528,7 +528,7 @@ Author:
       </listitem>
 
       <listitem>
-        <para>The amount is not balanced and <application>&app;</application> will indicate this by placing gray
+        <para>The amount is not balanced and <application>&appname;</application> will indicate this by placing gray
         check-boxes in the amount columns with the unbalanced amount in the blank last
         row.</para>
       </listitem>
@@ -574,7 +574,7 @@ Author:
 
   <sect1 id="trans-stts">
     <title>Setting the reconcile status (<guilabel>R</guilabel> field) of a transaction</title>
-    <para>In the <application>&app;</application> register there is a column labeled <guilabel>R</guilabel>. This field
+    <para>In the <application>&appname;</application> register there is a column labeled <guilabel>R</guilabel>. This field
     indicates the status of a transaction. Possible values are:</para>
 
     <variablelist>
@@ -625,7 +625,7 @@ Author:
     <title>Jump to another Account Register</title>
 
     <para>When using the Account Register Window it is frequently useful to be able to
-    view another account and also the transfer account at the same time. <application>&app;</application> allows you to
+    view another account and also the transfer account at the same time. <application>&appname;</application> allows you to
     do this quickly by using the <guibutton>Jump</guibutton> button available in the <emphasis>Toolbar</emphasis> or
     the <menuchoice><guimenu>Actions</guimenu><guimenuitem>Jump</guimenuitem></menuchoice> menu item in the Account Register Window. </para>
 
@@ -758,15 +758,15 @@ Author:
   <sect1 id="print-check">
     <title>Printing Checks</title>
 
-    <para>Checks are printed in <application>&app;</application> from the account register. <application>&app;</application> provides the
+    <para>Checks are printed in <application>&appname;</application> from the account register. <application>&appname;</application> provides the
     ability to print to several standard Quicken Checks (including US Letter) or to make
     a custom check format. Check position and Date formats are also customizable.</para>
 
-    <para>To print a single check in <application>&app;</application>, select the transaction to print a check for
+    <para>To print a single check in <application>&appname;</application>, select the transaction to print a check for
     and go to <menuchoice><guimenu>File</guimenu><guimenuitem>Print Checks</guimenuitem></menuchoice>.
     This will open the Print Checks properties dialog to print the selected transaction.</para>
 
-    <para>To print multiple checks in <application>&app;</application> execute a search to find the transactions
+    <para>To print multiple checks in <application>&appname;</application> execute a search to find the transactions
     you wish to print.  With the search results window as the front window go to
     <menuchoice><guimenu>File</guimenu><guimenuitem>Print Checks</guimenuitem></menuchoice>. This will open
     the Print Checks properties dialog to print all the transactions in the search results window.</para>
@@ -859,7 +859,7 @@ Author:
     <para>The Units field in the bottom half of the window specifies the units used in
     all the fields in both halves of the window.</para>
 
-    <para>Once <guibutton>OK</guibutton> is pressed on the Print Check dialog the Print <application>&app;</application> Document dialog is presented. Press <guibutton>OK</guibutton>
+    <para>Once <guibutton>OK</guibutton> is pressed on the Print Check dialog the Print <application>&appname;</application> Document dialog is presented. Press <guibutton>OK</guibutton>
     to print the check.</para>
 
   </sect1>
@@ -873,32 +873,36 @@ Author:
             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.
+            any other splits associated with the tansaction. These may or may not be supplied in the imported data,
+            depending upon the data source and the format of the data. If it is not, <application>&appname;</application>
+            may be able to assign an account on the basis of the previous import history by matching infomation in
+            the imported data to data associated with previous account assignments in the importer. The user may 
+            always over-ride this automatic assignment or where no assignment can be made automatically assign an account manually. 
     </para>
-    <para>Multi-split data previously exported from &app; may have both the import and destination accounts
-            for transaction splits specified in the data file.
+    <para>Multi-split data  exported from <application>&appname;</application> in CSV format will normally have both the import
+       and destination accountsfor transaction splits specified in the data file.
     </para>
-    <sect2>
+    <sect2 id="trans-import-formats">
       <title>Import Formats</title>
-      <para>&app; 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>
-          <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">MT940</link></emphasis> 
-               (.STA)  SWIFT MT940 Customer Statement Message;</para></listitem>
-          <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">MT942</link></emphasis> 
-               (.txt  SWIFT MT942 Interim Transaction Report;</para></listitem>
-          <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">DTAUS</link></emphasis> 
-               (.DTAUS)  Banking data Exchange File;</para></listitem>
-        </itemizedlist>
-      
+      <para><application>&appname;</application> allows transactions to be imported in a number of structured formats
+        for the exchange of financial data as well as in the unstructured CSV format, a plain text tabular format 
+        commonly used for the import and export of data to and from  spreadsheets:
+      </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>
+        <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">MT940</link></emphasis> 
+               SWIFT MT940 Customer End of Day Statement Message;</para></listitem>
+        <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">MT942</link></emphasis> 
+               SWIFT MT942 Customer Intra-day Transaction Report;</para></listitem>
+        <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">DTAUS</link></emphasis> 
+             (.DTAUS)  Banking data Exchange File;</para></listitem>
+      </itemizedlist>      
       <para>These import methods can be accessed from the <guisubmenu>Import</guisubmenu> submenu
             of the main menu <guimenu>File</guimenu> entry, along with methods for importing
             other types of data. Select the appropriate entry in the <guisubmenu>Import</guisubmenu>
@@ -908,7 +912,7 @@ Author:
     
     <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),
+      <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.
@@ -919,156 +923,160 @@ Author:
           <menuchoice>
             <guimenu>File</guimenu>
             <guisubmenu>Import</guisubmenu>
-            <guimenuitem>Import QIF</guimenuitem>
+            <guimenuitem>Import QIF...</guimenuitem>
           </menuchoice>
           from the menu to open the QIF Import dialog box illustrated below.
         </para>
-        <screenshot id="ImportQIFDruid">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/Help_Import_QIF_Druid.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
-          </imageobject>
-          <imageobject role="fo">
-                      <imagedata fileref="figures/Help_Import_QIF_Druid.png" format="PNG" srccredit="David Cousens"></imagedata>
-          </imageobject>
-          <textobject>
-            <phrase>Import QIF files dialog window.</phrase>
-          </textobject>
-          <caption><emphasis role="bold">Import QIF files dialog window.</emphasis></caption>
-        </mediaobject>
-        </screenshot>
-        <para>On most panes the dialog has three buttons on the right for navigating through the dialog steps shown in the left pane of the dialog:
+        <figure pgwide="1">
+          <title>Import QIF files dialog window.</title>
+          <screenshot id="ImportQIFDruid">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/Help_Import_QIF_Druid.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+              </imageobject>
+              <imageobject role="fo">
+                          <imagedata fileref="figures/Help_Import_QIF_Druid.png" format="PNG" srccredit="David Cousens"></imagedata>
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
+        <formalpara>
+          <title>Dialog Navigation</title>
+        	<para>The right hand pane will display some or all of the following navigation buttons:
           <itemizedlist>
-            <listitem>
-              <guibutton><emphasis role="bold">Cancel</emphasis></guibutton>
-              <para>Exit the dialog;</para>
+            <listitem><para><emphasis role="bold"><guibutton>Cancel</guibutton></emphasis>: Exit the dialog;</para>
             </listitem>
-            <listitem>
-              <guibutton><emphasis role="bold">Back</emphasis></guibutton>
-              <para>Go back to the previos step;</para>
+            <listitem><para><emphasis role="bold"><guibutton>Back</guibutton></emphasis>: Go back to the previous step;</para>
             </listitem>
-            <listitem>
-              <guibutton><emphasis role="bold">Next</emphasis></guibutton>
-              <para>Proceed to the next step.</para>
+            <listitem><para><emphasis role="bold"><guibutton>Next</guibutton></emphasis>: Proceed to the next step.</para>
             </listitem>
           </itemizedlist>
+          The buttons displayed are determined by whether navigation to the destination step is valid from the current step.
           </para>
-          <para>The dialog lists the steps in the import process in the pane on the left. The pane on the right will contain
-            instructions and/or controls for performing the operations in that step:
+        </formalpara>
+        <formalpara>
+        <title>Import Dialog Steps</title>
+        <para>The left hand pane lists the steps in the import dialog process. The right hand pane contains
+          instructions and/or controls for performing the operations in the step selected and highlighted
+          in the left hand pane. The import process steps are:
           <itemizedlist>
-          <listitem>
-            <emphasis role="bold"><guilabel>Import of QIF files</guilabel></emphasis>
-            <para>Initial informational panel. Click <guibutton><emphasis role="bold">Next</emphasis></guibutton> to proceed;
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Select a QIF file to load</guilabel></emphasis>
-            <para>Open a file selection dialog. Navigate to and select the file you wish to import and click <guibutton><emphasis role="bold">Import</emphasis></guibutton>.
-              Then click <guibutton><emphasis role="bold">Next</emphasis></guibutton>;
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Load QIF files</guilabel></emphasis>
-            <para>Click the <guibutton><emphasis role="bold">Start</emphasis></guibutton>
-              button to load the file. The file will be parsed and loaded. If errors or warnings occur you may have to remove the file, edit it and reimport it. If there are no 
-              errors click <guibutton><emphasis role="bold">Next</emphasis></guibutton>;
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Set a date format for the file</guilabel></emphasis>
-            <para>
-              Select a date format (m-d-y or d-m-y) appropriate to the locale of the source
-              of your QIF file. In the US this is generally m-d-y and in Europe d-m-y;
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Set the default QIF account name</guilabel></emphasis>
-            <para>
-              If the QIF file does not specify an account name, enteran account name. If importing data 
-              from another accounting program you should use the name used in that program;
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>QIF files you have loaded</guilabel></emphasis>
-            <para>This step allows you to edit the list of files to be imported and to load additional files. To remove a file,
-              click on the row and then click on <guibutton><emphasis role="bold">Unload selected file</emphasis></guibutton>. To load another
-              file click the <guibutton><emphasis role="bold">Load another file</emphasis></guibutton>. When you have all the files you wish
-              to import loaded, click <guibutton><emphasis role="bold">Next</emphasis></guibutton>;
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Accounts and stock holdings</guilabel></emphasis><para>Information panel.
-            Click <guibutton><emphasis role="bold">Next</emphasis></guibutton> to proceed;</para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Match QIF accounts with &app; accounts</guilabel></emphasis>
-            <para>QIF account names are matched to &app; accounts if possible. New &app;accounts are created if no matching accounts are
-              found. For stock, the required account structures are also created. Created accounts are indicated by checking
-              the checkbox in the New column. Assigned accounts may be edited by selecting the appropriate the row
-              and clicking on the <guibutton><emphasis role="bold">Change &app; Account</emphasis></guibutton> button to to run the account selection dialog;
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Income and Expense categories</guilabel></emphasis>
-            <para>Information panel. Click <guibutton><emphasis role="bold">Next</emphasis></guibutton> to proceed;</para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Match QIF categories to GnuCash accounts</guilabel></emphasis>
-            <para>QIF categories are matched to &app; accounts where possible. New &app; accounts are created where no matching &app; account 
-              is found. Created accounts are indicated by checking the checkbox in the New column. If you are not sure what
-              changes are needed, it is safe to accept the &app; account names. These may be changed later in &app;.
-              Assigned accounts may be edited by selecting the appropriate row and clicking on the 
-              <guibutton><emphasis role="bold">Change &app; Account</emphasis></guibutton> button to run the account selection dialog;
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Payees and Memos</guilabel></emphasis>
-            <para>Information page. Click <guibutton><emphasis role="bold">Next</emphasis></guibutton> to proceed;</para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Match payees/memos to GnuCash accounts</guilabel></emphasis>
-            <para>QIF payees and memos are matched to GnuCash accounts where possible and new accounts are created where this is not possible 
-              indicated by the checkbox in the New column. The assigned account may be changed by selecting a row and clicking on the 
-              <guibutton><emphasis role="bold">Change &app; Account</emphasis></guibutton> button to to run the account selection dialog;
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Choose the QIF file currency</guilabel></emphasis>
-            <para>Select the required currency from the dropdown list and click on <guibutton><emphasis role="bold">Next</emphasis></guibutton> to continue.</para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Tradable commodities</guilabel></emphasis>
-            <para>Not yet implemented</para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>QIF Import</guilabel></emphasis>
-            <para>Click on <guibutton><emphasis role="bold">Start</emphasis></guibutton> to begin the import. &app; 
-              currently proceeds to the Update your &app; accounts tab if the import is successful.
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Match existing transactions</guilabel></emphasis>
-            <para>Not yet implemented.</para><!--FIXME when implemented.-->
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Select possible duplicates</guilabel></emphasis>
-            <para>Not yet implemented</para><!--FIXME when implemented.-->
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Update yourGnuCash accounts</guilabel></emphasis>
-            <para>Click <guibutton><emphasis role="bold">Apply</emphasis></guibutton> 
-              to complete the import. 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, &app; will return you 
-              to the main window, which should now display the names of the accounts you imported.
-            </para>
-            <para>Other features are not currently implemented.<!--FIXME when implemented.--></para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>QIF Import Summary</guilabel></emphasis>
-            <para>Click on <guibutton><emphasis role="bold">Close</emphasis></guibutton> to exit the wizard.</para>
-          </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Import of QIF files</guilabel></emphasis>: Initial informational panel. 
+                Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to proceed;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Select a QIF file to load</guilabel></emphasis>: Open a file selection dialog. 
+                Navigate to and select the file you wish to import and click <emphasis role="bold"><guibutton>Import</guibutton></emphasis>.
+                Then click <emphasis role="bold"><guibutton>Next</guibutton></emphasis>;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Load QIF files</guilabel></emphasis>: Click the <emphasis role="bold"><guibutton>Start</guibutton></emphasis>
+                button to load the file. The file will be parsed and loaded. If errors or warnings occur you may have to remove the file, edit it and reimport it. If there are no 
+                errors click <emphasis role="bold"><guibutton>Next</guibutton></emphasis>;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Set a date format for the file</guilabel></emphasis>: Select a date format (m-d-y or d-m-y) 
+                appropriate to the locale of the source of your QIF file. In the US this is generally m-d-y and in Europe d-m-y;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Set the default QIF account name</guilabel></emphasis>: If the QIF file does
+                not specify an account name, enteran account name. If importing data 
+                from another accounting program you should use the name used in that program;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>QIF files you have loaded</guilabel></emphasis>: This step allows you to edit the 
+                list of files to be imported and to load additional files. To remove a file,
+                click on the row and then click on <emphasis role="bold"><guibutton>Unload selected file</guibutton></emphasis>. To load another
+                file click the <emphasis role="bold"><guibutton>Load another file</guibutton></emphasis>. When you have all the files you wish
+                to import loaded, click <emphasis role="bold"><guibutton>Next</guibutton></emphasis>;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Accounts and stock holdings</guilabel></emphasis>: Information panel.
+              Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to proceed;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Match QIF accounts with &appname; accounts</guilabel></emphasis>: QIF account
+                names are matched to <application>&appname;</application> accounts if possible. New <application>&appname;</application>
+                accounts are created if no matching accounts are found. For stock, the required account structures are also created. 
+                Created accounts are indicated by checking the checkbox in the New column. Assigned accounts may be edited by
+                selecting the appropriate the row and clicking on the <emphasis role="bold"><guibutton>Change &appname; Account</guibutton></emphasis>
+                button to to run the account selection dialog;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Income and Expense categories</guilabel></emphasis>: Information panel.
+                Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to proceed;
+           	</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Match QIF categories to GnuCash accounts</guilabel></emphasis>: QIF categories
+                are matched to <application>&appname;</application> accounts where possible. New <application>&appname;</application>
+                accounts are created where no matching <application>&appname;</application> account is found. Created accounts are
+                indicated by the checkbox in the New column being checked. If you are not sure what changes are needed, it is safe to
+                accept the <application>&appname;</application> account names. These may be changed later in <application>&appname;</application>.
+                Assigned accounts may be edited by selecting the appropriate row and clicking on the 
+                <emphasis role="bold"><guibutton>Change &appname; Account</guibutton></emphasis> button to run the account selection dialog;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Payees and Memos</guilabel></emphasis>: Information page.
+                Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to proceed;</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Match payees/memos to GnuCash accounts</guilabel></emphasis>: QIF payees and memos are 
+                matched to GnuCash accounts where possible and new accounts are created where this is not possible again
+                indicated by the checkbox in the New column. The assigned account may be changed by selecting a row and clicking on the 
+                <emphasis role="bold"><guibutton>Change &appname; Account</guibutton></emphasis> button to to run the account selection dialog;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Choose the QIF file currency</guilabel></emphasis>: Select the required currency
+                from the dropdown list and click on <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to continue;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Tradable commodities</guilabel></emphasis>: Not yet implemented;
+              </para><!--FIXME when implemented.-->
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>QIF Import</guilabel></emphasis>
+                : Click on <emphasis role="bold"><guibutton>Start</guibutton></emphasis> to begin the import. <application>&appname;</application> 
+                currently proceeds to the Update your <application>&appname;</application> accounts tab if the import is successful;
+              </para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Match existing transactions</guilabel></emphasis>: Not yet implemented;
+              </para><!--FIXME when implemented.-->
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Select possible duplicates</guilabel></emphasis>: Not yet implemented;
+              </para><!--FIXME when implemented.-->
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>Update yourGnuCash accounts</guilabel></emphasis>: Click
+                <emphasis role="bold"><guibutton>Apply</guibutton></emphasis> to complete the import. 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,
+                <application>&appname;</application> will return you to the main window, which should now
+                display the names of the accounts you imported.
+              </para>
+              <para>Other features are not currently implemented;<!--FIXME when implemented.--></para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="bold"><guilabel>QIF Import Summary</guilabel></emphasis>: Click on 
+                <emphasis role="bold"><guibutton>Close</guibutton></emphasis> to exit the wizard.
+              </para>
+            </listitem>
           </itemizedlist>
         </para>
+        </formalpara>
       </sect3>
     </sect2>
     
@@ -1076,10 +1084,10 @@ Author:
       <title>Import OFX/QFX</title>
       <para><guimenu>File</guimenu>-><guisubmenu>Import</guisubmenu>-><guimenuitem>Import OFX/QFX transactions</guimenuitem>
         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 <guibutton><emphasis role="bold">Import</emphasis></guibutton> button.</para>
-      <para>&app; then opens an Account Selection dialog to select an account in your CoA to match to an account name in the import file. Select
-        the appropriate account from the account tree and press the <guibutton><emphasis role="bold">OK</emphasis></guibutton> button. On subsequent import of files from the 
-        same source account, the mapped &app;account is remembered and the account selection dialog is not displayed.
+        the appropriate extension (.ofx  or .qfx), then press the <emphasis role="bold"><guibutton>Import</guibutton></emphasis> button.</para>
+      <para><application>&appname;</application> then opens an Account Selection dialog to select an account in your CoA to match to an account name in the import file. Select
+        the appropriate account from the account tree and press the <emphasis role="bold"><guibutton>OK</guibutton></emphasis> button. On subsequent import of files from the 
+        same source account, the mapped <application>&appname;</application> account 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
@@ -1092,44 +1100,53 @@ Author:
       <para>Clicking on <emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Import</guisubmenu>-><guimenuitem>Import Transactions from CSV</guimenuitem></emphasis>
         will bring up the CSV Transaction Import Assistant dialog illustrated below.
       </para>
-      <screenshot id="CSV_Transaction_Import_Assistant">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata  fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="David Cousens" width="515px"></imagedata>
-          </imageobject>
-          <imageobject role="fo">
-            <imagedata width="515px" fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="David Cousens"></imagedata>
-          </imageobject>
-          <textobject>
-            <phrase>CSV Transaction Import Assistant</phrase>
-          </textobject>
-          <caption><emphasis role="bold">CSV Transaction Import Assistant</emphasis></caption>
-        </mediaobject>
-      </screenshot>
-      <para>The CSV Transaction import Assistant is largely self explanatory with information panes which describe the functionality.
-        Each pane generally has three navigation buttons at the bottom right:
+      <figure pgwide="1">
+        <title>CSV Transaction Import Assistant</title>
+        <screenshot id="CSV_Transaction_Import_Assistant">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata  fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="David Cousens" width="515px"></imagedata>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata width="515px" fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="David Cousens"></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+      <para>The CSV Transaction import Assistant is largely self explanatory with information panes which describe the functionality.</para>
+      <formalpara>
+      <title>Dialog Navigation</title>  
+        <para>Each pane displays a selction of the following navigation buttons at the bottom right:
         <itemizedlist>
-          <listitem><guibutton><emphasis role="bold">Cancel</emphasis></guibutton> Exit the CSV Transaction Import Assistant;</listitem>
-          <listitem><guibutton><emphasis role="bold">Back</emphasis></guibutton> Return to the previous step in the assistant;</listitem>
-          <listitem><guibutton><emphasis role="bold">Next</emphasis></guibutton> Proceed to the next step in the assistant.</listitem>
+          <listitem><para><emphasis role="bold"><guibutton>Cancel</guibutton></emphasis> Exit the CSV Transaction Import Assistant;</para></listitem>
+          <listitem><para><emphasis role="bold"><guibutton>Back</guibutton></emphasis> Return to the previous step in the assistant;</para></listitem>
+          <listitem><para><emphasis role="bold"><guibutton>Next</guibutton></emphasis> Proceed to the next step in the assistant.</para></listitem>
         </itemizedlist>
+        The buttons displayed are determined by the validity of the traget step from the current step.
+        </para>
+      </formalpara>
+      <formalpara>
+      <title>CSV Import Process Steps</title>
+      <para>
         The steps in the CSV import process are listed in the left hand pane with the current step highlighted. 
         Explanatory text and the widgets to setup and carry out the step are displayed in the right hand pane.
         The function of the controls in each step is explained below, in the explanatory information in the panes or in tooltips on some controls.
         The steps in the CSV import process are:
-        <itemizedlist>
-          <listitem><emphasis role="bold">Transaction Import Assistant</emphasis><para>Introductory information panel. 
-            Click <guibutton><emphasis role="bold">Next</emphasis></guibutton> to continue;</para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Select File for Import</guilabel></emphasis>
-            <para>Display the File selection dialog. Navigate to the file you wish to import then click 
-              the <guibutton><emphasis role="bold">Next</emphasis></guibutton> button;
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold">Import Preview</emphasis>
-            <para>The Import Preview pane illustrated below provides controls to set options for the import of CSV data and a preview of the data to be imported.
+      <itemizedlist>
+        <listitem><para><emphasis role="bold">Transaction Import Assistant</emphasis>: Introductory information panel. 
+          Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to continue;</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold"><guilabel>Select File for Import</guilabel></emphasis>: Display the File selection dialog.
+            Navigate to the file you wish to import then click 
+            the <emphasis role="bold"><guibutton>Next</guibutton></emphasis> button;
+          </para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Import Preview</emphasis>: The Import Preview pane controls set options
+     	  for the import of CSV data and provides a preview of the data to be imported.
+            <figure pgwide="1">
+              <title>Import Preview Pane with settings to import the data shown.</title>
               <screenshot id="CSV_Import_Preview">
                 <mediaobject>
                   <imageobject role="html">
@@ -1138,310 +1155,303 @@ Author:
                   <imageobject role="fo">
                     <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" format="PNG" srccredit="David Cousens" ></imagedata>
                   </imageobject>
-                  <textobject>
-                    <phrase>Import Preview Pane</phrase>
-                  </textobject>
-                  <caption><emphasis role="bold">Import Preview Pane with settings to import the data shown.</emphasis></caption>
                 </mediaobject>
-              </screenshot> 
-              <itemizedlist>
-                <listitem>
-                  <emphasis role="bold"><guilabel>Load and Save Settings</guilabel></emphasis>
-                  <para id="trans-import-csv-save">Once you have set all the import parameters, you can save these settings by typing
-                    in a setting a unique name in the <guilabel>Load and Save Settings Entry</guilabel> combo box and clicking the
-                    <inlinemediaobject>
-                      <imageobject role="html"><imagedata fileref="figures/Help_CSV_Import_Transactions_Save.png" align="char" width="46px"></imagedata></imageobject>
-                      <imageobject role="fo"><imagedata fileref="figures/Help_CSV_Import_Transactions_Save.png" align="char" width="46px" ></imagedata></imageobject>
-                      <!--<textobject role="fo"><guibutton><emphasis role="bold">Save</emphasis></guibutton></textobject> -->
-                    </inlinemediaobject> save button just to the right of the box. 
-                    A previously defined settings group can be retrieved by selecting the appropriate setting group name from the dropdown list activated by
-                    the down arrow at the right end of the text box. This will set all other settings to the stored values.
-                  </para>
-                  <para> The 
-                    <inlinemediaobject>
-                      <imageobject role="html"><imagedata fileref="figures/Help_CSV_Import_Transactions_Delete.png" align="char" width="42px"></imagedata></imageobject>
-                      <imageobject role="fo"><imagedata fileref="figures/Help_CSV_Import_Transactions_Delete.png" align="char" width="42px"></imagedata></imageobject>
-                      <!--<textobject role="fo"><guibutton><emphasis role="bold">trashcan</emphasis></guibutton></textobject>-->
-                    </inlinemediaobject> delete button to the right of the Save button can be used to remove
-                    the saved settings group selected from the drop down list for the box.
-                  </para>
-                  <para> The settings group <guilabel><emphasis role="bold">&app; Export Settings</emphasis></guilabel>
-                    defines a setting group for used for the export and reimport of &app; transaction data - use this if 
-                    importing data previously exported from &app;.  
-                  </para>
-                </listitem>
-                <listitem>
-                  <emphasis role="bold"><guilabel>Account</guilabel></emphasis>
-                  <para>If the data you are importing does not specify the source account for the transaction an account can be selected
-                    from the drop down list will import all transactions to the selected account. Leave blank if your imported data
-                    specifies a source account.
-                  </para>
-                </listitem>
-                <listitem><emphasis role="bold"><guilabel>File Format</guilabel></emphasis> 
-                  <para>                 
-                    <itemizedlist>
-                      <listitem>
-                        <emphasis role="bold"><guilabel>Separators</guilabel></emphasis>
-                          <para>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 <guilabel>Custom</guilabel> checkbox. This may be used in combination with any of the 
-                            predefined separators.
-                          </para>
-                      </listitem>
-                      <listitem>
-                        <emphasis role="bold"><guilabel>Fixed-Width</guilabel></emphasis>
-                        <para>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>
-                    </itemizedlist>
-                  </para>
-                </listitem>
-                <listitem>
-                  <emphasis role="bold"><guilabel>Multi-split</guilabel></emphasis>
-                  <para>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>
-                <listitem>
-                  <emphasis role="bold"><guilabel>Miscellaneous</guilabel></emphasis>
-                  <para>The miscellaneous settings allow you to set:</para>
+              </screenshot>
+            </figure>
+            <itemizedlist>
+              <title>Import preview Controls</title>
+              <listitem>
+                <para id="trans-import-csv-save"><emphasis role="bold"><guilabel>Load and Save Settings</guilabel></emphasis>: Once you
+                  have set all the import parameters, you can save these settings by typing
+                  in a setting a unique name in the <guilabel>Load and Save Settings Entry</guilabel> combo box and clicking the
+                  Save icon just to the right of the box. A previously defined settings group can be retrieved by selecting the 
+                  appropriate setting group name from the dropdown list activated by
+                  the down arrow at the right end of the text box. This will set all other settings to the stored values.
+                </para>
+                <para> The delete/trashcan icon to the right of the Save icon can be used to remove
+                  the saved settings group selected from the drop down list for the box.
+                </para>
+                <para> The settings group <emphasis role="bold"><guilabel>&appname; Export Settings</guilabel></emphasis>
+                  defines a setting group for used for the export and reimport of <application>&appname;</application> transaction data - use this if 
+                  importing data previously exported from <application>&appname;</application>;  
+                </para>
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Account</guilabel></emphasis>: If the data you are
+                  importing does not specify the source account for the transaction an account can be selected
+                  from the drop down list will import all transactions to the selected account. Leave blank if your imported data
+                  specifies a source account;
+                </para>
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>File Format</guilabel></emphasis>:                
                   <itemizedlist>
                     <listitem>
-                      <emphasis role="bold"><guilabel>Encoding</guilabel></emphasis>
-                      <para>This is usually the UTF-8 variant for your locale;</para>
+                      <para><emphasis role="bold"><guilabel>Separators</guilabel></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 <guilabel>Custom</guilabel> checkbox. This may
+                        be used in combination with any of the predefined separators;
+                      </para>
                     </listitem>
                     <listitem>
-                      <emphasis role="bold"><guilabel>Date Format</guilabel></emphasis>
-                      <para>This does not default to the Locale setting so check it matches the data you are importing;</para>
-                    </listitem>
-                    <listitem>
-                      <emphasis role="bold"><guilabel>Currency Format</guilabel></emphasis>
-                      <para>Select the format of the decimal separator (full stop or comma or other) for the currency if the correct value is not supplied by Locale;</para>
-                    </listitem>
-                    <listitem>
-                      <emphasis role="bold"><guilabel>Leading Lines to Skip</guilabel></emphasis>
-                      <para>Select the number of header lines to skip in the imported file;</para>
-                    </listitem>
-                    <listitem>
-                      <emphasis role="bold"><guilabel>Trailing Lines to Skip</guilabel></emphasis>
-                      <para>Select the number of trailing lines to skip in the import file;</para>
-                    </listitem>
-                    <listitem>
-                      <emphasis role="bold"><guilabel>Skip alternate lines</guilabel></emphasis>
-                      <para>Use to skip every second line in the import file.</para>                   
+                      <para><emphasis role="bold"><guilabel>Fixed-Width</guilabel></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>
                   </itemizedlist>
-                  <para>to match the settings for the file you are importing. Tooltips may also contain information on the setting and options.</para>
-                </listitem>
-              </itemizedlist>
-            </para>
-            <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>must</emphasis> be specified:
-              <itemizedlist>
-                <listitem><para><guilabel>Date</guilabel>: of transaction;</para></listitem>
-                <listitem><para><guilabel>Account</guilabel>: into which transaction is to be imported (or alternatively set the base account as above);</para></listitem>
-                <listitem><para><guilabel>Description</guilabel>: of the transaction;</para></listitem>
-                <listitem><para><guilabel>Deposit or Withdrawal</guilabel>: column.</para></listitem>
-              </itemizedlist>
-              </para>
-              <para> The dropdown list of &app; transaction data fields which may be associated with a column of the imported data contains the following:
+                </para>
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Multi-split</guilabel></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>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Miscellaneous</guilabel></emphasis>: The miscellaneous settings allow you to set:
                 <itemizedlist>
                   <listitem>
-                    <emphasis role="bold"><guilabel>None</guilabel></emphasis>
-                    <para>The column is not assigned to a transaction data field and is not imported;</para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Date</guilabel></emphasis>
-                    <para>Ensure the date format in the column matches the Miscellaneous date Format Setting;</para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Num</guilabel></emphasis>
-                    <para>Transaction Num field - Use for check numbers etc </para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Description</guilabel></emphasis>
-                    <para></para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Notes</guilabel></emphasis>
-                    <para></para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Transaction Commodity</guilabel></emphasis>
-                    <para></para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Void Reason</guilabel></emphasis>
-                    <para></para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Action</guilabel></emphasis>
-                    <para></para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Account</guilabel></emphasis>
-                    <para>This header should be matched to a column specifying the source account
-                      for a transaction if it is present. Otherwise, set the source account in the
-                      <guilabel><emphasis role="bold">Account</emphasis></guilabel>combo box.
-                    </para>                   
+                    <para><emphasis role="bold"><guilabel>Encoding</guilabel></emphasis>
+                      : This is usually the UTF-8 variant for your locale;</para>
                   </listitem>
                   <listitem>
-                    <emphasis role="bold"><guilabel>Deposit</guilabel></emphasis>
-                    <para>Apply this header to a column containing the amount of the transaction.
-                      Positive amounts in the column generally represent an increase in the account 
-                      balance and negative amounts a decrease in the balance (asset accounts: Checking, Savings). 
-                      In external statements supplied by a bank for a check or savings account, a credit (Cr)
-                      is normally an increase in the account balance and a debit (Dr) a decrease in the 
-                      account balance. In the banks eyes, your savings or checking account is a Liability to them.
-                    </para>
-                    <para>
-                      If the amount data is in separate columns for debits and credits you will have
-                      to apply both this heading and the Withdrawal heading. </para>                   
+                    <para><emphasis role="bold"><guilabel>Date Format</guilabel></emphasis>
+                      : This does not default to the Locale setting so check it matches the data you are importing;</para>
                   </listitem>
                   <listitem>
-                    <emphasis role="bold"><guilabel>Withdrawal</guilabel></emphasis>
-                    <para>Apply this header to a column with the amount of the transaction where positive
-                      amounts in the column represent a decrease in the account balance and negative amounts
-                      an increase in the balance (e.g. Liability account: credit card).
-                    </para>
-                    <para>Where separate columns are used for debits and credit to the account apply it
-                     to the opposite to the column to which Deposits is applied.
-                   </para>
-                   <note>Some experimentation may be necessary to detrmine the correct allocation
-                    of the Deposit and Withdrawal headings.</note>
+                    <para><emphasis role="bold"><guilabel>Currency Format</guilabel></emphasis>
+                      : Select the format of the decimal separator (full stop or comma or other) for the currency if the correct value is not supplied by Locale;</para>
                   </listitem>
                   <listitem>
-                    <emphasis role="bold"><guilabel>Price</guilabel></emphasis>
-                    <para>The price for commodity transactions and/or transactions involving currency exchange.</para>                   
+                    <para><emphasis role="bold"><guilabel>Leading Lines to Skip</guilabel></emphasis>
+                      : Select the number of header lines to skip in the imported file;</para>
                   </listitem>
                   <listitem>
-                    <emphasis role="bold"><guilabel>Memo</guilabel></emphasis>
-                    <para>Additional column containing descriptive information relevant to one split
-                      of a transaction. If in the first line of a multi-split import it will apply 
-                      to the source account. In subsequent lines/splits it is applied to the 
-                      transfer account defined in that line or allocated to it in the matcher.</para>                   
+                    <para><emphasis role="bold"><guilabel>Trailing Lines to Skip</guilabel></emphasis>
+                      : Select the number of trailing lines to skip in the import file;</para>
                   </listitem>
                   <listitem>
-                    <emphasis role="bold"><guilabel>Reconciled</guilabel></emphasis>
-                    <para>Apply to a column indicating the reconciliation status of the transaction.
-                      This generally only applies to data exported from &app;
-                    </para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Reconcile Date</guilabel></emphasis>
-                    <para>Apply to a column which specifies the date of reconciliation. generally
-                      only for &app; exported data.</para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Transfer Action</guilabel></emphasis>
-                    <para></para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>
-                    <para>This header should be applied to a column which specifies the transfer
-                      account for the second split of a single line import and/or for subsequent
-                      splits in multiline exported transactions.</para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Transfer Memo</guilabel></emphasis>
-                    <para>Apply to a column with descriptive information relevant to a split to
-                      a transfer account specified by <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis></para>                   
-                  </listitem>
-                  <listitem>
-                    <emphasis role="bold"><guilabel>Transfer Reconciled</guilabel></emphasis>
-                    <para>Apply to a column with reconciliation status information relevant to
-                      a split to a transfer account specified by <emphasis role="bold">
-                      <guilabel>Transfer Account</guilabel></emphasis>.
-                    </para>                   
-                  </listitem>
-                 <listitem>
-                    <emphasis role="bold"><guilabel>Transfer Reconcile Date</guilabel></emphasis>
-                    <para>Apply to a column containing a reconciliation date relevant to a split
-                      to a transfer account previously specified in <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>.
-                    </para>                   
+                    <para><emphasis role="bold"><guilabel>Skip alternate lines</guilabel></emphasis>
+                      : Use to skip every second line in the import file.</para>                   
                   </listitem>
                 </itemizedlist>
-              </para>
-              <para>
-              The <guilabel>Skip Errors</guilabel> 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 <guibutton><emphasis role="bold">Next</emphasis></guibutton> button.
-            </para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold">Match Import and &app; accounts</emphasis>
-            <para>This window allows you to map the accounts identified in the account columns (Account and Transfer Account) with accounts in the &app; account tree 
-              (Account name). Double click on a row to bring up a dialog to select the matching &app; account. If you have previously imported transactions to this account
-              and account mappings can be matched automatically, this window will not be displayed.
-              When you have selected a match for all accounts, click on the <guibutton><emphasis role="bold">Next</emphasis></guibutton> button.
-            </para>
-          </listitem>
-          <listitem><emphasis role="bold">Transaction Information</emphasis>The Transaction Information
+                  to match the settings for the file you are importing. Tooltips may also contain information on the setting and options.
+                </para>
+              </listitem>
+            </itemizedlist>
+          </para>
+          <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>must</emphasis> be specified:
+            <itemizedlist>
+              <listitem><para><guilabel>Date</guilabel>: of transaction;</para></listitem>
+              <listitem><para><guilabel>Account</guilabel>: into which transaction is to be imported (or alternatively set the base account as above);</para></listitem>
+              <listitem><para><guilabel>Description</guilabel>: of the transaction;</para></listitem>
+              <listitem><para><guilabel>Deposit or Withdrawal</guilabel>: column.</para></listitem>
+            </itemizedlist>
+          </para>
+          <para> The dropdown list of <application>&appname;</application> transaction data fields which may be associated
+            with a column of the imported data contains the following:
+            <itemizedlist>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>None</guilabel></emphasis>: The column is not assigned to a transaction
+                  data field and is not imported;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Date</guilabel></emphasis>: Ensure the date format in the column matches
+                  the Miscellaneous date Format Setting;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Num</guilabel></emphasis>: Transaction Num field - Use for check numbers etc.; </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Description</guilabel></emphasis>;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Notes</guilabel></emphasis>;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transaction Commodity</guilabel></emphasis>;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Void Reason</guilabel></emphasis>;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Action</guilabel></emphasis>;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Account</guilabel></emphasis>: This header should be matched to a column
+                  specifying the source account for a transaction if it is present. Otherwise, set the source account in the
+                  <emphasis role="bold"><guilabel>Account</guilabel></emphasis> combo box;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Deposit</guilabel></emphasis>: Apply this header to a column containing
+                  the amount of the transaction. Positive amounts in the column generally represent an increase in the account 
+                  balance and negative amounts a decrease in the balance (asset accounts: Checking, Savings). 
+                  In external statements supplied by a bank for a check or savings account, a credit (Cr)
+                  is normally an increase in the account balance and a debit (Dr) a decrease in the 
+                  account balance. In the banks eyes, your savings or checking account is a Liability to them;
+                </para>
+                <para>
+                  If the amount data is in separate columns for debits and credits you will have
+                  to apply both this heading and the Withdrawal heading. </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Withdrawal</guilabel></emphasis>: Apply this header to a column with the
+                  amount of the transaction where positive amounts in the column represent a decrease in the account balance
+                  and negative amounts an increase in the balance (e.g. Liability account: credit card).
+                </para>
+                <para>Where separate columns are used for debits and credit to the account apply it
+                 to the opposite to the column to which Deposits is applied;
+               </para>
+               <note><para>Some experimentation may be necessary to determine the correct allocation of the Deposit and Withdrawal headings.</para></note>
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Price</guilabel></emphasis>: The price for commodity transactions and/or
+                  transactions involving currency exchange;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Memo</guilabel></emphasis>: Additional column containing descriptive
+                  information relevant to one split of a transaction. If in the first line of a multi-split import it will apply 
+                  to the source account. In subsequent lines/splits it is applied to the transfer account defined in that
+                  line or allocated to it in the matcher;</para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Reconciled</guilabel></emphasis>: Apply to a column indicating the
+                reconciliation status of the transaction. This generally only applies to data exported from <application>&appname;</application>;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Reconcile Date</guilabel></emphasis>: Apply to a column which specifies the 
+                  date of reconciliation, generally only for <application>&appname;</application> exported data;</para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transfer Action</guilabel></emphasis>;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>: This header should be applied
+                  to a column which specifies the transfer account for the second split of a single line import and/or for
+                  subsequent splits in multiline exported transactions;</para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transfer Memo</guilabel></emphasis>: Apply to a column with descriptive
+                  information relevant to a split to  a transfer account specified by
+                  <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>;</para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transfer Reconciled</guilabel></emphasis>: Apply to a column with
+                  reconciliation status information relevant to a split to a transfer account specified by <emphasis role="bold">
+                  <guilabel>Transfer Account</guilabel></emphasis>;
+                </para>                   
+              </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transfer Reconcile Date</guilabel></emphasis>: Apply to a column containing
+                  a reconciliation date relevant to a split to a transfer account previously specified in
+                  <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>.
+                </para>                   
+              </listitem>
+            </itemizedlist>
+          </para>
+          <para>
+            The <guilabel>Skip Errors</guilabel> 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"><guibutton>Next</guibutton></emphasis> button.
+          </para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Match Import and <application>&appname;</application> accounts</emphasis>: This window allows you
+            to map the accounts identified in the account columns (Account and Transfer Account) with accounts in the
+            <application>&appname;</application> account tree (Account name). Double click on a row to bring up a dialog to select the
+            matching <application>&appname;</application> account. If you have previously imported transactions to this account
+            and account mappings can be matched automatically, this window will not be displayed.
+            When you have selected a match for all accounts, click on the <emphasis role="bold"><guibutton>Next</guibutton></emphasis> button;
+          </para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Transaction Information</emphasis>: The Transaction Information
             panel allows review of data entry settings so far. Clicking Next will perform checks on the data.
-            If there are errors you will be returned to the <emphasis role="bold">Import Preview</emphasis> pane</listitem>
-            to edit the settings. For no errors you proceed to the next step.
-          <listitem>
-            <emphasis role="bold">Match Transactions</emphasis>
-            <para>Clicking on Match Transactions will then bring up the main <link linkend="trans-import-matcher">Import Matcher</link>
-            window. The Import Matcher is described in a separate section below which can be accessed by the link.</para>
-          </listitem>
-          <listitem>
-            <emphasis role="bold">Import Summary</emphasis>
-            <para>&app; displays a summary of the imported data. Click on the <guibutton><emphasis role="bold">Close</emphasis></guibutton> to exit the wizard.</para>
-          </listitem>
-        </itemizedlist>
+            If there are errors you will be returned to the <emphasis role="bold">Import Preview</emphasis> pane
+            to edit the settings. For no errors you proceed to the next step;
+          </para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Match Transactions</emphasis>: Clicking on Match Transactions will then bring up the
+            main <link linkend="trans-import-matcher">Import Matcher</link> window. The Import Matcher is described in a
+            separate section;
+          </para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Import Summary</emphasis>: <application>&appname;</application> displays a summary
+            of the imported data. Click on the <emphasis role="bold"><guibutton>Close</guibutton></emphasis> to exit the wizard.
+          </para>
+        </listitem>
+      </itemizedlist>
       </para>
-      <para><caution>Multi-split imports of multicurrency transactions and commodity
-        transactions are experimental and may currently experience some errors. 
-        Please experiment and report any bugs encountered.</caution></para><!--FIXME remove when bug fixes are incorporated.-->
+      </formalpara>
+      <caution>
+        <para>Multi-split imports of multicurrency transactions and commodity
+          transactions are experimental and may currently experience some errors. 
+          Please experiment and report any bugs encountered.
+        </para><!--FIXME remove when bug fixes are incorporated.-->
+      </caution>
     </sect2>
     
     <sect2 id="trans-import-MT940-MT942-DTAUS">
       <title>Import MT940 and MT942 SWIFT and  DTAUS format files</title>
-      <para>When you select <guimenu><emphasis role="bold">File</emphasis></guimenu>-><guisubmenu><emphasis role="bold">Import</emphasis></guisubmenu>->
+      <para> The SWIFT MT940 format is used for an end of day statement by banks using the SWIFT network for data exchange. 
+        MT942 is used for an intra-day statement in the same system. DTAUS is a format used with 9 track magnetic tapes 
+        since 1976 and later with other removable media (floppy disks). DTAUS has not been supported by banks since 1 February 2016.
+      </para><!--FIXME replace with link to glossary if and when extended to help -->
+      <para>When you select <emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Import</guisubmenu>-></emphasis>
         <itemizedlist>
-          <listitem><guimenuitem><emphasis role="bold">Import MT940</emphasis></guimenuitem> or</listitem>
-          <listitem> <guimenuitem><emphasis role="bold">Import MT942</emphasis></guimenuitem> or</listitem>
-          <listitem> <guimenuitem><emphasis role="bold">Import DTAUS</emphasis></guimenuitem></listitem>
+          <listitem><para><emphasis role="bold"><guimenuitem>Import MT940</guimenuitem></emphasis> or;</para></listitem>
+          <listitem><para><emphasis role="bold"><guimenuitem>Import MT942</guimenuitem></emphasis> or;</para></listitem>
+          <listitem><para><emphasis role="bold"><guimenuitem>Import DTAUS</guimenuitem></emphasis>.</para></listitem>
         </itemizedlist>
-        from the menu, &app; opens a file selection dialog. Navigate to the MT940, MT942 or DTAUS format file
-        you wish to import and then click on the <guibutton><emphasis role="bold">Import</emphasis></guibutton> button. On the first import of data to a given account specification in the import file, &app; will 
+        from the menu, <application>&appname;</application> opens a file selection dialog. Navigate to the MT940, MT942 or DTAUS format file
+        you wish to import and then click on the <emphasis role="bold"><guibutton>Import</guibutton></emphasis> button. On the first import of data to a given account specification in the import file, <application>&appname;</application> will 
         bring up an account selection dialog to select an appropriate account into which to import the transactions in the file.
-        &app; will map the account description in the import file onto the selected account and use it for future imports from the same account. The imported transactions
-        will then be displayed in the <link linkend="trans-import-matcher"><guimenuitem><emphasis role="bold">Generic Import Transaction Matcher</emphasis></guimenuitem></link> for review.
+        <application>&appname;</application> will map the account description in the import file onto the selected account and use it for future imports from the same account. The imported transactions
+        will then be displayed in the <link linkend="trans-import-matcher"><emphasis role="bold"><guimenuitem>Generic Import Transaction Matcher</guimenuitem></emphasis></link> for review.
       </para>
     </sect2>
     
     <sect2 id="trans-import-matcher">
       <title>Generic Transaction Import Matcher</title>
-      <screenshot id="ImportMatcherScreenShot">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
-          </imageobject>
-          <imageobject role="fo">
-                      <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" format="PNG" srccredit="David Cousens"></imagedata>
-          </imageobject>
-          <textobject>
-            <phrase>Generic Import Transaction Matcher window</phrase>
-          </textobject>
-          <caption> This is an image of the import transaction matcher window after opening a file to import.</caption>
-        </mediaobject>
-      </screenshot>
-      <para>The Import Matcher checks whether an imported transaction matches an existing transaction already recorded in &app; 
+      <figure pgwide="1">
+        <title>This is an image of the import transaction matcher window after opening a file to import.</title>
+        <screenshot id="ImportMatcherScreenShot">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+            </imageobject>
+            <imageobject role="fo">
+                        <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" format="PNG" srccredit="David Cousens"></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+      <para>The Import Matcher checks whether an imported transaction matches an existing transaction already recorded in <application>&appname;</application> 
           within a predefined time window (~+_42 days) for the account into which the transactions are being imported. A match probablity is 
           calculated based on the Date, Amount, Transaction ID's(if present), Check numbers (if present) and the Description
           and split Memo fields. Exact matches will generate a high match probability and flag a transaction as matching an existing
           transaction and therefore not to be imported. If there is a lower quality match to an existing transaction, the imported transaction
-          may be flagged for updating of non-matching information in the &app; record of the matching transaction. These decisions can be overridden by the user.
+          may be flagged for updating of non-matching information in the <application>&appname;</application> record of the matching transaction. These decisions can be overridden by the user.
       </para> 
       <para>If no matching transaction can be identified the transaction will be flagged for import. The matcher will attempt to assign
           a transfer account based on matches between tokenized information for previously imported transactions stored in lists associated
@@ -1452,35 +1462,35 @@ Author:
       </para>
       <para>The generic import transaction matcher is invoked when transaction data is imported using any of the following import formats:
         <itemizedlist>
-          <listitem>QIF;</listitem>
-          <listitem>OFX/QXF;</listitem>
-          <listitem>CSV;</listitem>
-          <listitem>MT940;</listitem>
-          <listitem>MT942;</listitem>
-          <listitem>DTAUS.</listitem>
+          <listitem><para>QIF;</para></listitem>
+          <listitem><para>OFX/QXF;</para></listitem>
+          <listitem><para>CSV;</para></listitem>
+          <listitem><para>MT940;</para></listitem>
+          <listitem><para>MT942;</para></listitem>
+          <listitem><para>DTAUS.</para></listitem>
         </itemizedlist>
         This window has the following controls:
         <itemizedlist>
-          <listitem><guibutton><emphasis role="bold">Help</emphasis></guibutton><para>Display a popup help window;</para></listitem>
-          <listitem><guibutton><emphasis role="bold">Cancel</emphasis></guibutton><para>Close this window without importing transaction data;</para></listitem>
-          <listitem><guibutton><emphasis role="bold">OK</emphasis></guibutton><para>Close this window importing transaction data;</para></listitem>
-          <listitem><guibutton><emphasis role="bold">Checkbox-Show the Source Account column</emphasis></guibutton><para>This option displays the account into which the transactions are being
+          <listitem><para><emphasis role="bold"><guibutton>Help</guibutton></emphasis>: Display a popup help window;</para></listitem>
+          <listitem><para><emphasis role="bold"><guibutton>Cancel</guibutton></emphasis>: Close this window without importing transaction data;</para></listitem>
+          <listitem><para><emphasis role="bold"><guibutton>OK</guibutton></emphasis>: Close this window importing transaction data;</para></listitem>
+          <listitem><para><emphasis role="bold"><guibutton>Checkbox-Show the Source Account column</guibutton></emphasis>: This option displays the account into which the transactions are being
            imported. This is the second column labelled Account in the screenshot;</para></listitem>
-           <listitem><guibutton><emphasis role="bold">List of downloaded transactions</emphasis></guibutton><para>Table containing information from the imported transactions. </para></listitem>
+           <listitem><para><emphasis role="bold"><guibutton>List of downloaded transactions</guibutton></emphasis>Table containing information from the imported transactions. </para></listitem>
         </itemizedlist>
       </para>
       <para> The List of downloaded transactions has the following columns which display the following information for each of the downloaded transactions:</para>
       <itemizedlist>
-        <listitem><para><guilabel><emphasis role="bold">Date</emphasis></guilabel> - The date supplied with the downloaded transaction;</para></listitem>
-        <listitem><para><guilabel><emphasis role="bold">Account</emphasis></guilabel> - The import or base account to which the transactions will be imported (optional see above);</para></listitem>
-        <listitem><para><guilabel><emphasis role="bold">Amount</emphasis></guilabel> - The amount of the transaction (split to the import or base account);</para></listitem>
-        <listitem><para><guilabel><emphasis role="bold">Description</emphasis></guilabel> - The description of the transaction;</para></listitem>
-        <listitem><para><guilabel><emphasis role="bold">Memo</emphasis></guilabel> - The memo for the split to the import or base account of the transaction;</para></listitem>
-        <listitem><para><guilabel><emphasis role="bold">A</emphasis></guilabel> - Checkbox which indicates that the transaction is to be imported as a new transaction;</para></listitem>
-        <listitem><para><guilabel><emphasis role="bold">U+C</emphasis></guilabel> - Checkbox which indicates that the transaction matches an existing transaction but has some differences
+        <listitem><para><emphasis role="bold"><guilabel>Date</guilabel></emphasis> - The date supplied with the downloaded transaction;</para></listitem>
+        <listitem><para><emphasis role="bold"><guilabel>Account</guilabel></emphasis> - The import or base account to which the transactions will be imported (optional see above);</para></listitem>
+        <listitem><para><emphasis role="bold"><guilabel>Amount</guilabel></emphasis> - The amount of the transaction (split to the import or base account);</para></listitem>
+        <listitem><para><emphasis role="bold"><guilabel>Description</guilabel></emphasis> - The description of the transaction;</para></listitem>
+        <listitem><para><emphasis role="bold"><guilabel>Memo</guilabel></emphasis> - The memo for the split to the import or base account of the transaction;</para></listitem>
+        <listitem><para><emphasis role="bold"><guilabel>A</guilabel></emphasis> - Checkbox which indicates that the transaction is to be imported as a new transaction;</para></listitem>
+        <listitem><para><emphasis role="bold"><guilabel>U+C</guilabel></emphasis> - Checkbox which indicates that the transaction matches an existing transaction but has some differences
          and the existing transaction will be updated with the different information</para></listitem>
-        <listitem><para><guilabel><emphasis role="bold">C</emphasis></guilabel> - Checkbox which indicates that the transaction matches an existing transaction and will not be imported;</para></listitem>
-        <listitem><para><guilabel><emphasis role="bold">Info</emphasis></guilabel> - For transactions which have been matched to an existing transaction displays a bar indicating the quality of the match
+        <listitem><para><emphasis role="bold"><guilabel>C</guilabel></emphasis> - Checkbox which indicates that the transaction matches an existing transaction and will not be imported;</para></listitem>
+        <listitem><para><emphasis role="bold"><guilabel>Info</guilabel></emphasis> - For transactions which have been matched to an existing transaction displays a bar indicating the quality of the match
          and text indicating whether the transaction is to be imported.</para></listitem>
       </itemizedlist>
       <para>In addition to the checkboxes, the import status of each transaction is indicated by the background color of the transaction row. The checkbox state,
@@ -1541,37 +1551,48 @@ Author:
           </tbody>
         </tgroup>
       </table>    
-      <note><para>The colors illustrated here are the defaults for &app; specified in
+      <note><para>The colors illustrated here are the defaults for <application>&appname;</application> specified in
         <ulink url="https://github.com/Gnucash/gnucash/blob/maint/gnucash/gnucash-fallback-310.css">gnucash-fallback-310.css</ulink>.
         You may experience different colors if the gtk-3.0 CSS files have been modified</para>
       </note>
       <para>You may always intervene manually to:
         <itemizedlist>
-          <listitem> change the import action by selecting another checkbox (or none); and/or</listitem>
-          <listitem>manually assign a different transfer account;</listitem>
+          <listitem><para>Change the import action by selecting another checkbox (or none); and/or;</para></listitem>
+          <listitem><para>Manually assign a different transfer account.</para></listitem>
         </itemizedlist>
         after reviewing the matched transactions and accounts and the automatically selected actions.
       </para>
       <para>Multi row selection is enabled for the list of downloaded transactions. The following operations can be performed on the list of downloaded transactions:</para>
       <itemizedlist>
-        <listitem><emphasis role="bold"><phrase>Single<mousebutton>Left Click</mousebutton> on a row</phrase></emphasis>
-        <para>Select this row (row is displayed with a blue background);</para></listitem>
-        <listitem><emphasis role="bold"><phrase>Double <mousebutton>Left Click</mousebutton> on a row</phrase></emphasis>
-          <para>If the transactions is flagged for import (see below) this will open an account selection dialog to select
+        <listitem>
+          <para><emphasis role="bold"><keycombo action="click"><mousebutton>Button 1</mousebutton></keycombo> on a row</emphasis>
+        	  : Select this row (row is displayed with a blue background);
+   	     </para>
+   	   </listitem>
+        <listitem>
+          <para><emphasis role="bold"><keycombo action="double-click"><mousebutton>Button 1</mousebutton></keycombo> on a row</emphasis>
+            : If the transactions is flagged for import (see below) this will open an account selection dialog to select
             a destination/transfer account to be used in the second split of the imported transaction. You may create a new
             account if necessary in this dialog using the <emphasis role="bold"><guibutton>New Account</guibutton></emphasis>
             buttonIf the transaction is flagged as matching an existing transaction either for import or updating, 
             the match picker dialog is opened to allow the matched transactions to be examined and a correct match selected;
           </para>
         </listitem>
-        <listitem><emphasis role="bold"><phrase><keycap>Ctrl</keycap> <mousebutton>Left Click</mousebutton> on a row</phrase></emphasis>
-          <para>Add the row to a selection of rows (displayed with a blue background) to which a single destination/transfer account may be applied;</para>
+        <listitem>
+          <para><emphasis role="bold"><keycombo action="simul"><keycap>Ctrl</keycap><mousebutton>Button 1</mousebutton></keycombo> on a row</emphasis>
+            : Add the row to a selection of rows (displayed with a blue background) to which a single destination/transfer account may be applied;
+          </para>
         </listitem>
-        <listitem><emphasis role="bold"><phrase><keycap>Shift</keycap> <mousebutton>Left Click</mousebutton> on a row</phrase></emphasis>
-          <para>Select all rows between the last selected row and this row and add them to the current selection of rows;</para>
+        <listitem>
+          <para><emphasis role="bold"><keycombo action="simul"><keycap>Shift</keycap><mousebutton>Button 1</mousebutton></keycombo> on a row</emphasis>
+            : Select all rows between the last selected row and this row and add them to the current selection of rows;
+          </para>
         </listitem>
-        <listitem><emphasis role="bold"><phrase><mousebutton>Right Click</mousebutton> in the window</phrase></emphasis>><para>Display a popup menu which when
-          clicked in turn opens a dialog to select a single destination/transfer account which will be applied to all rows currently selected.</para>
+        <listitem>
+          <para><emphasis role="bold"><keycombo action="simul"><mousebutton>Button2</mousebutton></keycombo> in the window</emphasis>
+            : Display a popup menu which when clicked in turn opens a dialog to select a single destination/transfer
+            account which will be applied to all rows currently selected.
+          </para>
         </listitem>
       </itemizedlist>
       <tip>
@@ -1615,7 +1636,7 @@ Author:
       </sect3>
       <sect3>
         <title>Assign a Destination Account to Multiple Transactions</title>
-        <para>Sometimes you will have several transactions which can have the same destination account. &app;
+        <para>Sometimes you will have several transactions which can have the same destination account. <application>&appname;</application>
               allows you to select multiple transactions and apply the same destination account to all transactions
               in the selection.
         </para>
@@ -1629,35 +1650,35 @@ Author:
         <itemizedlist>
           <listitem>
             <para>
-              <emphasis role="bold"><mousebutton>Left Click</mousebutton></emphasis>
+              <emphasis role="bold"><keycombo action="click"><mousebutton>Button 1</mousebutton></keycombo></emphasis>
               on first row and then
               <emphasis role="bold"><keycombo action='simul'>
                 <keycap>Ctrl</keycap>
-                <mousebutton>Left Click</mousebutton>
-              </keycombo></emphasis>
+                <mousebutton>Button 1</mousebutton></keycombo>
+              </emphasis>
               on other rows to add to the selection; or
             </para>
           </listitem>
           <listitem>
             <para>
-              <emphasis role="bold"><mousebutton>Left Click</mousebutton></emphasis> on first row and then
+              <emphasis role="bold"><keycombo action="click"><mousebutton>Button 1</mousebutton></keycombo></emphasis> on first row and then
               <emphasis role="bold">
                 <keycombo action='simul'>
                   <keycap>Shift</keycap>
-                  <mousebutton>Left Click</mousebutton>
+                  <mousebutton>Button 1</mousebutton>
                 </keycombo>
               </emphasis> on another row to select all rows between them.
             </para>
            </listitem>
            <listitem>
             <para>Rubber banding is also enabled so you may also <emphasis role="bold">
-              <mousebutton>Left Click and Drag</mousebutton></emphasis> over rows to create a selection. To
-              add more rows, hold down <emphasis role="bold"><keycap>Ctrl</keycap></emphasis> and
-              <emphasis role="bold"><mousebutton>Left Click and Drag</mousebutton></emphasis> over more rows.
+              <keycombo action="press"><mousebutton>Button 1 and Drag</mousebutton></keycombo></emphasis> over rows to create a selection. To
+              add more rows, <emphasis role="bold"><keycombo action="press"><keycap>Ctrl</keycap><mousebutton>Button 1 </mousebutton></keycombo> and
+              drag</emphasis> over more rows.
             </para>
            </listitem>
          </itemizedlist>
-        <para>then <emphasis role="bold"><mousebutton>Right Click</mousebutton></emphasis> to display a popup menu and then select 
+        <para>then <emphasis role="bold"><keycombo action="click"><mousebutton>Button 2</mousebutton></keycombo></emphasis> to display a popup menu and then select 
           <guimenuitem>"Assign a transfer account"</guimenuitem> to open the Account 
            Selection dialog. Select the desired destination account (create a new account if necessary) and click the <emphasis role="bold"><guibutton>OK</guibutton></emphasis>
            button in the Account Selection dialog.
@@ -1678,138 +1699,139 @@ Author:
     </sect2>
     <sect2 id="trans_match_picker">
       <title>Match Picker</title>
-      <para>The Match Picker allows you to review and edit existing &app; transactions which have been matched to a transaction being imported. Double Left Click on a row with the
+      <para>The Match Picker allows you to review and edit existing <application>&appname;</application> transactions which have been matched to a transaction being imported. 
+        <keycombo action ="double-click"><mousebutton>Button1</mousebutton></keycombo> on a row with the
         C checkbox checked to bring this dialog up.
       </para>
-      <screenshot id="ImportMatcherPicker">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/Help_Import_MatchPicker.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
-          </imageobject>
-          <imageobject role="fo">
-                      <imagedata fileref="figures/Help_Import_MatchPicker.png" format="PNG" srccredit="David Cousens"></imagedata>
-          </imageobject>
-          <textobject>
-            <phrase>Match Picker Dialog</phrase>
-          </textobject>
-          <caption> The Match Picker dialog window showing existing &app; transactions matching an imported transaction.</caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Match Picker dialog window showing existing <application>&appname;</application> transactions matching an imported transaction.</title>
+        <screenshot id="ImportMatcherPicker">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Help_Import_MatchPicker.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+            </imageobject>
+            <imageobject role="fo">
+                        <imagedata fileref="figures/Help_Import_MatchPicker.png" format="PNG" srccredit="David Cousens"></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
       <para>The top pane of the Match Picker displays details of the first split of the transaction to be imported. The column labels:
         <itemizedlist>
-          <listitem><emphasis role="bold"><guilabel>Account</guilabel></emphasis></listitem>
-          <listitem><emphasis role="bold"><guilabel>Date</guilabel></emphasis></listitem>
-          <listitem><emphasis role="bold"><guilabel>Amount</guilabel></emphasis></listitem>
-          <listitem><emphasis role="bold"><guilabel>Description</guilabel></emphasis></listitem>
-          <listitem><emphasis role="bold"><guilabel>Memo</guilabel></emphasis></listitem>
-          <listitem><emphasis role="bold"><guilabel>Balanced</guilabel></emphasis></listitem><para></para><!--FIXME -->
+          <listitem><para><emphasis role="bold"><guilabel>Account</guilabel></emphasis></para></listitem>
+          <listitem><para><emphasis role="bold"><guilabel>Date</guilabel></emphasis></para></listitem>
+          <listitem><para><emphasis role="bold"><guilabel>Amount</guilabel></emphasis></para></listitem>
+          <listitem><para><emphasis role="bold"><guilabel>Description</guilabel></emphasis></para></listitem>
+          <listitem><para><emphasis role="bold"><guilabel>Memo</guilabel></emphasis></para></listitem>
+          <listitem><para><emphasis role="bold"><guilabel>Balanced</guilabel></emphasis></para></listitem><!--FIXME ????-->
         </itemizedlist>
         are the same and have the same meaning as in the Generic Import Matcher window with the exception of the Balanced column which
         gives the amount of the balancing split for the transaction.<!--FIXME not sure what happens here with multisplit transactions -->
       </para>
-      <para>The lower pane displays the details of existing &app; transactions which match this transaction. If no transactions are displayed check the
+      <para>The lower pane displays the details of existing <application>&appname;</application> transactions which match this transaction. If no transactions are displayed check the
         <emphasis role="bold"><guilabel>Show Reconciled</guilabel></emphasis> checkbox at the bottom of the panel. The first row in
         this pane will normally be the auto-matched transaction with the best match score. Other rows will display other existing 
         transactions which might also be matches for the transaction being imported. The columns in this pane are:
         <itemizedlist>
-          <listitem><emphasis role="bold"><guilabel>Confidence</guilabel></emphasis><phrase>: This column indicateds the confidence of the
+          <listitem><para><emphasis role="bold"><guilabel>Confidence</guilabel></emphasis>: This column indicateds the confidence of the
             individual match as both a bar chart and a numerical value. Where the bar extends into the green, the match is good.
-            If the bar only extend to the red or yellow setions the quality of match is more doubtful.</phrase>
+            If the bar only extend to the red or yellow setions the quality of match is more doubtful.</para>
           </listitem>
-          <listitem><emphasis role="bold"><guilabel>Date</guilabel></emphasis></listitem>
-          <listitem><emphasis role="bold"><guilabel>Amount</guilabel></emphasis><phrase>: If this does not match exactly the amount
+          <listitem><para><emphasis role="bold"><guilabel>Date</guilabel></emphasis></para></listitem>
+          <listitem><para><emphasis role="bold"><guilabel>Amount</guilabel></emphasis>: If this does not match exactly the amount
             of the transaction being imported but otherwise the match is good, the amount of the imported transactions is
-            used to update the existing transaction matching it.</phrase> </listitem>
-          <listitem><emphasis role="bold"><guilabel>Description</guilabel></emphasis></listitem>
-          <listitem><emphasis role="bold"><guilabel>Memo</guilabel></emphasis></listitem>
-          <listitem><emphasis role="bold"><guilabel>Reconciled</guilabel></emphasis><phrase>: Indicates the reconciliation status of a matching existing transaction.</phrase></listitem>
-          <listitem><emphasis role="bold"><guilabel>Pending Action</guilabel></emphasis></listitem>
+            used to update the existing transaction matching it.</para></listitem>
+          <listitem><para><emphasis role="bold"><guilabel>Description</guilabel></emphasis></para></listitem>
+          <listitem><para><emphasis role="bold"><guilabel>Memo</guilabel></emphasis></para></listitem>
+          <listitem><para><emphasis role="bold"><guilabel>Reconciled</guilabel></emphasis>: Indicates the reconciliation
+            status of a matching existing transaction.</para>
+          </listitem>
+          <listitem><para><emphasis role="bold"><guilabel>Pending Action</guilabel></emphasis></para></listitem>
           <!--FIXME  not sure what this column really indicates. Doesn't seem to display the actual action proposed i.e. whether it is to skip importing or to update an existing transaction.-->
         </itemizedlist>
       </para>
-      <para>If you are not happy with the existing transaction that was auto-matched, click on your preferred 
-        match to select it and then click the <emphasis role="bold"><guibutton>OK</guibutton></emphasis>.
+      <para>If you are not happy with the existing transaction that was auto-matched, <keycombo action="click"><mousebutton>Button1</mousebutton></keycombo> on your preferred 
+        match to select it and then <keycombo action="click"><mousebutton>Button1</mousebutton></keycombo> the <emphasis role="bold"><guibutton>OK</guibutton></emphasis>.
         The transaction will then be marked as a (manual) match in the Info column of the Import Matcher.
-        To exit the dialog without changing the auto-match click on the <emphasis role="bold"><guibutton>Cancel</guibutton></emphasis>.
+        To exit the dialog without changing the auto-match <keycombo action="click"><mousebutton>Button1</mousebutton></keycombo> on the <emphasis role="bold"><guibutton>Cancel</guibutton></emphasis>.
       </para>        
     </sect2>
     <sect2 id="ImportMatchEditor">
       <title>Import Match Editor</title>
-      <para>The Import Match Editor allows you to edit the data used by &app; to automatically assign a
+      <para>The Import Match Editor allows you to edit the data used by <application>&appname;</application> to automatically assign a
         transfer account in the Import Matcher. It can be used to edit the data used by the Bayesian
         matcher, the Non-Bayesian matcher and online ID's. To open it select <emphasis role="bold">
         <guimenu>Tools</guimenu>-><guimenuitem>Import Map Editor</guimenuitem></emphasis> from
         the menu.
       </para>
-      <screenshot>
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/Help_Import_Map_Editor.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
-          </imageobject>
-          <imageobject role="fo">
-                      <imagedata fileref="figures/Help_Import_Map_Editor.png" format="PNG" srccredit="David Cousens"></imagedata>
-          </imageobject>
-          <textobject>
-            <phrase>Import Map Editor</phrase>
-          </textobject>
-          <caption>Import Map Editor illustrating typical entries for the Bayesian matcher.</caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Import Map Editor illustrating typical entries for the Bayesian matcher.</title>
+        <screenshot>
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Help_Import_Map_Editor.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+            </imageobject>
+            <imageobject role="fo">
+                        <imagedata fileref="figures/Help_Import_Map_Editor.png" format="PNG" srccredit="David Cousens"></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
       <para>The three radio buttons at the top of the dialog select the type of data being displayed and edited:
         <itemizedlist>
           <listitem>
-            <emphasis role="bold"><guilabel>Bayesian</guilabel></emphasis>
-            <phrase>: The Bayesian matcher matches a transfer or destination account using
+            <para><emphasis role="bold"><guilabel>Bayesian</guilabel></emphasis>
+              : The Bayesian matcher matches a transfer or destination account using
               the frequency of association of a token string with an assigned transfer/destination account in the Import matcher
               for a specific source account (the account that the first split of the imported transactionis directed to); 
-            </phrase>
+            </para>
           </listitem>
           <listitem>
-            <emphasis role="bold"><guilabel>Non-Bayesian</guilabel></emphasis>
-            <phrase>: The Non Bayesian matcher matches the transfer account on the basis of the occurrence of a token string in
+            <para><emphasis role="bold"><guilabel>Non-Bayesian</guilabel></emphasis>
+              : The Non Bayesian matcher matches the transfer account on the basis of the occurrence of a token string in
               transactions assigned to a transfer/destination account and does not record the frequency of association. This
-              was the original &app; matching process and has now been superceeded by the Bayesian matcher in more recent versions;
-            </phrase>
+              was the original <application>&appname;</application> matching process and has now been superceeded by the Bayesian matcher in more recent versions;
+            </para>
           </listitem>
           <listitem>
-            <emphasis role="bold"><guilabel>OnlineiD</guilabel></emphasis>
-            <phrase>: Online ids are specific strings which identify specific accounts in information downloaded from online sources.
+            <para><emphasis role="bold"><guilabel>OnlineiD</guilabel></emphasis>
+              : Online ids are specific strings which identify specific accounts in information downloaded from online sources.
             they may include account numbers and specific instiution identifiers.
-            </phrase>
+            </para>
           </listitem>
         </itemizedlist>
       </para>
       <para>The <emphasis role="bold"><guilabel>Bayesian</guilabel></emphasis> matcher data columns are:
         <itemizedlist>
           <listitem>
-            <emphasis role="bold"><guilabel>Source Account</guilabel></emphasis>
-            <phrase>: This is the account into which a transaction has been imported and is normally the first split in an
+            <para><emphasis role="bold"><guilabel>Source Account</guilabel></emphasis>
+              : This is the account into which a transaction has been imported and is normally the first split in an
               imported record. It may either be specified in the record itself or during the import setup for all 
               transactions to be imported. The arrow control at the left of each entry in this column may be used
               to display all the data used in matching a transfer or destination account for transactions which have
               this account as their source split;
-            </phrase>
+            </para>
           </listitem>
           <listitem>
-            <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
-            <phrase>: This column displays a specific token string that has been associated with the allocation of the
+            <para><emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
+              : This column displays a specific token string that has been associated with the allocation of the
               account in the <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis> column as
               a transfer/destination account for transfers to the <guilabel>Source Account</guilabel>;
-            </phrase>
+            </para>
           </listitem>
           <listitem>
-            <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>
-            <phrase>: The account name in this column is a &app; account name which has been allocated as a 
+            <para><emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>
+              : The account name in this column is a <application>&appname;</application> account name which has been allocated as a 
               transfer/destination account in association with the token string in the
               <emphasis role="bold"><guilabel>Match String</guilabel></emphasis> column;
-            </phrase>
+            </para>
           </listitem>
           <listitem>
-            <emphasis role="bold"><guilabel>Count of Match String Usage</guilabel></emphasis>
-            <phrase>: This is the number of times the token string in the <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
+             <para><emphasis role="bold"><guilabel>Count of Match String Usage</guilabel></emphasis>
+             : This is the number of times the token string in the <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
               column has occurred in association with the transfer/destination account specified in the 
-              <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis> column for transactions imported to &app;.
-            </phrase>
+              <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis> column for transactions imported to <application>&appname;</application>.
+            </para>
           </listitem>
         </itemizedlist>
       </para>
@@ -1819,20 +1841,20 @@ Author:
         which the assignment occurred.It has the following columns:
         <itemizedlist>
           <listitem>
-            <emphasis role="bold"><guilabel>Source Account</guilabel></emphasis>;
+            <para><emphasis role="bold"><guilabel>Source Account</guilabel></emphasis>;</para>
           </listitem>
           <listitem>
-            <emphasis role="bold"><guilabel>Based on</guilabel></emphasis>
-            <phrase>: This identifies the import process in which the <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
+            <para><emphasis role="bold"><guilabel>Based on</guilabel></emphasis>
+              : This identifies the import process in which the <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
               was associated with the transfer destination account in the <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>
               column;
-            </phrase>
+            </para>
           </listitem>
           <listitem>
-            <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>;
+            <para><emphasis role="bold"><guilabel>Match String</guilabel></emphasis>;</para>
           </listitem>
           <listitem>
-            <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>.
+            <para><emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>.</para>
           </listitem>
         </itemizedlist> 
       </para>
@@ -1854,100 +1876,99 @@ Author:
   </sect1>
   <sect1 id="trans-export">
     <title>Exporting Transactions</title>
-    <para>&app; allows transaction data to be exported in CSV format with the optional use of alternative column separators.
+    <para><application>&appname;</application> allows transaction data to be exported in CSV format with the optional use of alternative column separators.
       Transactions can be exported in either a single line format (simple layout) which can only be used for transactions with
       two splits and may not allow all the data associated with a transaction to be exported or in a multiline format where
       two or more lines are used for transactions with two or more splits with each splits information on separate lines.
       Transaction data can be exported either from the currently selected active register or from selected accounts. 
       The menu commands to export transactions are:
       <itemizedlist>
-        <listitem><emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Export</guisubmenu>-><guimenuitem>Export Transactions to CSV</guimenuitem></emphasis>;</listitem>
-        <listitem><emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Export</guisubmenu>-><guimenuitem>Export Active Register to CSV</guimenuitem></emphasis>.</listitem>
+        <listitem><para><emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Export</guisubmenu>-><guimenuitem>Export Transactions to CSV</guimenuitem></emphasis>;</para></listitem>
+        <listitem><para><emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Export</guisubmenu>-><guimenuitem>Export Active Register to CSV</guimenuitem></emphasis>.</para></listitem>
       </itemizedlist>
       These commands start the wizard illustrated in <!--FIXME --> to setup the export. They differ only in that in the latter case the
        <emphasis role="bold"><guilabel>Account Selection</guilabel></emphasis> step is not available in the left hand pane.
     </para>
-    <screenshot id="export-transactions-wizard">
-      <mediaobject>
-        <imageobject role="html">
-          <imagedata fileref="figures/Help_Choose_Export_Settings.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
-        </imageobject>
-        <imageobject role="fo">
-                    <imagedata fileref="figures/Help_Choose_Export_Settings.png" format="PNG" srccredit="David Cousens"></imagedata>
-        </imageobject>
-        <textobject>
-          <phrase>Export Transactions Wizard</phrase>
-        </textobject>
-        <caption> The Export Transactions Wizard </caption>
-      </mediaobject>
-    </screenshot>
+    <figure pgwide="1">
+      <title>The Export Transactions Wizard.</title>
+      <screenshot id="export-transactions-wizard">
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/Help_Choose_Export_Settings.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+          </imageobject>
+          <imageobject role="fo">
+                      <imagedata fileref="figures/Help_Choose_Export_Settings.png" format="PNG" srccredit="David Cousens"></imagedata>
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
     <para> The Export transaction wizard opens at the first step and performs the steps listed in the left hand pane:
       <itemizedlist>
         <listitem>
-          <emphasis role="bold"><guilabel>Choose Export Settings</guilabel></emphasis>;
+          <para><emphasis role="bold"><guilabel>Choose Export Settings</guilabel></emphasis>;</para>
         </listitem>
         <listitem>
-          <emphasis role="bold"><guilabel>Account Selection</guilabel></emphasis>;
+          <para><emphasis role="bold"><guilabel>Account Selection</guilabel></emphasis>;</para>
         </listitem>
         <listitem>
-          <emphasis role="bold"><guilabel>Choose File Name for export</guilabel></emphasis>;
+          <para><emphasis role="bold"><guilabel>Choose File Name for export</guilabel></emphasis>;</para>
         </listitem>
         <listitem>
-          <emphasis role="bold"><guilabel>Export Now...</guilabel></emphasis>;
+          <para><emphasis role="bold"><guilabel>Export Now...</guilabel></emphasis>;</para>
         </listitem>
         <listitem>
-          <emphasis role="bold"><guilabel>Export Summary</guilabel></emphasis>.
+          <para><emphasis role="bold"><guilabel>Export Summary</guilabel></emphasis>.</para>
         </listitem>
       </itemizedlist>
-      <para>Navigation between the steps uses the buttons displayed in the right hand lower corner of the wizard. 
-        Which of the following buttons are displayed will depend on what is permissible from the step:
-        <itemizedlist>
-          <listitem>
-            <emphasis role="bold"><guilabel>Cancel</guilabel></emphasis>
-            <phrase>: Exit the wizard without exporting any transactions;</phrase>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Back</guilabel></emphasis>
-            <phrase>: Return to the previous step in the wizard;</phrase>
-          </listitem>
-          <listitem>
-            <emphasis role="bold"><guilabel>Next</guilabel></emphasis>
-            <phrase>: Proceed to the next step.</phrase>
-          </listitem>
-        </itemizedlist>
-      </para>      
     </para>
-    <sect3 id="trans-export-settings">
+    <para>Navigation between the steps uses the buttons displayed in the right hand lower corner of the wizard. 
+      Which of the following buttons are displayed will depend on what is permissible from the step:
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold"><guilabel>Cancel</guilabel></emphasis>
+            : Exit the wizard without exporting any transactions;</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold"><guilabel>Back</guilabel></emphasis>
+            : Return to the previous step in the wizard;</para>
+        </listitem>
+        <listitem>
+         <para><emphasis role="bold"><guilabel>Next</guilabel></emphasis>
+           : Proceed to the next step.</para>
+        </listitem>
+     </itemizedlist>
+    </para>
+    <sect2 id="trans-export-settings">
       <title>Choose Export Settings</title>
       <para>This step allows you to choose various options in the formattig of the transactions being exported.</para>
       <para>The <emphasis role="bold"><guilabel>Options</guilabel></emphasis> checkboxes may be selected singly or both may be selected together:
         <itemizedlist>
-          <listitem><emphasis role="bold"><guilabel>Quotes</guilabel></emphasis>
-            <phrase>: Surround each data field in quotes;</phrase>
+          <listitem><para><emphasis role="bold"><guilabel>Quotes</guilabel></emphasis>
+            : Surround each data field in quotes;</para>
           </listitem>
-          <listitem><emphasis role="bold"><guilabel>Simple layout</guilabel></emphasis>
-            <phrase>: If checked, the ouput transaction data will be as displayed in the single row register
+          <listitem><para><emphasis role="bold"><guilabel>Simple layout</guilabel></emphasis>
+            : If checked, the ouput transaction data will be as displayed in the single row register
               view option and some of the transfer detail may be lost.
-            </phrase>
+            </para>
             <para>The column headers for data exported in <emphasis role="bold"><guilabel>Simple layout</guilabel></emphasis> format are:</para>
               <orderedlist>
-                <listitem><emphasis role="bold"><guilabel>Date</guilabel></emphasis>
+                <listitem><para><emphasis role="bold"><guilabel>Date</guilabel></emphasis></para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Account Name</guilabel></emphasis><phrase>: name of the source account;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Account Name</guilabel></emphasis>: name of the source account;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Number</guilabel></emphasis>
+                <listitem><para><emphasis role="bold"><guilabel>Number</guilabel></emphasis></para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Description</guilabel></emphasis>
+                <listitem><para><emphasis role="bold"><guilabel>Description</guilabel></emphasis></para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Full Category Path</guilabel></emphasis><phrase>full account name for transfer/destination account;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Full Category Path</guilabel></emphasis>: full account name for transfer/destination account;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Reconcile</guilabel></emphasis>
+                <listitem><para><emphasis role="bold"><guilabel>Reconcile</guilabel></emphasis></para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Amount with Sym</guilabel></emphasis>
+                <listitem><para><emphasis role="bold"><guilabel>Amount with Sym</guilabel></emphasis></para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Amount NUm</guilabel></emphasis>
+                <listitem><para><emphasis role="bold"><guilabel>Amount NUm</guilabel></emphasis></para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Rate/Price</guilabel></emphasis>
+                <listitem><para><emphasis role="bold"><guilabel>Rate/Price</guilabel></emphasis></para>
                 </listitem>
               </orderedlist>
             <para> If <emphasis role="bold"><guilabel>Simple layout</guilabel></emphasis> is not checked the transaction data will be exported
@@ -1955,69 +1976,71 @@ Author:
             </para>
             <para>The column headers for a multiline output for a transaction are:</para>
               <orderedlist>
-                <listitem><emphasis role="bold"><guilabel>Date</guilabel></emphasis><phrase>: first line only;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Date</guilabel></emphasis>: first line only;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Transaction ID</guilabel></emphasis><phrase>: first line only;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Transaction ID</guilabel></emphasis>: first line only;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Number</guilabel></emphasis><phrase>: first line only;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Number</guilabel></emphasis>: first line only;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Description</guilabel></emphasis><phrase>: first line only</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Description</guilabel></emphasis>: first line only</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Notes</guilabel></emphasis><phrase>: first line only;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Notes</guilabel></emphasis>: first line only;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Commodity/Currency</guilabel></emphasis><phrase>: first line only;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Commodity/Currency</guilabel></emphasis>: first line only;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Void Reason</guilabel></emphasis><phrase>: first line only;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Void Reason</guilabel></emphasis>: first line only;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Action</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Action</guilabel></emphasis>: first line and subsequent lines;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Memo</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Memo</guilabel></emphasis>: first line and subsequent lines;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Full Account Name</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Full Account Name</guilabel></emphasis>: first line and subsequent lines;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Account Name</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Account Name</guilabel></emphasis>: first line and subsequent lines;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Amount with SYm</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Amount with SYm</guilabel></emphasis>: first line and subsequent lines;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Amount Num</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Amount Num</guilabel></emphasis>: first line and subsequent lines;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Reconcile</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Reconcile</guilabel></emphasis>: first line and subsequent lines;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Reconcile Date</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Reconcile Date</guilabel></emphasis>: first line and subsequent lines;</para>
                 </listitem>
-                <listitem><emphasis role="bold"><guilabel>Rate/Price</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                <listitem><para><emphasis role="bold"><guilabel>Rate/Price</guilabel></emphasis>: first line and subsequent lines;</para>
                 </listitem>                
               </orderedlist>
-            <para>Each line contains the data relevant to a single split with the first line also having transaction data relevant to all splits in the first 7 columns.
+            <para>Each line contains the data relevant to a single split with the first line also having
+              transaction data relevant to all splits in the first 7 columns.
             </para>
           </listitem>
         </itemizedlist>
       </para>
       <para>The <emphasis role="bold"><guilabel>Separators</guilabel></emphasis> radio buttons allow the choice of an alternative column separator:
         <itemizedlist>
-          <listitem><emphasis role="bold"><guilabel>Comma(,)</guilabel></emphasis>
-            <phrase>: This is the default separator;</phrase>
+          <listitem><para><emphasis role="bold"><guilabel>Comma(,)</guilabel></emphasis>
+              : This is the default separator;</para>
           </listitem>
-          <listitem><emphasis role="bold"><guilabel>Colon(:)</guilabel></emphasis>
-            <phrase>: Use a colon to separate the columns;</phrase>
+          <listitem><para><emphasis role="bold"><guilabel>Colon(:)</guilabel></emphasis>
+              : Use a colon to separate the columns;</para>
           </listitem>
-          <listitem><emphasis role="bold"><guilabel>Semicolon(;)</guilabel></emphasis>
-            <phrase>: Use a semicolon to separate the columns;</phrase>
+          <listitem><para><emphasis role="bold"><guilabel>Semicolon(;)</guilabel></emphasis>
+              : Use a semicolon to separate the columns;</para>
           </listitem>
-          <listitem><emphasis role="bold"><guilabel>Custom</guilabel></emphasis>
-            <phrase>: Define a custom character to separate the columns by entering it in the textbox.</phrase>
+          <listitem><para><emphasis role="bold"><guilabel>Custom</guilabel></emphasis>
+              : Define a custom character to separate the columns by entering it in the textbox.</para>
           </listitem>
         </itemizedlist>
       </para>
-      <para>Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to go to the next step.</para>
-    </sect3>
-    <sect3 id="trans-export-account-select">
+      <para><emphasis role="bold"><keycombo action="click"><mousebutton>Button1</mousebutton></keycombo> on <guibutton>Next</guibutton></emphasis> to go to the next step.</para>
+    </sect2>
+    <sect2 id="trans-export-account-select">
       <title>Account Selection</title>
       <para>This step allows selection of one or more accounts and the specification of the date range
         containing the transactions to be exported.
       </para>
       <para>The <emphasis role="bold"><guilabel>Accounts</guilabel></emphasis> panel displays an account
-        tree which allows one or more accounts to be selected for export. (Ctrl-Left-Click and Shift-Left-Click 
+        tree which allows one or more accounts to be selected for export. (<keycombo action="click"><keycap>Ctrl</keycap><mousebutton>Button1></mousebutton></keycombo>
+        and <keycombo action="click"><keycap>Shift</keycap><mousebutton>Button1</mousebutton></keycombo> 
         may be used to select accounts). The <emphasis role="bold"><guibutton>Select Subaccounts</guibutton></emphasis>
         button will select all subaccounts of a selected account. The <emphasis role="bold"><guibutton>Select All</guibutton></emphasis>
         button will select all accounts in the account tree for export. The number of accounts which have been selected is indicated.
@@ -2025,21 +2048,21 @@ Author:
       <para>The <emphasis role="bold"><guilabel>Dates</guilabel></emphasis> panel allows selection of either all
         transactions or only those within a selected date range in the selected accounts to be exported. 
       </para>
-    </sect3>
-    <sect3 id="trans-export-choosefile">
+    </sect2>
+    <sect2 id="trans-export-choosefile">
       <title>Choose File Name for export</title>
       <para>A file selection dialog is presented allowing specification of a file name and a path to the directory/folder in which it is to be stored.
       </para>
-    </sect3>
-    <sect3 id="trans-export-now"><title>Export Now...</title>
+    </sect2>
+    <sect2 id="trans-export-now"><title>Export Now...</title>
       <para>The filename and path of the file to be exported and the number of accounts to be exported is displayed.
-        To continue with the export click the <emphasis role="bold"><guibutton>Apply</guibutton></emphasis> button.        
+        To continue with the export <keycombo action="click"><mousebutton>Button1</mousebutton></keycombo> the <emphasis role="bold"><guibutton>Apply</guibutton></emphasis> button.        
       </para>
-    </sect3>
-    <sect3 id="trans-export-summary">
+    </sect2>
+    <sect2 id="trans-export-summary">
       <title>Export Summary</title>
       <para>Displays a message if the file is successfully exported or an error message and debugging suggections if not.</para>
-    </sect3>
+    </sect2>
   </sect1>
 
   <sect1 id="trans-online">
@@ -2067,5 +2090,4 @@ Author:
     by using the "Filter By..." on the View menu.</para>
   </sect1>
 
-</chapter>
-
+</chapter>
\ No newline at end of file

commit fa593d88269d79c53c9090f18f61190bb546d1f5
Author: David Cousens <davidcousens at bigpond.com>
Date:   Thu Sep 12 11:47:16 2019 +1000

    Help manual Importing Transactions
    
    Series of updates to the Help manual Importing Transactions section to change the orientation more towards a description of the interface functionality in the help manual . Restructuring and adding screenshots to Importing QIF, Importing CSV, Importing OFX, Import Matcher. Added new sections on the Match Picker and Import Map Editor  and a new section re Exporting Transactions.
    Fix missing link to trans-import-DTAUS
    
    
    Another fix to missing linkend "trans-import-MT940-MT942-DTAUS
    
    
    fix to missing tags and syntax errors-add column descriptions to export transactions
    
    
    minor fix export transactions

diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index d122e0b..bb4e320 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -877,12 +877,12 @@ Author:
             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
+    <para>Multi-split data previously exported from &app; 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>
+      <para>&app; 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>
@@ -891,6 +891,12 @@ Author:
           </para></listitem>
           <listitem><para><emphasis role="bold"><link linkend="trans-import-csv">CSV</link></emphasis> 
                (.csv)  Comma Separated Values;</para></listitem>
+          <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">MT940</link></emphasis> 
+               (.STA)  SWIFT MT940 Customer Statement Message;</para></listitem>
+          <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">MT942</link></emphasis> 
+               (.txt  SWIFT MT942 Interim Transaction Report;</para></listitem>
+          <listitem><para><emphasis role="bold"><link linkend="trans-import-MT940-MT942-DTAUS">DTAUS</link></emphasis> 
+               (.DTAUS)  Banking data Exchange File;</para></listitem>
         </itemizedlist>
       
       <para>These import methods can be accessed from the <guisubmenu>Import</guisubmenu> submenu
@@ -899,6 +905,7 @@ Author:
             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),
@@ -906,173 +913,535 @@ Author:
             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
+        <title>To import QIF files:</title>
+        <para>Select
           <menuchoice>
             <guimenu>File</guimenu>
             <guisubmenu>Import</guisubmenu>
-            <guimenuitem>Import QIF...</guimenuitem>
+            <guimenuitem>Import QIF</guimenuitem>
           </menuchoice>
-          from the menu. When the QIF Import dialog box appears, click
-          <guibutton>Next</guibutton>
-          button 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.
+          from the menu to open the QIF Import dialog box illustrated below.
         </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>
-        <note><para>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></note>
-        <para>From the drop-down list, select a standard currency to be used for the imported accounts and click <guibutton>Next</guibutton>
-              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 <guibutton>Next</guibutton> button 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 <guibutton>Finish</guibutton> button 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 
+        <screenshot id="ImportQIFDruid">
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/Help_Import_QIF_Druid.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+          </imageobject>
+          <imageobject role="fo">
+                      <imagedata fileref="figures/Help_Import_QIF_Druid.png" format="PNG" srccredit="David Cousens"></imagedata>
+          </imageobject>
+          <textobject>
+            <phrase>Import QIF files dialog window.</phrase>
+          </textobject>
+          <caption><emphasis role="bold">Import QIF files dialog window.</emphasis></caption>
+        </mediaobject>
+        </screenshot>
+        <para>On most panes the dialog has three buttons on the right for navigating through the dialog steps shown in the left pane of the dialog:
+          <itemizedlist>
+            <listitem>
+              <guibutton><emphasis role="bold">Cancel</emphasis></guibutton>
+              <para>Exit the dialog;</para>
+            </listitem>
+            <listitem>
+              <guibutton><emphasis role="bold">Back</emphasis></guibutton>
+              <para>Go back to the previos step;</para>
+            </listitem>
+            <listitem>
+              <guibutton><emphasis role="bold">Next</emphasis></guibutton>
+              <para>Proceed to the next step.</para>
+            </listitem>
+          </itemizedlist>
+          </para>
+          <para>The dialog lists the steps in the import process in the pane on the left. The pane on the right will contain
+            instructions and/or controls for performing the operations in that step:
+          <itemizedlist>
+          <listitem>
+            <emphasis role="bold"><guilabel>Import of QIF files</guilabel></emphasis>
+            <para>Initial informational panel. Click <guibutton><emphasis role="bold">Next</emphasis></guibutton> to proceed;
+            </para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Select a QIF file to load</guilabel></emphasis>
+            <para>Open a file selection dialog. Navigate to and select the file you wish to import and click <guibutton><emphasis role="bold">Import</emphasis></guibutton>.
+              Then click <guibutton><emphasis role="bold">Next</emphasis></guibutton>;
+            </para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Load QIF files</guilabel></emphasis>
+            <para>Click the <guibutton><emphasis role="bold">Start</emphasis></guibutton>
+              button to load the file. The file will be parsed and loaded. If errors or warnings occur you may have to remove the file, edit it and reimport it. If there are no 
+              errors click <guibutton><emphasis role="bold">Next</emphasis></guibutton>;
+            </para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Set a date format for the file</guilabel></emphasis>
+            <para>
+              Select a date format (m-d-y or d-m-y) appropriate to the locale of the source
+              of your QIF file. In the US this is generally m-d-y and in Europe d-m-y;
+            </para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Set the default QIF account name</guilabel></emphasis>
+            <para>
+              If the QIF file does not specify an account name, enteran account name. If importing data 
+              from another accounting program you should use the name used in that program;
+            </para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>QIF files you have loaded</guilabel></emphasis>
+            <para>This step allows you to edit the list of files to be imported and to load additional files. To remove a file,
+              click on the row and then click on <guibutton><emphasis role="bold">Unload selected file</emphasis></guibutton>. To load another
+              file click the <guibutton><emphasis role="bold">Load another file</emphasis></guibutton>. When you have all the files you wish
+              to import loaded, click <guibutton><emphasis role="bold">Next</emphasis></guibutton>;
+            </para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Accounts and stock holdings</guilabel></emphasis><para>Information panel.
+            Click <guibutton><emphasis role="bold">Next</emphasis></guibutton> to proceed;</para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Match QIF accounts with &app; accounts</guilabel></emphasis>
+            <para>QIF account names are matched to &app; accounts if possible. New &app;accounts are created if no matching accounts are
+              found. For stock, the required account structures are also created. Created accounts are indicated by checking
+              the checkbox in the New column. Assigned accounts may be edited by selecting the appropriate the row
+              and clicking on the <guibutton><emphasis role="bold">Change &app; Account</emphasis></guibutton> button to to run the account selection dialog;
+            </para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Income and Expense categories</guilabel></emphasis>
+            <para>Information panel. Click <guibutton><emphasis role="bold">Next</emphasis></guibutton> to proceed;</para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Match QIF categories to GnuCash accounts</guilabel></emphasis>
+            <para>QIF categories are matched to &app; accounts where possible. New &app; accounts are created where no matching &app; account 
+              is found. Created accounts are indicated by checking the checkbox in the New column. If you are not sure what
+              changes are needed, it is safe to accept the &app; account names. These may be changed later in &app;.
+              Assigned accounts may be edited by selecting the appropriate row and clicking on the 
+              <guibutton><emphasis role="bold">Change &app; Account</emphasis></guibutton> button to run the account selection dialog;
+            </para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Payees and Memos</guilabel></emphasis>
+            <para>Information page. Click <guibutton><emphasis role="bold">Next</emphasis></guibutton> to proceed;</para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Match payees/memos to GnuCash accounts</guilabel></emphasis>
+            <para>QIF payees and memos are matched to GnuCash accounts where possible and new accounts are created where this is not possible 
+              indicated by the checkbox in the New column. The assigned account may be changed by selecting a row and clicking on the 
+              <guibutton><emphasis role="bold">Change &app; Account</emphasis></guibutton> button to to run the account selection dialog;
+            </para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Choose the QIF file currency</guilabel></emphasis>
+            <para>Select the required currency from the dropdown list and click on <guibutton><emphasis role="bold">Next</emphasis></guibutton> to continue.</para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Tradable commodities</guilabel></emphasis>
+            <para>Not yet implemented</para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>QIF Import</guilabel></emphasis>
+            <para>Click on <guibutton><emphasis role="bold">Start</emphasis></guibutton> to begin the import. &app; 
+              currently proceeds to the Update your &app; accounts tab if the import is successful.
+            </para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Match existing transactions</guilabel></emphasis>
+            <para>Not yet implemented.</para><!--FIXME when implemented.-->
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Select possible duplicates</guilabel></emphasis>
+            <para>Not yet implemented</para><!--FIXME when implemented.-->
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Update yourGnuCash accounts</guilabel></emphasis>
+            <para>Click <guibutton><emphasis role="bold">Apply</emphasis></guibutton> 
+              to complete the import. 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, &app; will return you 
               to the main window, which should now display the names of the accounts you imported.
+            </para>
+            <para>Other features are not currently implemented.<!--FIXME when implemented.--></para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>QIF Import Summary</guilabel></emphasis>
+            <para>Click on <guibutton><emphasis role="bold">Close</emphasis></guibutton> to exit the wizard.</para>
+          </listitem>
+          </itemizedlist>
         </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 <guibutton>Import</guibutton> button 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 <guibutton>OK</guibutton> 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><guimenu>File</guimenu>-><guisubmenu>Import</guisubmenu>-><guimenuitem>Import OFX/QFX transactions</guimenuitem>
+        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 <guibutton><emphasis role="bold">Import</emphasis></guibutton> button.</para>
+      <para>&app; then opens an Account Selection dialog to select an account in your CoA to match to an account name in the import file. Select
+        the appropriate account from the account tree and press the <guibutton><emphasis role="bold">OK</emphasis></guibutton> button. On subsequent import of files from the 
+        same source account, the mapped &app;account 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.
+        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 <guimenuitem>Import CSV...</guimenuitem> 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 
-            <guibutton>OK</guibutton> button.
+      <para>Clicking on <emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Import</guisubmenu>-><guimenuitem>Import Transactions from CSV</guimenuitem></emphasis>
+        will bring up the CSV Transaction Import Assistant dialog illustrated below.
       </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 <guilabel>Load and Save Settings Entry</guilabel> combo box and pressing the <guibutton>Save</guibutton> 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 <computeroutput>"GnuCash Export Settings"</computeroutput> 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>
+      <screenshot id="CSV_Transaction_Import_Assistant">
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata  fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="David Cousens" width="515px"></imagedata>
+          </imageobject>
+          <imageobject role="fo">
+            <imagedata width="515px" fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="David Cousens"></imagedata>
+          </imageobject>
+          <textobject>
+            <phrase>CSV Transaction Import Assistant</phrase>
+          </textobject>
+          <caption><emphasis role="bold">CSV Transaction Import Assistant</emphasis></caption>
+        </mediaobject>
+      </screenshot>
+      <para>The CSV Transaction import Assistant is largely self explanatory with information panes which describe the functionality.
+        Each pane generally has three navigation buttons at the bottom right:
+        <itemizedlist>
+          <listitem><guibutton><emphasis role="bold">Cancel</emphasis></guibutton> Exit the CSV Transaction Import Assistant;</listitem>
+          <listitem><guibutton><emphasis role="bold">Back</emphasis></guibutton> Return to the previous step in the assistant;</listitem>
+          <listitem><guibutton><emphasis role="bold">Next</emphasis></guibutton> Proceed to the next step in the assistant.</listitem>
+        </itemizedlist>
+        The steps in the CSV import process are listed in the left hand pane with the current step highlighted. 
+        Explanatory text and the widgets to setup and carry out the step are displayed in the right hand pane.
+        The function of the controls in each step is explained below, in the explanatory information in the panes or in tooltips on some controls.
+        The steps in the CSV import process are:
         <itemizedlist>
+          <listitem><emphasis role="bold">Transaction Import Assistant</emphasis><para>Introductory information panel. 
+            Click <guibutton><emphasis role="bold">Next</emphasis></guibutton> to continue;</para>
+          </listitem>
           <listitem>
-            <para><guilabel>Fixed width columns</guilabel>: 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.
+            <emphasis role="bold"><guilabel>Select File for Import</guilabel></emphasis>
+            <para>Display the File selection dialog. Navigate to the file you wish to import then click 
+              the <guibutton><emphasis role="bold">Next</emphasis></guibutton> button;
             </para>
           </listitem>
           <listitem>
-            <para><guilabel>Separators</guilabel>: 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 <guilabel>Custom</guilabel> checkbox. This may be used in combination with any of the 
-                  predefined separators.
+            <emphasis role="bold">Import Preview</emphasis>
+            <para>The Import Preview pane illustrated below provides controls to set options for the import of CSV data and a preview of the data to be imported.
+              <screenshot id="CSV_Import_Preview">
+                <mediaobject>
+                  <imageobject role="html">
+                    <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" format="PNG" srccredit="David Cousens" width="515px"></imagedata>
+                  </imageobject>
+                  <imageobject role="fo">
+                    <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" format="PNG" srccredit="David Cousens" ></imagedata>
+                  </imageobject>
+                  <textobject>
+                    <phrase>Import Preview Pane</phrase>
+                  </textobject>
+                  <caption><emphasis role="bold">Import Preview Pane with settings to import the data shown.</emphasis></caption>
+                </mediaobject>
+              </screenshot> 
+              <itemizedlist>
+                <listitem>
+                  <emphasis role="bold"><guilabel>Load and Save Settings</guilabel></emphasis>
+                  <para id="trans-import-csv-save">Once you have set all the import parameters, you can save these settings by typing
+                    in a setting a unique name in the <guilabel>Load and Save Settings Entry</guilabel> combo box and clicking the
+                    <inlinemediaobject>
+                      <imageobject role="html"><imagedata fileref="figures/Help_CSV_Import_Transactions_Save.png" align="char" width="46px"></imagedata></imageobject>
+                      <imageobject role="fo"><imagedata fileref="figures/Help_CSV_Import_Transactions_Save.png" align="char" width="46px" ></imagedata></imageobject>
+                      <!--<textobject role="fo"><guibutton><emphasis role="bold">Save</emphasis></guibutton></textobject> -->
+                    </inlinemediaobject> save button just to the right of the box. 
+                    A previously defined settings group can be retrieved by selecting the appropriate setting group name from the dropdown list activated by
+                    the down arrow at the right end of the text box. This will set all other settings to the stored values.
+                  </para>
+                  <para> The 
+                    <inlinemediaobject>
+                      <imageobject role="html"><imagedata fileref="figures/Help_CSV_Import_Transactions_Delete.png" align="char" width="42px"></imagedata></imageobject>
+                      <imageobject role="fo"><imagedata fileref="figures/Help_CSV_Import_Transactions_Delete.png" align="char" width="42px"></imagedata></imageobject>
+                      <!--<textobject role="fo"><guibutton><emphasis role="bold">trashcan</emphasis></guibutton></textobject>-->
+                    </inlinemediaobject> delete button to the right of the Save button can be used to remove
+                    the saved settings group selected from the drop down list for the box.
+                  </para>
+                  <para> The settings group <guilabel><emphasis role="bold">&app; Export Settings</emphasis></guilabel>
+                    defines a setting group for used for the export and reimport of &app; transaction data - use this if 
+                    importing data previously exported from &app;.  
+                  </para>
+                </listitem>
+                <listitem>
+                  <emphasis role="bold"><guilabel>Account</guilabel></emphasis>
+                  <para>If the data you are importing does not specify the source account for the transaction an account can be selected
+                    from the drop down list will import all transactions to the selected account. Leave blank if your imported data
+                    specifies a source account.
+                  </para>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>File Format</guilabel></emphasis> 
+                  <para>                 
+                    <itemizedlist>
+                      <listitem>
+                        <emphasis role="bold"><guilabel>Separators</guilabel></emphasis>
+                          <para>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 <guilabel>Custom</guilabel> checkbox. This may be used in combination with any of the 
+                            predefined separators.
+                          </para>
+                      </listitem>
+                      <listitem>
+                        <emphasis role="bold"><guilabel>Fixed-Width</guilabel></emphasis>
+                        <para>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>
+                    </itemizedlist>
+                  </para>
+                </listitem>
+                <listitem>
+                  <emphasis role="bold"><guilabel>Multi-split</guilabel></emphasis>
+                  <para>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>
+                <listitem>
+                  <emphasis role="bold"><guilabel>Miscellaneous</guilabel></emphasis>
+                  <para>The miscellaneous settings allow you to set:</para>
+                  <itemizedlist>
+                    <listitem>
+                      <emphasis role="bold"><guilabel>Encoding</guilabel></emphasis>
+                      <para>This is usually the UTF-8 variant for your locale;</para>
+                    </listitem>
+                    <listitem>
+                      <emphasis role="bold"><guilabel>Date Format</guilabel></emphasis>
+                      <para>This does not default to the Locale setting so check it matches the data you are importing;</para>
+                    </listitem>
+                    <listitem>
+                      <emphasis role="bold"><guilabel>Currency Format</guilabel></emphasis>
+                      <para>Select the format of the decimal separator (full stop or comma or other) for the currency if the correct value is not supplied by Locale;</para>
+                    </listitem>
+                    <listitem>
+                      <emphasis role="bold"><guilabel>Leading Lines to Skip</guilabel></emphasis>
+                      <para>Select the number of header lines to skip in the imported file;</para>
+                    </listitem>
+                    <listitem>
+                      <emphasis role="bold"><guilabel>Trailing Lines to Skip</guilabel></emphasis>
+                      <para>Select the number of trailing lines to skip in the import file;</para>
+                    </listitem>
+                    <listitem>
+                      <emphasis role="bold"><guilabel>Skip alternate lines</guilabel></emphasis>
+                      <para>Use to skip every second line in the import file.</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>
+                </listitem>
+              </itemizedlist>
+            </para>
+            <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>must</emphasis> be specified:
+              <itemizedlist>
+                <listitem><para><guilabel>Date</guilabel>: of transaction;</para></listitem>
+                <listitem><para><guilabel>Account</guilabel>: into which transaction is to be imported (or alternatively set the base account as above);</para></listitem>
+                <listitem><para><guilabel>Description</guilabel>: of the transaction;</para></listitem>
+                <listitem><para><guilabel>Deposit or Withdrawal</guilabel>: column.</para></listitem>
+              </itemizedlist>
+              </para>
+              <para> The dropdown list of &app; transaction data fields which may be associated with a column of the imported data contains the following:
+                <itemizedlist>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>None</guilabel></emphasis>
+                    <para>The column is not assigned to a transaction data field and is not imported;</para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Date</guilabel></emphasis>
+                    <para>Ensure the date format in the column matches the Miscellaneous date Format Setting;</para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Num</guilabel></emphasis>
+                    <para>Transaction Num field - Use for check numbers etc </para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Description</guilabel></emphasis>
+                    <para></para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Notes</guilabel></emphasis>
+                    <para></para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Transaction Commodity</guilabel></emphasis>
+                    <para></para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Void Reason</guilabel></emphasis>
+                    <para></para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Action</guilabel></emphasis>
+                    <para></para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Account</guilabel></emphasis>
+                    <para>This header should be matched to a column specifying the source account
+                      for a transaction if it is present. Otherwise, set the source account in the
+                      <guilabel><emphasis role="bold">Account</emphasis></guilabel>combo box.
+                    </para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Deposit</guilabel></emphasis>
+                    <para>Apply this header to a column containing the amount of the transaction.
+                      Positive amounts in the column generally represent an increase in the account 
+                      balance and negative amounts a decrease in the balance (asset accounts: Checking, Savings). 
+                      In external statements supplied by a bank for a check or savings account, a credit (Cr)
+                      is normally an increase in the account balance and a debit (Dr) a decrease in the 
+                      account balance. In the banks eyes, your savings or checking account is a Liability to them.
+                    </para>
+                    <para>
+                      If the amount data is in separate columns for debits and credits you will have
+                      to apply both this heading and the Withdrawal heading. </para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Withdrawal</guilabel></emphasis>
+                    <para>Apply this header to a column with the amount of the transaction where positive
+                      amounts in the column represent a decrease in the account balance and negative amounts
+                      an increase in the balance (e.g. Liability account: credit card).
+                    </para>
+                    <para>Where separate columns are used for debits and credit to the account apply it
+                     to the opposite to the column to which Deposits is applied.
+                   </para>
+                   <note>Some experimentation may be necessary to detrmine the correct allocation
+                    of the Deposit and Withdrawal headings.</note>
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Price</guilabel></emphasis>
+                    <para>The price for commodity transactions and/or transactions involving currency exchange.</para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Memo</guilabel></emphasis>
+                    <para>Additional column containing descriptive information relevant to one split
+                      of a transaction. If in the first line of a multi-split import it will apply 
+                      to the source account. In subsequent lines/splits it is applied to the 
+                      transfer account defined in that line or allocated to it in the matcher.</para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Reconciled</guilabel></emphasis>
+                    <para>Apply to a column indicating the reconciliation status of the transaction.
+                      This generally only applies to data exported from &app;
+                    </para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Reconcile Date</guilabel></emphasis>
+                    <para>Apply to a column which specifies the date of reconciliation. generally
+                      only for &app; exported data.</para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Transfer Action</guilabel></emphasis>
+                    <para></para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>
+                    <para>This header should be applied to a column which specifies the transfer
+                      account for the second split of a single line import and/or for subsequent
+                      splits in multiline exported transactions.</para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Transfer Memo</guilabel></emphasis>
+                    <para>Apply to a column with descriptive information relevant to a split to
+                      a transfer account specified by <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis></para>                   
+                  </listitem>
+                  <listitem>
+                    <emphasis role="bold"><guilabel>Transfer Reconciled</guilabel></emphasis>
+                    <para>Apply to a column with reconciliation status information relevant to
+                      a split to a transfer account specified by <emphasis role="bold">
+                      <guilabel>Transfer Account</guilabel></emphasis>.
+                    </para>                   
+                  </listitem>
+                 <listitem>
+                    <emphasis role="bold"><guilabel>Transfer Reconcile Date</guilabel></emphasis>
+                    <para>Apply to a column containing a reconciliation date relevant to a split
+                      to a transfer account previously specified in <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>.
+                    </para>                   
+                  </listitem>
+                </itemizedlist>
+              </para>
+              <para>
+              The <guilabel>Skip Errors</guilabel> 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 <guibutton><emphasis role="bold">Next</emphasis></guibutton> button.
             </para>
           </listitem>
           <listitem>
-            <para><guilabel>Multi-split</guilabel>: 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.
+            <emphasis role="bold">Match Import and &app; accounts</emphasis>
+            <para>This window allows you to map the accounts identified in the account columns (Account and Transfer Account) with accounts in the &app; account tree 
+              (Account name). Double click on a row to bring up a dialog to select the matching &app; account. If you have previously imported transactions to this account
+              and account mappings can be matched automatically, this window will not be displayed.
+              When you have selected a match for all accounts, click on the <guibutton><emphasis role="bold">Next</emphasis></guibutton> button.
             </para>
-          </listitem>                  
+          </listitem>
+          <listitem><emphasis role="bold">Transaction Information</emphasis>The Transaction Information
+            panel allows review of data entry settings so far. Clicking Next will perform checks on the data.
+            If there are errors you will be returned to the <emphasis role="bold">Import Preview</emphasis> pane</listitem>
+            to edit the settings. For no errors you proceed to the next step.
+          <listitem>
+            <emphasis role="bold">Match Transactions</emphasis>
+            <para>Clicking on Match Transactions will then bring up the main <link linkend="trans-import-matcher">Import Matcher</link>
+            window. The Import Matcher is described in a separate section below which can be accessed by the link.</para>
+          </listitem>
+          <listitem>
+            <emphasis role="bold">Import Summary</emphasis>
+            <para>&app; displays a summary of the imported data. Click on the <guibutton><emphasis role="bold">Close</emphasis></guibutton> to exit the wizard.</para>
+          </listitem>
         </itemizedlist>
-      </sect3>
-      <sect3>
-        <title>Miscellaneous</title>
-        <para>The miscellaneous settings allow you to set:
-        </para>
-        <itemizedlist>
-          <listitem><para><guilabel>Encoding</guilabel>: This is usually the UTF-8 variant for your locale;</para></listitem>
-          <listitem><para><guilabel>Date Format</guilabel>: This does not default to the Locale setting so check it matches the data you are importing;</para></listitem>
-          <listitem><para><guilabel>Currency Format</guilabel>: </para></listitem>
-          <listitem><para><guilabel>Leading Lines to Skip</guilabel>: </para></listitem>
-          <listitem><para><guilabel>Trailing Lines to Skip</guilabel>: </para></listitem>
-          <listitem><para><guilabel>Skip alternate lines</guilabel>: </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>must</emphasis> be specified:
-        </para>
+      </para>
+      <para><caution>Multi-split imports of multicurrency transactions and commodity
+        transactions are experimental and may currently experience some errors. 
+        Please experiment and report any bugs encountered.</caution></para><!--FIXME remove when bug fixes are incorporated.-->
+    </sect2>
+    
+    <sect2 id="trans-import-MT940-MT942-DTAUS">
+      <title>Import MT940 and MT942 SWIFT and  DTAUS format files</title>
+      <para>When you select <guimenu><emphasis role="bold">File</emphasis></guimenu>-><guisubmenu><emphasis role="bold">Import</emphasis></guisubmenu>->
         <itemizedlist>
-          <listitem><para><guilabel>Date</guilabel>: of transaction;</para></listitem>
-          <listitem><para><guilabel>Account</guilabel>: into which transaction is to be imported (or alternatively set the base account as above);</para></listitem>
-          <listitem><para><guilabel>Description</guilabel>: of the transaction;</para></listitem>
-          <listitem><para><guilabel>Deposit or Withdrawal</guilabel>: column.</para></listitem>
+          <listitem><guimenuitem><emphasis role="bold">Import MT940</emphasis></guimenuitem> or</listitem>
+          <listitem> <guimenuitem><emphasis role="bold">Import MT942</emphasis></guimenuitem> or</listitem>
+          <listitem> <guimenuitem><emphasis role="bold">Import DTAUS</emphasis></guimenuitem></listitem>
         </itemizedlist>
-        <para>The <guilabel>Skip Errors</guilabel> 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 <guibutton>Next</guibutton> 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 <guibutton>Next</guibutton> 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>
+        from the menu, &app; opens a file selection dialog. Navigate to the MT940, MT942 or DTAUS format file
+        you wish to import and then click on the <guibutton><emphasis role="bold">Import</emphasis></guibutton> button. On the first import of data to a given account specification in the import file, &app; will 
+        bring up an account selection dialog to select an appropriate account into which to import the transactions in the file.
+        &app; will map the account description in the import file onto the selected account and use it for future imports from the same account. The imported transactions
+        will then be displayed in the <link linkend="trans-import-matcher"><guimenuitem><emphasis role="bold">Generic Import Transaction Matcher</emphasis></guimenuitem></link> for review.
+      </para>
     </sect2>
+    
     <sect2 id="trans-import-matcher">
-      <title>Import Matcher</title>
-      <para>The Import Matcher checks whether an imported transaction matches an existing transaction already recorded in GnuCash 
-          within a predefined time window for the account into which the transactions are being imported. A match probablity is 
+      <title>Generic Transaction Import Matcher</title>
+      <screenshot id="ImportMatcherScreenShot">
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+          </imageobject>
+          <imageobject role="fo">
+                      <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" format="PNG" srccredit="David Cousens"></imagedata>
+          </imageobject>
+          <textobject>
+            <phrase>Generic Import Transaction Matcher window</phrase>
+          </textobject>
+          <caption> This is an image of the import transaction matcher window after opening a file to import.</caption>
+        </mediaobject>
+      </screenshot>
+      <para>The Import Matcher checks whether an imported transaction matches an existing transaction already recorded in &app; 
+          within a predefined time window (~+_42 days) for the account into which the transactions are being imported. A match probablity is 
           calculated based on the Date, Amount, Transaction ID's(if present), Check numbers (if present) and the Description
           and split Memo fields. Exact matches will generate a high match probability and flag a transaction as matching an existing
           transaction and therefore not to be imported. If there is a lower quality match to an existing transaction, the imported transaction
-          may be flagged for updating of non-matching information in the GnuCash record of the matching transaction. These decisions can be overridden by the user.
+          may be flagged for updating of non-matching information in the &app; record of the matching transaction. These decisions can be overridden by the user.
       </para> 
       <para>If no matching transaction can be identified the transaction will be flagged for import. The matcher will attempt to assign
           a transfer account based on matches between tokenized information for previously imported transactions stored in lists associated
@@ -1081,18 +1450,46 @@ Author:
           assignment of the transfer account by the user. By default, if no transfer account is assigned, transactions will be assigned to an Imbalance
           account on import. This is to indicate that they need an appropriate account assigned to them.
       </para>
-      <tip><para>It is important to assign a transfer account to each transaction prior to import of the transactions. Otherwise the tokenized information from the imported transaction
-          will not be appended to the list of tokens for an assigned account for use in future matching of transactions to transfer accounts.
-          </para></tip>
-      <para>The status of the transaction rows to be imported is indicated in the matcher by a combination of the background colour for the row and three
-       checkboxes in the columns labelled A (Add), U+R (Update and Reconcile) and R (Reconciled) as described in <xref linkend="match_status"/>.
+      <para>The generic import transaction matcher is invoked when transaction data is imported using any of the following import formats:
+        <itemizedlist>
+          <listitem>QIF;</listitem>
+          <listitem>OFX/QXF;</listitem>
+          <listitem>CSV;</listitem>
+          <listitem>MT940;</listitem>
+          <listitem>MT942;</listitem>
+          <listitem>DTAUS.</listitem>
+        </itemizedlist>
+        This window has the following controls:
+        <itemizedlist>
+          <listitem><guibutton><emphasis role="bold">Help</emphasis></guibutton><para>Display a popup help window;</para></listitem>
+          <listitem><guibutton><emphasis role="bold">Cancel</emphasis></guibutton><para>Close this window without importing transaction data;</para></listitem>
+          <listitem><guibutton><emphasis role="bold">OK</emphasis></guibutton><para>Close this window importing transaction data;</para></listitem>
+          <listitem><guibutton><emphasis role="bold">Checkbox-Show the Source Account column</emphasis></guibutton><para>This option displays the account into which the transactions are being
+           imported. This is the second column labelled Account in the screenshot;</para></listitem>
+           <listitem><guibutton><emphasis role="bold">List of downloaded transactions</emphasis></guibutton><para>Table containing information from the imported transactions. </para></listitem>
+        </itemizedlist>
       </para>
-      <note><para>Note that "reconciled" in this context does not mean the same as "reconciled" in the process of reconciling an account to an external statement.</para></note>
+      <para> The List of downloaded transactions has the following columns which display the following information for each of the downloaded transactions:</para>
+      <itemizedlist>
+        <listitem><para><guilabel><emphasis role="bold">Date</emphasis></guilabel> - The date supplied with the downloaded transaction;</para></listitem>
+        <listitem><para><guilabel><emphasis role="bold">Account</emphasis></guilabel> - The import or base account to which the transactions will be imported (optional see above);</para></listitem>
+        <listitem><para><guilabel><emphasis role="bold">Amount</emphasis></guilabel> - The amount of the transaction (split to the import or base account);</para></listitem>
+        <listitem><para><guilabel><emphasis role="bold">Description</emphasis></guilabel> - The description of the transaction;</para></listitem>
+        <listitem><para><guilabel><emphasis role="bold">Memo</emphasis></guilabel> - The memo for the split to the import or base account of the transaction;</para></listitem>
+        <listitem><para><guilabel><emphasis role="bold">A</emphasis></guilabel> - Checkbox which indicates that the transaction is to be imported as a new transaction;</para></listitem>
+        <listitem><para><guilabel><emphasis role="bold">U+C</emphasis></guilabel> - Checkbox which indicates that the transaction matches an existing transaction but has some differences
+         and the existing transaction will be updated with the different information</para></listitem>
+        <listitem><para><guilabel><emphasis role="bold">C</emphasis></guilabel> - Checkbox which indicates that the transaction matches an existing transaction and will not be imported;</para></listitem>
+        <listitem><para><guilabel><emphasis role="bold">Info</emphasis></guilabel> - For transactions which have been matched to an existing transaction displays a bar indicating the quality of the match
+         and text indicating whether the transaction is to be imported.</para></listitem>
+      </itemizedlist>
+      <para>In addition to the checkboxes, the import status of each transaction is indicated by the background color of the transaction row. The checkbox state,
+        background colors and their meaning are described in <xref linkend="match_status"/>.</para>
       <table id="match_status" frame="all" >
         <title>Status of transactions</title>
         <tgroup cols="3" rowsep="1" >
           <colspec colwidth="1*+ 1cm" align="center" colsep="1" />
-          <colspec colwidth="13*" align="left" colsep="1" />
+          <colspec colwidth="15*" align="left" colsep="1" />
           <colspec colwidth="26*" align="left" colsep="1" />
           <thead>
             <row rowsep="1">
@@ -1105,116 +1502,544 @@ Author:
             <row>
               <entry morerows='1' valign='middle'><emphasis role="strong">A</emphasis></entry>
               <entry><?dbhtml bgcolor="#FFD700"?><?dbfo bgcolor="#FFD700"?>Gold</entry>
-              <entry><?dbhtml bgcolor="#FFD700"?><?dbfo bgcolor="#FFD700"?>Flagged for input: – Intervention required, transfer account must be selected.</entry>
+              <entry><?dbhtml bgcolor="#FFD700"?><?dbfo bgcolor="#FFD700"?>No matches, flagged for input and no transfer account matched – 
+                Import as a new transaction. Intervention required to select a transfer account.
+              </entry>
             </row>
             <row>
-              <entry><?dbhtml bgcolor="#87B287"?><?dbfo bgcolor="#87B287"?>DarkSeaGreen1</entry>
-              <entry><?dbhtml bgcolor="#87B287"?><?dbfo bgcolor="#87B287"?>Flagged for input: – Intervention not required, transfer account matched.</entry>
+              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>DarkSeaGreen1</entry>
+              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>No matches dtected, flagged for input and a transfer account is matched – 
+                Import as a new transaction. Reconciliation status will be set as cleared(c) on import. Intervention is not required.
+              </entry>
             </row>
             <row>
-              <entry morerows='1' valign='middle'><emphasis role="strong">U+R</emphasis></entry>
-              <entry><?dbhtml bgcolor="#87B287"?><?dbfo bgcolor="#87B287"?>DarkSeaGreen1</entry>
-              <entry><?dbhtml bgcolor="#87B287"?><?dbfo bgcolor="#87B287"?>Matches an existing transaction: – Intervention not required, import and update amount.</entry>
+              <entry  valign='middle'><emphasis role="strong">U+C</emphasis></entry>
+              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>DarkSeaGreen1</entry>
+              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>Matches an existing transaction but not exactly on date and/or amount – 
+                Intervention not required, import and update.  Reconciliation status will be set as cleared(n) on import.
+              </entry>
             </row>
             <row>
-              <entry><?dbhtml bgcolor="#FF4040"?><?dbfo bgcolor="#FF4040"?>Brown1</entry>
-              <entry><?dbhtml bgcolor="#FF4040"?><?dbfo bgcolor="#FF4040"?>Transaction matched: – Intervention required, not to be imported.</entry>
-            </row>
-            <row>
-              <entry morerows='1' valign='middle'><emphasis role="strong">R</emphasis></entry>
-              <entry><?dbhtml bgcolor="#87B287"?><?dbfo bgcolor="#87B287"?>DarkSeaGreen1</entry>
-              <entry><?dbhtml bgcolor="#87B287"?><?dbfo bgcolor="#87B287"?>Matches an existing transaction: – Intervention not required, will not be imported.</entry>
+              <entry  valign='middle'><emphasis role="strong">C</emphasis></entry>
+              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>DarkSeaGreen1</entry>
+              <entry><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>Matches an existing transaction: – 
+                Not to be imported. The existing transaction reconciliation status will be as cleared (c) on import. Intervention is not required
+              </entry>
             </row>
             <row>
+              <entry></entry>
               <entry><?dbhtml bgcolor="#FF4040"?><?dbfo bgcolor="#FF4040"?>Brown1</entry>
-              <entry><?dbhtml bgcolor="#FF4040"?><?dbfo bgcolor="#FF4040"?>Matches but not reconciled: – Intervention required, will not be imported.</entry>
+              <entry><?dbhtml bgcolor="#FF4040"?><?dbfo bgcolor="#FF4040"?>Transaction has poor matches and no action was set: –
+                Not to be imported. Intervention required.
+              </entry>
             </row>
             <row>
-              <entry><?dbhtml bgcolor="#6495ED"?><?dbfo bgcolor="#6495ED"?></entry>
+              <entry></entry>
               <entry><?dbhtml bgcolor="#6495ED"?><?dbfo bgcolor="#6495ED"?>Cornflower Blue</entry>
               <entry><?dbhtml bgcolor="#6495ED"?><?dbfo bgcolor="#6495ED"?>Row is selected</entry>
             </row>
           </tbody>
         </tgroup>
-      </table>
-      <note><para>The colors illustrated here are the defaults for GnuCash specified in <ulink url="https://github.com/Gnucash/gnucash/blob/maint/gnucash/gnucash-fallback-310.css">gnucash-fallback-310.css</ulink>. You may experience different colors if the gtk-3.0 CSS files have been modified</para>
+      </table>    
+      <note><para>The colors illustrated here are the defaults for &app; specified in
+        <ulink url="https://github.com/Gnucash/gnucash/blob/maint/gnucash/gnucash-fallback-310.css">gnucash-fallback-310.css</ulink>.
+        You may experience different colors if the gtk-3.0 CSS files have been modified</para>
       </note>
-      <para>Where a row has been matched to an existing transaction or is to update an existing transaction or a transfer account 
-         has been matched and supplied, double clicking on the row will bring up a dialog which displays detail of the imported 
-         transaction and the transaction in GnuCash to which it has been matched to allow the user to vet the match and correct it,
-         if they feel the wrong transfer account has been assigned or the matcher has not produced a valid result. You may change the
-         checkbox selection if you disagree with the matcher decisions and you may reassign an assigned transfer account (see below).
+      <para>You may always intervene manually to:
+        <itemizedlist>
+          <listitem> change the import action by selecting another checkbox (or none); and/or</listitem>
+          <listitem>manually assign a different transfer account;</listitem>
+        </itemizedlist>
+        after reviewing the matched transactions and accounts and the automatically selected actions.
       </para>
- 
+      <para>Multi row selection is enabled for the list of downloaded transactions. The following operations can be performed on the list of downloaded transactions:</para>
+      <itemizedlist>
+        <listitem><emphasis role="bold"><phrase>Single<mousebutton>Left Click</mousebutton> on a row</phrase></emphasis>
+        <para>Select this row (row is displayed with a blue background);</para></listitem>
+        <listitem><emphasis role="bold"><phrase>Double <mousebutton>Left Click</mousebutton> on a row</phrase></emphasis>
+          <para>If the transactions is flagged for import (see below) this will open an account selection dialog to select
+            a destination/transfer account to be used in the second split of the imported transaction. You may create a new
+            account if necessary in this dialog using the <emphasis role="bold"><guibutton>New Account</guibutton></emphasis>
+            buttonIf the transaction is flagged as matching an existing transaction either for import or updating, 
+            the match picker dialog is opened to allow the matched transactions to be examined and a correct match selected;
+          </para>
+        </listitem>
+        <listitem><emphasis role="bold"><phrase><keycap>Ctrl</keycap> <mousebutton>Left Click</mousebutton> on a row</phrase></emphasis>
+          <para>Add the row to a selection of rows (displayed with a blue background) to which a single destination/transfer account may be applied;</para>
+        </listitem>
+        <listitem><emphasis role="bold"><phrase><keycap>Shift</keycap> <mousebutton>Left Click</mousebutton> on a row</phrase></emphasis>
+          <para>Select all rows between the last selected row and this row and add them to the current selection of rows;</para>
+        </listitem>
+        <listitem><emphasis role="bold"><phrase><mousebutton>Right Click</mousebutton> in the window</phrase></emphasis>><para>Display a popup menu which when
+          clicked in turn opens a dialog to select a single destination/transfer account which will be applied to all rows currently selected.</para>
+        </listitem>
+      </itemizedlist>
+      <tip>
+        <para>It is important to assign a transfer account to each transaction prior to import of the transactions. Otherwise the tokenized information from the imported transaction
+          will not be appended to the list of tokens for an assigned account for use in future matching of transactions to transfer accounts.
+        </para>
+      </tip>
+      <note>
+        <para>Note that "reconciled" in this context does not mean the same as "reconciled" in the process of reconciling an account to an external statement. The reconciliation status of an imported transaction is set to cleared (c) on import of a new transaction
+        </para>
+      </note>
+    
+      <para>Where a row has been matched to an existing transaction or is to update an existing transaction it will have a DarkSeaGreen background
+        double clicking on the row will bring up the Match Picker dialog which displays detail of the imported . If you,
+        feel the wrong transfer account has been assigned or the matcher has not produced a valid result, you may change the
+        checkbox selection if you disagree with the matcher decisions and you may reassign an assigned transfer account (see below).
+      </para>
+      <para>Double clicking on a row marked as New with a <phrase>DarkSeaGreen1</phrase> background
+        and a transfer account assigned to it will bring up the account selection dialog to allow you to
+        choose a different transfer account for the second split.
+      </para>
+      <para>Double clicking on a row marked New with no transfer account matched with a <phrase>Gold</phrase>
+        background will also bring up the account selection dialog to allow you to assign a suitable 
+        transfer account to the transaction.
+      </para> 
      <sect3><title>Assign a Destination Account to a Single Transaction</title>
         <para>The currently selected row is selected by <mousebutton>left</mousebutton> clicking it. It is displayed with a 
-          <phrase>Cornflower Blue</phrase> background color.</para>
+          <phrase><?dbhtml bgcolor="#6495ED"?><?dbfo bgcolor="#6495ED"?>Cornflower Blue</phrase> background color.</para>
         <para>Double <mousebutton>left</mousebutton> clicking  on a row will select it and open an Account Selection
-          dialog to allow you to assign a transfer account. Select the desired transfer account in the dialog and click <guibutton>OK</guibutton>. 
-          The dialog has a <guibutton>New Account</guibutton> button which will 
+          dialog to allow you to assign a transfer account. Select the desired transfer account in the dialog and click <emphasis role="bold"><guibutton>OK</guibutton></emphasis>. 
+          The dialog has a <emphasis role="bold"><guibutton>New Account</guibutton></emphasis> button which will 
           allow you to create a suitable account if there is no existing account which can be applied as the transfer account.The row 
-          background will change to a <phrase>Light Green</phrase> and the assigned destination account will be displayed 
+          background will change to a <phrase><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>DarkSeaGreen1</phrase> and the assigned destination account will be displayed 
           in the Info column.
         </para>
         <para>or alternatively, <mousebutton>left</mousebutton> click on a row to select it followed by a 
            <mousebutton>right</mousebutton> click to bring up a popup menu then select
           <guimenuitem>Assign a transfer account</guimenuitem> to display the <guilabel>Account Selection</guilabel> dialog, select the destination account and
-           click the <guibutton>OK</guibutton> button.
+           click the <emphasis role="bold"><guibutton>OK</guibutton></emphasis> button.
         </para>
       </sect3>
       <sect3>
         <title>Assign a Destination Account to Multiple Transactions</title>
-        <para>Sometimes you will have several transactions which can have the same destination account. Gnucash
+        <para>Sometimes you will have several transactions which can have the same destination account. &app;
               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 <phrase>Cornflower Blue</phrase> background.</para>
-        <para>Only rows which have the <emphasis role="strong">A</emphasis> checkbox checked and either a <phrase>Light Green</phrase>
-         or <phrase>Yellow/-Gold</phrase> background colour can be selected for inclusion in a multiple selection. Rows with a
-          <phrase>Bright Red</phrase> background or with the <emphasis role="strong">U+R</emphasis>  or <emphasis role="strong">R</emphasis> 
+        <para>Rows in a selection are displayed with a <phrase><?dbhtml bgcolor="#6495ED"?><?dbfo bgcolor="#6495ED"?>Cornflower Blue</phrase> background.</para>
+        <para>Only rows which have the <emphasis role="strong">A</emphasis> checkbox checked and either a <phrase><?dbhtml bgcolor="#CFFFCB"?><?dbfo bgcolor="#CFFFCB"?>DarkSeaGreen1</phrase>
+         or <phrase><?dbhtml bgcolor="#FFD700"?><?dbfo bgcolor="#FFD700"?>Gold</phrase> background colour can be selected for inclusion in a multiple selection. Rows with a
+          <phrase><?dbhtml bgcolor="#FF4040"?><?dbfo bgcolor="#FF4040"?>Brown1</phrase> background or with the <emphasis role="strong">U+C</emphasis>  or <emphasis role="strong">C</emphasis> 
           checkboxes checked cannot be selected in a multiple  selection.
         </para>
-        <para>To select rows either:</para>
+        <para>To select rows and add rows to a selection either:</para>
         <itemizedlist>
-          <listitem><para>
-            <mousebutton>Left</mousebutton>
-            click on first row and then
-            <keycombo action='simul'>
-              <keycap>Ctrl</keycap>
-              <mousebutton>Left</mousebutton>
-            </keycombo>
-            click on other rows to add to the selection or
-          </para></listitem>
-          <listitem><para>
-            <mousebutton>Left</mousebutton> click on first row and then
-            <keycombo action='simul'>
-              <keycap>Shift</keycap>
-              <mousebutton>Left</mousebutton>
-            </keycombo> click on another row to select all rows between them.
-           </para></listitem>
-           <listitem><para>Rubber banding is also enabled so you may also click and drag over rows to create a selection. To
-           add more rows, hold down <keycap>Ctrl</keycap> and click and drag over more rows.</para>
+          <listitem>
+            <para>
+              <emphasis role="bold"><mousebutton>Left Click</mousebutton></emphasis>
+              on first row and then
+              <emphasis role="bold"><keycombo action='simul'>
+                <keycap>Ctrl</keycap>
+                <mousebutton>Left Click</mousebutton>
+              </keycombo></emphasis>
+              on other rows to add to the selection; or
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <emphasis role="bold"><mousebutton>Left Click</mousebutton></emphasis> on first row and then
+              <emphasis role="bold">
+                <keycombo action='simul'>
+                  <keycap>Shift</keycap>
+                  <mousebutton>Left Click</mousebutton>
+                </keycombo>
+              </emphasis> on another row to select all rows between them.
+            </para>
+           </listitem>
+           <listitem>
+            <para>Rubber banding is also enabled so you may also <emphasis role="bold">
+              <mousebutton>Left Click and Drag</mousebutton></emphasis> over rows to create a selection. To
+              add more rows, hold down <emphasis role="bold"><keycap>Ctrl</keycap></emphasis> and
+              <emphasis role="bold"><mousebutton>Left Click and Drag</mousebutton></emphasis> over more rows.
+            </para>
            </listitem>
-       </itemizedlist>
-        <para>then <mousebutton>right</mousebutton> click to display a popup menu and then select 
+         </itemizedlist>
+        <para>then <emphasis role="bold"><mousebutton>Right Click</mousebutton></emphasis> to display a popup menu and then select 
           <guimenuitem>"Assign a transfer account"</guimenuitem> to open the Account 
-           Selection dialog. Select the desired destination account (create a new account if necessary) and click the <guibutton>OK</guibutton>
+           Selection dialog. Select the desired destination account (create a new account if necessary) and click the <emphasis role="bold"><guibutton>OK</guibutton></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 <guibutton>OK</guibutton> 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.
+          (all row backgrounds will be a light green colour), check that the assigned destination acounts are correct 
+          and then press the <guibutton>OK</guibutton> 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 tokenized data from the transactions assigned to a given transfer account is stored on exiting from the matcher and is used to 
-        match transactions to the appropriate transfer account in future imports.
+          match transactions to the appropriate transfer account in future imports.
         </para>
       </sect3>
     </sect2>
+    <sect2 id="trans_match_picker">
+      <title>Match Picker</title>
+      <para>The Match Picker allows you to review and edit existing &app; transactions which have been matched to a transaction being imported. Double Left Click on a row with the
+        C checkbox checked to bring this dialog up.
+      </para>
+      <screenshot id="ImportMatcherPicker">
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/Help_Import_MatchPicker.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+          </imageobject>
+          <imageobject role="fo">
+                      <imagedata fileref="figures/Help_Import_MatchPicker.png" format="PNG" srccredit="David Cousens"></imagedata>
+          </imageobject>
+          <textobject>
+            <phrase>Match Picker Dialog</phrase>
+          </textobject>
+          <caption> The Match Picker dialog window showing existing &app; transactions matching an imported transaction.</caption>
+        </mediaobject>
+      </screenshot>
+      <para>The top pane of the Match Picker displays details of the first split of the transaction to be imported. The column labels:
+        <itemizedlist>
+          <listitem><emphasis role="bold"><guilabel>Account</guilabel></emphasis></listitem>
+          <listitem><emphasis role="bold"><guilabel>Date</guilabel></emphasis></listitem>
+          <listitem><emphasis role="bold"><guilabel>Amount</guilabel></emphasis></listitem>
+          <listitem><emphasis role="bold"><guilabel>Description</guilabel></emphasis></listitem>
+          <listitem><emphasis role="bold"><guilabel>Memo</guilabel></emphasis></listitem>
+          <listitem><emphasis role="bold"><guilabel>Balanced</guilabel></emphasis></listitem><para></para><!--FIXME -->
+        </itemizedlist>
+        are the same and have the same meaning as in the Generic Import Matcher window with the exception of the Balanced column which
+        gives the amount of the balancing split for the transaction.<!--FIXME not sure what happens here with multisplit transactions -->
+      </para>
+      <para>The lower pane displays the details of existing &app; transactions which match this transaction. If no transactions are displayed check the
+        <emphasis role="bold"><guilabel>Show Reconciled</guilabel></emphasis> checkbox at the bottom of the panel. The first row in
+        this pane will normally be the auto-matched transaction with the best match score. Other rows will display other existing 
+        transactions which might also be matches for the transaction being imported. The columns in this pane are:
+        <itemizedlist>
+          <listitem><emphasis role="bold"><guilabel>Confidence</guilabel></emphasis><phrase>: This column indicateds the confidence of the
+            individual match as both a bar chart and a numerical value. Where the bar extends into the green, the match is good.
+            If the bar only extend to the red or yellow setions the quality of match is more doubtful.</phrase>
+          </listitem>
+          <listitem><emphasis role="bold"><guilabel>Date</guilabel></emphasis></listitem>
+          <listitem><emphasis role="bold"><guilabel>Amount</guilabel></emphasis><phrase>: If this does not match exactly the amount
+            of the transaction being imported but otherwise the match is good, the amount of the imported transactions is
+            used to update the existing transaction matching it.</phrase> </listitem>
+          <listitem><emphasis role="bold"><guilabel>Description</guilabel></emphasis></listitem>
+          <listitem><emphasis role="bold"><guilabel>Memo</guilabel></emphasis></listitem>
+          <listitem><emphasis role="bold"><guilabel>Reconciled</guilabel></emphasis><phrase>: Indicates the reconciliation status of a matching existing transaction.</phrase></listitem>
+          <listitem><emphasis role="bold"><guilabel>Pending Action</guilabel></emphasis></listitem>
+          <!--FIXME  not sure what this column really indicates. Doesn't seem to display the actual action proposed i.e. whether it is to skip importing or to update an existing transaction.-->
+        </itemizedlist>
+      </para>
+      <para>If you are not happy with the existing transaction that was auto-matched, click on your preferred 
+        match to select it and then click the <emphasis role="bold"><guibutton>OK</guibutton></emphasis>.
+        The transaction will then be marked as a (manual) match in the Info column of the Import Matcher.
+        To exit the dialog without changing the auto-match click on the <emphasis role="bold"><guibutton>Cancel</guibutton></emphasis>.
+      </para>        
+    </sect2>
+    <sect2 id="ImportMatchEditor">
+      <title>Import Match Editor</title>
+      <para>The Import Match Editor allows you to edit the data used by &app; to automatically assign a
+        transfer account in the Import Matcher. It can be used to edit the data used by the Bayesian
+        matcher, the Non-Bayesian matcher and online ID's. To open it select <emphasis role="bold">
+        <guimenu>Tools</guimenu>-><guimenuitem>Import Map Editor</guimenuitem></emphasis> from
+        the menu.
+      </para>
+      <screenshot>
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/Help_Import_Map_Editor.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+          </imageobject>
+          <imageobject role="fo">
+                      <imagedata fileref="figures/Help_Import_Map_Editor.png" format="PNG" srccredit="David Cousens"></imagedata>
+          </imageobject>
+          <textobject>
+            <phrase>Import Map Editor</phrase>
+          </textobject>
+          <caption>Import Map Editor illustrating typical entries for the Bayesian matcher.</caption>
+        </mediaobject>
+      </screenshot>
+      <para>The three radio buttons at the top of the dialog select the type of data being displayed and edited:
+        <itemizedlist>
+          <listitem>
+            <emphasis role="bold"><guilabel>Bayesian</guilabel></emphasis>
+            <phrase>: The Bayesian matcher matches a transfer or destination account using
+              the frequency of association of a token string with an assigned transfer/destination account in the Import matcher
+              for a specific source account (the account that the first split of the imported transactionis directed to); 
+            </phrase>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Non-Bayesian</guilabel></emphasis>
+            <phrase>: The Non Bayesian matcher matches the transfer account on the basis of the occurrence of a token string in
+              transactions assigned to a transfer/destination account and does not record the frequency of association. This
+              was the original &app; matching process and has now been superceeded by the Bayesian matcher in more recent versions;
+            </phrase>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>OnlineiD</guilabel></emphasis>
+            <phrase>: Online ids are specific strings which identify specific accounts in information downloaded from online sources.
+            they may include account numbers and specific instiution identifiers.
+            </phrase>
+          </listitem>
+        </itemizedlist>
+      </para>
+      <para>The <emphasis role="bold"><guilabel>Bayesian</guilabel></emphasis> matcher data columns are:
+        <itemizedlist>
+          <listitem>
+            <emphasis role="bold"><guilabel>Source Account</guilabel></emphasis>
+            <phrase>: This is the account into which a transaction has been imported and is normally the first split in an
+              imported record. It may either be specified in the record itself or during the import setup for all 
+              transactions to be imported. The arrow control at the left of each entry in this column may be used
+              to display all the data used in matching a transfer or destination account for transactions which have
+              this account as their source split;
+            </phrase>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
+            <phrase>: This column displays a specific token string that has been associated with the allocation of the
+              account in the <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis> column as
+              a transfer/destination account for transfers to the <guilabel>Source Account</guilabel>;
+            </phrase>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>
+            <phrase>: The account name in this column is a &app; account name which has been allocated as a 
+              transfer/destination account in association with the token string in the
+              <emphasis role="bold"><guilabel>Match String</guilabel></emphasis> column;
+            </phrase>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Count of Match String Usage</guilabel></emphasis>
+            <phrase>: This is the number of times the token string in the <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
+              column has occurred in association with the transfer/destination account specified in the 
+              <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis> column for transactions imported to &app;.
+            </phrase>
+          </listitem>
+        </itemizedlist>
+      </para>
+      <para>The <emphasis role="bold"><guilabel>Non-Bayesian</guilabel></emphasis> matcher displays the same first three columns as the Bayesian matcher having the same usage.
+        It does not store data on the frequency with which a particular token is associated with the assignement of a given
+        transfer/destination account. It has an additional column which specifies the type of the imported data process in
+        which the assignment occurred.It has the following columns:
+        <itemizedlist>
+          <listitem>
+            <emphasis role="bold"><guilabel>Source Account</guilabel></emphasis>;
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Based on</guilabel></emphasis>
+            <phrase>: This identifies the import process in which the <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>
+              was associated with the transfer destination account in the <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>
+              column;
+            </phrase>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Match String</guilabel></emphasis>;
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>.
+          </listitem>
+        </itemizedlist> 
+      </para>
+      <para><emphasis role="bold"><guilabel>Online ID</guilabel></emphasis> displays the same columns with the same data as the Non-Bayesian matcher.
+      </para>
+      <para>The <emphasis role="bold"><guilabel>Filter</guilabel></emphasis> textbox at the bottom of the dialog allows filtering
+        of the displayed data matching the entered string in either the
+        <emphasis role="bold"><guilabel>Match String</guilabel></emphasis> column or the <emphasis role="bold"><guilabel>Mapped to Account Name</guilabel></emphasis>
+        column.
+      </para>
+      <para>The <emphasis role="bold"><guibutton>Expand All</guibutton></emphasis> and <emphasis role="bold"><guibutton>Collapse All</guibutton></emphasis> buttons expand or collapse the data
+      in the other columns for the accounts in the <emphasis role="bold"><guilabel>Source Account</guilabel></emphasis> column.
+      </para>
+      <para>The <emphasis role="bold"><guibutton>Delete</guibutton></emphasis> button will delete any selected rows in the displayed matcher data.
+      </para>
+      <para>The <emphasis role="bold"><guibutton>Close</guibutton></emphasis> button closes the Import Match Editor dialog.
+      </para>
+    </sect2>
+  </sect1>
+  <sect1 id="trans-export">
+    <title>Exporting Transactions</title>
+    <para>&app; allows transaction data to be exported in CSV format with the optional use of alternative column separators.
+      Transactions can be exported in either a single line format (simple layout) which can only be used for transactions with
+      two splits and may not allow all the data associated with a transaction to be exported or in a multiline format where
+      two or more lines are used for transactions with two or more splits with each splits information on separate lines.
+      Transaction data can be exported either from the currently selected active register or from selected accounts. 
+      The menu commands to export transactions are:
+      <itemizedlist>
+        <listitem><emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Export</guisubmenu>-><guimenuitem>Export Transactions to CSV</guimenuitem></emphasis>;</listitem>
+        <listitem><emphasis role="bold"><guimenu>File</guimenu>-><guisubmenu>Export</guisubmenu>-><guimenuitem>Export Active Register to CSV</guimenuitem></emphasis>.</listitem>
+      </itemizedlist>
+      These commands start the wizard illustrated in <!--FIXME --> to setup the export. They differ only in that in the latter case the
+       <emphasis role="bold"><guilabel>Account Selection</guilabel></emphasis> step is not available in the left hand pane.
+    </para>
+    <screenshot id="export-transactions-wizard">
+      <mediaobject>
+        <imageobject role="html">
+          <imagedata fileref="figures/Help_Choose_Export_Settings.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+        </imageobject>
+        <imageobject role="fo">
+                    <imagedata fileref="figures/Help_Choose_Export_Settings.png" format="PNG" srccredit="David Cousens"></imagedata>
+        </imageobject>
+        <textobject>
+          <phrase>Export Transactions Wizard</phrase>
+        </textobject>
+        <caption> The Export Transactions Wizard </caption>
+      </mediaobject>
+    </screenshot>
+    <para> The Export transaction wizard opens at the first step and performs the steps listed in the left hand pane:
+      <itemizedlist>
+        <listitem>
+          <emphasis role="bold"><guilabel>Choose Export Settings</guilabel></emphasis>;
+        </listitem>
+        <listitem>
+          <emphasis role="bold"><guilabel>Account Selection</guilabel></emphasis>;
+        </listitem>
+        <listitem>
+          <emphasis role="bold"><guilabel>Choose File Name for export</guilabel></emphasis>;
+        </listitem>
+        <listitem>
+          <emphasis role="bold"><guilabel>Export Now...</guilabel></emphasis>;
+        </listitem>
+        <listitem>
+          <emphasis role="bold"><guilabel>Export Summary</guilabel></emphasis>.
+        </listitem>
+      </itemizedlist>
+      <para>Navigation between the steps uses the buttons displayed in the right hand lower corner of the wizard. 
+        Which of the following buttons are displayed will depend on what is permissible from the step:
+        <itemizedlist>
+          <listitem>
+            <emphasis role="bold"><guilabel>Cancel</guilabel></emphasis>
+            <phrase>: Exit the wizard without exporting any transactions;</phrase>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Back</guilabel></emphasis>
+            <phrase>: Return to the previous step in the wizard;</phrase>
+          </listitem>
+          <listitem>
+            <emphasis role="bold"><guilabel>Next</guilabel></emphasis>
+            <phrase>: Proceed to the next step.</phrase>
+          </listitem>
+        </itemizedlist>
+      </para>      
+    </para>
+    <sect3 id="trans-export-settings">
+      <title>Choose Export Settings</title>
+      <para>This step allows you to choose various options in the formattig of the transactions being exported.</para>
+      <para>The <emphasis role="bold"><guilabel>Options</guilabel></emphasis> checkboxes may be selected singly or both may be selected together:
+        <itemizedlist>
+          <listitem><emphasis role="bold"><guilabel>Quotes</guilabel></emphasis>
+            <phrase>: Surround each data field in quotes;</phrase>
+          </listitem>
+          <listitem><emphasis role="bold"><guilabel>Simple layout</guilabel></emphasis>
+            <phrase>: If checked, the ouput transaction data will be as displayed in the single row register
+              view option and some of the transfer detail may be lost.
+            </phrase>
+            <para>The column headers for data exported in <emphasis role="bold"><guilabel>Simple layout</guilabel></emphasis> format are:</para>
+              <orderedlist>
+                <listitem><emphasis role="bold"><guilabel>Date</guilabel></emphasis>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Account Name</guilabel></emphasis><phrase>: name of the source account;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Number</guilabel></emphasis>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Description</guilabel></emphasis>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Full Category Path</guilabel></emphasis><phrase>full account name for transfer/destination account;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Reconcile</guilabel></emphasis>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Amount with Sym</guilabel></emphasis>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Amount NUm</guilabel></emphasis>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Rate/Price</guilabel></emphasis>
+                </listitem>
+              </orderedlist>
+            <para> If <emphasis role="bold"><guilabel>Simple layout</guilabel></emphasis> is not checked the transaction data will be exported
+              in a multi-line format. 
+            </para>
+            <para>The column headers for a multiline output for a transaction are:</para>
+              <orderedlist>
+                <listitem><emphasis role="bold"><guilabel>Date</guilabel></emphasis><phrase>: first line only;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Transaction ID</guilabel></emphasis><phrase>: first line only;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Number</guilabel></emphasis><phrase>: first line only;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Description</guilabel></emphasis><phrase>: first line only</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Notes</guilabel></emphasis><phrase>: first line only;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Commodity/Currency</guilabel></emphasis><phrase>: first line only;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Void Reason</guilabel></emphasis><phrase>: first line only;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Action</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Memo</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Full Account Name</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Account Name</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Amount with SYm</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Amount Num</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Reconcile</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Reconcile Date</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                </listitem>
+                <listitem><emphasis role="bold"><guilabel>Rate/Price</guilabel></emphasis><phrase>: first line and subsequent lines;</phrase>
+                </listitem>                
+              </orderedlist>
+            <para>Each line contains the data relevant to a single split with the first line also having transaction data relevant to all splits in the first 7 columns.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+      <para>The <emphasis role="bold"><guilabel>Separators</guilabel></emphasis> radio buttons allow the choice of an alternative column separator:
+        <itemizedlist>
+          <listitem><emphasis role="bold"><guilabel>Comma(,)</guilabel></emphasis>
+            <phrase>: This is the default separator;</phrase>
+          </listitem>
+          <listitem><emphasis role="bold"><guilabel>Colon(:)</guilabel></emphasis>
+            <phrase>: Use a colon to separate the columns;</phrase>
+          </listitem>
+          <listitem><emphasis role="bold"><guilabel>Semicolon(;)</guilabel></emphasis>
+            <phrase>: Use a semicolon to separate the columns;</phrase>
+          </listitem>
+          <listitem><emphasis role="bold"><guilabel>Custom</guilabel></emphasis>
+            <phrase>: Define a custom character to separate the columns by entering it in the textbox.</phrase>
+          </listitem>
+        </itemizedlist>
+      </para>
+      <para>Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to go to the next step.</para>
+    </sect3>
+    <sect3 id="trans-export-account-select">
+      <title>Account Selection</title>
+      <para>This step allows selection of one or more accounts and the specification of the date range
+        containing the transactions to be exported.
+      </para>
+      <para>The <emphasis role="bold"><guilabel>Accounts</guilabel></emphasis> panel displays an account
+        tree which allows one or more accounts to be selected for export. (Ctrl-Left-Click and Shift-Left-Click 
+        may be used to select accounts). The <emphasis role="bold"><guibutton>Select Subaccounts</guibutton></emphasis>
+        button will select all subaccounts of a selected account. The <emphasis role="bold"><guibutton>Select All</guibutton></emphasis>
+        button will select all accounts in the account tree for export. The number of accounts which have been selected is indicated.
+      </para>
+      <para>The <emphasis role="bold"><guilabel>Dates</guilabel></emphasis> panel allows selection of either all
+        transactions or only those within a selected date range in the selected accounts to be exported. 
+      </para>
+    </sect3>
+    <sect3 id="trans-export-choosefile">
+      <title>Choose File Name for export</title>
+      <para>A file selection dialog is presented allowing specification of a file name and a path to the directory/folder in which it is to be stored.
+      </para>
+    </sect3>
+    <sect3 id="trans-export-now"><title>Export Now...</title>
+      <para>The filename and path of the file to be exported and the number of accounts to be exported is displayed.
+        To continue with the export click the <emphasis role="bold"><guibutton>Apply</guibutton></emphasis> button.        
+      </para>
+    </sect3>
+    <sect3 id="trans-export-summary">
+      <title>Export Summary</title>
+      <para>Displays a message if the file is successfully exported or an error message and debugging suggections if not.</para>
+    </sect3>
   </sect1>
 
   <sect1 id="trans-online">
diff --git a/help/C/figures/Help_CSV_Import_Transactions_Delete.png b/help/C/figures/Help_CSV_Import_Transactions_Delete.png
new file mode 100644
index 0000000..bef8f6a
Binary files /dev/null and b/help/C/figures/Help_CSV_Import_Transactions_Delete.png differ
diff --git a/help/C/figures/Help_CSV_Import_Transactions_Save.png b/help/C/figures/Help_CSV_Import_Transactions_Save.png
new file mode 100644
index 0000000..c061eb9
Binary files /dev/null and b/help/C/figures/Help_CSV_Import_Transactions_Save.png differ
diff --git a/help/C/figures/Help_CSV_Import_transactions_Preview.png b/help/C/figures/Help_CSV_Import_transactions_Preview.png
new file mode 100644
index 0000000..11c6493
Binary files /dev/null and b/help/C/figures/Help_CSV_Import_transactions_Preview.png differ
diff --git a/help/C/figures/Help_CSV_Transaction_Import_Assistant.png b/help/C/figures/Help_CSV_Transaction_Import_Assistant.png
new file mode 100644
index 0000000..5b4a595
Binary files /dev/null and b/help/C/figures/Help_CSV_Transaction_Import_Assistant.png differ
diff --git a/help/C/figures/Help_Choose_Export_Settings.png b/help/C/figures/Help_Choose_Export_Settings.png
new file mode 100644
index 0000000..50a6270
Binary files /dev/null and b/help/C/figures/Help_Choose_Export_Settings.png differ
diff --git a/help/C/figures/Help_Import_Map_Editor.png b/help/C/figures/Help_Import_Map_Editor.png
new file mode 100644
index 0000000..bae5355
Binary files /dev/null and b/help/C/figures/Help_Import_Map_Editor.png differ
diff --git a/help/C/figures/Help_Import_MatchPicker.png b/help/C/figures/Help_Import_MatchPicker.png
new file mode 100644
index 0000000..e214650
Binary files /dev/null and b/help/C/figures/Help_Import_MatchPicker.png differ
diff --git a/help/C/figures/Help_Import_QIF_Druid.png b/help/C/figures/Help_Import_QIF_Druid.png
new file mode 100644
index 0000000..0624f25
Binary files /dev/null and b/help/C/figures/Help_Import_QIF_Druid.png differ
diff --git a/help/C/figures/Help_Import_Transaction_matcher_1.png b/help/C/figures/Help_Import_Transaction_matcher_1.png
new file mode 100644
index 0000000..f720698
Binary files /dev/null and b/help/C/figures/Help_Import_Transaction_matcher_1.png differ

commit 5788142365d772d5d81aba228ad3c18ec0483116
Author: Rob Laan <rob.laan at chello.nl>
Date:   Wed Jul 10 12:19:05 2019 +0200

    Import Bills & Invoices: blank ID in import row is replaced by ID from previous row.

diff --git a/guide/C/ch_import_business_data.xml b/guide/C/ch_import_business_data.xml
index 6088bb2..1556ea9 100644
--- a/guide/C/ch_import_business_data.xml
+++ b/guide/C/ch_import_business_data.xml
@@ -49,8 +49,8 @@ Updated:
 			<title>The format of the import file</title>
 
 			<para>
-				The import file should contain rows of invoice entry data, each row marked by an invoice ID. The file should be
-				sorted on invoice ID. Each row contains header and entry fields, but <application>&app;</application> takes the
+				The import file should contain rows of invoice entry data.
+				Any row contains both header and entry fields, but <application>&app;</application> takes the
 				invoice header data from the first row of an invoice ID. For informational purposes, 
 				the header data may be repeated for each subsequent row of the same invoice.
 			</para>
@@ -67,7 +67,8 @@ Updated:
 			<itemizedlist>
 				<listitem>
 					<para><emphasis><prompt>id</prompt></emphasis> -
-						The invoice ID. Mandatory. Any row without an invoice ID will be ignored. If the invoice ID already exists,
+						The invoice ID. If the invoice ID is blank, <application>&app;</application> replaces it with the
+						invoice ID from the previous row. If the invoice ID already exists,
 						<application>&app;</application> will add the entries to the existing invoice (unless it is already posted).
 					</para>
 				</listitem>
@@ -226,7 +227,7 @@ Updated:
 
 	 	 	<para>
 				Example content for one customer invoice, with one entry, including tax and discount.
-				Using comma fields separator, decimal point and dd/mm/yyyy date format. 
+				Using comma field separator, decimal point and dd/mm/yyyy date format. 
 				The the value of the description field contains the separator character.
 			</para>
 		
@@ -435,7 +436,9 @@ Updated:
 				<itemizedlist>
 					<listitem>
 						<para>
-							The field <prompt>ID</prompt> is blank. Every row should have an invoice ID.
+							The field <prompt>ID</prompt> is blank. <application>&app;</application>  replaces a blank invoice ID
+							with the invoice ID from the previous row. But the first row of the import file should always have
+							an invoice ID.
 						</para>
 					</listitem>
 					<listitem>



Summary of changes:
 guide/C/ch_import_business_data.xml                |   13 +-
 guide/C/gnucash-guide.xml                          |   33 +-
 guide/de/gnucash-guide.xml                         |   22 +-
 help/C/Help_ch_Transactions.xml                    | 1405 ++++++++++++++++----
 help/C/figures/Help_Book_Options_Accounts.png      |  Bin 16767 -> 16943 bytes
 help/C/figures/Help_Book_Options_Budgeting.png     |  Bin 12990 -> 13166 bytes
 help/C/figures/Help_Book_Options_Business.png      |  Bin 47104 -> 47280 bytes
 help/C/figures/Help_Book_Options_Counters.png      |  Bin 34530 -> 34706 bytes
 .../Help_CSV_Import_Transactions_Delete.png        |  Bin 0 -> 428 bytes
 .../figures/Help_CSV_Import_Transactions_Save.png  |  Bin 0 -> 460 bytes
 .../Help_CSV_Import_transactions_Preview.png       |  Bin 0 -> 106312 bytes
 .../Help_CSV_Transaction_Import_Assistant.png      |  Bin 0 -> 51541 bytes
 help/C/figures/Help_Choose_Export_Settings.png     |  Bin 0 -> 38641 bytes
 help/C/figures/Help_Import_Map_Editor.png          |  Bin 0 -> 78426 bytes
 help/C/figures/Help_Import_MatchPicker.png         |  Bin 0 -> 27622 bytes
 help/C/figures/Help_Import_QIF_Druid.png           |  Bin 0 -> 52989 bytes
 .../figures/Help_Import_Transaction_matcher_1.png  |  Bin 0 -> 105804 bytes
 help/C/gnucash-help.xml                            |   33 +-
 help/de/gnucash-help.xml                           |  197 ++-
 19 files changed, 1280 insertions(+), 423 deletions(-)
 create mode 100644 help/C/figures/Help_CSV_Import_Transactions_Delete.png
 create mode 100644 help/C/figures/Help_CSV_Import_Transactions_Save.png
 create mode 100644 help/C/figures/Help_CSV_Import_transactions_Preview.png
 create mode 100644 help/C/figures/Help_CSV_Transaction_Import_Assistant.png
 create mode 100644 help/C/figures/Help_Choose_Export_Settings.png
 create mode 100644 help/C/figures/Help_Import_Map_Editor.png
 create mode 100644 help/C/figures/Help_Import_MatchPicker.png
 create mode 100644 help/C/figures/Help_Import_QIF_Druid.png
 create mode 100644 help/C/figures/Help_Import_Transaction_matcher_1.png



More information about the gnucash-changes mailing list