gnucash-docs maint: Multiple changes pushed

Frank H.Ellenberger fell at code.gnucash.org
Sat May 22 17:54:29 EDT 2021


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/9fbc03b3 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/f290acef (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/42e527b8 (commit)



commit 9fbc03b348cf4d4ec634d2ecb131e9f7cb13a55f
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed May 19 15:09:58 2021 +0200

    Replace most <literallayout> by <screen> for all LANG <> it
    
    <screen> uses Monospace while <literallayout> keeps the default
    (proportinal) font
    
    Partially includes updates of untranslated text and images

diff --git a/guide/C/appendixa.xml b/guide/C/appendixa.xml
index e0955c2..aaae878 100644
--- a/guide/C/appendixa.xml
+++ b/guide/C/appendixa.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Replaced empty pages 2020-03-07 by Frank H. Ellenberger
 
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixa">
   <title>Migration Guide</title>
@@ -111,7 +110,7 @@
           <para>If the file was last modified by a version of &app; older than 2.0, then before you continue to the
             next step you will need to modify the working file’s <gnc-v2> tag to read
             something like this:
-<literallayout>
+<programlisting language="xml">
 <gnc-v2 xmlns:cd="http://www.gnucash.org/XML/cd"
   xmlns:book="http://www.gnucash.org/XML/book"
   xmlns:gnc="http://www.gnucash.org/XML/gnc"
@@ -133,7 +132,7 @@
   xmlns:sx="http://www.gnucash.org/XML/sx"
   xmlns:fs="http://www.gnucash.org/XML/fs"
   xmlns:addr="http://www.gnucash.org/XML/custaddr">
-        </literallayout>
+</programlisting>
           </para>
         </important>
 
diff --git a/guide/C/appendixc.xml b/guide/C/appendixc.xml
index d41af39..3421cd2 100644
--- a/guide/C/appendixc.xml
+++ b/guide/C/appendixc.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: 2019-09-12 Fell: EEC->EU
    modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixc">
   <title>Contributed Account Trees</title>
@@ -93,7 +92,7 @@
       so the <quote>net of VAT</quote> increase in your bank account, when the invoice is payed, is
       matched by a decrease in capital.
     </para>
-<literallayout>
+<screen>
 Bank Accounts [B]
   |___ Main Account
   |___  Reserve Account
@@ -169,8 +168,6 @@ Expenses [E]
                     |___  Software
                     |___  Subscriptions
                     |___  Sundry
-                    |___  Travel / Accom
-
-</literallayout>
+                    |___  Travel / Accom</screen>
   </sect1>
 </appendix>
diff --git a/guide/C/appendixd.xml b/guide/C/appendixd.xml
index 796f17d..955989c 100644
--- a/guide/C/appendixd.xml
+++ b/guide/C/appendixd.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: March 18th, 2007
   Maintainers:
-                Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-                David Hampton <hampton at employees.org>
+    David Hampton <hampton at employees.org>
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixd">
   <title>Auxiliary File Formats</title>
@@ -60,8 +59,7 @@
       <para>A typical &app; check file is presented below. The contents of this file will be described in the
         next sections.
       </para>
-<programlisting>
-[Top]
+<programlisting language="ini">[Top]
 Guid = 67b144d1-96a5-48d5-9337-0e1083bbf229
 Title = Quicken/QuickBooks (tm) US-Letter
 Rotation = 0.0
@@ -88,8 +86,7 @@ Type_4 = DATE
 Coords_4 = 500.0;67.0
 
 Type_5 = NOTES
-Coords_5 = 50.0;212.0
-        </programlisting>
+Coords_5 = 50.0;212.0</programlisting>
     </sect2>
 
     <sect2>
@@ -688,8 +685,7 @@ Coords_5 = 50.0;212.0
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -711,8 +707,7 @@ Blocking_Chars
 <literallayout>Font
 Align
 Blocking_Chars
-DateFormat
-                    </literallayout>
+DateFormat</literallayout>
                 </entry>
 
                 <entry>
@@ -732,8 +727,7 @@ DateFormat
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -754,8 +748,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -784,8 +777,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -806,8 +798,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -837,8 +828,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -860,8 +850,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -882,8 +871,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -903,8 +891,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -925,8 +912,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -948,8 +934,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -970,8 +955,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
diff --git a/guide/C/ch_bus_features.xml b/guide/C/ch_bus_features.xml
index 53c4885..dc27254 100644
--- a/guide/C/ch_bus_features.xml
+++ b/guide/C/ch_bus_features.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 1.0.0
   Last modified: Sep 19th 2015
   Maintainers:
-               Chris Good <chris.good at ozemail.com.au>
+    Chris Good <chris.good at ozemail.com.au>
   Author:
-  		Chris Good <chris.good at ozemail.com.au>
-	updated [FirstName LastName] <name at company.com>
+    Chris Good <chris.good at ozemail.com.au>
+    updated
+    [FirstName LastName] <name at company.com>
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_bus_features">
   <title>Business Features</title>
@@ -100,8 +100,7 @@
         defined with account type <emphasis>A/Payable</emphasis>. &app; will use this account to
         place transactions related to the integrated accounts payable system.
       </para>
-<literallayout>
-Basic A/R and A/P Account Hierarchy:
+<screen>Basic A/R and A/P Account Hierarchy:
 
 -Assets
    -Accounts Receivable
@@ -114,8 +113,7 @@ Basic A/R and A/P Account Hierarchy:
   -Accounts Payable
   -Tax
       -Tax on Purchases
-      -Tax on Sales
-  </literallayout>
+      -Tax on Sales</screen>
       <para>You need to add additional accounts to this hierarchy for it to be useful.
       </para>
 
@@ -1750,19 +1748,17 @@ Basic A/R and A/P Account Hierarchy:
         for all of your employees. The taxes are later paid to the appropriate government agency.
       </para>
 
-      <para><literallayout>
-              Simple Payroll Account Layout:
-              
-              -Assets
-              --Checking
-              -Liabilities
-              --Tax1  (short term <quote>storage</quote> account)
-              --Tax2  (short term <quote>storage</quote> account)
-              -Expenses
-              --Salaries
-              --Tax1
-              --Tax2
-           </literallayout>
+      <para><screen>Simple Payroll Account Layout:
+
+-Assets
+--Checking
+-Liabilities
+--Tax1  (short term <quote>storage</quote> account)
+--Tax2  (short term <quote>storage</quote> account)
+-Expenses
+--Salaries
+--Tax1
+--Tax2</screen>
         <note>
           <para>Resist the temptation to create per-employee sub-accounts to track individual salaries. Creating a
             sub-account for each employee leads to unmanageably large lists of accounts. Imagine the
diff --git a/guide/C/ch_capgain.xml b/guide/C/ch_capgain.xml
index 8eb27f2..bbab1ae 100644
--- a/guide/C/ch_capgain.xml
+++ b/guide/C/ch_capgain.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Bengt Thuree <bengt at thuree.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_capgain">
   <title>Capital Gains</title>
@@ -134,7 +133,7 @@
       Gains</emphasis> accounts are balanced by the <emphasis>Income:Unrealized Gains</emphasis>
       account (similar for <emphasis>ITEM2</emphasis>).
     </para>
-<literallayout>
+<screen>
 -Assets
     -Current Assets
         -Savings Account
@@ -147,8 +146,7 @@
             -Unrealized Gain
 -Income
     -Realized Gains
-    -Unrealized Gains
-  </literallayout>
+    -Unrealized Gains</screen>
   </sect1>
 
   <sect1 id="capgain_example1">
diff --git a/guide/C/ch_cc.xml b/guide/C/ch_cc.xml
index e2239d8..b9a6645 100644
--- a/guide/C/ch_cc.xml
+++ b/guide/C/ch_cc.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Bengt Thuree <bengt at thuree.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Bengt Thuree <bengt at thuree.com>
   Originally written by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_cc">
   <title>Credit Cards</title>
@@ -70,14 +69,13 @@
       <para>If you do not want to track each expense made on the credit card, you can set up a simple account
         hierarchy like this:
       </para>
-<literallayout>
+<screen>
 -Assets
    -Bank
 -Liabilities
    -Credit Card
 -Expenses
-   -Credit Card
-   </literallayout>
+   -Credit Card</screen>
       <para>In this example, if you enter your total amount charged per month as a transaction between
         <emphasis>Liabilities:Credit Card</emphasis> and <emphasis>Expenses:Credit Card</emphasis>.
         When you make a payment, you would enter a transaction between
@@ -98,7 +96,7 @@
         entered as a separate transaction between your Credit Card liability account and a specific
         expense account. Below is an example of an account hierarchy for this:
       </para>
-<literallayout>
+<screen>
 -Assets
     -Bank
 -Liabilities
@@ -109,8 +107,7 @@
     -Clothes
     -Entertainment
     -Interest
-    -Service
-   </literallayout>
+    -Service</screen>
       <para>Clearly, you should enter specific expense accounts which fit your spending habits. The only
         difference with this setup as compared to the simple setup is that the expenses have been
         subdivided by groups. Also notice that there is an <quote>Interest</quote> expense, this is
diff --git a/guide/C/ch_currency.xml b/guide/C/ch_currency.xml
index d8ee8d2..70b71f3 100644
--- a/guide/C/ch_currency.xml
+++ b/guide/C/ch_currency.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.6.15
   Last modified: December 6, 2016
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Bengt Thuree <bengt at thuree.com>
-  	Updated	Geert Janssens <janssens-geert at telenet.be>
-	Revised David T. <sunfish62 at yahoo.com>
-	Revised 2020: David Cousens <davidcousens at bigpond.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated Bengt Thuree <bengt at thuree.com>
+    Updated Geert Janssens <janssens-geert at telenet.be>
+    Revised David T. <sunfish62 at yahoo.com>
+    Revised 2020: David Cousens <davidcousens at bigpond.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_currency">
   <title>Multiple Currencies</title>
@@ -87,18 +86,17 @@ TODO -->
         Dollars, one using Euros, and the third in Hong Kong Dollars. One possible account structure
         for this would be:
       </para>
-<literallayout>
-  -Assets (USD)
-     -Current Assets (USD)
-        -US Bank (USD)
-        -European Bank (EUR)
-        -HK Bank (HKD)
-  -Equity (USD)
-     -Opening Balances (USD)
-        -USD (USD)
-        -EUR (EUR)
-        -HKD (HKD)
-   </literallayout>
+<screen>
+-Assets (USD)
+   -Current Assets (USD)
+      -US Bank (USD)
+      -European Bank (EUR)
+      -HK Bank (HKD)
+-Equity (USD)
+   -Opening Balances (USD)
+      -USD (USD)
+      -EUR (EUR)
+      -HKD (HKD)</screen>
       <note>
         <para>The currency of each account is shown in parenthesis.
         </para>
@@ -501,17 +499,16 @@ TODO -->
 
         <para>To record this in &app; we use the following basic account structure:
         </para>
-<literallayout>
-  -Assets (USD)
-     -Current Assets (USD)
-        -US Bank (USD)
-        -Jamaican Bank (JMD)
-     -Fixed Assets (USD)
-        -Boat (JMD)
-  -Equity (USD)
-     -Opening Balances (USD)
-        -USD (USD)
-        </literallayout>
+<screen>
+-Assets (USD)
+   -Current Assets (USD)
+      -US Bank (USD)
+      -Jamaican Bank (JMD)
+   -Fixed Assets (USD)
+      -Boat (JMD)
+-Equity (USD)
+   -Opening Balances (USD)
+      -USD (USD)</screen>
         <note>
           <para>The currency of each account is shown in parenthesis.
           </para>
@@ -633,13 +630,12 @@ TODO -->
           0694.HK on Yahoo! Since you wanted to track all various income and expense amounts, here
           is the necessary account structure:
         </para>
-<literallayout>
-  Assets:Investments:Brokerage Accounts:Boom:0694.HK (0694.HK)
-  Assets:Investments:Brokerage Accounts:Boom:Bank (HKD)
-  Equity:Opening Balances:HKD (HKD)
-  Expenses:Commissions:Boom.0694.HK (HKD)
-  Income:Investments:Dividend:Boom:0694.HK (HKD)
-        </literallayout>
+<screen>
+Assets:Investments:Brokerage Accounts:Boom:0694.HK (0694.HK)
+Assets:Investments:Brokerage Accounts:Boom:Bank (HKD)
+Equity:Opening Balances:HKD (HKD)
+Expenses:Commissions:Boom.0694.HK (HKD)
+Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
         <para>The Chart of Accounts looks like this after creating all the needed accounts:
         </para>
 
@@ -842,22 +838,20 @@ TODO -->
 
       <para>If you are not interested in detail at all, a very simple account structure would suffice:
       </para>
-<literallayout>
-      Assets:Investments:Currency:Bank (USD)
-      Assets:Investments:Currency:XXX (XXX)
-      </literallayout>
+<screen>
+Assets:Investments:Currency:Bank (USD)
+Assets:Investments:Currency:XXX (XXX)</screen>
       <para>You would simply enter transfers between the two accounts, noting exchange rates as you went.
       </para>
 
       <para>But, if you do want to be able to track capital gains or losses, as well as any fees, you do need a
         more complex account structure, such as:
       </para>
-<literallayout>
-      Assets:Investments:Currency:Bank (USD)
-      Assets:Investments:Currency:Currency Bank:XXX (XXX)
-      Expenses:Investments:Currency:Currency Bank:XXX (XXX)
-      Income:Investments:Currency Bank:Capital Gains:XXX (XXX)
-      </literallayout>
+<screen>
+Assets:Investments:Currency:Bank (USD)
+Assets:Investments:Currency:Currency Bank:XXX (XXX)
+Expenses:Investments:Currency:Currency Bank:XXX (XXX)
+Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
       <sect3 id="currency_invest12">
         <title>Purchasing Currency</title>
 
@@ -1113,13 +1107,12 @@ TODO -->
         additional accounts which will be created automatically when transactions are created
         between different currencies with trading accounts enabled are:
       </para>
-<literallayout><emphasis role="bold">
-        Trading
-            CURRENCY
-                EUR
-                HKD
-                USD</emphasis>
-</literallayout>
+<screen>
+Trading
+    CURRENCY
+        EUR
+        HKD
+        USD</screen>
       <caution>
         <para>The names of these accounts are again assigned automatically and cannot be changed by a user without
           disrupting the functionality of the trading accounts in &app;.
@@ -1163,7 +1156,7 @@ TODO -->
 
         <para>The following prices were entered in the Price Database (
           <menuchoice>
-            <guimenu>Tools></guimenu><guisubmenu>Price Database </guisubmenu>
+            <guimenu>Tools</guimenu><guisubmenu>Price Database</guisubmenu>
           </menuchoice>
           ) as at 01/01/2020 to convert the account balances for the foreign currency accounts to
           USD:
diff --git a/guide/C/ch_dep.xml b/guide/C/ch_dep.xml
index a6365d1..8140f0d 100644
--- a/guide/C/ch_dep.xml
+++ b/guide/C/ch_dep.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!--  (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   	Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_dep">
   <title>Depreciation</title>
@@ -595,7 +594,7 @@
       Depreciation</emphasis> account is balanced by the <emphasis>Expenses:Depreciation</emphasis>
       account.
     </para>
-<literallayout>
+<screen>
 -Assets
    -Fixed Assets
       -ITEM1
@@ -607,8 +606,7 @@
    -Current Assets
       -Bank
 -Expense
-   -Depreciation        (Depreciation Expense account)
-  </literallayout>
+   -Depreciation        (Depreciation Expense account)</screen>
     <para>One of the features of the account hierarchy shown above is that you can readily see some important
       summary values about your depreciating asset. The <emphasis>Assets:Fixed
       Assets:ITEM1</emphasis> account total shows you the current estimated value for item1, the
diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index f6ede43..ef069f6 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: December 7th 2009
        modified: January 10th 2007
        modified: July 9th 2006
   Maintainers:
-               Alex Aycinena <alex.aycinena at gmail.com>
-               Chris Lyttle <chris at wilddev.net>
+    Alex Aycinena <alex.aycinena at gmail.com>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Dave Herman <dvherman at bigfoot.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Dave Herman <dvherman at bigfoot.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_invest">
   <title>Investments</title>
@@ -401,7 +400,7 @@
         deals with the investments. This way it is easier to compare the statements you get from
         your brokerage with the accounts you have in &app; and spot where &app; differs from the
         statement.
-<literallayout>
+<screen>
  Assets
     Investments
        Brokerage Accounts
@@ -448,8 +447,7 @@
           My Stockbroker
        Management Fees
           I*Trade
-          My Stockbroker
- </literallayout>
+          My Stockbroker</screen>
       </para>
 
       <tip>
@@ -478,7 +476,7 @@
         expense account to record bank charges. Below is an account layout example, in which you
         have an interest bearing savings account and a certificate of deposit at your bank.
       </para>
-<literallayout>
+<screen>
 Assets
    Bank ABC
       CD
@@ -489,8 +487,7 @@ Expenses
 Income
    Interest Income
       CD
-      Savings
-  </literallayout>
+      Savings</screen>
       <para>As usual, this account hierarchy is simply presented as an example, you should create your accounts
         in a form which best matches your actual situation.
       </para>
@@ -654,7 +651,7 @@ Income
         respectively. Below is a schematic model of the layout (only showing the Assets
         sub-accounts).
       </para>
-<literallayout>
+<screen>
  Assets
     Investments
        Brokerage Accounts
@@ -664,8 +661,7 @@ Income
           Stock
              AMZN
              IBM
-             NST
- </literallayout>
+             NST</screen>
       <note>
         <para>If you want to track income (dividends/interest/capital gains) on a per-stock or fund basis, you
           will need to create an <emphasis>Income:Dividends:STOCKSYMBOL</emphasis>,
diff --git a/guide/C/ch_loans.xml b/guide/C/ch_loans.xml
index 5365dc4..906d70b 100644
--- a/guide/C/ch_loans.xml
+++ b/guide/C/ch_loans.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   	Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_loans">
   <title>Loans</title>
@@ -126,8 +125,7 @@
       money from a loan is an asset. With these parameters, we can now present a basic loan account
       structure:
     </para>
-<literallayout>
-Basic Loan Account Structure
+<screen>Basic Loan Account Structure
 
 -Asset
     -Current Assets
@@ -140,8 +138,7 @@ Basic Loan Account Structure
 -Expenses
    -Interest
        -Mortgage Interest
-   -Mortgage Adm Fees
-  </literallayout>
+   -Mortgage Adm Fees</screen>
     <para>&app; has a number of predefined loan account hierarchies available, including Car Loans and Home
       Mortgage Loans. To access these predefined account structures, click on
       <menuchoice>
@@ -279,28 +276,27 @@ Basic Loan Account Structure
 
       <para>In order to discuss the mathematical formulas used by the <guilabel>Loan Repayment
         Calculator</guilabel>, we first must define some variables.
-<literallayout>
- n  == number of payment periods
+<screen>
+ n   == number of payment periods
  %i  == nominal interest rate, NAR, charged
  PV  == Present Value
  PMT == Periodic Payment
  FV  == Future Value
- CF == Compounding Frequency per year
- PF == Payment Frequency per year
+ CF  == Compounding Frequency per year
+ PF  == Payment Frequency per year
 
 Normal values for CF and PF are:
-   1   == annual
-   2   == semi-annual
-   3   == tri-annual
-   4   == quaterly
-   6   == bi-monthly
-   12  == monthly
-   24  == semi-monthly
-   26  == bi-weekly
-   52  == weekly
-   360 == daily
-   365 == daily
-</literallayout>
+   1  == annual
+   2  == semi-annual
+   3  == tri-annual
+   4  == quaterly
+   6  == bi-monthly
+  12  == monthly
+  24  == semi-monthly
+  26  == bi-weekly
+  52  == weekly
+ 360  == daily
+ 365  == daily</screen>
       </para>
 
       <sect3 id="loans_calcsdetails_i2">
@@ -312,15 +308,13 @@ Normal values for CF and PF are:
           computation produces the effective interest rate (ieff). Thus, we need functions which
           convert from i to ieff, and from ieff to i.
         </para>
-<literallayout>
-To convert from i to ieff, the following expressions are used:
-Discrete Interest:     <emphasis>ieff = (1 + i/CF)^(CF/PF) - 1</emphasis>
+<screen>To convert from i to ieff, the following expressions are used:
+Discrete Interest:   <emphasis>ieff = (1 + i/CF)^(CF/PF) - 1</emphasis>
 Continuous Interest: <emphasis>ieff = e^(i/PF) - 1 = exp(i/PF) - 1</emphasis>
 
 To convert from ieff to i, the following expressions are used:
-Discrete Interst:      <emphasis>i = CF*[(1+ieff)^(PF/CF) - 1]</emphasis>
-Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis>
-</literallayout>
+Discrete Interst:    <emphasis>i = CF*[(1+ieff)^(PF/CF) - 1]</emphasis>
+Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis></screen>
         <note>
           <para>In the equations below for the financial transaction, all interest rates are the effective interest
             rate, <quote>ieff</quote>. For the sake of brevity, the symbol will be shortened to just
@@ -335,18 +329,17 @@ Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis>
         <para>One equation fundamentally links all the 5 variables. This is known as the fundamental financial
           equation:
         </para>
-<literallayout>
+<screen>
 <emphasis>PV*(1 + i)^n + PMT*(1 + iX)*[(1+i)^n - 1]/i + FV = 0</emphasis>
 
   Where: X = 0 for end of period payments, and
-         X = 1 for beginning of period payments
-</literallayout>
+         X = 1 for beginning of period payments</screen>
         <para>From this equation, functions which solve for the individual variables can be derived. For a
           detailed explanation of the derivation of this equation, see the comments in the file
           src/calculation/fin.c from the &app; source code. The A, B, and C variables are defined
           first, to make the later equations simpler to read.
         </para>
-<literallayout>
+<screen>
 <emphasis>A = (1 + i)^n - 1</emphasis>
 <emphasis>B = (1 + iX)/i</emphasis>
 <emphasis>C = PMT*B</emphasis>
@@ -359,8 +352,7 @@ Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis>
 The solution for interest is broken into two cases.
 The simple case for when  PMT == 0 gives the solution:
 <emphasis>i = [FV/PV]^(1/n) - 1</emphasis>
-
-</literallayout>
+</screen>
         <para>The case where PMT != 0 is fairly complex and will not be presented here. Rather than involving an
           exactly solvable function, determining the interest rate when PMT !=0 involves an
           iterative process. Please see the src/calculation/fin.c source file for a detailed
@@ -564,7 +556,7 @@ The simple case for when  PMT == 0 gives the solution:
 
     <para>We are basing this How-To on the following generic account structure.
     </para>
-<literallayout>
+<screen>
 -Asset
    -Bank
         -Bank Account
@@ -572,8 +564,7 @@ The simple case for when  PMT == 0 gives the solution:
         -Person
 -Income
    -Interest Income
-        -Person
-  </literallayout>
+        -Person</screen>
     <para>This example will show how to track a personal loan of 2,000 USD (default currency) to your friend
       Peter
     </para>
@@ -650,12 +641,11 @@ The simple case for when  PMT == 0 gives the solution:
       <para>Let’s start with the following accounts (all accounts have the same currency, in this case
         USD)
       </para>
-<literallayout>
+<screen>
 Assets:Bank:USD
 Assets:Money owed to you:Peter
 Income:Interest Income:Peter
-Equity:Opening Balances:USD
-  </literallayout>
+Equity:Opening Balances:USD</screen>
     </sect2>
 
     <sect2 id="loans_personalLoanToSomeOne_InitialSetup">
@@ -889,7 +879,7 @@ Equity:Opening Balances:USD
       loan. The only difference is different accounts, and different interest rates.
     </para>
 
-    <para><literallayout>Basic Car Loan Account Structure
+    <para><screen>Basic Car Loan Account Structure
 
 -Asset
     -Current Assets
@@ -902,7 +892,7 @@ Equity:Opening Balances:USD
 -Expenses
    -Interest
        -Car Loan Interest
-   -Car Loan Adm Fees</literallayout>
+   -Car Loan Adm Fees</screen>
     </para>
 
     <para>For more information, please check <xref
@@ -956,7 +946,7 @@ Equity:Opening Balances:USD
         you want to sell a car instead, just substitute the house account with a car account.
       </para>
 
-      <para><literallayout>
+      <para><screen>
 -Assets
   -Fixed Assets
     -House
@@ -964,8 +954,7 @@ Equity:Opening Balances:USD
     -Saving
 -Income
   -Capital Gains Long
-    -House
-    </literallayout>
+    -House</screen>
       </para>
 
       <itemizedlist>
@@ -1130,7 +1119,7 @@ Equity:Opening Balances:USD
         <xref linkend="chapter_capgain"></xref>.
       </para>
 
-      <para><literallayout>
+      <para><screen>
 -Assets
     -Fixed Assets
         -House
@@ -1142,8 +1131,7 @@ Equity:Opening Balances:USD
     -Realized Gain
         -House
     -Unrealized Gain
-        -House
-    </literallayout>
+        -House</screen>
       </para>
 
       <para>You bought a house for $300,000 once upon a time, and over the years kept a close look on the market
@@ -1288,8 +1276,7 @@ Equity:Opening Balances:USD
 <!--
   <sect1 id="loans_missing1">
     <title>Missing Loan Documentation</title>
-
-    <literallayout>
+<screen>
  -Entering a Payment Schedule
      -Monthly Payments (How-To)
        -See the Mortgage assistant
@@ -1299,8 +1286,7 @@ Equity:Opening Balances:USD
        -Same as a normal payment, but you get the figures from the bank
        -How to fix 10 amortization and then a final bulk payment setup?
 
- -Putting It All Together
- </literallayout>
+ -Putting It All Together</screen>
   </sect1>
 -->
 </chapter>
diff --git a/guide/de/appendixa.xml b/guide/de/appendixa.xml
index 321ffa0..7bd186f 100644
--- a/guide/de/appendixa.xml
+++ b/guide/de/appendixa.xml
@@ -1,134 +1,202 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Replaced empty pages 2020-03-07 by Frank H. Ellenberger
+
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixa">
   <title>Migration Guide</title>
-
+  
   <para>&untranslated-de;
   </para>
 <!--
- <para>
-This appendix is to help current users of other financial software packages in their migration to &app;.  We address the conceptual differences between the layout of &app; accounts versus other software packages.
+  <para>This appendix is to help current users of other financial software packages in their migration to
+    &app;. We address the conceptual differences between the layout of &app; accounts versus other
+    software packages.
   </para>
 
-<sect1 id="appendixa_accts_vs_cats1">
-<title>Using Accounts vs. Categories</title>
-<para>
-If you are familiar with other personal finance programs, you are already accustomed to tracking your income and expenses as categories. Since &app; is a double-entry system (refer to section 2.1), incomes and expenses are tracked in accounts. The basic concept is the same, but the account structure allows more consistency with accepted business practices. So, if you are a business user as well as a home user, &app; makes it easy to keep track of your business as well as your personal accounts.
-</para>
-<para>
-Income and expense accounts give you the same information you would get with categories, but they also give you more flexibility in entering your transactions.    In &app;, you have the option to enter transactions directly into income and expense accounts through their account registers.   Other programs that use categories do not offer this option, because there is no <quote>account register</quote> for a category.
-</para>
-<para>
-You also have the option in &app; to treat income and expense accounts exactly as you would treat categories, if you are more comfortable with that method.  In <trademark class="registered">Quicken</trademark> and similar programs,  transactions require an account and a category.   Substitute an income or expense account name in &app; where you would normally enter a category name in the other programs, and the result should be the same.   We will discuss transaction entry in Chapter 4 in greater detail.
-</para>
-</sect1>
-
- <sect1 id="appendixa_qif1">
- <title>Organization of <acronym>QIF</acronym> Files (Discussion)</title>
- <para>
-  </para>
- </sect1>
- <sect1 id="appendixa_entercharge1">
- <title>Common Duplication Issues (Discussion)</title>
- <para>
- </para>
- </sect1>
- <sect1 id="appendixa_enterpay1">
- <title>Checking <acronym>QIF</acronym> Data (Discussion)</title>
- <para>
- </para>
- </sect1>
-
-<sect1 id="appendixa_xmlconvert1">
-<title>Converting <acronym>XML</acronym> &app; File</title>
- <para>The &app; <acronym>XML</acronym> data file can be transformed to almost any other data
-format (e.g., <acronym>QIF</acronym>, <acronym>CSV</acronym>...) quite easily if one is familiar with <acronym>XSLT</acronym>. 
-The &app; data file is well-formed <acronym>XML</acronym>, and it can therefore be run
-through an <acronym>XSLT</acronym> parser with an associated stylesheet.  This allows one
-to transform the file to just about any format that can be designed,
-given a properly written stylesheet.</para>
-
-  <para>A few steps need to be followed.  The writing of a stylesheet is a task
-for a different time, but if you can get one written, here’s what you
-need to do:</para>
-  <orderedlist>
-  <listitem>
-    <para>Copy the &app; <acronym>XML</acronym> data file to a working file.</para>
-    <note>
-      <para>If the file was last modified by a version of &app; older than 2.0, then
-before to continue to the next step you will need to modify the working file’s <gnc-v2>
-tag to read something like this:</para>
-    <literallayout>
+  <sect1 id="appendixa_accts_vs_cats1">
+    <title>Using Accounts vs. Categories</title>
+
+    <para>If you are familiar with other personal finance programs, you are already accustomed to tracking
+      your income and expenses as categories. Since &app; is a double-entry system (see
+      <xref linkend="basics-accounting1" />), income and expenses are tracked in accounts. The basic
+      concept is the same, but the account structure allows more consistency with accepted business
+      practices. So, if you are a business user as well as a home user, &app; makes it easy to keep
+      track of your business as well as your personal accounts.
+    </para>
+
+    <para>Income and expense accounts give you the same information you would get with categories, but they
+      also give you more flexibility in entering your transactions. In &app;, you have the option to
+      enter transactions directly into income and expense accounts through their account registers.
+      Other programs that use categories do not offer this option, because there is no
+      <quote>account register</quote> for a category.
+    </para>
+
+    <para>You also have the option in &app; to treat income and expense accounts exactly as you would treat
+      categories, if you are more comfortable with that method. In
+      <trademark class="registered">Quicken</trademark> and similar programs, transactions require
+      an account and a category. Substitute an income or expense account name in &app; where you
+      would normally enter a category name in the other programs, and the result should be the same.
+      We will discuss transaction entry in <xref linkend="basics-transactions2" /> in greater
+      detail.
+    </para>
+  </sect1>
+
+  <sect1 id="appendixa_import">
+    <title>Importing Data</title>
+
+    <para>If you want to import data from your previous application, you should distinguish between financial
+      data and other data. Probably the best way to import financial data is the <quote>Quicken
+      Interchange Format</quote> <acronym>QIF</acronym> . It is a specific format for financial
+      data, which most financial applications for the private sector know and can use for export.
+    </para>
+
+    <para>For other data we suggest the use of the <quote>Comma Separated Value</quote> <acronym>CSV</acronym>
+      format.
+    </para>
+
+    <sect2 id="appendixa_qif1">
+      <title>Import of Financial Data by <acronym>QIF</acronym> Files</title>
+
+      <para>See <ulink url="&url-wp-en;Quicken_Interchange_Format" /> for it's details.
+      </para>
+
+      <para>Some &app; users collected their knowledge about the best use in our
+        <ulink url="&url-wiki-qif;"></ulink>.
+      </para>
+
+      <para>For other formats and more details see <xref linkend="chapter_importing"/>.
+      </para>
+    </sect2>
+
+    <sect2 id="appendixa_business">
+      <title>Import of Business Data by <acronym>CSV</acronym> Files</title>
+
+      <para>If you want to import customers and vendors or bills and invoices see
+        <xref linkend="ch_import_bus_data" />.
+      </para>
+    </sect2>
+  </sect1>
+
+  <sect1 id="appendixa_xmlconvert1">
+    <title>Converting <acronym>XML</acronym> &app; File</title>
+
+    <para>The &app; <acronym>XML</acronym> data file can be transformed to almost any other data format (e.g.,
+      <acronym>QIF</acronym>, <acronym>CSV</acronym>...) quite easily if one is familiar with the
+      <quote>Extensible Stylesheet Language Transformations</quote>
+      <ulink url="&url-wp-en;XSLT"><acronym>XSLT</acronym></ulink>. The &app; data file is
+      well-formed <acronym>XML</acronym>, and it can therefore be run through an
+      <acronym>XSLT</acronym> parser with an associated stylesheet. This allows one to transform the
+      file to just about any format that can be designed, given a properly written stylesheet.
+    </para>
+
+    <para>A few steps need to be followed. The writing of a stylesheet is a task for a different time, but if
+      you can get one written, here’s what you need to do:
+    </para>
+
+    <orderedlist>
+      <listitem>
+        <para>Copy the &app; <acronym>XML</acronym> data file to a working file.
+        </para>
+
+        <important>
+          <para>If the file was last modified by a version of &app; older than 2.0, then before you continue to the
+            next step you will need to modify the working file’s <gnc-v2> tag to read
+            something like this:
+<programlisting language="xml">
 <gnc-v2 xmlns:cd="http://www.gnucash.org/XML/cd"
-        xmlns:book="http://www.gnucash.org/XML/book"
-        xmlns:gnc="http://www.gnucash.org/XML/gnc"
-        xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
-        xmlns:trn="http://www.gnucash.org/XML/trn"
-        xmlns:split="http://www.gnucash.org/XML/split"
-        xmlns:act="http://www.gnucash.org/XML/act"
-        xmlns:price="http://www.gnucash.org/XML/price"
-        xmlns:ts="http://www.gnucash.org/XML/ts"
-        xmlns:slot="http://www.gnucash.org/XML/kvpslot"
-        xmlns:cust="http://www.gnucash.org/XML/cust"
-        xmlns:entry="http://www.gnucash.org/XML/entry"
-        xmlns:lot="http://www.gnucash.org/XML/lot"
-        xmlns:invoice="http://www.gnucash.org/XML/invoice"
-        xmlns:owner="http://www.gnucash.org/XML/owner"
-        xmlns:job="http://www.gnucash.org/XML/job"
-        xmlns:billterm="http://www.gnucash.org/XML/billterm"
-        xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
-        xmlns:sx="http://www.gnucash.org/XML/sx"
-        xmlns:fs="http://www.gnucash.org/XML/fs"
-        xmlns:addr="http://www.gnucash.org/XML/custaddr">
-    </literallayout>
-    <para>You can put pretty much anything you want behind the equal signs, but a <acronym>URL</acronym>
-is what is typically used.</para>
-    </note>
-  </listitem>
-  <listitem>
-  <para>Create an <acronym>XSLT</acronym> stylesheet containing the transformation your desire,
-or obtain one that’s already written (AFAIK, there aren’t any, but I’m
-working on a <acronym>CSV</acronym> one).</para>
-  </listitem>
-  <listitem>
-<para>Install an <acronym>XSLT</acronym> processor such as Saxon
-(http://saxon.sourceforge.net/) or Xalan-J  (http://xml.apache.org/). 
-Any conforming processor will do, really...</para>
-  </listitem>
-  <listitem>
-<para>Run the work file and the stylesheet through the processor according
-to the processor’s instructions.</para>
-  </listitem>
-  <listitem>
-<para>You will now have a file in the desired output format.  An
-enterprising individual could go so far as to write a stylesheet to
-transform the &app; data file to an OpenOffice spreadsheet (or
-vice-versa, for that matter).  Such things as <acronym>QIF</acronym> ought to be a little
-less work.</para>
-  </listitem>
-  </orderedlist>
-
-<para>Benefits are that you don’t need to write a Scheme module or a new C
-routine to do this transformation.  Anyone who knows or can learn <acronym>XML</acronym>
-and <acronym>XSLT</acronym> can perform this task.  Not much harder, really, than writing a
-Web page....</para>
-
-<para>Anyhow, I just wanted this tidbit to be captured somewhere permanently. 
-The process works on &vers-stable; datafiles, and ought to
-work on earlier versions, too.</para>
-
- </sect1>
--->
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:slot="http://www.gnucash.org/XML/kvpslot"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:addr="http://www.gnucash.org/XML/custaddr">
+</programlisting>
+          </para>
+        </important>
+
+        <note>
+          <para>You can put pretty much anything you want behind the equal signs, but a unique
+            <acronym>URL</acronym> is what is typically used.
+          </para>
+        </note>
+      </listitem>
+
+      <listitem>
+        <para>Create an <acronym>XSLT</acronym> stylesheet containing the transformation your desire, or obtain
+          one that’s already written.
+        </para>
+
+        <itemizedlist>
+          <title>User Contributed XSLT Stylesheets</title>
+
+          <listitem>
+            <para>in our repository: <ulink url="&url-src-maint;contrib/xslt"></ulink>
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>in our wiki: <ulink url="&url-wiki-xslt;"></ulink>
+            </para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para>Install an <acronym>XSLT</acronym> processor such as Saxon (<ulink url="&url-wp-en;Saxon_XSLT" />)
+          or Xalan (<ulink url="&url-wp-en;Apache_Xalan" />). Any
+          <ulink url="&url-wp-en;Category:XSLT_processors">conforming processor</ulink> will do,
+          really...
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>Run the work file and the stylesheet through the processor according to the processor’s
+          instructions.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>You will now have a file in the desired output format. An enterprising individual could go so far as
+          to write a stylesheet to transform the &app; data file to an OpenOffice spreadsheet (or
+          vice-versa, for that matter). Such things as <acronym>QIF</acronym> ought to be a little
+          less work.
+        </para>
+      </listitem>
+    </orderedlist>
+
+    <para>Benefits are that you don’t need to write a Scheme module or a new C routine to do this
+      transformation. Anyone who knows or can learn <acronym>XML</acronym> and
+      <acronym>XSLT</acronym> can perform this task. Not much harder, really, than writing a Web
+      page....
+    </para>
+
+    <para>Anyhow, I just wanted this tidbit to be captured somewhere permanently. The process works on
+      &vers-stable; datafiles, and ought to work on earlier versions, too.
+    </para>
+  </sect1> -->
 </appendix>
diff --git a/guide/de/appendixc.xml b/guide/de/appendixc.xml
index 09e53da..258d601 100644
--- a/guide/de/appendixc.xml
+++ b/guide/de/appendixc.xml
@@ -1,69 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
-  Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Last modified: 2019-09-12 Fell: EEC->EU
+   modified: July 9th 2006
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixc">
   <title>Contributed Account Trees</title>
 
   <para>&untranslated-de;
   </para>
-<!--
- <para>
-   </para>
- <sect1 id="appendixc_vat1">
- <title>UK Vat</title>
- <para>
-Account types (only shown if different to parent type)
- </para>
- <itemizedlist>
- <listitem>
- <para>[E] Expense</para>
- </listitem>
- <listitem>
-<para>[I] Income</para>
- </listitem>
- <listitem>
-<para>[A] Asset</para>
- </listitem>
- <listitem>
-<para>[L] Liability</para>
- </listitem>
- <listitem>
-<para>[Q] Equity</para>
- </listitem>
- <listitem>
-<para>[B] Bank accounts</para>
- </listitem>
- <listitem>
-<para>[C] Credit Cards</para>
- </listitem>
- <listitem>
-<para>[R] Accounts Receivable</para>
- </listitem>
- <listitem>
-<para>[P] Accounts Payable</para>
- </listitem>
- </itemizedlist>
-
-<para>(Box n) refers to VAT form box number (I actually have these as
-descriptions to the account to remind me)</para>
-
-<para>Add all the (Box n -part)  together to get the whole (Box n)
-The VAT shows you liability - if its negative they owe you.</para>
-
-<para>Capital Equipment (Box 7 - part) and (Box 6 - part) is the value of all *additions* (purchases) made over the VAT return period - not the absolute value, nor the difference in value unless that difference is wholly due to new purchases. Depreciation, losses (e.g a write off of faulty item) and other reductions in capital value are not included. If you sell a capital item then that sale and its VAT is recorded under Income. The asset is <quote>converted to cash</quote>, so the <quote>net of VAT</quote> increase in your bank account, when the invoice is payed, is matched by a decrease in capital.</para>
-
-<literallayout>
+<!-- 
+  <para>This is an ancient example. For recent account trees see
+    <ulink url="&url-src-maint;data/accounts" />, select your language and if existing region.
+  </para>
+
+  <para>If you want to contribute your new or improved templates, read
+    <ulink url="&url-wiki;Translation#How_to_translate_the_files_containing_the_new_account_hierarchies" />.
+  </para>
+
+  <sect1 id="appendixc_vat1">
+    <title>UK Vat</title>
+
+    <para>Account types (only shown if different to parent type)
+    </para>
+
+    <itemizedlist>
+      <listitem>
+        <para>[E] Expense
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>[I] Income
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>[A] Asset
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>[L] Liability
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>[Q] Equity
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>[B] Bank accounts
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>[C] Credit Cards
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>[R] Accounts Receivable
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>[P] Accounts Payable
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para>(Box n) refers to VAT form box number (I actually have these as descriptions to the account to
+      remind me)
+    </para>
+
+    <para>Add all the (Box n -part) together to get the whole (Box n) The VAT shows you liability - if its
+      negative they owe you.
+    </para>
+
+    <para>Capital Equipment (Box 7 - part) and (Box 6 - part) is the value of all *additions* (purchases) made
+      over the VAT return period - not the absolute value, nor the difference in value unless that
+      difference is wholly due to new purchases. Depreciation, losses (e.g a write off of faulty
+      item) and other reductions in capital value are not included. If you sell a capital item then
+      that sale and its VAT is recorded under Income. The asset is <quote>converted to cash</quote>,
+      so the <quote>net of VAT</quote> increase in your bank account, when the invoice is payed, is
+      matched by a decrease in capital.
+    </para>
+<screen>
 Bank Accounts [B]
   |___ Main Account
   |___  Reserve Account
@@ -139,10 +171,6 @@ Expenses [E]
                     |___  Software
                     |___  Subscriptions
                     |___  Sundry
-                    |___  Travel / Accom 
-
-</literallayout>
-
- </sect1>
- -->
+                    |___  Travel / Accom</screen>
+  </sect1>-->
 </appendix>
diff --git a/guide/de/appendixd.xml b/guide/de/appendixd.xml
index bb651e2..c3683d6 100644
--- a/guide/de/appendixd.xml
+++ b/guide/de/appendixd.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: March 18th, 2007
-  Maintainers: 
-                Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-                David Hampton <hampton at employees.org>
+    David Hampton <hampton at employees.org>
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixd">
   <title>Auxiliary File Formats</title>
@@ -17,24 +16,53 @@
   <para>&untranslated-de;
   </para>
 <!--
-    <para>These are the formats of some auxiliary files used by &app;.</para>
-    <sect1 id="check_format_info">
-      <title>Check Format Files (<filename>*.chk</filename>)</title>
-
-      <sect2 id="check_format_overview">
-        <title>Overview</title>
-        <para>The check format file is used to tell &app; how to print a check or checks onto a page of paper.  This file first describes the overall layout of a page (number of checks, orientation, etc) and then describes the layout of the specific items on a single check.  The file is organized as a typical Key/Value file used by many Linux applications.  Keys/values pairs are grouped into sections that begin with the group name enclosed in square brackets.</para>
-        <para>&app; looks for check format files in two different locations when you bring up the check printing dialog.  The first location is typically <filename class="directory">/usr/share/gnucash/checks</filename>, where check files distributed with the application can be found.  The second location is the user private <filename class="directory">~/.gnucash/checks</filename> directory.  Users may add check formats at any time (even while &app; is running) simply by dropping a new <filename>*.chk</filename> file in this directory.  The next time the check printing dialog is opened the new check format will appear in the list of available check formats.</para>
-        <note>
-          <para>Printing functions differently depending on the version of GTK that is installed on your system.  When &app; is using a version of GTK prior to 2.10 all offsets are measured from the lower left corner of the page or check.  When using GTK 2.10 or later, all offsets are measured from the upper left corner of the page or check.</para>
-        </note>
-      </sect2>
-      <sect2>
-        <title>Example file</title>
-        <para>A typical &app; check file is presented below.  The contents of this file will be described in the next sections.</para>
+  <para>These are the formats of some auxiliary files used by &app;.
+  </para>
+
+  <sect1 id="check_format_info">
+    <title>Check Format Files (<filename>*.chk</filename>)</title>
+
+    <sect2 id="check_format_overview">
+      <title>Overview</title>
 
-        <programlisting>
-[Top]
+      <para>The check format file is used to tell &app; how to print a check or checks onto a page of paper.
+        This file first describes the overall layout of a page (number of checks, orientation, etc)
+        and then describes the layout of the specific items on a single check. The file is organized
+        as a typical Key/Value file used by many Linux applications. Keys/values pairs are grouped
+        into sections that begin with the group name enclosed in square brackets.
+      </para>
+
+      <para>&app; looks for check format files in two different locations when you bring up the check printing
+        dialog. The first location is typically
+        <filename class="directory">/usr/share/gnucash/checks</filename>, where check files
+        distributed with the application can be found. The second location is the user private
+        <filename class="directory">&dir-data;checks</filename>
+        <footnote id="dir-old-chk">
+          <para>Up to &app; 2.6.21 it was <filename class="directory">&dir-old;checks</filename>
+          </para>
+        </footnote>
+        directory. Users may add check formats at any time (even while &app; is running) simply by
+        dropping a new <filename>*.chk</filename> file in this directory. The next time the check
+        printing dialog is opened the new check format will appear in the list of available check
+        formats.
+      </para>
+
+      <note>
+        <para>Printing functions differently depending on the version of GTK that is installed on your system.
+          When &app; is using a version of GTK prior to 2.10 all offsets are measured from the lower
+          left corner of the page or check. When using GTK 2.10 or later, all offsets are measured
+          from the upper left corner of the page or check.
+        </para>
+      </note>
+    </sect2>
+
+    <sect2>
+      <title>Example file</title>
+
+      <para>A typical &app; check file is presented below. The contents of this file will be described in the
+        next sections.
+      </para>
+<programlisting language="ini">[Top]
 Guid = 67b144d1-96a5-48d5-9337-0e1083bbf229
 Title = Quicken/QuickBooks (tm) US-Letter
 Rotation = 0.0
@@ -61,388 +89,936 @@ Type_4 = DATE
 Coords_4 = 500.0;67.0
 
 Type_5 = NOTES
-Coords_5 = 50.0;212.0
-        </programlisting>
-      </sect2>
-      <sect2>
-        <title>Field Descriptions</title>
-        <sect3>
-          <title>Top Group</title>
-          <para>This section of the check file describes the overall layout of a page of checks (or check) that goes into the printer.</para>
-          <table id="check_table_top">
-            <title>Overall Page Description Fields</title>
-            <tgroup cols="4">
-              <thead>
-                <row>
-                  <entry>Name</entry>
-                  <entry>Type</entry>
-                  <entry>Required</entry>
-                  <entry>Description</entry>
-                </row>
-              </thead>
-              <tbody>
-                <row>
-                  <entry>Guid</entry>
-                  <entry>string</entry>
-                  <entry>mandatory</entry>
-                  <entry>The guid is used to uniquely identify a check format to &app;.  It must be unique across the entire set of application supplied and user supplied check formats.  If you copy an application check file as the basis of your own check format, you must change this value.  The <emphasis>uuidgen</emphasis> program may be used to generate these identifiers.</entry>
-                </row>
-                <row>
-                  <entry>Title</entry>
-                  <entry>string</entry>
-                  <entry>mandatory</entry>
-                  <entry>The title is used to uniquely identify a check format to the user.  This value is presented verbatim in the check format list of the check printing dialog.  If you copy an application check file as the basis of your own check format, you should change this value.  The title may be any utf-8 string.</entry>
-                </row>
-                <row>
-                  <entry>Font</entry>
-                  <entry>string</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this is the default font used to print all text items on this check.  This field can contain any string that is acceptable by gtk as a font specifier.  If this field is omitted, the default font is the font specified in the &app; preferences dialog.  A typical string would be <quote>sans 12</quote>.</entry>
-                </row>
-                <row>
-                  <entry>Blocking_Chars</entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this is the default used when printing all <emphasis>TEXT</emphasis> items on this check.  When set to true, will print <emphasis>***</emphasis> before and after each text field on the check.  Blocking characters are printed to protect check fields from alteration.  For example, the amount field may be printed as <emphasis>***100.00***</emphasis></entry>
-                </row>
-                <row>
-                  <entry>DateFormat</entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this is the default used when printing all <emphasis>DATE</emphasis> items on this check.  When set to true, will print the format of the DATE in 8 point type, centered and below the actual DATE.  For example DDMMYYYY.</entry>
-                </row>
-                <row>
-                  <entry>Rotation</entry>
-                  <entry>double</entry>
-                  <entry>optional</entry>
-                  <entry>This value specified the rotation of the entire page (in degrees) around the origin point. For gtk versions prior to 2.10, the origin point is in the lower left corner of the page and rotation values increase in the counter-clockwise direction.  For gtk version 2.10 and later, the origin point is in the upper left corner of the page and rotation values increase in the clockwise direction. Rotation of the page is applied before translation.</entry>
-                </row>
-                <row>
-                  <entry>Translation</entry>
-                  <entry>list of 2 doubles</entry>
-                  <entry>optional</entry>
-                  <entry>These values specify the x and y translation of the entire page (in points) relative to the origin point. For gtk versions prior to 2.10, the origin point is in the lower left corner of the page and translation values increase moving up and to the right.  For gtk version 2.10 and later, the origin point is in the upper left corner of the page and translation values increase moving down and to the right. Rotation of the page is applied before translation.</entry>
-                </row>
-                <row>
-                  <entry>Show_Grid</entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If this value is set to <emphasis>true</emphasis> then &app; will draw a grid on the page, starting at the origin with the lines spaced every 50 points. This can be helpful when creating a check format file.</entry>
-                </row>
-                <row>
-                  <entry>Show_Boxes</entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If this value is set to <emphasis>true</emphasis> then for each item where the width and height have been specified, &app; will draw a box showing location and maximum size of that item . This can be helpful when creating a check format file.</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-          <note><para>The Blocking_Chars and DateFormat options are defined for all check formats in Edit->Preferences->Printing.  It is recommened that these global options be set to false (the default), and that the options be set for individual Check Items as described below.</para></note>
-        </sect3>
-        <sect3>
-          <title>Check Positions Group</title>
-          <para>This group of items specifies how multiple checks are laid out on the same sheet of paper, and gives names to each of these check locations so that a user can specify which check location that &app; should print.  This entire group of key/value pairs is optional, and should be omitted if the format file only specifies a single check per page of paper.</para>
-          <table id="check_table_positions">
-            <title>Multiple Checks Per Page Fields</title>
-            <tgroup cols="4">
-              <thead>
-                <row>
-                  <entry>Name</entry>
-                  <entry>Type</entry>
-                  <entry>Required</entry>
-                  <entry>Description</entry>
-                </row>
-              </thead>
-              <tbody>
-                <row>
-                  <entry>Height</entry>
-                  <entry>double</entry>
-                  <entry>mandatory</entry>
-                  <entry>This field specifies the height of a single check on the page.  If there are multiple checks per page then this item is mandatory.  If there is only a single check per page, this entire section should be omitted.</entry>
-                </row>
-                <row>
-                  <entry>Names</entry>
-                  <entry>list of strings</entry>
-                  <entry>mandatory</entry>
-                  <entry>This field specifies the names of the check locations that can be printed on each page.  These names represent the check positions starting from the top of the page and moving downward.  The names are presented verbatim in the check position list of the check printing dialog.  A typical value for this field is "Top;Middle;Bottom", but it could also be "First;Second;Third" or any other set of strings that clearly identify the check locations.  If there are multiple checks per page then this item is mandatory.  If there is only a single check per page, this entire section should be omitted.</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-        </sect3>
-        <sect3>
-          <title>Check Items Group</title>
-          <para>This section specifies the individual items that are printed on the check.  There is no limit to the number of items that may be present in this section, and any given type of item can be repeated multiple times.  This allows for the printing of checks that have a side stub, or for the one-per-page business checks that have both the check and multiple check stubs on the same page.  For example, to print the payee name on a business check and on both stubs, simply specify three payee items with differing print coordinates.</para>
-          <para>Each key names in this section explicitly includes the item number to which it applies.  E.G. The key named <guilabel>Type_1</guilabel> applies to the first item to be printed, and the key <guilabel>Coords_3</guilabel> applies to the third item to be printed.  Item numbers start at one and increase sequentially.  Any gap in the numbering sequence is interpreted by &app; as the end of the item list.  Items are printed in the order of their item numbers, not in the order in which they appear in the file.</para>
-          <para>Each item specified must include a type declaration.  The rest of the parameters for that item depend upon the particular type of that item.  See <xref linkend="check_table_types"></xref> for a list of valid item types and their required parameters.</para>
-          <table id="check_table_items">
-            <title>Individual Check Item Fields</title>
-            <tgroup cols="4">
-              <thead>
-                <row>
-                  <entry>Name</entry>
-                  <entry>Type</entry>
-                  <entry>Required</entry>
-                  <entry>Description</entry>
-                </row>
-              </thead>
-              <tbody>
-                <row>
-                  <entry>Type_<emphasis>n</emphasis></entry>
-                  <entry>string</entry>
-                  <entry>mandatory</entry>
-                  <entry>This field specifies the type of a single item to be printed on a check.  See <xref linkend="check_table_types"></xref> for a list of valid item types.</entry>
-                </row>
-                <row>
-                  <entry>Coords_<emphasis>n</emphasis></entry>
-                  <entry>list of 2 or 4 doubles</entry>
-                  <entry>mandatory</entry>
-                  <entry>This field specifies the coordinates where the item should be placed on a check, and optionally also specifies the width and height of the item.  The numbers in order are the X and Y offset of the lower left corner of the item, and optionally the width and height of the item.  If the width is supplied then the height must also be supplied, so this field will always contain two or four numbers.  For gtk versions prior to 2.10, the origin point is in the lower left corner of the page and translation values increase moving up and to the right.  For gtk version 2.10 and later, the origin point is in the upper left corner of the page and translation values increase moving down and to the right.<note><para>Regardless of whether the origin is at the top or the bottom of the page, the coordinates always specify the lower left point of the item.</para></note></entry>
-                </row>
-                <row>
-                  <entry>Font_<emphasis>n</emphasis></entry>
-                  <entry>string</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this is the font used to print this specific text item.  This field can contain any string that is acceptable by gtk as a font specifier.  If this field is omitted, the default font is the font specified in the <emphasis>Top</emphasis> section of the check description file, or if that was omitted the font specified in the &app; preferences dialog.  This field is only recognized when using gtk version 2.10 or later.</entry>
-                </row>
-                <row>
-                  <entry>Align_<emphasis>n</emphasis></entry>
-                  <entry>string</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this is the alignment used to print this specific text item.  This field must contain one of the strings <quote>left</quote>, <quote>center</quote> or <quote>right</quote>.  If this field is omitted, the text will be left aligned.  This field is only recognized when using gtk version 2.10 or later.</entry>
-                </row>
-                <row>
-                  <entry>Text_<emphasis>n</emphasis></entry>
-                  <entry>string</entry>
-                  <entry>optional</entry>
-                  <entry>This field is only used when the item type is <emphasis>TEXT</emphasis>. It specifies the utf-8 text that should be printed on the check.</entry>
-                </row>
-                <row>
-                  <entry>Filename_<emphasis>n</emphasis></entry>
-                  <entry>string</entry>
-                  <entry>optional</entry>
-                  <entry>This field is only used when the item type is <emphasis>PICTURE</emphasis>. It specifies the filename of the image that should be printed on the check.  The string may specify either an absolute path name or as a relative path name.  If a relative path name is specified, &app; first looks in in the application check format folder (typically <filename class="directory">/usr/share/gnucash/checks</filename>) for the image file, and if it isn’t found there then it looks in the user private <filename class="directory">~/.gnucash/checks</filename> directory for the image.  This field is only recognized when using gtk version 2.10 or later.</entry>
-                </row>
-                <row>
-                  <entry>Blocking_Chars_<emphasis>n</emphasis></entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this will set the print <emphasis>Blocking_Chars</emphasis> option for this item.</entry>
-                </row>
-                <row>
-                  <entry>DateFormat_<emphasis>n</emphasis></entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this will set the print <emphasis>DateFormat</emphasis> option for this item.</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-          <para>These are the individual items that can be printed on a check.  All items require the coordinates on the page where the item should be printed.  The majority of these items result in text being printed on the page, and these items may have individual font and alignments specified.  For example, the numerical amount of a check could be printed right justified while everything else is printed left justified.  Other types may have unique parameters.</para>
-          <table id="check_table_types">
-            <title>Individual Check Item Types</title>
-            <tgroup cols="4">
-              <thead>
-                <row>
-                  <entry>Name</entry>
-                  <entry>Required Fields</entry>
-                  <entry>Optional Fields</entry>
-                  <entry>Description</entry>
-                </row>
-              </thead>
-              <tbody>
-                <row>
-                  <entry>PAYEE</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Coords_5 = 50.0;212.0</programlisting>
+    </sect2>
+
+    <sect2>
+      <title>Field Descriptions</title>
+
+      <sect3>
+        <title>Top Group</title>
+
+        <para>This section of the check file describes the overall layout of a page of checks (or check) that goes
+          into the printer.
+        </para>
+
+        <table id="check_table_top">
+          <title>Overall Page Description Fields</title>
+
+          <tgroup cols="4">
+            <thead>
+              <row>
+                <entry>
+                  Name
+                </entry>
+
+                <entry>
+                  Type
+                </entry>
+
+                <entry>
+                  Required
+                </entry>
+
+                <entry>
+                  Description
+                </entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>
+                  Guid
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  The guid is used to uniquely identify a check format to &app;. It must be unique
+                  across the entire set of application supplied and user supplied check formats. If
+                  you copy an application check file as the basis of your own check format, you must
+                  change this value. The <emphasis>uuidgen</emphasis> program may be used to
+                  generate these identifiers.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Title
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  The title is used to uniquely identify a check format to the user. This value is
+                  presented verbatim in the check format list of the check printing dialog. If you
+                  copy an application check file as the basis of your own check format, you should
+                  change this value. The title may be any utf-8 string.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Font
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this is the default font used to print all text items on this check.
+                  This field can contain any string that is acceptable by gtk as a font specifier.
+                  If this field is omitted, the default font is the font specified in the &app;
+                  preferences dialog. A typical string would be <quote>sans 12</quote>.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Blocking_Chars
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this is the default used when printing all <emphasis>TEXT</emphasis>
+                  items on this check. When set to true, will print <emphasis>***</emphasis> before
+                  and after each text field on the check. Blocking characters are printed to protect
+                  check fields from alteration. For example, the amount field may be printed as
+                  <emphasis>***100.00***</emphasis>
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  DateFormat
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this is the default used when printing all <emphasis>DATE</emphasis>
+                  items on this check. When set to true, will print the format of the DATE in 8
+                  point type, centered and below the actual DATE. For example DDMMYYYY.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Rotation
+                </entry>
+
+                <entry>
+                  double
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  This value specified the rotation of the entire page (in degrees) around the
+                  origin point. For gtk versions prior to 2.10, the origin point is in the lower
+                  left corner of the page and rotation values increase in the counter-clockwise
+                  direction. For gtk version 2.10 and later, the origin point is in the upper left
+                  corner of the page and rotation values increase in the clockwise direction.
+                  Rotation of the page is applied before translation.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Translation
+                </entry>
+
+                <entry>
+                  list of 2 doubles
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  These values specify the x and y translation of the entire page (in points)
+                  relative to the origin point. For gtk versions prior to 2.10, the origin point is
+                  in the lower left corner of the page and translation values increase moving up and
+                  to the right. For gtk version 2.10 and later, the origin point is in the upper
+                  left corner of the page and translation values increase moving down and to the
+                  right. Rotation of the page is applied before translation.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Show_Grid
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If this value is set to <emphasis>true</emphasis> then &app; will draw a grid on
+                  the page, starting at the origin with the lines spaced every 50 points. This can
+                  be helpful when creating a check format file.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Show_Boxes
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If this value is set to <emphasis>true</emphasis> then for each item where the
+                  width and height have been specified, &app; will draw a box showing location and
+                  maximum size of that item . This can be helpful when creating a check format file.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+
+        <note>
+          <para>The Blocking_Chars and DateFormat options are defined for all check formats in
+            Edit->Preferences->Printing. It is recommened that these global options be set to false
+            (the default), and that the options be set for individual Check Items as described
+            below.
+          </para>
+        </note>
+      </sect3>
+
+      <sect3>
+        <title>Check Positions Group</title>
+
+        <para>This group of items specifies how multiple checks are laid out on the same sheet of paper, and gives
+          names to each of these check locations so that a user can specify which check location
+          that &app; should print. This entire group of key/value pairs is optional, and should be
+          omitted if the format file only specifies a single check per page of paper.
+        </para>
+
+        <table id="check_table_positions">
+          <title>Multiple Checks Per Page Fields</title>
+
+          <tgroup cols="4">
+            <thead>
+              <row>
+                <entry>
+                  Name
+                </entry>
+
+                <entry>
+                  Type
+                </entry>
+
+                <entry>
+                  Required
+                </entry>
+
+                <entry>
+                  Description
+                </entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>
+                  Height
+                </entry>
+
+                <entry>
+                  double
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  This field specifies the height of a single check on the page. If there are
+                  multiple checks per page then this item is mandatory. If there is only a single
+                  check per page, this entire section should be omitted.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Names
+                </entry>
+
+                <entry>
+                  list of strings
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  This field specifies the names of the check locations that can be printed on each
+                  page. These names represent the check positions starting from the top of the page
+                  and moving downward. The names are presented verbatim in the check position list
+                  of the check printing dialog. A typical value for this field is
+                  "Top;Middle;Bottom", but it could also be "First;Second;Third" or any other set of
+                  strings that clearly identify the check locations. If there are multiple checks
+                  per page then this item is mandatory. If there is only a single check per page,
+                  this entire section should be omitted.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+      </sect3>
+
+      <sect3>
+        <title>Check Items Group</title>
+
+        <para>This section specifies the individual items that are printed on the check. There is no limit to the
+          number of items that may be present in this section, and any given type of item can be
+          repeated multiple times. This allows for the printing of checks that have a side stub, or
+          for the one-per-page business checks that have both the check and multiple check stubs on
+          the same page. For example, to print the payee name on a business check and on both stubs,
+          simply specify three payee items with differing print coordinates.
+        </para>
+
+        <para>Each key names in this section explicitly includes the item number to which it applies. E.G. The key
+          named <guilabel>Type_1</guilabel> applies to the first item to be printed, and the key
+          <guilabel>Coords_3</guilabel> applies to the third item to be printed. Item numbers start
+          at one and increase sequentially. Any gap in the numbering sequence is interpreted by
+          &app; as the end of the item list. Items are printed in the order of their item numbers,
+          not in the order in which they appear in the file.
+        </para>
+
+        <para>Each item specified must include a type declaration. The rest of the parameters for that item depend
+          upon the particular type of that item. See <xref linkend="check_table_types"></xref> for a
+          list of valid item types and their required parameters.
+        </para>
+
+        <table id="check_table_items">
+          <title>Individual Check Item Fields</title>
+
+          <tgroup cols="4">
+            <thead>
+              <row>
+                <entry>
+                  Name
+                </entry>
+
+                <entry>
+                  Type
+                </entry>
+
+                <entry>
+                  Required
+                </entry>
+
+                <entry>
+                  Description
+                </entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>
+                  Type_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  This field specifies the type of a single item to be printed on a check. See
+                  <xref linkend="check_table_types"></xref> for a list of valid item types.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Coords_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  list of 2 or 4 doubles
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  This field specifies the coordinates where the item should be placed on a check,
+                  and optionally also specifies the width and height of the item. The numbers in
+                  order are the X and Y offset of the lower left corner of the item, and optionally
+                  the width and height of the item. If the width is supplied then the height must
+                  also be supplied, so this field will always contain two or four numbers. For gtk
+                  versions prior to 2.10, the origin point is in the lower left corner of the page
+                  and translation values increase moving up and to the right. For gtk version 2.10
+                  and later, the origin point is in the upper left corner of the page and
+                  translation values increase moving down and to the right.
+                  <note>
+                    <para>Regardless of whether the origin is at the top or the bottom of the page, the coordinates always
+                      specify the lower left point of the item.
+                    </para>
+                  </note>
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Font_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this is the font used to print this specific text item. This field
+                  can contain any string that is acceptable by gtk as a font specifier. If this
+                  field is omitted, the default font is the font specified in the
+                  <emphasis>Top</emphasis> section of the check description file, or if that was
+                  omitted the font specified in the &app; preferences dialog. This field is only
+                  recognized when using gtk version 2.10 or later.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Align_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this is the alignment used to print this specific text item. This
+                  field must contain one of the strings <quote>left</quote>, <quote>center</quote>
+                  or <quote>right</quote>. If this field is omitted, the text will be left aligned.
+                  This field is only recognized when using gtk version 2.10 or later.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Text_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  This field is only used when the item type is <emphasis>TEXT</emphasis>. It
+                  specifies the utf-8 text that should be printed on the check.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Filename_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  This field is only used when the item type is <emphasis>PICTURE</emphasis>. It
+                  specifies the filename of the image that should be printed on the check. The
+                  string may specify either an absolute path name or as a relative path name. If a
+                  relative path name is specified, &app; first looks in in the application check
+                  format folder (typically
+                  <filename class="directory">/usr/share/gnucash/checks</filename> ) for the image
+                  file, and if it is not found there then it looks in the user private
+                  <filename class="directory">&dir-data;checks</filename><footnoteref linkend="dir-old-chk" />
+                  directory for the image. This field is only recognized when using gtk version 2.10
+                  or later.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Blocking_Chars_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this will set the print <emphasis>Blocking_Chars</emphasis> option
+                  for this item.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  DateFormat_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this will set the print <emphasis>DateFormat</emphasis> option for
+                  this item.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+
+        <para>These are the individual items that can be printed on a check. All items require the coordinates on
+          the page where the item should be printed. The majority of these items result in text
+          being printed on the page, and these items may have individual font and alignments
+          specified. For example, the numerical amount of a check could be printed right justified
+          while everything else is printed left justified. Other types may have unique parameters.
+        </para>
+
+        <table id="check_table_types">
+          <title>Individual Check Item Types</title>
+
+          <tgroup cols="4">
+            <thead>
+              <row>
+                <entry>
+                  Name
+                </entry>
+
+                <entry>
+                  Required Fields
+                </entry>
+
+                <entry>
+                  Optional Fields
+                </entry>
+
+                <entry>
+                  Description
+                </entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>
+                  PAYEE
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the check payee name at the specified coordinates.</entry>
-                </row>
-                <row>
-                  <entry>DATE</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the check payee name at the specified
+                  coordinates.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  DATE
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
 Blocking_Chars
-DateFormat
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the check date at the specified coordinates.</entry>
-                </row>
-                <row>
-                  <entry>NOTES</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+DateFormat</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the check date at the specified coordinates.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  NOTES
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the transaction notes field at the specified coordinates.</entry>
-                </row>
-                <row>
-                  <entry>CHECK_NUMBER</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the transaction notes field at the specified
+                  coordinates.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  CHECK_NUMBER
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app;
-                    to print the check number at the specified coordinates. The
-                    check number reflects the book option selection under
-                    <menuchoice><guimenu>File</guimenu><guimenuitem>Properties
-                    </guimenuitem></menuchoice> for number source (transaction
-                    number or anchor-split action - see <ulink type="help"
-                    url="ghelp:gnucash-help?num-action-book-option">Use Split
-                    Action Field for Number</ulink> in the Book Options section
-                    of the &app; Help Manual).
-                  </entry>
-                </row>
-                <row>
-                  <entry>MEMO</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the check number at the specified
+                  coordinates. The check number reflects the book option selection under
+                  <menuchoice>
+                    <guimenu>File</guimenu><guimenuitem>Properties </guimenuitem>
+                  </menuchoice>
+                  for number source (transaction number or anchor-split action - see
+                  <ulink type="help"
+                    url="ghelp:gnucash-help?num-action-book-option">Use
+                  Split Action Field for Number</ulink> in the Book Options section of the &app;
+                  Help Manual).
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  MEMO
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the split memo field at the specified coordinates.</entry>
-                </row>
-                <row>
-                  <entry>ACTION</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the split memo field at the specified
+                  coordinates.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  ACTION
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app;
-                    to print the split action field at the specified coordinates.
-                    However, the printed field reflects the book option selection
-                    under <menuchoice><guimenu>File</guimenu><guimenuitem>
-                    Properties</guimenuitem></menuchoice> for number source
-                    (transaction number or anchor-split action - see <ulink
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the split action field at the specified
+                  coordinates. However, the printed field reflects the book option selection under
+                  <menuchoice>
+                    <guimenu>File</guimenu><guimenuitem> Properties</guimenuitem>
+                  </menuchoice>
+                  for number source (transaction number or anchor-split action - see
+                  <ulink
                     type="help" url="ghelp:gnucash-help?num-action-book-option">
-                    Use Split Action Field for Number</ulink> in the Book
-                    Options section of the &app; Help
-                    Manual). If number source for the book is specified as
-                    anchor-split action, this field will instead print the
-                    transaction number field.
-                  </entry>
-                </row>
-                <row>
-                  <entry>AMOUNT_WORDS</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+                  Use Split Action Field for Number</ulink> in the Book Options section of the &app;
+                  Help Manual). If number source for the book is specified as anchor-split action,
+                  this field will instead print the transaction number field.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  AMOUNT_WORDS
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the check amount in words at the specified coordinates.  The amount will appear similar to the string "One thousand, two hundred thirty four and 56/100".</entry>
-                </row>
-                <row>
-                  <entry>AMOUNT_NUMBER</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the check amount in words at the specified
+                  coordinates. The amount will appear similar to the string "One thousand, two
+                  hundred thirty four and 56/100".
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  AMOUNT_NUMBER
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the check amount in numbers at the specified coordinates.  The amount will appear similar to the number "$1,234.56".</entry>
-                </row>
-                <row>
-                  <entry>ADDRESS</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the check amount in numbers at the specified
+                  coordinates. The amount will appear similar to the number "$1,234.56".
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  ADDRESS
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the address at the specified coordinates.</entry>
-                </row>
-                <row>
-                  <entry>SPLITS_ACCOUNT</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the address at the specified coordinates.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  SPLITS_ACCOUNT
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the account names for each split entry stating at the specified coordinates. See the note on splits printing.</entry>
-                </row>
-                <row>
-                  <entry>SPLITS_AMOUNT</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the account names for each split entry
+                  stating at the specified coordinates. See the note on splits printing.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  SPLITS_AMOUNT
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the amount for each split entry stating at the specified coordinates.  Amounts are printed with currency symbols. See the note on splits printing.</entry>
-                </row>
-                <row>
-                  <entry>SPLITS_MEMO</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the amount for each split entry stating at
+                  the specified coordinates. Amounts are printed with currency symbols. See the note
+                  on splits printing.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  SPLITS_MEMO
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the memo text for each split entry stating at the specified coordinates. See the note on splits printing.</entry>
-                </row>
-                <row>
-                  <entry>TEXT</entry>
-                  <entry>Coords, Text</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the memo text for each split entry stating at
+                  the specified coordinates. See the note on splits printing.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  TEXT
+                </entry>
+
+                <entry>
+                  Coords, Text
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print an arbitrary string at the specified coordinates. The string to be printed is specified with the <emphasis>Text_n</emphasis> key.</entry>
-                </row>
-                <row>
-                  <entry>PICTURE</entry>
-                  <entry>Coords, Filename</entry>
-                  <entry>(none)</entry>
-                  <entry>This type value tells &app; to print an image at the specified coordinates. The image to be printed is specified with the <emphasis>Filename_n</emphasis> key.  This type is only recognized when using gtk version 2.10 or later.</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-          <note>
-           <para>SPLIT items include all split entries for the transaction
-            except for the split that applies to the current account register
-            (referred to as the anchor-split).  This is usually the last split
-            listed when splits are displayed in the register.  The coordinate
-            location defines the lower left location for the split information.
-           </para>
-          </note>
-        </sect3>
-      </sect2>
-      <sect2 id="check_format_notes">
-        <title>Creating Check Format Files</title>
-        <para>Creating your own check format file is a fairly simple task.  The easiest way to start is to copy an existing check format file from the application directory (typically <filename class="directory">/usr/share/gnucash/checks</filename>) to the directory <filename class="directory">~/.gnucash/checks</filename>.  Make sure to change the guid so the new file will be accepted by gnucash, and change the title to something descriptive.  Then change or add individual item fields as necessary.  You can also create a new check file by clicking the <guibutton>Save Format</guibutton> button on the <guilabel>Custom format</guilabel> page of the check printing dialog.</para>
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print an arbitrary string at the specified
+                  coordinates. The string to be printed is specified with the
+                  <emphasis>Text_n</emphasis> key.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  PICTURE
+                </entry>
+
+                <entry>
+                  Coords, Filename
+                </entry>
+
+                <entry>
+                  (none)
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print an image at the specified coordinates. The
+                  image to be printed is specified with the <emphasis>Filename_n</emphasis> key.
+                  This type is only recognized when using gtk version 2.10 or later.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+
         <note>
-          <para>Key names are case sensitive.  If you’re having problems with a check format file, ensure that all key names have capital letters as documented above.</para>
+          <para>SPLIT items include all split entries for the transaction except for the split that applies to the
+            current account register (referred to as the anchor-split). This is usually the last
+            split listed when splits are displayed in the register. The coordinate location defines
+            the lower left location for the split information.
+          </para>
         </note>
-      </sect2>
-    </sect1>
-    -->
+      </sect3>
+    </sect2>
+
+    <sect2 id="check_format_notes">
+      <title>Creating Check Format Files</title>
+
+      <para>Creating your own check format file is a fairly simple task. The easiest way to start is to copy an
+        existing check format file from the application directory (typically
+        <filename class="directory">/usr/share/gnucash/checks</filename>) to the directory
+        <filename class="directory">&dir-data;checks</filename><footnoteref linkend="dir-old-chk" />.
+        Make sure to change the guid so the new file will be accepted by gnucash, and change the
+        title to something descriptive. Then change or add individual item fields as necessary. You
+        can also create a new check file by clicking the <guibutton>Save Format</guibutton> button
+        on the <guilabel>Custom format</guilabel> page of the check printing dialog.
+      </para>
+
+      <note>
+        <para>Key names are case sensitive. If you are having problems with a check format file, ensure that all
+          key names have capital letters as documented above.
+        </para>
+      </note>
+    </sect2>
+  </sect1>-->
 </appendix>
diff --git a/guide/de/ch_bus_ap.xml b/guide/de/ch_bus_ap.xml
index 799dead..217cbc9 100644
--- a/guide/de/ch_bus_ap.xml
+++ b/guide/de/ch_bus_ap.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Originally designed by Carol Champagne.
   Version: 2.0.0
   Last modified: Sep 19th 2015 (Englisch 20.09.2015)
@@ -12,7 +11,7 @@
         updated Patrick Schweiger <pks at spiffykitty.com>
             Chris Good <chris.good at ozemail.com.au>
   Translators:
-               Mechtilde Stehmann<ooo at mechtilde.de>
+    Mechtilde Stehmann<ooo at mechtilde.de>
 -->
 <!--
 A lot of the following text is duplicated in the GnuCash help. The text here in the guide should be 
@@ -38,12 +37,12 @@ corrected to be less describing of the interface and more tutorial oriented
     <para>&app; hat eine integrierte Kreditorenbuchhaltung. Die von der Kreditorenbuchhaltung erzeugten
       Geschäftsvorfälle werden im Konto Verbindlichkeiten aus Lieferung und Leistung
       aufgezeichnet. In der Regel arbeiten Sie nicht direkt mit diesem Konto, sondern nutzen die
-      vier integrierten &app; Passiva-Anwendungsbestandteile. Die Passiva-Anwendungsbestandteile sind
-      im Untermenü
+      vier integrierten &app; Passiva-Anwendungsbestandteile. Die Passiva-Anwendungsbestandteile
+      sind im Untermenü
       <menuchoice>
-        <guimenu>Geschäft</guimenu> <guisubmenu>Kunden</guisubmenu>
+        <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu>
       </menuchoice>
-      erreichbar. Diese Passiva-Anwendungsbestandteile sind :
+      erreichbar. Diese Passiva-Anwendungsbestandteile sind:
     </para>
 
     <itemizedlist>
@@ -98,7 +97,7 @@ corrected to be less describing of the interface and more tutorial oriented
 
       <para>Um einen neuen Lieferanten zu registrieren, wählen Sie den Menüeintrag
         <menuchoice>
-          <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu> <guimenuitem>Neuer
+          <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Neuer
           Lieferant…</guimenuitem>
         </menuchoice>
         . Geben Sie die allgemeinen Informationen über den Lieferanten, wie Firmenname, Adresse,
@@ -132,7 +131,7 @@ corrected to be less describing of the interface and more tutorial oriented
 
       <para>Um einen existierenden Lieferanten zu suchen, nutzen Sie das Fenster
         <menuchoice>
-          <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu> <guimenuitem>Lieferanten
+          <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Lieferanten
           suchen…</guimenuitem>
         </menuchoice>
         . Sie wählen einen Lieferanten mit <guibutton>Lieferant anzeigen/bearbeiten</guibutton> aus
@@ -211,7 +210,7 @@ corrected to be less describing of the interface and more tutorial oriented
         Sie eine neue Rechnung erstellen. Um eine neue Rechnung zu erstellen, nutzen Sie den
         Menüeintrag
         <menuchoice>
-          <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu> <guimenuitem>Neue
+          <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Neue
           Rechnung</guimenuitem>
         </menuchoice>
         , und füllen das erscheinende Fenster entsprechend aus.
@@ -376,7 +375,7 @@ corrected to be less describing of the interface and more tutorial oriented
     <para>Um eine Auswahl unter den Rechnungen, die mit einem gegebenen Auftrag verbunden sind, zu treffen,
       nutzen Sie den Menüeintrag
       <menuchoice>
-        <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu> <guimenuitem>Auftrag
+        <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Auftrag
         suchen</guimenuitem>
       </menuchoice>
       . Wählen Sie den gewünschten Auftrag in den Suchergebnissen und klicken Sie die
@@ -392,7 +391,7 @@ corrected to be less describing of the interface and more tutorial oriented
 
     <para>Irgendwann müssen Sie Ihre Rechnungen auch bezahlen. Dazu nutzen Sie die Zahlungsanwendung unter
       <menuchoice>
-        <guimenu>Geschäft</guimenu> <guisubmenu>Lieferant</guisubmenu><guimenuitem>Zahlung
+        <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Zahlung
         verarbeiten…</guimenuitem>
       </menuchoice>
       .
diff --git a/guide/de/ch_bus_ar.xml b/guide/de/ch_bus_ar.xml
index 185b059..c0a20f5 100644
--- a/guide/de/ch_bus_ar.xml
+++ b/guide/de/ch_bus_ar.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006 (English 20.09.2015)
   Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-        Jon Lapham <lapham at extracta.com.br>
-        updated Patrick Schweiger <pks at spiffykitty.com>
+    Jon Lapham <lapham at extracta.com.br>
+    updated Patrick Schweiger <pks at spiffykitty.com>
   Originally designed by Carol Champagne.
   Translators:
-                Mechtilde Stehmann<ooo at mechtilde.de>
+    Mechtilde Stehmann<ooo at mechtilde.de>
 -->
 <!--
 A lot of the following text is duplicated in the GnuCash help. The text here in the guide should be 
@@ -39,7 +38,7 @@ corrected to be less describing of the interface and more tutorial oriented
       Sie nicht direkt mit diesen Konten arbeiten. Sie werden normalerweise mit den vier
       integrierten &app; Debitorenanwendungen arbeiten, die im Menü unter
       <menuchoice>
-        <guimenu>Geschäft</guimenu> <guisubmenu>Kunden</guisubmenu>
+        <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu>
       </menuchoice>
       zu finden sind. Diese vier Komponenten sind:
     </para>
@@ -94,7 +93,7 @@ corrected to be less describing of the interface and more tutorial oriented
 
       <para>Um einen neuen Kunden einzutragen, öffnen Sie das Menü
         <menuchoice>
-          <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu> <guimenuitem>Neuer
+          <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu><guimenuitem>Neuer
           Kunde…</guimenuitem>
         </menuchoice>
         . Geben Sie die Kundeninformationen ein, wie Name des Unternehmens, Adresse, Telefon-,
@@ -125,7 +124,7 @@ corrected to be less describing of the interface and more tutorial oriented
 
       <para>Um einen existierenden Kunden zu suchen, nutzen Sie das Fenster
         <menuchoice>
-          <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu> <guimenuitem>Kunde
+          <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu><guimenuitem>Kunde
           suchen…</guimenuitem>
         </menuchoice>
         . Sie wählen einen Kunden aus den Ergebnissen der Suche aus mit der Schaltfläche
@@ -203,7 +202,7 @@ corrected to be less describing of the interface and more tutorial oriented
       <para>Um eine Ausgangsrechnung an einen Kunden zu senden, müssen Sie zunächst ein neues Dokument
         erstellen. Um eine Rechnung zu erstellen, nutzen Sie
         <menuchoice>
-          <guimenu>Geschäft</guimenu><guisubmenu>Kunde</guisubmenu> <guimenuitem>Neue
+          <guimenu>Geschäft</guimenu><guisubmenu>Kunde</guisubmenu><guimenuitem>Neue
           Rechnung…</guimenuitem>
         </menuchoice>
         . Das Fenster Neue Rechnung muss entsprechend ausgefüllt werden.
@@ -297,7 +296,7 @@ corrected to be less describing of the interface and more tutorial oriented
 
       <para>Um eine existierende Rechnung zu finden, nutzen Sie den Menüeintrag
         <menuchoice>
-          <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu> <guimenuitem>Rechnung
+          <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu><guimenuitem>Rechnung
           suchen…</guimenuitem>
         </menuchoice>
         . In den Suchergebnissen können Sie eine Rechnung auswählen, um diese zu betrachten oder
@@ -339,7 +338,7 @@ corrected to be less describing of the interface and more tutorial oriented
       <para>Nach dem Buchen einer Rechnung sollten Sie diese drucken und an Ihren Kunden senden. Um eine
         Rechnung zu drucken, Nutzen Sie den Menüeintrag
         <menuchoice>
-          <guimenu>Datei</guimenu> <guimenuitem>Rechnung drucken</guimenuitem>
+          <guimenu>Datei</guimenu><guimenuitem>Rechnung drucken</guimenuitem>
         </menuchoice>
         .
       </para>
@@ -371,7 +370,7 @@ corrected to be less describing of the interface and more tutorial oriented
 
       <para>Rechnungen können auch vom Hauptfenster aus ausgedruckt werden, indem dort aus dem Hauptmenü
         <menuchoice>
-          <guimenu>Berichte</guimenu><guisubmenu>Geschäft</guisubmenu> <guimenuitem>Druckbare
+          <guimenu>Berichte</guimenu><guisubmenu>Geschäft</guisubmenu><guimenuitem>Druckbare
           Rechnung…</guimenuitem>
         </menuchoice>
         Hauptmenü ausgewählt wird. Das sich ergebende Berichtsfenster stellt fest, dass keine
@@ -470,7 +469,7 @@ corrected to be less describing of the interface and more tutorial oriented
 
     <para>Um eine vorhandene Kundenauftrag zu bearbeiten, nutzen Sie den Menüeintrag
       <menuchoice>
-        <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu> <guimenuitem>Suche
+        <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu><guimenuitem>Suche
         Auftrag…</guimenuitem>
       </menuchoice>
       . Wählen Sie den erwünschten Auftrag in den Suchergebnissen und klicken Sie auf die
@@ -497,7 +496,7 @@ corrected to be less describing of the interface and more tutorial oriented
     <para>Möglicherweise werden Sie Zahlung von Ihren Kunden für offene Rechnungen erhalten. Um diese
       Zahlungen aufzuzeichnen, nutzen Sie die Anwendung Zahlung verarbeiten, zu finden unter
       <menuchoice>
-        <guimenu>Geschäft</guimenu> <guisubmenu>Kunden</guisubmenu><guimenuitem>Zahlung
+        <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu><guimenuitem>Zahlung
         verarbeiten… </guimenuitem>
       </menuchoice>
       .
@@ -544,7 +543,7 @@ corrected to be less describing of the interface and more tutorial oriented
     <para>Um einen individualisierten Hintergrund, ein Kopfbanner oder Logo zu den Rechnungen hinzuzufügen,
       ändern Sie die Rechnungsstilvorlagen. Um dies zu tun, gehen Sie zu
       <menuchoice>
-        <guimenu>Bearbeiten</guimenu> <guimenuitem>Stilvorlagen</guimenuitem>
+        <guimenu>Bearbeiten</guimenu><guimenuitem>Stilvorlagen</guimenuitem>
       </menuchoice>
       und wählen die Schaltfläche <guibutton>Neu</guibutton> im Fenster <guilabel>HTML-Stilvorlage
       auswählen</guilabel> aus, welches erscheint. Sie werden ein Fenster wie dieses sehen:
diff --git a/guide/de/ch_bus_pay.xml b/guide/de/ch_bus_pay.xml
index a3f3135..26dee1d 100644
--- a/guide/de/ch_bus_pay.xml
+++ b/guide/de/ch_bus_pay.xml
@@ -1,43 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-        updated Patrick Schweiger <pks at spiffykitty.com>
+    Jon Lapham <lapham at extracta.com.br>
+  Updated:
+    Patrick Schweiger <pks at spiffykitty.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_bus_pay">
-  <title>Payroll</title>
+  <title>Lohn- und Gehaltsabrechnung</title>
 
   <para>&untranslated-de;
   </para>
 <!--
- <para>Payroll is a financial record of wages, net pay, paid vacations, and deductions for an employee.  This chapter demonstrates how to track payroll using &app;</para>
- <sect1 id="bus-pay-concepts1">
- <title>Basic Concepts</title>
-  <para>Payroll is a financial record of wages, net pay, paid vacations, and deductions for an employee.  Basically, anything that relates to giving money or benefits to an employee.  Payroll is one of the more complex tasks in accounting, because there are many different accounts, people, and agencies involved in paying salaries.</para>
-  <para>Payroll is typically accounted for as an expense.  Sometimes accountants <quote>store</quote> some payroll expenses in a short term liability account.  This is useful for things such as payroll taxes, which may be paid at a different time than the employee.  The employee might get paid biweekly, while taxes are paid quarterly.  This chapter presents a methodology which expenses payroll immediately for salaries, but stores taxes in liability accounts.</para>
-  <note>
-  <para>&app; does not have an integrated payroll system.  While you can track payroll expenses in &app;, the calculation of taxes and deductions has to be done outside of &app;.</para>
-  </note>
+  <para>Payroll is a financial record of wages, net pay, paid vacations, and deductions for an employee.
+    This chapter demonstrates how to track payroll using &app;
+  </para>
+
+  <sect1 id="bus-pay-concepts1">
+    <title>Basic Concepts</title>
+
+    <para>Payroll is a financial record of wages, net pay, paid vacations, and deductions for an employee.
+      Basically, anything that relates to giving money or benefits to an employee. Payroll is one of
+      the more complex tasks in accounting, because there are many different accounts, people, and
+      agencies involved in paying salaries.
+    </para>
+
+    <para>Payroll is typically accounted for as an expense. Sometimes accountants <quote>store</quote> some
+      payroll expenses in a short term liability account. This is useful for things such as payroll
+      taxes, which may be paid at a different time than the employee. The employee might get paid
+      biweekly, while taxes are paid quarterly. This chapter presents a methodology which expenses
+      payroll immediately for salaries, but stores taxes in liability accounts.
+    </para>
+
+    <note>
+      <para>&app; does not have an integrated payroll system. While you can track payroll expenses in &app;, the
+        calculation of taxes and deductions has to be done outside of &app;.
+      </para>
+    </note>
   </sect1>
 
- <sect1 id="bus-pay-acct1">
- <title>Account Setup</title>
+  <sect1 id="bus-pay-acct1">
+    <title>Account Setup</title>
+
+    <para>Local tax law must be considered when setting up accounts. Because there are many different ways
+      payroll taxes are handled throughout the world, this section presents a very simple structure.
+      From this, you should be able to adapt your particular payroll deductions setup.
+    </para>
+
+    <para>Assume that you must pay 2 taxes, Tax1 and Tax2 and that each has an employee contributed and an
+      employer contributed component.
+    </para>
 
-  <para>Local tax law must be considered when setting up accounts.  Because there are many different ways payroll taxes are handled throughout the world, this section presents a very simple structure.  From this, you should be able to adapt your particular payroll deductions setup.</para>
-  <para>Assume that you must pay 2 taxes, Tax1 and Tax2 and that each has an employee contributed and an employer contributed component.</para>
-  <para>The employee’s salary and these two taxes are expense accounts. The tax components are liability accounts.  The tax liability accounts are where you accumulate the taxes withheld for all of your employees.  The taxes are later paid to the appropriate government agency.</para>
-  <para>
-  <literallayout>
-Simple Payroll Account Layout:
+    <para>The employee’s salary and these two taxes are expense accounts. The tax components are
+      liability accounts. The tax liability accounts are where you accumulate the taxes withheld for
+      all of your employees. The taxes are later paid to the appropriate government agency.
+    </para>
+
+    <para><screen>Simple Payroll Account Layout:
 
 -Assets
    -Checking
@@ -47,259 +73,497 @@ Simple Payroll Account Layout:
 -Expenses
    -Salaries
    -Tax1
-   -Tax2
-  </literallayout>
+   -Tax2</screen>
+      <note>
+        <para>Resist the temptation to create per-employee sub-accounts to track individual salaries. Creating a
+          sub-account for each employee leads to unmanageably large lists of accounts. Imagine the
+          account structure after a few years of employees coming and going. It is much simpler to
+          keep all of your employees’ payroll records within a single account
+          (<emphasis>Expenses:Salaries</emphasis> for example) and use reports to view per-employee
+          information.
+        </para>
+      </note>
+    </para>
+  </sect1>
 
-  <note>
-  <para>Resist the temptation to create per-employee sub-accounts to track individual salaries.  Creating a sub-account for each employee leads to unmanageably large lists of accounts.  Imagine the account structure after a few years of employees coming and going.  It is much simpler to keep all of your employees’ payroll records within a single account (<emphasis>Expenses:Salaries</emphasis> for example) and use reports to view per-employee information.</para>
-  </note>
-  </para>
+  <sect1 id="bus-pay-protocol1">
+    <title>Protocol</title>
 
-  </sect1>
+    <para>&app; does not have an integrated payroll system. &app; can track your payroll expenses, but you
+      need to develop a payroll protocol and perform the calculations outside of &app;, in a
+      spreadsheet for example. In this section, one such protocol is presented. You can use the
+      sample protocol as a model.
+    </para>
 
- <sect1 id="bus-pay-protocol1">
- <title>Protocol</title>
-  <para>&app; does not have an integrated payroll system.  &app; can track your payroll expenses, but you need to develop a payroll protocol and perform the calculations outside of &app;, in a spreadsheet for example.  In this section, one such protocol is presented. You can use the sample protocol as a model.</para>
-
-  <sect2 id="bus-pay-protocolone2">
-  <title>Step 1: Deductions list</title>
-  <para>The first step to the payroll protocol is to create a list of all the possible taxes and deductions for each employee.  Each entry should include definitions and formulas for calculating each value.  Once the protocol is established it needs to be changed only when payroll laws or tax rates change.</para>
-
- <para>In the proposed scenario, such a list would look like this:</para>
-  <itemizedlist spacing="compact">
-  <listitem>
-  <para><emphasis>E_GROSS_SALARY</emphasis> - Employee gross salary</para>
-  </listitem>
-  <listitem>
-  <para><emphasis>E_TAX1</emphasis> - Employee contribution to tax1 (X% of E_GROSS_SALARY)</para>
-  </listitem>
-  <listitem>
-  <para><emphasis>E_TAX2</emphasis> - Employee contribution to tax2 (X% of E_GROSS_SALARY)</para>
-  </listitem>
-  <listitem>
-  <para><emphasis>C_TAX1</emphasis> - Company contribution to tax1 (X% of E_GROSS_SALARY)</para>
-  </listitem>
-  <listitem>
-  <para><emphasis>C_TAX2</emphasis> - Company contribution to tax2 (X% of E_GROSS_SALARY)</para>
-  </listitem>
-  </itemizedlist>
-  <note>
-  <para>The employee’s net salary (E_NET_SALARY) is defined as E_GROSS_SALARY - E_TAX1 - E_TAX2 and need not be placed in this list since it is composed of items that already exist.</para>
-  </note>
-  <para>Place the actual formulas for calculating each deduction in this list.  Sometimes these formulas are quite complex, and sometimes they simply say "look it up in table XYZ of the tax codes".</para>
-  <para>Notice that you can calculate some interesting values using the above definitions.  One such value is the total cost to the company: E_GROSS_SALARY + C_TAX1 + C_TAX2.</para>
-  </sect2>
-
-  <sect2 id="bus-pay-protocoltwo2">
-  <title>Step 2: Create the Transaction Map</title>
-  <para>When you record payroll in &app;, do so with a single split transaction.  This split transaction populates the appropriate expense and liability accounts.  If you need to look at the payroll details at a later time, open the split transaction.</para>
-  <para>With the deductions list from above, an employee split transaction map can be generated.  Each of the items in the list is mapped to a &app; account.</para>
-
-  <para>
-  <table>
-  <title>Transaction Map</title>
-  <tgroup cols="3">
-  <thead>
-  <row>
-<entry>Account</entry><entry>Increase</entry><entry>Decrease</entry>
-  </row>
-  </thead>
-  <tbody>
-  <row>
-<entry>Assets:Checking</entry><entry></entry><entry>E_NET_SALARY</entry>
-  </row>
-  <row>
-<entry>Expenses:Salaries</entry><entry>E_GROSS_SALARY</entry><entry></entry>
-  </row>
-  <row>
-<entry>Liabilities:Tax1</entry><entry></entry><entry>E_TAX1</entry>
-  </row>
-  <row>
-<entry>Liabilities:Tax2</entry><entry></entry><entry>E_TAX2</entry>
-  </row>
-  <row>
-<entry>Expenses:Tax1</entry><entry>C_TAX1</entry><entry></entry>
-  </row>
-  <row>
-<entry>Liabilities:Tax1</entry><entry></entry><entry>C_TAX1</entry>
-  </row>
-  <row>
-<entry>Expenses:Tax2</entry><entry>C_TAX2</entry><entry></entry>
-  </row>
-  <row>
-<entry>Liabilities:Tax2</entry><entry></entry><entry>C_TAX2</entry>
-  </row>
-  </tbody>
-  </tgroup>
-  </table>
-  </para>
+    <sect2 id="bus-pay-protocolone2">
+      <title>Step 1: Deductions list</title>
+
+      <para>The first step to the payroll protocol is to create a list of all the possible taxes and deductions
+        for each employee. Each entry should include definitions and formulas for calculating each
+        value. Once the protocol is established it needs to be changed only when payroll laws or tax
+        rates change.
+      </para>
+
+      <para>In the proposed scenario, such a list would look like this:
+      </para>
+
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para><emphasis>E_GROSS_SALARY</emphasis> - Employee gross salary
+          </para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>E_TAX1</emphasis> - Employee contribution to tax1 (X% of E_GROSS_SALARY)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>E_TAX2</emphasis> - Employee contribution to tax2 (X% of E_GROSS_SALARY)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>C_TAX1</emphasis> - Company contribution to tax1 (X% of E_GROSS_SALARY)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>C_TAX2</emphasis> - Company contribution to tax2 (X% of E_GROSS_SALARY)
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <note>
+        <para>The employee’s net salary (E_NET_SALARY) is defined as E_GROSS_SALARY - E_TAX1 - E_TAX2 and
+          need not be placed in this list since it is composed of items that already exist.
+        </para>
+      </note>
+
+      <para>Place the actual formulas for calculating each deduction in this list. Sometimes these formulas are
+        quite complex, and sometimes they simply say "look it up in table XYZ of the tax codes".
+      </para>
+
+      <para>Notice that you can calculate some interesting values using the above definitions. One such value is
+        the total cost to the company: E_GROSS_SALARY + C_TAX1 + C_TAX2.
+      </para>
+    </sect2>
+
+    <sect2 id="bus-pay-protocoltwo2">
+      <title>Step 2: Create the Transaction Map</title>
+
+      <para>When you record payroll in &app;, do so with a single split transaction. This split transaction
+        populates the appropriate expense and liability accounts. If you need to look at the payroll
+        details at a later time, open the split transaction.
+      </para>
+
+      <para>With the deductions list from above, an employee split transaction map can be generated. Each of the
+        items in the list is mapped to a &app; account.
+      </para>
+
+      <para><table>
+          <title>Transaction Map</title>
+
+          <tgroup cols="3">
+            <thead>
+              <row>
+                <entry>
+                  Account
+                </entry>
+                <entry>
+                  Increase
+                </entry>
+                <entry>
+                  Decrease
+                </entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>
+                  Assets:Checking
+                </entry>
+                <entry></entry>
+                <entry>
+                  E_NET_SALARY
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Expenses:Salaries
+                </entry>
+                <entry>
+                  E_GROSS_SALARY
+                </entry>
+                <entry></entry>
+              </row>
+
+              <row>
+                <entry>
+                  Liabilities:Tax1
+                </entry>
+                <entry></entry>
+                <entry>
+                  E_TAX1
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Liabilities:Tax2
+                </entry>
+                <entry></entry>
+                <entry>
+                  E_TAX2
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Expenses:Tax1
+                </entry>
+                <entry>
+                  C_TAX1
+                </entry>
+                <entry></entry>
+              </row>
+
+              <row>
+                <entry>
+                  Liabilities:Tax1
+                </entry>
+                <entry></entry>
+                <entry>
+                  C_TAX1
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Expenses:Tax2
+                </entry>
+                <entry>
+                  C_TAX2
+                </entry>
+                <entry></entry>
+              </row>
+
+              <row>
+                <entry>
+                  Liabilities:Tax2
+                </entry>
+                <entry></entry>
+                <entry>
+                  C_TAX2
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+      </para>
+
+      <para>Note that the C_TAX1 and C_TAX2 components have entries in the both the liability and expense
+        accounts. The company component of each tax is expensed at the time of payroll, but remains
+        a liability until taxes are due.
+      </para>
+    </sect2>
+
+    <sect2 id="bus-pay-protocolthree2">
+      <title>Step 3: Pay the Employee</title>
 
-  <para>Note that the C_TAX1 and C_TAX2 components have entries in the both the liability and expense accounts.  The company component of each tax is expensed at the time of payroll, but remains a liability until taxes are due.</para>
-  </sect2>
+      <para>Go to the account from which the employee will be paid, for example your
+        <emphasis>Assets:Checking</emphasis> account. Open a split transaction and enter the real
+        values using the Transaction Map above as a guide. Repeat this for all employees.
+      </para>
 
-  <sect2 id="bus-pay-protocolthree2">
-  <title>Step 3: Pay the Employee</title>
-  <para>Go to the account from which the employee will be paid, for example your <emphasis>Assets:Checking</emphasis> account. Open a split transaction and enter the real values using the Transaction Map above as a guide.  Repeat this for all employees.</para>
-  <tip>
-  <para>This manual process is tedious, especially if you have a large number of employees.</para>
-  <para>One &app; tool you certainly want use when entering employee payroll is duplicate transaction (use the <guibutton>Duplicate</guibutton> <emphasis>Toolbar</emphasis> button).  This saves you from having to enter all the transaction splits for each employee.  You still need to change the amounts of money to match each employee’s real payroll values, but you will not have to build the split for each employee.</para>
-  <para>If payroll transactions do not change significantly every pay period, you can also use the duplicate transaction feature to duplicate each employee’s most recent payroll transaction for the current pay period.  If you find you are doing so all the time, read about the Schedule Transactions feature and save even more time!</para>
-  </tip>
-  </sect2>
+      <tip>
+        <para>This manual process is tedious, especially if you have a large number of employees.
+        </para>
 
-  <sect2 id="bus-pay-protocolfour2">
-  <title>Step 4: Pay the Government</title>
-  <para>The final thing to do is to pay the taxes to the government.  The liability accounts have been collecting the taxes for various government agencies, and periodically you need to send a check to the government to pay this charge.  To do so, you simply enter a 2 account transaction in (for example) your checking account to pay off the tax liability.  The transaction is between the checking account and the liability account, no expense account is involved.  The expense accounts are charged at the time the tax liability is recorded.</para>
-  </sect2>
+        <para>One &app; tool you certainly want use when entering employee payroll is duplicate transaction (use
+          the <guibutton>Duplicate</guibutton> <emphasis>Toolbar</emphasis> button). This saves you
+          from having to enter all the transaction splits for each employee. You still need to
+          change the amounts of money to match each employee’s real payroll values, but you
+          will not have to build the split for each employee.
+        </para>
 
+        <para>If payroll transactions do not change significantly every pay period, you can also use the duplicate
+          transaction feature to duplicate each employee’s most recent payroll transaction for
+          the current pay period. If you find you are doing so all the time, read about the Schedule
+          Transactions feature and save even more time!
+        </para>
+      </tip>
+    </sect2>
+
+    <sect2 id="bus-pay-protocolfour2">
+      <title>Step 4: Pay the Government</title>
+
+      <para>The final thing to do is to pay the taxes to the government. The liability accounts have been
+        collecting the taxes for various government agencies, and periodically you need to send a
+        check to the government to pay this charge. To do so, you simply enter a 2 account
+        transaction in (for example) your checking account to pay off the tax liability. The
+        transaction is between the checking account and the liability account, no expense account is
+        involved. The expense accounts are charged at the time the tax liability is recorded.
+      </para>
+    </sect2>
   </sect1>
-  
- <sect1 id="bus-pay-example1">
- <title>Example</title>
-  <para>Using the account setup seen previously, let’s go through an example.  Assume that there are 2 employees (E1 and E2) which each earn $1000 per month gross salary. The employee contribution to Tax1 and Tax2 are 10% and 5% respectively.  The company contribution to Tax1 and Tax2 are 15% and 10% each on top of the employees gross salary.</para>
-  <para>Staring with $50k in the bank, and before doing any payroll, the account hierarchy looks like this:</para>
-	<screenshot id="bus-pay-ex1">
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata fileref="figures/bus_pay_ex1.png" 
+
+  <sect1 id="bus-pay-example1">
+    <title>Example</title>
+
+    <para>Using the account setup seen previously, let’s go through an example. Assume that there are 2
+      employees (E1 and E2) which each earn $1000 per month gross salary. The employee contribution
+      to Tax1 and Tax2 are 10% and 5% respectively. The company contribution to Tax1 and Tax2 are
+      15% and 10% each on top of the employees gross salary.
+    </para>
+
+    <para>Staring with $50k in the bank, and before doing any payroll, the account hierarchy looks like this:
+    </para>
+
+    <screenshot id="bus-pay-ex1">
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/bus_pay_ex1.png" 
 	      srccredit="Patrick Schweiger" format="PNG"/>
-            </imageobject>
-	    <textobject>
-	        <phrase>Payroll Example 1</phrase>
-	    </textobject>
-	    <caption>
-	       <para>Payroll Initial Setup
-	       </para>
-	    </caption>
-          </mediaobject>
-        </screenshot>
-
-  <sect2 id="bus-pay-exampleprotocol2">
-  <title>Build Protocol</title>
-  <para>The deductions list for employee 1:</para>
-   <itemizedlist>
-  <listitem>
-  <para><emphasis>E_GROSS_SALARY</emphasis> - Employee gross salary - <emphasis>$1000</emphasis></para>
-  </listitem>
-  <listitem>
-  <para><emphasis>E_TAX1</emphasis> - Employee contribution to tax1 - <emphasis>$100</emphasis> (10% of E_GROSS_SALARY)</para>
-  </listitem>
-  <listitem>
-  <para><emphasis>E_TAX2</emphasis> - Employee contribution to tax2 - <emphasis>$50</emphasis> (5% of E_GROSS_SALARY)</para>
-  </listitem>
-  <listitem>
-  <para><emphasis>C_TAX1</emphasis> - Company contribution to tax1 - <emphasis>$150</emphasis> (15% of E_GROSS_SALARY)</para>
-  </listitem>
-  <listitem>
-  <para><emphasis>C_TAX2</emphasis> - Company contribution to tax2 - <emphasis>$100</emphasis> (10% of E_GROSS_SALARY)</para>
-  </listitem>
-  </itemizedlist>
-
-  <para>
-  <table>
-  <title>Transaction Map for Employee 1</title>
-  <tgroup cols="3">
-  <thead>
-  <row>
-<entry>Account</entry><entry>Increase</entry><entry>Decrease</entry>
-  </row>
-  </thead>
-  <tbody>
-  <row>
-<entry>Assets:Checking</entry><entry></entry><entry>$850 (E_NET_SALARY)</entry>
-  </row>
-  <row>
-<entry>Expenses:Salaries</entry><entry>$1000 (E_GROSS_SALARY)</entry><entry></entry>
-  </row>
-  <row>
-<entry>Liabilities:Tax1</entry><entry></entry><entry>$100 (E_TAX1)</entry>
-  </row>
-  <row>
-<entry>Liabilities:Tax2</entry><entry></entry><entry>$50 (E_TAX2)</entry>
-  </row>
-  <row>
-<entry>Expenses:Tax1</entry><entry>$150 (C_TAX1)</entry><entry></entry>
-  </row>
-  <row>
-<entry>Liabilities:Tax1</entry><entry></entry><entry>$150 (C_TAX1)</entry>
-  </row>
-  <row>
-<entry>Expenses:Tax2</entry><entry>$100 (C_TAX2)</entry><entry></entry>
-  </row>
-  <row>
-<entry>Liabilities:Tax2</entry><entry></entry><entry>$100 (C_TAX2)</entry>
-  </row>
-  </tbody>
-  </tgroup>
-  </table>
-  </para>
+        </imageobject>
+
+        <textobject>
+          <phrase>Payroll Example 1</phrase>
+        </textobject>
+
+        <caption>
+          <para>Payroll Initial Setup
+          </para>
+        </caption>
+      </mediaobject>
+    </screenshot>
+
+    <sect2 id="bus-pay-exampleprotocol2">
+      <title>Build Protocol</title>
+
+      <para>The deductions list for employee 1:
+      </para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>E_GROSS_SALARY</emphasis> - Employee gross salary - <emphasis>$1000</emphasis>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>E_TAX1</emphasis> - Employee contribution to tax1 - <emphasis>$100</emphasis> (10% of
+            E_GROSS_SALARY)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>E_TAX2</emphasis> - Employee contribution to tax2 - <emphasis>$50</emphasis> (5% of
+            E_GROSS_SALARY)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>C_TAX1</emphasis> - Company contribution to tax1 - <emphasis>$150</emphasis> (15% of
+            E_GROSS_SALARY)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis>C_TAX2</emphasis> - Company contribution to tax2 - <emphasis>$100</emphasis> (10% of
+            E_GROSS_SALARY)
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <para><table>
+          <title>Transaction Map for Employee 1</title>
+
+          <tgroup cols="3">
+            <thead>
+              <row>
+                <entry>
+                  Account
+                </entry>
+                <entry>
+                  Increase
+                </entry>
+                <entry>
+                  Decrease
+                </entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>
+                  Assets:Checking
+                </entry>
+                <entry></entry>
+                <entry>
+                  $850 (E_NET_SALARY)
+                </entry>
+              </row>
 
-  </sect2>
+              <row>
+                <entry>
+                  Expenses:Salaries
+                </entry>
+                <entry>
+                  $1000 (E_GROSS_SALARY)
+                </entry>
+                <entry></entry>
+              </row>
 
+              <row>
+                <entry>
+                  Liabilities:Tax1
+                </entry>
+                <entry></entry>
+                <entry>
+                  $100 (E_TAX1)
+                </entry>
+              </row>
 
-  <sect2 id="bus-pay-examplepay2">
-  <title>Pay an Employee</title>
+              <row>
+                <entry>
+                  Liabilities:Tax2
+                </entry>
+                <entry></entry>
+                <entry>
+                  $50 (E_TAX2)
+                </entry>
+              </row>
 
-  <para>Now, enter the first split transaction for employee 1 in the checking account.  The split transaction looks like this:</para>
+              <row>
+                <entry>
+                  Expenses:Tax1
+                </entry>
+                <entry>
+                  $150 (C_TAX1)
+                </entry>
+                <entry></entry>
+              </row>
 
-	<screenshot id="bus-pay-ex2">
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata fileref="figures/bus_pay_ex2.png" 
+              <row>
+                <entry>
+                  Liabilities:Tax1
+                </entry>
+                <entry></entry>
+                <entry>
+                  $150 (C_TAX1)
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Expenses:Tax2
+                </entry>
+                <entry>
+                  $100 (C_TAX2)
+                </entry>
+                <entry></entry>
+              </row>
+
+              <row>
+                <entry>
+                  Liabilities:Tax2
+                </entry>
+                <entry></entry>
+                <entry>
+                  $100 (C_TAX2)
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+      </para>
+    </sect2>
+
+    <sect2 id="bus-pay-examplepay2">
+      <title>Pay an Employee</title>
+
+      <para>Now, enter the first split transaction for employee 1 in the checking account. The split transaction
+        looks like this:
+      </para>
+
+      <screenshot id="bus-pay-ex2">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/bus_pay_ex2.png" 
 	      srccredit="Patrick Schweiger" format="PNG"/>
-            </imageobject>
-	    <textobject>
-	        <phrase>Payroll Example 2</phrase>
-	    </textobject>
-	    <caption>
-	       <para>Employee 1 Split Transaction
-	       </para>
-	    </caption>
-          </mediaobject>
-        </screenshot>
-
-  <tip>
-  <para>When paying employees, enter only the employee name in the Description area.  If you decide to use &app;’s check printing capabilities, the check is automatically made out to the correct employee.  If you want to record other information in the transaction besides the employee name, use the Notes area, available when viewing the Register in double-line mode.</para>
-  </tip>
-  <para>Repeat this for the second employee, which leaves the account hierarchy looking like this:</para>
-
-	<screenshot id="bus-pay-ex3">
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata fileref="figures/bus_pay_ex3.png" 
+          </imageobject>
+
+          <textobject>
+            <phrase>Payroll Example 2</phrase>
+          </textobject>
+
+          <caption>
+            <para>Employee 1 Split Transaction
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+
+      <tip>
+        <para>When paying employees, enter only the employee name in the Description area. If you decide to use
+          &app;’s check printing capabilities, the check is automatically made out to the
+          correct employee. If you want to record other information in the transaction besides the
+          employee name, use the Notes area, available when viewing the Register in double-line
+          mode.
+        </para>
+      </tip>
+
+      <para>Repeat this for the second employee, which leaves the account hierarchy looking like this:
+      </para>
+
+      <screenshot id="bus-pay-ex3">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/bus_pay_ex3.png" 
 	      srccredit="Patrick Schweiger" format="PNG"/>
-            </imageobject>
-	    <textobject>
-	        <phrase>Payroll Example 3</phrase>
-	    </textobject>
-	    <caption>
-	       <para>Account Tree After Salaries Paid
-	       </para>
-	    </caption>
-          </mediaobject>
-        </screenshot>
-  </sect2>
-  <sect2 id="bus-pay-examplegovt2">
-  <title>Pay the Government</title>
-  <para>The <emphasis>Liabilities:Tax1</emphasis> and <emphasis>Liabilities:Tax2</emphasis> accounts continue to track how much you must pay to the government agencies responsible for each.  When it is time to pay these agencies, make a transaction from the checking account to the liability accounts.  No expense accounts are involved.  The main account will then appear like this for this example:</para>
-
-	<screenshot id="bus-pay-ex4">
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata fileref="figures/bus_pay_ex4.png" 
+          </imageobject>
+
+          <textobject>
+            <phrase>Payroll Example 3</phrase>
+          </textobject>
+
+          <caption>
+            <para>Account Tree After Salaries Paid
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </sect2>
+
+    <sect2 id="bus-pay-examplegovt2">
+      <title>Pay the Government</title>
+
+      <para>The <emphasis>Liabilities:Tax1</emphasis> and <emphasis>Liabilities:Tax2</emphasis> accounts
+        continue to track how much you must pay to the government agencies responsible for each.
+        When it is time to pay these agencies, make a transaction from the checking account to the
+        liability accounts. No expense accounts are involved. The main account will then appear like
+        this for this example:
+      </para>
+
+      <screenshot id="bus-pay-ex4">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/bus_pay_ex4.png" 
 	      srccredit="Patrick Schweiger" format="PNG"/>
-            </imageobject>
-	    <textobject>
-	        <phrase>Payroll Example 4</phrase>
-	    </textobject>
-	    <caption>
-	       <para>Accounts After Paying Government
-	       </para>
-	    </caption>
-          </mediaobject>
-        </screenshot>
-
- </sect2>
- </sect1>
--->
+          </imageobject>
+
+          <textobject>
+            <phrase>Payroll Example 4</phrase>
+          </textobject>
+
+          <caption>
+            <para>Accounts After Paying Government
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </sect2>
+  </sect1> -->
 </chapter>
diff --git a/guide/de/ch_bus_setup.xml b/guide/de/ch_bus_setup.xml
index 015cfad..8989990 100644
--- a/guide/de/ch_bus_setup.xml
+++ b/guide/de/ch_bus_setup.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 1.0.0
   Last modified: Sep 19th 2015 (Englisch 20.09.1015)
-  Maintainers: 
-               Chris Good <chris.good at ozemail.com.au>
+  Maintainers:
+    Chris Good <chris.good at ozemail.com.au>
   Author:
-        Chris Good <chris.good at ozemail.com.au>
-        updated [FirstName LastName] <name at company.com>
+    Chris Good <chris.good at ozemail.com.au>
+    updated [FirstName LastName] <name at company.com>
   Translators:
-               (Mechtilde Stehmann <ooo at mechtilde.de)
+    Mechtilde Stehmann <ooo at mechtilde.de
 -->
 <chapter id="chapter_bus_setup">
   <title>Einrichtung der geschäftlichen Buchhaltung</title>
@@ -75,8 +74,7 @@
       Verbindlichkeiten</emphasis> einrichten. Innerhalb dieses Kontos wird die integrierte
       Kreditorenbuchhaltung Geschäftsvorfälle buchen.
     </para>
-<literallayout>
-Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
+<screen>Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
 
 -Aktiva
    -Forderungskonten
@@ -89,8 +87,7 @@ Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
   -Verbindlichkeiten aus Lieferungen und Leistungen
   -Steuern
       -Steuern auf Ankäufe (Vorsteuer)
-      -Steuern auf Verkäufe (Umsatzsteuer)
-  </literallayout>
+      -Steuern auf Verkäufe (Umsatzsteuer)</screen>
     <para>Sie müssen zusätzliche Konten dieser Hierarchie hinzufügen, um diese nutzbar zu machen.
     </para>
 
diff --git a/guide/de/ch_capgain.xml b/guide/de/ch_capgain.xml
index c5ee832..126d628 100644
--- a/guide/de/ch_capgain.xml
+++ b/guide/de/ch_capgain.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0 /2.6.9 
   Last modified: July 9th 2006
-  (Englisch 30.01.2014)
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+    (Englisch 30.01.2014)
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-        Jon Lapham <lapham at extracta.com.br>
-        Updated  Bengt Thuree <bengt at thuree.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (Mechtilde Stehmann <ooo at mechtilde.de)
+    Mechtilde Stehmann <ooo at mechtilde.de
 -->
 <chapter id="chapter_capgain">
   <title>Kapitalerträge</title>
@@ -30,9 +29,9 @@
 
     <para>Sicher wiederverkaufbare Anlagen können ihren Wert im Laufe der Zeit ändern, wie zum Beispiel
       Aktien, Anleihen, Häuser oder Autos. Einige Anlagen (z.B.: eine Aktie) können im Wert
-      steigen, einige (z.B.: ein Auto) können im Wert abnehmen. Es ist wichtig, in der Lage zu sein,
-      einige dieser zeitabhängigen Vermögensbewertungen zu beobachten. Dieses Kapitel zeigt Ihnen,
-      wie das geht.
+      steigen, einige (z.B.: ein Auto) können im Wert abnehmen. Es ist wichtig, in der Lage zu
+      sein, einige dieser zeitabhängigen Vermögensbewertungen zu beobachten. Dieses Kapitel zeigt
+      Ihnen, wie das geht.
     </para>
 
     <para>Vermutlich alles, was Sie besitzen, steigt oder nimmt über die Zeit an Wert ab. So stellt sich die
@@ -69,10 +68,10 @@
     </para>
 
     <para>Die Kontoführung für die Behandlung einer Wertsteigerung der Anlage unterscheidet sich ein wenig
-      von einer Abschreibung, weil Sie sich normalerweise mit dem Moment des Verkaufs der Anlage
-      und der Realisierung des Kapitalertrages beschäftigen. Dies steht im Gegensatz zur stetigen
-      Natur der aufgezeichneten Abschreibung. Kapitalerträge sind ein wichtiges Thema in der Welt
-      der Besteuerung, weil die Regierungen dazu neigen, sich durchaus dafür zu interessieren,
+      von einer Abschreibung, weil Sie sich normalerweise mit dem Moment des Verkaufs der Anlage und
+      der Realisierung des Kapitalertrages beschäftigen. Dies steht im Gegensatz zur stetigen Natur
+      der aufgezeichneten Abschreibung. Kapitalerträge sind ein wichtiges Thema in der Welt der
+      Besteuerung, weil die Regierungen dazu neigen, sich durchaus dafür zu interessieren,
       Kapitalerträge auf die eine oder andere Weise zu besteuern.
     </para>
 
@@ -147,7 +146,7 @@
       <emphasis>Erträge:Nichtrealisierte Gewinne</emphasis> ausgeglichen (ähnlich wie
       <emphasis>ITEM2</emphasis>).
     </para>
-<literallayout>
+<screen>
 -Aktiva
     -Barvermögen
         -Sparkonto
@@ -160,8 +159,7 @@
             -Nichtrealisierte Gewinne
 -Erträge
     -Realisierte Gewinne
-    -Nichtrealisierte Gewinne
-  </literallayout>
+    -Nichtrealisierte Gewinne</screen>
   </sect1>
 
   <sect1 id="capgain_example1">
diff --git a/guide/de/ch_cc.xml b/guide/de/ch_cc.xml
index 15c8e40..7d943fe 100644
--- a/guide/de/ch_cc.xml
+++ b/guide/de/ch_cc.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0 /2.6 maint
   Last modified: July 9th 2006 (Englisch 2015-08-27)
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-        Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
     Updated	Bengt Thuree <bengt at thuree.com>
   Originally written by Carol Champagne.
   Translators:
-               (Mechtilde Stehmann<ooo at mechtilde.de>)
+    Mechtilde Stehmann<ooo at mechtilde.de>
 -->
 <chapter id="chapter_cc">
   <title>Kreditkarten</title>
@@ -72,14 +71,13 @@
       <para>Wenn Sie nicht jede Aufwendung verfolgen wollen, die Sie mit der Kreditkarte gemacht haben, können
         Sie eine einfache Kontenhierarchie wie diese einrichten:
       </para>
-<literallayout>
+<screen>
 -Aktiva
    -Bank
 -Verbindlichkeiten
    -Kreditkarte
 -Aufwand
-   -Kreditkarte
-   </literallayout>
+   -Kreditkarte</screen>
       <para>In diesem Beispiel geben Sie Ihre Gesamtkosten pro Monat als eine Buchung zwischen
         <emphasis>Verbindlichkeiten:Kreditkarte</emphasis> und
         <emphasis>Aufwendungen:Kreditkarte</emphasis> ein. Wenn Sie eine Zahlung leisten, geben Sie
@@ -102,7 +100,7 @@
         Kreditkartenverbindlichkeitskonto und einem besonderen Aufwandskonto eingegeben. Unten ist
         ein Beispiel für eine solche Kontenhierarchie:
       </para>
-<literallayout>
+<screen>
 -Aktiva
     -Bank
 -Verbindlichkeit
@@ -113,8 +111,7 @@
     -Kleidung
     -Unterhaltung
     -Zinsen
-    -Gebühren
-   </literallayout>
+    -Gebühren</screen>
       <para>Natürlich sollten Sie spezifische Ausgabekonten einrichten, die zu Ihren Ausgabengewohnheiten
         passen. Der einzige Unterschied zwischen dieser Einrichtung zur einfachen Einrichtung ist
         die Unterteilung der Ausgaben in Gruppen. Denken Sie daran, dass es Ausgaben für
@@ -148,9 +145,9 @@
     </para>
 
     <para>Die Eingabe dieser Buchungen in &app; erlaubt Ihnen nachzuverfolgen, wie viel Sie dem
-      Kreditkartenunternehmen schulden und Sie erhalten ein besseres Bild über alle Ihre Konten
-      Es erlaubt Ihnen auch, Ihre Konten zu überwachen und sicherzustellen, dass
-      Betrug vermieden wird.
+      Kreditkartenunternehmen schulden und Sie erhalten ein besseres Bild über alle Ihre Konten Es
+      erlaubt Ihnen auch, Ihre Konten zu überwachen und sicherzustellen, dass Betrug vermieden
+      wird.
     </para>
 
     <para>Das Hinzufügen von Buchungen zu einem Kreditkartenkonto ist ähnlich der der Eingabe in andere
@@ -178,8 +175,8 @@
       ist eine andere Art der Zahlung, in der die Kreditkartenverbindlichkeiten abnehmen, die Sie
       schulden. Wenn Sie die original Buchungen über den Kauf als einen Übertrag vom
       Kreditkartenkonto auf Aufwendungen aufgezeichnet haben, machen Sie nun einfach diese Buchung
-      rückgängig: übertragen Sie das Geld zurück von Aufwendungen auf das Kreditkartenkonto. Diese
-      Buchung verringert beides, das Aufwandskontensaldo und das Kreditkartensaldo. Wenn Sie
+      rückgängig: übertragen Sie das Geld zurück von Aufwendungen auf das Kreditkartenkonto.
+      Diese Buchung verringert beides, das Aufwandskontensaldo und das Kreditkartensaldo. Wenn Sie
       beispielsweise Kleidung mit der Kreditkart kaufen, ist die Buchung ein Ãœbertrag vom
       Kreditkartenkonto auf das Aufwandskonto Kleidung. Wenn Sie dann die Kleidung zurückgeben
       gegen eine Erstattung, übertragen Sie einfach das Geld zurück vom Aufwandskonto Kleidung auf
@@ -193,9 +190,10 @@
       </para>
     </note>
 
-    <para>Um das zu erläutern, lassen Sie uns ein Beispiel durchspielen. Sie kaufen einige Jeans für 74,99 €
-      mit Ihrer VISA Karte, aber bemerken einen Tag später, dass diese zu groß sind, und wollen
-      sie umtauschen. Der Laden stimmt dem höflich zu und erstattet den Betrag auf Ihre Kreditkarte.
+    <para>Um das zu erläutern, lassen Sie uns ein Beispiel durchspielen. Sie kaufen einige Jeans für 74,99
+      € mit Ihrer VISA Karte, aber bemerken einen Tag später, dass diese zu groß sind, und
+      wollen sie umtauschen. Der Laden stimmt dem höflich zu und erstattet den Betrag auf Ihre
+      Kreditkarte.
     </para>
 
     <orderedlist>
@@ -436,8 +434,8 @@
       <title>Abgleichen</title>
 
       <para>Wenn Sie Ihre Kreditkartenrechnung erhalten, sollten Sie Ihre Kreditkartenkonto gegen dieses
-        Dokument abgleichen. Dies geschieht mit der in &app; eingebauten Abgleichen-Funktion. Heben Sie das
-        Kreditkartenkonto hervor und klicken Sie auf
+        Dokument abgleichen. Dies geschieht mit der in &app; eingebauten Abgleichen-Funktion. Heben
+        Sie das Kreditkartenkonto hervor und klicken Sie auf
         <menuchoice>
           <guimenu>Aktionen</guimenu> <guimenuitem>Abgleichen…</guimenuitem>
         </menuchoice>
@@ -467,8 +465,8 @@
       </screenshot>
 
       <para>Während des Abgleichens haken Sie jede Buchung in dem Konto ab, womit Sie bestätigen, dass die
-        Buchung auf beiden Konten erscheint, Ihrem &app; Konto und der Kreditkartenabrechnung. Für dieses
-        Beispiel gibt es eine Differenz von 300,- € zwischen Ihren &app; Konten und der
+        Buchung auf beiden Konten erscheint, Ihrem &app; Konto und der Kreditkartenabrechnung. Für
+        dieses Beispiel gibt es eine Differenz von 300,- € zwischen Ihren &app; Konten und der
         Kreditkartenabrechnung, wie unten gezeigt.
       </para>
 
@@ -501,11 +499,12 @@
     <sect2 id="cc-together-payment2">
       <title>Auszahlung</title>
 
-      <para>Angenommen, Sie haben Ihr Kreditkartenkonto vollständig abgeglichen, müssen Sie nun eine Zahlung an
-        das Kreditkartenunternehmen leisten. In diesem Beispiel schulden Sie 455,- €, aber wollen
-        diesen Monat wieder eine Teilzahlung von 300,- € leisten. Um dies zu tun, geben Sie eine
-        Buchung von Ihrem Bankkonto auf das Kreditkartenkonto von 300,- € ein. Dies reduziert das
-        Kreditkartensaldo auf 155,- €. Ihre Kreditkantenkontoansicht sollte wie folgt aussehen:
+      <para>Angenommen, Sie haben Ihr Kreditkartenkonto vollständig abgeglichen, müssen Sie nun eine Zahlung
+        an das Kreditkartenunternehmen leisten. In diesem Beispiel schulden Sie 455,- €, aber
+        wollen diesen Monat wieder eine Teilzahlung von 300,- € leisten. Um dies zu tun, geben Sie
+        eine Buchung von Ihrem Bankkonto auf das Kreditkartenkonto von 300,- € ein. Dies reduziert
+        das Kreditkartensaldo auf 155,- €. Ihre Kreditkantenkontoansicht sollte wie folgt
+        aussehen:
       </para>
 
       <screenshot id="cc-payment">
diff --git a/guide/de/ch_currency.xml b/guide/de/ch_currency.xml
index 6c7449a..102c11c 100644
--- a/guide/de/ch_currency.xml
+++ b/guide/de/ch_currency.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.4.0 /2.6.9
   Last modified: March 16th 2010 (Englisch 10.12.2016)
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
     Jon Lapham <lapham at extracta.com.br>
-    Updated  Bengt Thuree <bengt at thuree.com>
+    Updated Bengt Thuree <bengt at thuree.com>
     Updated Geert Janssens <janssens-geert at telenet.be>
   Originally designed by Carol Champagne.
   Translators:
-               (Mechtilde Stehmann <ooo at mechtilde.de)
+    (Mechtilde Stehmann <ooo at mechtilde.de)
 -->
 <chapter id="chapter_currency">
   <title>Verschiedene Währungen</title>
@@ -93,7 +92,7 @@
       aufzusetzen, eins in US Dollars und ein weiteres in Hong Kong Dollar. Eine mögliche
       Kontenstruktur dafür könnte Folgende sein:
     </para>
-<literallayout>
+<screen>
 -Aktiva                      (EUR)
    -Barvermögen              (EUR)
       -US Bank               (USD)
@@ -102,9 +101,8 @@
 -Eigenkapital                (EUR)
    -Anfangsbestände
       -USD                   (USD)
-      -EUR                   (EUR)   
-      -HKD                   (HKD)
- </literallayout>
+      -EUR                   (EUR)
+      -HKD                   (HKD)</screen>
     <note>
       <para>Beachten Sie, dass die Währung jedes Kontos in Klammern gesetzt ist.
       </para>
@@ -519,7 +517,7 @@
 
       <para>Um dies in &app; aufzuzeichnen, nutzen wir die Basiskontenstruktur:
       </para>
-<literallayout>
+<screen>
 -Aktiva                       (EUR)
    -Barvermögen               (EUR)
       -Europäische Bank       (EUR)
@@ -528,8 +526,7 @@
       -Boot                   (JMD)
 -Eigenkapital                 (EUR)
    -Anfangsbestand
-      -EUR                    (EUR)
-      </literallayout>
+      -EUR                    (EUR)</screen>
       <note>
         <para>Beachten Sie, dass die Währung jedes Kontos in Klammern gesetzt ist.
         </para>
@@ -653,13 +650,12 @@
         Aktie 0694.HK auf Yahoo! Weil Sie alle verschiedene Erträge und Aufwendungen verfolgen
         wollen, gibt es die folgende Kontenstruktur:
       </para>
-<literallayout>
+<screen>
 Aktiva:Anlagen:Maklerkonto:Boom:0694.HK         (Beijing Airport)
 Aktiva:Anlagen:Maklerkonto:Boom:Bank            (HKD)
 Eigenkapital:Anfangsbestand:HKD                 (HKD)
 Aufwendungen:Kommissionen:Boom.0694.HK          (HKD)
-Erträge:Investments:Dividende:Boom:0694.HK      (HKD)
-      </literallayout>
+Erträge:Investments:Dividende:Boom:0694.HK      (HKD)</screen>
       <para>Der Kontenplan sieht wie folgt nach der Erstellung aller benötigten Konten aus:
       </para>
 
@@ -722,12 +718,11 @@ Erträge:Investments:Dividende:Boom:0694.HK      (HKD)
         HKD-Maklerkonto in (<emphasis>Aktiva:Anlagen:Maklerkonto:Boom:Bank</emphasis>) und geben
         folgendes ein:
       </para>
-<literallayout>
+<screen>
 Aktienkauf
     Aktiva:Anlagen:Maklerkonto:Boom:Bank     Abbuchung 50.000,-
     Aufwendungen:Kommission:Boom             Einzahlung 500,-
-    Aktiva:Anlagen:Maklerkonto:Boom:0694-HK  Einzahlung 49.500 (16.500 Anteile)
-</literallayout>
+    Aktiva:Anlagen:Maklerkonto:Boom:0694-HK  Einzahlung 49.500 (16.500 Anteile)</screen>
       <para>Wenn der Wechselkursdialog nicht automatisch erscheint, klicken Sie mit rechts auf die Aktienzeile
         und wählen <guilabel>Bearbeiten Wechselkurs</guilabel>. Geben Sie die Anzahl der Anteile
         (16.500) als <guilabel>Zum Betrag</guilabel> ein.
@@ -813,22 +808,22 @@ Aktienkauf
     <para>Wenn Sie nicht an allen Einzelheiten interessiert sind, genügt eine einfaches Kontostruktur wie die
       Folgende:
     </para>
-<literallayout>
-    Aktiva:Investments:Währung:Bank (EUR)
-    Aktiva:Investments:Währung:XXX (XXX)</literallayout>
-    <para>Sie würden einfach Überweisungen zwischen den beiden Konten eingeben und dabei
-      die Wechselkurse notieren.
+<screen>
+Aktiva:Investments:Währung:Bank   (EUR)
+Aktiva:Investments:Währung:XXX    (XXX)</screen>
+    <para>Sie würden einfach Überweisungen zwischen den beiden Konten eingeben und dabei die Wechselkurse
+      notieren.
     </para>
 
     <para>Aber wenn Sie in der Lage sein wollen, die KapitalertrFäge und -verluste genauso wie die
       verschiedenen Gebühren nachzuverfolgen, benötigen Sie ein etwas aufwändigeres Layout wie
       das Folgende:
     </para>
-<literallayout>
-    Aktiva:Investments:Währung:Bank                      (EUR)
-    Aktiva:Investments:Währung:Währung Bank:XXX          (XXX)
-    Aufwendungen:Investments:Währung:Währung Bank:XXX    (XXX)
-    Ertrag:Investments:Währung Bank:Kapitalerträge:XXX   (XXX)</literallayout>
+<screen>
+Aktiva:Investments:Währung:Bank                      (EUR)
+Aktiva:Investments:Währung:Währung Bank:XXX          (XXX)
+Aufwendungen:Investments:Währung:Währung Bank:XXX    (XXX)
+Ertrag:Investments:Währung Bank:Kapitalerträge:XXX   (XXX)</screen>
     <sect2 id="currency_invest12">
       <title>Fremdwährungsanlagen erwerben</title>
 
@@ -1117,9 +1112,8 @@ Aktienkauf
       Ihre Erträge und Aufwendungen zu verfolgen, kann die folgende 
       Kontenhierarchie genutzt werden:</para>
 
-      <literallayout>
-Aktiva:Barvermögen:Sparkonto         (AUD)
-      </literallayout>
+      <screen>
+Aktiva:Barvermögen:Sparkonto         (AUD)</screen>
 
       <para></para>
     </sect2>
@@ -1136,11 +1130,9 @@ Aktiva:Barvermögen:Sparkonto         (AUD)
       
       <para>Um diese Buchungen aufzuzeichnen, benötigen wir die follgenden 
       Konten:</para>
-      <literallayout>
+      <screen>
 Eigenkapital:Lotterie         (AUD)
-Eigenkapital:Erbschaft     (AUD)      
-      </literallayout>
-
+Eigenkapital:Erbschaft        (AUD)</screen>
 
       <para>Die Buchungen, die geben in Ihr Konto  
       <emphasis>Aktiva:Barvermögen:Sparkonto</emphasis> eingeben, 
@@ -1205,12 +1197,11 @@ Eigenkapital:Erbschaft     (AUD)
       <para>Endlich können Sie es sich leisten, das Hypothekendarlehen, das 
       Sie vor ein paar Jahren aufgenommen haben (mit einer Rstzahlung von 50.000,- $), zurückzuzahlen.</para>
 
-      <literallayout>
-Aktiva:Sachanlagen:Haus                  (AUD) 300.000,- $
+      <screen>
+Aktiva:Sachanlagen:Haus                     (AUD) 300.000,- $
 Verbindlichkeiten:Darlehen:Hypothek         (AUD) 250.000,- $
 Aufwand:Zinsen:Hypothekenzinsen             (AUD)
-Eigenkapital:Anfangsbestand                 (AUD) 50.000,- $
-      </literallayout>
+Eigenkapital:Anfangsbestand                 (AUD) 50.000,- $</screen>
 
       <para>Nach einem kurzen Gespräch mit Ihrer Hypothekenbank stimmt 
       diese zu, dass Sie alles in einem bezahlen plus Zinsen (30.000,- $). 
@@ -1286,10 +1277,10 @@ Eigenkapital:Anfangsbestand                 (AUD) 50.000,- $
       Telecommunication (Ericsson in Sweden), Beijing
       Airport (Hong Kong) und Amazon (USA) zu kaufen.</para>
 
-      <para>Die benutzten Konten, um diese Investments zu verfolgen, 
+      <para>Die benutzten Konten, um diese Investments zu verfolgen,
       sollten wie folgt aussehen:</para>
 
-      <literallayout>
+      <screen>
 Aktiva:Investments:Schwedischer Makler:ERIC.ST            (STOCK ERIC.ST Yahoo)
 Aktiva:Investments:Swedish Broker:Bank                    (SEK)
 Aktiva:Investments:HK Broker:0694.HK                      (STOCK 0694.HK Yahoo)
@@ -1299,8 +1290,7 @@ Aktiva:Investments:US Broker:Bank                         (USD)
 Aufwand:Investments:Kommision:Swedish Broker:ERIC.ST      (SEK)
 Aufwand:Investments:Kommision:HK Broker:0694.HK           (HKD)
 Aufwand:Investments:Kommision:US Broker:AMZN              (USD)
-Aufwand:Investments:Devisentransfer                       (AUD)
-</literallayout>
+Aufwand:Investments:Devisentransfer                       (AUD)</screen>
 
       <para>Sie entscheiden sich, 100.000,- $ je Aktie anzulegen und 
        führen dazu zunächst einen Devisentransver auf die verschiedenen 
@@ -1467,11 +1457,11 @@ Aufwand:Investments:Devisentransfer                       (AUD)
       mit einem persönlichen Darlehen von 40.000,- € auszuhelfen.</para>
 
       <para>
-        <literallayout>
+        <screen>
 Aktiva:Geld gehört mir:Euro:Peter            (Euro)
 Ertrag:Zinsertrag:Peter                      (Euro)
-Aufwand:Bankgebühr                           (AUD)
-        </literallayout>
+Aufwand:Bankgebühr                           (AUD)</screen>
+
       </para>
       <para>Dies ist ein einfaches Devisengeschäft von Ihrem Sparkonto 
        auf Ihr Aktiva:Geld gehört mir:Peter (EURO) Konto. Sie erhalten einen 
@@ -1512,13 +1502,12 @@ Aufwand:Bankgebühr                           (AUD)
 
       <para>Wir benötigen die folgenden Konten für dieses Beispiel:</para>
 
-      <literallayout>
+      <screen>
 Verbindlichkeiten:Darlehen:Japanisches Darlen              (JPY)
 Aufwand:Zinsen:Japanisches Darlehen                        (JPY)
 Aufwand:Hypothek Verwaltungsgebühr:Japanisches Darlehen    (JPY)
 Aktiva:Barvermögen:Japan Bank                              (JPY)
-Aktiva:Anlagevermögen:Haus in Neuseeland                   (NZ)
-</literallayout>
+Aktiva:Anlagevermögen:Haus in Neuseeland                   (NZ)</screen>
 
       <table>
           <title>Splitbuchung eines Hauskaufes in Neuseeland</title>
diff --git a/guide/de/ch_dep.xml b/guide/de/ch_dep.xml
index 5745eb2..03b2e08 100644
--- a/guide/de/ch_dep.xml
+++ b/guide/de/ch_dep.xml
@@ -1,152 +1,153 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!--  (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   	Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_dep">
-  <title>Depreciation</title>
+  <title>Wertberichtigungen</title>
 
   <para>&untranslated-de;
   </para>
 <!--
-  <para>This chapter will introduce the concept of depreciation in accounting
-  and give some real life examples for using it.</para>
+  <para>This chapter will introduce the concept of depreciation in accounting and give some real life
+    examples for using it.
+  </para>
 
   <sect1 id="dep_concepts1">
     <title>Basic Concepts</title>
 
-    <para>Depreciation is the accounting method for expensing capital
-    purchases over time. There are two reasons that you may want to record
-    depreciation; you are doing bookkeeping for your own personal finances and
-    would like to keep track of your net worth, or you are doing bookkeeping
-    for a small busines and need to produce a financial statement from which
-    you will prepare your tax return.</para>
+    <para>Depreciation is the accounting method for expensing capital purchases over time. There are two
+      reasons that you may want to record depreciation; you are doing bookkeeping for your own
+      personal finances and would like to keep track of your net worth, or you are doing bookkeeping
+      for a small busines and need to produce a financial statement from which you will prepare your
+      tax return.
+    </para>
 
-    <para>The method of recording depreciation is the same in either case. but
-    the end goal is different. This section will discuss the differences
-    between the two. But first, some terminology.</para>
+    <para>The method of recording depreciation is the same in either case. but the end goal is different. This
+      section will discuss the differences between the two. But first, some terminology.
+    </para>
 
     <itemizedlist>
       <listitem>
-        <para><emphasis>Accumulated depreciation</emphasis> - the accumulated
-        total of book depreciation taken over the life of the asset. This is
-        accumulated in the depreciation account in the asset section.</para>
+        <para><emphasis>Accumulated depreciation</emphasis> - the accumulated total of book depreciation taken
+          over the life of the asset. This is accumulated in the depreciation account in the asset
+          section.
+        </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Book depreciation</emphasis> - this is the amount of
-        depreciation that you record in your financial statements per
-        accounting period.</para>
+        <para><emphasis>Book depreciation</emphasis> - this is the amount of depreciation that you record in your
+          financial statements per accounting period.
+        </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Fair market value</emphasis> - the amount for which an
-        asset could be sold at a given time.</para>
+        <para><emphasis>Fair market value</emphasis> - the amount for which an asset could be sold at a given
+          time.
+        </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Net book value</emphasis> - this is the difference
-        between the original cost and the depreciation taken to date.</para>
+        <para><emphasis>Net book value</emphasis> - this is the difference between the original cost and the
+          depreciation taken to date.
+        </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Original cost</emphasis> - this is the amount that the
-        asset cost you to purchase. It includes any cost to get the asset into
-        a condition in which you can use it. For example - shipping,
-        installation costs, special training.</para>
+        <para><emphasis>Original cost</emphasis> - this is the amount that the asset cost you to purchase. It
+          includes any cost to get the asset into a condition in which you can use it. For example -
+          shipping, installation costs, special training.
+        </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Salvage value</emphasis> - this is the value that you
-        estimate the asset can be sold for at the end of it’s useful life (to
-        you).</para>
+        <para><emphasis>Salvage value</emphasis> - this is the value that you estimate the asset can be sold for
+          at the end of it’s useful life (to you).
+        </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Tax depreciation</emphasis> - this is the amount of
-        depreciation that you take for income tax purposes.</para>
+        <para><emphasis>Tax depreciation</emphasis> - this is the amount of depreciation that you take for income
+          tax purposes.
+        </para>
       </listitem>
     </itemizedlist>
 
     <sect2 id="dep_concepts_personal2">
       <title>Personal Finances</title>
 
-      <para>Depreciation is used in personal finances to periodically lower an
-      asset’s value to give you an accurate estimation of your current net
-      worth. For example, if you owned a car you could keep track of its
-      current value by recording depreciation every year. To accomplish this,
-      you record the original purchase as an asset, and then record a
-      depreciation expense each year (See <xref linkend="dep_example1" /> for
-      an example). This would result in the net book value being approximately
-      equal to the fair market value of the asset at the end of the
-      year.</para>
-
-      <para>Depreciation for personal finance has no tax implications, it is
-      simply used to help you estimate your net worth. Because of this, there
-      are no rules for how you estimate depreciation, use your best
-      judgement.</para>
-
-      <para>For which assets should you estimate depreciation? Since the idea
-      of depreciation for personal finances is to give you an estimate of your
-      personal net worth, you need only track depreciation on assets of
-      notable worth that you could potentially sell, such as a car or
-      boat.</para>
+      <para>Depreciation is used in personal finances to periodically lower an asset’s value to give you
+        an accurate estimation of your current net worth. For example, if you owned a car you could
+        keep track of its current value by recording depreciation every year. To accomplish this,
+        you record the original purchase as an asset, and then record a depreciation expense each
+        year (See <xref linkend="dep_example1" /> for an example). This would result in the net book
+        value being approximately equal to the fair market value of the asset at the end of the
+        year.
+      </para>
+
+      <para>Depreciation for personal finance has no tax implications, it is simply used to help you estimate
+        your net worth. Because of this, there are no rules for how you estimate depreciation, use
+        your best judgement.
+      </para>
+
+      <para>For which assets should you estimate depreciation? Since the idea of depreciation for personal
+        finances is to give you an estimate of your personal net worth, you need only track
+        depreciation on assets of notable worth that you could potentially sell, such as a car or
+        boat.
+      </para>
     </sect2>
 
     <sect2 id="dep_concepts_business2">
       <title>Business</title>
 
-      <para>As opposed to personal finance where the goal is tracking personal
-      worth, business is concerned with matching the expense of purchasing
-      capital assets with the revenue generated by them. This is done through
-      book depreciation. Businesses must also be concerned with local tax laws
-      covering depreciation of assets. This is known as tax depreciation. The
-      business is free to choose whatever scheme it wants to record book
-      depreciation, but the scheme used for tax depreciation is fixed. More
-      often than not this results in differences between book and tax
-      depreciation, but steps can be taken to reduce these differences.</para>
-
-      <para>Now, what purchases should be capitalized? If you expect something
-      that you purchase to help you earn income for more than just the current
-      year, then it should be capitalized. This includes things like land,
-      buildings, equipment, automobiles, and computers - as long as they are
-      used for business purposes. It does not include items that would be
-      considered inventory. So if you made a purchase with the intent to
-      resell the item, it should not be capitalized.</para>
-
-      <para>In addition to the purchase of the asset itself, any costs
-      associated with getting the asset into a condition so that you can use
-      it should be capitalized. For example, if you buy a piece of equipment
-      and it needs to be shipped from out of town, and then some electrical
-      work needs to be done so you can plug the machine in, and some
-      specialized training is needed so you know how to use the machine, all
-      these costs would be included in the cost of the equipment.</para>
-
-      <para>You also need to know the estimated salvage value of the asset.
-      Generally, this is assumed to be zero. The idea behind knowing the
-      salvage value is that the asset will be depreciated untill the net book
-      value (cost less depreciation) equals the salvage value. Then, when the
-      asset is written off, you will not have a gain or loss resulting from
-      the disposal of the asset.</para>
-
-      <para>The last step is to determine the method of depreciation that you
-      want to use. This will be discussed on the next few pages.</para>
+      <para>As opposed to personal finance where the goal is tracking personal worth, business is concerned with
+        matching the expense of purchasing capital assets with the revenue generated by them. This
+        is done through book depreciation. Businesses must also be concerned with local tax laws
+        covering depreciation of assets. This is known as tax depreciation. The business is free to
+        choose whatever scheme it wants to record book depreciation, but the scheme used for tax
+        depreciation is fixed. More often than not this results in differences between book and tax
+        depreciation, but steps can be taken to reduce these differences.
+      </para>
+
+      <para>Now, what purchases should be capitalized? If you expect something that you purchase to help you
+        earn income for more than just the current year, then it should be capitalized. This
+        includes things like land, buildings, equipment, automobiles, and computers - as long as
+        they are used for business purposes. It does not include items that would be considered
+        inventory. So if you made a purchase with the intent to resell the item, it should not be
+        capitalized.
+      </para>
+
+      <para>In addition to the purchase of the asset itself, any costs associated with getting the asset into a
+        condition so that you can use it should be capitalized. For example, if you buy a piece of
+        equipment and it needs to be shipped from out of town, and then some electrical work needs
+        to be done so you can plug the machine in, and some specialized training is needed so you
+        know how to use the machine, all these costs would be included in the cost of the equipment.
+      </para>
+
+      <para>You also need to know the estimated salvage value of the asset. Generally, this is assumed to be
+        zero. The idea behind knowing the salvage value is that the asset will be depreciated until
+        the net book value (cost less depreciation) equals the salvage value. Then, when the asset
+        is written off, you will not have a gain or loss resulting from the disposal of the asset.
+      </para>
+
+      <para>The last step is to determine the method of depreciation that you want to use. This will be
+        discussed on the next few pages.
+      </para>
 
       <warning>
-        <para>Be aware that different countries can have
-        substantially different tax policies for depreciation; all that this
-        document can really provide is some of the underlying ideas to help
-        you apply your <quote>favorite</quote> tax/depreciation policies.</para>
+        <para>Be aware that different countries can have substantially different tax policies for depreciation;
+          all that this document can really provide is some of the underlying ideas to help you
+          apply your <quote>favorite</quote> tax/depreciation policies.
+        </para>
       </warning>
     </sect2>
   </sect1>
@@ -154,63 +155,60 @@
   <sect1 id="dep_value1">
     <title>Estimating Valuation</title>
 
-    <para>A central issue with depreciation is to determine how you will
-    estimate the future value of the asset. Compared to the often uncertain
-    estimates one has to do where appreciation of assets is concerned, we are
-    on somewhat firmer ground here. Using sources listed below should make it
-    fairly straight forward to estimate the future value of your depreciating
-    assets.</para>
+    <para>A central issue with depreciation is to determine how you will estimate the future value of the
+      asset. Compared to the often uncertain estimates one has to do where appreciation of assets is
+      concerned, we are on somewhat firmer ground here. Using sources listed below should make it
+      fairly straight forward to estimate the future value of your depreciating assets.
+    </para>
 
     <itemizedlist>
       <listitem>
-        <para><emphasis>Tax Codes:</emphasis> For businesses that want to use
-        depreciation for tax purposes, governments tend to set up precise
-        rules as to how you are required to calculate depreciation. Consult
-        your local tax codes, which should explicitly state how to estimate
-        depreciation.</para>
+        <para><emphasis>Tax Codes:</emphasis> For businesses that want to use depreciation for tax purposes,
+          governments tend to set up precise rules as to how you are required to calculate
+          depreciation. Consult your local tax codes, which should explicitly state how to estimate
+          depreciation.
+        </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Car Blue Book:</emphasis> For automobiles, it is easy
-        to look up in references such as <quote>Blue Books</quote> estimates of what an
-        automobile should be worth after some period of time in the future.
-        From this you will be able to develop a model of the
-        depreciation.</para>
+        <para><emphasis>Car Blue Book:</emphasis> For automobiles, it is easy to look up in references such as
+          <quote>Blue Books</quote> estimates of what an automobile should be worth after some
+          period of time in the future. From this you will be able to develop a model of the
+          depreciation.
+        </para>
       </listitem>
     </itemizedlist>
 
     <sect2 id="dep_valueschemes2">
       <title>Depreciation Schemes</title>
 
-      <para>A <emphasis>depreciation scheme</emphasis> is a mathematical model
-      of how an asset will be expensed over time. For every asset which
-      undergoes depreciation, you will need to decide on a depreciation
-      scheme. An important point to keep in mind is that, for tax purposes,
-      you will need to depreciate your assets at a certain rate. This is
-      called tax depreciation. For financial statement purposes you are free
-      to choose whatever method you want. This is book depreciation. Most
-      small businesses use the same rate for tax and book depreciation. This
-      way there is less of a difference between your net income on the
-      financial statements and your taxable income.</para>
-
-      <para>This section will present 3 of the more popular depreciation
-      schemes: <emphasis>linear</emphasis>, <emphasis>geometric</emphasis>,
-      and <emphasis>sum of digits</emphasis>. To simplify the examples, we
-      will assume the salvage value of the asset being depreciated is zero. If
-      you choose to use a salvage value, you would stop depreciating the asset
-      once the net book value equals the salvage value.</para>
+      <para>A <emphasis>depreciation scheme</emphasis> is a mathematical model of how an asset will be expensed
+        over time. For every asset which undergoes depreciation, you will need to decide on a
+        depreciation scheme. An important point to keep in mind is that, for tax purposes, you will
+        need to depreciate your assets at a certain rate. This is called tax depreciation. For
+        financial statement purposes you are free to choose whatever method you want. This is book
+        depreciation. Most small businesses use the same rate for tax and book depreciation. This
+        way there is less of a difference between your net income on the financial statements and
+        your taxable income.
+      </para>
+
+      <para>This section will present 3 of the more popular depreciation schemes: <emphasis>linear</emphasis>,
+        <emphasis>geometric</emphasis>, and <emphasis>sum of digits</emphasis>. To simplify the
+        examples, we will assume the salvage value of the asset being depreciated is zero. If you
+        choose to use a salvage value, you would stop depreciating the asset once the net book value
+        equals the salvage value.
+      </para>
 
       <orderedlist>
         <listitem>
-          <para><emphasis>Linear depreciation</emphasis> diminishes the value
-          of an asset by a fixed amount each period until the net value is
-          zero. This is the simplest calculation, as you estimate a useful
-          lifetime, and simply divide the cost equally across that
-          lifetime.</para>
+          <para><emphasis>Linear depreciation</emphasis> diminishes the value of an asset by a fixed amount each
+            period until the net value is zero. This is the simplest calculation, as you estimate a
+            useful lifetime, and simply divide the cost equally across that lifetime.
+          </para>
 
-          <para>Example: You have bought a computer for $1500 and wish to
-          depreciate it over a period of 5 years. Each year the amount of
-          depreciation is $300, leading to the following calculations:</para>
+          <para>Example: You have bought a computer for $1500 and wish to depreciate it over a period of 5 years.
+            Each year the amount of depreciation is $300, leading to the following calculations:
+          </para>
 
           <para><table>
               <title>Linear Depreciation Scheme Example</title>
@@ -218,75 +216,118 @@
               <tgroup cols="3">
                 <tbody>
                   <row>
-                    <entry><emphasis>Year</emphasis></entry>
+                    <entry>
+                      <emphasis>Year</emphasis>
+                    </entry>
 
-                    <entry><emphasis>Depreciation</emphasis></entry>
+                    <entry>
+                      <emphasis>Depreciation</emphasis>
+                    </entry>
 
-                    <entry><emphasis>Remaining Value</emphasis></entry>
+                    <entry>
+                      <emphasis>Remaining Value</emphasis>
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>0</entry>
+                    <entry>
+                      0
+                    </entry>
 
-                    <entry>-</entry>
+                    <entry>
+                      -
+                    </entry>
 
-                    <entry>1500</entry>
+                    <entry>
+                      1500
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>1</entry>
+                    <entry>
+                      1
+                    </entry>
 
-                    <entry>300</entry>
+                    <entry>
+                      300
+                    </entry>
 
-                    <entry>1200</entry>
+                    <entry>
+                      1200
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>2</entry>
+                    <entry>
+                      2
+                    </entry>
 
-                    <entry>300</entry>
+                    <entry>
+                      300
+                    </entry>
 
-                    <entry>900</entry>
+                    <entry>
+                      900
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>3</entry>
+                    <entry>
+                      3
+                    </entry>
 
-                    <entry>300</entry>
+                    <entry>
+                      300
+                    </entry>
 
-                    <entry>600</entry>
+                    <entry>
+                      600
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>4</entry>
+                    <entry>
+                      4
+                    </entry>
 
-                    <entry>300</entry>
+                    <entry>
+                      300
+                    </entry>
 
-                    <entry>300</entry>
+                    <entry>
+                      300
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>5</entry>
+                    <entry>
+                      5
+                    </entry>
 
-                    <entry>300</entry>
+                    <entry>
+                      300
+                    </entry>
 
-                    <entry>0</entry>
+                    <entry>
+                      0
+                    </entry>
                   </row>
                 </tbody>
               </tgroup>
-            </table></para>
+            </table>
+          </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Geometric depreciation</emphasis> is depreciated by
-          a fixed percentage of the asset value in the previous period. This
-          is a front-weighted depreciation scheme, more depreciation being
-          applied early in the period. In this scheme the value of an asset
-          decreases exponentially leaving a value at the end that is larger
-          than zero (i.e.: a resale value).</para>
+          <para><emphasis>Geometric depreciation</emphasis> is depreciated by a fixed percentage of the asset value
+            in the previous period. This is a front-weighted depreciation scheme, more depreciation
+            being applied early in the period. In this scheme the value of an asset decreases
+            exponentially leaving a value at the end that is larger than zero (i.e.: a resale
+            value).
+          </para>
 
-          <para>Example: We take the same example as above, with an annual
-          depreciation of 30%.</para>
+          <para>Example: We take the same example as above, with an annual depreciation of 30%.
+          </para>
 
           <para><table>
               <title>Geometric Depreciation Scheme Example</title>
@@ -294,88 +335,130 @@
               <tgroup cols="3">
                 <tbody>
                   <row>
-                    <entry><emphasis>Year</emphasis></entry>
+                    <entry>
+                      <emphasis>Year</emphasis>
+                    </entry>
 
-                    <entry><emphasis>Depreciation</emphasis></entry>
+                    <entry>
+                      <emphasis>Depreciation</emphasis>
+                    </entry>
 
-                    <entry><emphasis>Remaining Value</emphasis></entry>
+                    <entry>
+                      <emphasis>Remaining Value</emphasis>
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>0</entry>
+                    <entry>
+                      0
+                    </entry>
 
-                    <entry>-</entry>
+                    <entry>
+                      -
+                    </entry>
 
-                    <entry>1500</entry>
+                    <entry>
+                      1500
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>1</entry>
+                    <entry>
+                      1
+                    </entry>
 
-                    <entry>450</entry>
+                    <entry>
+                      450
+                    </entry>
 
-                    <entry>1050</entry>
+                    <entry>
+                      1050
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>2</entry>
+                    <entry>
+                      2
+                    </entry>
 
-                    <entry>315</entry>
+                    <entry>
+                      315
+                    </entry>
 
-                    <entry>735</entry>
+                    <entry>
+                      735
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>3</entry>
+                    <entry>
+                      3
+                    </entry>
 
-                    <entry>220.50</entry>
+                    <entry>
+                      220.50
+                    </entry>
 
-                    <entry>514.50</entry>
+                    <entry>
+                      514.50
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>4</entry>
+                    <entry>
+                      4
+                    </entry>
 
-                    <entry>154.35</entry>
+                    <entry>
+                      154.35
+                    </entry>
 
-                    <entry>360.15</entry>
+                    <entry>
+                      360.15
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>5</entry>
+                    <entry>
+                      5
+                    </entry>
 
-                    <entry>108.05</entry>
+                    <entry>
+                      108.05
+                    </entry>
 
-                    <entry>252.10</entry>
+                    <entry>
+                      252.10
+                    </entry>
                   </row>
                 </tbody>
               </tgroup>
-            </table></para>
+            </table>
+          </para>
 
           <note>
-            <para>Beware: Tax authorities may require (or allow) a larger
-            percentage in the first period. On the other hand, in Canada, this
-            is reversed, as they permit only a half share of <quote>Capital Cost
-            Allowance</quote> in the first year. The result of this approach is that
-            asset value decreases more rapidly at the beginning than at the
-            end which is probably more realistic for most assets than a linear
-            scheme. This is certainly true for automobiles.</para>
+            <para>Beware: Tax authorities may require (or allow) a larger percentage in the first period. On the other
+              hand, in Canada, this is reversed, as they permit only a half share of <quote>Capital
+              Cost Allowance</quote> in the first year. The result of this approach is that asset
+              value decreases more rapidly at the beginning than at the end which is probably more
+              realistic for most assets than a linear scheme. This is certainly true for
+              automobiles.
+            </para>
           </note>
         </listitem>
 
         <listitem>
-          <para><emphasis>Sum of digits</emphasis> is a front-weighted
-          depreciation scheme similar to the geometric depreciation, except
-          that the value of the asset reaches zero at the end of the period.
-          This is a front-weighted depreciation scheme, more depreciation
-          being applied early in the period. This method is most often
-          employed in Anglo/Saxon countries. Here is an illustration:</para>
-
-          <para>Example: First you divide the asset value by the sum of the
-          years of use, e.g. for our example from above with an asset worth
-          $1500 that is used over a period of five years you get
-          1500/(1+2+3+4+5)=100. Depreciation and asset value are then
-          calculated as follows:</para>
+          <para><emphasis>Sum of digits</emphasis> is a front-weighted depreciation scheme similar to the geometric
+            depreciation, except that the value of the asset reaches zero at the end of the period.
+            This is a front-weighted depreciation scheme, more depreciation being applied early in
+            the period. This method is most often employed in Anglo/Saxon countries. Here is an
+            illustration:
+          </para>
+
+          <para>Example: First you divide the asset value by the sum of the years of use, e.g. for our example from
+            above with an asset worth $1500 that is used over a period of five years you get
+            1500/(1+2+3+4+5)=100. Depreciation and asset value are then calculated as follows:
+          </para>
 
           <para><table>
               <title>Sum of Digits Depreciation Scheme Example</title>
@@ -383,63 +466,106 @@
               <tgroup cols="3">
                 <tbody>
                   <row>
-                    <entry><emphasis>Year</emphasis></entry>
+                    <entry>
+                      <emphasis>Year</emphasis>
+                    </entry>
 
-                    <entry><emphasis>Depreciation</emphasis></entry>
+                    <entry>
+                      <emphasis>Depreciation</emphasis>
+                    </entry>
 
-                    <entry><emphasis>Remaining Value</emphasis></entry>
+                    <entry>
+                      <emphasis>Remaining Value</emphasis>
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>0</entry>
+                    <entry>
+                      0
+                    </entry>
 
-                    <entry>-</entry>
+                    <entry>
+                      -
+                    </entry>
 
-                    <entry>1500</entry>
+                    <entry>
+                      1500
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>1</entry>
+                    <entry>
+                      1
+                    </entry>
 
-                    <entry>100*5=500</entry>
+                    <entry>
+                      100*5=500
+                    </entry>
 
-                    <entry>1000</entry>
+                    <entry>
+                      1000
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>2</entry>
+                    <entry>
+                      2
+                    </entry>
 
-                    <entry>100*4=400</entry>
+                    <entry>
+                      100*4=400
+                    </entry>
 
-                    <entry>600</entry>
+                    <entry>
+                      600
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>3</entry>
+                    <entry>
+                      3
+                    </entry>
 
-                    <entry>100*3=300</entry>
+                    <entry>
+                      100*3=300
+                    </entry>
 
-                    <entry>300</entry>
+                    <entry>
+                      300
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>4</entry>
+                    <entry>
+                      4
+                    </entry>
 
-                    <entry>100*2=200</entry>
+                    <entry>
+                      100*2=200
+                    </entry>
 
-                    <entry>100</entry>
+                    <entry>
+                      100
+                    </entry>
                   </row>
 
                   <row>
-                    <entry>5</entry>
+                    <entry>
+                      5
+                    </entry>
 
-                    <entry>100*1=100</entry>
+                    <entry>
+                      100*1=100
+                    </entry>
 
-                    <entry>0</entry>
+                    <entry>
+                      0
+                    </entry>
                   </row>
                 </tbody>
               </tgroup>
-            </table></para>
+            </table>
+          </para>
         </listitem>
       </orderedlist>
     </sect2>
@@ -448,30 +574,30 @@
   <sect1 id="dep_accounts1">
     <title>Account Setup</title>
 
-    <para>As with most accounting practices, there are a number of different
-    ways to setup depreciation accounts. We will present here a general method
-    which should be flexible enough to handle most situations. The first
-    account you will need is an <emphasis>Asset Cost</emphasis> account
-    (&app; account type <guilabel>Asset</guilabel>), which is simply a place where you record
-    the original purchase of the asset. Usually this purchase is accomplished
-    by a transaction from your bank account.</para>
-
-    <para>In order to keep track of the depreciation of the asset, you will
-    need two depreciation accounts. The first is an <emphasis>Accumulated
-    Depreciation</emphasis> account in which to collect the sum of all of the
-    depreciation amounts, and will contain negative values. In &app;, this
-    is an account type <emphasis>asset</emphasis>. The <emphasis>Accumulated Depreciation</emphasis>
-    account is balanced by a <emphasis>Depreciation Expense</emphasis> account,
-    in which all periodic depreciation expenses
-    are recorded. In &app;, this is an account type
-    <emphasis>expense</emphasis>.</para>
-
-    <para>Below is a generic account hierarchy for tracking the depreciation
-    of 2 assets, <emphasis>ITEM1</emphasis> and <emphasis>ITEM2</emphasis>. The <emphasis>Asset Cost</emphasis> accounts are balanced by
-    the <emphasis>Bank</emphasis> account, the <emphasis>Accumulated Depreciation</emphasis> account is balanced by
-    the <emphasis>Expenses:Depreciation</emphasis> account.</para>
-
-    <literallayout>
+    <para>As with most accounting practices, there are a number of different ways to setup depreciation
+      accounts. We will present here a general method which should be flexible enough to handle most
+      situations. The first account you will need is an <emphasis>Asset Cost</emphasis> account
+      (&app; account type <guilabel>Asset</guilabel>), which is simply a place where you record the
+      original purchase of the asset. Usually this purchase is accomplished by a transaction from
+      your bank account.
+    </para>
+
+    <para>In order to keep track of the depreciation of the asset, you will need two depreciation accounts.
+      The first is an <emphasis>Accumulated Depreciation</emphasis> account in which to collect the
+      sum of all of the depreciation amounts, and will contain negative values. In &app;, this is an
+      account type <emphasis>asset</emphasis>. The <emphasis>Accumulated Depreciation</emphasis>
+      account is balanced by a <emphasis>Depreciation Expense</emphasis> account, in which all
+      periodic depreciation expenses are recorded. In &app;, this is an account type
+      <emphasis>expense</emphasis>.
+    </para>
+
+    <para>Below is a generic account hierarchy for tracking the depreciation of 2 assets,
+      <emphasis>ITEM1</emphasis> and <emphasis>ITEM2</emphasis>. The <emphasis>Asset Cost</emphasis>
+      accounts are balanced by the <emphasis>Bank</emphasis> account, the <emphasis>Accumulated
+      Depreciation</emphasis> account is balanced by the <emphasis>Expenses:Depreciation</emphasis>
+      account.
+    </para>
+<screen>
 -Assets
    -Fixed Assets
       -ITEM1
@@ -483,51 +609,47 @@
    -Current Assets
       -Bank
 -Expense
-   -Depreciation        (Depreciation Expense account)
-  </literallayout>
-
-    <para>One of the features of the account hierarchy shown above is that you
-    can readily see some important summary values about your depreciating
-    asset. The <emphasis>Assets:Fixed Assets:ITEM1</emphasis> account total shows you the current
-    estimated value for item1, the <emphasis>Assets:Fixed Assets:ITEM1:Cost</emphasis> shows you
-    what you originally paid for item1, <emphasis>Assets:Fixed Assets:ITEM1:Depreciation</emphasis>
-    shows you your accrued depreciation for item1,
-    and finally, <emphasis>Expenses:Depreciation</emphasis> demonstrates the total accrued
-    depreciation of all your assets.</para>
-
-    <para>It is certainly possible to use a different account hierarchy. One
-    popular account setup is to combine the <emphasis>Asset Cost</emphasis>
-    and <emphasis>Accrued Depreciation</emphasis> asset accounts. This has the
-    advantage of having fewer accounts cluttering your account hierarchy, but
-    with the disadvantage that to determine some of the summary details
-    mentioned in the paragraph above you will have to open the account
-    register windows. As with most things, there are many ways to do it, find
-    a way that works best for you.</para>
-
-    <para>The actual input of the depreciation amounts is done by hand every
-    accounting period. There is no way in &app; (as of yet) to perform the
-    depreciation scheme calculations automatically, or to input the values
-    automatically into the appropriate accounts. However, since an accounting
-    period is typically one year, this really is not much work to do by
-    hand.</para>
+   -Depreciation        (Depreciation Expense account)</screen>
+    <para>One of the features of the account hierarchy shown above is that you can readily see some important
+      summary values about your depreciating asset. The <emphasis>Assets:Fixed
+      Assets:ITEM1</emphasis> account total shows you the current estimated value for item1, the
+      <emphasis>Assets:Fixed Assets:ITEM1:Cost</emphasis> shows you what you originally paid for
+      item1, <emphasis>Assets:Fixed Assets:ITEM1:Depreciation</emphasis> shows you your accrued
+      depreciation for item1, and finally, <emphasis>Expenses:Depreciation</emphasis> demonstrates
+      the total accrued depreciation of all your assets.
+    </para>
+
+    <para>It is certainly possible to use a different account hierarchy. One popular account setup is to
+      combine the <emphasis>Asset Cost</emphasis> and <emphasis>Accrued Depreciation</emphasis>
+      asset accounts. This has the advantage of having fewer accounts cluttering your account
+      hierarchy, but with the disadvantage that to determine some of the summary details mentioned
+      in the paragraph above you will have to open the account register windows. As with most
+      things, there are many ways to do it, find a way that works best for you.
+    </para>
+
+    <para>The actual input of the depreciation amounts is done by hand every accounting period. There is no
+      way in &app; (as of yet) to perform the depreciation scheme calculations automatically, or to
+      input the values automatically into the appropriate accounts. However, since an accounting
+      period is typically one year, this really is not much work to do by hand.
+    </para>
   </sect1>
 
   <sect1 id="dep_example1">
     <title>Example</title>
 
-    <para>Let’s go ahead and step through an example. Imagine you are a
-    photographer and you use a car and an expensive camera for your personal
-    business. You will want to track the depreciation on these items, because
-    you can probably deduct the depreciation from your business taxes.</para>
+    <para>Let’s go ahead and step through an example. Imagine you are a photographer and you use a car
+      and an expensive camera for your personal business. You will want to track the depreciation on
+      these items, because you can probably deduct the depreciation from your business taxes.
+    </para>
 
-    <para>The first step is to build the account hierarchy (as shown in the
-    previous section, replace <emphasis>ITEM1</emphasis> and <emphasis>ITEM2</emphasis> with <quote>car</quote> and <quote>camera</quote>). Now,
-    record the purchase of your assets by transferring the money from your
-    bank account to the appropriate <emphasis>Asset Cost</emphasis> accounts
-    for each item (eg: the <emphasis>Assets:Fixed Assets:Car:Cost</emphasis> account for the
-    car). In this example, you start with $30k in the bank, the car cost $20k
-    and the camera cost $10k and were both purchased on January 1,
-    2000.</para>
+    <para>The first step is to build the account hierarchy (as shown in the previous section, replace
+      <emphasis>ITEM1</emphasis> and <emphasis>ITEM2</emphasis> with <quote>car</quote> and
+      <quote>camera</quote>). Now, record the purchase of your assets by transferring the money from
+      your bank account to the appropriate <emphasis>Asset Cost</emphasis> accounts for each item
+      (eg: the <emphasis>Assets:Fixed Assets:Car:Cost</emphasis> account for the car). In this
+      example, you start with $30k in the bank, the car cost $20k and the camera cost $10k and were
+      both purchased on January 1, 2000.
+    </para>
 
     <screenshot id="dep_example">
       <mediaobject>
@@ -540,26 +662,27 @@
           <phrase>Asset Depreciation Example1</phrase>
         </textobject>
 
-        <caption><para>The asset depreciation example main window, before
-        depreciation </para></caption>
+        <caption>
+          <para>The asset depreciation example main window, before depreciation
+          </para>
+        </caption>
       </mediaobject>
     </screenshot>
 
-    <para>Looking at the tax codes, we realize that we must report
-    depreciation on these items using the <quote>sum of digits</quote> scheme, over a 5
-    year period. So, the yearly depreciation amounts for the car come to
-    $6667, $5333, $4000, $2667, $1333 for years 1 to 5 respectively, rounded
-    to the nearest dollar. The yearly depreciation amounts for the camera are
-    $3333, $2667, $2000, $1333, $667. Consult the previous section on
-    Depreciation Schemes for the formula for calculating these values.</para>
-
-    <para>For each accounting period (IE: fiscal year) you record the
-    depreciation as an expense in the appropriate <emphasis>Accrued
-    Depreciation</emphasis> account (eg: the <emphasis>Assets:Fixed Assets:Car:Depreciation</emphasis>
-    account for the car). The two windows below show
-    your car’s accrued depreciation account and the main window after the
-    third year (IE: three periods) of depreciation using this <guilabel>sum of digits</guilabel>
-    scheme.</para>
+    <para>Looking at the tax codes, we realize that we must report depreciation on these items using the
+      <quote>sum of digits</quote> scheme, over a 5 year period. So, the yearly depreciation amounts
+      for the car come to $6667, $5333, $4000, $2667, $1333 for years 1 to 5 respectively, rounded
+      to the nearest dollar. The yearly depreciation amounts for the camera are $3333, $2667, $2000,
+      $1333, $667. Consult the previous section on Depreciation Schemes for the formula for
+      calculating these values.
+    </para>
+
+    <para>For each accounting period (IE: fiscal year) you record the depreciation as an expense in the
+      appropriate <emphasis>Accrued Depreciation</emphasis> account (eg: the <emphasis>Assets:Fixed
+      Assets:Car:Depreciation</emphasis> account for the car). The two windows below show your
+      car’s accrued depreciation account and the main window after the third year (IE: three
+      periods) of depreciation using this <guilabel>sum of digits</guilabel> scheme.
+    </para>
 
     <screenshot id="dep_assetreg">
       <mediaobject>
@@ -572,8 +695,10 @@
           <phrase>Asset Depreciation Register Window</phrase>
         </textobject>
 
-        <caption><para>The asset depreciation register window
-        </para></caption>
+        <caption>
+          <para>The asset depreciation register window
+          </para>
+        </caption>
       </mediaobject>
     </screenshot>
 
@@ -588,18 +713,20 @@
           <phrase>Asset Depreciation Main Window</phrase>
         </textobject>
 
-        <caption><para>The asset depreciation main window </para></caption>
+        <caption>
+          <para>The asset depreciation main window
+          </para>
+        </caption>
       </mediaobject>
     </screenshot>
 
     <note>
-      <para>A Word of Caution: Since depreciation and tax issues are closely
-      related, you may not always be free in choosing your preferred method.
-      Fixing wrong calculations will cost a whole lot more time and trouble
-      than getting the calculations right the first time, so if you plan to
-      depreciate assets, it is wise to make sure of the schemes you will be
-      permitted or required to use.</para>
+      <para>A Word of Caution: Since depreciation and tax issues are closely related, you may not always be free
+        in choosing your preferred method. Fixing wrong calculations will cost a whole lot more time
+        and trouble than getting the calculations right the first time, so if you plan to depreciate
+        assets, it is wise to make sure of the schemes you will be permitted or required to use.
+      </para>
     </note>
   </sect1>
-  -->
+   -->
 </chapter>
diff --git a/guide/de/ch_invest.xml b/guide/de/ch_invest.xml
index 14c5d79..8c8c084 100644
--- a/guide/de/ch_invest.xml
+++ b/guide/de/ch_invest.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: December 7th 2009 (Englisch 2016-10-27)
        modified: January 10th 2007
        modified: July 9th 2006
-  Maintainers: 
-               Alex Aycinena <alex.aycinena at gmail.com>
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Alex Aycinena <alex.aycinena at gmail.com>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-        Jon Lapham <lapham at extracta.com.br>
-    Updated Dave Herman <dvherman at bigfoot.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Dave Herman <dvherman at bigfoot.com>
   Originally designed by Carol Champagne.
   Translators:
-               Mechtilde Stehmann <ooo at mechtilde.de>
+    Mechtilde Stehmann <ooo at mechtilde.de>
 -->
 <chapter id="chapter_invest">
   <title>Kapitalanlagen</title>
@@ -205,8 +204,8 @@
           <term><emphasis>Wertbestimmung</emphasis></term>
 
           <listitem>
-            <para>Dies ist der Prozess der Festlegung des Marktwertes oder des Preises, den die Kapitalanlage bei einem
-              Verkauf in einem <quote>zumutbaren Zeitrahmen </quote> erzielen würde.
+            <para>Dies ist der Prozess der Festlegung des Marktwertes oder des Preises, den die Kapitalanlage bei
+              einem Verkauf in einem <quote>zumutbaren Zeitrahmen </quote> erzielen würde.
             </para>
           </listitem>
         </varlistentry>
@@ -389,7 +388,8 @@
 
       <para>In einer üblichen Kontenstruktur sind Wertpapierkonten Unterkonten des Aktivkontos, das nach dem
         Konto der Maklerfirma benannt ist. Das Maklerkonto würde in Ihrer lokalen Währung
-        ausgewiesen und würde Unterkonten für jedes Wertpapier enthalten, welches Sie dort handeln.
+        ausgewiesen und würde Unterkonten für jedes Wertpapier enthalten, welches Sie dort
+        handeln.
       </para>
 
       <para>Die dazugehörigen An- und Verkaufskonten, Ertrags- und Aufwandskonten sollten auch in der gleichen
@@ -422,7 +422,7 @@
         Art und Weise ist es einfacher, die Aufstellungen, die Sie von Ihrer Maklerfirma erhalten,
         mit den Konten zu vergleichen, die Sie in &app; haben, und zu erkennen, wo &app; von der
         Aufstellung abweicht.
-<literallayout>
+<screen>
  Aktiva
     Investments
        Brokerage Accounts
@@ -469,8 +469,7 @@
           My Stockbroker
        Management Fees
           I*Trade
-          My Stockbroker
- </literallayout>
+          My Stockbroker</screen>
       </para>
 
       <tip>
@@ -501,7 +500,7 @@
         Kontenlayouts, in welchem Sie ein verzinsliches Sparkonto und festverzinsliche Wertpapiere
         bei Ihrer Bank haben.
       </para>
-<literallayout>
+<screen>
 Aktiva
    Bank ABC
       festverzinsliche Wertpapiere
@@ -512,8 +511,7 @@ Aufwendungen
 Einnahmen
    Zinseinnahmen
       festverzinsliche Wertpapiere
-      Banksparguthaben
-  </literallayout>
+      Banksparguthaben</screen>
       <para>Wie üblich stellt diese Kontenhierarchie ein Beispiel dar; Sie sollten Ihre eigenen Konten so
         darstellen, wie sie am Besten zu Ihrer aktuellen Situation passt.
       </para>
@@ -635,9 +633,9 @@ Einnahmen
 
       <para>Auf dem obigen Bild des Hauptkontenfenster von &app; sehen Sie eine schöne Zusammenfassung über
         das, was mit dieser Kapitalanlage in 6 Monaten passiert. Während die Verzinsung der
-        festverzinslichen Wertpapiere doppelt so hoch ist wie die des Sparkontos, war der Ertrag
-        des festverzinslichen Wertpapiers 50,21 € gegenüber 13,03 € des Sparkontos oder fast 4
-        Mal so viel. Warum? Wegen der ärgerlichen 2,- € Bankgebühren, die das Sparkonto treffen
+        festverzinslichen Wertpapiere doppelt so hoch ist wie die des Sparkontos, war der Ertrag des
+        festverzinslichen Wertpapiers 50,21 € gegenüber 13,03 € des Sparkontos oder fast 4 Mal
+        so viel. Warum? Wegen der ärgerlichen 2,- € Bankgebühren, die das Sparkonto treffen
         (welche sich auf 12,- € über 6 Monate aufsummieren).
       </para>
 
@@ -680,7 +678,7 @@ Einnahmen
         jeweils für Ihre Amazon-, IBM- und NSTAR-Aktien nennen. Unten ist eine Vorlage für den
         Entwurf (zeigt nur die Aktiva Unterkonten).
       </para>
-<literallayout>
+<screen>
  Aktiva
     Kapitalanlagen
        Brokerage Accounts
@@ -690,8 +688,7 @@ Einnahmen
           Aktie
              AMZN
              IBM
-             NST
- </literallayout>
+             NST</screen>
       <note>
         <para>Wenn Sie Ihr Einkommen verfolgen wollen (Dividenden/Zinsen/Veräußerungsgewinne) auf der Basis
           einzelner Aktien oder Fonds, müssen Sie ein
@@ -1226,10 +1223,9 @@ Einnahmen
         </mediaobject>
       </screenshot>
 
-      <para>Klicken Sie <guibutton>OK</guibutton> zum Beenden. Wenn Sie diese Anfangseinstellung des
-        Wertpapiers im <guilabel>Kurs-Editor</guilabel> durchgeführt haben, müssen Sie diese
-        nicht nochmals durchführen, selbst wenn Sie das gleiche Wertpapier auf einem anderen Konto
-        nutzen.
+      <para>Klicken Sie <guibutton>OK</guibutton> zum Beenden. Wenn Sie diese Anfangseinstellung des Wertpapiers
+        im <guilabel>Kurs-Editor</guilabel> durchgeführt haben, müssen Sie diese nicht nochmals
+        durchführen, selbst wenn Sie das gleiche Wertpapier auf einem anderen Konto nutzen.
       </para>
 
       <note>
@@ -1317,8 +1313,8 @@ Einnahmen
           <emphasis role="strong">Finance Quote aktualisieren </emphasis> App in &app;.dmg. Sie
           können es von dem *.dmg starten oder kopieren es in den gleichen Ordner, in den Sie &app;
           kopiert haben. Es öffnet ein Terminalfenster und startet ein Script für Sie, welches
-          Ihnen viele Fragen stellt. Akzeptieren Sie die Voreinstellungen, es sei denn, Sie wissen, was Sie
-          tun.
+          Ihnen viele Fragen stellt. Akzeptieren Sie die Voreinstellungen, es sei denn, Sie wissen,
+          was Sie tun.
         </para>
 
         <para><emphasis role="strong">Linux:</emphasis>
@@ -1370,9 +1366,9 @@ Einnahmen
         <title>Wertpapiere für die Online-Abfrage konfigurieren</title>
 
         <para>Wenn <application>Finance::Quote</application> installiert ist und korrekt arbeitet, müssen Sie
-          Ihre &app; Wertpapiere so konfigurieren, dass diese Funktion verwendet wird, um die aktuellen
-          Preisinformationen automatisch zu erhalten. Falls Sie neue Wertpapiere erstellen oder
-          Wertpapiere abändern, die bereits erstellt wurden, nutzen Sie
+          Ihre &app; Wertpapiere so konfigurieren, dass diese Funktion verwendet wird, um die
+          aktuellen Preisinformationen automatisch zu erhalten. Falls Sie neue Wertpapiere erstellen
+          oder Wertpapiere abändern, die bereits erstellt wurden, nutzen Sie
           <menuchoice>
             <guimenu>Werkzeuge</guimenu><guimenuitem>Wertpapier-Editor</guimenuitem>
           </menuchoice>
@@ -1407,9 +1403,9 @@ Einnahmen
         </para>
 
         <para>Erinnern Sie sich, dass die <quote>Kurse</quote> der Investmentfonds tatsächlich
-          <quote>NettoAnteilsWerte</quote> und erst mehrere Stunden nach Schließung der Devisenmärkte
-          verfügbar sind. Wenn die <acronym>NAW</acronym>s heruntergeladen werden, bevor die
-          <acronym>NAW</acronym>s vom laufenden Tag festgelegt sind, werden die gestrigen
+          <quote>NettoAnteilsWerte</quote> und erst mehrere Stunden nach Schließung der
+          Devisenmärkte verfügbar sind. Wenn die <acronym>NAW</acronym>s heruntergeladen werden,
+          bevor die <acronym>NAW</acronym>s vom laufenden Tag festgelegt sind, werden die gestrigen
           <acronym>NAW</acronym>s abgerufen.
         </para>
       </sect3>
@@ -3444,9 +3440,9 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         Aktien eingetragen.
       </para>
 
-      <para>Die Bedingungen für den Zusammenschluss waren: 0,77942 SBC Aktien wurden für jede AT&T
-        Aktien eingetauscht. Die zusammengeschlossene Gesellschaft setzte die Nutzung des
-        Aktienkürzel <quote>T</quote> von AT&T fort.
+      <para>Die Bedingungen für den Zusammenschluss waren: 0,77942 SBC Aktien wurden für jede AT&T Aktien
+        eingetauscht. Die zusammengeschlossene Gesellschaft setzte die Nutzung des Aktienkürzel
+        <quote>T</quote> von AT&T fort.
       </para>
 
       <para>AT&T zahlte eine <quote>Dividende</quote> von 1,20 € pro Aktie an diesem Stichtag, aber dies
diff --git a/guide/de/ch_loans.xml b/guide/de/ch_loans.xml
index b18f644..76d473d 100644
--- a/guide/de/ch_loans.xml
+++ b/guide/de/ch_loans.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0 / 2.6 maint
   Last modified: July 9th 2006 (Englisch 2015-09-08)
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-        Jon Lapham <lapham at extracta.com.br>
-    Updated Bengt Thuree <bengt at thuree.com>
+    Jon Lapham <lapham at extracta.com.br>
+  	Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               Martin Mainka <martin at mainka-it.de>
-               Mechtilde Stehmann<ooo at mechtilde.de>
+    Martin Mainka <martin at mainka-it.de>
+    Mechtilde Stehmann<ooo at mechtilde.de>
 -->
 <chapter id="chapter_loans">
   <title>Darlehen</title>
@@ -67,8 +66,7 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>Säumniszuschlag</emphasis> - ist die vereinbarte Bedingung für verspätete
-            Rückzahlung.
+          <para><emphasis>Säumniszuschlag</emphasis> - ist die vereinbarte Bedingung für verspätete Rückzahlung.
           </para>
         </listitem>
 
@@ -101,8 +99,8 @@
         <listitem>
           <para><emphasis>Darlehensbetrag</emphasis> – Der ursprüngliche Darlehensbetrag oder der Anteil des
             Darlehens, der noch geschuldet wird. Wenn Sie monatliche Raten für das Darlehen
-            bezahlen, ist ein Teil davon für die Zahlung des Zinses und ein Teil ist für die Rückzahlung
-            des Darlehensbetrags.
+            bezahlen, ist ein Teil davon für die Zahlung des Zinses und ein Teil ist für die
+            Rückzahlung des Darlehensbetrags.
           </para>
         </listitem>
 
@@ -134,8 +132,7 @@
       Gegenstand, der mit dem Geld des Darlehens gekauft wird, ist ein Aktiva. Mit diesen Parametern
       können wir jetzt die grundlegende Kontohierarchie für Darlehen aufzeigen.
     </para>
-<literallayout>
-Grundlegende Kontostrukturen für Darlehen
+<screen>Grundlegende Kontostrukturen für Darlehen
 
 -Aktiva
     -Umlaufvermögen
@@ -148,8 +145,7 @@ Grundlegende Kontostrukturen für Darlehen
 -Aufwendungen
     -Zinsen
         -Hypothekenzinsen
-    -Hypothekengebühren
-   </literallayout>
+    -Hypothekengebühren</screen>
     <para>&app; besitzt eine Anzahl vordefinierter Kontostrukturen für Darlehen, wie zum Beispiel
       Autodarlehen und sonstige Darlehen. Um diese vorgefertigten Kontostrukturen zu nutzen, klicken
       Sie auf <guimenu>Aktionen</guimenu> <guimenuitem>Kontenhierarchie hinzufügen</guimenuitem>
@@ -291,7 +287,7 @@ Grundlegende Kontostrukturen für Darlehen
       <para>Für die Besprechungen der mathematischen Formeln, die durch den
         <guilabel>Darlehensrechner</guilabel> benutzt werden definieren wir erst die folgenden
         Variablen.
-<literallayout>
+<screen>
  n   == Anzahl der Zahlungsperioden
  %i  == nominaler Zinssatz
  PV  == aktueller Wert
@@ -301,18 +297,17 @@ Grundlegende Kontostrukturen für Darlehen
  PF  == Zahlungsperiode pro Jahr
 
 Normale Werte für CF und PF sind:
-  1   == jährlich
-  2   == halbjährlich
-  3   == dreimal im Jahr
-  4   == vierteljährlich
-  6   == alle zwei Monate
+   1  == jährlich
+   2  == halbjährlich
+   3  == dreimal im Jahr
+   4  == vierteljährlich
+   6  == alle zwei Monate
   12  == monatlich
   24  == halb monatlich
   26  == alle zwei Wochen
   52  == wöchentlich
-  360 == täglich (12 x 30 Tage)
-  365 == täglich
-</literallayout>
+ 360  == täglich (12 x 30 Tage)
+ 365  == täglich</screen>
       </para>
 
       <sect3 id="loans_calcsdetails_i2">
@@ -325,15 +320,13 @@ Normale Werte für CF und PF sind:
           Deshalb benötigen wir Funktionen, die den nominalen Zinssatz in den effektiven Zinssatz,
           und den effektiven Zinssatz in den Nominalzinssatz umrechnen.
         </para>
-<literallayout>
-Zur Umrechnung von i nach ieff werden folgende Formeln genutzt:
+<screen>Zur Umrechnung von i nach ieff werden folgende Formeln genutzt:
 schrittweise Verzinsung:     <emphasis>ieff = (1 + i/CF)^(CF/PF) - 1</emphasis>
 kontinuierliche Verzinsung:  <emphasis>ieff = e^(i/PF) - 1 = exp(i/PF) - 1</emphasis>
 
 Zur Umrechnung von ieff nach i werden folgende Formeln genutzt:
 schrittweise Verzinsung:     <emphasis>i = CF*[(1+ieff)^(PF/CF) - 1]</emphasis>
-kontinuierliche Verzinsung:  <emphasis>i = ln[(1+ieff)^PF]</emphasis>
-        </literallayout>
+kontinuierliche Verzinsung:  <emphasis>i = ln[(1+ieff)^PF]</emphasis></screen>
         <note>
           <para>In den unten stehenden Gleichungen für Geldgeschäfte sind alle Zinssätze die effektiven
             Zinssätze, <quote>ieff</quote>. Aus Gründen der Kürze wird statt <quote>ieff</quote>
@@ -348,18 +341,17 @@ kontinuierliche Verzinsung:  <emphasis>i = ln[(1+ieff)^PF]</emphasis>
         <para>Eine Gleichung verbindet alle fünf genannten Variablen. Diese ist bekannt als die grundlegende
           Finanzgleichung:
         </para>
-<literallayout>
+<screen>
 <emphasis>PV*(1 + i)^n + PMT*(1 + iX)*[(1+i)^n - 1]/i + FV = 0</emphasis>
 
 Dabei ist:  X = 0 für Zahlungen am Ende des Zeitraums und
-            X = 1 für Zahlungen am Anfang des Zeitraums.
-         </literallayout>
+            X = 1 für Zahlungen am Anfang des Zeitraums.</screen>
         <para>Aus dieser Gleichung können Funktionen abgeleitet werden, um einzelne Variablen zu berechnen. Für
           eine ausführliche Beschreibung der Ableitung dieser Gleichungen lesen Sie bitte die
           Kommentare in der Datei src/calculation/fin.c im &app; Quelltext. Die Variablen A, B, und
           C werden zuerst definiert, um die nachfolgenden Gleichungen übersichtlicher zu machen.
         </para>
-<literallayout>
+<screen>
 <emphasis>A = (1 + i)^n - 1</emphasis>
 <emphasis>B = (1 + iX)/i</emphasis>
 <emphasis>C = PMT*B</emphasis>
@@ -372,8 +364,7 @@ Dabei ist:  X = 0 für Zahlungen am Ende des Zeitraums und
 Die Auflösung nach dem Zinssatz wird in zwei Fälle unterteilt.
 Der einfache Fall mit PMT == 0 ergibt die Gleichung:
 <emphasis>i = [FV/PV]^(1/n) - 1</emphasis>
-
-         </literallayout>
+</screen>
         <para>Der Fall, wo PMT != 0 ist ziemlich komplex und wird hier nicht behandelt. Statt eine exakt lösbare
           Funktionen zur Bestimmung des Zinssatzes für den Fall PMT !=0 zu benutzen, wird ein
           interaktiver Prozess verwendet. Bitte lesen Sie die Datei src/calculation/fin.c für eine
@@ -580,7 +571,7 @@ Der einfache Fall mit PMT == 0 ergibt die Gleichung:
 
     <para>Dieses Beispiel basiert auf den folgenden allgemeinen Kontostrukturen.
     </para>
-<literallayout>
+<screen>
 -Aktiva
     -Bank
       -Bankkonto
@@ -588,8 +579,7 @@ Der einfache Fall mit PMT == 0 ergibt die Gleichung:
       -Person
 -Ertrag
     -Zinsertrag
-      -Person
-    </literallayout>
+      -Person</screen>
     <para>Dieses Beispiel zeigt, wie Sie die Entwicklung eines persönlichen Darlehens von 2.000,- € an
       Ihren Freund Peter verfolgen
     </para>
@@ -667,12 +657,11 @@ Der einfache Fall mit PMT == 0 ergibt die Gleichung:
       <para>Wir beginnen mit folgender Kontenhierarchie (alle Konten haben dieselbe Währung, in diesem Fall
         Euro)
       </para>
-<literallayout>
+<screen>
 Aktiva:Bank:EUR
 Aktiva:Ihnen geschuldetes Geld:Peter
 Ertrag: Zinsertrag:Peter
-Vermögen:Anfangskontostand:EUR
-</literallayout>
+Vermögen:Anfangskontostand:EUR</screen>
     </sect2>
 
     <sect2 id="loans_personalLoanToSomeOne_InitialSetup">
@@ -907,7 +896,7 @@ Vermögen:Anfangskontostand:EUR
       andere Kontobezeichnungen und andere Zinskonditionen.
     </para>
 
-    <para><literallayout>Grundlegende Kontostrukturen für Darlehen
+    <para><screen>Grundlegende Kontostrukturen für Darlehen
 
 -Aktiva
     -Umlaufvermögen
@@ -920,7 +909,7 @@ Vermögen:Anfangskontostand:EUR
 -Aufwendungen
     -Zinsen
         -Zinsen Kfz-Darlehen
-    -Gebühren Kfz-Darlehen</literallayout>
+    -Gebühren Kfz-Darlehen</screen>
     </para>
 
     <para>Weitere Informationen finden Sie unter <xref linkend=
@@ -978,7 +967,7 @@ Vermögen:Anfangskontostand:EUR
         durch das Kfz-Konto.
       </para>
 
-      <para><literallayout>
+      <para><screen>
 -Aktiva
     -Anlagevermögen
         -Haus
@@ -986,8 +975,7 @@ Vermögen:Anfangskontostand:EUR
         -Sparkonto
 -Ertrag
     -langfristige Kapitalerträge
-        -Haus
-      </literallayout>
+        -Haus</screen>
       </para>
 
       <itemizedlist>
@@ -1156,7 +1144,7 @@ Vermögen:Anfangskontostand:EUR
         bitte <xref linkend="chapter_capgain"></xref>.
       </para>
 
-      <para><literallayout>
+      <para><screen>
         -Aktiva
             -Anlagevermögen
                 -Haus
@@ -1168,8 +1156,7 @@ Vermögen:Anfangskontostand:EUR
             -realisierter Gewinn
                 -Haus
             -unrealisierter Gewinn
-                -Haus
-        </literallayout>
+                -Haus</screen>
       </para>
 
       <para>Vor einiger Zeit haben Sie ein Haus für 300.000,- € gekauft und während der Jahre haben Sie den
@@ -1307,16 +1294,15 @@ Vermögen:Anfangskontostand:EUR
       </para>
 
       <para>Nach Eingabe dieser Buchung sehen Sie, dass Ihr Hausvermögen jetzt den Wert null hat, der Betrag
-        auf Ihrem Sparkonto wurde um 600.000,- € erhöht und zuletzt hat sich der Betrag
-        unter <emphasis>Ertrag:realisierter Gewinn</emphasis> auf 300.000,- € erhöht.
+        auf Ihrem Sparkonto wurde um 600.000,- € erhöht und zuletzt hat sich der Betrag unter
+        <emphasis>Ertrag:realisierter Gewinn</emphasis> auf 300.000,- € erhöht.
       </para>
     </sect2>
   </sect1>
 <!--
   <sect1 id="loans_missing1">
     <title>Missing Loan Documentation</title>
-
-    <literallayout>
+<screen>
  -Entering a Payment Schedule
      -Monthly Payments (Wie wird es gemacht)
        -See the Mortgage assistant
@@ -1326,8 +1312,7 @@ Vermögen:Anfangskontostand:EUR
        -Same as a normal payment, but you get the figures from the bank
        -How to fix 10 amortization and then a final bulk payment setup?
 
- -Putting It All Together
- </literallayout>
+ -Putting It All Together</screen>
   </sect1>
 -->
 </chapter>
diff --git a/guide/ja/appendixa.xml b/guide/ja/appendixa.xml
index 2cfec3a..b8f0874 100644
--- a/guide/ja/appendixa.xml
+++ b/guide/ja/appendixa.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
 
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixa">
   <title>移行ガイド</title>
@@ -84,29 +83,41 @@ class="registered">Quicken</trademark>および類似のプログラムでは、
           伝統的なので<acronym>URL</acronym>を使用しています
           (そのような若い技術と言われるかもしれないですが!)。
         </para>
-<literallayout>
+        <important>
+          <para>If the file was last modified by a version of &app; older than 2.0, then before you continue to the
+            next step you will need to modify the working file’s <gnc-v2> tag to read
+            something like this:
+<programlisting language="xml">
 <gnc-v2 xmlns:cd="http://www.gnucash.org/XML/cd"
-        xmlns:book="http://www.gnucash.org/XML/book"
-        xmlns:gnc="http://www.gnucash.org/XML/gnc"
-        xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
-        xmlns:trn="http://www.gnucash.org/XML/trn"
-        xmlns:split="http://www.gnucash.org/XML/split"
-        xmlns:act="http://www.gnucash.org/XML/act"
-        xmlns:price="http://www.gnucash.org/XML/price"
-        xmlns:ts="http://www.gnucash.org/XML/ts"
-        xmlns:slot="http://www.gnucash.org/XML/kvpslot"
-        xmlns:cust="http://www.gnucash.org/XML/cust"
-        xmlns:entry="http://www.gnucash.org/XML/entry"
-        xmlns:lot="http://www.gnucash.org/XML/lot"
-        xmlns:invoice="http://www.gnucash.org/XML/invoice"
-        xmlns:owner="http://www.gnucash.org/XML/owner"
-        xmlns:job="http://www.gnucash.org/XML/job"
-        xmlns:billterm="http://www.gnucash.org/XML/billterm"
-        xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
-        xmlns:sx="http://www.gnucash.org/XML/sx"
-        xmlns:fs="http://www.gnucash.org/XML/fs"
-        xmlns:addr="http://www.gnucash.org/XML/custaddr">
- </literallayout>
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:slot="http://www.gnucash.org/XML/kvpslot"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:addr="http://www.gnucash.org/XML/custaddr">
+</programlisting>
+          </para>
+        </important>
+
+        <note>
+          <para>You can put pretty much anything you want behind the equal signs, but a unique
+            <acronym>URL</acronym> is what is typically used.
+          </para>
+        </note>
       </listitem>
 
       <listitem>
diff --git a/guide/ja/appendixc.xml b/guide/ja/appendixc.xml
index e11945d..6cfc378 100644
--- a/guide/ja/appendixc.xml
+++ b/guide/ja/appendixc.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   Originally designed by Carol Champagne.
-  Translators: Yasuaki Taniguchi <yasuakit at gmail.com>
-               (translators put your name and email here)
+  Translators:
+    Yasuaki Taniguchi <yasuakit at gmail.com>
 -->
 <appendix id="appendixc">
   <title>寄付された勘定科目ツリー</title>
@@ -81,7 +80,7 @@
     <para>資本設備(ボックス7 の一部)と(ボックス6
       の一部)は、付加価値税返金期間でのすべての*加算*(購入)金額です。差異が完全な新規の購入のためでないなら、金額の絶対値でも金額の変化でもありません。そして、減価償却費、損失、(例:不完全な商品の清算)、可変資本における営業外費用は含まれていません。あなたが資本設備を売却する場合、その売却とその付加価値税は収益として記録されます。資産が「お金に変換」され、請求の支払があった時に銀行預金口座の「付加価値税の総額」が増加します。これは資本の減少と一致します。
     </para>
-<literallayout>
+<screen>
 銀行預金口座 [B]
   |___ 主口座
   |___ 積立金口座
@@ -157,8 +156,6 @@
                     |___  ソフトウェア
                     |___  定期購読
                     |___  雑費
-                    |___  出張費/宿泊費
-
-</literallayout>
+                    |___  出張費/宿泊費</screen>
   </sect1>
 </appendix>
diff --git a/guide/ja/appendixd.xml b/guide/ja/appendixd.xml
index 64006f9..4425c97 100644
--- a/guide/ja/appendixd.xml
+++ b/guide/ja/appendixd.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: March 18th, 2007
-  Maintainers: 
-                Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-                David Hampton <hampton at employees.org>
+    David Hampton <hampton at employees.org>
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixd">
   <title>補助ファイル形式</title>
@@ -39,10 +38,15 @@
         dialog. The first location is typically
         <filename class="directory">/usr/share/gnucash/checks</filename>, where check files
         distributed with the application can be found. The second location is the user private
-        <filename class="directory">~/.gnucash/checks</filename> directory. Users may add check
-        formats at any time (even while &app; is running) simply by dropping a new
-        <filename>*.chk</filename> file in this directory. The next time the check printing dialog
-        is opened the new check format will appear in the list of available check formats.
+        <filename class="directory">&dir-data;checks</filename>
+        <footnote id="dir-old-chk">
+          <para>Up to &app; 2.6.21 it was <filename class="directory">&dir-old;checks</filename>
+          </para>
+        </footnote>
+        directory. Users may add check formats at any time (even while &app; is running) simply by
+        dropping a new <filename>*.chk</filename> file in this directory. The next time the check
+        printing dialog is opened the new check format will appear in the list of available check
+        formats.
       </para>
 
       <note>
@@ -60,8 +64,7 @@
       <para>A typical &app; check file is presented below. The contents of this file will be described in the
         next sections.
       </para>
-<programlisting>
-[Top]
+<programlisting language="ini">[Top]
 Guid = 67b144d1-96a5-48d5-9337-0e1083bbf229
 Title = Quicken/QuickBooks (tm) US-Letter
 Rotation = 0.0
@@ -88,8 +91,7 @@ Type_4 = DATE
 Coords_4 = 500.0;67.0
 
 Type_5 = NOTES
-Coords_5 = 50.0;212.0
-        </programlisting>
+Coords_5 = 50.0;212.0</programlisting>
     </sect2>
 
     <sect2>
@@ -551,9 +553,9 @@ Coords_5 = 50.0;212.0
 
                 <entry>
                   If supplied, this is the alignment used to print this specific text item. This
-                  field must contain one of the strings "left", "center" or "right". If this field
-                  is omitted, the text will be left aligned. This field is only recognized when
-                  using gtk version 2.10 or later.
+                  field must contain one of the strings <quote>left</quote>, <quote>center</quote>
+                  or <quote>right</quote>. If this field is omitted, the text will be left aligned.
+                  This field is only recognized when using gtk version 2.10 or later.
                 </entry>
               </row>
 
@@ -595,10 +597,11 @@ Coords_5 = 50.0;212.0
                   string may specify either an absolute path name or as a relative path name. If a
                   relative path name is specified, &app; first looks in in the application check
                   format folder (typically
-                  <filename class="directory">/usr/share/gnucash/checks</filename>) for the image
-                  file, and if it isn’t found there then it looks in the user private
-                  <filename class="directory">~/.gnucash/checks</filename> directory for the image.
-                  This field is only recognized when using gtk version 2.10 or later.
+                  <filename class="directory">/usr/share/gnucash/checks</filename> ) for the image
+                  file, and if it is not found there then it looks in the user private
+                  <filename class="directory">&dir-data;checks</filename><footnoteref linkend="dir-old-chk" />
+                  directory for the image. This field is only recognized when using gtk version 2.10
+                  or later.
                 </entry>
               </row>
 
@@ -687,8 +690,7 @@ Coords_5 = 50.0;212.0
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -710,8 +712,7 @@ Blocking_Chars
 <literallayout>Font
 Align
 Blocking_Chars
-DateFormat
-                    </literallayout>
+DateFormat</literallayout>
                 </entry>
 
                 <entry>
@@ -731,8 +732,7 @@ DateFormat
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -753,13 +753,20 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
                   This type value tells &app; to print the check number at the specified
-                  coordinates.
+                  coordinates. The check number reflects the book option selection under
+                  <menuchoice>
+                    <guimenu>File</guimenu><guimenuitem>Properties </guimenuitem>
+                  </menuchoice>
+                  for number source (transaction number or anchor-split action - see
+                  <ulink type="help"
+                    url="ghelp:gnucash-help?num-action-book-option">Use
+                  Split Action Field for Number</ulink> in the Book Options section of the &app;
+                  Help Manual).
                 </entry>
               </row>
 
@@ -775,8 +782,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -797,13 +803,21 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
                   This type value tells &app; to print the split action field at the specified
-                  coordinates.
+                  coordinates. However, the printed field reflects the book option selection under
+                  <menuchoice>
+                    <guimenu>File</guimenu><guimenuitem> Properties</guimenuitem>
+                  </menuchoice>
+                  for number source (transaction number or anchor-split action - see
+                  <ulink
+                    type="help" url="ghelp:gnucash-help?num-action-book-option">
+                  Use Split Action Field for Number</ulink> in the Book Options section of the &app;
+                  Help Manual). If number source for the book is specified as anchor-split action,
+                  this field will instead print the transaction number field.
                 </entry>
               </row>
 
@@ -819,8 +833,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -842,8 +855,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -864,8 +876,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -885,8 +896,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -907,8 +917,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -930,8 +939,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -952,8 +960,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -988,9 +995,9 @@ Blocking_Chars
 
         <note>
           <para>SPLIT items include all split entries for the transaction except for the split that applies to the
-            current account register. This is usually the last split listed when splits are
-            displayed in the register. The coordinate location defines the lower left location for
-            the split information.
+            current account register (referred to as the anchor-split). This is usually the last
+            split listed when splits are displayed in the register. The coordinate location defines
+            the lower left location for the split information.
           </para>
         </note>
       </sect3>
@@ -1002,16 +1009,16 @@ Blocking_Chars
       <para>Creating your own check format file is a fairly simple task. The easiest way to start is to copy an
         existing check format file from the application directory (typically
         <filename class="directory">/usr/share/gnucash/checks</filename>) to the directory
-        <filename class="directory">~/.gnucash/checks</filename>. Make sure to change the guid so
-        the new file will be accepted by gnucash, and change the title to something descriptive.
-        Then change or add individual item fields as necessary. You can also create a new check file
-        by clicking the <guibutton>Save Format</guibutton> button on the <guilabel>Custom
-        format</guilabel> page of the check printing dialog.
+        <filename class="directory">&dir-data;checks</filename><footnoteref linkend="dir-old-chk" />.
+        Make sure to change the guid so the new file will be accepted by gnucash, and change the
+        title to something descriptive. Then change or add individual item fields as necessary. You
+        can also create a new check file by clicking the <guibutton>Save Format</guibutton> button
+        on the <guilabel>Custom format</guilabel> page of the check printing dialog.
       </para>
 
       <note>
-        <para>Key names are case sensitive. If you’re having problems with a check format file, ensure that
-          all key names have capital letters as documented above.
+        <para>Key names are case sensitive. If you are having problems with a check format file, ensure that all
+          key names have capital letters as documented above.
         </para>
       </note>
     </sect2>
diff --git a/guide/ja/ch_bus_ap.xml b/guide/ja/ch_bus_ap.xml
index c13fdc1..8c717a8 100644
--- a/guide/ja/ch_bus_ap.xml
+++ b/guide/ja/ch_bus_ap.xml
@@ -7,12 +7,11 @@
   Last modified: July 9th 2006
   Maintainers: 
                Chris Lyttle <chris at wilddev.net>
-
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+        Jon Lapham <lapham at extracta.com.br>
         updated Patrick Schweiger <pks at spiffykitty.com>
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_bus_ap">
   <title>買掛金</title>
@@ -60,16 +59,14 @@
         通常、<emphasis>買掛金</emphasis>勘定科目は負債の子勘定科目にします。
         統合買掛金システムでは、この勘定科目の中に取引を配置します。
       </para>
-<literallayout>
-基本的な買掛金勘定科目階層 :
+<screen>基本的な買掛金勘定科目階層 :
 
 -資産
    -銀行
 -負債
    -買掛金
 -費用
-   -買掛金費用
-</literallayout>
+   -買掛金費用</screen>
       <para>有効に利用するためには、この階層に追加の資産および実際の費用勘定科目を加える必要があります
         この階層の重要な側面は、費用勘定科目および<emphasis>買掛金</emphasis>タイプに設定されている買掛金負債勘定科目を使用することです。
       </para>
@@ -220,7 +217,7 @@
               <listitem>
                 <para><guilabel>全体の設定を使用</guilabel>は
                   <menuchoice>
-                    <guimenu>編集</guimenu> <guimenuitem>設定</guimenuitem>
+                    <guimenu>編集</guimenu><guimenuitem>設定</guimenuitem>
                   </menuchoice>
                   (Mac OS Xの場合は
                   <menuchoice>
diff --git a/guide/ja/ch_bus_ar.xml b/guide/ja/ch_bus_ar.xml
index f776b4f..d948448 100644
--- a/guide/ja/ch_bus_ar.xml
+++ b/guide/ja/ch_bus_ar.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
-
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-	updated Patrick Schweiger <pks at spiffykitty.com>
+    Jon Lapham <lapham at extracta.com.br>
+    updated Patrick Schweiger <pks at spiffykitty.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_bus_ar">
   <title>売掛金</title>
@@ -76,15 +74,13 @@
         (通常は資産の子勘定科目) をセットアップしなければいけません。
         統合売掛金システムでは、この勘定科目の中に取引を配置します。
       </para>
-<literallayout>
-基本的な売掛金勘定科目階層:
+<screen>基本的な売掛金勘定科目階層:
 
 -資産
   -当座預金
   -売掛金
 -収益
-   -売上
-</literallayout>
+   -売上</screen>
       <para>有効に利用するためには、この階層に追加の資産、費用、および収益勘定科目を加える必要があります。
         この階層の重要な側面は、収益勘定科目および<emphasis>売掛金</emphasis>タイプに設定されている売掛金資産勘定科目を使用することです。
       </para>
@@ -133,7 +129,7 @@
       売掛金システムによって作成される取引は売掛金勘定科目の中に記録されます。
       一般的に直接この勘定科目内では作業をしません。 一般的には
       <menuchoice>
-        <guimenu>ビジネス</guimenu> <guisubmenu>得意先</guisubmenu>
+        <guimenu>ビジネス</guimenu><guisubmenu>得意先</guisubmenu>
       </menuchoice>
       サブメニューを通じて使用可能な4種類の統合GnuCash
       売掛金アプリケーションコンポーネントを使用して作業をします。
@@ -224,7 +220,7 @@
           <para><guilabel>請求情報 - 支払条件</guilabel> -
             この得意先のデフォルト支払条件を指定します。
             <menuchoice>
-              <guimenu>ビジネス</guimenu> <guimenuitem>支払条件エディター</guimenuitem>
+              <guimenu>ビジネス</guimenu><guimenuitem>支払条件エディター</guimenuitem>
             </menuchoice>
             を使用して、支払条件を前もって登録しなければいけません。
           </para>
@@ -264,7 +260,7 @@
               <listitem>
                 <para><guilabel>全体の設定を使用</guilabel>は
                   <menuchoice>
-                    <guimenu>編集</guimenu> <guimenuitem>設定</guimenuitem>
+                    <guimenu>編集</guimenu><guimenuitem>設定</guimenuitem>
                   </menuchoice>
                   (Mac OS Xの場合は
                   <menuchoice>
@@ -281,7 +277,7 @@
           <para><guilabel>請求情報 - 税額表</guilabel> -
             請求書の商品に適用するデフォルト税額表を指定します。
             <menuchoice>
-              <guimenu>ビジネス</guimenu> <guimenuitem>税額表エディター</guimenuitem>
+              <guimenu>ビジネス</guimenu><guimenuitem>税額表エディター</guimenuitem>
             </menuchoice>
             メニュー項目から税額表を登録しなければいけません。
           </para>
@@ -778,7 +774,7 @@ linkend="bus-ar-invoicenew2"/>を参照してください)。
       <para>得意先請求書を記帳した後に、得意先請求書を印刷して得意先に送らなければいけません。
         得意先請求書使用を印刷するためには、
         <menuchoice>
-          <guimenu>ファイル</guimenu> <guimenuitem>得意先請求書を印刷</guimenuitem>
+          <guimenu>ファイル</guimenu><guimenuitem>得意先請求書を印刷</guimenuitem>
         </menuchoice>
         メニュー項目を使用します。
       </para>
diff --git a/guide/ja/ch_bus_pay.xml b/guide/ja/ch_bus_pay.xml
index 78c99f6..6c6c793 100644
--- a/guide/ja/ch_bus_pay.xml
+++ b/guide/ja/ch_bus_pay.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
-
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-        updated Patrick Schweiger <pks at spiffykitty.com>
+    Jon Lapham <lapham at extracta.com.br>
+  Updated:
+    Patrick Schweiger <pks at spiffykitty.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_bus_pay">
   <title>給与支払い</title>
@@ -60,8 +59,7 @@
       後で適切な政府系機関に税金を支払います。
     </para>
 
-    <para><literallayout>
-単純な給与支払い配置
+    <para><screen>単純な給与支払い配置:
 
 -資産
    -当座預金
@@ -71,8 +69,7 @@
 -費用
    -給与
    -Tax1
-   -Tax2
-</literallayout>
+   -Tax2</screen>
       <note>
         <para>一人一人の給与を追跡するために従業員ごとに子勘定科目を作成する誘惑に抵抗してください。
           各従業員のために子勘定科目を作成すると、管理できないほど大きな勘定科目リストになります。
diff --git a/guide/ja/ch_capgain.xml b/guide/ja/ch_capgain.xml
index a41431c..c6faea0 100644
--- a/guide/ja/ch_capgain.xml
+++ b/guide/ja/ch_capgain.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
-
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Bengt Thuree <bengt at thuree.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_capgain">
   <title>資本利得</title>
@@ -112,7 +110,7 @@
 
     <para>2つの資産<emphasis>ITEM1</emphasis>および<emphasis>ITEM2</emphasis>の評価を追跡するための一般的な勘定科目階層を次に示します。<emphasis>資産:固定資産:ITEM1:購入価格</emphasis>勘定科目は<emphasis>資産:流動資産:普通預金</emphasis>勘定科目と釣り合いを保ちます。<emphasis>資産:固定資産:ITEM1:未実現利益</emphasis>勘定科目は<emphasis>収益:未実現利益</emphasis>勘定科目と釣り合いを保ちます。ITEM2でも同様です。
     </para>
-<literallayout>
+<screen>
 -資産
     -流動資産
     -普通預金
@@ -125,8 +123,7 @@
             -未実現利益
 -収益
     -実現利益
-    -未実現利益
-</literallayout>
+    -未実現利益</screen>
   </sect1>
 
   <sect1 id="capgain_example1">
diff --git a/guide/ja/ch_cc.xml b/guide/ja/ch_cc.xml
index d14cb57..783b5b6 100644
--- a/guide/ja/ch_cc.xml
+++ b/guide/ja/ch_cc.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
-
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Bengt Thuree <bengt at thuree.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Bengt Thuree <bengt at thuree.com>
   Originally written by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_cc">
   <title>クレジットカード</title>
@@ -60,14 +58,13 @@
 
       <para>クレジットカードで行ったそれぞれの買い物の費用を追跡しない場合は、次のような単純な勘定科目階層をセットアップします。
       </para>
-<literallayout>
+<screen>
 -資産
    -銀行
 -負債
    -クレジットカード
 -費用
-   -クレジットカード
-</literallayout>
+   -クレジットカード</screen>
       <para>この例では、毎月の請求総額を<emphasis>負債:クレジットカード</emphasis>勘定科目と<emphasis>費用:クレジットカード</emphasis>勘定科目間の取引として入力します。
         支払いを行う時は、<emphasis>資産:銀行</emphasis>勘定科目と<emphasis>負債:クレジットカード</emphasis>間で取引を入力します。
       </para>
@@ -85,7 +82,7 @@
         そしてクレジットカードで行ったそれぞれの支払いは、クレジットカード負債勘定科目と特定の費用勘定科目間の別々の取引として入力します。
         このための勘定科目階層の例は次のようになります。
       </para>
-<literallayout>
+<screen>
 -資産
     -銀行
 -負債
@@ -96,8 +93,7 @@
     -衣料品
     -娯楽
     -利子
-    -サービス
-</literallayout>
+    -サービス</screen>
       <para>明らかに、消費動向に合う特定の費用勘定科目を入力しなければいけません。
         単純セットアップと完全セットアップを比較すると、唯一の差異は費用がグループによって細分化されているということです。
         また、<quote>利子</quote>費用があるのも分かります。これはクレジットカード会社が毎月の未払い残高に対して利子を請求する時に使用されます。
diff --git a/guide/ja/ch_currency.xml b/guide/ja/ch_currency.xml
index bc6b537..160a1db 100644
--- a/guide/ja/ch_currency.xml
+++ b/guide/ja/ch_currency.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.4.0
   Last modified: March 16th 2010
   Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
-
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Bengt Thuree <bengt at thuree.com>
-  	Updated	Geert Janssens <janssens-geert at telenet.be>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated Bengt Thuree <bengt at thuree.com>
+    Updated Geert Janssens <janssens-geert at telenet.be>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_currency">
   <title>複数通貨</title>
@@ -80,7 +78,7 @@ url="&url-selinger;accounting/tutorial.html">&tit-sel-tut;
       それでは、3つの銀行勘定科目をセットアップします。米ドルを使用する一つ、ユーロ通貨を使用する一つ、および香港ドルを使用する一つです。
       勘定科目構造はおそらく次のようになります。
     </para>
-<literallayout>
+<screen>
 -資産                         (USD)
    -流動資産                  (USD)
       -米国銀行               (USD)
@@ -91,7 +89,7 @@ url="&url-selinger;accounting/tutorial.html">&tit-sel-tut;
       -USD                    (USD)
       -EUR                    (EUR)   
       -HKD                    (HKD)
-    </literallayout>
+    </screen>
     <note>
       <para>それぞれの勘定科目の通貨は小括弧で表示しています。
       </para>
@@ -463,7 +461,7 @@ srccredit="Geert Janssens" />
 
       <para>これを記録するために、&app;では次の基本勘定科目構造を使用します。
       </para>
-<literallayout>
+<screen>
 -資産                          (USD)
    -流動資産                   (USD)
       -米国銀行                (USD)
@@ -473,7 +471,7 @@ srccredit="Geert Janssens" />
 -純資産                        (USD)
    -開始残高
       -USD            (USD)
-      </literallayout>
+      </screen>
       <note>
         <para>それぞれの勘定科目の通貨は小括弧で表示しています。
         </para>
@@ -616,13 +614,13 @@ url="&url-yh-fin;lookup"><citetitle>Yahoo!
 
       <para>すべてのさまざま損益を追跡可能にするために、次の勘定科目構造を作成します。
       </para>
-<literallayout>
+<screen>
 資産:投資:証券会社:好況:0694.HK                        (北京空港)
 資産:投資:証券会社:好況:現金                           (HKD)
 純資産:開始残高:HKD                                    (HKD)
 費用:手数料:好況.0694.HK                               (HKD)
 収益:投資:配当:好況:0694.HK                            (HKD)
-</literallayout>
+</screen>
       <para>必要なすべての勘定科目を作成後、勘定科目表はこのようになります。
       </para>
 
@@ -681,11 +679,11 @@ format="PNG" srccredit="Bengt Thuree" />
         (<emphasis>資産:投資:証券会社:好況:現金</emphasis>)
         を開き、次のように入力します。
       </para>
-<literallayout>
+<screen>
 株式購入
         資産:投資:証券会社:好況:現金                  出金 50,000
         費用:投資:手数料:好況:HKD                     入金 500
-        資産:投資:証券会社:好況:0694                  入金 49,500 (16,500株)</literallayout>
+        資産:投資:証券会社:好況:0694                  入金 49,500 (16,500株)</screen>
       <para><guilabel>資金移動</guilabel>ダイアログボックスが自動的に現れない場合、株式行を右クリックし、<guilabel>為替・交換レートを編集</guilabel>を選択します。
         <guilabel>資金移動先金額</guilabel>に株式数 (16,500) を入力します。
       </para>
@@ -763,17 +761,17 @@ format="PNG" srccredit="Bengt Thuree" />
     <para>詳細に全く関心がないなら非常に簡単な勘定科目構造で十分です。
       それは次のようになります。
     </para>
-<literallayout>
+<screen>
     資産:投資:通貨:銀行 (USD)
-    資産:投資:通貨:XXX  (XXX)</literallayout>
+    資産:投資:通貨:XXX  (XXX)</screen>
     <para>しかし、さまざまな手数料や、資本利得または資本損失も追跡可能にしたいなら、もう少し複雑な配置を行う必要性があります。
       それは次のようになります。
     </para>
-<literallayout>
+<screen>
     資産:投資:通貨:銀行                    (USD)
     資産:投資:通貨:外貨預金:XXX            (XXX)
     費用:投資:通貨:外貨預金:XXX            (XXX)
-    収益:投資:外貨預金:資本利得:XXX        (XXX)</literallayout>
+    収益:投資:外貨預金:資本利得:XXX        (XXX)</screen>
     <para>XXXは投資する通貨です。
     </para>
 
@@ -1071,9 +1069,8 @@ linkend="invest-sell1" />と同様です)。
         )でデフォルト通貨をオーストラリア・ドル (AUD) に設定します。
         さまざまな収益と費用を可能な限り追跡可能にすると決めたので、次の勘定科目階層を使用します。
       </para>
-<literallayout>
-資産:流動資産:普通預金         (AUD)
-</literallayout>
+<screen>
+資産:流動資産:普通預金         (AUD)</screen>
       <para></para>
     </sect2>
 
@@ -1087,10 +1084,9 @@ linkend="invest-sell1" />と同様です)。
 
       <para>これらの取引を記録するためには、次の勘定科目が必要です。
       </para>
-<literallayout>
+<screen>
 純資産:宝くじ          (AUD)
-純資産:相続            (AUD)
-</literallayout>
+純資産:相続           (AUD)</screen>
       <para><emphasis>資産:流動資産:普通預金</emphasis>勘定科目に入力する取引は次のようになります。
       </para>
 
@@ -1169,12 +1165,11 @@ srccredit="Bengt Thuree" />
       <para>ついに、数年前に (50,000ドルの頭金で)
         借りた住宅ローンを支払う余裕ができました。
       </para>
-<literallayout>
-資産:固定資産:住宅                     (AUD) 300,000オーストラリア・ドル
+<screen>
+資産:固定資産:住宅                  (AUD) 300,000オーストラリア・ドル
 負債:ローン:住宅ローン                 (AUD) 250,000オーストラリア・ドル
-費用:利子:住宅ローン利子               (AUD)
-純資産:開始残高                        (AUD) 50,000オーストラリア・ドル
-</literallayout>
+費用:利子:住宅ローン利子             (AUD)
+純資産:開始残高                     (AUD) 50,000オーストラリア・ドル</screen>
       <para>住宅ローンを借りている銀行と少し相談した後に、いくらかの利子(30,000オーストラリア・ドル)を加えて
         、一括繰り上げ返済を行うことに合意しました。
         <emphasis>資産:固定資産:住宅</emphasis>勘定科目に次のスプリット取引を入力します。
@@ -1272,17 +1267,17 @@ srccredit="Bengt Thuree" />
 
       <para>これらの投資を追跡する必要な勘定科目は次のようになります。
       </para>
-<literallayout>
-資産:投資:スウェーデン証券会社:ERIC.ST                 (STOCK ERIC.ST Yahoo!)
-資産:投資:スウェーデン証券会社:現金                    (SEK)
-資産:投資:香港証券会社:0694.HK                         (STOCK 0694.HK Yahoo!)
-資産:投資:香港証券会社:現金                            (HKD)
-資産:投資:米国証券会社:AMZN                            (STOCK AMZN NASDAQ)
-資産:投資:米国証券会社:現金                            (USD)
+<screen>
+資産:投資:スウェーデン証券会社:ERIC.ST               (STOCK ERIC.ST Yahoo!)
+資産:投資:スウェーデン証券会社:現金                   (SEK)
+資産:投資:香港証券会社:0694.HK                      (STOCK 0694.HK Yahoo!)
+資産:投資:香港証券会社:現金                          (HKD)
+資産:投資:米国証券会社:AMZN                         (STOCK AMZN NASDAQ)
+資産:投資:米国証券会社:現金                          (USD)
 費用:投資:手数料:スウェーデン証券会社:ERIC.ST          (SEK)
-費用:投資:手数料:香港証券会社:0694.HK                  (HKD)
-費用:投資:手数料:米国証券会社:AMZN                     (USD)
-費用:投資:両替手数料                                (AUD)</literallayout>
+費用:投資:手数料:香港証券会社:0694.HK                (HKD)
+費用:投資:手数料:米国証券会社:AMZN                   (USD)
+費用:投資:両替手数料                                (AUD)</screen>
       <para>各株式に100,000オーストラリア・ドルを投資すると決めます。これを行うために、最初に、株式に関連した各現金勘定科目に通貨取引を行います。
       </para>
 
@@ -1517,11 +1512,10 @@ srccredit="Bengt Thuree" />
         彼は非常に親愛なる友人なので、40,000ユーロの個人貸付をして彼を助けることに決めます。
       </para>
 
-      <para><literallayout>
+      <para><screen>
 資産:貸付:ピーター                    (Euro)
-収益:利子収益:ピーター                  (Euro)
-費用:銀行手数料                         (AUD)
-</literallayout>
+収益:利子収益:ピーター                (Euro)
+費用:銀行手数料                    (AUD)</screen>
       </para>
 
       <para>これは普通預金勘定科目 (オーストラリア・ドル) から資産:貸付:ピーター
@@ -1555,12 +1549,12 @@ srccredit="Bengt Thuree" />
 
       <para>この例では次の勘定科目が必要となります。
       </para>
-<literallayout>
+<screen>
 負債:ローン:円建てローン                            (JPY)
 費用:利子:円建てローン                              (JPY)
-費用:住宅ローン管理手数料:円建てローン              (JPY)
-資産:流動資産:日本の銀行                            (JPY)
-資産:固定資産:ニュージーランドの家                  (NZD)</literallayout>
+費用:住宅ローン管理手数料:円建てローン               (JPY)
+資産:流動資産:日本の銀行                        (JPY)
+資産:固定資産:ニュージーランドの家                (NZD)</screen>
       <table>
         <title>ニュージーランドの家を購入するスプリット取引</title>
 
diff --git a/guide/ja/ch_dep.xml b/guide/ja/ch_dep.xml
index 2910dfd..6b7e39c 100644
--- a/guide/ja/ch_dep.xml
+++ b/guide/ja/ch_dep.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!--  (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
-
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   	Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_dep">
   <title>減価償却</title>
@@ -571,7 +569,7 @@ linkend="dep_example1" />を参照してください)。
     <para>2つの資産<emphasis>ITEM1</emphasis>および<emphasis>ITEM2</emphasis>の減価償却費を追跡するための一般的な勘定科目階層を次に示します。
       <emphasis>資産取得価額</emphasis>勘定科目は<emphasis>銀行</emphasis>勘定科目と釣り合いを保ち、<emphasis>減価償却累計額</emphasis>勘定科目は<emphasis>費用:減価償却費</emphasis>勘定科目と釣り合いを保ちます。
     </para>
-<literallayout>
+<screen>
 -資産
    -固定資産
       -ITEM1 
@@ -583,8 +581,7 @@ linkend="dep_example1" />を参照してください)。
    -流動資産
       -銀行
 -費用
-   -減価償却費                   (減価償却費勘定科目)
-</literallayout>
+   -減価償却費                   (減価償却費勘定科目)</screen>
     <para>この勘定科目階層の特徴の一つとして、減価償却が行われる資産に関する重要な評価額要約が一目で分かることがあります。
       <emphasis>資産:固定資産:ITEM1</emphasis>勘定科目の合計欄にはITEM1の現在の評価額が表示されます。<emphasis>資産:固定資産:ITEM1:購入価格</emphasis>勘定科目の合計欄にはITEM1のためにもともといくらを支払ったかが表示されます。<emphasis>資産:固定資産:ITEM1:減価償却費</emphasis>勘定科目の合計欄にはITEM1の減価償却累計額が表示されます。最後に、<emphasis>費用:減価償却費</emphasis>勘定科目の合計欄にはすべての資産で発生した減価償却費合計額が表示されます。
     </para>
diff --git a/guide/ja/ch_invest.xml b/guide/ja/ch_invest.xml
index 53dca42..8580de3 100644
--- a/guide/ja/ch_invest.xml
+++ b/guide/ja/ch_invest.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: December 7th 2009
        modified: January 10th 2007
        modified: July 9th 2006
-  Maintainers: 
-               Alex Aycinena <alex.aycinena at gmail.com>
-
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Alex Aycinena <alex.aycinena at gmail.com>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Dave Herman <dvherman at bigfoot.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Dave Herman <dvherman at bigfoot.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_invest">
   <title>投資</title>
@@ -266,7 +264,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
       <para>手動で投資勘定科目階層をセットアップすることもできます。
         次は投資を追跡するために&app;をセットアップするより複雑な例です。投資を扱う証券会社の下に異なる各投資を分類するという利点があります。
         この方法では、&app;勘定科目と証券会社からの計算書を比較して、&app;と計算書が異なるところで見つけるのがより簡単になります。
-<literallayout>
+<screen>
  資産
     投資
        証券口座
@@ -313,8 +311,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
           My Stockbroker
        管理手数料
           I*Trade
-          My Stockbroker
-</literallayout>
+          My Stockbroker</screen>
       </para>
 
       <para>投資勘定科目階層をセットアップする一意の方法は本当にありません。
@@ -337,7 +334,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
       <para>利付き投資を購入する時は、投資の購入を記録する資産勘定科目、利子からの収益を記録する収益勘定科目、および銀行手数料を記録する費用勘定科目を作成しなければいけません。
         次は、銀行の利付き普通預金勘定科目と定期預金勘定科目の配置例です。
       </para>
-<literallayout>
+<screen>
 資産
    ABC銀行
       定期預金
@@ -347,8 +344,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
       手数料
 収益
    ABC銀行
-      利子
-</literallayout>
+      利子</screen>
       <para>いつものように、この勘定科目階層は例のための単純なものです。実態と最も良く一致した配置の勘定科目を作成してください。
       </para>
     </sect2>
@@ -467,7 +463,7 @@ linkend="invest-buy-new2"><emphasis>新規株式の購入</emphasis>
         <emphasis>IBM</emphasis>および<emphasis>NST</emphasis>とします。
         配置の概要のモデル(資産子勘定科目のみ)を次に示します。
       </para>
-<literallayout>
+<screen>
  資産
     投資
        証券口座
@@ -477,8 +473,7 @@ linkend="invest-buy-new2"><emphasis>新規株式の購入</emphasis>
           株式
              AMZN
              IBM
-             NST
-</literallayout>
+             NST</screen>
       <note>
         <para>株式または投資信託単位で収益 (配当/利子/資本利得)
           を追跡したい場合、所有している配当または利子が付く株式ごとに、<emphasis>収益:
diff --git a/guide/ja/ch_loans.xml b/guide/ja/ch_loans.xml
index 68676c0..cf05eed 100644
--- a/guide/ja/ch_loans.xml
+++ b/guide/ja/ch_loans.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
-
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   	Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_loans">
   <title>ローン</title>
@@ -122,8 +120,7 @@
       ローンからのお金で購入されたものは、資産です。
       これらのパラメータを使用して、基本的なローン勘定科目の構造を示します。
     </para>
-<literallayout>
-基本的なローン勘定科目構造
+<screen>基本的なローン勘定科目構造
 
 -資産
     -流動資産
@@ -136,8 +133,7 @@
 -費用
    -利子
        -担保付きローン利子
-   -担保付きローン管理手数料
-</literallayout>
+   -担保付きローン管理手数料</screen>
     <para>&app;には、自動車のローンや住宅ローンを含む、多くの既定義ローン勘定科目階層が利用可能です。
       これらの既定義勘定科目構造にアクセスするためには、
       <menuchoice>
@@ -262,7 +258,7 @@ srccredit="Bengt Thuree" />
       <title>発展: 計算の詳細</title>
 
       <para>財務計算機で使用される数式を説明するためには、まず、いくつかの変数を定義しなければいけません。
-<literallayout>
+<screen>
  n  == 支払期間の数
  %i  == 表面利率、NAR
  PV  == 現在価値
@@ -272,17 +268,17 @@ srccredit="Bengt Thuree" />
  PF == 1年あたりの支払い頻度
 
 CFとPFの標準の値はそれぞれ次の通りです。
-   1   == 毎年
-   2   == 年2回
-   3   == 年3回
-   4   == 四半期ごと
-   6   == 2カ月ごと
-   12  == 毎月
-   24  == 月2回
-   26  == 隔週
-   52  == 毎週
-   360 == 毎日(360)
-   365 == 毎日(365)</literallayout>
+   1  == 毎年
+   2  == 年2回
+   3  == 年3回
+   4  == 四半期ごと
+    6  == 2カ月ごと
+  12  == 毎月
+  24  == 月2回
+  26  == 隔週
+  52  == 毎週
+ 360  == 毎日(360)
+ 365  == 毎日(365)</screen>
       </para>
 
       <sect3 id="loans_calcsdetails_i2">
@@ -293,14 +289,13 @@ CFとPFの標準の値はそれぞれ次の通りです。
           iを求める時には、計算によって実効利率(ieff)を求めます。
           したがって、iからieffまで変換する機能とieffからiまで計算する機能が必要です。
         </para>
-<literallayout>
-iからieffまで変換するためには次の式を使用します。
-離散的な利率:     <emphasis>ieff = (1 + i/CF)^(CF/PF) - 1</emphasis>
-連続的な利率: <emphasis>ieff = e^(i/PF) - 1 = exp(i/PF) - 1</emphasis>
+<screen>iからieffまで変換するためには次の式を使用します。
+離散的な利率:  <emphasis>ieff = (1 + i/CF)^(CF/PF) - 1</emphasis>
+連続的な利率:  <emphasis>ieff = e^(i/PF) - 1 = exp(i/PF) - 1</emphasis>
 
 ieffからiまで変換するためには次の式を使用します。
-離散的な利率:      <emphasis>i = CF*[(1+ieff)^(PF/CF) - 1]</emphasis>
-連続的な利率: <emphasis>i = ln[(1+ieff)^PF]</emphasis></literallayout>
+離散的な利率:  <emphasis>i = CF*[(1+ieff)^(PF/CF) - 1]</emphasis>
+連続的な利率:  <emphasis>i = ln[(1+ieff)^PF]</emphasis></screen>
         <note>
           <para>以降で説明する、金融取引のための方程式では、すべての利率が実効利率<quote>ieff</quote>です。
             簡潔にするために、文字では単に<quote>i</quote>と表記します。
@@ -314,17 +309,17 @@ ieffからiまで変換するためには次の式を使用します。
         <para>一つの方程式が基本的に5個すべての変数を関連付けます。
           これは基本的な財務方程式として知られています。
         </para>
-<literallayout>
+<screen>
 <emphasis>PV*(1 + i)^n + PMT*(1 + iX)*[(1+i)^n - 1]/i + FV = 0</emphasis>
 ここでXは次を表します。
 
    X = 0 : 支払期間の終了時
-   X = 1 : 支払期間の開始時</literallayout>
+   X = 1 : 支払期間の開始時</screen>
         <para>この方程式からそれぞれの変数を求める関数が導き出されます。
           この式を求める方法の詳細については&app;ソースコードのファイルsrc/calculation/fin.cにあるコメントを参照してください。
           後の方程式を読むのをより簡単にするために、変数A、B、およびCを最初に定義します。
         </para>
-<literallayout>
+<screen>
 <emphasis>A = (1 + i)^n - 1</emphasis>
 <emphasis>B = (1 + iX)/i</emphasis>
 <emphasis>C = PMT*B</emphasis>
@@ -336,7 +331,8 @@ ieffからiまで変換するためには次の式を使用します。
 
 利率のための解は2つの場合に分かれます。
 PMT===0 の場合は簡単で、解は次のようになります。
-<emphasis>i = [FV/PV]^(1/n) - 1</emphasis></literallayout>
+<emphasis>i = [FV/PV]^(1/n) - 1</emphasis>
+</screen>
         <para>PMT!=0の場合は非常に複雑であり、ここで記述することはできません。
           PMT!=0の場合、正確に求めることができる関数があるのではなく、利率を決定するに反復演算が必要となります。
           詳細な説明はsrc/calculation/fin.cソースファイルを参照してください。
@@ -536,7 +532,7 @@ srccredit="Bengt Thuree" />
 
     <para>このHow-Toでは、次の一般的な勘定科目構造に基づいています。
     </para>
-<literallayout>
+<screen>
 -資産
    -銀行
         -普通預金
@@ -544,8 +540,7 @@ srccredit="Bengt Thuree" />
         -人
 -収益
    -利子収益
-        -人
-</literallayout>
+        -人</screen>
     <para>この例では、友人ピーターへの2,000ドル(デフォルトの通貨)の個人貸付を、どのように追跡するかを説明します。
     </para>
 
@@ -619,12 +614,11 @@ format="PNG" srccredit="Bengt Thuree" />
       <para>次の勘定科目で開始します
         (すべての勘定科目が同じ通貨、この場合U.S.ドルとします)。
       </para>
-<literallayout>
+<screen>
 資産:銀行:USD
 資産:貸付:ピーター
 収益:利子収益:ピーター
-純資産:開始残高:USD
-</literallayout>
+純資産:開始残高:USD</screen>
     </sect2>
 
     <sect2 id="loans_personalLoanToSomeOne_InitialSetup">
@@ -863,7 +857,7 @@ srccredit="Bengt Thuree" />
       差異は勘定科目と利子だけです。
     </para>
 
-    <para><literallayout>基本的な自動車ローン勘定科目構造
+    <para><screen>基本的な自動車ローン勘定科目構造
 
 -資産
     -流動資産
@@ -876,7 +870,7 @@ srccredit="Bengt Thuree" />
 -費用
    -利子
        -自動車ローン利子
-   -自動車ローン管理手数料</literallayout>
+   -自動車ローン管理手数料</screen>
     </para>
 
     <para>詳細に関しては<xref linkend="loans_mortgage1" />を参照してください。
@@ -922,7 +916,7 @@ srccredit="Bengt Thuree" />
         自動車を代わりに売却したい場合は、単に住宅勘定科目が自動車勘定科目に変わるだけです。
       </para>
 
-      <para><literallayout>
+      <para><screen>
 -資産
   -固定資産
     -住宅
@@ -930,8 +924,7 @@ srccredit="Bengt Thuree" />
     -普通預金
 -収益
   -長期資本利得
-    -住宅
-</literallayout>
+    -住宅</screen>
       </para>
 
       <itemizedlist>
@@ -1098,7 +1091,7 @@ srccredit="Bengt Thuree" />
         については、<xref linkend="chapter_capgain"></xref>を参照してください。
       </para>
 
-      <para><literallayout>
+      <para><screen>
 -資産
     -固定資産
         -住宅
@@ -1110,8 +1103,7 @@ srccredit="Bengt Thuree" />
     -実現利益
         -住宅
     -未実現利益
-        -住宅
-</literallayout>
+        -住宅</screen>
       </para>
 
       <para>大昔に300,000ドルで家を買いました。そして、長い間、市場を良く見続けており、住宅の推定現在価値の記録を更新していました。
@@ -1250,17 +1242,16 @@ srccredit="Bengt Thuree" />
 
   <sect1 id="loans_missing1">
     <title>未作成のローン文書</title>
-<literallayout>
+<screen>
  -Entering a Payment Schedule
      -Monthly Payments (How-To)
-     ---See the Mortgage assistant
-     ----ARM 10/1 means 10 year fixed interest rate, then changes every year
-     ----ARM 10/3 means 10 year fixed interest rate, then changes every third year
+       -See the Mortgage assistant
+        -ARM 10/1 means 10 year fixed interest rate, then changes every year
+        -ARM 10/3 means 10 year fixed interest rate, then changes every third year
      -Final Payment (How-To)
      ---Same as a normal payment, but you get the figures from the bank
      ---How to fix 10 amortization and then a final bulk payment setup?
 
- -Putting It All Together
-</literallayout>
+ -Putting It All Together</screen>
   </sect1>
 </chapter>
diff --git a/guide/pt/appendixa.xml b/guide/pt/appendixa.xml
index 61eabba..f9b05e5 100644
--- a/guide/pt/appendixa.xml
+++ b/guide/pt/appendixa.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixa">
   <title>Guia de migração</title>
@@ -89,34 +88,37 @@
         <para>Copie o ficheiro <acronym>XML</acronym> do &app; para um ficheiro de trabalho.
         </para>
 
-        <note>
+        <important>
           <para>Se o ficheiro foi modificado pela última vez com uma versão do &app; anterior à 2.0, antes de
             continuar para o próximo passo tem de modificar a etiqueta <gnc-v2> do ficheiro
             de trabalho para algo como isto:
-          </para>
-<literallayout>
+<programlisting language="xml">
 <gnc-v2 xmlns:cd="http://www.gnucash.org/XML/cd"
-        xmlns:book="http://www.gnucash.org/XML/book"
-        xmlns:gnc="http://www.gnucash.org/XML/gnc"
-        xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
-        xmlns:trn="http://www.gnucash.org/XML/trn"
-        xmlns:split="http://www.gnucash.org/XML/split"
-        xmlns:act="http://www.gnucash.org/XML/act"
-        xmlns:price="http://www.gnucash.org/XML/price"
-        xmlns:ts="http://www.gnucash.org/XML/ts"
-        xmlns:slot="http://www.gnucash.org/XML/kvpslot"
-        xmlns:cust="http://www.gnucash.org/XML/cust"
-        xmlns:entry="http://www.gnucash.org/XML/entry"
-        xmlns:lot="http://www.gnucash.org/XML/lot"
-        xmlns:invoice="http://www.gnucash.org/XML/invoice"
-        xmlns:owner="http://www.gnucash.org/XML/owner"
-        xmlns:job="http://www.gnucash.org/XML/job"
-        xmlns:billterm="http://www.gnucash.org/XML/billterm"
-        xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
-        xmlns:sx="http://www.gnucash.org/XML/sx"
-        xmlns:fs="http://www.gnucash.org/XML/fs"
-        xmlns:addr="http://www.gnucash.org/XML/custaddr">
-    </literallayout>
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:slot="http://www.gnucash.org/XML/kvpslot"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:addr="http://www.gnucash.org/XML/custaddr">
+</programlisting>
+          </para>
+        </important>
+
+        <note>
           <para>Pode pôr praticamente tudo o que quiser dentro dos sinais de igual, mas um <acronym>URL</acronym>
             é o que costuma ser usado.
           </para>
diff --git a/guide/pt/appendixc.xml b/guide/pt/appendixc.xml
index d35ec24..1cd6ef1 100644
--- a/guide/pt/appendixc.xml
+++ b/guide/pt/appendixc.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   Originally designed by Carol Champagne.
   Translators:
-               (Pedro Albuquerque <palbuquerque73 at gmail.com>)
+    Pedro Albuquerque <palbuquerque73 at gmail.com>
 -->
 <appendix id="appendixc">
   <title>Planos de contas contribuídos</title>
@@ -90,7 +89,7 @@
       so the <quote>net of VAT</quote> increase in your bank account, when the invoice is payed, is
       matched by a decrease in capital.
     </para>
-<literallayout>
+<screen>
 Bank Accounts [B]
   |___ Main Account
   |___  Reserve Account
@@ -166,8 +165,6 @@ Expenses [E]
                     |___  Software
                     |___  Subscriptions
                     |___  Sundry
-                    |___  Travel / Accom 
-
-</literallayout>
+                    |___  Travel / Accom</screen>
   </sect1>
 </appendix>
diff --git a/guide/pt/appendixd.xml b/guide/pt/appendixd.xml
index cedc899..40fa4dd 100644
--- a/guide/pt/appendixd.xml
+++ b/guide/pt/appendixd.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: March 18th, 2007
-  Maintainers: 
-                Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-                David Hampton <hampton at employees.org>
+    David Hampton <hampton at employees.org>
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixd">
   <title>Formatos de ficheiros auxiliares</title>
@@ -21,27 +20,53 @@
     tiver interesse em colaborar na tradução, consulte
   </para>
 
-  <para><ulink url="http://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
-    Gnucash wiki: How to translate the GnuCash guide and/or help files</ulink>
+  <para>&untranslated-pt;
   </para>
 <!--
-    <sect1 id="check_format_info">
-      <title>Check Format Files (<filename>*.chk</filename>)</title>
+  <sect1 id="check_format_info">
+    <title>Check Format Files (<filename>*.chk</filename>)</title>
 
-      <sect2 id="check_format_overview">
-        <title>Overview</title>
-        <para>The check format file is used to tell &app; how to print a check or checks onto a page of paper.  This file first describes the overall layout of a page (number of checks, orientation, etc) and then describes the layout of the specific items on a single check.  The file is organized as a typical Key/Value file used by many Linux applications.  Keys/values pairs are grouped into sections that begin with the group name enclosed in square brackets.</para>
-        <para>&app; looks for check format files in two different locations when you bring up the check printing dialog.  The first location is typically <filename class="directory">/usr/share/gnucash/checks</filename>, where check files distributed with the application can be found.  The second location is the user private <filename class="directory">~/.gnucash/checks</filename> directory.  Users may add check formats at any time (even while &app; is running) simply by dropping a new <filename>*.chk</filename> file in this directory.  The next time the check printing dialog is opened the new check format will appear in the list of available check formats.</para>
-        <note>
-          <para>Printing functions differently depending on the version of GTK that is installed on your system.  When &app; is using a version of GTK prior to 2.10 all offsets are measured from the lower left corner of the page or check.  When using GTK 2.10 or later, all offsets are measured from the upper left corner of the page or check.</para>
-        </note>
-      </sect2>
-      <sect2>
-        <title>Example file</title>
-        <para>A typical &app; check file is presented below.  The contents of this file will be described in the next sections.</para>
+    <sect2 id="check_format_overview">
+      <title>Overview</title>
+
+      <para>The check format file is used to tell &app; how to print a check or checks onto a page of paper.
+        This file first describes the overall layout of a page (number of checks, orientation, etc)
+        and then describes the layout of the specific items on a single check. The file is organized
+        as a typical Key/Value file used by many Linux applications. Keys/values pairs are grouped
+        into sections that begin with the group name enclosed in square brackets.
+      </para>
+
+      <para>&app; looks for check format files in two different locations when you bring up the check printing
+        dialog. The first location is typically
+        <filename class="directory">/usr/share/gnucash/checks</filename>, where check files
+        distributed with the application can be found. The second location is the user private
+        <filename class="directory">&dir-data;checks</filename>
+        <footnote id="dir-old-chk">
+          <para>Up to &app; 2.6.21 it was <filename class="directory">&dir-old;checks</filename>
+          </para>
+        </footnote>
+        directory. Users may add check formats at any time (even while &app; is running) simply by
+        dropping a new <filename>*.chk</filename> file in this directory. The next time the check
+        printing dialog is opened the new check format will appear in the list of available check
+        formats.
+      </para>
+
+      <note>
+        <para>Printing functions differently depending on the version of GTK that is installed on your system.
+          When &app; is using a version of GTK prior to 2.10 all offsets are measured from the lower
+          left corner of the page or check. When using GTK 2.10 or later, all offsets are measured
+          from the upper left corner of the page or check.
+        </para>
+      </note>
+    </sect2>
 
-        <programlisting>
-[Top]
+    <sect2>
+      <title>Example file</title>
+
+      <para>A typical &app; check file is presented below. The contents of this file will be described in the
+        next sections.
+      </para>
+<programlisting language="ini">[Top]
 Guid = 67b144d1-96a5-48d5-9337-0e1083bbf229
 Title = Quicken/QuickBooks (tm) US-Letter
 Rotation = 0.0
@@ -68,387 +93,936 @@ Type_4 = DATE
 Coords_4 = 500.0;67.0
 
 Type_5 = NOTES
-Coords_5 = 50.0;212.0
-        </programlisting>
-      </sect2>
-      <sect2>
-        <title>Field Descriptions</title>
-        <sect3>
-          <title>Top Group</title>
-          <para>This section of the check file describes the overall layout of a page of checks (or check) that goes into the printer.</para>
-          <table id="check_table_top">
-            <title>Overall Page Description Fields</title>
-            <tgroup cols="4">
-              <thead>
-                <row>
-                  <entry>Name</entry>
-                  <entry>Type</entry>
-                  <entry>Required</entry>
-                  <entry>Description</entry>
-                </row>
-              </thead>
-              <tbody>
-                <row>
-                  <entry>Guid</entry>
-                  <entry>string</entry>
-                  <entry>mandatory</entry>
-                  <entry>The guid is used to uniquely identify a check format to &app;.  It must be unique across the entire set of application supplied and user supplied check formats.  If you copy an application check file as the basis of your own check format, you must change this value.  The <emphasis>uuidgen</emphasis> program may be used to generate these identifiers.</entry>
-                </row>
-                <row>
-                  <entry>Title</entry>
-                  <entry>string</entry>
-                  <entry>mandatory</entry>
-                  <entry>The title is used to uniquely identify a check format to the user.  This value is presented verbatim in the check format list of the check printing dialog.  If you copy an application check file as the basis of your own check format, you should change this value.  The title may be any utf-8 string.</entry>
-                </row>
-                <row>
-                  <entry>Font</entry>
-                  <entry>string</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this is the default font used to print all text items on this check.  This field can contain any string that is acceptable by gtk as a font specifier.  If this field is omitted, the default font is the font specified in the &app; preferences dialog.  A typical string would be <quote>sans 12</quote>.</entry>
-                </row>
-                <row>
-                  <entry>Blocking_Chars</entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this is the default used when printing all <emphasis>TEXT</emphasis> items on this check.  When set to true, will print <emphasis>***</emphasis> before and after each text field on the check.  Blocking characters are printed to protect check fields from alteration.  For example, the amount field may be printed as <emphasis>***100.00***</emphasis></entry>
-                </row>
-                <row>
-                  <entry>DateFormat</entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this is the default used when printing all <emphasis>DATE</emphasis> items on this check.  When set to true, will print the format of the DATE in 8 point type, centered and below the actual DATE.  For example DDMMYYYY.</entry>
-                </row>
-                <row>
-                  <entry>Rotation</entry>
-                  <entry>double</entry>
-                  <entry>optional</entry>
-                  <entry>This value specified the rotation of the entire page (in degrees) around the origin point. For gtk versions prior to 2.10, the origin point is in the lower left corner of the page and rotation values increase in the counter-clockwise direction.  For gtk version 2.10 and later, the origin point is in the upper left corner of the page and rotation values increase in the clockwise direction. Rotation of the page is applied before translation.</entry>
-                </row>
-                <row>
-                  <entry>Translation</entry>
-                  <entry>list of 2 doubles</entry>
-                  <entry>optional</entry>
-                  <entry>These values specify the x and y translation of the entire page (in points) relative to the origin point. For gtk versions prior to 2.10, the origin point is in the lower left corner of the page and translation values increase moving up and to the right.  For gtk version 2.10 and later, the origin point is in the upper left corner of the page and translation values increase moving down and to the right. Rotation of the page is applied before translation.</entry>
-                </row>
-                <row>
-                  <entry>Show_Grid</entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If this value is set to <emphasis>true</emphasis> then &app; will draw a grid on the page, starting at the origin with the lines spaced every 50 points. This can be helpful when creating a check format file.</entry>
-                </row>
-                <row>
-                  <entry>Show_Boxes</entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If this value is set to <emphasis>true</emphasis> then for each item where the width and height have been specified, &app; will draw a box showing location and maximum size of that item . This can be helpful when creating a check format file.</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-          <note><para>The Blocking_Chars and DateFormat options are defined for all check formats in Edit->Preferences->Printing.  It is recommened that these global options be set to false (the default), and that the options be set for individual Check Items as described below.</para></note>
-        </sect3>
-        <sect3>
-          <title>Check Positions Group</title>
-          <para>This group of items specifies how multiple checks are laid out on the same sheet of paper, and gives names to each of these check locations so that a user can specify which check location that &app; should print.  This entire group of key/value pairs is optional, and should be omitted if the format file only specifies a single check per page of paper.</para>
-          <table id="check_table_positions">
-            <title>Multiple Checks Per Page Fields</title>
-            <tgroup cols="4">
-              <thead>
-                <row>
-                  <entry>Name</entry>
-                  <entry>Type</entry>
-                  <entry>Required</entry>
-                  <entry>Description</entry>
-                </row>
-              </thead>
-              <tbody>
-                <row>
-                  <entry>Height</entry>
-                  <entry>double</entry>
-                  <entry>mandatory</entry>
-                  <entry>This field specifies the height of a single check on the page.  If there are multiple checks per page then this item is mandatory.  If there is only a single check per page, this entire section should be omitted.</entry>
-                </row>
-                <row>
-                  <entry>Names</entry>
-                  <entry>list of strings</entry>
-                  <entry>mandatory</entry>
-                  <entry>This field specifies the names of the check locations that can be printed on each page.  These names represent the check positions starting from the top of the page and moving downward.  The names are presented verbatim in the check position list of the check printing dialog.  A typical value for this field is "Top;Middle;Bottom", but it could also be "First;Second;Third" or any other set of strings that clearly identify the check locations.  If there are multiple checks per page then this item is mandatory.  If there is only a single check per page, this entire section should be omitted.</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-        </sect3>
-        <sect3>
-          <title>Check Items Group</title>
-          <para>This section specifies the individual items that are printed on the check.  There is no limit to the number of items that may be present in this section, and any given type of item can be repeated multiple times.  This allows for the printing of checks that have a side stub, or for the one-per-page business checks that have both the check and multiple check stubs on the same page.  For example, to print the payee name on a business check and on both stubs, simply specify three payee items with differing print coordinates.</para>
-          <para>Each key names in this section explicitly includes the item number to which it applies.  E.G. The key named <guilabel>Type_1</guilabel> applies to the first item to be printed, and the key <guilabel>Coords_3</guilabel> applies to the third item to be printed.  Item numbers start at one and increase sequentially.  Any gap in the numbering sequence is interpreted by &app; as the end of the item list.  Items are printed in the order of their item numbers, not in the order in which they appear in the file.</para>
-          <para>Each item specified must include a type declaration.  The rest of the parameters for that item depend upon the particular type of that item.  See <xref linkend="check_table_types"></xref> for a list of valid item types and their required parameters.</para>
-          <table id="check_table_items">
-            <title>Individual Check Item Fields</title>
-            <tgroup cols="4">
-              <thead>
-                <row>
-                  <entry>Name</entry>
-                  <entry>Type</entry>
-                  <entry>Required</entry>
-                  <entry>Description</entry>
-                </row>
-              </thead>
-              <tbody>
-                <row>
-                  <entry>Type_<emphasis>n</emphasis></entry>
-                  <entry>string</entry>
-                  <entry>mandatory</entry>
-                  <entry>This field specifies the type of a single item to be printed on a check.  See <xref linkend="check_table_types"></xref> for a list of valid item types.</entry>
-                </row>
-                <row>
-                  <entry>Coords_<emphasis>n</emphasis></entry>
-                  <entry>list of 2 or 4 doubles</entry>
-                  <entry>mandatory</entry>
-                  <entry>This field specifies the coordinates where the item should be placed on a check, and optionally also specifies the width and height of the item.  The numbers in order are the X and Y offset of the lower left corner of the item, and optionally the width and height of the item.  If the width is supplied then the height must also be supplied, so this field will always contain two or four numbers.  For gtk versions prior to 2.10, the origin point is in the lower left corner of the page and translation values increase moving up and to the right.  For gtk version 2.10 and later, the origin point is in the upper left corner of the page and translation values increase moving down and to the right.<note><para>Regardless of whether the origin is at the top or the bottom of the page, the coordinates always specify the lower left point of the item.</para></note></entry>
-                </row>
-                <row>
-                  <entry>Font_<emphasis>n</emphasis></entry>
-                  <entry>string</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this is the font used to print this specific text item.  This field can contain any string that is acceptable by gtk as a font specifier.  If this field is omitted, the default font is the font specified in the <emphasis>Top</emphasis> section of the check description file, or if that was omitted the font specified in the &app; preferences dialog.  This field is only recognized when using gtk version 2.10 or later.</entry>
-                </row>
-                <row>
-                  <entry>Align_<emphasis>n</emphasis></entry>
-                  <entry>string</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this is the alignment used to print this specific text item.  This field must contain one of the strings <quote>left</quote>, <quote>center</quote> or <quote>right</quote>.  If this field is omitted, the text will be left aligned.  This field is only recognized when using gtk version 2.10 or later.</entry>
-                </row>
-                <row>
-                  <entry>Text_<emphasis>n</emphasis></entry>
-                  <entry>string</entry>
-                  <entry>optional</entry>
-                  <entry>This field is only used when the item type is <emphasis>TEXT</emphasis>. It specifies the utf-8 text that should be printed on the check.</entry>
-                </row>
-                <row>
-                  <entry>Filename_<emphasis>n</emphasis></entry>
-                  <entry>string</entry>
-                  <entry>optional</entry>
-                  <entry>This field is only used when the item type is <emphasis>PICTURE</emphasis>. It specifies the filename of the image that should be printed on the check.  The string may specify either an absolute path name or as a relative path name.  If a relative path name is specified, &app; first looks in in the application check format folder (typically <filename class="directory">/usr/share/gnucash/checks</filename>) for the image file, and if it isn’t found there then it looks in the user private <filename class="directory">~/.gnucash/checks</filename> directory for the image.  This field is only recognized when using gtk version 2.10 or later.</entry>
-                </row>
-                <row>
-                  <entry>Blocking_Chars_<emphasis>n</emphasis></entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this will set the print <emphasis>Blocking_Chars</emphasis> option for this item.</entry>
-                </row>
-                <row>
-                  <entry>DateFormat_<emphasis>n</emphasis></entry>
-                  <entry>boolean</entry>
-                  <entry>optional</entry>
-                  <entry>If supplied, this will set the print <emphasis>DateFormat</emphasis> option for this item.</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-          <para>These are the individual items that can be printed on a check.  All items require the coordinates on the page where the item should be printed.  The majority of these items result in text being printed on the page, and these items may have individual font and alignments specified.  For example, the numerical amount of a check could be printed right justified while everything else is printed left justified.  Other types may have unique parameters.</para>
-          <table id="check_table_types">
-            <title>Individual Check Item Types</title>
-            <tgroup cols="4">
-              <thead>
-                <row>
-                  <entry>Name</entry>
-                  <entry>Required Fields</entry>
-                  <entry>Optional Fields</entry>
-                  <entry>Description</entry>
-                </row>
-              </thead>
-              <tbody>
-                <row>
-                  <entry>PAYEE</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Coords_5 = 50.0;212.0</programlisting>
+    </sect2>
+
+    <sect2>
+      <title>Field Descriptions</title>
+
+      <sect3>
+        <title>Top Group</title>
+
+        <para>This section of the check file describes the overall layout of a page of checks (or check) that goes
+          into the printer.
+        </para>
+
+        <table id="check_table_top">
+          <title>Overall Page Description Fields</title>
+
+          <tgroup cols="4">
+            <thead>
+              <row>
+                <entry>
+                  Name
+                </entry>
+
+                <entry>
+                  Type
+                </entry>
+
+                <entry>
+                  Required
+                </entry>
+
+                <entry>
+                  Description
+                </entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>
+                  Guid
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  The guid is used to uniquely identify a check format to &app;. It must be unique
+                  across the entire set of application supplied and user supplied check formats. If
+                  you copy an application check file as the basis of your own check format, you must
+                  change this value. The <emphasis>uuidgen</emphasis> program may be used to
+                  generate these identifiers.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Title
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  The title is used to uniquely identify a check format to the user. This value is
+                  presented verbatim in the check format list of the check printing dialog. If you
+                  copy an application check file as the basis of your own check format, you should
+                  change this value. The title may be any utf-8 string.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Font
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this is the default font used to print all text items on this check.
+                  This field can contain any string that is acceptable by gtk as a font specifier.
+                  If this field is omitted, the default font is the font specified in the &app;
+                  preferences dialog. A typical string would be <quote>sans 12</quote>.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Blocking_Chars
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this is the default used when printing all <emphasis>TEXT</emphasis>
+                  items on this check. When set to true, will print <emphasis>***</emphasis> before
+                  and after each text field on the check. Blocking characters are printed to protect
+                  check fields from alteration. For example, the amount field may be printed as
+                  <emphasis>***100.00***</emphasis>
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  DateFormat
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this is the default used when printing all <emphasis>DATE</emphasis>
+                  items on this check. When set to true, will print the format of the DATE in 8
+                  point type, centered and below the actual DATE. For example DDMMYYYY.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Rotation
+                </entry>
+
+                <entry>
+                  double
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  This value specified the rotation of the entire page (in degrees) around the
+                  origin point. For gtk versions prior to 2.10, the origin point is in the lower
+                  left corner of the page and rotation values increase in the counter-clockwise
+                  direction. For gtk version 2.10 and later, the origin point is in the upper left
+                  corner of the page and rotation values increase in the clockwise direction.
+                  Rotation of the page is applied before translation.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Translation
+                </entry>
+
+                <entry>
+                  list of 2 doubles
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  These values specify the x and y translation of the entire page (in points)
+                  relative to the origin point. For gtk versions prior to 2.10, the origin point is
+                  in the lower left corner of the page and translation values increase moving up and
+                  to the right. For gtk version 2.10 and later, the origin point is in the upper
+                  left corner of the page and translation values increase moving down and to the
+                  right. Rotation of the page is applied before translation.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Show_Grid
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If this value is set to <emphasis>true</emphasis> then &app; will draw a grid on
+                  the page, starting at the origin with the lines spaced every 50 points. This can
+                  be helpful when creating a check format file.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Show_Boxes
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If this value is set to <emphasis>true</emphasis> then for each item where the
+                  width and height have been specified, &app; will draw a box showing location and
+                  maximum size of that item . This can be helpful when creating a check format file.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+
+        <note>
+          <para>The Blocking_Chars and DateFormat options are defined for all check formats in
+            Edit->Preferences->Printing. It is recommened that these global options be set to false
+            (the default), and that the options be set for individual Check Items as described
+            below.
+          </para>
+        </note>
+      </sect3>
+
+      <sect3>
+        <title>Check Positions Group</title>
+
+        <para>This group of items specifies how multiple checks are laid out on the same sheet of paper, and gives
+          names to each of these check locations so that a user can specify which check location
+          that &app; should print. This entire group of key/value pairs is optional, and should be
+          omitted if the format file only specifies a single check per page of paper.
+        </para>
+
+        <table id="check_table_positions">
+          <title>Multiple Checks Per Page Fields</title>
+
+          <tgroup cols="4">
+            <thead>
+              <row>
+                <entry>
+                  Name
+                </entry>
+
+                <entry>
+                  Type
+                </entry>
+
+                <entry>
+                  Required
+                </entry>
+
+                <entry>
+                  Description
+                </entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>
+                  Height
+                </entry>
+
+                <entry>
+                  double
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  This field specifies the height of a single check on the page. If there are
+                  multiple checks per page then this item is mandatory. If there is only a single
+                  check per page, this entire section should be omitted.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Names
+                </entry>
+
+                <entry>
+                  list of strings
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  This field specifies the names of the check locations that can be printed on each
+                  page. These names represent the check positions starting from the top of the page
+                  and moving downward. The names are presented verbatim in the check position list
+                  of the check printing dialog. A typical value for this field is
+                  "Top;Middle;Bottom", but it could also be "First;Second;Third" or any other set of
+                  strings that clearly identify the check locations. If there are multiple checks
+                  per page then this item is mandatory. If there is only a single check per page,
+                  this entire section should be omitted.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+      </sect3>
+
+      <sect3>
+        <title>Check Items Group</title>
+
+        <para>This section specifies the individual items that are printed on the check. There is no limit to the
+          number of items that may be present in this section, and any given type of item can be
+          repeated multiple times. This allows for the printing of checks that have a side stub, or
+          for the one-per-page business checks that have both the check and multiple check stubs on
+          the same page. For example, to print the payee name on a business check and on both stubs,
+          simply specify three payee items with differing print coordinates.
+        </para>
+
+        <para>Each key names in this section explicitly includes the item number to which it applies. E.G. The key
+          named <guilabel>Type_1</guilabel> applies to the first item to be printed, and the key
+          <guilabel>Coords_3</guilabel> applies to the third item to be printed. Item numbers start
+          at one and increase sequentially. Any gap in the numbering sequence is interpreted by
+          &app; as the end of the item list. Items are printed in the order of their item numbers,
+          not in the order in which they appear in the file.
+        </para>
+
+        <para>Each item specified must include a type declaration. The rest of the parameters for that item depend
+          upon the particular type of that item. See <xref linkend="check_table_types"></xref> for a
+          list of valid item types and their required parameters.
+        </para>
+
+        <table id="check_table_items">
+          <title>Individual Check Item Fields</title>
+
+          <tgroup cols="4">
+            <thead>
+              <row>
+                <entry>
+                  Name
+                </entry>
+
+                <entry>
+                  Type
+                </entry>
+
+                <entry>
+                  Required
+                </entry>
+
+                <entry>
+                  Description
+                </entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>
+                  Type_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  This field specifies the type of a single item to be printed on a check. See
+                  <xref linkend="check_table_types"></xref> for a list of valid item types.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Coords_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  list of 2 or 4 doubles
+                </entry>
+
+                <entry>
+                  mandatory
+                </entry>
+
+                <entry>
+                  This field specifies the coordinates where the item should be placed on a check,
+                  and optionally also specifies the width and height of the item. The numbers in
+                  order are the X and Y offset of the lower left corner of the item, and optionally
+                  the width and height of the item. If the width is supplied then the height must
+                  also be supplied, so this field will always contain two or four numbers. For gtk
+                  versions prior to 2.10, the origin point is in the lower left corner of the page
+                  and translation values increase moving up and to the right. For gtk version 2.10
+                  and later, the origin point is in the upper left corner of the page and
+                  translation values increase moving down and to the right.
+                  <note>
+                    <para>Regardless of whether the origin is at the top or the bottom of the page, the coordinates always
+                      specify the lower left point of the item.
+                    </para>
+                  </note>
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Font_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this is the font used to print this specific text item. This field
+                  can contain any string that is acceptable by gtk as a font specifier. If this
+                  field is omitted, the default font is the font specified in the
+                  <emphasis>Top</emphasis> section of the check description file, or if that was
+                  omitted the font specified in the &app; preferences dialog. This field is only
+                  recognized when using gtk version 2.10 or later.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Align_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this is the alignment used to print this specific text item. This
+                  field must contain one of the strings <quote>left</quote>, <quote>center</quote>
+                  or <quote>right</quote>. If this field is omitted, the text will be left aligned.
+                  This field is only recognized when using gtk version 2.10 or later.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Text_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  This field is only used when the item type is <emphasis>TEXT</emphasis>. It
+                  specifies the utf-8 text that should be printed on the check.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Filename_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  string
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  This field is only used when the item type is <emphasis>PICTURE</emphasis>. It
+                  specifies the filename of the image that should be printed on the check. The
+                  string may specify either an absolute path name or as a relative path name. If a
+                  relative path name is specified, &app; first looks in in the application check
+                  format folder (typically
+                  <filename class="directory">/usr/share/gnucash/checks</filename> ) for the image
+                  file, and if it is not found there then it looks in the user private
+                  <filename class="directory">&dir-data;checks</filename><footnoteref linkend="dir-old-chk" />
+                  directory for the image. This field is only recognized when using gtk version 2.10
+                  or later.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Blocking_Chars_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this will set the print <emphasis>Blocking_Chars</emphasis> option
+                  for this item.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  DateFormat_<emphasis>n</emphasis>
+                </entry>
+
+                <entry>
+                  boolean
+                </entry>
+
+                <entry>
+                  optional
+                </entry>
+
+                <entry>
+                  If supplied, this will set the print <emphasis>DateFormat</emphasis> option for
+                  this item.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+
+        <para>These are the individual items that can be printed on a check. All items require the coordinates on
+          the page where the item should be printed. The majority of these items result in text
+          being printed on the page, and these items may have individual font and alignments
+          specified. For example, the numerical amount of a check could be printed right justified
+          while everything else is printed left justified. Other types may have unique parameters.
+        </para>
+
+        <table id="check_table_types">
+          <title>Individual Check Item Types</title>
+
+          <tgroup cols="4">
+            <thead>
+              <row>
+                <entry>
+                  Name
+                </entry>
+
+                <entry>
+                  Required Fields
+                </entry>
+
+                <entry>
+                  Optional Fields
+                </entry>
+
+                <entry>
+                  Description
+                </entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>
+                  PAYEE
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the check payee name at the specified coordinates.</entry>
-                </row>
-                <row>
-                  <entry>DATE</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the check payee name at the specified
+                  coordinates.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  DATE
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
 Blocking_Chars
-DateFormat
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the check date at the specified coordinates.</entry>
-                </row>
-                <row>
-                  <entry>NOTES</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+DateFormat</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the check date at the specified coordinates.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  NOTES
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the transaction notes field at the specified coordinates.</entry>
-                </row>
-                <row>
-                  <entry>CHECK_NUMBER</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the transaction notes field at the specified
+                  coordinates.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  CHECK_NUMBER
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app;
-                    to print the check number at the specified coordinates. The
-                    check number reflects the book option selection under
-                    <menuchoice><guimenu>File</guimenu><guimenuitem>Properties
-                    </guimenuitem></menuchoice> for number source (transaction
-                    number or anchor-split action - see <ulink type="help"
-                    url="ghelp:gnucash-help?num-action-book-option">Use Split
-                    Action Field for Number</ulink> in the Book Options section
-                    of the &app; Help Manual).
-                  </entry>
-                </row>
-                <row>
-                  <entry>MEMO</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the check number at the specified
+                  coordinates. The check number reflects the book option selection under
+                  <menuchoice>
+                    <guimenu>File</guimenu><guimenuitem>Properties </guimenuitem>
+                  </menuchoice>
+                  for number source (transaction number or anchor-split action - see
+                  <ulink type="help"
+                    url="ghelp:gnucash-help?num-action-book-option">Use
+                  Split Action Field for Number</ulink> in the Book Options section of the &app;
+                  Help Manual).
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  MEMO
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the split memo field at the specified coordinates.</entry>
-                </row>
-                <row>
-                  <entry>ACTION</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the split memo field at the specified
+                  coordinates.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  ACTION
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app;
-                    to print the split action field at the specified coordinates.
-                    However, the printed field reflects the book option selection
-                    under <menuchoice><guimenu>File</guimenu><guimenuitem>
-                    Properties</guimenuitem></menuchoice> for number source
-                    (transaction number or anchor-split action - see <ulink
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the split action field at the specified
+                  coordinates. However, the printed field reflects the book option selection under
+                  <menuchoice>
+                    <guimenu>File</guimenu><guimenuitem> Properties</guimenuitem>
+                  </menuchoice>
+                  for number source (transaction number or anchor-split action - see
+                  <ulink
                     type="help" url="ghelp:gnucash-help?num-action-book-option">
-                    Use Split Action Field for Number</ulink> in the Book
-                    Options section of the &app; Help
-                    Manual). If number source for the book is specified as
-                    anchor-split action, this field will instead print the
-                    transaction number field.
-                  </entry>
-                </row>
-                <row>
-                  <entry>AMOUNT_WORDS</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+                  Use Split Action Field for Number</ulink> in the Book Options section of the &app;
+                  Help Manual). If number source for the book is specified as anchor-split action,
+                  this field will instead print the transaction number field.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  AMOUNT_WORDS
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the check amount in words at the specified coordinates.  The amount will appear similar to the string "One thousand, two hundred thirty four and 56/100".</entry>
-                </row>
-                <row>
-                  <entry>AMOUNT_NUMBER</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the check amount in words at the specified
+                  coordinates. The amount will appear similar to the string "One thousand, two
+                  hundred thirty four and 56/100".
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  AMOUNT_NUMBER
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the check amount in numbers at the specified coordinates.  The amount will appear similar to the number "$1,234.56".</entry>
-                </row>
-                <row>
-                  <entry>ADDRESS</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the check amount in numbers at the specified
+                  coordinates. The amount will appear similar to the number "$1,234.56".
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  ADDRESS
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the address at the specified coordinates.</entry>
-                </row>
-                <row>
-                  <entry>SPLITS_ACCOUNT</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the address at the specified coordinates.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  SPLITS_ACCOUNT
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the account names for each split entry stating at the specified coordinates. See the note on splits printing.</entry>
-                </row>
-                <row>
-                  <entry>SPLITS_AMOUNT</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the account names for each split entry
+                  stating at the specified coordinates. See the note on splits printing.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  SPLITS_AMOUNT
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the amount for each split entry stating at the specified coordinates.  Amounts are printed with currency symbols. See the note on splits printing.</entry>
-                </row>
-                <row>
-                  <entry>SPLITS_MEMO</entry>
-                  <entry>Coords</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the amount for each split entry stating at
+                  the specified coordinates. Amounts are printed with currency symbols. See the note
+                  on splits printing.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  SPLITS_MEMO
+                </entry>
+
+                <entry>
+                  Coords
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print the memo text for each split entry stating at the specified coordinates. See the note on splits printing.</entry>
-                </row>
-                <row>
-                  <entry>TEXT</entry>
-                  <entry>Coords, Text</entry>
-                  <entry>
-                    <literallayout>Font
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print the memo text for each split entry stating at
+                  the specified coordinates. See the note on splits printing.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  TEXT
+                </entry>
+
+                <entry>
+                  Coords, Text
+                </entry>
+
+                <entry>
+<literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
-                  </entry>
-                  <entry>This type value tells &app; to print an arbitrary string at the specified coordinates. The string to be printed is specified with the <emphasis>Text_n</emphasis> key.</entry>
-                </row>
-                <row>
-                  <entry>PICTURE</entry>
-                  <entry>Coords, Filename</entry>
-                  <entry>(none)</entry>
-                  <entry>This type value tells &app; to print an image at the specified coordinates. The image to be printed is specified with the <emphasis>Filename_n</emphasis> key.  This type is only recognized when using gtk version 2.10 or later.</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-          <note>
-           <para>SPLIT items include all split entries for the transaction
-            except for the split that applies to the current account register
-            (referred to as the anchor-split).  This is usually the last split
-            listed when splits are displayed in the register.  The coordinate
-            location defines the lower left location for the split information.
-           </para>
-          </note>
-        </sect3>
-      </sect2>
-      <sect2 id="check_format_notes">
-        <title>Creating Check Format Files</title>
-        <para>Creating your own check format file is a fairly simple task.  The easiest way to start is to copy an existing check format file from the application directory (typically <filename class="directory">/usr/share/gnucash/checks</filename>) to the directory <filename class="directory">~/.gnucash/checks</filename>.  Make sure to change the guid so the new file will be accepted by gnucash, and change the title to something descriptive.  Then change or add individual item fields as necessary.  You can also create a new check file by clicking the <guibutton>Save Format</guibutton> button on the <guilabel>Custom format</guilabel> page of the check printing dialog.</para>
+Blocking_Chars</literallayout>
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print an arbitrary string at the specified
+                  coordinates. The string to be printed is specified with the
+                  <emphasis>Text_n</emphasis> key.
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  PICTURE
+                </entry>
+
+                <entry>
+                  Coords, Filename
+                </entry>
+
+                <entry>
+                  (none)
+                </entry>
+
+                <entry>
+                  This type value tells &app; to print an image at the specified coordinates. The
+                  image to be printed is specified with the <emphasis>Filename_n</emphasis> key.
+                  This type is only recognized when using gtk version 2.10 or later.
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+
         <note>
-          <para>Key names are case sensitive.  If you’re having problems with a check format file, ensure that all key names have capital letters as documented above.</para>
+          <para>SPLIT items include all split entries for the transaction except for the split that applies to the
+            current account register (referred to as the anchor-split). This is usually the last
+            split listed when splits are displayed in the register. The coordinate location defines
+            the lower left location for the split information.
+          </para>
         </note>
-      </sect2> 
-    </sect1> -->
+      </sect3>
+    </sect2>
+
+    <sect2 id="check_format_notes">
+      <title>Creating Check Format Files</title>
+
+      <para>Creating your own check format file is a fairly simple task. The easiest way to start is to copy an
+        existing check format file from the application directory (typically
+        <filename class="directory">/usr/share/gnucash/checks</filename>) to the directory
+        <filename class="directory">&dir-data;checks</filename><footnoteref linkend="dir-old-chk" />.
+        Make sure to change the guid so the new file will be accepted by gnucash, and change the
+        title to something descriptive. Then change or add individual item fields as necessary. You
+        can also create a new check file by clicking the <guibutton>Save Format</guibutton> button
+        on the <guilabel>Custom format</guilabel> page of the check printing dialog.
+      </para>
+
+      <note>
+        <para>Key names are case sensitive. If you are having problems with a check format file, ensure that all
+          key names have capital letters as documented above.
+        </para>
+      </note>
+    </sect2>
+  </sect1> -->
 </appendix>
diff --git a/guide/pt/ch_bus_pay.xml b/guide/pt/ch_bus_pay.xml
index 5426847..e08d3e0 100644
--- a/guide/pt/ch_bus_pay.xml
+++ b/guide/pt/ch_bus_pay.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-        updated Patrick Schweiger <pks at spiffykitty.com>
+    Jon Lapham <lapham at extracta.com.br>
+  Updated:
+    Patrick Schweiger <pks at spiffykitty.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_bus_pay">
   <title>Payroll</title>
 
+  <para>&untranslated-pt;
+  </para>
   <para>Payroll is a financial record of wages, net pay, paid vacations, and deductions for an employee.
     This chapter demonstrates how to track payroll using &app;
   </para>
@@ -60,8 +62,7 @@
       all of your employees. The taxes are later paid to the appropriate government agency.
     </para>
 
-    <para><literallayout>
-Simple Payroll Account Layout:
+    <para><screen>Simple Payroll Account Layout:
 
 -Assets
    -Checking
@@ -71,8 +72,7 @@ Simple Payroll Account Layout:
 -Expenses
    -Salaries
    -Tax1
-   -Tax2
-  </literallayout>
+   -Tax2</screen>
       <note>
         <para>Resist the temptation to create per-employee sub-accounts to track individual salaries. Creating a
           sub-account for each employee leads to unmanageably large lists of accounts. Imagine the
@@ -152,7 +152,7 @@ Simple Payroll Account Layout:
       <title>Step 2: Create the Transaction Map</title>
 
       <para>When you record payroll in &app;, do so with a single split transaction. This split transaction
-        populates the appropriate expense and liability accounts. If you need to look the payroll
+        populates the appropriate expense and liability accounts. If you need to look at the payroll
         details at a later time, open the split transaction.
       </para>
 
diff --git a/guide/pt/ch_bus_setup.xml b/guide/pt/ch_bus_setup.xml
index 42b2f4a..15511e7 100644
--- a/guide/pt/ch_bus_setup.xml
+++ b/guide/pt/ch_bus_setup.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 1.0.0
   Last modified: Sep 19th 2015
   Maintainers:
-               Chris Good <chris.good at ozemail.com.au>
+    Chris Good <chris.good at ozemail.com.au>
   Author:
-  		Chris Good <chris.good at ozemail.com.au>
-	updated [FirstName LastName] <name at company.com>
+    Chris Good <chris.good at ozemail.com.au>
+    updated [FirstName LastName] <name at company.com>
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_bus_setup">
   <title>Business Setup</title>
@@ -73,8 +72,7 @@
       with account type <emphasis>A/Payable</emphasis>. &app; will use this account to place
       transactions related to the integrated accounts payable system.
     </para>
-<literallayout>
-Basic A/R and A/P Account Hierarchy:
+<screen>Basic A/R and A/P Account Hierarchy:
 
 -Assets
    -Accounts Receivable
@@ -87,8 +85,7 @@ Basic A/R and A/P Account Hierarchy:
   -Accounts Payable
   -Tax
       -Tax on Purchases
-      -Tax on Sales
-  </literallayout>
+      -Tax on Sales</screen>
     <para>You need to add additional accounts to this hierarchy for it to be useful.
     </para>
 
diff --git a/guide/pt/ch_capgain.xml b/guide/pt/ch_capgain.xml
index ab8e3cd..f5c4055 100644
--- a/guide/pt/ch_capgain.xml
+++ b/guide/pt/ch_capgain.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Pedro Albuquerque <bengt at thuree.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (Pedro Albuquerque <palbuquerque73 at gmail.com>)
+    Pedro Albuquerque <palbuquerque73 at gmail.com>
 -->
 <chapter id="chapter_capgain">
   <title>Ganhos de capital</title>
@@ -134,7 +133,7 @@
       <para>Deverá criar uma estrutura igual para cada ativo que pretenda controlar, ITEM1, ITEM2, ..., ITEMN.
       </para>
     </note>
-<literallayout>
+<screen>
 -Ativos
     -Ativos atuais
         -Conta poupança
@@ -147,8 +146,7 @@
             -Ganhos não realizados
 -Receita
     -Ganhos realizados
-    -Ganhos não realizados
-  </literallayout>
+    -Ganhos não realizados</screen>
   </sect1>
 
   <sect1 id="capgain_example1">
diff --git a/guide/pt/ch_cc.xml b/guide/pt/ch_cc.xml
index 89e55b2..b1779e2 100644
--- a/guide/pt/ch_cc.xml
+++ b/guide/pt/ch_cc.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: de julho de 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Bengt Thuree <bengt at thuree.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Bengt Thuree <bengt at thuree.com>
   Originally written by Carol Champagne.
   Translators:
-               (Pedro Albuquerque <palbuquerque73 at gmail.com>)
+    Pedro Albuquerque <palbuquerque73 at gmail.com>
 -->
 <chapter id="chapter_cc">
   <title>Cartões de crédito</title>
@@ -71,14 +70,13 @@
       <para>Se não quer controlar cada despesa feita com o cartão de crédito, pode configurar um plano de
         contas simples, como este:
       </para>
-<literallayout>
+<screen>
 -Ativos
    -Banco
 -Passivo
    -Cartão de crédito
 -Despesas
-   -Cartão de crédito
-   </literallayout>
+   -Cartão de crédito</screen>
       <para>Neste exemplo, insere o montante total gasto com o cartão por mês como uma transação entre
         <emphasis>Passivo:Cartão de crédito</emphasis> e <emphasis>Despesas:Cartão de
         crédito</emphasis>. Quando fizer um pagamento, insere uma transação entre
@@ -99,7 +97,7 @@
         então inserida como uma transação separada entre a conta do passivo e uma conta de
         despesa específica. Abaixo encontra um exemplo de plano de contas deste tipo:
       </para>
-<literallayout>
+<screen>
 -Ativos
     -Banco
 -Passivo
@@ -110,8 +108,7 @@
     -Roupas
     -Lazer
     -Juros
-    -Taxas de serviço
-   </literallayout>
+    -Taxas de serviço</screen>
       <para>Claramente, deve criar contas de despesa que se adequem aos seus hábitos de consumo. A única
         diferença entre esta configuração e a outra mais simples, é que as despesas foram
         divididas em grupos. Note ainda que há uma despesa de tipo <quote>Juros</quote>, usada
diff --git a/guide/pt/ch_currency.xml b/guide/pt/ch_currency.xml
index 9188272..2a60d01 100644
--- a/guide/pt/ch_currency.xml
+++ b/guide/pt/ch_currency.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.4.0
   Last modified: March 16th 2010
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Pedro Albuquerque <bengt at thuree.com>
-  	Updated	Pedro Albuquerque <janssens-geert at telenet.be>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated  Bengt Thuree <bengt at thuree.com>
+    Updated Geert Janssens <janssens-geert at telenet.be>
   Originally designed by Carol Champagne.
   Translators:
-               (Pedro Albuquerque <palbuquerque73 at gmail.com)
+    (Pedro Albuquerque <palbuquerque73 at gmail.com)
 -->
 <chapter id="chapter_currency">
   <title>Múltiplas moedas</title>
@@ -88,7 +87,7 @@
       Euro, outra em dólares americanos e outra em dólares de Hong Kong. Uma estrutura de contas
       possível seria:
     </para>
-<literallayout>
+<screen>
 -Ativos                          (USD)
    -Ativos atuais                (USD)
       -Banco americano           (USD)
@@ -97,9 +96,8 @@
 -Capital próprio                 (USD)
    -Saldos iniciais 
       -USD                       (USD)
-      -EUR                       (EUR)   
-      -HKD                      (HKD)
-    </literallayout>
+      -EUR                       (EUR)
+      -HKD                       (HKD)</screen>
     <note>
       <para>A moeda de cada conta é mostrada entre parênteses.
       </para>
@@ -493,7 +491,7 @@
 
       <para>Para registar isto no &app; vamos usar a seguinte estrutura de contas:
       </para>
-<literallayout>
+<screen>
 -Ativos                      (USD)
    -Ativos atuais            (USD)
       -Banco europeu         (USD)
@@ -502,8 +500,7 @@
       -Barco                 (JMD)
 -Capital próprio             (USD)
    -Saldos iniciais 
-      -USD                   (USD)
-      </literallayout>
+      -USD                   (USD)</screen>
       <note>
         <para>A moeda de cada conta é mostrada entre parênteses.
         </para>
@@ -643,13 +640,12 @@
       <para>Dado que também queremos controlar os vários montantes de receita e despesa, criámos a seguinte
         estrutura de contas:
       </para>
-<literallayout>
+<screen>
 Ativos:Investimentos:Conta na corretora:Boom:0694.HK     (Beijing Airport)
-Ativos:Investimentos:Conta na corretora:Boom:Banco        (HKD)
-Capital próprio:Saldos iniciais:HKD                            (HKD)
-Despesas:Comissões:Boom.0694.HK                      (HKD)
-Receitas:Investimentos:Dividendos:Boom:0694.HK               (HKD)
-      </literallayout>
+Ativos:Investimentos:Conta na corretora:Boom:Banco       (HKD)
+Capital próprio:Saldos iniciais:HKD                      (HKD)
+Despesas:Comissões:Boom.0694.HK                          (HKD)
+Receitas:Investimentos:Dividendos:Boom:0694.HK           (HKD)</screen>
       <para>Eis o plano de contas após criar todas as contas necessárias:
       </para>
 
@@ -705,12 +701,11 @@ Receitas:Investimentos:Dividendos:Boom:0694.HK               (HKD)
         corretora HKD (<emphasis>Ativos:Investimentos:Conta na corretora:Boom:Banco</emphasis>) e
         insira o seguinte:
       </para>
-<literallayout>
+<screen>
 Compra de ações
-	Ativos:Investimentos:Conta na corretora:Boom:Banco  Levantamento 50.000
-	Despesas:Investimentos:Comissão:Boom:HKD	Depósito 500
-	Ativos:Investimentos:Conta na corretora:Boom:0694  Depósito 49,500 (16,500 shares)
-</literallayout>
+    Ativos:Investimentos:Conta na corretora:Boom:Banco  Levantamento 50.000
+    Despesas:Investimentos:Comissão:Boom:HKD            Depósito        500
+    Ativos:Investimentos:Conta na corretora:Boom:0694   Depósito     49,500 (16,500 shares)</screen>
       <para>Se o diálogo de taxa de câmbio não abrir automaticamente, clique com o botão direito do rato na
         linha da ação e selecione <guilabel>Editar taxa de câmbio</guilabel>. Insira o número de
         ações (16,500) como <guilabel>Montante de destino</guilabel>.
@@ -791,17 +786,17 @@ Compra de ações
 
     <para>Se não está interessado em detalhes, é suficiente uma estrutura de contas bastante simples:
     </para>
-<literallayout>
-    Ativos:Investimentos:Moeda:Banco (USD)
-    Ativos:Investimentos:Moeda:XXX (XXX)</literallayout>
+<screen>
+    Ativos:Investimentos:Moeda:Banco   (USD)
+    Ativos:Investimentos:Moeda:XXX     (XXX)</screen>
     <para>Mas, se quiser ser capaz de controlar ganhos ou perdas de capital, assim como as várias taxas, tem
       de criar uma disposição um pouco mais complexa:
     </para>
-<literallayout>
-    Ativos:Investimentos:Moeda:Banco                    (USD)
-    Ativos:Investimentos:Moeda:Banco da moeda:XXX       (XXX)
-    Despesas:Investimentos:Moeda:Banco da moeda:XXX     (XXX)
-    Receitas:Investimentos:Banco da moeda:Ganhos de capital:XXX  (XXX)</literallayout>
+<screen>
+Ativos:Investimentos:Moeda:Banco                              (USD)
+Ativos:Investimentos:Moeda:Banco da moeda:XXX                 (XXX)
+Despesas:Investimentos:Moeda:Banco da moeda:XXX               (XXX)
+Receitas:Investimentos:Banco da moeda:Ganhos de capital:XXX   (XXX)</screen>
     <para>Onde XXX é a moeda em que está a investir.
     </para>
 
@@ -1097,9 +1092,8 @@ Compra de ações
         em MacOS) para escolher AUD como moeda predefinida. Uma vez que decidiu controlar o maior
         número de detalhes de receitas e despesas, pode usar a seguinte hierarquia de contas:
       </para>
-<literallayout>
-Ativos:Ativos atuais:Conta poupança         (AUD)
-      </literallayout>
+<screen>
+Ativos:Ativos atuais:Conta poupança         (AUD)</screen>
       <para></para>
     </sect2>
 
@@ -1114,10 +1108,9 @@ Ativos:Ativos atuais:Conta poupança         (AUD)
 
       <para>Para registar estas transações, precisamos das seguintes contas:
       </para>
-<literallayout>
-Capital próprio:Lotaria  (AUD)
-Capital próprio:Herança (AUD)      
-      </literallayout>
+<screen>
+Capital próprio:Lotaria   (AUD)
+Capital próprio:Herança   (AUD)</screen>
       <para>As transações que inserir na conta <emphasis>Ativos:Ativos atuais:Conta poupança</emphasis> devem
         parecer-se com isto:
       </para>
@@ -1196,12 +1189,11 @@ Capital próprio:Herança (AUD)
       <para>Por fim pode acabar de pagar aquele crédito à habitação que contraiu há alguns anos atrás (com
         um depósito de 50.000).
       </para>
-<literallayout>
+<screen>
 Ativos:Ativos fixos:Casa                  (AUD) 300.000
-Passivo:Empréstimos:Hipoteca                 (AUD) 250.000
-Despesas:Juros:Juros da hipoteca        (AUD)
-Capital próprio:Saldo inicial                     (AUD) 50.000
-      </literallayout>
+Passivo:Empréstimos:Hipoteca              (AUD) 250.000
+Despesas:Juros:Juros da hipoteca          (AUD)
+Capital próprio:Saldo inicial             (AUD)  50.000</screen>
       <para>Após ter uma breve conversa com o banco do crédito à habitação, eles concordaram em receber o
         pagamento total do crédito, mais alguns juros (AUD 30.000). Deve inserir a seguinte
         transação com parcelas na conta <emphasis>Ativos:Ativos fixos:Casa</emphasis>.
@@ -1299,18 +1291,17 @@ Capital próprio:Saldo inicial                     (AUD) 50.000
 
       <para>As contas necessárias para controlar estes investimentos são as seguintes:
       </para>
-<literallayout>
-Ativos:Investimentos:Corretor sueco:ERIC.ST                 (AÇÃO ERIC.ST Yahoo)
-Ativos:Investimentos:Corretor sueco:Banco                    (SEK)
-Ativos:Investimentos:Corretor HK:0694.HK                      (AÇÃO 0694.HK Yahoo)
-Ativos:Investimentos:Corretor HK:Banco                         (HKD)
-Ativos:Investimentos:Corretor EUA:AMZN                         (AÇÃO AMZN Nasdaq)
-Ativos:Investimentos:Corretor EUA:Banco                         (USD)
+<screen>
+Ativos:Investimentos:Corretor sueco:ERIC.ST               (AÇÃO ERIC.ST Yahoo)
+Ativos:Investimentos:Corretor sueco:Banco                 (SEK)
+Ativos:Investimentos:Corretor HK:0694.HK                  (AÇÃO 0694.HK Yahoo)
+Ativos:Investimentos:Corretor HK:Banco                    (HKD)
+Ativos:Investimentos:Corretor EUA:AMZN                    (AÇÃO AMZN Nasdaq)
+Ativos:Investimentos:Corretor EUA:Banco                   (USD)
 Despesas:Investimentos:Comissões:Corretor sueco:ERIC.ST   (SEK)
-Despesas:Investimentos:Comissões:Corretor HK:0694.HK        (HKD)
-Despesas:Investimentos:Comissões:Corretor EUA:AMZN           (USD)
-Despesas:Investimentos:Transferência de dinheiro                    (AUD)
-</literallayout>
+Despesas:Investimentos:Comissões:Corretor HK:0694.HK      (HKD)
+Despesas:Investimentos:Comissões:Corretor EUA:AMZN        (USD)
+Despesas:Investimentos:Transferência de dinheiro          (AUD)</screen>
       <para>Decide investir 100.000 AUD em cada empresa e para tal, tem de fazer uma transação de moeda para
         cada uma das contas bancárias associadas à ação.
       </para>
@@ -1544,11 +1535,10 @@ Despesas:Investimentos:Transferência de dinheiro                    (AUD)
         ajudá-lo com um empréstimo pessoal de 40.000€.
       </para>
 
-      <para><literallayout>
-Ativos:Dinheiro que me devem:Euro:José da Esquina            (Euro)
-Receitas:Juros Receitas:José da Esquina                  (Euro)
-Despesas:Taxa bancária                      (AUD)
-        </literallayout>
+      <para><screen>
+Ativos:Dinheiro que me devem:Euro:José da Esquina   (Euro)
+Receitas:Juros Receitas:José da Esquina             (Euro)
+Despesas:Taxa bancária                              (AUD)</screen>
       </para>
 
       <para>Esta é uma transação simples de moeda a partir da sua conta poupança para a conta
@@ -1586,13 +1576,12 @@ Despesas:Taxa bancária                      (AUD)
 
       <para>Precisaria das seguintes contas para este exemplo:
       </para>
-<literallayout>
+<screen>
 Passivo:Empréstimos:Empréstimo japonês             (JPY)
 Despesas:Juros:Empréstimo japonês                  (JPY)
 Despesas:Taxas da hipoteca:Empréstimo japonês      (JPY)
 Ativos:Ativos atuais:Banco japonês                 (JPY)
-Ativos:Ativos fixos:Casa na NZ                     (NZ)
-</literallayout>
+Ativos:Ativos fixos:Casa na NZ                     (NZ)</screen>
       <table>
         <title>Compra de uma casa na NZ com uma transação com parcelas</title>
 
diff --git a/guide/pt/ch_dep.xml b/guide/pt/ch_dep.xml
index 261b686..8140f0d 100644
--- a/guide/pt/ch_dep.xml
+++ b/guide/pt/ch_dep.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!--  (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   	Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_dep">
   <title>Depreciation</title>
@@ -132,7 +131,7 @@
       </para>
 
       <para>You also need to know the estimated salvage value of the asset. Generally, this is assumed to be
-        zero. The idea behind knowing the salvage value is that the asset will be depreciated untill
+        zero. The idea behind knowing the salvage value is that the asset will be depreciated until
         the net book value (cost less depreciation) equals the salvage value. Then, when the asset
         is written off, you will not have a gain or loss resulting from the disposal of the asset.
       </para>
@@ -595,7 +594,7 @@
       Depreciation</emphasis> account is balanced by the <emphasis>Expenses:Depreciation</emphasis>
       account.
     </para>
-<literallayout>
+<screen>
 -Assets
    -Fixed Assets
       -ITEM1
@@ -607,8 +606,7 @@
    -Current Assets
       -Bank
 -Expense
-   -Depreciation        (Depreciation Expense account)
-  </literallayout>
+   -Depreciation        (Depreciation Expense account)</screen>
     <para>One of the features of the account hierarchy shown above is that you can readily see some important
       summary values about your depreciating asset. The <emphasis>Assets:Fixed
       Assets:ITEM1</emphasis> account total shows you the current estimated value for item1, the
diff --git a/guide/pt/ch_invest.xml b/guide/pt/ch_invest.xml
index db4341b..448513d 100644
--- a/guide/pt/ch_invest.xml
+++ b/guide/pt/ch_invest.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: December 7th 2009
        modified: January 10th 2007
        modified: July 9th 2006
-  Maintainers: 
-               Alex Aycinena <alex.aycinena at gmail.com>
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Alex Aycinena <alex.aycinena at gmail.com>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Pedro Albuquerque <dvherman at bigfoot.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Dave Herman <dvherman at bigfoot.com>
   Originally designed by Carol Champagne.
   Translators:
-               (Pedro Albuquerque palbuquerque73 at gmail.com)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_invest">
-  <title>Investimentos</title>
+  <title>Investments</title>
 
   <para>Este capítulo explica como gerir os seus investimentos com o &app;. A maioria das pessoas tem um
     plano de investimento, Seja ele simplesmente pôr dinheiro numa conta a prazo, seja um plano de
@@ -383,7 +382,7 @@
         controlar os seus investimentos, que tem a vantagem de agrupar cada diferente investimento
         sob a corretora que os negoceia. Assim é mais fácil comparar os extratos que recebe com as
         suas contas no &app; e detetar onde o &app; difere dos extratos.
-<literallayout>
+<screen>
  Ativos
     Investimentos
        Contas da corretora
@@ -430,8 +429,7 @@
           Meu corretor
        Taxas de gestão
           Eu*Negoceio
-          Meu corretor
- </literallayout>
+          Meu corretor</screen>
       </para>
 
       <tip>
@@ -460,7 +458,7 @@
         as taxas bancárias. Abaixo está uma disposição exemplo de contas, na qual tem uma conta
         poupança remunerada e um certificado de depósito no seu banco.
       </para>
-<literallayout>
+<screen>
 Ativos
    Banco ABC
       Certificado de depósito
@@ -471,8 +469,7 @@ Despesas
 Receita
    Receita de juros
       Certificado de depósito
-      Conta poupança
-  </literallayout>
+      Conta poupança</screen>
       <para>Como habitual, esta estrutura é mostrada como exemplo, deve criar a sua própria estrutura da forma
         que melhor corresponda à sua situação real.
       </para>
@@ -635,7 +632,7 @@ Receita
         ações na Amazon, na IBM e na NSTAR, respetivamente. Abaixo está o modelo esquemático da
         disposição, só com as subcontas de Ativos.
       </para>
-<literallayout>
+<screen>
  Ativos
     Investimentos
        Contas na corretora
@@ -645,8 +642,7 @@ Receita
           Ação
              AMZN
              IBM
-             NST
- </literallayout>
+             NST</screen>
       <note>
         <para>Se quer controlar receitas (dividendos/juro/ganhos de capital) por ação ou fundo, tem de criar uma
           conta <emphasis>Receitas:Dividendos:SÍMBOLO</emphasis>, <emphasis>Receitas:Ganhos de
diff --git a/guide/pt/ch_loans.xml b/guide/pt/ch_loans.xml
index 3822089..6314359 100644
--- a/guide/pt/ch_loans.xml
+++ b/guide/pt/ch_loans.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
+  Maintainers:
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Pedro Albuquerque <bengt at thuree.com>
+    Jon Lapham <lapham at extracta.com.br>
+  	Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (Pedro Albuquerque <palbuquerque73 at gmail.com)
+    Pedro Albuquerque <palbuquerque73 at gmail.com
 -->
 <chapter id="chapter_loans">
   <title>Empréstimos</title>
@@ -129,8 +128,7 @@
       dinheiro do empréstimo é um ativo. Com estes parâmetros, podemos agora criar uma estrutura
       básica de contas para um empréstimo:
     </para>
-<literallayout>
-Estrutura básica de contas para um empréstimo
+<screen>Estrutura básica de contas para um empréstimo
 
 -Ativo
     -Ativos
@@ -143,8 +141,7 @@ Estrutura básica de contas para um empréstimo
 -Despesas
    -Juros
        -Juros do empréstimo
-   -Taxas administrativas
-  </literallayout>
+   -Taxas administrativas</screen>
     <para>O &app; tem um grande número de árvores de contas predefinidas para empréstimos disponível,
       incluindo crédito automóvel e crédito à habitação. Para aceder a estas árvores
       predefinidas, clique em
@@ -289,7 +286,7 @@ Estrutura básica de contas para um empréstimo
 
       <para>Para podermos discutir as fórmulas matemáticas usadas pela <guilabel>calculadora de amortização
         de empréstimos</guilabel>, primeiro temos de definir algumas variáveis.
-<literallayout>
+<screen>
  n  == número de período de pagamentos
  %i  == taxa de juro nominal aplicada, TAN
  VA  == valor atual
@@ -299,18 +296,18 @@ Estrutura básica de contas para um empréstimo
  FP == frequência de pagamento por ano
 
 Valores normais para FC e FP são:
-   1   == anual
-   2   == semestral
-   3   == quadrimestral
-   4   == trimestral
-   6   == bimensal
-   12  == mensalmente
-   24  == quinzenalmente
-   26  == quinzenal
-   52  == semanalmente
-   360 == diariamente
-   365 == diariamente
-</literallayout>
+   1  == anual
+   2  == semestral
+   3  == quadrimestral
+   4  == trimestral
+   6  == bimensal
+  12  == mensalmente
+  24  == quinzenalmente
+  26  == quinzenal
+  52  == semanalmente
+ 360  == diariamente
+ 365  == diariamente
+</screen>
       </para>
 
       <sect3 id="loans_calcsdetails_i2">
@@ -322,15 +319,13 @@ Valores normais para FC e FP são:
           i, o cálculo produz a taxa de juro efetiva, ief. Logo, precisamos de funções para
           converter i em ief e ief em i.
         </para>
-<literallayout>
-Para converter de i em ieff,são usadas as seguintes expressões:
+<screen>Para converter de i em ieff,são usadas as seguintes expressões:
 Juro discreto:     <emphasis>ief = (1 + i/FC)^(FC/FP) - 1</emphasis>
 Juro contínuo: <emphasis>ief = e^(i/FP) - 1 = exp(i/FP) - 1</emphasis>
 
 Para converter ief em i, São usadas as seguintes expressões:
 Juro discreto:      <emphasis>i = FC*[(1+ief)^(FP/FP) - 1]</emphasis>
-Juro contínuo: <emphasis>i = ln[(1+ief)^FP]</emphasis>
-</literallayout>
+Juro contínuo: <emphasis>i = ln[(1+ief)^FP]</emphasis></screen>
         <note>
           <para>Nas equações abaixo para a transação financeira, todas as taxas de juro são efetivas,
             <quote>ief</quote>.
@@ -344,19 +339,18 @@ Juro contínuo: <emphasis>i = ln[(1+ief)^FP]</emphasis>
         <para>Há uma equação que fundamentalmente, liga as cinco variáveis. É conhecida pela equação
           financeira básica:
         </para>
-<literallayout>
+<screen>
 <emphasis>VA*(1 + ief)^n + PGT*(1 + iefX)*[(1+ief)^n - 1]/ief + VF = 0</emphasis>
 
   Onde: X = 0 para pagamentos no final do período e 
-         X = 1 para pagamentos no início do período
-</literallayout>
+         X = 1 para pagamentos no início do período</screen>
         <para>A partir desta equação, podem ser derivadas funções resolvidas em ordem a cada variável
           individual. Para uma explicação detalhada sobre a derivação desta equação, veja os
           comentários no ficheiro src/calculation/fin.c, no código fonte do &app;. As variáveis
           A, B, e C são definidas primeiro, para tornar as equações posteriores mais simples de
           ler.
         </para>
-<literallayout>
+<screen>
 <emphasis>A = (1 + ief)^n - 1</emphasis>
 <emphasis>B = (1 + iefX)/ief</emphasis>
 <emphasis>C = PGT*B</emphasis>
@@ -369,8 +363,7 @@ Juro contínuo: <emphasis>i = ln[(1+ief)^FP]</emphasis>
 A solução para o juro é dividida em dois casos: 
 O caso mais simples para quando PGT == 0 dá a solução:
 <emphasis>i = [VF/VA]^(1/n) - 1</emphasis>
-
-</literallayout>
+</screen>
         <para>O caso em que PGT != 0 é razoavelmente complexo e não será discutido aqui. Em vez de envolver uma
           função exatamente resolúvel, determinar a taxa de juro quando PMT !=0 envolve um
           processo interativo. Por favor, veja o ficheiro src/calculation/fin.para uma explicação
@@ -575,7 +568,7 @@ O caso mais simples para quando PGT == 0 dá a solução:
 
     <para>Baseamos este Como fazer no seguinte plano de contas:
     </para>
-<literallayout>
+<screen>
 -Ativo
    -Banco 
         -Conta bancária
@@ -583,8 +576,7 @@ O caso mais simples para quando PGT == 0 dá a solução:
         -Pessoa
 -Receita
    -receita de juros
-        -Pessoa
-  </literallayout>
+        -Pessoa</screen>
     <para>Este exemplo mostra-lhe como controlar um empréstimo pessoal de 2.000€ ao seu amigo José da
       Esquina.
     </para>
@@ -660,12 +652,11 @@ O caso mais simples para quando PGT == 0 dá a solução:
 
       <para>Vamos começar com as seguintes contas (todas as contas têm a mesma moeda, neste caso, o Euro)
       </para>
-<literallayout>
+<screen>
 Ativos:Banco:Euro
 Ativos:Dinheiro que me devem:José da Esquina
 Receita:Receita de juros:José da Esquina
-Capital próprio:Saldos iniciais:Euro
-  </literallayout>
+Capital próprio:Saldos iniciais:Euro</screen>
     </sect2>
 
     <sect2 id="loans_personalLoanToSomeOne_InitialSetup">
@@ -900,7 +891,7 @@ Capital próprio:Saldos iniciais:Euro
       juro.
     </para>
 
-    <para><literallayout>Estrutura básica de contas para crédito automóvel
+    <para><screen>Estrutura básica de contas para crédito automóvel
 
 -Ativos
     -Ativos atuais
@@ -913,7 +904,7 @@ Capital próprio:Saldos iniciais:Euro
 -Despesas
    -Juros
        -Juros do crédito automóvel
-   -Taxas administrativas do crédito automóvel</literallayout>
+   -Taxas administrativas do crédito automóvel</screen>
     </para>
 
     <para>Para mais informação, por favor veja <xref linkend="loans_mortgage1" />
@@ -967,7 +958,7 @@ Capital próprio:Saldos iniciais:Euro
         vender antes um carro, substitua as contas apropriadas.
       </para>
 
-      <para><literallayout>
+      <para><screen>
 -Ativos
   -Ativos fixos
     -Casa
@@ -975,8 +966,7 @@ Capital próprio:Saldos iniciais:Euro
     -Conta poupança
 -Receita
   -Ganho de capital a longo prazo
-    -Casa
-    </literallayout>
+    -Casa</screen>
       </para>
 
       <itemizedlist>
@@ -1142,7 +1132,7 @@ Capital próprio:Saldos iniciais:Euro
         e subestimada), por favor veja <xref linkend="chapter_capgain"></xref>.
       </para>
 
-      <para><literallayout>
+      <para><screen>
 -Ativos
     -Ativos fixos
         -Casa
@@ -1154,8 +1144,7 @@ Capital próprio:Saldos iniciais:Euro
     -Ganhos realizados
         -Casa
     -Ganhos não realizados
-        -Casa
-    </literallayout>
+        -Casa</screen>
       </para>
 
       <para>Comprou uma casa por 300.000€ há anos e manteve sempre um olho no mercado, atualizando os seus
@@ -1300,8 +1289,7 @@ Capital próprio:Saldos iniciais:Euro
 <!--
   <sect1 id="loans_missing1">
     <title>Missing Loan Documentation</title>
-
-    <literallayout>
+<screen>
  -Entering a Payment Schedule
      -Monthly Payments (How-To)
        -See the Mortgage assistant
@@ -1311,8 +1299,7 @@ Capital próprio:Saldos iniciais:Euro
        -Same as a normal payment, but you get the figures from the bank
        -How to fix 10 amortization and then a final bulk payment setup?
 
- -Putting It All Together
- </literallayout>
+ -Putting It All Together</screen>
   </sect1>
 -->
 </chapter>
diff --git a/guide/ru/appendixa.xml b/guide/ru/appendixa.xml
index 1942f0d..50b49ba 100644
--- a/guide/ru/appendixa.xml
+++ b/guide/ru/appendixa.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
+  Replaced empty pages 2020-03-07 by Frank H. Ellenberger
+
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixa">
   <title>Migration Guide</title>
@@ -24,11 +25,11 @@
     <title>Using Accounts vs. Categories</title>
 
     <para>If you are familiar with other personal finance programs, you are already accustomed to tracking
-      your income and expenses as categories. Since &app; is a double-entry system (refer to section
-      2.1), incomes and expenses are tracked in accounts. The basic concept is the same, but the
-      account structure allows more consistency with accepted business practices. So, if you are a
-      business user as well as a home user, &app; makes it easy to keep track of your business as
-      well as your personal accounts.
+      your income and expenses as categories. Since &app; is a double-entry system (see
+      <xref linkend="basics-accounting1" />), income and expenses are tracked in accounts. The basic
+      concept is the same, but the account structure allows more consistency with accepted business
+      practices. So, if you are a business user as well as a home user, &app; makes it easy to keep
+      track of your business as well as your personal accounts.
     </para>
 
     <para>Income and expense accounts give you the same information you would get with categories, but they
@@ -43,37 +44,57 @@
       <trademark class="registered">Quicken</trademark> and similar programs, transactions require
       an account and a category. Substitute an income or expense account name in &app; where you
       would normally enter a category name in the other programs, and the result should be the same.
-      We will discuss transaction entry in Chapter 4 in greater detail.
+      We will discuss transaction entry in <xref linkend="basics-transactions2" /> in greater
+      detail.
     </para>
   </sect1>
 
-  <sect1 id="appendixa_qif1">
-    <title>Organization of <acronym>QIF</acronym> Files (Discussion)</title>
+  <sect1 id="appendixa_import">
+    <title>Importing Data</title>
 
-    <para></para>
-  </sect1>
+    <para>If you want to import data from your previous application, you should distinguish between financial
+      data and other data. Probably the best way to import financial data is the <quote>Quicken
+      Interchange Format</quote> <acronym>QIF</acronym> . It is a specific format for financial
+      data, which most financial applications for the private sector know and can use for export.
+    </para>
+
+    <para>For other data we suggest the use of the <quote>Comma Separated Value</quote> <acronym>CSV</acronym>
+      format.
+    </para>
 
-  <sect1 id="appendixa_entercharge1">
-    <title>Common Duplication Issues (Discussion)</title>
+    <sect2 id="appendixa_qif1">
+      <title>Import of Financial Data by <acronym>QIF</acronym> Files</title>
 
-    <para></para>
-  </sect1>
+      <para>See <ulink url="&url-wp-en;Quicken_Interchange_Format" /> for it's details.
+      </para>
 
-  <sect1 id="appendixa_enterpay1">
-    <title>Checking <acronym>QIF</acronym> Data (Discussion)</title>
+      <para>Some &app; users collected their knowledge about the best use in our
+        <ulink url="&url-wiki-qif;"></ulink>.
+      </para>
+<!-- ToDo: Uncomment this after adding the chapter
+      <para>For other formats and more details see <xref linkend="chapter_importing"/>.
+      </para> -->
+    </sect2>
 
-    <para></para>
+    <sect2 id="appendixa_business">
+      <title>Import of Business Data by <acronym>CSV</acronym> Files</title>
+
+      <para>If you want to import customers and vendors or bills and invoices see
+        <xref linkend="ch_import_bus_data" />.
+      </para>
+    </sect2>
   </sect1>
 
   <sect1 id="appendixa_xmlconvert1">
     <title>Converting <acronym>XML</acronym> &app; File</title>
 
     <para>The &app; <acronym>XML</acronym> data file can be transformed to almost any other data format (e.g.,
-      <acronym>QIF</acronym>, <acronym>CSV</acronym>...) quite easily if one is familiar with
-      <acronym>XSLT</acronym>. The &app; data file is well-formed <acronym>XML</acronym>, and it can
-      therefore be run through an <acronym>XSLT</acronym> parser with an associated stylesheet. This
-      allows one to transform the file to just about any format that can be designed, given a
-      properly written stylesheet.
+      <acronym>QIF</acronym>, <acronym>CSV</acronym>...) quite easily if one is familiar with the
+      <quote>Extensible Stylesheet Language Transformations</quote>
+      <ulink url="&url-wp-en;XSLT"><acronym>XSLT</acronym></ulink>. The &app; data file is
+      well-formed <acronym>XML</acronym>, and it can therefore be run through an
+      <acronym>XSLT</acronym> parser with an associated stylesheet. This allows one to transform the
+      file to just about any format that can be designed, given a properly written stylesheet.
     </para>
 
     <para>A few steps need to be followed. The writing of a stylesheet is a task for a different time, but if
@@ -85,50 +106,68 @@
         <para>Copy the &app; <acronym>XML</acronym> data file to a working file.
         </para>
 
-        <note>
-          <para>If the file was last modified by a version of &app; older than 2.0, then before to continue to the
+        <important>
+          <para>If the file was last modified by a version of &app; older than 2.0, then before you continue to the
             next step you will need to modify the working file’s <gnc-v2> tag to read
             something like this:
-          </para>
-<literallayout>
+<programlisting language="xml">
 <gnc-v2 xmlns:cd="http://www.gnucash.org/XML/cd"
-        xmlns:book="http://www.gnucash.org/XML/book"
-        xmlns:gnc="http://www.gnucash.org/XML/gnc"
-        xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
-        xmlns:trn="http://www.gnucash.org/XML/trn"
-        xmlns:split="http://www.gnucash.org/XML/split"
-        xmlns:act="http://www.gnucash.org/XML/act"
-        xmlns:price="http://www.gnucash.org/XML/price"
-        xmlns:ts="http://www.gnucash.org/XML/ts"
-        xmlns:slot="http://www.gnucash.org/XML/kvpslot"
-        xmlns:cust="http://www.gnucash.org/XML/cust"
-        xmlns:entry="http://www.gnucash.org/XML/entry"
-        xmlns:lot="http://www.gnucash.org/XML/lot"
-        xmlns:invoice="http://www.gnucash.org/XML/invoice"
-        xmlns:owner="http://www.gnucash.org/XML/owner"
-        xmlns:job="http://www.gnucash.org/XML/job"
-        xmlns:billterm="http://www.gnucash.org/XML/billterm"
-        xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
-        xmlns:sx="http://www.gnucash.org/XML/sx"
-        xmlns:fs="http://www.gnucash.org/XML/fs"
-        xmlns:addr="http://www.gnucash.org/XML/custaddr">
-    </literallayout>
-          <para>You can put pretty much anything you want behind the equal signs, but a <acronym>URL</acronym> is
-            what is typically used.
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:slot="http://www.gnucash.org/XML/kvpslot"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:addr="http://www.gnucash.org/XML/custaddr">
+</programlisting>
+          </para>
+        </important>
+
+        <note>
+          <para>You can put pretty much anything you want behind the equal signs, but a unique
+            <acronym>URL</acronym> is what is typically used.
           </para>
         </note>
       </listitem>
 
       <listitem>
         <para>Create an <acronym>XSLT</acronym> stylesheet containing the transformation your desire, or obtain
-          one that’s already written (AFAIK, there aren’t any, but I’m working on
-          a <acronym>CSV</acronym> one).
+          one that’s already written.
         </para>
+
+        <itemizedlist>
+          <title>User Contributed XSLT Stylesheets</title>
+
+          <listitem>
+            <para>in our repository: <ulink url="&url-src-maint;contrib/xslt"></ulink>
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>in our wiki: <ulink url="&url-wiki-xslt;"></ulink>
+            </para>
+          </listitem>
+        </itemizedlist>
       </listitem>
 
       <listitem>
-        <para>Install an <acronym>XSLT</acronym> processor such as Saxon (http://saxon.sourceforge.net/) or
-          Xalan-J (http://xml.apache.org/). Any conforming processor will do, really...
+        <para>Install an <acronym>XSLT</acronym> processor such as Saxon (<ulink url="&url-wp-en;Saxon_XSLT" />)
+          or Xalan (<ulink url="&url-wp-en;Apache_Xalan" />). Any
+          <ulink url="&url-wp-en;Category:XSLT_processors">conforming processor</ulink> will do,
+          really...
         </para>
       </listitem>
 
diff --git a/guide/ru/appendixc.xml b/guide/ru/appendixc.xml
index 845b930..3421cd2 100644
--- a/guide/ru/appendixc.xml
+++ b/guide/ru/appendixc.xml
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
-  Last modified: July 9th 2006
+  Last modified: 2019-09-12 Fell: EEC->EU
+   modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixc">
   <title>Contributed Account Trees</title>
 
-  <para></para>
+  <para>This is an ancient example. For recent account trees see
+    <ulink url="&url-src-maint;data/accounts" />, select your language and if existing region.
+  </para>
+
+  <para>If you want to contribute your new or improved templates, read
+    <ulink url="&url-wiki;Translation#How_to_translate_the_files_containing_the_new_account_hierarchies" />.
+  </para>
 
   <sect1 id="appendixc_vat1">
     <title>UK Vat</title>
@@ -86,7 +92,7 @@
       so the <quote>net of VAT</quote> increase in your bank account, when the invoice is payed, is
       matched by a decrease in capital.
     </para>
-<literallayout>
+<screen>
 Bank Accounts [B]
   |___ Main Account
   |___  Reserve Account
@@ -162,8 +168,6 @@ Expenses [E]
                     |___  Software
                     |___  Subscriptions
                     |___  Sundry
-                    |___  Travel / Accom
-
-</literallayout>
+                    |___  Travel / Accom</screen>
   </sect1>
 </appendix>
diff --git a/guide/ru/appendixd.xml b/guide/ru/appendixd.xml
index 0c85048..955989c 100644
--- a/guide/ru/appendixd.xml
+++ b/guide/ru/appendixd.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: March 18th, 2007
   Maintainers:
-                Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-                David Hampton <hampton at employees.org>
+    David Hampton <hampton at employees.org>
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <appendix id="appendixd">
   <title>Auxiliary File Formats</title>
@@ -34,10 +33,15 @@
         dialog. The first location is typically
         <filename class="directory">/usr/share/gnucash/checks</filename>, where check files
         distributed with the application can be found. The second location is the user private
-        <filename class="directory">~/.gnucash/checks</filename> directory. Users may add check
-        formats at any time (even while &app; is running) simply by dropping a new
-        <filename>*.chk</filename> file in this directory. The next time the check printing dialog
-        is opened the new check format will appear in the list of available check formats.
+        <filename class="directory">&dir-data;checks</filename>
+        <footnote id="dir-old-chk">
+          <para>Up to &app; 2.6.21 it was <filename class="directory">&dir-old;checks</filename>
+          </para>
+        </footnote>
+        directory. Users may add check formats at any time (even while &app; is running) simply by
+        dropping a new <filename>*.chk</filename> file in this directory. The next time the check
+        printing dialog is opened the new check format will appear in the list of available check
+        formats.
       </para>
 
       <note>
@@ -55,8 +59,7 @@
       <para>A typical &app; check file is presented below. The contents of this file will be described in the
         next sections.
       </para>
-<programlisting>
-[Top]
+<programlisting language="ini">[Top]
 Guid = 67b144d1-96a5-48d5-9337-0e1083bbf229
 Title = Quicken/QuickBooks (tm) US-Letter
 Rotation = 0.0
@@ -83,8 +86,7 @@ Type_4 = DATE
 Coords_4 = 500.0;67.0
 
 Type_5 = NOTES
-Coords_5 = 50.0;212.0
-        </programlisting>
+Coords_5 = 50.0;212.0</programlisting>
     </sect2>
 
     <sect2>
@@ -590,10 +592,11 @@ Coords_5 = 50.0;212.0
                   string may specify either an absolute path name or as a relative path name. If a
                   relative path name is specified, &app; first looks in in the application check
                   format folder (typically
-                  <filename class="directory">/usr/share/gnucash/checks</filename>) for the image
-                  file, and if it isn’t found there then it looks in the user private
-                  <filename class="directory">~/.gnucash/checks</filename> directory for the image.
-                  This field is only recognized when using gtk version 2.10 or later.
+                  <filename class="directory">/usr/share/gnucash/checks</filename> ) for the image
+                  file, and if it is not found there then it looks in the user private
+                  <filename class="directory">&dir-data;checks</filename><footnoteref linkend="dir-old-chk" />
+                  directory for the image. This field is only recognized when using gtk version 2.10
+                  or later.
                 </entry>
               </row>
 
@@ -682,8 +685,7 @@ Coords_5 = 50.0;212.0
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -705,8 +707,7 @@ Blocking_Chars
 <literallayout>Font
 Align
 Blocking_Chars
-DateFormat
-                    </literallayout>
+DateFormat</literallayout>
                 </entry>
 
                 <entry>
@@ -726,8 +727,7 @@ DateFormat
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -748,8 +748,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -778,8 +777,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -800,8 +798,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -831,8 +828,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -854,8 +850,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -876,8 +871,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -897,8 +891,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -919,8 +912,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -942,8 +934,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -964,8 +955,7 @@ Blocking_Chars
                 <entry>
 <literallayout>Font
 Align
-Blocking_Chars
-                    </literallayout>
+Blocking_Chars</literallayout>
                 </entry>
 
                 <entry>
@@ -1014,16 +1004,16 @@ Blocking_Chars
       <para>Creating your own check format file is a fairly simple task. The easiest way to start is to copy an
         existing check format file from the application directory (typically
         <filename class="directory">/usr/share/gnucash/checks</filename>) to the directory
-        <filename class="directory">~/.gnucash/checks</filename>. Make sure to change the guid so
-        the new file will be accepted by gnucash, and change the title to something descriptive.
-        Then change or add individual item fields as necessary. You can also create a new check file
-        by clicking the <guibutton>Save Format</guibutton> button on the <guilabel>Custom
-        format</guilabel> page of the check printing dialog.
+        <filename class="directory">&dir-data;checks</filename><footnoteref linkend="dir-old-chk" />.
+        Make sure to change the guid so the new file will be accepted by gnucash, and change the
+        title to something descriptive. Then change or add individual item fields as necessary. You
+        can also create a new check file by clicking the <guibutton>Save Format</guibutton> button
+        on the <guilabel>Custom format</guilabel> page of the check printing dialog.
       </para>
 
       <note>
-        <para>Key names are case sensitive. If you’re having problems with a check format file, ensure that
-          all key names have capital letters as documented above.
+        <para>Key names are case sensitive. If you are having problems with a check format file, ensure that all
+          key names have capital letters as documented above.
         </para>
       </note>
     </sect2>
diff --git a/guide/ru/ch_bus_features.xml b/guide/ru/ch_bus_features.xml
index 53c4885..dc27254 100644
--- a/guide/ru/ch_bus_features.xml
+++ b/guide/ru/ch_bus_features.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 1.0.0
   Last modified: Sep 19th 2015
   Maintainers:
-               Chris Good <chris.good at ozemail.com.au>
+    Chris Good <chris.good at ozemail.com.au>
   Author:
-  		Chris Good <chris.good at ozemail.com.au>
-	updated [FirstName LastName] <name at company.com>
+    Chris Good <chris.good at ozemail.com.au>
+    updated
+    [FirstName LastName] <name at company.com>
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_bus_features">
   <title>Business Features</title>
@@ -100,8 +100,7 @@
         defined with account type <emphasis>A/Payable</emphasis>. &app; will use this account to
         place transactions related to the integrated accounts payable system.
       </para>
-<literallayout>
-Basic A/R and A/P Account Hierarchy:
+<screen>Basic A/R and A/P Account Hierarchy:
 
 -Assets
    -Accounts Receivable
@@ -114,8 +113,7 @@ Basic A/R and A/P Account Hierarchy:
   -Accounts Payable
   -Tax
       -Tax on Purchases
-      -Tax on Sales
-  </literallayout>
+      -Tax on Sales</screen>
       <para>You need to add additional accounts to this hierarchy for it to be useful.
       </para>
 
@@ -1750,19 +1748,17 @@ Basic A/R and A/P Account Hierarchy:
         for all of your employees. The taxes are later paid to the appropriate government agency.
       </para>
 
-      <para><literallayout>
-              Simple Payroll Account Layout:
-              
-              -Assets
-              --Checking
-              -Liabilities
-              --Tax1  (short term <quote>storage</quote> account)
-              --Tax2  (short term <quote>storage</quote> account)
-              -Expenses
-              --Salaries
-              --Tax1
-              --Tax2
-           </literallayout>
+      <para><screen>Simple Payroll Account Layout:
+
+-Assets
+--Checking
+-Liabilities
+--Tax1  (short term <quote>storage</quote> account)
+--Tax2  (short term <quote>storage</quote> account)
+-Expenses
+--Salaries
+--Tax1
+--Tax2</screen>
         <note>
           <para>Resist the temptation to create per-employee sub-accounts to track individual salaries. Creating a
             sub-account for each employee leads to unmanageably large lists of accounts. Imagine the
diff --git a/guide/ru/ch_capgain.xml b/guide/ru/ch_capgain.xml
index 83c632e..bd7c60f 100644
--- a/guide/ru/ch_capgain.xml
+++ b/guide/ru/ch_capgain.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Bengt Thuree <bengt at thuree.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_capgain">
   <title>Доходы от прироста капитала</title>
@@ -134,7 +133,7 @@
       Gains</emphasis> accounts are balanced by the <emphasis>Income:Unrealized Gains</emphasis>
       account (similar for <emphasis>ITEM2</emphasis>).
     </para>
-<literallayout>
+<screen>
 -Assets
     -Current Assets
         -Savings Account
@@ -147,8 +146,7 @@
             -Unrealized Gain
 -Income
     -Realized Gains
-    -Unrealized Gains
-  </literallayout>
+    -Unrealized Gains</screen>
   </sect1>
 
   <sect1 id="capgain_example1">
diff --git a/guide/ru/ch_cc.xml b/guide/ru/ch_cc.xml
index 37fa4b3..315f46a 100644
--- a/guide/ru/ch_cc.xml
+++ b/guide/ru/ch_cc.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Bengt Thuree <bengt at thuree.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Bengt Thuree <bengt at thuree.com>
   Originally written by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_cc">
   <title>Кредитные карты</title>
@@ -70,14 +69,13 @@
       <para>If you do not want to track each expense made on the credit card, you can set up a simple account
         hierarchy like this:
       </para>
-<literallayout>
+<screen>
 -Assets
    -Bank
 -Liabilities
    -Credit Card
 -Expenses
-   -Credit Card
-   </literallayout>
+   -Credit Card</screen>
       <para>In this example, if you enter your total amount charged per month as a transaction between
         <emphasis>Liabilities:Credit Card</emphasis> and <emphasis>Expenses:Credit Card</emphasis>.
         When you make a payment, you would enter a transaction between
@@ -98,7 +96,7 @@
         entered as a separate transaction between your Credit Card liability account and a specific
         expense account. Below is an example of an account hierarchy for this:
       </para>
-<literallayout>
+<screen>
 -Assets
     -Bank
 -Liabilities
@@ -109,8 +107,7 @@
     -Clothes
     -Entertainment
     -Interest
-    -Service
-   </literallayout>
+    -Service</screen>
       <para>Clearly, you should enter specific expense accounts which fit your spending habits. The only
         difference with this setup as compared to the simple setup is that the expenses have been
         subdivided by groups. Also notice that there is an <quote>Interest</quote> expense, this is
diff --git a/guide/ru/ch_currency.xml b/guide/ru/ch_currency.xml
index 9cf9b8c..ee174ca 100644
--- a/guide/ru/ch_currency.xml
+++ b/guide/ru/ch_currency.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.6.15
   Last modified: December 6, 2016
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Bengt Thuree <bengt at thuree.com>
-  	Updated	Geert Janssens <janssens-geert at telenet.be>
-	Revised David T. <sunfish62 at yahoo.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated Bengt Thuree <bengt at thuree.com>
+    Updated Geert Janssens <janssens-geert at telenet.be>
+    Revised David T. <sunfish62 at yahoo.com>
+    Revised 2020: David Cousens <davidcousens at bigpond.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_currency">
   <title>Мультивалютные операции</title>
@@ -33,61 +33,60 @@
       currency accounts? How do reports deal with mixed currencies?
     </para>
 
-    <note>
-      <para>An alternative way to manage multiple currency accounts from the one presented in the next sections,
-        is to use the <guilabel>trading</guilabel> accounts capabilities of &app;. This feature,
-        which was introduced with &app; version 2.3.14, can be enabled by going to the
-        <guilabel>Accounts</guilabel> tab under
+    <para>You can either deal with multiple currencies using manually entered transactions to record currency
+      gains and losses as described in <xref linkend="currency_manual" /> or you can utilize
+      currency trading accounts introduced with &app; version 2.3.14 to automatically record the
+      gains and losses on transactions between currencies as described in the subsequent section.
+      Trading accounts are not enabled by default in &app; and must be explicitly enabled as
+      described in <xref linkend="currency_trading_accts" />.
+    </para>
+<!-- TODO: add sections
+    <para>The following sections are common to both manually recording gains
+      and losses from multiple currency transactions and using trading accounts
+      to record such gains and losses.</para>
+TODO -->
+  </sect1>
+
+  <sect1 id="currency_manual">
+    <title>Manually Recording Currency Transaction</title>
+
+    <sect2 id="currency_acct1">
+      <title>Account Setup</title>
+
+      <para>Your default account currency is set in the <guilabel>Account</guilabel> tab under
+        <menuchoice>
+          <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
+        </menuchoice>
+        (
         <menuchoice>
-          <guimenu>File</guimenu><guimenuitem> Properties</guimenuitem>
+          <guimenu>&appname;</guimenu><guimenuitem>Preferences</guimenuitem>
         </menuchoice>
-        .
+        on MacOS).
       </para>
 
-      <para>For a complete guide on <guilabel>trading</guilabel> accounts, see
-        <foreignphrase><ulink url="&url-selinger;accounting/tutorial.html">
-        &tit-sel-tut;</ulink></foreignphrase> by Peter Selinger.
+      <para>Similarly, &app; offers an option to set your preferred currency for displaying reports (like the
+        balance sheet and income statement). The option is called <guilabel>Default Report
+        Currency</guilabel>, and is in the <guilabel>Reports</guilabel> tab of the
+        <guilabel>&appname; Preferences</guilabel> screen. You’ll want to set both options
+        when you start using &app; because if (for example) your accounts are all in Canadian
+        Dollars but the generated reports are all in US Dollars, the reports will just say that
+        there are <quote>no data/transactions (or only zeroes) for the selected time period</quote>.
       </para>
-    </note>
-  </sect1>
-
-  <sect1 id="currency_acct1">
-    <title>Account Setup</title>
-
-    <para>Your default account currency is set in the <guilabel>Account</guilabel> tab under
-      <menuchoice>
-        <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-      </menuchoice>
-      (
-      <menuchoice>
-        <guimenu>&appname;</guimenu><guimenuitem>Preferences</guimenuitem>
-      </menuchoice>
-      on MacOS).
-    </para>
-
-    <para>Similarly, &app; offers an option to set your preferred currency for displaying reports (like the
-      balance sheet and income statement). The option is called <guilabel>Default Report
-      Currency</guilabel>, and is in the <guilabel>Reports</guilabel> tab of the <guilabel>&appname;
-      Preferences</guilabel> screen. You’ll want to set both options when you start using
-      &app; because if (for example) your accounts are all in Canadian Dollars but the generated
-      reports are all in US Dollars, the reports will just say that there are <quote>no
-      data/transactions (or only zeroes) for the selected time period</quote>.
-    </para>
 
-    <para>When you create a new account, you have the option to define the commodity in which that account is
-      denominated. For accounts denominated in a currency, you can specify any of the currencies
-      supported by &app; by simply selecting it from the currency commodity list. You will notice
-      that the default currency is the currency that is defined for the parent account of the new
-      account.
-    </para>
+      <para>When you create a new account, you have the option to define the commodity in which that account is
+        denominated. For accounts denominated in a currency, you can specify any of the currencies
+        supported by &app; by simply selecting it from the currency commodity list. You will notice
+        that the default currency is the currency that is defined for the parent account of the new
+        account.
+      </para>
 
-    <para>As an example, let’s set up a bank account scenario where you mostly work in US Dollars, but
-      do also have a European bank account using the Euro currency, as well as one bank account in
-      Hong Kong using Hong Kong Dollars. So, set up 3 bank accounts, one denominated in US Dollars,
-      one using Euros, and the third in Hong Kong Dollars. One possible account structure for this
-      would be:
-    </para>
-<literallayout>
+      <para>As an example, let’s set up a bank account scenario where you mostly work in US Dollars, but
+        do also have a European bank account using the Euro currency, as well as one bank account in
+        Hong Kong using Hong Kong Dollars. So, set up 3 bank accounts, one denominated in US
+        Dollars, one using Euros, and the third in Hong Kong Dollars. One possible account structure
+        for this would be:
+      </para>
+<screen>
 -Assets (USD)
    -Current Assets (USD)
       -US Bank (USD)
@@ -97,292 +96,261 @@
    -Opening Balances (USD)
       -USD (USD)
       -EUR (EUR)
-      -HKD (HKD)
-    </literallayout>
-    <note>
-      <para>The currency of each account is shown in parenthesis.
-      </para>
-    </note>
-
-    <para>Since in this example you mostly work in USD, all of the parent accounts are set to USD. Of course,
-      if you mostly work in Euros, you could change the currency of these parent accounts to EUR.
-      The totals shown in the account tree window will always be converted to the currency of each
-      particular account. Notice, we also set up 3 Starting Balances equity accounts, used to
-      initially populate the 3 banks.
-    </para>
+      -HKD (HKD)</screen>
+      <note>
+        <para>The currency of each account is shown in parenthesis.
+        </para>
+      </note>
 
-    <note>
-      <para>You could also set up just a single Starting Balance account and use a currency transfer to populate
-        the <quote>different currency</quote> accounts. However, this is more advanced option, which
-        is explained in a later section (<xref linkend="currency_purchase2" />).
+      <para>Since in this example you mostly work in USD, all of the parent accounts are set to USD. Of course,
+        if you mostly work in Euros, you could change the currency of these parent accounts to EUR.
+        The totals shown in the account tree window will always be converted to the currency of each
+        particular account. Notice, we also set up 3 Starting Balances equity accounts, used to
+        initially populate the 3 banks.
       </para>
-    </note>
-
-    <para>Below you see the result of this example, in which you start with USD 10,000, EUR 10,000 as well as
-      HKD 10,000 in the three bank accounts. Notice that the total of the parent accounts only shows
-      the value of the currency of sub-accounts with matching currencies. In other words, the Total
-      Assets and Total Equity values only reflect USD amounts, because &app; has no way of
-      evaluating the value of EUR or HKD yet. Once you set up exchange rates between the currencies,
-      the parent accounts will calculate the converted value of all sub-accounts. See the later
-      section (<xref linkend="currency_howto1" />) on ways to do this.
-    </para>
-
-    <screenshot id="currency_main1">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/currency_main1.png" format="PNG"
-                     srccredit="Geert Janssens" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Initial multi currency Account Bank Setup</phrase>
-        </textobject>
-
-        <caption>
-          <para>Initial setup of 3 bank accounts with different currencies.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
-
-    <para>Notice that the "Total (Report)" column is being displayed. This is configured in the column header
-      row, select <guibutton>Arrow down</guibutton> and select <quote>Total(USD)</quote>.
-    </para>
 
-    <sect2 id="currency_acct_user2">
-      <title>User-Defined Currencies</title>
+      <note>
+        <para>You could also set up just a single Starting Balance account and use a currency transfer to populate
+          the <quote>different currency</quote> accounts. However, this is more advanced option,
+          which is explained in a later section (<xref linkend="currency_purchase2" />).
+        </para>
+      </note>
 
-      <para>Usually when we talk about currencies, we mean government-backed currencies (or more precisely,
-        currencies defined in <ulink
-      url="&url-wp-ru;ISO_4217">ISO 4217</ulink>). &app; does
-        not allow you to create your own currencies. If you want to track non-<acronym>ISO</acronym>
-        currencies, you can use either of two workarounds, depending on which fits your needs
-        better.
+      <para>Below you see the result of this example, in which you start with USD 10,000, EUR 10,000 as well as
+        HKD 10,000 in the three bank accounts. Notice that the total of the parent accounts only
+        shows the value of the currency of sub-accounts with matching currencies. In other words,
+        the Total Assets and Total Equity values only reflect USD amounts, because &app; has no way
+        of evaluating the value of EUR or HKD yet. Once you set up exchange rates between the
+        currencies, the parent accounts will calculate the converted value of all sub-accounts. See
+        the later section (<xref linkend="currency_howto1" />) on ways to do this.
       </para>
 
-      <para>The <emphasis role="strong">first method</emphasis> is to treat these as if they were a
-        security—that is, like a stock or mutual fund. The second method is to use one of the
-        <quote>dummy</quote> currencies for them.
-      </para>
+      <screenshot id="currency_main1">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/currency_main1.png" format="PNG"
+                       srccredit="Geert Janssens" />
+          </imageobject>
 
-      <para>Let’s say for example that you want to track loyalty points you’ve earned by buying from
-        a certain group of businesses. The account which tracks your loyalty points will be
-        <emphasis>Assets:Other:LoyaltyGroupRewardMiles</emphasis>.
-      </para>
+          <textobject>
+            <phrase>Initial multi currency Account Bank Setup</phrase>
+          </textobject>
 
-      <para>In the first method, you define a new security, of type <guilabel>FUND</guilabel>, called
-        RewardMiles. This is pretty straightforward—when you create the new
-        <emphasis>LoyaltyGroupRewardMiles</emphasis> account, just set the account type to
-        <guilabel>Stock</guilabel> or <guilabel>Mutual Fund</guilabel>, click the
-        <guibutton>Select...</guibutton> button next to the <guilabel>Security/currency:</guilabel>
-        box, and click <guibutton>New</guibutton> to define a new security of type
-        <guilabel>FUND</guilabel>.
-      </para>
+          <caption>
+            <para>Initial setup of 3 bank accounts with different currencies.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
 
-      <para>This is not really what the stock and mutual fund account types are meant for, but &app; will allow
-        it. The downside is that you’ll have to enter a <quote>price</quote> for every
-        transaction involving this account, because &app; needs the prices to figure out the
-        monetary value of the points and treat them as one of your assets.
+      <para>Notice that the "Total (Report)" column is being displayed. This is configured in the column header
+        row, select <guibutton>Arrow down</guibutton> and select <quote>Total(USD)</quote>.
       </para>
 
-      <para>In the <emphasis role="strong">second method</emphasis>, you use one of the dummy currencies to
-        track the loyalty points. These currencies are <quote>XTS (Code for testing
-        purposes)</quote> and <quote>XXX (No currency)</quote>. If you use one of these for your
-        LoyaltyGroupRewardMiles account, you can enter transactions into the account without having
-        to enter share prices for every transaction. And, you can keep using the same two dummy
-        currencies to track all sorts of amounts—vacation dollars earned and used so far this
-        year, vacation hours earned and used, health insurance benefits allowance used and
-        remaining, and so on.
-      </para>
+      <sect3 id="currency_acct_user2">
+        <title>User-Defined Currencies</title>
 
-      <para>The drawback with this second method is that you cannot define exchange rates for the dummy
-        currencies to convert them to <acronym>ISO</acronym> currencies. If you want to do that, you
-        really should use the first method.
-      </para>
-    </sect2>
-  </sect1>
+        <para>Usually when we talk about currencies, we mean government-backed currencies (or more precisely,
+          currencies defined in <ulink
+        url="&url-wp-en;ISO_4217">ISO 4217</ulink>). &app;
+          does not allow you to create your own currencies. If you want to track
+          non-<acronym>ISO</acronym> currencies, you can use either of two workarounds, depending on
+          which fits your needs better.
+        </para>
 
-  <sect1 id="currency_howto1">
-    <title>Recording and Updating Currency Exchange Rates</title>
+        <para>The <emphasis role="strong">first method</emphasis> is to treat these as if they were a
+          security—that is, like a stock or mutual fund. The second method is to use one of
+          the <quote>dummy</quote> currencies for them.
+        </para>
 
-    <para>&app; allows you to update the Currency Exchange Rates both manually and automatically. This process
-      is essentially the same as setting share prices for investments (see
-      <xref linkend="invest-stockprice1"/>). In the following two sections we will work through both
-      methods.
-    </para>
+        <para>Let’s say for example that you want to track loyalty points you’ve earned by buying from
+          a certain group of businesses. The account which tracks your loyalty points will be
+          <emphasis>Assets:Other:LoyaltyGroupRewardMiles</emphasis>.
+        </para>
 
-    <para>Before we start, let’s have a quick look at the Chart of Accounts
-    </para>
+        <para>In the first method, you define a new security, of type <guilabel>FUND</guilabel>, called
+          RewardMiles. This is pretty straightforward—when you create the new
+          <emphasis>LoyaltyGroupRewardMiles</emphasis> account, just set the account type to
+          <guilabel>Stock</guilabel> or <guilabel>Mutual Fund</guilabel>, click the
+          <guibutton>Select...</guibutton> button next to the
+          <guilabel>Security/currency:</guilabel> box, and click <guibutton>New</guibutton> to
+          define a new security of type <guilabel>FUND</guilabel>.
+        </para>
 
-    <screenshot id="currency_main1a">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/currency_main1.png" format="PNG"
-                     srccredit="Geert Janssens" />
-        </imageobject>
+        <para>This is not really what the stock and mutual fund account types are meant for, but &app; will allow
+          it. The downside is that you’ll have to enter a <quote>price</quote> for every
+          transaction involving this account, because &app; needs the prices to figure out the
+          monetary value of the points and treat them as one of your assets.
+        </para>
 
-        <textobject>
-          <phrase>Initial multi currency Account Bank Setup</phrase>
-        </textobject>
+        <para>In the <emphasis role="strong">second method</emphasis>, you use one of the dummy currencies to
+          track the loyalty points. These currencies are <quote>XTS (Code for testing
+          purposes)</quote> and <quote>XXX (No currency)</quote>. If you use one of these for your
+          LoyaltyGroupRewardMiles account, you can enter transactions into the account without
+          having to enter share prices for every transaction. And, you can keep using the same two
+          dummy currencies to track all sorts of amounts—vacation dollars earned and used so
+          far this year, vacation hours earned and used, health insurance benefits allowance used
+          and remaining, and so on.
+        </para>
 
-        <caption>
-          <para>Initial set up of 3 bank accounts with different currencies.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+        <para>The drawback with this second method is that you cannot define exchange rates for the dummy
+          currencies to convert them to <acronym>ISO</acronym> currencies. If you want to do that,
+          you really should use the first method.
+        </para>
+      </sect3>
+    </sect2>
 
-    <para>As you see, the overall balances do not yet reflect any value for EUR or HKD holdings. Adding
-      currency exchange rates will fix this.
-    </para>
+    <sect2 id="currency_howto1">
+      <title>Recording and Updating Currency Exchange Rates</title>
 
-    <sect2 id="currency_howto_Manual">
-      <title>Manually Updating Exchange Rates</title>
+      <para>&app; allows you to update the Currency Exchange Rates both manually and automatically. This process
+        is essentially the same as setting share prices for investments (see
+        <xref linkend="invest-stockprice1"/>). In the following two sections we will work through
+        both methods.
+      </para>
 
-      <para>Open the <guilabel>Price Editor</guilabel> by going to
-        <menuchoice>
-          <guimenu>Tools</guimenu> <guimenuitem>Price Editor</guimenuitem>
-        </menuchoice>
-        .
+      <para>Before we start, let’s have a quick look at the Chart of Accounts
       </para>
 
-      <screenshot id="currency_peditor">
+      <screenshot id="currency_main1a">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_peditor.png"
-                       format="PNG" srccredit="Geert Janssens" />
+            <imagedata fileref="figures/currency_main1.png" format="PNG"
+                       srccredit="Geert Janssens" />
           </imageobject>
 
           <textobject>
-            <phrase>Price Editor window</phrase>
+            <phrase>Initial multi currency Account Bank Setup</phrase>
           </textobject>
 
           <caption>
-            <para>Price Editor Window.
+            <para>Initial set up of 3 bank accounts with different currencies.
             </para>
           </caption>
         </mediaobject>
       </screenshot>
 
-      <para>Click on the <guibutton>Add</guibutton> button to add a new currency exchange rate. A window will
-        appear in which you can set up a new exchange rate. This window should appear like this:
+      <para>As you see, the overall balances do not yet reflect any value for EUR or HKD holdings. Adding
+        currency exchange rates will fix this.
       </para>
 
-      <screenshot id="currency_addcurr">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_addcurr.png" format="PNG"
-                       srccredit="Geert Janssens" />
-          </imageobject>
+      <sect3 id="currency_howto_Manual">
+        <title>Manually Updating Exchange Rates</title>
 
-          <textobject>
-            <phrase>Set up Euro Exchange Rate</phrase>
-          </textobject>
+        <para>Open the <guilabel>Price Editor</guilabel> by going to
+          <menuchoice>
+            <guimenu>Tools</guimenu> <guimenuitem>Price Editor</guimenuitem>
+          </menuchoice>
+          .
+        </para>
 
-          <caption>
-            <para>Add Price Editor Window
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+        <screenshot id="currency_peditor">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_peditor.png"
+                         format="PNG" srccredit="Geert Janssens" />
+            </imageobject>
 
-      <para>Set the <guilabel>Namespace</guilabel> to Currency and the <guilabel>Security</guilabel> to EUR
-        (Euro). Then set the exchange rate between the selected security and the selected currency.
-        The price box defines how many units of currency are required to purchase one unit of the
-        security. In this case, how many dollars it will take to purchase on Euro. In this example,
-        you will set the exchange rate to 1 EUR for 1 USD.
-      </para>
+            <textobject>
+              <phrase>Price Editor window</phrase>
+            </textobject>
 
-      <screenshot id="currency_manualpriceadded">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
-                       srccredit="Geert Janssens" />
-          </imageobject>
+            <caption>
+              <para>Price Editor Window.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
 
-          <textobject>
-            <phrase>Price Editor Window</phrase>
-          </textobject>
+        <para>Click on the <guibutton>Add</guibutton> button to add a new currency exchange rate. A window will
+          appear in which you can set up a new exchange rate. This window should appear like this:
+        </para>
 
-          <caption>
-            <para>The Price Editor window after setting the exchange rate between Euros and US Dollars
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+        <screenshot id="currency_addcurr">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_addcurr.png" format="PNG"
+                         srccredit="Geert Janssens" />
+            </imageobject>
 
-      <screenshot id="currency_main2">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_main2.png" format="PNG"
-                       srccredit="Geert Janssens" />
-          </imageobject>
+            <textobject>
+              <phrase>Set up Euro Exchange Rate</phrase>
+            </textobject>
 
-          <textobject>
-            <phrase>Chart of Accounts</phrase>
-          </textobject>
+            <caption>
+              <para>Add Price Editor Window
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
 
-          <caption>
-            <para>Chart of Accounts after setting the exchange rate between Euros and US Dollars.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+        <para>Set the <guilabel>Namespace</guilabel> to Currency and the <guilabel>Security</guilabel> to EUR
+          (Euro). Then set the exchange rate between the selected security and the selected
+          currency. The price box defines how many units of currency are required to purchase one
+          unit of the security. In this case, how many dollars it will take to purchase on Euro. In
+          this example, you will set the exchange rate to 1 EUR for 1 USD.
+        </para>
 
-      <para>Observe that since you have no exchange rate for HKD, &app; doesn’t convert the HKD accounts
-        to USD. This will be added in the next section.
-      </para>
-    </sect2>
+        <screenshot id="currency_manualpriceadded">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
+                         srccredit="Geert Janssens" />
+            </imageobject>
 
-    <sect2 id="currency_howto_Auto">
-      <title>Automatic Updating Exchange Rates (How-To)</title>
+            <textobject>
+              <phrase>Price Editor Window</phrase>
+            </textobject>
 
-      <para>In the previous section you saw how to manually define a new currency exchange rate, but &app;
-        includes an automatic price update feature, which will now be described.
-      </para>
+            <caption>
+              <para>The Price Editor window after setting the exchange rate between Euros and US Dollars
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
 
-      <para>Open the <guilabel>Price Editor</guilabel> by going to
-        <menuchoice>
-          <guimenu>Tools</guimenu> <guimenuitem>Price Editor</guimenuitem>
-        </menuchoice>
-        .
-      </para>
+        <screenshot id="currency_main2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_main2.png" format="PNG"
+                         srccredit="Geert Janssens" />
+            </imageobject>
 
-      <screenshot id="currency_BeforeGetOnline">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
-                       srccredit="Geert Janssens" />
-          </imageobject>
+            <textobject>
+              <phrase>Chart of Accounts</phrase>
+            </textobject>
 
-          <textobject>
-            <phrase>Price Editor window</phrase>
-          </textobject>
+            <caption>
+              <para>Chart of Accounts after setting the exchange rate between Euros and US Dollars.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
 
-          <caption>
-            <para>Price Editor Window before you obtain online quotes.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+        <para>Observe that since you have no exchange rate for HKD, &app; doesn’t convert the HKD accounts
+          to USD. This will be added in the next section.
+        </para>
+      </sect3>
 
-      <para>Click on the <guibutton>Get Quotes</guibutton> button to automatically load the various exchange
-        rates you need.
-      </para>
+      <sect3 id="currency_howto_Auto">
+        <title>Automatic Updating Exchange Rates (How-To)</title>
 
-      <note>
-        <para>If the <guibutton>Get Quotes</guibutton> button is disabled, that means that the
-          <application>Perl</application> module <application>Finance::Quote</application> is not
-          installed. For information on how to install it, please see
-          <xref linkend="invest-stockprice-auto2"></xref>
+        <para>In the previous section you saw how to manually define a new currency exchange rate, but &app;
+          includes an automatic price update feature, which will now be described.
         </para>
-      </note>
 
-      <para><screenshot id="currency_AfterGetOnlineQuotes">
+        <para>Open the <guilabel>Price Editor</guilabel> by going to
+          <menuchoice>
+            <guimenu>Tools</guimenu> <guimenuitem>Price Editor</guimenuitem>
+          </menuchoice>
+          .
+        </para>
+
+        <screenshot id="currency_BeforeGetOnline">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
-                         format="PNG" srccredit="Geert Janssens" />
+              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
+                         srccredit="Geert Janssens" />
             </imageobject>
 
             <textobject>
@@ -390,117 +358,148 @@
             </textobject>
 
             <caption>
-              <para>Price Editor Window after we obtained online quotes.
+              <para>Price Editor Window before you obtain online quotes.
               </para>
             </caption>
           </mediaobject>
         </screenshot>
-      </para>
 
-      <para>&app; downloads exchange rates for all currencies that are in use in your various accounts. This
-        will happen every time you click on <guibutton>Get Quotes</guibutton> or request &app; to
-        download quotes as per <xref linkend="invest-stockprice-auto2" />
-      </para>
-
-      <para>Now when you check the main Chart of Accounts you will see that &app; has automatically converted
-        the HKD amount to USD amount on the parent accounts that are in USD, as well as on the Total
-        (USD) column. Also the Euro accounts have been been updated with the latest exchange rate.
-      </para>
+        <para>Click on the <guibutton>Get Quotes</guibutton> button to automatically load the various exchange
+          rates you need.
+        </para>
 
-      <screenshot id="currency_main3.png">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_main3.png" format="PNG"
-                       srccredit="Geert Janssens" />
-          </imageobject>
+        <note>
+          <para>If the <guibutton>Get Quotes</guibutton> button is disabled, that means that the
+            <application>Perl</application> module <application>Finance::Quote</application> is not
+            installed. For information on how to install it, please see
+            <xref linkend="invest-stockprice-auto2" ></xref>
+          </para>
+        </note>
+
+        <para><screenshot id="currency_AfterGetOnlineQuotes">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
+                           format="PNG" srccredit="Geert Janssens" />
+              </imageobject>
+
+              <textobject>
+                <phrase>Price Editor window</phrase>
+              </textobject>
+
+              <caption>
+                <para>Price Editor Window after we obtained online quotes.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </para>
 
-          <textobject>
-            <phrase>Price Editor window</phrase>
-          </textobject>
+        <para>&app; downloads exchange rates for all currencies that are in use in your various accounts. This
+          will happen every time you click on <guibutton>Get Quotes</guibutton> or request &app; to
+          download quotes as per <xref linkend="invest-stockprice-auto2" />
+        </para>
 
-          <caption>
-            <para>Chart of Accounts after we obtain online quotes.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
-    </sect2>
+        <para>Now when you check the main Chart of Accounts you will see that &app; has automatically converted
+          the HKD amount to USD amount on the parent accounts that are in USD, as well as on the
+          Total (USD) column. Also the Euro accounts have been been updated with the latest exchange
+          rate.
+        </para>
 
-    <sect2 id="currency_howto_disable">
-      <title>Disabling Exchange Rate Retrieval</title>
+        <screenshot id="currency_main3.png">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_main3.png" format="PNG"
+                         srccredit="Geert Janssens" />
+            </imageobject>
 
-      <para>Whenever you create an account that uses a non-default currency, exchange rate retrieval will be
-        automatically enabled for that currency. However, if you later delete that account, &app;
-        will not automatically disable exchange rate retrieval for that currency.
-      </para>
+            <textobject>
+              <phrase>Price Editor window</phrase>
+            </textobject>
 
-      <para>If you have deleted the last account for a particular currency, and you do not wish to retrieve
-        exchange rates for that currency anymore, do the following:
-      </para>
+            <caption>
+              <para>Chart of Accounts after we obtain online quotes.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </sect3>
 
-      <itemizedlist>
-        <listitem>
-          <para>Open the Securities window by selecting
-            <menuchoice>
-              <guimenu>Tools</guimenu><guimenuitem>Security Editor</guimenuitem>
-            </menuchoice>
-            .
-          </para>
-        </listitem>
+      <sect3 id="currency_howto_disable">
+        <title>Disabling Exchange Rate Retrieval</title>
 
-        <listitem>
-          <para>Make sure the <guilabel>Show National Currencies</guilabel> box is selected.
-          </para>
-        </listitem>
+        <para>Whenever you create an account that uses a non-default currency, exchange rate retrieval will be
+          automatically enabled for that currency. However, if you later delete that account, &app;
+          will not automatically disable exchange rate retrieval for that currency.
+        </para>
 
-        <listitem>
-          <para>Expand the CURRENCY row.
-          </para>
-        </listitem>
+        <para>If you have deleted the last account for a particular currency, and you do not wish to retrieve
+          exchange rates for that currency anymore, do the following:
+        </para>
 
-        <listitem>
-          <para>Double click on the currency for which you want to disable exchange rate retrieval.
-          </para>
-        </listitem>
+        <itemizedlist>
+          <listitem>
+            <para>Open the Securities window by selecting
+              <menuchoice>
+                <guimenu>Tools</guimenu><guimenuitem>Security Editor</guimenuitem>
+              </menuchoice>
+              .
+            </para>
+          </listitem>
 
-        <listitem>
-          <para>Deselect the <guilabel>Get Online Quotes</guilabel> box and click <guibutton>OK</guibutton>.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </sect2>
-  </sect1>
+          <listitem>
+            <para>Make sure the <guilabel>Show National Currencies</guilabel> box is selected.
+            </para>
+          </listitem>
 
-  <sect1 id="currency_purchase1">
-    <title>Recording Purchases in a Foreign Currency</title>
+          <listitem>
+            <para>Expand the CURRENCY row.
+            </para>
+          </listitem>
 
-    <para>Purchases in a foreign currency can be managed in two different ways.
-    </para>
+          <listitem>
+            <para>Double click on the currency for which you want to disable exchange rate retrieval.
+            </para>
+          </listitem>
 
-    <para>1) Use &app;'s built-in currency exchange functions when you do your transactions. This is mainly
-      used for one-time transactions, and nothing which happens regularly.
-    </para>
+          <listitem>
+            <para>Deselect the <guilabel>Get Online Quotes</guilabel> box and click <guibutton>OK</guibutton>.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </sect3>
+    </sect2>
 
-    <para>2) Use separate accounts to track transactions, where all involved accounts use the same currency.
-      This is the recommended method, since it allows much better tracking and follow up. In this
-      way, you do one currency exchange transaction, and after that you do normal transactions in
-      the native currency.
-    </para>
+    <sect2 id="currency_purchase1">
+      <title>Recording Purchases in a Foreign Currency</title>
 
-    <para>The rest of this section will explain more based upon option 2).
-    </para>
+      <para>Purchases in a foreign currency can be managed in two different ways.
+      </para>
 
-    <sect2 id="currency_purchase2">
-      <title>Purchase of an Asset with Foreign Currency</title>
+      <para>1) Use &app;'s built-in currency exchange functions when you do your transactions. This is mainly
+        used for one-time transactions, and nothing which happens regularly.
+      </para>
 
-      <para>You are using USD as your default currency. But, you decide to purchase a boat in Jamaica. To do
-        this, you opened a bank account in Jamaica, moved some money from the US, and then purchased
-        your boat.
+      <para>2) Use separate accounts to track transactions, where all involved accounts use the same currency.
+        This is the recommended method, since it allows much better tracking and follow up. In this
+        way, you do one currency exchange transaction, and after that you do normal transactions in
+        the native currency.
       </para>
 
-      <para>To record this in &app; we use the following basic account structure:
+      <para>The rest of this section will explain more based upon option 2).
       </para>
-<literallayout>
+
+      <sect3 id="currency_purchase2">
+        <title>Purchase of an Asset with Foreign Currency</title>
+
+        <para>You are using USD as your default currency. But, you decide to purchase a boat in Jamaica. To do
+          this, you opened a bank account in Jamaica, moved some money from the US, and then
+          purchased your boat.
+        </para>
+
+        <para>To record this in &app; we use the following basic account structure:
+        </para>
+<screen>
 -Assets (USD)
    -Current Assets (USD)
       -US Bank (USD)
@@ -509,555 +508,978 @@
       -Boat (JMD)
 -Equity (USD)
    -Opening Balances (USD)
-      -USD (USD)
-      </literallayout>
-      <note>
-        <para>The currency of each account is shown in parenthesis.
-        </para>
-      </note>
+      -USD (USD)</screen>
+        <note>
+          <para>The currency of each account is shown in parenthesis.
+          </para>
+        </note>
 
-      <para>First you need to transfer some money ($10,000) to Jamaica, and you use your US bank account (with a
-        balance of $100,000) for that. The bank gives you an exchange rate of USD 1 = JMD 64, but
-        charges you USD 150 to transfer the money.
-      </para>
+        <para>First you need to transfer some money ($10,000) to Jamaica, and you use your US bank account (with a
+          balance of $100,000) for that. The bank gives you an exchange rate of USD 1 = JMD 64, but
+          charges you USD 150 to transfer the money.
+        </para>
 
-      <screenshot id="currency_purchase_MoveMoney.png">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_purchase_MoveMoney.png"
-                       format="PNG" srccredit="Bengt Thuree" />
-          </imageobject>
+        <screenshot id="currency_purchase_MoveMoney.png">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_purchase_MoveMoney.png"
+                         format="PNG" srccredit="Bengt Thuree" />
+            </imageobject>
 
-          <textobject>
-            <phrase>Currency transfer</phrase>
-          </textobject>
+            <textobject>
+              <phrase>Currency transfer</phrase>
+            </textobject>
 
-          <caption>
-            <para>Transfer money to Jamaica
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+            <caption>
+              <para>Transfer money to Jamaica
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
 
-      <para>Select the Jamaica transaction line ($9,850.00), right click and select <guilabel>Edit Exchange
-        Rate</guilabel>
-      </para>
+        <para>Select the Jamaica transaction line ($9,850.00), right click and select <guilabel>Edit Exchange
+          Rate</guilabel>
+        </para>
 
-      <screenshot id="currency_purchase_SetExchangeRate.png">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_purchase_SetExchangeRate.png"
-                       format="PNG" srccredit="Bengt Thuree" />
-          </imageobject>
+        <screenshot id="currency_purchase_SetExchangeRate.png">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_purchase_SetExchangeRate.png"
+                         format="PNG" srccredit="Bengt Thuree" />
+            </imageobject>
 
-          <textobject>
-            <phrase>Edit Exchange rate</phrase>
-          </textobject>
+            <textobject>
+              <phrase>Edit Exchange rate</phrase>
+            </textobject>
 
-          <caption>
-            <para>A dialog window where the exchange rate in a currency transaction is specified
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+            <caption>
+              <para>A dialog window where the exchange rate in a currency transaction is specified
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
 
-      <para>As Exchange Rate, you enter 1 USD = 64 JMD, since this is the rate your bank gave. Press ok in the
-        Transfer Funds (Edit Exchange Rate) window, and then save this split transaction. Below is
-        how it now looks in the main Chart of Accounts.
-      </para>
+        <para>As Exchange Rate, you enter 1 USD = 64 JMD, since this is the rate your bank gave. Press ok in the
+          Transfer Funds (Edit Exchange Rate) window, and then save this split transaction. Below is
+          how it now looks in the main Chart of Accounts.
+        </para>
 
-      <screenshot id="currency_purchase_BeforeBoat.png">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_purchase_BeforeBoat.png"
-                       format="PNG" srccredit="Bengt Thuree" />
-          </imageobject>
+        <screenshot id="currency_purchase_BeforeBoat.png">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_purchase_BeforeBoat.png"
+                         format="PNG" srccredit="Bengt Thuree" />
+            </imageobject>
 
-          <textobject>
-            <phrase>Chart of Accounts before purchasing the boat</phrase>
-          </textobject>
+            <textobject>
+              <phrase>Chart of Accounts before purchasing the boat</phrase>
+            </textobject>
 
-          <caption>
-            <para>Chart of Accounts before purchasing the boat
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+            <caption>
+              <para>Chart of Accounts before purchasing the boat
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
 
-      <para>You choose to buy a boat for JMD 509,000. To record this transaction in &app;, you will need to
-        enter a simple transaction in <emphasis>Assets:Current Assets:Jamaican Bank</emphasis>
-        withdrawing JMD 509,000 and transferring it to <emphasis>Assets:Fixed Assets:Boat</emphasis>
-      </para>
+        <para>You choose to buy a boat for JMD 509,000. To record this transaction in &app;, you will need to
+          enter a simple transaction in <emphasis>Assets:Current Assets:Jamaican Bank</emphasis>
+          withdrawing JMD 509,000 and transferring it to <emphasis>Assets:Fixed
+          Assets:Boat</emphasis>
+        </para>
 
-      <screenshot id="currency_purchase_AfterBoat.png">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_purchase_AfterBoat.png"
-                       format="PNG" srccredit="Bengt Thuree" />
-          </imageobject>
+        <screenshot id="currency_purchase_AfterBoat.png">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_purchase_AfterBoat.png"
+                         format="PNG" srccredit="Bengt Thuree" />
+            </imageobject>
 
-          <textobject>
-            <phrase>Chart of Accounts after purchasing the boat</phrase>
-          </textobject>
+            <textobject>
+              <phrase>Chart of Accounts after purchasing the boat</phrase>
+            </textobject>
 
-          <caption>
-            <para>Chart of Accounts after purchasing the boat
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+            <caption>
+              <para>Chart of Accounts after purchasing the boat
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
 
-      <para>The Chart of Accounts now reflects that your bank account has been reduced by JMD 509,000, and that
-        your Fixed Assets boat account has been increased by the same amount. If you also have
-        turned on the CoA (Column Choice) "Total (USD)" you will see the corresponding value in USD.
-        The USD value will always reflect the latest currency exchange rate you have either
-        automatically or manually retrieved.
-      </para>
-    </sect2>
+        <para>The Chart of Accounts now reflects that your bank account has been reduced by JMD 509,000, and that
+          your Fixed Assets boat account has been increased by the same amount. If you also have
+          turned on the CoA (Column Choice) "Total (USD)" you will see the corresponding value in
+          USD. The USD value will always reflect the latest currency exchange rate you have either
+          automatically or manually retrieved.
+        </para>
+      </sect3>
 
-    <sect2 id="currency_purchase3">
-      <title>Purchasing Foreign Stocks</title>
+      <sect3 id="currency_purchase3">
+        <title>Purchasing Foreign Stocks</title>
 
-      <para>This example will show how to purchase stocks that are priced in a currency other than your primary
-        currency.
-      </para>
+        <para>This example will show how to purchase stocks that are priced in a currency other than your primary
+          currency.
+        </para>
 
-      <para>Assume that you live in New York and therefore you have set the default currency to USD. You decide
-        to purchase a stock traded in Hong Kong that is priced in HKD. You would also like to be
-        able to track the various income and expense amounts per stock and broker.
-      </para>
+        <para>Assume that you live in New York and therefore you have set the default currency to USD. You decide
+          to purchase a stock traded in Hong Kong that is priced in HKD. You would also like to be
+          able to track the various income and expense amounts per stock and broker.
+        </para>
 
-      <para>You decide to purchase stock in the Beijing Airport (Hong Kong). The ticker for this stock is
-        0694.HK on Yahoo! Since you wanted to track all various income and expense amounts, here is
-        the necessary account structure:
-      </para>
-<literallayout>
+        <para>You decide to purchase stock in the Beijing Airport (Hong Kong). The ticker for this stock is
+          0694.HK on Yahoo! Since you wanted to track all various income and expense amounts, here
+          is the necessary account structure:
+        </para>
+<screen>
 Assets:Investments:Brokerage Accounts:Boom:0694.HK (0694.HK)
 Assets:Investments:Brokerage Accounts:Boom:Bank (HKD)
 Equity:Opening Balances:HKD (HKD)
 Expenses:Commissions:Boom.0694.HK (HKD)
-Income:Investments:Dividend:Boom:0694.HK (HKD)
-      </literallayout>
-      <para>The Chart of Accounts looks like this after creating all the needed accounts:
-      </para>
+Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
+        <para>The Chart of Accounts looks like this after creating all the needed accounts:
+        </para>
 
-      <screenshot id="currency_purchase_BeforeStocks.png">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_purchase_BeforeStocks.png"
-                       format="PNG" srccredit="Bengt Thuree" />
-          </imageobject>
+        <screenshot id="currency_purchase_BeforeStocks.png">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_purchase_BeforeStocks.png"
+                         format="PNG" srccredit="Bengt Thuree" />
+            </imageobject>
 
-          <textobject>
-            <phrase>Chart of Accounts for international stocks</phrase>
-          </textobject>
+            <textobject>
+              <phrase>Chart of Accounts for international stocks</phrase>
+            </textobject>
 
-          <caption>
-            <para>Chart of Accounts for international stocks
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+            <caption>
+              <para>Chart of Accounts for international stocks
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
 
-      <para>The stock definition can be seen in the Security Editor. (
-        <menuchoice>
-          <guimenu>Tools</guimenu><guimenu>Security Editor</guimenu>
-        </menuchoice>
-        )
-      </para>
+        <para>The stock definition can be seen in the Security Editor. (
+          <menuchoice>
+            <guimenu>Tools</guimenu><guimenu>Security Editor</guimenu>
+          </menuchoice>
+          )
+        </para>
 
-      <screenshot id="currency_purchase_Commodities.png">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_purchase_Commodities.png"
-                       format="PNG" srccredit="Bengt Thuree" />
-          </imageobject>
+        <screenshot id="currency_purchase_Commodities.png">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_purchase_Commodities.png"
+                         format="PNG" srccredit="Bengt Thuree" />
+            </imageobject>
 
-          <textobject>
-            <phrase>International securities</phrase>
-          </textobject>
+            <textobject>
+              <phrase>International securities</phrase>
+            </textobject>
 
-          <caption>
-            <para>International securities
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+            <caption>
+              <para>International securities
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+
+        <para>If you have not moved money (HKD 50,000) into the brokerage cash account
+          (<emphasis>Assets:Investments:Brokerage Account:Boom:Bank</emphasis>), do so now, either
+          using the Equity (HKD) account, or an existing bank account (Currency Transfer).
+        </para>
+
+        <para>There are two ways to enter the actual purchase transaction: you can enter it from the cash account
+          (shown below), or you can enter it from the stock account. <emphasis>If entered from the
+          stock account, the stock is assumed to be priced in the currency of the parent
+          account</emphasis>.
+        </para>
+
+        <para>Let’s assume that the stock price is HKD 3 per share. To record the purchase, open the
+          brokerage’s HKD cash account (<emphasis>Assets:Investments:Brokerage
+          Account:Boom:Bank</emphasis>), and enter the following:
+        </para>
+
+        <bridgehead renderas='sect4'>
+          Buy Stocks
+        </bridgehead>
+
+        <informaltable frame='none' colsep='0' rowsep='0'>
+          <tgroup cols='3'>
+            <colspec colwidth='3*' align='left'/>
+
+            <colspec colwidth='1*' align='left'/>
+
+            <colspec colwidth='1*' align='right'/>
+
+            <tbody>
+              <row>
+                <entry>
+                  Assets:Investments:Brokerage Account:Boom:Bank
+                </entry>
+
+                <entry>
+                  Withdrawal
+                </entry>
+
+                <entry>
+                  50,000
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Expenses:Investments:Commission:Boom_HKD
+                </entry>
+
+                <entry>
+                  Deposit
+                </entry>
+
+                <entry>
+                  500
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Assets:Investments:Brokerage Account:Boom:0694
+                </entry>
+
+                <entry>
+                  Deposit
+                </entry>
+
+                <entry>
+                  49,500 (16,500 shares)
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+
+        <para>If the exchange rate dialog box does not appear automatically, right-click on the stock row, and
+          select <guilabel>Edit Exchange Rate</guilabel>. Enter the number of shares (16,500) as the
+          <guilabel>To Amount</guilabel>.
+        </para>
+
+        <screenshot id="currency_purchase_ToAmount.png">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_purchase_ToAmount.png"
+                         format="PNG" srccredit="Bengt Thuree" />
+            </imageobject>
+
+            <textobject>
+              <phrase>Transfer Funds</phrase>
+            </textobject>
+
+            <caption>
+              <para>Setting the number of shares in the Transfer Funds dialog
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+
+        <para>When you return to the Chart of Accounts, you will see the purchased shares reflected in the stock
+          account’s total.
+        </para>
+
+        <screenshot id="currency_purchase_AfterStocks.png">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_purchase_AfterStocks.png"
+                         format="PNG" srccredit="Bengt Thuree" />
+            </imageobject>
+
+            <textobject>
+              <phrase>Purchased international stocks</phrase>
+            </textobject>
+
+            <caption>
+              <para>Chart of Accounts with some international stocks
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+
+        <para>However, as you can see, the USD totals may be zero if &app; doesn’t have an exchange rate
+          between USD and HKD. To fix this, go to
+          <menuchoice>
+            <guimenu>Tools</guimenu><guimenuitem>Price Editor</guimenuitem>
+          </menuchoice>
+          and click the <guibutton>Get Quotes</guibutton> button to automatically retrieve the
+          exchange rates you need.
+        </para>
 
-      <para>If you have not moved money (HKD 50,000) into the brokerage cash account
-        (<emphasis>Assets:Investments:Brokerage Account:Boom:Bank</emphasis>), do so now, either
-        using the Equity (HKD) account, or an existing bank account (Currency Transfer).
+        <note>
+          <para>To reiterate, this example shows how stock can be purchased in any currency by entering the
+            transaction in the register of the cash account used to make payment. It is also
+            possible to enter the purchase in the stock account’s register, but be aware that
+            the stock is assumed to be priced in the currency of the stock account’s parent.
+          </para>
+
+          <para>In this example, the stock account’s parent (<emphasis>Assets:Investments:Brokerage
+            Account:Boom</emphasis>) is denominated in HKD. Since this is same currency as the stock
+            price, the purchase can be safely entered in the stock account’s register.
+          </para>
+        </note>
+      </sect3>
+    </sect2>
+
+    <sect2 id="currency_invest1">
+      <title>Tracking Currency Investments</title>
+
+      <para>Currency investment is when you decide to invest in a different country's currency, and hope that it
+        will rise in value relative your own currency.
       </para>
 
-      <para>There are two ways to enter the actual purchase transaction: you can enter it from the cash account
-        (shown below), or you can enter it from the stock account. <emphasis>If entered from the
-        stock account, the stock is assumed to be priced in the currency of the parent
-        account</emphasis>.
+      <para>When you enter these transactions into &app;, you will have to decide on how much detail you would
+        like to have.
       </para>
 
-      <para>Let’s assume that the stock price is HKD 3 per share. To record the purchase, open the
-        brokerage’s HKD cash account (<emphasis>Assets:Investments:Brokerage
-        Account:Boom:Bank</emphasis>), and enter the following:
+      <para>If you are not interested in detail at all, a very simple account structure would suffice:
+      </para>
+<screen>
+Assets:Investments:Currency:Bank (USD)
+Assets:Investments:Currency:XXX (XXX)</screen>
+      <para>You would simply enter transfers between the two accounts, noting exchange rates as you went.
       </para>
 
-      <bridgehead renderas='sect4'>
-        Buy Stocks
-      </bridgehead>
-
-      <informaltable frame='none' colsep='0' rowsep='0'>
-        <tgroup cols='3'>
-          <colspec colwidth='3*' align='left'/>
-
-          <colspec colwidth='1*' align='left'/>
-
-          <colspec colwidth='1*' align='right'/>
-
-          <tbody>
-            <row>
-              <entry>
-                Assets:Investments:Brokerage Account:Boom:Bank
-              </entry>
-
-              <entry>
-                Withdrawal
-              </entry>
-
-              <entry>
-                50,000
-              </entry>
-            </row>
-
-            <row>
-              <entry>
-                Expenses:Investments:Commission:Boom_HKD
-              </entry>
-
-              <entry>
-                Deposit
-              </entry>
-
-              <entry>
-                500
-              </entry>
-            </row>
-
-            <row>
-              <entry>
-                Assets:Investments:Brokerage Account:Boom:0694
-              </entry>
-
-              <entry>
-                Deposit
-              </entry>
-
-              <entry>
-                49,500 (16,500 shares)
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
-
-      <para>If the exchange rate dialog box does not appear automatically, right-click on the stock row, and
-        select <guilabel>Edit Exchange Rate</guilabel>. Enter the number of shares (16,500) as the
-        <guilabel>To Amount</guilabel>.
+      <para>But, if you do want to be able to track capital gains or losses, as well as any fees, you do need a
+        more complex account structure, such as:
       </para>
+<screen>
+Assets:Investments:Currency:Bank (USD)
+Assets:Investments:Currency:Currency Bank:XXX (XXX)
+Expenses:Investments:Currency:Currency Bank:XXX (XXX)
+Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
+      <sect3 id="currency_invest12">
+        <title>Purchasing Currency</title>
+
+        <para>When purchasing another currency, you will buy a certain number of units of foreign currency with
+          your own currency, at a particular rate. For example, you might buy USD 10,000 worth of
+          Andorran Francs, at 5 Francs to the dollar, with a transaction fee of $150.
+        </para>
 
-      <screenshot id="currency_purchase_ToAmount.png">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_purchase_ToAmount.png"
-                       format="PNG" srccredit="Bengt Thuree" />
-          </imageobject>
+        <bridgehead renderas='sect4'>
+          Buy Currency
+        </bridgehead>
+
+        <informaltable frame='none' colsep='0' rowsep='0'>
+          <tgroup cols='3'>
+            <colspec colwidth='5*' align='left'/>
+
+            <colspec colwidth='2*' align='left'/>
+
+            <colspec colwidth='1*' align='right'/>
+
+            <tbody>
+              <row>
+                <entry>
+                  Assets:Investments:Currency:Bank
+                </entry>
+
+                <entry>
+                  Withdrawal
+                </entry>
+
+                <entry>
+                  10,000
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Expenses:Investments:Currency:Currency Bank:ADF
+                </entry>
+
+                <entry>
+                  Deposit
+                </entry>
+
+                <entry>
+                  150
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Assets:Investments:Currency:ADF
+                </entry>
+
+                <entry>
+                  Deposit
+                </entry>
+
+                <entry>
+                  49,250
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+
+        <para>The Exchange Rate window should pop up when you leave the last row in the split above (Currency
+          Transaction). If this window does not pop up, right click on the row or select
+          <guimenu>Actions</guimenu>, and select <guilabel>Edit Exchange Rate</guilabel>. In the
+          Exchange Rate window you specify the exchange rate you got from the bank.
+        </para>
+      </sect3>
 
-          <textobject>
-            <phrase>Transfer Funds</phrase>
-          </textobject>
+      <sect3 id="currency_invest13">
+        <title>Selling a currency investment</title>
 
-          <caption>
-            <para>Setting the number of shares in the Transfer Funds dialog
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+        <para>Entering a currency sale is done in the same way as a currency buy except that you are now
+          transferring money from the Currency account to your Savings account (very similar to
+          <xref
+        linkend="invest-sell1" />).
+        </para>
 
-      <para>When you return to the Chart of Accounts, you will see the purchased shares reflected in the stock
-        account’s total.
-      </para>
+        <para>The proper recording of the currency sale *must* account for realized gains or losses. This can be
+          done using a split transaction. In the split transaction, you must account for the profit
+          (or loss) as coming from an <emphasis>Income:Capital Gains</emphasis> account (or
+          <emphasis>Expenses:Capital Loss</emphasis>). To balance this income, you will need to
+          enter the Currency asset twice in the split—once to record the actual sale (using
+          the correct amount and correct exchange rate), and once to balance the income profit
+          (setting the amount to 0).
+        </para>
 
-      <screenshot id="currency_purchase_AfterStocks.png">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_purchase_AfterStocks.png"
-                       format="PNG" srccredit="Bengt Thuree" />
-          </imageobject>
+        <para>In short, a selling Currency transaction should look something like below, seen again from the
+          <emphasis>Assets:Investments:Currency:Bank</emphasis>.
+        </para>
 
-          <textobject>
-            <phrase>Purchased international stocks</phrase>
-          </textobject>
+        <table>
+          <title>Selling a currency with a Split Transaction Scheme</title>
+
+          <tgroup cols="3">
+            <colspec colwidth='3*' align='left'/>
+
+            <colspec colwidth='1*' align='center'/>
+
+            <colspec colwidth='1*' align='center'/>
+
+            <thead>
+              <row>
+                <entry>
+                  Account
+                </entry>
+
+                <entry>
+                  Deposit
+                </entry>
+
+                <entry>
+                  Withdrawal
+                </entry>
+              </row>
+            </thead>
+
+            <tbody>
+              <row>
+                <entry>
+                  Assets:Investments:Currency:Bank
+                </entry>
+
+                <entry>
+                  Sold Amount - Exchange Fee
+                </entry>
+
+                <entry></entry>
+              </row>
+
+              <row>
+                <entry>
+                  Expenses:Investments:Currency:Currency Bank:XXX
+                </entry>
+
+                <entry>
+                  Exchange Fee
+                </entry>
+
+                <entry></entry>
+              </row>
+
+              <row>
+                <entry>
+                  Assets:Investments:Currency:XXX
+                </entry>
+
+                <entry></entry>
+
+                <entry>
+                  Sold Amount
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Income:Investments:Currency Bank:Capital Gains:XXX
+                </entry>
+
+                <entry>
+                  [LOSS]
+                </entry>
+
+                <entry>
+                  PROFIT
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Assets:Investments:Currency:XXX
+                </entry>
+
+                <entry>
+                  PROFIT (with To Amount = 0)
+                </entry>
+
+                <entry>
+                  [LOSS (with To Amount = 0) ]
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+      </sect3>
+    </sect2>
 
-          <caption>
-            <para>Chart of Accounts with some international stocks
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+    <sect2 id="currency_reconcile1">
+      <title>Reconciling Statements in a Foreign Currency</title>
 
-      <para>However, as you can see, the USD totals may be zero if &app; doesn’t have an exchange rate
-        between USD and HKD. To fix this, go to
-        <menuchoice>
-          <guimenu>Tools</guimenu><guimenuitem>Price Editor</guimenuitem>
-        </menuchoice>
-        and click the <guibutton>Get Quotes</guibutton> button to automatically retrieve the
-        exchange rates you need.
+      <para>Reconciling foreign statement are done in the same manner as when you reconcile your local bank
+        statement. If you have created a Chart of Accounts structure which allows you to have the
+        same currency per account as your statement, it is actually exactly the same as reconciling
+        your local bank statement.
       </para>
 
-      <note>
-        <para>To reiterate, this example shows how stock can be purchased in any currency by entering the
-          transaction in the register of the cash account used to make payment. It is also possible
-          to enter the purchase in the stock account’s register, but be aware that the stock
-          is assumed to be priced in the currency of the stock account’s parent.
-        </para>
-
-        <para>In this example, the stock account’s parent (<emphasis>Assets:Investments:Brokerage
-          Account:Boom</emphasis>) is denominated in HKD. Since this is same currency as the stock
-          price, the purchase can be safely entered in the stock account’s register.
-        </para>
-      </note>
+      <para>If you have different currencies you might have to manually convert the amounts from one currency to
+        another while you reconcile the accounts.
+      </para>
     </sect2>
   </sect1>
 
-  <sect1 id="currency_invest1">
-    <title>Tracking Currency Investments</title>
+  <sect1 id="currency_trading_accts">
+    <title>Automatically Recording Currency Transactions using Trading Accounts</title>
 
-    <para>Currency investment is when you decide to invest in a different country's currency, and hope that it
-      will rise in value relative your own currency.
+    <para>Trading accounts were introduced as a feature from &app; version 2.3.14. The conceptual basis for
+      trading accounts is described in <ulink url="&url-selinger;accounting/tutorial.html">
+      &tit-sel-tut;</ulink> by Peter Selinger. A second tutorial
+      <ulink url="&url-selinger;accounting/gnucash.html"> &tit-sel-gnc;</ulink> by Peter Selinger
+      describes the manual creation and use of trading accounts in &app; prior to version 2.3.14.
     </para>
 
-    <para>When you enter these transactions into &app;, you will have to decide on how much detail you would
-      like to have.
+    <para>Trading accounts are not enabled by default in &app;. To enable them go to
+      <menuchoice>
+        <guimenu>File</guimenu><guimenuitem>Properties</guimenuitem> <guimenuitem>Accounts
+        tab</guimenuitem>
+      </menuchoice>
+      and check the <guilabel>Use Trading Accounts</guilabel> checkbox.
     </para>
 
-    <para>If you are not interested in detail at all, a very simple account structure would suffice:
-    </para>
-<literallayout>
-    Assets:Investments:Currency:Bank (USD)
-    Assets:Investments:Currency:XXX (XXX)
-    </literallayout>
-    <para>You would simply enter transfers between the two accounts, noting exchange rates as you went.
-    </para>
+    <sect2 id="trading_acct_concepts">
+      <title>Trading Account Concepts</title>
 
-    <para>But, if you do want to be able to track capital gains or losses, as well as any fees, you do need a
-      more complex account structure, such as:
-    </para>
-<literallayout>
-    Assets:Investments:Currency:Bank (USD)
-    Assets:Investments:Currency:Currency Bank:XXX (XXX)
-    Expenses:Investments:Currency:Currency Bank:XXX (XXX)
-    Income:Investments:Currency Bank:Capital Gains:XXX (XXX)
-    </literallayout>
-    <sect2 id="currency_invest12">
-      <title>Purchasing Currency</title>
-
-      <para>When purchasing another currency, you will buy a certain number of units of foreign currency with
-        your own currency, at a particular rate. For example, you might buy USD 10,000 worth of
-        Andorran Francs, at 5 Francs to the dollar, with a transaction fee of $150.
+      <para>In accounting terms, trading accounts are specialized equity accounts to record changes in revenue
+        which result from transactions between two or more currencies. In &app; they are implemented
+        as a top level account type of Trading. When trading accounts are enabled the required sub
+        accounts of Trading are automatically created if they do not already exist when a
+        transaction between one or more currencies is created.
+      </para>
+
+      <para>In the extended Accounting Equation, Trading accounts would appear as follows:
+        <equation>
+          <mathphrase>Assets = Liabilities + Equity (+ Income -Expenses) + Trading </mathphrase>
+        </equation>
       </para>
 
-      <bridgehead renderas='sect4'>
-        Buy Currency
-      </bridgehead>
-
-      <informaltable frame='none' colsep='0' rowsep='0'>
-        <tgroup cols='3'>
-          <colspec colwidth='5*' align='left'/>
-
-          <colspec colwidth='2*' align='left'/>
-
-          <colspec colwidth='1*' align='right'/>
-
-          <tbody>
-            <row>
-              <entry>
-                Assets:Investments:Currency:Bank
-              </entry>
-
-              <entry>
-                Withdrawal
-              </entry>
-
-              <entry>
-                10,000
-              </entry>
-            </row>
-
-            <row>
-              <entry>
-                Expenses:Investments:Currency:Currency Bank:ADF
-              </entry>
-
-              <entry>
-                Deposit
-              </entry>
-
-              <entry>
-                150
-              </entry>
-            </row>
-
-            <row>
-              <entry>
-                Assets:Investments:Currency:ADF
-              </entry>
-
-              <entry>
-                Deposit
-              </entry>
-
-              <entry>
-                49,250
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
-
-      <para>The Exchange Rate window should pop up when you leave the last row in the split above (Currency
-        Transaction). If this window does not pop up, right click on the row or select
-        <guimenu>Actions</guimenu>, and select <guilabel>Edit Exchange Rate</guilabel>. In the
-        Exchange Rate window you specify the exchange rate you got from the bank.
+      <caution>
+        <para>The user is prevented from manually making entries directly to the registers for any of the accounts
+          in the Trading top level account group. All entries to these accounts are automatically
+          generated when transactions between currencies are created in other account registers
+          within the &app;account heirarchy.
+        </para>
+      </caution>
+
+      <para>The Trading account group is structured below the top level account <guilabel>Trading</guilabel>
+        with a sub-account <guilabel>CURRENCY</guilabel> which in turn has a sub-account for each
+        currency between which transactions have been made. For the example previously used in
+        <link linkend="currency_manual">Manually Recording Currency Transactions</link>, the
+        additional accounts which will be created automatically when transactions are created
+        between different currencies with trading accounts enabled are:
       </para>
+<screen>
+Trading
+    CURRENCY
+        EUR
+        HKD
+        USD</screen>
+      <caution>
+        <para>The names of these accounts are again assigned automatically and cannot be changed by a user without
+          disrupting the functionality of the trading accounts in &app;.
+        </para>
+      </caution>
     </sect2>
 
-    <sect2 id="currency_invest13">
-      <title>Selling a currency investment</title>
+    <sect2 id="currency_trading">
+      <title>Recording Foreign Currency Transactions with Trading Accounts</title>
 
-      <para>Entering a currency sale is done in the same way as a currency buy except that you are now
-        transferring money from the Currency account to your Savings account (very similar to
-        <xref
-      linkend="invest-sell1" />).
-      </para>
+      <sect3 id="currency_trading_account_setup">
+        <title>Setup of Accounts for Trading Accounts</title>
 
-      <para>The proper recording of the currency sale *must* account for realized gains or losses. This can be
-        done using a split transaction. In the split transaction, you must account for the profit
-        (or loss) as coming from an <emphasis>Income:Capital Gains</emphasis> account (or
-        <emphasis>Expenses:Capital Loss</emphasis>). To balance this income, you will need to enter
-        the Currency asset twice in the split—once to record the actual sale (using the
-        correct amount and correct exchange rate), and once to balance the income profit (setting
-        the amount to 0).
-      </para>
+        <para>The same account structure useds in the manual recording of currency transactions in the previous
+          section is required. The initial account configuration for Assets and Equity accounts are
+          as follows:
+        </para>
 
-      <para>In short, a selling Currency transaction should look something like below, seen again from the
-        <emphasis>Assets:Investments:Currency:Bank</emphasis>.
-      </para>
+        <screenshot id="currency__trading_acct_setup">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/currency_trading_acct_setup.png"
+                format="PNG" srccredit="David Cousens" width="510"/>
+            </imageobject>
 
-      <table>
-        <title>Selling a currency with a Split Transaction Scheme</title>
-
-        <tgroup cols="3">
-          <colspec colwidth='3*' align='left'/>
-
-          <colspec colwidth='1*' align='center'/>
-
-          <colspec colwidth='1*' align='center'/>
-
-          <thead>
-            <row>
-              <entry>
-                Account
-              </entry>
-
-              <entry>
-                Deposit
-              </entry>
-
-              <entry>
-                Withdrawal
-              </entry>
-            </row>
-          </thead>
-
-          <tbody>
-            <row>
-              <entry>
-                Assets:Investments:Currency:Bank
-              </entry>
-
-              <entry>
-                Sold Amount - Exchange Fee
-              </entry>
-
-              <entry></entry>
-            </row>
-
-            <row>
-              <entry>
-                Expenses:Investments:Currency:Currency Bank:XXX
-              </entry>
-
-              <entry>
-                Exchange Fee
-              </entry>
-
-              <entry></entry>
-            </row>
-
-            <row>
-              <entry>
-                Assets:Investments:Currency:XXX
-              </entry>
-
-              <entry></entry>
-
-              <entry>
-                Sold Amount
-              </entry>
-            </row>
-
-            <row>
-              <entry>
-                Income:Investments:Currency Bank:Capital Gains:XXX
-              </entry>
-
-              <entry>
-                [LOSS]
-              </entry>
-
-              <entry>
-                PROFIT
-              </entry>
-            </row>
-
-            <row>
-              <entry>
-                Assets:Investments:Currency:XXX
-              </entry>
-
-              <entry>
-                PROFIT (with To Amount = 0)
-              </entry>
-
-              <entry>
-                [LOSS (with To Amount = 0) ]
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </sect2>
-  </sect1>
+            <imageobject role="fo">
+              <imagedata fileref="figures/currency_trading_acct_setup.png"
+                format="PNG" srccredit="David Cousens"/>
+            </imageobject>
 
-  <sect1 id="currency_reconcile1">
-    <title>Reconciling Statements in a Foreign Currency</title>
+            <textobject>
+              <phrase>Initial multi currency Account Bank Setup</phrase>
+            </textobject>
 
-    <para>Reconciling foreign statement are done in the same manner as when you reconcile your local bank
-      statement. If you have created a Chart of Accounts structure which allows you to have the same
-      currency per account as your statement, it is actually exactly the same as reconciling your
-      local bank statement.
-    </para>
+            <caption>
+              <para>Initial setup of bank accounts in multiple currencies.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
 
-    <para>If you have different currencies you might have to manually convert the amounts from one currency to
-      another while you reconcile the accounts.
-    </para>
+        <para>The following prices were entered in the Price Database (
+          <menuchoice>
+            <guimenu>Tools</guimenu><guisubmenu>Price Database</guisubmenu>
+          </menuchoice>
+          ) as at 01/01/2020 to convert the account balances for the foreign currency accounts to
+          USD:
+        </para>
+
+        <screenshot id="currency__trading_price_database">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/currency_trading_Price_Database_initial.png"
+                format="PNG" srccredit="David Cousens" width="510"/>
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/currency_trading_Price_Database_initial.png"
+                format="PNG" srccredit="David Cousens"/>
+            </imageobject>
+
+            <textobject>
+              <phrase>The Price Database initial entries</phrase>
+            </textobject>
+
+            <caption>
+              <para>Price Database window after setting initial exchange rates between USD and HKD and EUR.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+
+        <para>With the currency prices set as shown, the Accounts tab will now display the values of the foreign
+          accounts in USD in the <guilabel>Total(USD)</guilabel> column:
+        </para>
+
+        <screenshot id="currency_trading_acct_setup_2">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/currency_trading_acct_setup_2.png"
+                format="PNG" srccredit="David Cousens" width="510"/>
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/currency_trading_acct_setup_2.png"
+                format="PNG" srccredit="David Cousens"/>
+            </imageobject>
+
+            <textobject>
+              <phrase>Initial multi currency setup after entering exchange rates between USD and HKD
+              and EUR </phrase>
+            </textobject>
+
+            <caption>
+              <para><guilabel>Accounts</guilabel> tab after setting exchange rates to USD.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </sect3>
+
+      <sect3 id="currency_trading_transfer">
+        <title>Transfer of Funds to a Foreign Currency</title>
+
+        <para>Let us assume we wish to purchase at item in Hong Kong using the Hong Kong bank account for $20000
+          HKD on 01/02/2020. The current funds in the Hong Kong account are insufficient and we will
+          need to transfer another $10200 HKD from the US bank account. The exchange rate at the
+          time of the transfer is 1 USD = 7.7884 HKD and we will have to transfer $1309.64 USD for
+          which the bank charges a $40 USD transfer fee. The transaction to effect this is created
+          with the transfer funds dialog as shown below:
+        </para>
+
+        <screenshot id="currency__trading_tfr_dialog">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/currency_trading_transfer_funds.png"
+                format="PNG" srccredit="David Cousens" width="510"/>
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/currency_trading_transfer_funds.png"
+                format="PNG" srccredit="David Cousens"/>
+            </imageobject>
+
+            <textobject>
+              <phrase>Transfer dialog to create transactionfor transfer from USD to HKD</phrase>
+            </textobject>
+
+            <caption>
+              <para>Transfer of 10200 HKD from US Bank account to Hong Kong bank account.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+
+        <para>The debit amount has been specified in HKD and the transaction amount being transferred in USD.
+          There is no provision to enter the transfer fee in the dialog. On closing the dialog the
+          following transaction as viewed in the US Bank Account register has been created:
+        </para>
+
+        <note>
+          <para>Entering the Amount for the account that the funds are being transferred from the selected Credit
+            Account and selecting the Debit Amount radio button and then entering the foreign
+            currency amount to be debited generally provides a transaction recording the correct
+            amounts whereas entering an exchange rate will often not give the exact value actually
+            transferred in the foreign currency because of rounding errors.
+          </para>
+        </note>
+
+        <screenshot id="currency_trading_transfer_trans1">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/currency_trading_transfer_trans1.png"
+                format="PNG" srccredit="David Cousens"  width="510"/>
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/currency_trading_transfer_trans1.png"
+                format="PNG" srccredit="David Cousens"/>
+            </imageobject>
+
+            <textobject>
+              <phrase>Transaction after transfer displayed in US Bank account register</phrase>
+            </textobject>
+
+            <caption>
+              <para>Transaction to transfer from US bank account to Hong Kong Bank account after closing transfer
+                dialog.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+
+        <para>The transaction can be opened in the US Bank Account register and may then be edited to add splits
+          for the transfer fee as follows:
+        </para>
+
+        <screenshot id="currency_trading_transfer_trans2">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/currency_trading_transfer_trans2.png"
+                format="PNG" srccredit="David Cousens"  width="510"/>
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/currency_trading_transfer_trans2.png"
+                format="PNG" srccredit="David Cousens"/>
+            </imageobject>
+
+            <textobject>
+              <phrase>Transaction after adding the splits for the transfer fee</phrase>
+            </textobject>
+
+            <caption>
+              <para>Transaction to transfer from US bank account to Hong Kong Bank account after adding the splits for
+                the transaction fee.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+
+        <para>Returning to the Accounts tab we can see the result of the transfer transaction on the accounts:
+        </para>
+
+        <screenshot id="currency_trading_accts_after_tfr">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/currency_trading_accts_after_tfr.png"
+                format="PNG" srccredit="David Cousens" width="510"/>
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/currency_trading_accts_after_tfr.png"
+                format="PNG" srccredit="David Cousens"/>
+            </imageobject>
+
+            <textobject>
+              <phrase>Account tab balances after completion of USD to HKD transfer</phrase>
+            </textobject>
+
+            <caption>
+              <para>Account balances in the Accounts tab after the transfer of funds from the US Bank account to the
+                Hong Kong bank account.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+
+        <para>The balances of the Asset and Equity accounts are presented with values set by the exchange rate
+          entered in the transaction to transfer funds on 01/02/2020.
+        </para>
+
+        <para>The trading accounts have been automatically created and the amounts of the transfer have been
+          entered into the accounts. There are no entries associated with the pre-existing opening
+          balances of the accounts prior to the transfer. This reflects that the trading accounts
+          only reflect gains and losses since the book was opened.
+        </para>
+
+        <para>At this point there have been no trading gains or losses. The balances of the USD and HKD trading
+          accounts are the same when converted to USD. The HKD trading account has a debit (-ve
+          balance) and the USD trading account has a credit balance (+ve balance). The nett balance
+          of the CURRENCY sub account of Trading, and Trading itself, is 0 indicating that at this
+          point no gains or losses have been recorded in the trading of currencies.
+        </para>
+
+        <para>The hypothetical purchase in Hong Kong fails to take place and a month later on 01/03/2020 the funds
+          are required in the US account for another purpose. A transfer of $10200.00 HKD is made
+          from the Hong Kong bank account back to the US bank account. The exchange rate at the time
+          of the transfer is 1USD = 7.7933 HKD and a fee of $20.00 USD is charged for the transfer.
+          The transaction to effect the transfer is:
+        </para>
+
+        <screenshot id="currency_trading_tfr_back">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/currency_trading_trf_back.png" format="PNG"
+                         srccredit="David Cousens"  width="510"/>
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/currency_trading_trf_back.png"
+                format="PNG" srccredit="David Cousens"/>
+            </imageobject>
+
+            <textobject>
+              <phrase>Transaction to transfer funds from Hong Kong to US Bank account.</phrase>
+            </textobject>
+
+            <caption>
+              <para>The transaction transfers $10200.00 HKD from the Hong Kong Bank account to the US Bank account.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+
+        <para>After transferring the funds back to the US Bank account, the prices database entries are as
+          follows:
+        </para>
+
+        <screenshot id="currency_trading_prices_after_trf_back">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/currency_trading_prices_after_trf_back.png"
+                format="PNG" srccredit="David Cousens" width="510"/>
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/currency_trading_prices_after_trf_back.png"
+                format="PNG" srccredit="David Cousens"/>
+            </imageobject>
+
+            <textobject>
+              <phrase>Price database after transfer of funds back to US account</phrase>
+            </textobject>
+
+            <caption>
+              <para>The price database showing prices for the transfer of funds to HKD and back to USD.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+
+        <para>The Accounts tab balances after transferring the funds back are:
+        </para>
+
+        <screenshot id="currency_trading_accts_after_trf_back">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/currency_trading_accts_after_trf_back.png"
+                format="PNG" srccredit="David Cousens" width="510"/>
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/currency_trading_accts_after_trf_back.png"
+                format="PNG" srccredit="David Cousens"/>
+            </imageobject>
+
+            <textobject>
+              <phrase>Accounts tab after transfer back</phrase>
+            </textobject>
+
+            <caption>
+              <para>State of the accounts after the funds have been transferred back.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+
+        <para>The Assets and Equity balances now reflect the the values of the accounts at the exchange rate for
+          the transfer of funds back to the US Bank account. The Trading accounts now indicate a
+          modest realized loss of US$0.82 on the currency transactions indicated by the balances in
+          the CURRENCY and Trading placeholder accounts. The associated transfer fees appear in the
+          Expenses total. Not a profitable exercise but still illustrative.
+        </para>
+
+        <note>
+          <para>The gains or losses reported using trading accounts are realized gains and losses.
+          </para>
+        </note>
+
+        <para>Finally we have the balance sheet after the above sequence of transactions reporting the Trading
+          Loss incurred:
+        </para>
+
+        <screenshot id="currency_trading_balance_sheet">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/currency_trading_balance_sheet.png"
+                format="PNG" srccredit="David Cousens" width="510"/>
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/currency_trading_balance_sheet.png"
+                format="PNG" srccredit="David Cousens"/>
+            </imageobject>
+
+            <textobject>
+              <phrase>Balance sheet after above transactions</phrase>
+            </textobject>
+
+            <caption>
+              <para>Balance Sheet after these transactions reflecting the trading loss incurred.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </sect3>
+    </sect2>
   </sect1>
 </chapter>
diff --git a/guide/ru/ch_dep.xml b/guide/ru/ch_dep.xml
index a6365d1..8140f0d 100644
--- a/guide/ru/ch_dep.xml
+++ b/guide/ru/ch_dep.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!--  (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   	Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_dep">
   <title>Depreciation</title>
@@ -595,7 +594,7 @@
       Depreciation</emphasis> account is balanced by the <emphasis>Expenses:Depreciation</emphasis>
       account.
     </para>
-<literallayout>
+<screen>
 -Assets
    -Fixed Assets
       -ITEM1
@@ -607,8 +606,7 @@
    -Current Assets
       -Bank
 -Expense
-   -Depreciation        (Depreciation Expense account)
-  </literallayout>
+   -Depreciation        (Depreciation Expense account)</screen>
     <para>One of the features of the account hierarchy shown above is that you can readily see some important
       summary values about your depreciating asset. The <emphasis>Assets:Fixed
       Assets:ITEM1</emphasis> account total shows you the current estimated value for item1, the
diff --git a/guide/ru/ch_invest.xml b/guide/ru/ch_invest.xml
index aabe506..e9e5a5a 100644
--- a/guide/ru/ch_invest.xml
+++ b/guide/ru/ch_invest.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: December 7th 2009
        modified: January 10th 2007
        modified: July 9th 2006
   Maintainers:
-               Alex Aycinena <alex.aycinena at gmail.com>
-               Chris Lyttle <chris at wilddev.net>
+    Alex Aycinena <alex.aycinena at gmail.com>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  	Updated	Dave Herman <dvherman at bigfoot.com>
+    Jon Lapham <lapham at extracta.com.br>
+    Updated	Dave Herman <dvherman at bigfoot.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_invest">
   <title>Инвестиции</title>
@@ -401,7 +400,7 @@
         deals with the investments. This way it is easier to compare the statements you get from
         your brokerage with the accounts you have in &app; and spot where &app; differs from the
         statement.
-<literallayout>
+<screen>
  Assets
     Investments
        Brokerage Accounts
@@ -448,8 +447,7 @@
           My Stockbroker
        Management Fees
           I*Trade
-          My Stockbroker
- </literallayout>
+          My Stockbroker</screen>
       </para>
 
       <tip>
@@ -478,7 +476,7 @@
         expense account to record bank charges. Below is an account layout example, in which you
         have an interest bearing savings account and a certificate of deposit at your bank.
       </para>
-<literallayout>
+<screen>
 Assets
    Bank ABC
       CD
@@ -489,8 +487,7 @@ Expenses
 Income
    Interest Income
       CD
-      Savings
-  </literallayout>
+      Savings</screen>
       <para>As usual, this account hierarchy is simply presented as an example, you should create your accounts
         in a form which best matches your actual situation.
       </para>
@@ -654,7 +651,7 @@ Income
         respectively. Below is a schematic model of the layout (only showing the Assets
         sub-accounts).
       </para>
-<literallayout>
+<screen>
  Assets
     Investments
        Brokerage Accounts
@@ -664,8 +661,7 @@ Income
           Stock
              AMZN
              IBM
-             NST
- </literallayout>
+             NST</screen>
       <note>
         <para>If you want to track income (dividends/interest/capital gains) on a per-stock or fund basis, you
           will need to create an <emphasis>Income:Dividends:STOCKSYMBOL</emphasis>,
@@ -1550,7 +1546,7 @@ Income
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockvalue_report_options.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       format="PNG" srccredit="John Ralls"></imagedata>
             </imageobject>
 
             <textobject>
diff --git a/guide/ru/ch_loans.xml b/guide/ru/ch_loans.xml
index 38fe709..b50a94f 100644
--- a/guide/ru/ch_loans.xml
+++ b/guide/ru/ch_loans.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
+    Jon Lapham <lapham at extracta.com.br>
   	Updated	Bengt Thuree <bengt at thuree.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_loans">
   <title>Кредиты</title>
@@ -126,8 +125,7 @@
       money from a loan is an asset. With these parameters, we can now present a basic loan account
       structure:
     </para>
-<literallayout>
-Basic Loan Account Structure
+<screen>Basic Loan Account Structure
 
 -Asset
     -Current Assets
@@ -140,8 +138,7 @@ Basic Loan Account Structure
 -Expenses
    -Interest
        -Mortgage Interest
-   -Mortgage Adm Fees
-  </literallayout>
+   -Mortgage Adm Fees</screen>
     <para>&app; has a number of predefined loan account hierarchies available, including Car Loans and Home
       Mortgage Loans. To access these predefined account structures, click on
       <menuchoice>
@@ -279,28 +276,27 @@ Basic Loan Account Structure
 
       <para>In order to discuss the mathematical formulas used by the <guilabel>Loan Repayment
         Calculator</guilabel>, we first must define some variables.
-<literallayout>
- n  == number of payment periods
+<screen>
+ n   == number of payment periods
  %i  == nominal interest rate, NAR, charged
  PV  == Present Value
  PMT == Periodic Payment
  FV  == Future Value
- CF == Compounding Frequency per year
- PF == Payment Frequency per year
+ CF  == Compounding Frequency per year
+ PF  == Payment Frequency per year
 
 Normal values for CF and PF are:
-   1   == annual
-   2   == semi-annual
-   3   == tri-annual
-   4   == quaterly
-   6   == bi-monthly
-   12  == monthly
-   24  == semi-monthly
-   26  == bi-weekly
-   52  == weekly
-   360 == daily
-   365 == daily
-</literallayout>
+   1  == annual
+   2  == semi-annual
+   3  == tri-annual
+   4  == quaterly
+   6  == bi-monthly
+  12  == monthly
+  24  == semi-monthly
+  26  == bi-weekly
+  52  == weekly
+ 360  == daily
+ 365  == daily</screen>
       </para>
 
       <sect3 id="loans_calcsdetails_i2">
@@ -312,15 +308,13 @@ Normal values for CF and PF are:
           computation produces the effective interest rate (ieff). Thus, we need functions which
           convert from i to ieff, and from ieff to i.
         </para>
-<literallayout>
-To convert from i to ieff, the following expressions are used:
-Discrete Interest:     <emphasis>ieff = (1 + i/CF)^(CF/PF) - 1</emphasis>
+<screen>To convert from i to ieff, the following expressions are used:
+Discrete Interest:   <emphasis>ieff = (1 + i/CF)^(CF/PF) - 1</emphasis>
 Continuous Interest: <emphasis>ieff = e^(i/PF) - 1 = exp(i/PF) - 1</emphasis>
 
 To convert from ieff to i, the following expressions are used:
-Discrete Interst:      <emphasis>i = CF*[(1+ieff)^(PF/CF) - 1]</emphasis>
-Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis>
-</literallayout>
+Discrete Interst:    <emphasis>i = CF*[(1+ieff)^(PF/CF) - 1]</emphasis>
+Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis></screen>
         <note>
           <para>In the equations below for the financial transaction, all interest rates are the effective interest
             rate, <quote>ieff</quote>. For the sake of brevity, the symbol will be shortened to just
@@ -335,18 +329,17 @@ Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis>
         <para>One equation fundamentally links all the 5 variables. This is known as the fundamental financial
           equation:
         </para>
-<literallayout>
+<screen>
 <emphasis>PV*(1 + i)^n + PMT*(1 + iX)*[(1+i)^n - 1]/i + FV = 0</emphasis>
 
   Where: X = 0 for end of period payments, and
-         X = 1 for beginning of period payments
-</literallayout>
+         X = 1 for beginning of period payments</screen>
         <para>From this equation, functions which solve for the individual variables can be derived. For a
           detailed explanation of the derivation of this equation, see the comments in the file
           src/calculation/fin.c from the &app; source code. The A, B, and C variables are defined
           first, to make the later equations simpler to read.
         </para>
-<literallayout>
+<screen>
 <emphasis>A = (1 + i)^n - 1</emphasis>
 <emphasis>B = (1 + iX)/i</emphasis>
 <emphasis>C = PMT*B</emphasis>
@@ -359,8 +352,7 @@ Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis>
 The solution for interest is broken into two cases.
 The simple case for when  PMT == 0 gives the solution:
 <emphasis>i = [FV/PV]^(1/n) - 1</emphasis>
-
-</literallayout>
+</screen>
         <para>The case where PMT != 0 is fairly complex and will not be presented here. Rather than involving an
           exactly solvable function, determining the interest rate when PMT !=0 involves an
           iterative process. Please see the src/calculation/fin.c source file for a detailed
@@ -564,7 +556,7 @@ The simple case for when  PMT == 0 gives the solution:
 
     <para>We are basing this How-To on the following generic account structure.
     </para>
-<literallayout>
+<screen>
 -Asset
    -Bank
         -Bank Account
@@ -572,8 +564,7 @@ The simple case for when  PMT == 0 gives the solution:
         -Person
 -Income
    -Interest Income
-        -Person
-  </literallayout>
+        -Person</screen>
     <para>This example will show how to track a personal loan of 2,000 USD (default currency) to your friend
       Peter
     </para>
@@ -614,8 +605,9 @@ The simple case for when  PMT == 0 gives the solution:
       </para>
 
       <para>You have a number of different options, like paper and pen, Linux Calculator, Open Office’s
-        Calc module, but the easiest is to use &app; <guilabel>Loan Repayment Calculator</guilabel>.
-        This tells you that the Monthly Payment should be $115.56.
+        Calc module, but the easiest is to use &app; <link linkend="loans_calcs1"><guilabel>Loan
+        Repayment Calculator</guilabel></link>. This tells you that the Monthly Payment should be
+        $115.56.
       </para>
 
       <para>But you need to know how much of this is Interest and how much is Principal to be able to do a
@@ -649,12 +641,11 @@ The simple case for when  PMT == 0 gives the solution:
       <para>Let’s start with the following accounts (all accounts have the same currency, in this case
         USD)
       </para>
-<literallayout>
+<screen>
 Assets:Bank:USD
 Assets:Money owed to you:Peter
 Income:Interest Income:Peter
-Equity:Opening Balances:USD
-  </literallayout>
+Equity:Opening Balances:USD</screen>
     </sect2>
 
     <sect2 id="loans_personalLoanToSomeOne_InitialSetup">
@@ -888,7 +879,7 @@ Equity:Opening Balances:USD
       loan. The only difference is different accounts, and different interest rates.
     </para>
 
-    <para><literallayout>Basic Car Loan Account Structure
+    <para><screen>Basic Car Loan Account Structure
 
 -Asset
     -Current Assets
@@ -901,7 +892,7 @@ Equity:Opening Balances:USD
 -Expenses
    -Interest
        -Car Loan Interest
-   -Car Loan Adm Fees</literallayout>
+   -Car Loan Adm Fees</screen>
     </para>
 
     <para>For more information, please check <xref
@@ -955,7 +946,7 @@ Equity:Opening Balances:USD
         you want to sell a car instead, just substitute the house account with a car account.
       </para>
 
-      <para><literallayout>
+      <para><screen>
 -Assets
   -Fixed Assets
     -House
@@ -963,8 +954,7 @@ Equity:Opening Balances:USD
     -Saving
 -Income
   -Capital Gains Long
-    -House
-    </literallayout>
+    -House</screen>
       </para>
 
       <itemizedlist>
@@ -1129,7 +1119,7 @@ Equity:Opening Balances:USD
         <xref linkend="chapter_capgain"></xref>.
       </para>
 
-      <para><literallayout>
+      <para><screen>
 -Assets
     -Fixed Assets
         -House
@@ -1141,8 +1131,7 @@ Equity:Opening Balances:USD
     -Realized Gain
         -House
     -Unrealized Gain
-        -House
-    </literallayout>
+        -House</screen>
       </para>
 
       <para>You bought a house for $300,000 once upon a time, and over the years kept a close look on the market
@@ -1287,8 +1276,7 @@ Equity:Opening Balances:USD
 <!--
   <sect1 id="loans_missing1">
     <title>Missing Loan Documentation</title>
-
-    <literallayout>
+<screen>
  -Entering a Payment Schedule
      -Monthly Payments (How-To)
        -See the Mortgage assistant
@@ -1298,8 +1286,7 @@ Equity:Opening Balances:USD
        -Same as a normal payment, but you get the figures from the bank
        -How to fix 10 amortization and then a final bulk payment setup?
 
- -Putting It All Together
- </literallayout>
+ -Putting It All Together</screen>
   </sect1>
 -->
 </chapter>
diff --git a/guide/ru/figures/invest_stockvalue_report_options.png b/guide/ru/figures/invest_stockvalue_report_options.png
index 6703486..79b386c 100644
Binary files a/guide/ru/figures/invest_stockvalue_report_options.png and b/guide/ru/figures/invest_stockvalue_report_options.png differ

commit f290acef6569f10f6ff67c31b5a4e5992a7c7f97
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed May 19 10:50:48 2021 +0200

    L10N:de: guide ch_currency.xml: fix indentation

diff --git a/guide/de/ch_currency.xml b/guide/de/ch_currency.xml
index 57d8375..6c7449a 100644
--- a/guide/de/ch_currency.xml
+++ b/guide/de/ch_currency.xml
@@ -91,7 +91,7 @@
       arbeiten, aber auch ein US Bankkonto haben und den US Dollar nutzen (USD). Ebenso haben Sie
       ein Bankkonto in Hong Kong und nutzen Hong Kong Dollar (HKD). Somit sind 3 Bankkonten
       aufzusetzen, eins in US Dollars und ein weiteres in Hong Kong Dollar. Eine mögliche
-      Kontenstruktur dafür könnte Folgende sein::
+      Kontenstruktur dafür könnte Folgende sein:
     </para>
 <literallayout>
 -Aktiva                      (EUR)
@@ -657,7 +657,7 @@
 Aktiva:Anlagen:Maklerkonto:Boom:0694.HK         (Beijing Airport)
 Aktiva:Anlagen:Maklerkonto:Boom:Bank            (HKD)
 Eigenkapital:Anfangsbestand:HKD                 (HKD)
-Aufwendungen:Kommissionen:Boom.0694.HK           (HKD)
+Aufwendungen:Kommissionen:Boom.0694.HK          (HKD)
 Erträge:Investments:Dividende:Boom:0694.HK      (HKD)
       </literallayout>
       <para>Der Kontenplan sieht wie folgt nach der Erstellung aller benötigten Konten aus:



Summary of changes:
 guide/C/appendixa.xml                              |   13 +-
 guide/C/appendixc.xml                              |   15 +-
 guide/C/appendixd.xml                              |   54 +-
 guide/C/ch_bus_features.xml                        |   42 +-
 guide/C/ch_capgain.xml                             |   16 +-
 guide/C/ch_cc.xml                                  |   21 +-
 guide/C/ch_currency.xml                            |  107 +-
 guide/C/ch_dep.xml                                 |   14 +-
 guide/C/ch_invest.xml                              |   28 +-
 guide/C/ch_loans.xml                               |   96 +-
 guide/de/appendixa.xml                             |  302 +--
 guide/de/appendixc.xml                             |  148 +-
 guide/de/appendixd.xml                             | 1356 +++++++++----
 guide/de/ch_bus_ap.xml                             |   23 +-
 guide/de/ch_bus_ar.xml                             |   31 +-
 guide/de/ch_bus_pay.xml                            |  788 +++++---
 guide/de/ch_bus_setup.xml                          |   19 +-
 guide/de/ch_capgain.xml                            |   34 +-
 guide/de/ch_cc.xml                                 |   57 +-
 guide/de/ch_currency.xml                           |   93 +-
 guide/de/ch_dep.xml                                |  765 ++++---
 guide/de/ch_invest.xml                             |   72 +-
 guide/de/ch_loans.xml                              |   95 +-
 guide/ja/appendixa.xml                             |   65 +-
 guide/ja/appendixc.xml                             |   19 +-
 guide/ja/appendixd.xml                             |  125 +-
 guide/ja/ch_bus_ap.xml                             |   13 +-
 guide/ja/ch_bus_ar.xml                             |   28 +-
 guide/ja/ch_bus_pay.xml                            |   21 +-
 guide/ja/ch_capgain.xml                            |   19 +-
 guide/ja/ch_cc.xml                                 |   24 +-
 guide/ja/ch_currency.xml                           |   92 +-
 guide/ja/ch_dep.xml                                |   17 +-
 guide/ja/ch_invest.xml                             |   31 +-
 guide/ja/ch_loans.xml                              |   97 +-
 guide/pt/appendixa.xml                             |   62 +-
 guide/pt/appendixc.xml                             |   17 +-
 guide/pt/appendixd.xml                             | 1352 +++++++++----
 guide/pt/ch_bus_pay.xml                            |   24 +-
 guide/pt/ch_bus_setup.xml                          |   17 +-
 guide/pt/ch_capgain.xml                            |   18 +-
 guide/pt/ch_cc.xml                                 |   23 +-
 guide/pt/ch_currency.xml                           |  119 +-
 guide/pt/ch_dep.xml                                |   16 +-
 guide/pt/ch_invest.xml                             |   32 +-
 guide/pt/ch_loans.xml                              |   91 +-
 guide/ru/appendixa.xml                             |  155 +-
 guide/ru/appendixc.xml                             |   26 +-
 guide/ru/appendixd.xml                             |   90 +-
 guide/ru/ch_bus_features.xml                       |   42 +-
 guide/ru/ch_capgain.xml                            |   16 +-
 guide/ru/ch_cc.xml                                 |   21 +-
 guide/ru/ch_currency.xml                           | 2114 ++++++++++++--------
 guide/ru/ch_dep.xml                                |   14 +-
 guide/ru/ch_invest.xml                             |   30 +-
 guide/ru/ch_loans.xml                              |  101 +-
 .../figures/invest_stockvalue_report_options.png   |  Bin 53714 -> 58604 bytes
 57 files changed, 5513 insertions(+), 3607 deletions(-)



More information about the gnucash-changes mailing list