gnucash-docs stable: Multiple changes pushed

Frank H.Ellenberger fell at code.gnucash.org
Wed Jul 19 23:37:39 EDT 2023


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/cf5c288a (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/15d5db1c (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/491a29a5 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/57207af1 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/24a91f07 (commit)



commit cf5c288afcb2fdb8896a0f86ac3a4460beb8f78f
Author: Christian Wehling <christian.wehling at web.de>
Date:   Mon May 1 17:35:58 2023 +0200

    xmlformat of all xml-docs, both guide and manual and all languages

diff --git a/C/guide/appendixa.xml b/C/guide/appendixa.xml
index f06eef45..5071ffbb 100644
--- a/C/guide/appendixa.xml
+++ b/C/guide/appendixa.xml
@@ -68,8 +68,7 @@
       <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;"/>.
+      <para>Some &app; users collected their knowledge about the best use in our <ulink url="&url-wiki-qif;"/>.
       </para>
 
       <para>For other formats and more details see <xref linkend="chapter_importing"/>.
diff --git a/C/guide/appendixd.xml b/C/guide/appendixd.xml
index 5e067796..bdac61e2 100644
--- a/C/guide/appendixd.xml
+++ b/C/guide/appendixd.xml
@@ -758,9 +758,8 @@ Blocking_Chars</literallayout>
                     <guimenu>File</guimenu><guimenuitem>Properties </guimenuitem>
                   </menuchoice>
                   for number source (transaction number or anchor-split action - see
-                  <ulink url="&url-docs-C;help/book-options.html#num-action-book-option">Use
-                  Split Action Field for Number</ulink> in the Book Options section of the &app;
-                  Manual).
+                  <ulink url="&url-docs-C;help/book-options.html#num-action-book-option">Use Split
+                  Action Field for Number</ulink> in the Book Options section of the &app; Manual).
                 </entry>
               </row>
 
@@ -807,10 +806,10 @@ Blocking_Chars</literallayout>
                     <guimenu>File</guimenu><guimenuitem> Properties</guimenuitem>
                   </menuchoice>
                   for number source (transaction number or anchor-split action - see
-                  <ulink url="&url-docs-C;help/book-options.html#num-action-book-option">
-                  Use Split Action Field for Number</ulink> in the Book Options section of the &app;
-                  Manual). If number source for the book is specified as anchor-split action,
-                  this field will instead print the transaction number field.
+                  <ulink url="&url-docs-C;help/book-options.html#num-action-book-option">Use Split
+                  Action Field for Number</ulink> in the Book Options section of the &app; Manual).
+                  If number source for the book is specified as anchor-split action, this field will
+                  instead print the transaction number field.
                 </entry>
               </row>
 
diff --git a/C/guide/ch_accts.xml b/C/guide/ch_accts.xml
index bece4198..4aecf0bb 100644
--- a/C/guide/ch_accts.xml
+++ b/C/guide/ch_accts.xml
@@ -45,17 +45,20 @@ Translators:
 
     <figure pgwide="1">
       <title>The basic accounts relationships</title>
+
       <screenshot id="accts-AccountRelationships">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/basics_AccountRelationships.png"
                        srccredit="Geert Janssens"/>
           </imageobject>
+
           <imageobject role="fo">
             <imagedata fileref="figures/basics_AccountRelationships.svg"
                        srccredit="Geert Janssens"
                        contentwidth="4in"/>
           </imageobject>
+
           <caption>
             <para>A graphical view of the relationship between the 5 basic accounts. Net worth (equity) increases
               through income and decreases through expenses. The arrows represent the movement of
@@ -271,7 +274,8 @@ Translators:
           </para>
 
           <para>Transactions involving an Accounts Payable account should not be added, changed or deleted in any
-            way other than by using<itemizedlist>
+            way other than by using
+            <itemizedlist>
               <listitem>
                 <para>post/unpost bill/invoice/voucher or
                 </para>
@@ -369,19 +373,23 @@ Translators:
 
       <para>Below are the standard <guilabel>Income</guilabel> and <guilabel>Expense</guilabel> accounts after
         selecting <guilabel>Common Accounts</guilabel> in the assistant for creating a new Account
-        Hierarchy (<menuchoice>
+        Hierarchy (
+        <menuchoice>
           <guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy...</guimenuitem>
-        </menuchoice>).
+        </menuchoice>
+        ).
       </para>
 
       <figure pgwide="1">
         <title>Default Income Accounts</title>
+
         <screenshot id="accts-DefaultIncomeAccounts">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This image shows the standard <emphasis>Income</emphasis> accounts.
               </para>
@@ -392,13 +400,15 @@ Translators:
 
       <figure pgwide="1">
         <title>Default Expense Accounts</title>
+
         <screenshot id="accts-DefaultExpenseAccounts">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
                            srccredit="Cristian Marchi"/>
             </imageobject>
-           <caption>
+
+            <caption>
               <para>This image shows some standard <emphasis>Expense</emphasis> accounts.
               </para>
             </caption>
@@ -465,16 +475,22 @@ Translators:
         highly recommended that you always begin this way.
       </para>
 
-      <para>Start with a clean &app; file by selecting <menuchoice>
+      <para>Start with a clean &app; file by selecting
+        <menuchoice>
           <guimenu>File</guimenu><guimenuitem>New File</guimenuitem>
-        </menuchoice> from the menu. The <guilabel>New Account Hierarchy Setup</guilabel> assistant will start.
-        Press <guibutton>Cancel</guibutton> to close the assistant as we don’t want to use one of
-        the predefined accounts structure; instead we will build a basic starting account structure
-        from scratch. In the empty &app; window select <menuchoice>
+        </menuchoice>
+        from the menu. The <guilabel>New Account Hierarchy Setup</guilabel> assistant will start.
+        Press <guibutton>Cancel</guibutton> to close the assistant as we don’t want to use one
+        of the predefined accounts structure; instead we will build a basic starting account
+        structure from scratch. In the empty &app; window select
+        <menuchoice>
           <guimenu>View</guimenu><guimenuitem>New Accounts Page</guimenuitem>
-        </menuchoice> from the menu: the <guilabel>Accounts</guilabel> tab will open. Finally select <menuchoice>
+        </menuchoice>
+        from the menu: the <guilabel>Accounts</guilabel> tab will open. Finally select
+        <menuchoice>
           <guimenu>Actions</guimenu><guimenuitem>New Account...</guimenuitem>
-        </menuchoice>.
+        </menuchoice>
+        .
       </para>
 
       <para>Now you are ready to build this basic starting account structure
@@ -488,12 +504,14 @@ Translators:
 
           <figure pgwide="1">
             <title>Creating an Assets account</title>
+
             <screenshot id="accts-CreateAssetsAccounts">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/accts_CreateAssetsAccount.png"
                              srccredit="Cristian Marchi"/>
                 </imageobject>
+
                 <caption>
                   <para>This image shows the dialog to create an asset account.
                   </para>
@@ -533,12 +551,14 @@ Translators:
 
       <figure pgwide="1">
         <title>The Basic Top-level Accounts</title>
+
         <screenshot id="accts-toplevel">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/accts_toplevel.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This image shows the basic top-level accounts.
               </para>
@@ -558,11 +578,13 @@ Translators:
       </para>
 
       <tip>
-        <para>Instead of selecting <menuchoice>
+        <para>Instead of selecting
+          <menuchoice>
             <guimenu>Actions</guimenu><guimenuitem>New Account...</guimenuitem>
-          </menuchoice> from the menu, you can alternatively create a new sub-account of an account by right clicking on the
-          main account’s name and selecting the <guilabel>New Account...</guilabel> entry.
-          This will open a dialog similar to the one depicted in
+          </menuchoice>
+          from the menu, you can alternatively create a new sub-account of an account by right
+          clicking on the main account’s name and selecting the <guilabel>New
+          Account...</guilabel> entry. This will open a dialog similar to the one depicted in
           <xref linkend="accts-examples-toplevel2" /> where the new sub-account will be already set
           as a child of the main account.
         </para>
@@ -659,12 +681,14 @@ Translators:
 
       <figure pgwide="1">
         <title>The Basic Chart of Accounts</title>
+
         <screenshot id="accts-tree">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/accts_tree.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This image shows a simple chart of accounts.
               </para>
diff --git a/C/guide/ch_basics.xml b/C/guide/ch_basics.xml
index ff5d8768..fc117c72 100644
--- a/C/guide/ch_basics.xml
+++ b/C/guide/ch_basics.xml
@@ -130,6 +130,7 @@ Translators:
 
       <figure pgwide="1">
         <title>The basic accounts relationships</title>
+
         <screenshot id="basics-AccountRelationships">
           <mediaobject>
             <imageobject role="html">
@@ -142,6 +143,7 @@ Translators:
                          format="SVG" srccredit="Geert Janssens"
                          contentwidth="4in"/>
             </imageobject>
+
             <caption>
               <para>A graphical view of the relationship between the 5 basic accounts. Net worth (equity) increases
                 through income and decreases through expenses. The arrows represent the movement of
@@ -476,18 +478,22 @@ Translators:
 
       <para>The <emphasis>New Account Hierarchy Setup</emphasis> assistant helps you to create a set of &app;
         accounts. It will appear if you choose <guibutton>Create a new set of accounts</guibutton>
-        in the <guilabel>Welcome to &appname;!</guilabel> menu, or when you select <menuchoice>
+        in the <guilabel>Welcome to &appname;!</guilabel> menu, or when you select
+        <menuchoice>
           <shortcut>
           <keycombo>
             <keycap>Ctrl</keycap><keycap>N</keycap>
           </keycombo>
           </shortcut> <guimenu><accel>F</accel>ile</guimenu><guimenuitem><accel>N</accel>ew
           File</guimenuitem>
-        </menuchoice>. You may also use it to add a section of accounts to an existing book from the
-        <guilabel>Accounts</guilabel> page by selecting <menuchoice>
+        </menuchoice>
+        . You may also use it to add a section of accounts to an existing book from the
+        <guilabel>Accounts</guilabel> page by selecting
+        <menuchoice>
           <guimenu><accel>A</accel>ction</guimenu><guimenuitem>New Account
           Hierarchy…</guimenuitem>
-        </menuchoice>.
+        </menuchoice>
+        .
       </para>
 
       <para>This assistant will guide you through the creation of a <emphasis>Chart of Accounts</emphasis>.
@@ -503,14 +509,16 @@ Translators:
         <listitem>
           <para><guilabel>New Book Options</guilabel> appears only when creating a new book. Here you set various
             book attributes. This page has four tabs: Accounts, Budgeting, Business, and Counters.
-            These items are explained elsewhere in the Guide, and can be changed at any time from <menuchoice>
+            These items are explained elsewhere in the Guide, and can be changed at any time from
+            <menuchoice>
               <shortcut>
               <keycombo>
                 <keycap>Ctrl</keycap><keycap>Enter</keycap>
               </keycombo>
               </shortcut>
               <guimenu><accel>F</accel>ile</guimenu><guimenuitem>Proper<accel>t</accel>ies</guimenuitem>
-            </menuchoice>.
+            </menuchoice>
+            .
           </para>
         </listitem>
 
@@ -551,7 +559,8 @@ Translators:
         <listitem>
           <para><guilabel>Setup selected accounts</guilabel> presents the accounts from the categories you selected
             on <guilabel>Choose accounts to create</guilabel> in a non-collapsible tree view with
-            four or five columns depending on whether or not you're creating a new book:<itemizedlist>
+            four or five columns depending on whether or not you're creating a new book:
+            <itemizedlist>
               <listitem>
                 <para><guilabel>Account Name</guilabel>. This is editable, just click in it or select the row and press
                   <keycap>Enter</keycap>.
@@ -574,7 +583,8 @@ Translators:
                 <para><guilabel>Opening Balances</guilabel> can accept a value for new non-placeholder accounts that are
                   not of type <emphasis>Equity</emphasis>, as existing accounts already have
                   balances, placeholder accounts can't have transactions, and Equity can't have an
-                  opening balance.<note>
+                  opening balance.
+                  <note>
                     <para><guilabel>Opening Balance</guilabel> entry isn't obvious until you click in it. You must move out of
                       the entry by clicking somewhere or by pressing <keycap>Tab</keycap> or
                       <keycap>Enter</keycap> before clicking <guibutton>Next</guibutton> or your
@@ -620,12 +630,14 @@ Translators:
 
       <figure pgwide="1">
         <title>The Tip of the Day</title>
+
         <screenshot id="basics-TipOfDay">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/basics_TipOfDay.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This image shows the <guilabel>Tip of the Day</guilabel>.
               </para>
@@ -653,12 +665,14 @@ Translators:
 
       <figure pgwide="1">
         <title>The basic accounts relationships</title>
+
         <screenshot id="basics-Accounts">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/basics_Accounts.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This image shows the <guilabel>Accounts</guilabel> window.
               </para>
@@ -713,12 +727,14 @@ Translators:
 
       <figure pgwide="1">
         <title>The Checking Account Register</title>
+
         <screenshot id="basics-CheckAccount">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/basics_CheckAccount.png"
                          srccredit="Bengt Thuree"/>
             </imageobject>
+
             <caption>
               <para>This image shows the <guilabel>Checking Account - Register</guilabel> with several transactions.
               </para>
@@ -814,23 +830,28 @@ Translators:
         Tabs can be configured in Preferences to appear along any side of the &app; window.
       </para>
 
-      <para>To see the full name for a tab, hover the mouse pointer over an account window tab. If
-        more tabs are open than can be displayed across the window, some tabs will not display.
+      <para>To see the full name for a tab, hover the mouse pointer over an account window tab. If more tabs are
+        open than can be displayed across the window, some tabs will not display.
       </para>
 
       <tip>
         <orderedlist>
           <listitem>
-            <simpara>You can move through all tabs by clicking the arrows on either end of the tab bar.</simpara>
+            <simpara>You can move through all tabs by clicking the arrows on either end of the tab bar.
+            </simpara>
           </listitem>
-        <listitem>
-          <simpara>You can also change the alignment of the tab bar by changing the
-            <guilabel>Tab Position</guilabel> in
-            <ulink url="&url-docs-C;help/set-prefs.html#prefs-window">The Preferences window, Windows tab</ulink>.</simpara>
+
+          <listitem>
+            <simpara>You can also change the alignment of the tab bar by changing the <guilabel>Tab Position</guilabel>
+              in <ulink url="&url-docs-C;help/set-prefs.html#prefs-window">The Preferences window,
+              Windows tab</ulink>.
+            </simpara>
           </listitem>
+
           <listitem>
-            <simpara>A complete list of tabs can be viewed by right-clicking the Tab Bar and
-              any tab can be selected by clicking it.</simpara>
+            <simpara>A complete list of tabs can be viewed by right-clicking the Tab Bar and any tab can be selected by
+              clicking it.
+            </simpara>
           </listitem>
         </orderedlist>
       </tip>
@@ -865,10 +886,12 @@ Translators:
       <para>All of the menu items have access keys which are marked by underlined characters in the menu names.
         Pressing the <keycap>Alt</keycap> key with the underlined character in the menu heading will
         bring up the menu items for that heading. Once the menu items are displayed, type the
-        underlined character in the menu item to activate it. For example, typing <keycombo>
+        underlined character in the menu item to activate it. For example, typing
+        <keycombo>
           <keycap>Alt</keycap><keycap>F</keycap>
-        </keycombo> in the main window brings up the <guimenu>File</guimenu> menu, then typing <keycap>S</keycap> will
-        save the file. Access keys are fixed and cannot be changed by users.
+        </keycombo>
+        in the main window brings up the <guimenu>File</guimenu> menu, then typing
+        <keycap>S</keycap> will save the file. Access keys are fixed and cannot be changed by users.
       </para>
 
       <para>Some of the more commonly used menu items also have shortcut keys that directly activate the command
@@ -887,27 +910,35 @@ Translators:
 
       <para>&app; offers several formats for storing your financial data. The default file storage format is
         <acronym>XML</acronym>, while <acronym>SQL</acronym> storage is available in SQLite, MySQL,
-        and PostgreSQL formats. Users can choose a file format for new files from <menuchoice>
+        and PostgreSQL formats. Users can choose a file format for new files from
+        <menuchoice>
           <guimenu>File</guimenu><guimenuitem>Save</guimenuitem>
-        </menuchoice> and for existing files from <menuchoice>
+        </menuchoice>
+        and for existing files from
+        <menuchoice>
           <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem>
-        </menuchoice> dialogs.
+        </menuchoice>
+        dialogs.
       </para>
 
       <para>The <acronym>XML</acronym> storage format is a text file that by default is compressed, which is a
-        preference that is set at <menuchoice>
+        preference that is set at
+        <menuchoice>
           <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-        </menuchoice> <guilabel>General</guilabel> <guilabel>Compress files</guilabel>. SQLite storage is also available,
-        and stores your data in a single file on your system, like the <acronym>XML</acronym>
-        format. However, internally, an SQLite file is managed as a database. The MySQL and
-        PostgreSQL storage options require access to a MySQL or PostgreSQL database server and the
-        installation of additional database drivers on your machine.
+        </menuchoice>
+        <guilabel>General</guilabel> <guilabel>Compress files</guilabel>. SQLite storage is also
+        available, and stores your data in a single file on your system, like the
+        <acronym>XML</acronym> format. However, internally, an SQLite file is managed as a database.
+        The MySQL and PostgreSQL storage options require access to a MySQL or PostgreSQL database
+        server and the installation of additional database drivers on your machine.
       </para>
 
       <tip>
-        <para>Users can change the format at any time by using <menuchoice>
+        <para>Users can change the format at any time by using
+          <menuchoice>
             <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem>
-          </menuchoice>. This will create a copy of the data file in the selected format.
+          </menuchoice>
+          . This will create a copy of the data file in the selected format.
         </para>
       </tip>
     </sect2>
@@ -992,9 +1023,10 @@ Translators:
                 Depends on packaging
                 <footnote>
                   <para>The SQL backends rely on additional packages. These are included in the macOS and Microsoft Windows
-                  application bundles and installed automatically by GnuCash's flatpak installer. Linux distribution users may need
-                  to explicitly install the one they want with their package manager. Look for a package named something like
-                  libdbd-sqlite3, libdbd-mysql, or libdbd-pgsql for SQLite3, MySql, and Postgresql respectively.
+                    application bundles and installed automatically by GnuCash's flatpak installer.
+                    Linux distribution users may need to explicitly install the one they want with
+                    their package manager. Look for a package named something like libdbd-sqlite3,
+                    libdbd-mysql, or libdbd-pgsql for SQLite3, MySql, and Postgresql respectively.
                   </para>
                 </footnote>
               </entry>
@@ -1112,9 +1144,11 @@ Translators:
 
       <orderedlist>
         <listitem>
-          <para>From the &app; <emphasis>Menubar</emphasis>, choose <menuchoice>
+          <para>From the &app; <emphasis>Menubar</emphasis>, choose
+            <menuchoice>
               <guimenu>File</guimenu><guimenuitem>New File</guimenuitem>
-            </menuchoice>. The <guilabel>New Account Hierarchy setup</guilabel> assistant will start.
+            </menuchoice>
+            . The <guilabel>New Account Hierarchy setup</guilabel> assistant will start.
           </para>
 
           <note>
@@ -1141,9 +1175,11 @@ Translators:
 
       <orderedlist>
         <listitem>
-          <para>Choose <menuchoice>
+          <para>Choose
+            <menuchoice>
               <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem>
-            </menuchoice> from the <emphasis>Menubar</emphasis> or select the <guibutton>Save</guibutton>
+            </menuchoice>
+            from the <emphasis>Menubar</emphasis> or select the <guibutton>Save</guibutton>
             <emphasis>Toolbar</emphasis> button. &app; will bring up the save window.
           </para>
         </listitem>
@@ -1160,7 +1196,6 @@ Translators:
         </listitem>
 
         <listitem>
-
           <itemizedlist>
             <listitem>
               <para>If you selected <guilabel>xml</guilabel> or <guilabel>sqlite3</guilabel> you will see a screen like
@@ -1169,15 +1204,18 @@ Translators:
 
               <figure>
                 <title>Save screen when <guilabel>xml</guilabel> or <guilabel>sqlite3</guilabel> is selected.</title>
+
                 <screenshot id="basics-SaveXML">
                   <mediaobject>
                     <imageobject>
                       <imagedata fileref="figures/basics_SaveXML.png"
                                  srccredit="Cristian Marchi"/>
                     </imageobject>
+
                     <caption>
                       <para>This image shows the <guilabel>Save</guilabel> screen when the selected <guilabel>Data
-                        Format</guilabel> is <guilabel>xml</guilabel> or <guilabel>sqlite3</guilabel>.
+                        Format</guilabel> is <guilabel>xml</guilabel> or
+                        <guilabel>sqlite3</guilabel>.
                       </para>
                     </caption>
                   </mediaobject>
@@ -1216,12 +1254,14 @@ Translators:
 
               <figure>
                 <title>Save screen when <guilabel>mysql</guilabel> or <guilabel>postgres</guilabel> is selected.</title>
+
                 <screenshot id="basics-SaveSQL">
                   <mediaobject>
                     <imageobject role="fo">
                       <imagedata fileref="figures/basics_SaveSQL.png"
                                  srccredit="Cristian Marchi"/>
                     </imageobject>
+
                     <caption>
                       <para>This image shows the <guilabel>Save</guilabel> screen when the selected <guilabel>Data
                         Format</guilabel> is <guilabel>mysql</guilabel> or
@@ -1238,10 +1278,10 @@ Translators:
               </para>
 
               <warning>
-                <para>Saving to <guilabel>mysql</guilabel> or <guilabel>postgres</guilabel> requires the proper permissions in
-                  that database, that is you need to have the permissions to create a new database
-                  with the given database name, or you need to have write access to an existing
-                  database with the given database name.
+                <para>Saving to <guilabel>mysql</guilabel> or <guilabel>postgres</guilabel> requires the proper
+                  permissions in that database, that is you need to have the permissions to create a
+                  new database with the given database name, or you need to have write access to an
+                  existing database with the given database name.
                 </para>
               </warning>
             </listitem>
@@ -1259,16 +1299,23 @@ Translators:
         need more than one file.
       </para>
 
-      <para>Before ending each &app; session, be sure to save your data changes using <menuchoice>
+      <para>Before ending each &app; session, be sure to save your data changes using
+        <menuchoice>
           <guimenu>File</guimenu><guimenuitem>Save</guimenuitem>
-        </menuchoice> or the <guibutton>Save</guibutton> <emphasis>Toolbar</emphasis> button.<note>
+        </menuchoice>
+        or the <guibutton>Save</guibutton> <emphasis>Toolbar</emphasis> button.
+        <note>
           <para>As it is very important to save your data frequently to avoid losing them for whatever reason, &app;
             is able to automatically save the opened file every a certain amount of time. This
-            interval can be set in the <guilabel>General</guilabel> tab under <menuchoice>
+            interval can be set in the <guilabel>General</guilabel> tab under
+            <menuchoice>
               <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-            </menuchoice> (<menuchoice>
+            </menuchoice>
+            (
+            <menuchoice>
               <guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem>
-            </menuchoice> on &mac;). Keep in mind that this option is relevant only if you are saving in
+            </menuchoice>
+            on &mac;). Keep in mind that this option is relevant only if you are saving in
             <acronym>XML</acronym> format. If you are working with a database, the
             <guibutton>Save</guibutton> button and the <guimenuitem>Save</guimenuitem> menu entry
             will be grayed out because changes are stored right away.
@@ -1280,12 +1327,14 @@ Translators:
     <sect2 id="basics-open-data">
       <title>Opening data</title>
 
-      <para>To open an existing file or database, select <menuchoice>
+      <para>To open an existing file or database, select
+        <menuchoice>
           <guimenu>File</guimenu><guimenuitem>Open</guimenuitem>
-        </menuchoice> from the menu. In the window that will open, select the <guilabel>Data Format</guilabel>. If you
-        selected <guilabel>File</guilabel> choose the file you want to open by browsing the folders
-        in the lower panes. Else, enter the required <guilabel>Database Connection</guilabel>
-        information.
+        </menuchoice>
+        from the menu. In the window that will open, select the <guilabel>Data Format</guilabel>. If
+        you selected <guilabel>File</guilabel> choose the file you want to open by browsing the
+        folders in the lower panes. Else, enter the required <guilabel>Database
+        Connection</guilabel> information.
       </para>
 
       <tip>
@@ -1305,13 +1354,15 @@ Translators:
         to close your books at the end of the year and begin each year with a fresh set of books.
       </para>
 
-      <para>&app; allows you to create an empty copy of your Chart of Accounts simply by selecting <menuchoice>
+      <para>&app; allows you to create an empty copy of your Chart of Accounts simply by selecting
+        <menuchoice>
           <guimenu>File</guimenu><guisubmenu>Export</guisubmenu><guimenuitem>Export
           Accounts</guimenuitem>
-        </menuchoice>. When you select this command, you are asked to provide the name for the new empty file, and &app;
-        creates a new data file that contains only your account hierarchy (that is, there is no
-        transaction data). Once saved, the new file can be opened like any other &app; data file as
-        described above.
+        </menuchoice>
+        . When you select this command, you are asked to provide the name for the new empty file,
+        and &app; creates a new data file that contains only your account hierarchy (that is, there
+        is no transaction data). Once saved, the new file can be opened like any other &app; data
+        file as described above.
       </para>
     </sect2>
   </sect1>
@@ -1388,11 +1439,14 @@ Translators:
         </listitem>
 
         <listitem>
-          <para>Go to <menuchoice>
+          <para>Go to
+            <menuchoice>
               <guimenu>File</guimenu><guisubmenu>Import</guisubmenu><guimenuitem>Replay &appname;
               .log file</guimenuitem>
-            </menuchoice> and select the one .log file with the same date as the saved file you just opened. Make sure that
-            you picked the right .log file, or you will possibly wreak havoc in your accounts.
+            </menuchoice>
+            and select the one .log file with the same date as the saved file you just opened. Make
+            sure that you picked the right .log file, or you will possibly wreak havoc in your
+            accounts.
           </para>
         </listitem>
       </orderedlist>
@@ -1460,11 +1514,15 @@ Translators:
         <para>By default &app; will automatically delete any <filename>.log</filename> and
           <filename>.YYYYMMDDHHMMSS.gnucash</filename> backup files that are older than 30 days. You
           can change this behavior in the &app; preferences in the <guilabel>General</guilabel> tab
-          under <menuchoice>
+          under
+          <menuchoice>
             <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-          </menuchoice> (<menuchoice>
+          </menuchoice>
+          (
+          <menuchoice>
             <guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem>
-          </menuchoice> on &mac;).
+          </menuchoice>
+          on &mac;).
         </para>
       </note>
     </sect2>
@@ -1698,9 +1756,11 @@ Translators:
 
     <orderedlist>
       <listitem>
-        <para>First, let’s create a file to store your real data. Open &app; and select <menuchoice>
+        <para>First, let’s create a file to store your real data. Open &app; and select
+          <menuchoice>
             <guimenu>File</guimenu><guimenuitem>New File</guimenuitem>
-          </menuchoice> from the <emphasis>Menubar</emphasis>. This will start the <guilabel>New Account Hierarchy
+          </menuchoice>
+          from the <emphasis>Menubar</emphasis>. This will start the <guilabel>New Account Hierarchy
           Setup</guilabel> assistant that allows you to create several accounts at once.
         </para>
 
@@ -1711,7 +1771,9 @@ Translators:
         </note>
 
         <figure pgwide="1">
-          <title>New Account Hierarchy Setup: Introduction</title><screenshot id="basics-NewAccountHierarchySetup">
+          <title>New Account Hierarchy Setup: Introduction</title>
+
+          <screenshot id="basics-NewAccountHierarchySetup">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
@@ -1722,6 +1784,7 @@ Translators:
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
                            srccredit="John Ralls"/>
               </imageobject>
+
               <caption>
                 <para>This image shows the first screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant.
                 </para>
@@ -1738,19 +1801,24 @@ Translators:
       <listitem>
         <para>In the second screen, set the <guilabel>New Book Options</guilabel> on the different tabs, then
           press the <guibutton>Forward</guibutton> button. You can also update these options later
-          using <menuchoice>
+          using
+          <menuchoice>
             <guimenu>File </guimenu><guimenuitem>Properties</guimenuitem>
-          </menuchoice>. For details of these options, see the &app; Manual, chapter Customizing GnuCash, Book
+          </menuchoice>
+          . For details of these options, see the &app; Manual, chapter Customizing GnuCash, Book
           Options.
         </para>
 
         <figure pgwide="1">
-          <title>New Account Hierarchy Setup: Book Options</title><screenshot id="basics-NewBookOptions">
+          <title>New Account Hierarchy Setup: Book Options</title>
+
+          <screenshot id="basics-NewBookOptions">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/basics_NewBookOpts.png"
                            srccredit="Frank H. Ellenberger"/>
               </imageobject>
+
               <caption>
                 <para>This image shows the second screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you select the <guilabel>Book Options</guilabel>.
@@ -1773,16 +1841,20 @@ Translators:
         </note>
 
         <figure pgwide="1">
-          <title>New Account Hierarchy Setup: Currency Selection</title><screenshot id="basics-NewAccountHierarchySetup-currency">
+          <title>New Account Hierarchy Setup: Currency Selection</title>
+
+          <screenshot id="basics-NewAccountHierarchySetup-currency">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
                            srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
                            srccredit="John Ralls"/>
               </imageobject>
+
               <caption>
                 <para>This image shows the third screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you select the <guilabel>Currency</guilabel>.
@@ -1806,16 +1878,20 @@ Translators:
         </note>
 
         <figure pgwide="1">
-          <title>New Account Hierarchy Setup: Account Selection</title><screenshot id="basics-NewAccountHierarchySetup-Accounts">
+          <title>New Account Hierarchy Setup: Account Selection</title>
+
+          <screenshot id="basics-NewAccountHierarchySetup-Accounts">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
                            srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
                            srccredit="John Ralls"/>
               </imageobject>
+
               <caption>
                 <para>This image shows the fourth screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you choose the various <guilabel>Accounts</guilabel>.
@@ -1834,16 +1910,20 @@ Translators:
         </para>
 
         <figure pgwide="1">
-          <title>New Account Hierarchy Setup: Account Setup</title><screenshot id="basics-NewAccountHierarchySetup-Setup.png">
+          <title>New Account Hierarchy Setup: Account Setup</title>
+
+          <screenshot id="basics-NewAccountHierarchySetup-Setup.png">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
                            srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
                            srccredit="John Ralls"/>
               </imageobject>
+
               <caption>
                 <para>This image shows the fifth screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you can set <guilabel>Opening Balance</guilabel>.
@@ -1860,7 +1940,9 @@ Translators:
         </para>
 
         <figure pgwide="1">
-          <title>New Account Hierarchy Setup: Finish</title><screenshot id="basics-NewAccountHierarchySetup-Finish">
+          <title>New Account Hierarchy Setup: Finish</title>
+
+          <screenshot id="basics-NewAccountHierarchySetup-Finish">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
@@ -1893,7 +1975,9 @@ Translators:
         </para>
 
         <figure pgwide="1">
-          <title>Tutorial: Starting Account View of the Test File</title><screenshot id="basics-EmptyAccounts">
+          <title>Tutorial: Starting Account View of the Test File</title>
+
+          <screenshot id="basics-EmptyAccounts">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
diff --git a/C/guide/ch_bus_features.xml b/C/guide/ch_bus_features.xml
index 8b712469..b8712903 100644
--- a/C/guide/ch_bus_features.xml
+++ b/C/guide/ch_bus_features.xml
@@ -176,6 +176,7 @@
 
       <figure>
         <title>Sales Tax Tables Editor</title>
+
         <screenshot id="bus-taxmain">
           <mediaobject>
             <imageobject>
@@ -188,6 +189,7 @@
 
       <figure>
         <title>New Sales Tax Table Entry</title>
+
         <screenshot id="bus-taxnew">
           <mediaobject>
             <imageobject>
@@ -531,6 +533,7 @@
 
       <figure>
         <title>Entering Company Information</title>
+
         <screenshot id="bus-co-reg">
           <mediaobject>
             <imageobject>
@@ -548,19 +551,18 @@
               e-mail address and website URL.
             </para>
           </listitem>
-  
+
           <listitem>
             <para>Enter your company’s tax payer id number in the <guilabel>Company ID</guilabel> field.
             </para>
           </listitem>
-  
+
           <listitem>
             <para>Select default tax tables applicable to your most common customers and vendors.
             </para>
           </listitem>
         </itemizedlist>
       </para>
-
     </sect2>
 
     <sect2 id="bus_setup_pref">
@@ -625,6 +627,7 @@
 
       <figure>
         <title>Billing Terms Editor</title>
+
         <screenshot id="bus-termsmain">
           <mediaobject>
             <imageobject>
@@ -637,7 +640,8 @@
 
       <figure>
         <title>New Billing Term</title>
-<screenshot id="bus-termsnew">
+
+        <screenshot id="bus-termsnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_terms_new.png"
@@ -797,6 +801,7 @@
 
         <figure>
           <title>New Customer Registration Window</title>
+
           <screenshot id="bus-ar-custnew">
             <mediaobject>
               <imageobject>
@@ -823,6 +828,7 @@
 
         <figure>
           <title>Find Customer Window</title>
+
           <screenshot id="bus-ar-custfind">
             <mediaobject>
               <imageobject>
@@ -889,6 +895,7 @@
 
         <figure>
           <title>Creating a New Invoice</title>
+
           <screenshot id="bus-ar-invoicenew">
             <mediaobject>
               <imageobject>
@@ -911,10 +918,10 @@
           invoice in a manner similar to how the account register works. For credit notes you enter
           an itemized list of goods and services you refunded instead.
         </para>
-
 <!-- ToDo: unshrink -->
         <figure>
           <title>Edit Invoice Window</title>
+
           <screenshot id="bus-ar-invoiceedit">
             <mediaobject>
               <imageobject>
@@ -941,6 +948,7 @@
 
         <figure>
           <title>Post Invoice Window</title>
+
           <screenshot id="bus-ar-invoicepost">
             <mediaobject>
               <imageobject>
@@ -1000,10 +1008,10 @@
           </menuchoice>
           menu item.
         </para>
-
 <!-- ToDo: unshrink -->
         <figure>
           <title>Invoice Print Output</title>
+
           <screenshot id="bus-ar-invoiceprint">
             <mediaobject>
               <imageobject>
@@ -1092,6 +1100,7 @@
 
       <figure>
         <title>New Customer Job</title>
+
         <screenshot id="bus-ar-jobnew">
           <mediaobject>
             <imageobject>
@@ -1149,6 +1158,7 @@
 
       <figure>
         <title>Process Payment From Customer</title>
+
         <screenshot id="bus-ar-payment">
           <mediaobject>
             <imageobject>
@@ -1190,6 +1200,7 @@
 
       <figure>
         <title>New Style Sheet Window</title>
+
         <screenshot id="bus-ar-invoicechange1">
           <mediaobject>
             <imageobject>
@@ -1216,10 +1227,9 @@
       </para>
 
       <para>To include a company logo, banner heading and background image, use your favorite graphics
-        application such as <application>The Gimp</application> or &app-aoo;/&app-lo; 
-        Draw to save the images in either <acronym>GIF</acronym> or
-        <acronym>PNG</acronym> format. Then import them into the style sheet using the
-        <guilabel>Images</guilabel> section described above.
+        application such as <application>The Gimp</application> or &app-aoo;/&app-lo; Draw to save
+        the images in either <acronym>GIF</acronym> or <acronym>PNG</acronym> format. Then import
+        them into the style sheet using the <guilabel>Images</guilabel> section described above.
       </para>
 
       <para>Below is an example that imports all three types of images.
@@ -1227,12 +1237,14 @@
 
       <figure>
         <title>HTML Style Sheet Example Window</title>
+
         <screenshot id="bus-ar-invoicechange2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ar_invoicechange2.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>The <acronym>HTML</acronym> Style Sheets window with an example Background Tile, Heading Banner, and
                 Logo.
@@ -1257,16 +1269,17 @@
         the <guimenu>Options</guimenu> menu. Below is the resultant invoice after applying the style
         sheet demonstrated above.
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>HTML Style Sheets Example Output</title>
+
         <screenshot id="bus-ar-invoicechange3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ar_invoicechange3.png"
                          srccredit="Patrick Schweiger" />
             </imageobject>
+
             <caption>
               <para>The hideous invoice which results from the graphics selected in the style sheet.
               </para>
@@ -1359,6 +1372,7 @@
 
         <figure>
           <title>New Vendor Registration Window</title>
+
           <screenshot id="bus-ap-vendornew">
             <mediaobject>
               <imageobject>
@@ -1382,10 +1396,10 @@
           search. This window is also used to look up a vendor when entering bills and processing
           payments.
         </para>
-
 <!-- ToDo: unshrink -->
         <figure>
           <title>Find Vendor Window</title>
+
           <screenshot id="bus-ar-vendorfind">
             <mediaobject>
               <imageobject>
@@ -1454,6 +1468,7 @@
 
         <figure>
           <title>New Bill Registration Window</title>
+
           <screenshot id="bus-ap-billnew">
             <mediaobject>
               <imageobject>
@@ -1475,10 +1490,10 @@
           manner similar to how the account register works. For credit notes you enter an itemized
           list of goods and services the vendor refunded instead.
         </para>
-
 <!-- ToDo: unshrink -->
         <figure>
           <title>Edit Bill Window</title>
+
           <screenshot id="bus-ap-billedit">
             <mediaobject>
               <imageobject>
@@ -1504,6 +1519,7 @@
 
         <figure>
           <title>Post Bill Window</title>
+
           <screenshot id="bus-ap-billpost">
             <mediaobject>
               <imageobject>
@@ -1558,6 +1574,7 @@
 
       <figure>
         <title>New Vendor Job</title>
+
         <screenshot id="bus-ap-jobnew">
           <mediaobject>
             <imageobject>
@@ -1604,6 +1621,7 @@
 
       <figure>
         <title>Process Payment To Vendor</title>
+
         <screenshot id="bus-ap-payment">
           <mediaobject>
             <imageobject>
@@ -1961,6 +1979,7 @@
 
       <figure>
         <title>Payroll Example: Initial Setup</title>
+
         <screenshot id="bus-pay-ex1">
           <mediaobject>
             <imageobject>
@@ -2128,16 +2147,17 @@
 
       <para>From the checking account, enter the split transaction for employee 1. It should look like this:
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>Payroll Example: Employee Split Transaction</title>
+
         <screenshot id="bus-pay-ex2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex2.png"
                          srccredit="Patrick Schweiger"/>
             </imageobject>
+
             <caption>
               <para>The Split Transaction for Employee 1
               </para>
@@ -2160,7 +2180,8 @@
 
       <figure>
         <title>Payroll Example: Accounts After Salaries Paid</title>
-<screenshot id="bus-pay-ex3">
+
+        <screenshot id="bus-pay-ex3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex3.png"
@@ -2179,6 +2200,7 @@
 
       <figure>
         <title>Payroll Example: Accounts After Paying Government</title>
+
         <screenshot id="bus-pay-ex4">
           <mediaobject>
             <imageobject>
diff --git a/C/guide/ch_capgain.xml b/C/guide/ch_capgain.xml
index 2cce94e6..5930befb 100644
--- a/C/guide/ch_capgain.xml
+++ b/C/guide/ch_capgain.xml
@@ -27,9 +27,8 @@
     </para>
 
     <para>Certain resellable assets can change value over time, such as stocks, bonds, houses, or cars. Some
-      assets could increase in value, some could decrease in value. It is
-      important to be able to track some of these time-dependent asset valuations, this chapter will
-      show you how.
+      assets could increase in value, some could decrease in value. It is important to be able to
+      track some of these time-dependent asset valuations, this chapter will show you how.
     </para>
 
     <para>Probably everything you own will increase or decrease in value over time. So, the question is for
@@ -38,12 +37,12 @@
       taxation.
     </para>
 
-    <para>Consumable and disposable items (for example, food, gas for your car, or printer paper) are obviously not
-      involved. Thus, even though the new clothes you recently bought will certainly depreciate, you
-      would not want to track this depreciation since you have no intention of reselling the clothes
-      and there is no tax implications to the depreciation on clothing. So, for this example, the
-      purchase of new clothes should be recorded as a pure expense... you spent the money, and it is
-      gone.
+    <para>Consumable and disposable items (for example, food, gas for your car, or printer paper) are
+      obviously not involved. Thus, even though the new clothes you recently bought will certainly
+      depreciate, you would not want to track this depreciation since you have no intention of
+      reselling the clothes and there is no tax implications to the depreciation on clothing. So,
+      for this example, the purchase of new clothes should be recorded as a pure expense... you
+      spent the money, and it is gone.
     </para>
 
     <para>Asset appreciation occurs when something you own increases in value over time. When you own an asset
@@ -111,12 +110,11 @@
     <title>Account Setup</title>
 
     <important>
-      <para>
-        In the next few sections, unrealized gain accounts are created, and the estimated unrealized gain transactions 
-        are recorded there in order for users to understand unrealized gain easily. However, it is not necessary
-        to record unrealized gains unless large corporations like which adopt IFRS in actual accounting.
-        The small enterprise users, who are using &app;, should not record unrealized gains. Record into &app; 
-        only when realized gains are fixed.
+      <para>In the next few sections, unrealized gain accounts are created, and the estimated unrealized gain
+        transactions are recorded there in order for users to understand unrealized gain easily.
+        However, it is not necessary to record unrealized gains unless large corporations like which
+        adopt IFRS in actual accounting. The small enterprise users, who are using &app;, should not
+        record unrealized gains. Record into &app; only when realized gains are fixed.
       </para>
     </important>
 
@@ -169,8 +167,8 @@
     <para>Start with an account hierarchy similar to that shown in <xref
     linkend="capgain_accounts1" />,
       but replace <emphasis>ITEM1</emphasis> with <emphasis>Degas</emphasis> and remove the
-      <emphasis>ITEM2</emphasis> accounts. We will assume that the Degas painting had an initial value of
-      one hundred thousand dollars. Begin by giving your self $100,000 in the bank and then
+      <emphasis>ITEM2</emphasis> accounts. We will assume that the Degas painting had an initial
+      value of one hundred thousand dollars. Begin by giving your self $100,000 in the bank and then
       transferring that from your bank account to your <emphasis>Assets:Fixed
       Assets:Degas:Cost</emphasis> account (the asset purchase transaction). You should now have a
       main account window which appears like this:
@@ -178,12 +176,14 @@
 
     <figure pgwide="1">
       <title>Asset Appreciation Main Window</title>
+
       <screenshot id="capgain_appmain">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/capgain_appmain.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
+
           <caption>
             <para>The asset appreciation example main window
             </para>
@@ -192,24 +192,25 @@
       </screenshot>
     </figure>
 
-
     <sect2 id="capgain_exampleunrealized2">
       <title>Unrealized Gains</title>
 
       <para>A month later, you have reason to suspect that the value of your painting has increased by $10,000
         (an unrealized gain). In order to record this you transfer $10,000 from your
-        <emphasis>Income:Unrealized Gains</emphasis> account to your <emphasis>Assets:Fixed Assets:Degas:Unrealized Gains</emphasis> account.
-         Your main window will resemble this:
+        <emphasis>Income:Unrealized Gains</emphasis> account to your <emphasis>Assets:Fixed
+        Assets:Degas:Unrealized Gains</emphasis> account. Your main window will resemble this:
       </para>
 
       <figure pgwide="1">
         <title>Asset Appreciation Main Window</title>
+
         <screenshot id="capgain_app2main">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/capgain_app2main.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>Chart of Accounts after unrealized gain
               </para>
@@ -246,9 +247,9 @@
           <para>Secondly, you must credit your bank account with the selling price of the painting. This money comes
             directly from your <emphasis>Assets:Fixed Assets:Degas</emphasis> sub-accounts. Transfer
             the full <emphasis>Assets:Fixed Assets:Degas:Cost</emphasis> value into
-            <emphasis>Assets:Current Assets:Savings</emphasis>, and the full
-            <emphasis>Assets:Fixed Assets:Degas:Unrealized Gains</emphasis> into
-            <emphasis>Assets:Current Assets:Savings</emphasis>.
+            <emphasis>Assets:Current Assets:Savings</emphasis>, and the full <emphasis>Assets:Fixed
+            Assets:Degas:Unrealized Gains</emphasis> into <emphasis>Assets:Current
+            Assets:Savings</emphasis>.
           </para>
 
           <para>These transactions should now appear as follows:
@@ -335,25 +336,27 @@
             </table>
           </para>
 
-          <para>This leaves the <emphasis>Assets:Current Assets:Savings</emphasis> account with a total of
-            $130,000 and <emphasis>Income:Realized Gains</emphasis> with a total of $30,000.
+          <para>This leaves the <emphasis>Assets:Current Assets:Savings</emphasis> account with a total of $130,000
+            and <emphasis>Income:Realized Gains</emphasis> with a total of $30,000.
           </para>
 
           <figure pgwide="1">
             <title>Asset Appreciation Main Window</title>
+
             <screenshot id="capgain_app3main">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/capgain_app3main.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>Chart of Accounts after realized gains
                   </para>
                 </caption>
               </mediaobject>
             </screenshot>
-           </figure>
+          </figure>
         </listitem>
 
         <listitem>
@@ -362,8 +365,8 @@
 
           <para>You were over-optimistic about the value of the painting. Instead of the $130,000 you thought the
             painting was worth you are only offered $120,000. But you still decide to sell, because
-            you value $120,000 more than you value the painting. The numbers change a little bit, but
-            not too dramatically.
+            you value $120,000 more than you value the painting. The numbers change a little bit,
+            but not too dramatically.
           </para>
 
           <para>The transactions should now appear as follows (observe the last transaction which balances the
@@ -469,8 +472,8 @@
             </table>
           </para>
 
-          <para>This leaves the <emphasis>Assets:Current Assets:Savings</emphasis> account with a total of
-            $120,000 and <emphasis>Income:Realized Gains</emphasis> with a total of $20,000.
+          <para>This leaves the <emphasis>Assets:Current Assets:Savings</emphasis> account with a total of $120,000
+            and <emphasis>Income:Realized Gains</emphasis> with a total of $20,000.
           </para>
         </listitem>
 
@@ -585,8 +588,8 @@
             </table>
           </para>
 
-          <para>This leaves the <emphasis>Assets:Current Assets:Savings</emphasis> account with a total of
-            $150,000 and <emphasis>Income:Realized Gains</emphasis> with a total of $50,000.
+          <para>This leaves the <emphasis>Assets:Current Assets:Savings</emphasis> account with a total of $150,000
+            and <emphasis>Income:Realized Gains</emphasis> with a total of $50,000.
           </para>
         </listitem>
       </orderedlist>
diff --git a/C/guide/ch_cbook.xml b/C/guide/ch_cbook.xml
index de77c6d1..a492a7e2 100644
--- a/C/guide/ch_cbook.xml
+++ b/C/guide/ch_cbook.xml
@@ -202,12 +202,14 @@
 
       <figure>
         <title>The Chart Of Accounts</title>
+
         <screenshot id="cbook-gcashdata4">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cbook_gcashdata4.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>This image shows the Chart of Accounts.
               </para>
@@ -231,16 +233,17 @@
             <emphasis>Savings</emphasis>, since you are in the <emphasis>Checking</emphasis>
             account. Your <emphasis>Checking</emphasis> account should now look like this:
           </para>
-
 <!-- ToDo: unshrink -->
           <figure>
             <title>The Checking Account Register</title>
+
             <screenshot id="cbook-transferin">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_transferin.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Checking Account Register.
                   </para>
@@ -259,16 +262,17 @@
             <emphasis>Expense</emphasis> type account for each of these, then enter splits for them.
             Your checking account should now look like this;
           </para>
-
 <!-- ToDo: unshrink -->
           <figure>
             <title>The Checking Account Register After Registering Some More Checks</title>
+
             <screenshot id="cbook-checkexamp">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_checkexamp.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Checking Account Register after registering some more checks.
                   </para>
@@ -286,16 +290,17 @@
             to transfer $100 from <emphasis>Checking</emphasis> to <emphasis>Cash</emphasis> on the
             25 of March.
           </para>
-
 <!-- ToDo: unshrink -->
           <figure>
             <title>The Checking Account Register With An ATM Withdrawal</title>
+
             <screenshot id="cbook-atm">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_atm.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Checking Account Register with an ATM withdrawal.
                   </para>
@@ -316,12 +321,14 @@
 
       <figure>
         <title>A sample Bank Statement</title>
+
         <screenshot id="cbook-bankstmt">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cbook_bankstmt.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>This image shows a sample Bank Statement.
               </para>
@@ -341,16 +348,17 @@
             they appear on the sample statement. When you have checked off all your entries, the
             reconcile window should look like this:
           </para>
-
 <!-- ToDo: unshrink -->
           <figure>
             <title>The Reconcile Window</title>
+
             <screenshot id="cbook-reconexamp">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_reconexamp.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the reconcile window with a $5 difference.
                   </para>
@@ -375,23 +383,24 @@
             as the date you enter for this transaction. Your <emphasis>Checking</emphasis> account
             should now look like this:
           </para>
-
 <!-- ToDo: unshrink -->
-            <figure>
-              <title>The Checking Account With Service Charge</title>
-              <screenshot id="cbook-servch">
-                <mediaobject>
-                  <imageobject>
-                    <imagedata fileref="figures/cbook_servch.png"
+          <figure>
+            <title>The Checking Account With Service Charge</title>
+
+            <screenshot id="cbook-servch">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_servch.png"
                                srccredit="Bengt Thuree" />
-                  </imageobject>
-                  <caption>
-                    <para>This image shows the Checking Account Register with service charge added.
-                    </para>
-                  </caption>
-                </mediaobject>
-              </screenshot>
-            </figure>
+                </imageobject>
+
+                <caption>
+                  <para>This image shows the Checking Account Register with service charge added.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -403,23 +412,24 @@
             each transaction you just reconciled. Also observe the bottom status row that now
             indicates <guilabel>Reconciled: USD 1451.79</guilabel>
           </para>
-
 <!-- ToDo: unshrink -->
           <figure>
             <title>The Reconciled Checking Account</title>
+
             <screenshot id="cbook-reconciledCheckAct">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_reconciledCheckAct.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the reconciled Checking Account Register.
                   </para>
                 </caption>
               </mediaobject>
             </screenshot>
-            </figure>
+          </figure>
         </listitem>
       </orderedlist>
     </sect2>
@@ -430,16 +440,17 @@
       <para>Go back to the main window and save your file with the new <filename>gcashdata_5</filename> name.
         Your chart of accounts is steadily growing, and it should now look like this:
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>The Chart of Accounts</title>
+
         <screenshot id="cbook-chartaccts5">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cbook_chartaccts5.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>This image shows the Chart of Accounts.
               </para>
@@ -471,12 +482,14 @@
 
           <figure>
             <title>Cash Flow report for the month of March</title>
+
             <screenshot id="cbook-puttoget2-Cash">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_CashFlow.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Cash Flow report after <xref linkend="chapter_cbook"></xref>.
                   </para>
@@ -499,12 +512,14 @@
 
           <figure>
             <title>Transaction Report For The Assets During March</title>
+
             <screenshot id="cbook-puttoget2-TransactionRptChecking">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_TransactionRptAssets.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Transaction Report for the Assets accounts during March.
                   </para>
@@ -521,12 +536,14 @@
 
           <figure>
             <title>Transaction Report For The Expenses During March</title>
+
             <screenshot id="cbook-puttoget2-TransactionRptExpenses">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_TransactionRptExpenses.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Transaction Report for the various Expense accounts during March.
                   </para>
diff --git a/C/guide/ch_cc.xml b/C/guide/ch_cc.xml
index 64db1817..47036a34 100644
--- a/C/guide/ch_cc.xml
+++ b/C/guide/ch_cc.xml
@@ -234,12 +234,14 @@
 
         <figure pgwide="1">
           <title>Credit Card account after reversing a purchase</title>
+
           <screenshot id="cc-Reversing-Transaction-1">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
                              srccredit="Bengt Thuree"/>
               </imageobject>
+
               <caption>
                 <para>This image shows <emphasis>Liability:Credit Card</emphasis> - Register after reversing a purchase
                   transaction.
@@ -254,12 +256,14 @@
 
         <figure pgwide="1">
           <title>Expenses account after reversing a purchase</title>
+
           <screenshot id="cc-Reversing-Transaction-2">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
                              srccredit="Bengt Thuree"/>
               </imageobject>
+
               <caption>
                 <para>This image shows <emphasis>Expenses:Clothes</emphasis> register after reversing a purchase
                   transaction.
@@ -297,12 +301,14 @@
 
       <figure pgwide="1">
         <title>Starting account structure for tracking a credit card</title>
+
         <screenshot id="cc-accounts">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_accounts.png"
                        srccredit="Bengt Thuree"/>
             </imageobject>
+
             <caption>
               <para>Starting account structure for tracking a credit card in the putting it all together example.
               </para>
@@ -331,12 +337,14 @@
 
       <figure pgwide="1">
         <title>Initial credit card purchases</title>
+
         <screenshot id="cc-purchases">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_purchases.png"
                          srccredit="Bengt Thuree"/>
             </imageobject>
+
             <caption>
               <para>Initial credit card purchases.
               </para>
@@ -360,12 +368,14 @@
 
       <figure pgwide="1">
         <title>Item return transaction refunded to credit card</title>
+
         <screenshot id="cc-refund">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_refund.png"
                          srccredit="Bengt Thuree"/>
             </imageobject>
+
             <caption>
               <para>Returning clothes to Faux Pas Fashions, refund to credit card.
               </para>
@@ -386,12 +396,14 @@
 
       <figure pgwide="1">
         <title>Interest charge on the Credit Card</title>
+
         <screenshot id="cc-interest">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_interest.png"
                          srccredit="Bengt Thuree"/>
             </imageobject>
+
             <caption>
               <para>Interest charge.
               </para>
@@ -418,6 +430,7 @@
 
       <figure pgwide="1">
         <title>The Initial Reconciliation Window For The Credit Card</title>
+
         <screenshot id="cc-reconcile-init">
           <mediaobject>
             <imageobject>
@@ -436,12 +449,14 @@
 
       <figure pgwide="1">
         <title>The Main Reconciliation Window With A Discrepancy</title>
+
         <screenshot id="cc-reconcile">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_reconcile.png"
                          srccredit="Bengt Thuree"/>
             </imageobject>
+
             <caption>
               <para>Main account reconciliation window, demonstrating a discrepancy of $300.
               </para>
@@ -469,12 +484,14 @@
 
       <figure pgwide="1">
         <title>The Credit Card Account After Reconciliation And Payment</title>
+
         <screenshot id="cc-payment">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_payment.png"
                          srccredit="Bengt Thuree"/>
             </imageobject>
+
             <caption>
               <para>Account register after reconciliation and payment.
               </para>
@@ -489,6 +506,7 @@
 
       <figure pgwide="1">
         <title>The Chart of Accounts After Account Reconciliation And Payment</title>
+
         <screenshot id="cc-final">
           <mediaobject>
             <imageobject>
@@ -530,12 +548,14 @@
 
           <figure pgwide="1">
             <title>The Cash Flow report for the month of March</title>
+
             <screenshot id="cc-puttoget2-Cash">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cc_CashFlow.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Cash Flow report after <xref linkend="chapter_cc"></xref>.
                   </para>
@@ -552,17 +572,20 @@
           <para>Select the transaction report from
             <menuchoice>
               <guimenu>Reports</guimenu><guimenuitem>Transaction Report</guimenuitem>
-            </menuchoice>.
+            </menuchoice>
+            .
           </para>
 
           <figure pgwide="1">
             <title>The Transaction Report for the Visa account during March/April</title>
+
             <screenshot id="cc-puttoget2-TransactionRptVisa">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cc_TransactionRptVisa.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Transaction Report for the Visa account during March/April.
                   </para>
@@ -578,12 +601,14 @@
 
           <figure pgwide="1">
             <title>The Transaction Report for the Expenses accounts during April</title>
+
             <screenshot id="cc-puttoget2-TransactionRptExpenses">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cc_TransactionRptExpenses.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Transaction Report for the various Expense accounts during April.
                   </para>
diff --git a/C/guide/ch_currency.xml b/C/guide/ch_currency.xml
index 3bff45ab..1ddf0240 100644
--- a/C/guide/ch_currency.xml
+++ b/C/guide/ch_currency.xml
@@ -29,10 +29,21 @@
     </para>
 
     <para>Some of the issues which arise when using multiple currencies are as follows:
-    <itemizedlist>
-        <listitem><simpara>How do you transfer funds between accounts with different currencies?</simpara></listitem>
-        <listitem><simpara>How do you calculate the overall value when you have mixed currency accounts?</simpara></listitem>
-        <listitem><simpara>How do reports deal with mixed currencies?</simpara></listitem>
+      <itemizedlist>
+        <listitem>
+          <simpara>How do you transfer funds between accounts with different currencies?
+          </simpara>
+        </listitem>
+
+        <listitem>
+          <simpara>How do you calculate the overall value when you have mixed currency accounts?
+          </simpara>
+        </listitem>
+
+        <listitem>
+          <simpara>How do reports deal with mixed currencies?
+          </simpara>
+        </listitem>
       </itemizedlist>
     </para>
 
@@ -73,7 +84,8 @@ TODO -->
         <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><computeroutput>no data/transactions (or only zeroes) for the selected time period</computeroutput></quote>.
+        there are <quote><computeroutput>no data/transactions (or only zeroes) for the selected time
+        period</computeroutput></quote>.
       </para>
 
       <para>When you create a new account, you have the option to define the commodity in which that account is
@@ -130,12 +142,14 @@ TODO -->
 
       <figure pgwide="1">
         <title>Initial multi currency Account Bank Setup</title>
+
         <screenshot id="currency_main1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_main1.png"
                          srccredit="Frank H. Ellenberger" />
             </imageobject>
+
             <caption>
               <para>Initial setup of 3 bank accounts with different currencies.
               </para>
@@ -144,65 +158,68 @@ TODO -->
         </screenshot>
       </figure>
 
-      <para>Notice that the <guilabel>Total (Report)</guilabel> column is being displayed. This is configured in the column header
-        row, select <guibutton>Arrow down</guibutton> and select <guilabel>Total(USD)</guilabel>.
+      <para>Notice that the <guilabel>Total (Report)</guilabel> column is being displayed. This is configured in
+        the column header row, select <guibutton>Arrow down</guibutton> and select
+        <guilabel>Total(USD)</guilabel>.
       </para>
 
       <sect3 id="currency_acct_user2">
         <title>User-Defined Currencies</title>
 
         <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.
-
-        <orderedlist>
-        <title>User-Defined Currencies Workarounds</title>
-        <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:LoyaltyPoints</emphasis>.
-        </para>
-        <listitem><simpara>
-            Treat these as if they were a security—that is, like a stock or mutual fund.
-            </simpara>
-	        <para>
-            In this workaround, you define a new security, of type <guilabel>FUND</guilabel>, called
-            LoyalityPoints. This is pretty straightforward—when you create the new
-            <emphasis>LoyaltyPoints</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>
-            <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.
+          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.
+          <orderedlist>
+            <title>User-Defined Currencies Workarounds</title>
+
+            <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:LoyaltyPoints</emphasis>.
             </para>
-        </listitem>
 
-        <listitem><simpara>
-            Use one of the <quote>dummy</quote> currencies for them.
-            </simpara>
-            <para>In this workaround, 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
-            LoyaltyPoints 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>
-            <para>The drawback with this workaround 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 workaround.
-            </para>
-        </listitem>
-        </orderedlist>
-        </para>
+            <listitem>
+              <simpara>Treat these as if they were a security—that is, like a stock or mutual fund.
+              </simpara>
+
+              <para>In this workaround, you define a new security, of type <guilabel>FUND</guilabel>, called
+                LoyalityPoints. This is pretty straightforward—when you create the new
+                <emphasis>LoyaltyPoints</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>
+
+              <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>
+            </listitem>
+
+            <listitem>
+              <simpara>Use one of the <quote>dummy</quote> currencies for them.
+              </simpara>
+
+              <para>In this workaround, 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 LoyaltyPoints 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>
 
+              <para>The drawback with this workaround 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 workaround.
+              </para>
+            </listitem>
+          </orderedlist>
+        </para>
       </sect3>
     </sect2>
 
@@ -220,12 +237,14 @@ TODO -->
 
       <figure pgwide="1">
         <title>Initial multi currency Account Bank Setup</title>
+
         <screenshot id="currency_main1a">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_main1.png"
                          srccredit="Frank H. Ellenberger" />
             </imageobject>
+
             <caption>
               <para>Initial set up of 3 bank accounts with different currencies.
               </para>
@@ -244,11 +263,13 @@ TODO -->
         <para>Open the <guilabel>Price Database</guilabel> by going to
           <menuchoice>
             <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
-          </menuchoice>.
+          </menuchoice>
+          .
         </para>
 
         <figure pgwide="1">
           <title>The Price Database Window—Still Empty</title>
+
           <screenshot id="currency_peditor">
             <mediaobject>
               <imageobject>
@@ -257,7 +278,7 @@ TODO -->
               </imageobject>
             </mediaobject>
           </screenshot>
-          </figure>
+        </figure>
 
         <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:
@@ -265,12 +286,14 @@ TODO -->
 
         <figure pgwide="1">
           <title>Setup Of Euro Exchange Rate</title>
+
           <screenshot id="currency_addcurr">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_addcurr.png"
                            srccredit="Frank H. Ellenberger" />
               </imageobject>
+
               <caption>
                 <para>Add Price Database Window
                 </para>
@@ -279,21 +302,24 @@ TODO -->
           </screenshot>
         </figure>
 
-        <para>Set the <guilabel>Namespace</guilabel> to <guilabel>CURRENCY</guilabel> and the <guilabel>Security</guilabel> to <guilabel>EUR
-          (Euro)</guilabel>. Then set the exchange rate between the selected security and the selected
-          currency. The <guilabel>Price</guilabel> 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 1 Euro. In
-          this example, you will set the exchange rate to 1 EUR for 1 USD.
+        <para>Set the <guilabel>Namespace</guilabel> to <guilabel>CURRENCY</guilabel> and the
+          <guilabel>Security</guilabel> to <guilabel>EUR (Euro)</guilabel>. Then set the exchange
+          rate between the selected security and the selected currency. The
+          <guilabel>Price</guilabel> 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 1
+          Euro. In this example, you will set the exchange rate to 1 EUR for 1 USD.
         </para>
 
         <figure pgwide="1">
           <title>The Price Database window after setting the exchange rate between Euros and US Dollars</title>
+
           <screenshot id="currency_manualpriceadded">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                            srccredit="Frank H. Ellenberger" width="&img-w;" />
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                            srccredit="Frank H. Ellenberger" />
@@ -304,6 +330,7 @@ TODO -->
 
         <figure pgwide="1">
           <title>Chart of Accounts After Setting The Exchange Rate Between Euro And US Dollar</title>
+
           <screenshot id="currency_main2">
             <mediaobject>
               <imageobject>
@@ -329,17 +356,20 @@ TODO -->
         <para>Open the <guilabel>Price Database</guilabel> by going to
           <menuchoice>
             <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
-          </menuchoice>.
+          </menuchoice>
+          .
         </para>
 
         <figure pgwide="1">
           <title>Price Database Before Obtaining Online Quotes</title>
+
           <screenshot id="currency_BeforeGetOnline">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                            srccredit="Frank H. Ellenberger" width="&img-w;" />
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                            srccredit="Frank H. Ellenberger" />
@@ -354,20 +384,21 @@ TODO -->
 
         <note>
           <para>If the <guibutton>Get Quotes</guibutton> button is disabled, that means that the
-            <application>Perl</application> module &app-fq; is not
-            installed. For information on how to install it, please see
-            <xref linkend="invest-stockprice-auto2" />.
+            <application>Perl</application> module &app-fq; is not installed. For information on how
+            to install it, please see <xref linkend="invest-stockprice-auto2" />.
           </para>
         </note>
 
         <figure pgwide="1">
           <title>The Price Database After Obtaining Online Quotes</title>
+
           <screenshot id="currency_AfterGetOnlineQuotes">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
                            srccredit="Frank H. Ellenberger" width="&img-w;" />
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
                            srccredit="Frank H. Ellenberger" />
@@ -383,12 +414,13 @@ TODO -->
 
         <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
-          <guilabel>Total (USD)</guilabel> column. Also the Euro accounts have been been updated with the latest exchange
-          rate.
+          <guilabel>Total (USD)</guilabel> column. Also the Euro accounts have been been updated
+          with the latest exchange rate.
         </para>
 
         <figure pgwide="1">
           <title>The Chart of Accounts After Obtaining Online Quotes</title>
+
           <screenshot id="currency_main3.png">
             <mediaobject>
               <imageobject>
@@ -413,17 +445,34 @@ TODO -->
         </para>
 
         <procedure>
-          <step><simpara>Open the Securities window by selecting <menuchoice>
-                <guimenu>Tools</guimenu><guimenuitem>Security Editor</guimenuitem></menuchoice>.</simpara>
+          <step>
+            <simpara>Open the Securities window by selecting
+              <menuchoice>
+                <guimenu>Tools</guimenu><guimenuitem>Security Editor</guimenuitem>
+              </menuchoice>
+              .
+            </simpara>
           </step>
 
-          <step><simpara>Make sure the <guilabel>Show National Currencies</guilabel> box is selected.</simpara></step>
+          <step>
+            <simpara>Make sure the <guilabel>Show National Currencies</guilabel> box is selected.
+            </simpara>
+          </step>
 
-          <step><simpara>Expand the <guilabel>CURRENCY</guilabel> row.</simpara></step>
+          <step>
+            <simpara>Expand the <guilabel>CURRENCY</guilabel> row.
+            </simpara>
+          </step>
 
-          <step><simpara>Double click on the currency for which you want to disable exchange rate retrieval.</simpara></step>
+          <step>
+            <simpara>Double click on the currency for which you want to disable exchange rate retrieval.
+            </simpara>
+          </step>
 
-          <step><simpara>Deselect the <guilabel>Get Online Quotes</guilabel> box and click <guibutton>OK</guibutton>.</simpara></step>
+          <step>
+            <simpara>Deselect the <guilabel>Get Online Quotes</guilabel> box and click <guibutton>OK</guibutton>.
+            </simpara>
+          </step>
         </procedure>
       </sect3>
     </sect2>
@@ -432,24 +481,25 @@ TODO -->
       <title>Recording Purchases in a Foreign Currency</title>
 
       <para>Purchases in a foreign currency can be managed in two different options.
-      
         <orderedlist numeration="upperalpha">
-            <listitem><para>    
-                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>
+          <listitem>
+            <para>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>
 
-            <listitem id="currency_purchase1.ol.2"><para>
-	           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></listitem>
+          <listitem id="currency_purchase1.ol.2">
+            <para>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>
+          </listitem>
         </orderedlist>
       </para>
 
-      <para>The rest of this section will explain more based upon option <quote><xref linkend="currency_purchase1.ol.2" /></quote>.
+      <para>The rest of this section will explain more based upon option
+        <quote><xref linkend="currency_purchase1.ol.2" /></quote>.
       </para>
 
       <sect3 id="currency_purchase2">
@@ -477,13 +527,14 @@ TODO -->
           </para>
         </note>
 
-        <para>First you need to transfer 10,000 USD to Jamaica, and you use your US bank account (with a
-          balance of 100,000 USD) for that. The bank gives you an exchange rate of 1 USD = 64 JMD, but
+        <para>First you need to transfer 10,000 USD to Jamaica, and you use your US bank account (with a balance
+          of 100,000 USD) for that. The bank gives you an exchange rate of 1 USD = 64 JMD, but
           charges you 150 USD to transfer the money.
         </para>
 
         <figure pgwide="1">
           <title>Transaction <quote>Currency Transfer To Jamaica</quote></title>
+
           <screenshot id="currency_purchase_MoveMoney.png">
             <mediaobject>
               <imageobject>
@@ -500,12 +551,14 @@ TODO -->
 
         <figure pgwide="1">
           <title>Edit Exchange Rate</title>
+
           <screenshot id="currency_purchase_SetExchangeRate.png">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_purchase_SetExchangeRate.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
+
               <caption>
                 <para>In this dialog the exchange rate of a currency transaction is specified.
                 </para>
@@ -521,6 +574,7 @@ TODO -->
 
         <figure pgwide="1">
           <title>Chart of Accounts before purchasing the boat</title>
+
           <screenshot id="currency_purchase_BeforeBoat.png">
             <mediaobject>
               <imageobject>
@@ -539,6 +593,7 @@ TODO -->
 
         <figure pgwide="1">
           <title>The Chart Of Accounts After Purchasing The Boat</title>
+
           <screenshot id="currency_purchase_AfterBoat.png">
             <mediaobject>
               <imageobject>
@@ -551,9 +606,9 @@ TODO -->
 
         <para>The Chart of Accounts now reflects that your bank account has been reduced by 509,000 JMD, and that
           your Fixed Assets boat account has been increased by the same amount. If you also have
-          turned on the Chart of Accounts (Column Choice) <guilabel>Total (USD)</guilabel> 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.
+          turned on the Chart of Accounts (Column Choice) <guilabel>Total (USD)</guilabel> 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>
 
@@ -568,8 +623,7 @@ TODO -->
           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>
-
- <!-- 
+<!-- 
  As for brokerage "Bank" account, see 
  https://github.com/Gnucash/gnucash-docs/pull/198#discussion_r679289248
  
@@ -578,19 +632,40 @@ TODO -->
         <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:
-        <itemizedlist>
-            <listitem><simpara>Assets:Investments:Brokerage Accounts:Boom:0694.HK (0694.HK)</simpara></listitem>
-            <listitem><simpara>Assets:Investments:Brokerage Accounts:Boom:Bank (HKD)</simpara></listitem>
-            <listitem><simpara>Equity:Opening Balances:HKD (HKD)</simpara></listitem>
-            <listitem><simpara>Expenses:Commissions:Boom:0694.HK (HKD)</simpara></listitem>
-            <listitem><simpara>Income:Investments:Dividend:Boom:0694.HK (HKD)</simpara></listitem>
-        </itemizedlist>
+          <itemizedlist>
+            <listitem>
+              <simpara>Assets:Investments:Brokerage Accounts:Boom:0694.HK (0694.HK)
+              </simpara>
+            </listitem>
+
+            <listitem>
+              <simpara>Assets:Investments:Brokerage Accounts:Boom:Bank (HKD)
+              </simpara>
+            </listitem>
+
+            <listitem>
+              <simpara>Equity:Opening Balances:HKD (HKD)
+              </simpara>
+            </listitem>
+
+            <listitem>
+              <simpara>Expenses:Commissions:Boom:0694.HK (HKD)
+              </simpara>
+            </listitem>
+
+            <listitem>
+              <simpara>Income:Investments:Dividend:Boom:0694.HK (HKD)
+              </simpara>
+            </listitem>
+          </itemizedlist>
         </para>
+
         <para>The Chart of Accounts looks like this after creating all the needed accounts:
         </para>
 
         <figure pgwide="1">
           <title>The Chart of Accounts For International Stocks</title>
+
           <screenshot id="currency_purchase_BeforeStocks.png">
             <mediaobject>
               <imageobject>
@@ -604,11 +679,13 @@ TODO -->
         <para>The stock definition can be seen in the Security Editor (
           <menuchoice>
             <guimenu>Tools</guimenu><guimenuitem>Security Editor</guimenuitem>
-          </menuchoice>.)
+          </menuchoice>
+          .)
         </para>
 
         <figure pgwide="1">
           <title>International Securities</title>
+
           <screenshot id="currency_purchase_Commodities.png">
             <mediaobject>
               <imageobject>
@@ -625,9 +702,12 @@ TODO -->
         </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. 
-          <note><para>If entered from the stock account, the stock is assumed to be priced in the currency of the parent
-          account.</para></note>
+          (shown below), or you can enter it from the stock account.
+          <note>
+            <para>If entered from the stock account, the stock is assumed to be priced in the currency of the parent
+              account.
+            </para>
+          </note>
         </para>
 
         <para>Let’s assume that the stock price is 3 HKD per share. To record the purchase, open the
@@ -635,10 +715,12 @@ TODO -->
           Accounts:Boom:Bank</emphasis>), and enter the following:
         </para>
 
- 
         <informaltable>
-            <textobject><phrase><emphasis>Buy Stocks</emphasis></phrase></textobject>
-            <tgroup cols='3'>
+          <textobject>
+            <phrase><emphasis>Buy Stocks</emphasis></phrase>
+          </textobject>
+
+          <tgroup cols='3'>
             <colspec colwidth='3*' align='left'/>
 
             <colspec colwidth='1*' align='left'/>
@@ -698,12 +780,14 @@ TODO -->
 
         <figure pgwide="1">
           <title>Transfer Funds</title>
+
           <screenshot id="currency_purchase_ToAmount.png">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_purchase_ToAmount.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
+
               <caption>
                 <para>Setting the number of shares in the Transfer Funds dialog
                 </para>
@@ -718,12 +802,14 @@ TODO -->
 
         <figure pgwide="1">
           <title>The Purchased international stocks</title>
+
           <screenshot id="currency_purchase_AfterStocks.png">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_purchase_AfterStocks.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
+
               <caption>
                 <para>Chart of Accounts is now containing the international stocks
                 </para>
@@ -769,8 +855,15 @@ TODO -->
 
       <para>If you are not interested in detail at all, a very simple account structure would suffice:
         <itemizedlist>
-            <listitem><simpara>Assets:Investments:Currency:Bank (USD)</simpara></listitem>
-            <listitem><simpara>Assets:Investments:Currency:XXX (XXX)</simpara></listitem>
+          <listitem>
+            <simpara>Assets:Investments:Currency:Bank (USD)
+            </simpara>
+          </listitem>
+
+          <listitem>
+            <simpara>Assets:Investments:Currency:XXX (XXX)
+            </simpara>
+          </listitem>
         </itemizedlist>
       </para>
 
@@ -780,10 +873,25 @@ TODO -->
       <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:
         <itemizedlist>
-            <listitem><simpara>Assets:Investments:Currency:Bank (USD)</simpara></listitem>
-            <listitem><simpara>Assets:Investments:Currency:Currency Bank:XXX (XXX)</simpara></listitem>
-            <listitem><simpara>Expenses:Investments:Currency:Bank (USD)</simpara></listitem>
-            <listitem><simpara>Income:Investments:Currency:Currency Bank:Capital Gains:XXX (XXX)</simpara></listitem>
+          <listitem>
+            <simpara>Assets:Investments:Currency:Bank (USD)
+            </simpara>
+          </listitem>
+
+          <listitem>
+            <simpara>Assets:Investments:Currency:Currency Bank:XXX (XXX)
+            </simpara>
+          </listitem>
+
+          <listitem>
+            <simpara>Expenses:Investments:Currency:Bank (USD)
+            </simpara>
+          </listitem>
+
+          <listitem>
+            <simpara>Income:Investments:Currency:Currency Bank:Capital Gains:XXX (XXX)
+            </simpara>
+          </listitem>
         </itemizedlist>
       </para>
 
@@ -796,7 +904,10 @@ TODO -->
         </para>
 
         <informaltable>
-          <textobject><phrase><emphasis>Buy Currency</emphasis></phrase></textobject>
+          <textobject>
+            <phrase><emphasis>Buy Currency</emphasis></phrase>
+          </textobject>
+
           <tgroup cols='3'>
             <colspec colwidth='5*' align='left'/>
 
@@ -861,17 +972,18 @@ TODO -->
         <title>Selling a currency investment</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 native currency’s Bank account (very similar to
-          <xref linkend="invest-sell1" />).
+          transferring money from the Currency account to your native currency’s Bank account
+          (very similar to <xref linkend="invest-sell1" />).
         </para>
 
-        <para>The proper recording of the currency sale <emphasis>must</emphasis> 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:Investments:Currency:Currency Bank:Capital Gains:XXX</emphasis> account (or
-          <emphasis>Expense:Investments:Currency:Currency Bank:Capital Loss:XXX</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>The proper recording of the currency sale <emphasis>must</emphasis> 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:Investments:Currency:Currency Bank:Capital Gains:XXX</emphasis> account
+          (or <emphasis>Expense:Investments:Currency:Currency Bank:Capital Loss:XXX</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>In short, a selling Currency transaction should look something like below, seen again from the
@@ -994,13 +1106,15 @@ TODO -->
 
     <para>Trading accounts were introduced as a feature from &app; version 2.3.14. The conceptual basis for
       trading accounts is described in &ulink-sel-tut; by Peter Selinger. A second tutorial
-      &ulink-sel-gnc; describes the manual creation and use of trading accounts in &app; prior to version 2.3.14.
+      &ulink-sel-gnc; describes the manual creation and use of trading accounts in &app; prior to
+      version 2.3.14.
     </para>
 
     <para>Trading accounts are not enabled by default in &app;. To enable them go to
-        <menuchoice>
-            <guimenu>File</guimenu><guimenuitem>Properties</guimenuitem><guilabel>Accounts</guilabel>
-        </menuchoice> tab and check the <guilabel>Use Trading Accounts</guilabel> checkbox.
+      <menuchoice>
+        <guimenu>File</guimenu><guimenuitem>Properties</guimenuitem><guilabel>Accounts</guilabel>
+      </menuchoice>
+      tab and check the <guilabel>Use Trading Accounts</guilabel> checkbox.
     </para>
 
     <sect2 id="trading_acct_concepts">
@@ -1030,9 +1144,9 @@ TODO -->
       <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
-        <xref linkend="currency_manual" />, the
-        additional accounts which will be created automatically when transactions are created
-        between different currencies with trading accounts enabled are:
+        <xref linkend="currency_manual" />, the additional accounts which will be created
+        automatically when transactions are created between different currencies with trading
+        accounts enabled are:
       </para>
 <screen>
 Trading
@@ -1060,12 +1174,14 @@ Trading
 
         <figure pgwide="1">
           <title>The Initial Multicurrency Bank Accounts Setup</title>
+
           <screenshot id="currency__trading_acct_setup">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_trading_acct_setup.png"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <caption>
                 <para>Initial setup of bank accounts in multiple currencies.
                 </para>
@@ -1084,12 +1200,14 @@ Trading
 
         <figure pgwide="1">
           <title>The Initial Price Database Entries</title>
+
           <screenshot id="currency__trading_price_database">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_trading_Price_Database_initial.png"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <caption>
                 <para>Price Database window after setting initial exchange rates between USD, HKD and EUR.
                 </para>
@@ -1103,14 +1221,15 @@ Trading
         </para>
 
         <figure pgwide="1">
-          <title>The Initial Multicurrency Setup After Entering Exchange Rates Between USD, HKD
-                and EUR</title>
+          <title>The Initial Multicurrency Setup After Entering Exchange Rates Between USD, HKD and EUR</title>
+
           <screenshot id="currency_trading_acct_setup_2">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_trading_acct_setup_2.png"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <caption>
                 <para><guilabel>Accounts</guilabel> tab after setting exchange rates to USD.
                 </para>
@@ -1124,21 +1243,23 @@ Trading
         <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 20,000
-          HKD on Feb. 1, 2020. The current funds in the Hong Kong account are insufficient and we will
-          need to transfer another 10,200 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 1,309.64 USD for
-          which the bank charges a 40 USD transfer fee. The transaction to effect this is created
-          with the <guilabel>Transfer Funds</guilabel> dialog as shown below:
+          HKD on Feb. 1, 2020. The current funds in the Hong Kong account are insufficient and we
+          will need to transfer another 10,200 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 1,309.64 USD
+          for which the bank charges a 40 USD transfer fee. The transaction to effect this is
+          created with the <guilabel>Transfer Funds</guilabel> dialog as shown below:
         </para>
 
         <figure pgwide="1">
           <title>The Transfer Dialog To Create Transaction For Transfer From USD To HKD</title>
+
           <screenshot id="currency__trading_tfr_dialog">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_trading_transfer_funds.png"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <caption>
                 <para>Transfer of 10,200 HKD from US Bank account to Hong Kong bank account.
                 </para>
@@ -1147,31 +1268,37 @@ Trading
           </screenshot>
         </figure>
 
-        <para>The <guilabel>Debit Amount</guilabel> has been specified in HKD and the transaction <guilabel>Amount</guilabel> 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>The <guilabel>Debit Amount</guilabel> has been specified in HKD and the transaction
+          <guilabel>Amount</guilabel> 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><guilabel>Amount</guilabel> entered in the <guilabel>Transfer Funds</guilabel> are transferred from the selected <guilabel>Credit
-            Account</guilabel> to the selected <guilabel>Debit Account</guilabel>. And if <guilabel>Debit Amount</guilabel> radio button is selected and the foreign
-            currency amounts are entered, the transaction is recorded on the correct debit amounts. Whereas if <guilabel>Exchange Rate</guilabel> is selected
-            and entered, the exact value is not often recorded due to the rounding errors.
+          <para><guilabel>Amount</guilabel> entered in the <guilabel>Transfer Funds</guilabel> are transferred from
+            the selected <guilabel>Credit Account</guilabel> to the selected <guilabel>Debit
+            Account</guilabel>. And if <guilabel>Debit Amount</guilabel> radio button is selected
+            and the foreign currency amounts are entered, the transaction is recorded on the correct
+            debit amounts. Whereas if <guilabel>Exchange Rate</guilabel> is selected and entered,
+            the exact value is not often recorded due to the rounding errors.
           </para>
         </note>
 
         <figure pgwide="1">
           <title>The Transaction After Transfer Displayed in The US Bank Account Register</title>
+
           <screenshot id="currency_trading_transfer_trans1">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/currency_trading_transfer_trans1.png"
                            srccredit="David Cousens"  width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/currency_trading_transfer_trans1.png"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <caption>
                 <para>Transaction to transfer from US bank account to Hong Kong Bank account after closing transfer
                   dialog.
@@ -1187,16 +1314,19 @@ Trading
 
         <figure pgwide="1">
           <title>The Transaction After Adding The Splits For The Transfer Fee</title>
+
           <screenshot id="currency_trading_transfer_trans2">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/currency_trading_transfer_trans2.png"
                            srccredit="David Cousens"  width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/currency_trading_transfer_trans2.png"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <caption>
                 <para>Transaction to transfer from US bank account to Hong Kong Bank account after adding the splits for
                   the transaction fee.
@@ -1211,12 +1341,14 @@ Trading
 
         <figure pgwide="1">
           <title>The Account Tab Balances After Completion Of USD To HKD Transfer</title>
+
           <screenshot id="currency_trading_accts_after_tfr">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_trading_accts_after_tfr.png"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <caption>
                 <para>Account balances in the Accounts tab after the transfer of funds from the US Bank account to the
                   Hong Kong bank account.
@@ -1238,30 +1370,33 @@ Trading
 
         <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 (negative
-          balance) and the USD trading account has a credit balance (positive balance). The net 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.
+          balance) and the USD trading account has a credit balance (positive balance). The net
+          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 Mar. 1, 2020 the funds
-          are required in the US account for another purpose. A transfer of 10,200.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 1 USD = 7.7933 HKD and a fee of 20.00 USD is charged for the transfer.
-          The transaction to effect the transfer is as follows:
+        <para>The hypothetical purchase in Hong Kong fails to take place and a month later on Mar. 1, 2020 the
+          funds are required in the US account for another purpose. A transfer of 10,200.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 1 USD = 7.7933 HKD and a fee of 20.00 USD is charged for the
+          transfer. The transaction to effect the transfer is as follows:
         </para>
 
         <figure pgwide="1">
           <title>The Transaction To Transfer Funds From Hong Kong To US Bank Account</title>
+
           <screenshot id="currency_trading_tfr_back">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/currency_trading_trf_back.png"
                            srccredit="David Cousens"  width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/currency_trading_trf_back.png"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <caption>
                 <para>The transaction transfers 10,200.00 HKD from the Hong Kong Bank account to the US Bank account.
                 </para>
@@ -1276,12 +1411,14 @@ Trading
 
         <figure pgwide="1">
           <title>The Price database after transfer of funds back to US account</title>
+
           <screenshot id="currency_trading_prices_after_trf_back">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_trading_prices_after_trf_back.png"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <caption>
                 <para>The price database showing prices for the transfer of funds to HKD and back to USD.
                 </para>
@@ -1295,12 +1432,14 @@ Trading
 
         <figure pgwide="1">
           <title>The Accounts tab after transfer back</title>
+
           <screenshot id="currency_trading_accts_after_trf_back">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_trading_accts_after_trf_back.png"
                            srccredit="David Cousens" />
               </imageobject>
+
               <caption>
                 <para>State of the accounts after the funds have been transferred back.
                 </para>
@@ -1310,9 +1449,10 @@ Trading
         </figure>
 
         <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 and CURRENCY placeholder accounts now indicate a
-          modest realized loss of 0.82 USD on the currency transactions. The associated transfer fees appear in the
-          Expenses total. Not a profitable exercise but still illustrative.
+          the transfer of funds back to the US Bank account. The Trading and CURRENCY placeholder
+          accounts now indicate a modest realized loss of 0.82 USD on the currency transactions. The
+          associated transfer fees appear in the Expenses total. Not a profitable exercise but still
+          illustrative.
         </para>
 
         <note>
@@ -1326,12 +1466,14 @@ Trading
 
         <figure pgwide="1">
           <title>The Balance Sheet After Above Transactions</title>
+
           <screenshot id="currency_trading_balance_sheet">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_trading_balance_sheet.png"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <caption>
                 <para>Balance Sheet after these transactions reflecting the trading loss incurred.
                 </para>
diff --git a/C/guide/ch_dep.xml b/C/guide/ch_dep.xml
index 136e66b7..a4ba7000 100644
--- a/C/guide/ch_dep.xml
+++ b/C/guide/ch_dep.xml
@@ -650,12 +650,14 @@
 
     <figure pgwide="1">
       <title>Asset Accounts Before Depreciation</title>
+
       <screenshot id="dep_example">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/dep_example.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
+
           <caption>
             <para>The asset accounts still only have the investments stored.
             </para>
@@ -681,12 +683,14 @@
 
     <figure pgwide="1">
       <title>Asset Depreciation In The Register</title>
+
       <screenshot id="dep_assetreg">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/dep_assetreg.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
+
           <caption>
             <para>This account shows a list of depreciation transactions.
             </para>
@@ -697,18 +701,20 @@
 
     <figure pgwide="1">
       <title>Accounts Tab After Asset Depreciation</title>
-    <screenshot id="dep_assetmain">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/dep_assetmain.png"
+
+      <screenshot id="dep_assetmain">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/dep_assetmain.png"
                      srccredit="Bengt Thuree" />
-        </imageobject>
+          </imageobject>
+
           <caption>
             <para>The asset accounts got decreased by the depreciation.
             </para>
           </caption>
-      </mediaobject>
-    </screenshot>
+        </mediaobject>
+      </screenshot>
     </figure>
 
     <note>
diff --git a/C/guide/ch_importing.xml b/C/guide/ch_importing.xml
index ab7abdd7..088ae1c0 100644
--- a/C/guide/ch_importing.xml
+++ b/C/guide/ch_importing.xml
@@ -20,15 +20,14 @@
   <sect1 id="importing-from-files">
     <title>Importing Transactions from Files</title>
 
-  <important>
-    <title>Outdated</title>
+    <important>
+      <title>Outdated</title>
 
-    <para>This is an older version of
-      <ulink url="&url-docs-C;help/trans-import.html"><quote>Common Transaction
-      Operations</quote> in the manual</ulink>. Better continue there until this update anomaly is
-      resolved.
-    </para>
-  </important>
+      <para>This is an older version of <ulink url="&url-docs-C;help/trans-import.html"><quote>Common
+        Transaction Operations</quote> in the manual</ulink>. Better continue there until this
+        update anomaly is resolved.
+      </para>
+    </important>
 
     <para>Imported transactions will generally be to a specific account in your account tree. In the following
       this will be referred to as the <emphasis role="bold">import</emphasis> or
@@ -768,17 +767,22 @@
           </listitem>
 
           <listitem>
-            <para><emphasis role="bold">Leading Lines to Skip</emphasis> Can be set to skip a number of non-transaction lines preceding the actual data. This can include a field name header or an introduction section in the import file;
+            <para><emphasis role="bold">Leading Lines to Skip</emphasis> Can be set to skip a number of
+              non-transaction lines preceding the actual data. This can include a field name header
+              or an introduction section in the import file;
             </para>
           </listitem>
 
           <listitem>
-            <para><emphasis role="bold">Trailing Lines to Skip</emphasis> Can be set to skip a number of non-transaction lines following the actual data. This can include a summary section;
+            <para><emphasis role="bold">Trailing Lines to Skip</emphasis> Can be set to skip a number of
+              non-transaction lines following the actual data. This can include a summary section;
             </para>
           </listitem>
 
           <listitem>
-            <para><emphasis role="bold">Skip alternate lines</emphasis> When set only every other line will be imported, starting from the first line not skipped with the "Leading Lines to Skip" option;
+            <para><emphasis role="bold">Skip alternate lines</emphasis> When set only every other line will be
+              imported, starting from the first line not skipped with the "Leading Lines to Skip"
+              option;
             </para>
           </listitem>
         </itemizedlist>
diff --git a/C/guide/ch_invest.xml b/C/guide/ch_invest.xml
index 9e2bb6dd..d1edc00f 100644
--- a/C/guide/ch_invest.xml
+++ b/C/guide/ch_invest.xml
@@ -19,10 +19,11 @@
   <title>Investments</title>
 
   <para>This chapter explains how to manage your investments with &app;. Most people have an investment
-    plan, whether its just putting money into a certificate of deposit (<acronym>CD</acronym> for short) account, investing through a company sponsored
-    plan at your workplace or buying and selling stocks and bonds through a brokerage. &app; gives
-    you tools to help you manage these investments such as the <emphasis>Price Database</emphasis>
-    which allows you to record changes in the prices of stocks you own.
+    plan, whether its just putting money into a certificate of deposit (<acronym>CD</acronym> for
+    short) account, investing through a company sponsored plan at your workplace or buying and
+    selling stocks and bonds through a brokerage. &app; gives you tools to help you manage these
+    investments such as the <emphasis>Price Database</emphasis> which allows you to record changes
+    in the prices of stocks you own.
   </para>
 
   <sect1 id="invest_concepts1">
@@ -144,7 +145,8 @@
 
           <listitem>
             <para>Unrealized gain or loss occurs when you’ve got a change in price of an asset. You realize the
-              gain/loss when you actually sell the asset. See also <xref linkend="invest_terms2.capgain" />.
+              gain/loss when you actually sell the asset. See also
+              <xref linkend="invest_terms2.capgain" />.
             </para>
           </listitem>
         </varlistentry>
@@ -153,7 +155,8 @@
           <term id="invest_terms2.return">Return</term>
 
           <listitem>
-            <para>The total income plus capital gains or losses of an investment. See also <xref linkend="invest_terms2.yield" />.
+            <para>The total income plus capital gains or losses of an investment. See also
+              <xref linkend="invest_terms2.yield" />.
             </para>
           </listitem>
         </varlistentry>
@@ -206,10 +209,11 @@
           <term id="invest_terms2.yield">Yield</term>
 
           <listitem>
-            <para>A measure of the amount of money you earn from an investment (That is how much income you receive from
-              the investment). Typically this is reported as a percentage of the principal amount.
-              Yield does not include capital gains or loses (see <xref linkend="invest_terms2.return" />). For example, a stock sells for $100
-              and gives $2 in dividends per year has a yield of 2%.
+            <para>A measure of the amount of money you earn from an investment (That is how much income you receive
+              from the investment). Typically this is reported as a percentage of the principal
+              amount. Yield does not include capital gains or loses (see
+              <xref linkend="invest_terms2.return" />). For example, a stock sells for $100 and
+              gives $2 in dividends per year has a yield of 2%.
             </para>
           </listitem>
         </varlistentry>
@@ -257,10 +261,11 @@
           </para>
 
           <para>A mutual fund is a group investment mechanism in which you can buy into many stocks simultaneously.
-            For example, a <quote>S&P 500 index fund</quote> is a fund which purchases all 500 stocks listed
-            in the Standard and Poor’s index. When you buy a share of this fund, you are
-            really buying a small amount of each of the 500 stocks contained within the fund. Mutual
-            funds are treated exactly like a single stock, both for tax purposes and in accounting.
+            For example, a <quote>S&P 500 index fund</quote> is a fund which purchases all 500
+            stocks listed in the Standard and Poor’s index. When you buy a share of this fund,
+            you are really buying a small amount of each of the 500 stocks contained within the
+            fund. Mutual funds are treated exactly like a single stock, both for tax purposes and in
+            accounting.
           </para>
         </listitem>
 
@@ -313,8 +318,8 @@
         &app; file is open, switch to the <guilabel>Accounts</guilabel> tab, and choose
         <menuchoice>
           <guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy</guimenuitem>
-        </menuchoice>.
-        This will run the <guilabel>New Account Hierarchy Setup</guilabel> assistant and allow you
+        </menuchoice>
+        . This will run the <guilabel>New Account Hierarchy Setup</guilabel> assistant and allow you
         to select additional accounts to add to your account hierarchy. Choose the
         <guilabel>Investment Accounts</guilabel> option (along with any others you are interested
         in). Assuming only investment accounts were selected, this will create an account hierarchy
@@ -329,12 +334,14 @@
 
       <figure>
         <title>A New File Containinng Only The Default Investment Accounts</title>
+
         <screenshot id="invest_accountspredef">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_AccountsPredef.png"
                           srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This is a screen image of the <guilabel>Accounts</guilabel> tab after creating a new file and
                 selecting only the default investment accounts.
@@ -344,9 +351,10 @@
         </screenshot>
       </figure>
 
-      <para>You will probably at least want to add a <emphasis>Bank</emphasis> account to the <emphasis>Assets</emphasis> account and
-        probably an <emphasis>Equity:Opening Balances</emphasis> account, as we have done in
-        previous chapters. Don’t forget to save your new account file with a relevant name!
+      <para>You will probably at least want to add a <emphasis>Bank</emphasis> account to the
+        <emphasis>Assets</emphasis> account and probably an <emphasis>Equity:Opening
+        Balances</emphasis> account, as we have done in previous chapters. Don’t forget to
+        save your new account file with a relevant name!
       </para>
     </sect2>
 
@@ -373,11 +381,11 @@
         as the brokerage account.
       </para>
 
-      <para>Security prices are kept in the <guilabel>Price Database</guilabel> of &app; (see <xref linkend="invest-stockprice1" />).
-        This contains prices for individual securities (not security accounts). All prices for an
-        individual security are in a single currency. If a security is traded in multiple
-        currencies, then a separate security and separate accounts should be set up for each
-        currency.
+      <para>Security prices are kept in the <guilabel>Price Database</guilabel> of &app; (see
+        <xref linkend="invest-stockprice1" />). This contains prices for individual securities (not
+        security accounts). All prices for an individual security are in a single currency. If a
+        security is traded in multiple currencies, then a separate security and separate accounts
+        should be set up for each currency.
       </para>
     </sect2>
 
@@ -477,7 +485,6 @@ Income
    Interest Income
       Certificate of Deposit
       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>
@@ -489,20 +496,23 @@ Income
       <para>Now let’s populate these accounts with real numbers. Let’s assume that you start with
         $10,000 in your bank account, which pays 1% interest and you buy a $5,000 certificate of
         deposit with a 6 month maturity date and a 2% yield. Clearly, it is much better to keep your
-        money in the certificate of deposit than in the savings account. After the initial purchase, your accounts
-        should look something like this:
+        money in the certificate of deposit than in the savings account. After the initial purchase,
+        your accounts should look something like this:
       </para>
 
       <figure>
         <title>The Chart Of Accounts After Investing In A Certificate Of Deposit</title>
+
         <screenshot id="invest-int">
           <mediaobject>
-           <imageobject>
+            <imageobject>
               <imagedata fileref="figures/invest_int1.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
-              <para>This is an image of the account register after creating and investing in a certificate of deposit investment.
+              <para>This is an image of the account register after creating and investing in a certificate of deposit
+                investment.
               </para>
             </caption>
           </mediaobject>
@@ -512,22 +522,25 @@ Income
       <para>Now, during the course of the next 6 months, you receive monthly bank statements which describe the
         activity of your account. In our fictional example, we do nothing with the money at this
         bank, so the only activity is income from interest and bank charges. The monthly bank
-        charges are $2. After 6 months, the register window for the certificate of deposit and for the savings account
-        should look like these:
+        charges are $2. After 6 months, the register window for the certificate of deposit and for
+        the savings account should look like these:
       </para>
 
       <figure>
         <title>The CD Account After 6 Months</title>
+
         <screenshot id="invest-int2">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_int2.png"
                          srccredit="Cristian Marchi" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_int2.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This is an image of the register of the certificate of deposit account after 6 months.
               </para>
@@ -538,16 +551,19 @@ Income
 
       <figure>
         <title>The Savings Account After 6 Months</title>
+
         <screenshot id="invest-int2-1">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_int2-1.png"
                          srccredit="Cristian Marchi" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_int2-1.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This is an image of the register of the Savings account after 6 months.
               </para>
@@ -561,12 +577,14 @@ Income
 
       <figure>
         <title>The Chart Of Accounts After 6 months</title>
+
         <screenshot id="invest-int3">
           <mediaobject>
-           <imageobject>
+            <imageobject>
               <imagedata fileref="figures/invest_int3.png"
                           srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This a screen capture of the accounts after 6 months.
               </para>
@@ -576,15 +594,15 @@ Income
       </figure>
 
       <para>From the above image of the main &app; account window you see a nice summary of what happened to
-        these investments over the 6 months. While the yield on the certificate of deposit is double that of the savings
-        account, the return on the certificate of deposit was $50.21 versus $13.03 for the savings account, or almost 4
-        times more. Why? Because of the pesky $2 bank charges that hit the savings account (which
-        counted for $12 over 6 months).
+        these investments over the 6 months. While the yield on the certificate of deposit is double
+        that of the savings account, the return on the certificate of deposit was $50.21 versus
+        $13.03 for the savings account, or almost 4 times more. Why? Because of the pesky $2 bank
+        charges that hit the savings account (which counted for $12 over 6 months).
       </para>
 
-      <para>After this 6 month period, the certificate of deposit has reached maturity which means you may sell it with no early
-        withdrawal penalty. To do so, simply transfer the $5,050.21 from the certificate of deposit account into the
-        savings account.
+      <para>After this 6 month period, the certificate of deposit has reached maturity which means you may sell
+        it with no early withdrawal penalty. To do so, simply transfer the $5,050.21 from the
+        certificate of deposit account into the savings account.
       </para>
     </sect2>
   </sect1>
@@ -596,8 +614,8 @@ Income
       to create and populate the accounts with your investment portfolio. After this initial setup
       of your portfolio, you may have shares of stock purchased from before you started using &app;.
       For these stocks, follow the instructions in the
-      <xref linkend="invest-buy-stock2" endterm="invest-buy-stock2.title" /> section.
-      If you have just purchased your stocks, then use the
+      <xref linkend="invest-buy-stock2" endterm="invest-buy-stock2.title" /> section. If you have
+      just purchased your stocks, then use the
       <xref linkend="invest-buy-new2" endterm="invest-buy-new2.title" /> section.
     </para>
 
@@ -650,13 +668,14 @@ Income
         menu
         <menuchoice>
           <guimenu>Actions</guimenu><guimenu>New Account...</guimenu>
-        </menuchoice>.
-        The New Account dialog will appear, follow the steps, in the sequence below to setup your
+        </menuchoice>
+        . The New Account dialog will appear, follow the steps, in the sequence below to setup your
         new stock account.
       </para>
 
       <figure>
         <title>The <quote>New Account</quote> Window For AMZN</title>
+
         <screenshot id="invest-newaccount">
           <mediaobject>
             <imageobject>
@@ -712,10 +731,10 @@ Income
 
           <itemizedlist>
             <listitem>
-              <para><emphasis>Select Security/Currency</emphasis> - Click on the <guibutton>Select...</guibutton>
-                button next to the <guilabel>Security/currency</guilabel> line. We must change the
-                security from the default (your default currency) to this specific stock. This will
-                bring up the <guilabel>Select Security</guilabel> dialog.
+              <para><emphasis>Select Security/Currency</emphasis> - Click on the <guibutton>Select...</guibutton> button
+                next to the <guilabel>Security/currency</guilabel> line. We must change the security
+                from the default (your default currency) to this specific stock. This will bring up
+                the <guilabel>Select Security</guilabel> dialog.
               </para>
             </listitem>
 
@@ -729,6 +748,7 @@ Income
 
               <figure>
                 <title>The <quote>Select Security</quote> Window</title>
+
                 <screenshot id="invest-selectsecurity">
                   <mediaobject>
                     <imageobject>
@@ -754,11 +774,12 @@ Income
                 </listitem>
 
                 <listitem>
-                  <para>The <guilabel>Symbol/abbreviation:</guilabel> is <userinput>AMZN</userinput>. The symbol is the stock ticker
-                    used in your quote source several lines down on the form.                    <note><para>
-                    Different symbols will be used on different price sources for the same stock, an
-                    example is Ericsson on the Stockholm Exchange is ERIC-B while on Yahoo it is
-                    ERRICB.ST.</para>
+                  <para>The <guilabel>Symbol/abbreviation:</guilabel> is <userinput>AMZN</userinput>. The symbol is the
+                    stock ticker used in your quote source several lines down on the form.
+                    <note>
+                      <para>Different symbols will be used on different price sources for the same stock, an example is Ericsson
+                        on the Stockholm Exchange is ERIC-B while on Yahoo it is ERRICB.ST.
+                      </para>
                     </note>
                   </para>
                 </listitem>
@@ -779,7 +800,8 @@ Income
 
                 <listitem>
                   <para>The <guilabel>Fraction traded</guilabel> should be adjusted to the smallest fraction of this
-                    security which can be traded, usually <guilabel>1/100</guilabel> or <guilabel>1/10000</guilabel>.
+                    security which can be traded, usually <guilabel>1/100</guilabel> or
+                    <guilabel>1/10000</guilabel>.
                   </para>
                 </listitem>
 
@@ -791,24 +813,27 @@ Income
 
                   <note>
                     <para>If the <guibutton>Get Online Quotes</guibutton> button is not highlighted, and it is not tickable,
-                      then the &app-fq; package is not installed.
-                      See the chapter <ulink url="&url-docs-C;help/finance-quote.html">Setting Up the Quote Retrieval</ulink> in the manual.
+                      then the &app-fq; package is not installed. See the chapter
+                      <ulink url="&url-docs-C;help/finance-quote.html">Setting Up the Quote
+                      Retrieval</ulink> in the manual.
                     </para>
                   </note>
 
                   <para>Below is what this window should look like when finished:
                   </para>
+
                   <figure>
                     <title>The <quote>New Security</quote> Window</title>
-                      <screenshot id="invest-newsecurity">
-                        <mediaobject>
-                          <imageobject>
-                            <imagedata fileref="figures/invest_newsecurity.png"
+
+                    <screenshot id="invest-newsecurity">
+                      <mediaobject>
+                        <imageobject>
+                          <imagedata fileref="figures/invest_newsecurity.png"
                                        srccredit="Cristian Marchi"/>
-                          </imageobject>
-                        </mediaobject>
-                      </screenshot>
-                    </figure>
+                        </imageobject>
+                      </mediaobject>
+                    </screenshot>
+                  </figure>
                 </listitem>
 
                 <listitem>
@@ -876,12 +901,14 @@ Income
 
       <figure>
         <title>The Chart of Accounts After The Creation Of The First Stock Account</title>
+
         <screenshot id="invest-setup-current">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_setup_current.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This image is after the creation of the first stock account (AMZN).
               </para>
@@ -909,12 +936,13 @@ Income
       <para>The examples in this section use <guilabel>Transaction Journal</guilabel> view.
       </para>
 
-      <para>To register the initial <userinput>100</userinput> shares of this stock that you purchased previously, on the first
-        (transaction) line, enter the date of the purchase (for example, Jan. 1 2005) and
-        <guilabel>Description</guilabel> (for example, Opening Balance). On the first split line, enter <userinput>100</userinput>
-        in <guilabel>Shares</guilabel>, delete the (unit) <guilabel>Price</guilabel> (it will be
-        calculated when you <keycap>Tab</keycap> out of the split) and enter <userinput>2000</userinput> in the
-        <guilabel>Buy</guilabel> column.
+      <para>To register the initial <userinput>100</userinput> shares of this stock that you purchased
+        previously, on the first (transaction) line, enter the date of the purchase (for example,
+        Jan. 1 2005) and <guilabel>Description</guilabel> (for example, Opening Balance). On the
+        first split line, enter <userinput>100</userinput> in <guilabel>Shares</guilabel>, delete
+        the (unit) <guilabel>Price</guilabel> (it will be calculated when you <keycap>Tab</keycap>
+        out of the split) and enter <userinput>2000</userinput> in the <guilabel>Buy</guilabel>
+        column.
       </para>
 
       <note>
@@ -931,16 +959,19 @@ Income
 
       <figure>
         <title>The Transaction Register Of The AMZN Account After The First Purchase</title>
+
         <screenshot id="invest-setup-portfolio1">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_setup_portfolio1.png"
                          srccredit="Cristian Marchi" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_setup_portfolio1.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This image is the transaction register of the AMZN account after the first stock
                 <quote>purchase</quote>.
@@ -951,8 +982,8 @@ Income
       </figure>
 
       <para>Notice that the <guilabel>Balance</guilabel> (last column) is in the units of the commodity (AMZN
-        shares) not in currency units. Thus, the balance is 100 (AMZN units) rather than $2,000. This
-        is how it should be.
+        shares) not in currency units. Thus, the balance is 100 (AMZN units) rather than $2,000.
+        This is how it should be.
       </para>
     </sect2>
 
@@ -974,35 +1005,39 @@ Income
           Unless otherwise stated, fees are handled in a similar way.
         </para>
 
-        <para>In &app; 2 alternate ways can be used to handle commissions (for simplicity this document section will
-          refer to these ways as net pricing and gross pricing).</para>
+        <para>In &app; 2 alternate ways can be used to handle commissions (for simplicity this document section
+          will refer to these ways as net pricing and gross pricing).
+        </para>
 
-		<variablelist>
-        <varlistentry>
-        <term>Gross Pricing</term>
-	    <listitem><para>You enter the price not adjusted by commissions and enter the
-	       commissions expense on a separate split in the transaction. This enables the tracking
-	       of commissions but is <emphasis>not</emphasis> compatible with using
-	       <xref linkend="invest-sellLots"/>. Scrubbing doesn't know to deduct commissions
-	       and fees from the gains, so capital gains or losses must be manually calculated (see
-	       <xref linkend="invest-sell-man"/>).
-           </para>
-        </listitem>
-        </varlistentry>
-		<varlistentry>
-	    <term>Net Pricing</term>
-        <listitem><para>
-            You enter a net price (adjusted by commissions) when buying and
-            selling securities. You do <emphasis>not</emphasis> also record commissions in a
-            specific commissions account in order to later claim it as an expense, as this would
-            be claiming commissions twice. This way <emphasis>is</emphasis> compatible with using
-            <xref linkend="invest-sellLots"/>. This results in a slightly misleading price
-            being added to the price database (the effective price you paid) but is not usually of
-            any concern.
-	    </para>
-        </listitem>
-		</varlistentry>
-		</variablelist>
+        <variablelist>
+          <varlistentry>
+            <term>Gross Pricing</term>
+
+            <listitem>
+              <para>You enter the price not adjusted by commissions and enter the commissions expense on a separate
+                split in the transaction. This enables the tracking of commissions but is
+                <emphasis>not</emphasis> compatible with using <xref linkend="invest-sellLots"/>.
+                Scrubbing doesn't know to deduct commissions and fees from the gains, so capital
+                gains or losses must be manually calculated (see <xref linkend="invest-sell-man"/>).
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>Net Pricing</term>
+
+            <listitem>
+              <para>You enter a net price (adjusted by commissions) when buying and selling securities. You do
+                <emphasis>not</emphasis> also record commissions in a specific commissions account
+                in order to later claim it as an expense, as this would be claiming commissions
+                twice. This way <emphasis>is</emphasis> compatible with using
+                <xref linkend="invest-sellLots"/>. This results in a slightly misleading price being
+                added to the price database (the effective price you paid) but is not usually of any
+                concern.
+              </para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
 
         <para>Please get professional advice if you are unsure which of these ways are applicable to your
           jurisdiction.
@@ -1012,35 +1047,39 @@ Income
       <sect3 id="invest-buy-gross">
         <title>Example: Buying Shares with Gross Pricing</title>
 
-        <para>In this example you will purchase 100 shares at $50 per share of IBM stock with a commission of $100. First step will be
-          to create the stock account for IBM. The existing <emphasis>Expenses:Commission</emphasis>
-          account will be used.
+        <para>In this example you will purchase 100 shares at $50 per share of IBM stock with a commission of
+          $100. First step will be to create the stock account for IBM. The existing
+          <emphasis>Expenses:Commission</emphasis> account will be used.
         </para>
 
         <para>Now for the transaction, on the first (transaction) line, enter the <guilabel>Date</guilabel> of the
-          purchase (for example, Jan. 3, 2005) and <guilabel>Description</guilabel> (for example, Initial IBM
-          Purchase). On the first split line, enter <userinput>50</userinput> in <guilabel>Shares</guilabel>, delete
-          <guilabel>Price</guilabel> (leave it empty so it will be calculated), and enter <userinput>5000</userinput> in
-          <guilabel>Buy</guilabel>. You do not need to fill in the <guilabel>Price</guilabel>
-          column, as it will be calculated for you when you <keycap>Tab</keycap> to the next split.
-          The next line in the split transaction will be <emphasis>Expenses:Commissions</emphasis>
-          and fill <userinput>100</userinput> in <guilabel>Buy</guilabel>. The third split line will be to transfer $5,100 from
-          <emphasis>Assets:Bank ABC</emphasis> account to balance the transaction. Your IBM
-          Commodity view should now appear like this:
+          purchase (for example, Jan. 3, 2005) and <guilabel>Description</guilabel> (for example,
+          Initial IBM Purchase). On the first split line, enter <userinput>50</userinput> in
+          <guilabel>Shares</guilabel>, delete <guilabel>Price</guilabel> (leave it empty so it will
+          be calculated), and enter <userinput>5000</userinput> in <guilabel>Buy</guilabel>. You do
+          not need to fill in the <guilabel>Price</guilabel> column, as it will be calculated for
+          you when you <keycap>Tab</keycap> to the next split. The next line in the split
+          transaction will be <emphasis>Expenses:Commissions</emphasis> and fill
+          <userinput>100</userinput> in <guilabel>Buy</guilabel>. The third split line will be to
+          transfer $5,100 from <emphasis>Assets:Bank ABC</emphasis> account to balance the
+          transaction. Your IBM Commodity view should now appear like this:
         </para>
 
         <figure>
           <title>The Transaction Register Of The IBM Account After The First Stock Purchase</title>
+
           <screenshot id="invest-setup-portfolio2">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/invest_SetupPortfolio2.png"
                             srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/invest_SetupPortfolio2.png"
                             srccredit="Chris Good"/>
               </imageobject>
+
               <caption>
                 <para>This image is of the transaction register of the IBM account after the first stock
                   <quote>purchase</quote> with a commission.
@@ -1062,14 +1101,14 @@ Income
         </para>
 
         <para>Now for the transaction, on the first (transaction) line, enter the <guilabel>Date</guilabel> of the
-          purchase (for example, Jan. 3, 2005) and <guilabel>Description</guilabel> (for example, Initial IBM
-          Purchase). On the first split line, optionally enter more details in <guilabel>Memo
-          </guilabel>, then <userinput>50</userinput> in <guilabel>Shares</guilabel>, delete anything in
-          <guilabel>Price</guilabel> (so it will be calculated by dividing <guilabel>Buy</guilabel>
-          by <guilabel>Shares</guilabel> when you <keycap>Tab</keycap> out of the split), &img-w;0 in
-          <guilabel>Buy</guilabel> (50 * $100.00 + $100). Alternatively use &app; to calculate
-          <guilabel>Buy</guilabel> by entering the formula <userinput>5000 + 100</userinput> or
-          <userinput>(50 * 100) + 100</userinput> in <guilabel>Buy</guilabel> (
+          purchase (for example, Jan. 3, 2005) and <guilabel>Description</guilabel> (for example,
+          Initial IBM Purchase). On the first split line, optionally enter more details in
+          <guilabel>Memo </guilabel>, then <userinput>50</userinput> in <guilabel>Shares</guilabel>,
+          delete anything in <guilabel>Price</guilabel> (so it will be calculated by dividing
+          <guilabel>Buy</guilabel> by <guilabel>Shares</guilabel> when you <keycap>Tab</keycap> out
+          of the split), &img-w;0 in <guilabel>Buy</guilabel> (50 * $100.00 + $100). Alternatively
+          use &app; to calculate <guilabel>Buy</guilabel> by entering the formula <userinput>5000 +
+          100</userinput> or <userinput>(50 * 100) + 100</userinput> in <guilabel>Buy</guilabel> (
           <guilabel>Buy</guilabel> will be calculated when you <keycap>Tab</keycap> out of the
           column.) Use the <keycap>Tab</keycap> key as many times as needed to proceed to the next
           split.
@@ -1084,16 +1123,19 @@ Income
 
         <figure>
           <title>The IBM Account After The First Stock Purchase With A Commission</title>
+
           <screenshot id="invest-setup-portfolio3">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/invest_SetupPortfolio3.png"
                            srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/invest_SetupPortfolio3.png"
                            srccredit="Chris Good"/>
               </imageobject>
+
               <caption>
                 <para>This image is of the transaction register of the IBM account after the first stock
                   <quote>purchase</quote> with a commission.
@@ -1119,13 +1161,14 @@ Income
       <title>Initial Price Database Setup</title>
 
       <para>To use the <guilabel>Price Database</guilabel> to track a stock value, you must initially insert the
-        stock. To do so, open the <guilabel>Price Database</guilabel> (<menuchoice>
+        stock. To do so, open the <guilabel>Price Database</guilabel> (
+        <menuchoice>
           <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
-        </menuchoice>)
-        and click on <guibutton>Add</guibutton> button. The first time a Commodity/Stock is
+        </menuchoice>
+        ) and click on <guibutton>Add</guibutton> button. The first time a Commodity/Stock is
         entered this window will be blank except for the control buttons on the bottom. Select the
-        appropriate Commodity you want to insert into the <guilabel>Price Database</guilabel>. At this
-        point, you can input the price of the commodity manually. There are 6 fields in the New
+        appropriate Commodity you want to insert into the <guilabel>Price Database</guilabel>. At
+        this point, you can input the price of the commodity manually. There are 6 fields in the New
         Commodity window:
       </para>
 
@@ -1172,11 +1215,11 @@ Income
           <listitem>
             <para>One of: <guilabel>Bid</guilabel> (the market buying price), <guilabel>Ask</guilabel> (the market
               selling price), <guilabel>Last</guilabel> (the last transaction price), <guilabel>Net
-              Asset Value</guilabel> (mutual fund price per share, <acronym>NAV</acronym> for short), or <guilabel>Unknown</guilabel>.
-              Stocks and currencies will usually give their quotes as one of bid, ask or last.
-              Mutual funds are often given as net asset value. For other commodities, simply choose
-              <guilabel>Unknown</guilabel>. This option is for informational purposes only, it is
-              not used by &app;.
+              Asset Value</guilabel> (mutual fund price per share, <acronym>NAV</acronym> for
+              short), or <guilabel>Unknown</guilabel>. Stocks and currencies will usually give their
+              quotes as one of bid, ask or last. Mutual funds are often given as net asset value.
+              For other commodities, simply choose <guilabel>Unknown</guilabel>. This option is for
+              informational purposes only, it is not used by &app;.
             </para>
           </listitem>
         </varlistentry>
@@ -1191,18 +1234,20 @@ Income
         </varlistentry>
       </variablelist>
 
-      <para>As an example of adding the AMZN commodity to the price database, with an initial value of $40.50 per
-        share.
+      <para>As an example of adding the AMZN commodity to the price database, with an initial value of $40.50
+        per share.
       </para>
 
       <figure>
         <title>Entering A Price Into The Database</title>
+
         <screenshot id="invest-peditor">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_peditor.png"
                           srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>Adding the AMZN commodity to the price database, with an initial value of $40.50 per share.
               </para>
@@ -1212,18 +1257,17 @@ Income
       </figure>
 
       <para>Click <guibutton>OK</guibutton> when finished. Once you have performed this initial placement of the
-        commodity into the <guilabel>Price Database</guilabel>, you will not have to do it again, even
-        if you use the same commodity in another account.
+        commodity into the <guilabel>Price Database</guilabel>, you will not have to do it again,
+        even if you use the same commodity in another account.
       </para>
 
       <note>
-        <para>If you have online retrieval of quotes activated (see
-          <xref linkend="invest-stockprice-auto2" />), you can initialize a commodity
-          without manually making an entry. When you initially add the security in the
-          <guilabel>Security Editor</guilabel>, check <guilabel>Get Online Quotes</guilabel> and
-          save the security. Then, in the <guilabel>Price Database</guilabel>, click <guibutton>Get
-          Quotes</guibutton>, and the new security will be inserted into the price list with the
-          retrieved price.
+        <para>If you have online retrieval of quotes activated (see <xref linkend="invest-stockprice-auto2" />),
+          you can initialize a commodity without manually making an entry. When you initially add
+          the security in the <guilabel>Security Editor</guilabel>, check <guilabel>Get Online
+          Quotes</guilabel> and save the security. Then, in the <guilabel>Price Database</guilabel>,
+          click <guibutton>Get Quotes</guibutton>, and the new security will be inserted into the
+          price list with the retrieved price.
         </para>
       </note>
     </sect2>
@@ -1238,16 +1282,19 @@ Income
 
       <figure>
         <title>The Price Database With The List Of All Known Commodities</title>
+
         <screenshot id="invest-peditor2">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_peditor2.png"
                          srccredit="Cristian Marchi" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_peditor2.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>The main price database window, showing the list of all known commodities.
               </para>
@@ -1263,72 +1310,123 @@ Income
       <para>If you have more than a couple of commodities, you will tire of having to update their prices
         constantly. &app; has the ability to automatically download the most recent price for your
         commodities using the Internet. This is accomplished through the
-        <application>Perl</application> module &app-fq;, which must
-        be installed in order to activate this feature.
+        <application>Perl</application> module &app-fq;, which must be installed in order to
+        activate this feature.
       </para>
 
-      <para>See the chapter
-        <ulink url="&url-docs-C;help/finance-quote.html">Setting Up the Quote Retrieval</ulink>
-        in the manual.
+      <para>See the chapter <ulink url="&url-docs-C;help/finance-quote.html">Setting Up the Quote
+        Retrieval</ulink> in the manual.
       </para>
 
       <sect3 id="invest-stockprice-auto-install3">
         <title>Installing &app-fq;</title>
-        <para>The process of installing &app-fq; depends on the system. </para>
 
-        <para>On &lin; and BSD it's usually simplest to use the package manager, but those seldom keep up with the latest &app-fq; releases. If you need a newer version than your package manager provides, use the following procedure with <filename>gnc-fq-update</filename></para>
+        <para>The process of installing &app-fq; depends on the system.
+        </para>
+
+        <para>On &lin; and BSD it's usually simplest to use the package manager, but those seldom keep up with the
+          latest &app-fq; releases. If you need a newer version than your package manager provides,
+          use the following procedure with <filename>gnc-fq-update</filename>
+        </para>
+
         <procedure>
           <title>Installing &app-fq; on &lin; with <filename>gnc-fq-update</filename></title>
-          <step><simpara>Close &app;.</simpara></step>
-          <step><simpara>Run the command <command>which gnc-fq-update</command> to check <filename>gnc-fq-update</filename> program is in your PATH environment
-            variable.<footnote><simpara>If you’ve installed &app; packages provided by your distribution, <filename>gnc-fq-update</filename> must be on your PATH.</simpara></footnote>
-          </simpara>
-            <substeps><step id="gnc-fq-update-not-found">
-                <simpara>If <filename>gnc-fq-update</filename> is not in your PATH, search the folder where &app; is 
-                installed.</simpara>
-                </step>
+
+          <step>
+            <simpara>Close &app;.
+            </simpara>
+          </step>
+
+          <step>
+            <simpara>Run the command <command>which gnc-fq-update</command> to check <filename>gnc-fq-update</filename>
+              program is in your PATH environment variable.
+              <footnote>
+                <simpara>If you’ve installed &app; packages provided by your distribution,
+                  <filename>gnc-fq-update</filename> must be on your PATH.
+                </simpara>
+              </footnote>
+            </simpara>
+
+            <substeps>
+              <step id="gnc-fq-update-not-found">
+                <simpara>If <filename>gnc-fq-update</filename> is not in your PATH, search the folder where &app; is
+                  installed.
+                </simpara>
+              </step>
             </substeps>
           </step>
-          <step><simpara>Run the command <command>sudo gnc-fq-update</command> or <command>su -c gnc-fq-update</command> in order to run it with root privilege.
-            It depends on your distribution.
-          If <filename>gnc-fq-update</filename> is not in your PATH, specify full path of <filename>gnc-fq-update</filename>
-            instead, which is found by <xref linkend="gnc-fq-update-not-found" />.</simpara>
-            <para>
-              This will launch a <application>Perl</application> <acronym><ulink url="https://www.cpan.org/">CPAN</ulink></acronym><footnote>
-                <simpara>See <ulink url="https://www.cpan.org/misc/cpan-faq.html">CPAN Frequently Asked Questions</ulink> for details.</simpara></footnote>
-              module internally. When you launch the CPAN module for the first time, you must setup and configure it. However, on the most systems if you accept the default settings
-              or answer the first question <computeroutput>Are you ready for manual
-              configuration? [yes]</computeroutput> with <userinput>no</userinput>, you will be able to install &app-fq; successfully. 
-              </para>
+
+          <step>
+            <simpara>Run the command <command>sudo gnc-fq-update</command> or <command>su -c gnc-fq-update</command> in
+              order to run it with root privilege. It depends on your distribution. If
+              <filename>gnc-fq-update</filename> is not in your PATH, specify full path of
+              <filename>gnc-fq-update</filename> instead, which is found by
+              <xref linkend="gnc-fq-update-not-found" />.
+            </simpara>
+
+            <para>This will launch a <application>Perl</application>
+              <acronym><ulink url="https://www.cpan.org/">CPAN</ulink></acronym>
+              <footnote>
+                <simpara>See <ulink url="https://www.cpan.org/misc/cpan-faq.html">CPAN Frequently Asked Questions</ulink> for
+                  details.
+                </simpara>
+              </footnote>
+              module internally. When you launch the CPAN module for the first time, you must setup
+              and configure it. However, on the most systems if you accept the default settings or
+              answer the first question <computeroutput>Are you ready for manual configuration?
+              [yes]</computeroutput> with <userinput>no</userinput>, you will be able to install
+              &app-fq; successfully.
+            </para>
           </step>
-          
-          <step><simpara>Run <command>gnc-fq-dump</command> to check &app-fq; works properly.</simpara></step>
-        </procedure>
 
+          <step>
+            <simpara>Run <command>gnc-fq-dump</command> to check &app-fq; works properly.
+            </simpara>
+          </step>
+        </procedure>
 
         <procedure>
           <title>Installing &app-fq; on &mac;</title>
-          <step><simpara>Close &app;.</simpara></step>
-          <step><simpara>Install Xcode if it is not installed.</simpara>
-              <simpara>XCode is an optional item from your &mac; distribution DVD.</simpara>
+
+          <step>
+            <simpara>Close &app;.
+            </simpara>
+          </step>
+
+          <step>
+            <simpara>Install Xcode if it is not installed.
+            </simpara>
+
+            <simpara>XCode is an optional item from your &mac; distribution DVD.
+            </simpara>
           </step>
-          <step><simpara>Run the <emphasis>Update Finance Quote</emphasis> app in the &app; dmg.</simpara> 
-              <para>You can run it from the dmg or copy it to the same
-                folder to which you copied &app;.
-                It will open a Terminal window and run a script for you
-                which will ask lots of questions. Accept the default for each unless you know what
-                you’re doing.
+
+          <step>
+            <simpara>Run the <emphasis>Update Finance Quote</emphasis> app in the &app; dmg.
+            </simpara>
+
+            <para>You can run it from the dmg or copy it to the same folder to which you copied &app;. It will open a
+              Terminal window and run a script for you which will ask lots of questions. Accept the
+              default for each unless you know what you’re doing.
             </para>
           </step>
         </procedure>
 
         <procedure>
           <title>Installing &app-fq; on &win;</title>
-          <step><simpara>Close &app;.</simpara></step>
-          <step><simpara>Run <menuchoice>
-                               <guimenu>Start</guimenu>
-                               <guisubmenu>&app;</guisubmenu>
-                               <guimenuitem>Install Online Price Retrieval</guimenuitem></menuchoice>.
+
+          <step>
+            <simpara>Close &app;.
+            </simpara>
+          </step>
+
+          <step>
+            <simpara>Run
+              <menuchoice>
+                <guimenu>Start</guimenu> <guisubmenu>&app;</guisubmenu> <guimenuitem>Install Online
+                Price Retrieval</guimenuitem>
+              </menuchoice>
+              .
             </simpara>
           </step>
         </procedure>
@@ -1345,14 +1443,13 @@ Income
       <sect3 id="invest-stockprice-auto-configure3">
         <title>Configuring Securities for Online Quotes</title>
 
-        <para>With &app-fq; installed and functioning correctly, you must
-          configure your &app; securities to use this feature to obtain updated price information
-          automatically. Whether creating new securities or modifying securities that have already
-          been setup, use the
+        <para>With &app-fq; installed and functioning correctly, you must configure your &app; securities to use
+          this feature to obtain updated price information automatically. Whether creating new
+          securities or modifying securities that have already been setup, use the
           <menuchoice>
             <guimenu>Tools</guimenu><guimenuitem>Security Editor</guimenuitem>
-          </menuchoice>,
-          to edit the security and check the <guilabel>Get Online Quotes</guilabel> box. You will
+          </menuchoice>
+          , to edit the security and check the <guilabel>Get Online Quotes</guilabel> box. You will
           now be able to modify the radio buttons for <guilabel>Type of quote source</guilabel>, the
           pull-down menus to specify the specific source(s) and <guilabel>The timezone for these
           quotes</guilabel>. When finished editing, <guilabel>Close</guilabel> the Security Editor
@@ -1364,10 +1461,10 @@ Income
       <sect3 id="invest-stockprice-auto-scheduler">
         <title>Configuring for Getting Online Quotes Periodically</title>
 
-        <para>After you have verified the proper fetching of Online Quotes for your commodities, 
-         you can tell your operating system to fetch the quotes periodically. See the section
-        <ulink url="&url-docs-C;help/finance-quote-scheduler.html">Configuring for Getting Quotes Periodically</ulink>
-        in the manual.
+        <para>After you have verified the proper fetching of Online Quotes for your commodities, you can tell your
+          operating system to fetch the quotes periodically. See the section
+          <ulink url="&url-docs-C;help/finance-quote-scheduler.html">Configuring for Getting Quotes
+          Periodically</ulink> in the manual.
         </para>
       </sect3>
     </sect2>
@@ -1389,12 +1486,14 @@ Income
 
       <figure>
         <title>Displaying Stock Values in the Chart of Accounts</title>
+
         <screenshot id="invest-stockvalue">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockvalue.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>Viewing the value of a stock commodity in the main window using the Total in Report Currency option.
               </para>
@@ -1412,28 +1511,34 @@ Income
         <guibutton>Options</guibutton> icon in the <emphasis>Menubar</emphasis> or selecting
         <menuchoice>
           <guimenu>Edit</guimenu><guimenuitem>Report Options</guimenuitem>
-        </menuchoice>.
-        <guilabel>Price Source</guilabel> determines how accounts denominated in commodities
+        </menuchoice>
+        . <guilabel>Price Source</guilabel> determines how accounts denominated in commodities
         different from the report currency are converted to the report currency. Depending on the
         report the selector may appear in either the <guilabel>General</guilabel>, the
         <guilabel>Commodities</guilabel>, or the <guilabel>Display</guilabel> tab of the
         <guilabel>Report Options</guilabel> dialog box.
       </para>
+
       <note>
         <simpara>In the example the report can be customized using the
-          <menuchoice><guimenu>Reports</guimenu><guisubmenu>Assets & Liabilities</guisubmenu><guimenuitem>Average Balance</guimenuitem></menuchoice> menu.
+          <menuchoice>
+            <guimenu>Reports</guimenu><guisubmenu>Assets &
+            Liabilities</guisubmenu><guimenuitem>Average Balance</guimenuitem>
+          </menuchoice>
+          menu.
         </simpara>
       </note>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>Determining The Source Of The Stock Price/Currency Exchange Rate in Reports</title>
+
         <screenshot id="invest-stockvalue-report-options">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockvalue_report_options.png"
                          srccredit="John Ralls"/>
             </imageobject>
+
             <caption>
               <para>Determining the value of a stock commodity or a currency other than the report currency in a report
                 by setting the Price Source option.
@@ -1446,13 +1551,15 @@ Income
       <variablelist>
         <varlistentry>
           <term><guilabel>Weighted Average</guilabel></term>
-          <listitem><para>Calculates the price by summing the absolute value of the
-            amount and the absolute value of every split in every account denominated in the
-            commodity, excluding those splits with a zero amount, and dividing the sum of values
-            by the sum of amounts to obtain a price. For example, if you had a buy transaction for
-            200 shares of XYZ for a total of 2000 and a sell of 100 for 1300 the weighted average
-            would be 3300/300 or 11/share.
+
+          <listitem>
+            <para>Calculates the price by summing the absolute value of the amount and the absolute value of every
+              split in every account denominated in the commodity, excluding those splits with a
+              zero amount, and dividing the sum of values by the sum of amounts to obtain a price.
+              For example, if you had a buy transaction for 200 shares of XYZ for a total of 2000
+              and a sell of 100 for 1300 the weighted average would be 3300/300 or 11/share.
             </para>
+
             <note>
               <para>Gain/Loss splits have an amount of 0 and are <emphasis>not</emphasis> included in this calculation.
               </para>
@@ -1462,19 +1569,29 @@ Income
 
         <varlistentry>
           <term><guilabel>Average Cost</guilabel></term>
-          <listitem><para>Calculates the price by summing the amounts and values of every
-            split in every account denominated in the commodity, including the zero amount splits.
-            In the example above, with an additional split (either part of the sale transaction or
-            in a separate transaction) booking the gain at 0 shares and a 300 gain, the average
-            cost is 1000/100 (2000 original cost − 1300 proceeds from the sale + 300 gain)/(200 −
-            100) shares or 10/share.
+
+          <listitem>
+            <para>Calculates the price by summing the amounts and values of every split in every account denominated
+              in the commodity, including the zero amount splits. In the example above, with an
+              additional split (either part of the sale transaction or in a separate transaction)
+              booking the gain at 0 shares and a 300 gain, the average cost is 1000/100 (2000
+              original cost − 1300 proceeds from the sale + 300 gain)/(200 − 100) shares
+              or 10/share.
             </para>
+
             <note>
               <itemizedlist>
-                <listitem><simpara>Gain/Loss splits <emphasis>are</emphasis> included in this calculation.</simpara></listitem>
-                <listitem><simpara>This is the <emphasis>only</emphasis> <guilabel>Price Source</guilabel> that will balance the
-              <guilabel>Trial Balance Report</guilabel> and in order for it to balance you
-              <emphasis>must</emphasis> correctly book your gains and losses.</simpara></listitem>
+                <listitem>
+                  <simpara>Gain/Loss splits <emphasis>are</emphasis> included in this calculation.
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>This is the <emphasis>only</emphasis> <guilabel>Price Source</guilabel> that will balance the
+                    <guilabel>Trial Balance Report</guilabel> and in order for it to balance you
+                    <emphasis>must</emphasis> correctly book your gains and losses.
+                  </simpara>
+                </listitem>
               </itemizedlist>
             </note>
           </listitem>
@@ -1482,16 +1599,22 @@ Income
 
         <varlistentry>
           <term><guilabel>Most Recent</guilabel></term>
-          <listitem><para>Uses the latest price from the price database.</para></listitem>
+
+          <listitem>
+            <para>Uses the latest price from the price database.
+            </para>
+          </listitem>
         </varlistentry>
 
         <varlistentry>
           <term><guilabel>Nearest in time</guilabel></term>
-          <listitem><para>Uses the price nearest in time to the report date—the
-            datum date for time series reports like <guilabel>Assets Over
-            Time</guilabel>—from the price database.
+
+          <listitem>
+            <para>Uses the price nearest in time to the report date—the datum date for time series reports like
+              <guilabel>Assets Over Time</guilabel>—from the price database.
               <note>
-                <simpara>The nearest date isn’t necessarily before the date in question.</simpara>
+                <simpara>The nearest date isn’t necessarily before the date in question.
+                </simpara>
               </note>
             </para>
           </listitem>
@@ -1500,12 +1623,14 @@ Income
 
       <figure>
         <title>An Asset Barchart Report Based On The <quote>Nearest In Time</quote> Price Source</title>
+
         <screenshot id="invest-stockvalue-report">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockvalue_report.png"
                          srccredit="Dave Herman"/>
             </imageobject>
+
             <caption>
               <para>Tracking what value your stocks would’ve had on the stock exchanges.
               </para>
@@ -1528,12 +1653,11 @@ Income
 
     <para>For information on handling <emphasis>commissions</emphasis> and the use of <emphasis>Net
       Pricing</emphasis> or <emphasis>Gross Pricing</emphasis>, please see
-      <xref linkend="invest-buy-com" />.
-      If you will be recording a capital gain or loss on the sale, please see
-      <xref linkend="chapter_capgain" /> and <xref linkend="chapter_dep" /> for more information on
-      this topic.
-      To use the &app; <emphasis>Automatic Calculation of Capital Gain or Loss Using Lots</emphasis>
-      feature, please see <xref linkend="invest-sellLots" /> otherwise continue to the next section.
+      <xref linkend="invest-buy-com" />. If you will be recording a capital gain or loss on the
+      sale, please see <xref linkend="chapter_capgain" /> and <xref linkend="chapter_dep" /> for
+      more information on this topic. To use the &app; <emphasis>Automatic Calculation of Capital
+      Gain or Loss Using Lots</emphasis> feature, please see <xref linkend="invest-sellLots" />
+      otherwise continue to the next section.
     </para>
 
     <sect2 id="invest-sell-man">
@@ -1549,94 +1673,116 @@ Income
       </note>
 
       <para>In the schemes of transaction splits presented below, the following symbols are used:
-
-      <variablelist>
-        <varlistentry>
+        <variablelist>
+          <varlistentry>
             <term>NUM_SHARES</term>
-        <listitem>
-            <simpara>the number of shares you are selling</simpara>
-        </listitem>
-        </varlistentry>
 
-        <varlistentry>
+            <listitem>
+              <simpara>the number of shares you are selling
+              </simpara>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
             <term>COMMISSION</term>
+
             <listitem>
-                <simpara>brokerage commissions or fees</simpara>
+              <simpara>brokerage commissions or fees
+              </simpara>
             </listitem>
-        </varlistentry>
+          </varlistentry>
 
-        <varlistentry>
+          <varlistentry>
             <term>GROSS_SELL_PRICE</term>
+
             <listitem>
-                <simpara>unit price for which you sold the shares, not reduced by COMMISSION</simpara>
+              <simpara>unit price for which you sold the shares, not reduced by COMMISSION
+              </simpara>
             </listitem>
-        </varlistentry>
+          </varlistentry>
 
-        <varlistentry>
+          <varlistentry>
             <term>NET_SELL_PRICE</term>
+
             <listitem>
-                <simpara>unit price for which you sold the shares, reduced by COMMISSION</simpara>
+              <simpara>unit price for which you sold the shares, reduced by COMMISSION
+              </simpara>
             </listitem>
-        </varlistentry>
+          </varlistentry>
 
-        <varlistentry>
+          <varlistentry>
             <term>GROSS_BUY_PRICE</term>
+
             <listitem>
-                <simpara>unit price for which you bought the shares, not increased by COMMISSION</simpara>
+              <simpara>unit price for which you bought the shares, not increased by COMMISSION
+              </simpara>
             </listitem>
-        </varlistentry>
+          </varlistentry>
 
-        <varlistentry>
+          <varlistentry>
             <term>NET_BUY_PRICE</term>
+
             <listitem>
-                <simpara>unit price for which you bought the shares, increased by COMMISSION</simpara>
+              <simpara>unit price for which you bought the shares, increased by COMMISSION
+              </simpara>
             </listitem>
-        </varlistentry>
+          </varlistentry>
 
-        <varlistentry>
+          <varlistentry>
             <term>GROSS_BUY</term>
+
             <listitem>
-                <simpara>total price for which you bought shares, excluding COMMISSION, equal to NUM_SHARES * GROSS_BUY_PRICE</simpara>
+              <simpara>total price for which you bought shares, excluding COMMISSION, equal to NUM_SHARES * GROSS_BUY_PRICE
+              </simpara>
             </listitem>
-        </varlistentry>
+          </varlistentry>
 
-        <varlistentry>
+          <varlistentry>
             <term>NET_BUY</term>
+
             <listitem>
-                <simpara>amount of money for which you bought shares including COMMISSION, equal to GROSS_BUY + COMMISSION</simpara>
+              <simpara>amount of money for which you bought shares including COMMISSION, equal to GROSS_BUY + COMMISSION
+              </simpara>
             </listitem>
-        </varlistentry>
+          </varlistentry>
 
-        <varlistentry>
+          <varlistentry>
             <term>GROSS_SALE</term>
+
             <listitem>
-                <simpara>total price for which you sold shares, equal to NUM_SHARES * GROSS_SELL_PRICE</simpara>
+              <simpara>total price for which you sold shares, equal to NUM_SHARES * GROSS_SELL_PRICE
+              </simpara>
             </listitem>
-        </varlistentry>
+          </varlistentry>
 
-        <varlistentry>
+          <varlistentry>
             <term>NET_SALE</term>
+
             <listitem>
-                <simpara>amount of money received from the sale, equal to GROSS_SALE − COMMISSION</simpara>
-        </listitem>
-        </varlistentry>
+              <simpara>amount of money received from the sale, equal to GROSS_SALE − COMMISSION
+              </simpara>
+            </listitem>
+          </varlistentry>
 
-        <varlistentry>
+          <varlistentry>
             <term>GROSS_PROFIT</term>
+
             <listitem>
-                <simpara>amount of money you made on the sale, not reduced by COMMISSION</simpara>
+              <simpara>amount of money you made on the sale, not reduced by COMMISSION
+              </simpara>
             </listitem>
-        </varlistentry>
+          </varlistentry>
 
-        <varlistentry>
+          <varlistentry>
             <term>NET_PROFIT</term>
+
             <listitem>
-                <simpara>amount of money you made on the sale, reduced by COMMISSION</simpara>
+              <simpara>amount of money you made on the sale, reduced by COMMISSION
+              </simpara>
             </listitem>
-        </varlistentry>
-      </variablelist>
-    </para>
-
+          </varlistentry>
+        </variablelist>
+      </para>
 
       <para>There are 2 ways of manually recording the capital gain or loss. The capital gain/loss can be
         combined with the sale in one transaction or it can be entered in a separate transaction.
@@ -1673,9 +1819,13 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -1797,29 +1947,55 @@ Income
           </table>
 
           <example>
-            <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined,
-              Gross Pricing</title>
+            <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined, Gross
+              Pricing</title>
 
-            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
-            <para>You bought 100 shares of AMZN for $20 per share, then later sell them all for $36
-              per share with a commission of $75. The split transaction scheme is as follows:
+            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.
+            </simpara>
+
+            <para>You bought 100 shares of AMZN for $20 per share, then later sell them all for $36 per share with a
+              commission of $75. The split transaction scheme is as follows:
               <itemizedlist>
-                <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
-                <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
-                <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
-                <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
-                <listitem><simpara>and finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
+                <listitem>
+                  <simpara>GROSS_BUY_PRICE is $20 (the original buying price),
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>NUM_SHARES is 100,
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>GROSS_BUY is $2,000 (the original buying cost),
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>GROSS_SALE is $3,600,
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>and finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).
+                  </simpara>
+                </listitem>
               </itemizedlist>
             </para>
+
             <para><!-- Hack to get a figure inside of an example -->
               <table>
                 <title>Selling Shares Split Scheme, Sale & Gain Combined, Gross Pricing</title>
-                <?dbfo table-width="70%" ?>
+<?dbfo table-width="70%" ?>
                 <tgroup cols="5">
                   <colspec colnum="1" colwidth="4*"/>
+
                   <colspec colnum="1" colwidth="2*"/>
+
                   <colspec colnum="1" colwidth="2*"/>
+
                   <colspec colnum="1" colwidth="1*"/>
+
                   <colspec colnum="1" colwidth="1*"/>
 
                   <tbody>
@@ -1935,14 +2111,17 @@ Income
                   </tbody>
                 </tgroup>
               </table>
+
               <figure pgwide="1">
                 <title>Selling Shares, Gain Combined, Gross Pricing</title>
+
                 <screenshot id="invest-sellstockManProfComb">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/invest_sellstock.png"
                                  srccredit="Chris Good" width="&img-w;"/>
                     </imageobject>
+
                     <imageobject role="fo">
                       <imagedata fileref="figures/invest_sellstock.png"
                                  srccredit="Chris Good"/>
@@ -1950,24 +2129,29 @@ Income
                   </mediaobject>
                 </screenshot>
               </figure>
+
               <note>
                 <para>In the above screenshot, it appears there are 2 transactions for Mar. 21, 2006. This is because the
-                  register is in <guilabel> Auto-Split Ledger</guilabel> view and there are 2 splits for
-                  the register account in the 1 transaction. <guilabel>Transaction Journal</guilabel>
-                  view may be clearer. Refer to <xref linkend="txns-registers-txntypes" />. As there are 2
-                  splits for the register account in the sale transaction, this transaction must be
-                  entered in <guilabel>Auto-Split Ledger</guilabel> or <guilabel>Transaction
-                  Journal</guilabel> view. It cannot be entered in <guilabel>Basic Ledger</guilabel> view.
+                  register is in <guilabel> Auto-Split Ledger</guilabel> view and there are 2 splits
+                  for the register account in the 1 transaction. <guilabel>Transaction
+                  Journal</guilabel> view may be clearer. Refer to
+                  <xref linkend="txns-registers-txntypes" />. As there are 2 splits for the register
+                  account in the sale transaction, this transaction must be entered in
+                  <guilabel>Auto-Split Ledger</guilabel> or <guilabel>Transaction Journal</guilabel>
+                  view. It cannot be entered in <guilabel>Basic Ledger</guilabel> view.
                 </para>
               </note>
+
               <figure pgwide="1">
                 <title>The Account Tree after the Example of Selling Shares for a Gain</title>
+
                 <screenshot id="invest-sellstockManProfComb2">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/invest_sellstock2.png"
                                  srccredit="Chris Good" width="&img-w;"/>
                     </imageobject>
+
                     <imageobject role="fo">
                       <imagedata fileref="figures/invest_sellstock2.png"
                                  srccredit="Chris Good"/>
@@ -1987,9 +2171,13 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -2096,29 +2284,59 @@ Income
 
           <example>
             <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined, Net Pricing</title>
-            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
-            <para>You bought 100 shares of AMZN for $20 per share (including commissions), then later
-              sell them all for $36 per share with a commission of $75. The split transaction scheme
-              is as follows:
+
+            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.
+            </simpara>
+
+            <para>You bought 100 shares of AMZN for $20 per share (including commissions), then later sell them all
+              for $36 per share with a commission of $75. The split transaction scheme is as
+              follows:
               <itemizedlist>
-                <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
-                <listitem><simpara>NET_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
-                <listitem><simpara>NET_BUY is $2,000 (the original buying cost),</simpara></listitem>
-                <listitem><simpara>NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)),</simpara></listitem>
-                <listitem><simpara>GROSS_SALE is $3,600, NET_SALE is $3,525,</simpara></listitem>
-                <listitem><simpara>and finally NET_PROFIT is $1,525 (NET_SALE − NET_BUY).</simpara></listitem>
+                <listitem>
+                  <simpara>NUM_SHARES is 100,
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>NET_BUY_PRICE is $20 (the original buying price),
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>NET_BUY is $2,000 (the original buying cost),
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)),
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>GROSS_SALE is $3,600, NET_SALE is $3,525,
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>and finally NET_PROFIT is $1,525 (NET_SALE − NET_BUY).
+                  </simpara>
+                </listitem>
               </itemizedlist>
             </para>
 
             <para><!-- Hack to get a figures and tables inside of an example -->
               <table>
                 <title>Selling Shares Split Scheme, Sale & Gain Combined, Net Pricing</title>
-                <?dbfo table-width="70%" ?>
+<?dbfo table-width="70%" ?>
                 <tgroup cols="5">
                   <colspec colnum="1" colwidth="4*"/>
+
                   <colspec colnum="1" colwidth="2*"/>
+
                   <colspec colnum="1" colwidth="2*"/>
+
                   <colspec colnum="1" colwidth="1*"/>
+
                   <colspec colnum="1" colwidth="1*"/>
 
                   <tbody>
@@ -2221,12 +2439,14 @@ Income
 
               <figure pgwide="1">
                 <title>Selling Shares for Gain using Net Pricing in Transaction Journal View</title>
+
                 <screenshot id="invest-sellstockManProfCombNet">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
                                  srccredit="Chris Good" width="&img-w;"/>
                     </imageobject>
+
                     <imageobject role="fo">
                       <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
                                  srccredit="Chris Good"/>
@@ -2236,15 +2456,14 @@ Income
               </figure>
             </para>
           </example>
-
         </sect4>
       </sect3>
 
       <sect3 id="invest-sell-man-sep">
         <title>Separate the Capital Gain/Loss Transaction from the Sale Transaction</title>
 
-        <para>This is <emphasis>required</emphasis> if using <emphasis>scrubbing</emphasis> to
-          calculate and create capital gain/loss transactions automatically. Otherwise scrubbing will not detect
+        <para>This is <emphasis>required</emphasis> if using <emphasis>scrubbing</emphasis> to calculate and
+          create capital gain/loss transactions automatically. Otherwise scrubbing will not detect
           them and will create an incorrectly valued capital gain/loss transaction.
         </para>
 
@@ -2256,9 +2475,13 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -2345,9 +2568,13 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -2415,30 +2642,56 @@ Income
               </tbody>
             </tgroup>
           </table>
+
           <example>
-            <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated, Gross Pricing</title>
-            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
+            <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated, Gross
+              Pricing</title>
+
+            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.
+            </simpara>
 
             <para>You bought 100 shares of AMZN for $20 per share and commissions $20, then later sell them all for
               $36 per share with a commission of $75. The split transaction scheme is as follows:
               <itemizedlist>
-                <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
-                <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
-                <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
-                <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
-                <listitem><simpara>finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
+                <listitem>
+                  <simpara>GROSS_BUY_PRICE is $20 (the original buying price),
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>NUM_SHARES is 100,
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>GROSS_BUY is $2,000 (the original buying cost),
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>GROSS_SALE is $3,600,
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).
+                  </simpara>
+                </listitem>
               </itemizedlist>
             </para>
 
-            <para>
-              <table>
+            <para><table>
                 <title>Selling Shares Split Scheme, Sale Transaction, Gross Pricing</title>
-                <?dbfo table-width="70%" ?>
+<?dbfo table-width="70%" ?>
                 <tgroup cols="5">
                   <colspec colnum="1" colwidth="4*"/>
+
                   <colspec colnum="1" colwidth="2*"/>
+
                   <colspec colnum="1" colwidth="2*"/>
+
                   <colspec colnum="1" colwidth="1*"/>
+
                   <colspec colnum="1" colwidth="1*"/>
 
                   <tbody>
@@ -2518,14 +2771,19 @@ Income
                   </tbody>
                 </tgroup>
               </table>
+
               <table>
                 <title>Selling Shares Split Scheme, Gain Transaction, Gross Pricing</title>
-      <?dbfo table-width="70%" ?>
+<?dbfo table-width="70%" ?>
                 <tgroup cols="5">
                   <colspec colnum="1" colwidth="4*"/>
+
                   <colspec colnum="1" colwidth="2*"/>
+
                   <colspec colnum="1" colwidth="2*"/>
+
                   <colspec colnum="1" colwidth="1*"/>
+
                   <colspec colnum="1" colwidth="1*"/>
 
                   <tbody>
@@ -2589,16 +2847,19 @@ Income
                   </tbody>
                 </tgroup>
               </table>
+
               <figure pgwide="1">
-                <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions,
-                        in <guilabel>Transaction Journal</guilabel> View</title>
+                <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions, in
+                  <guilabel>Transaction Journal</guilabel> View</title>
+
                 <screenshot id="invest-sellstockManProfSep">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/invest_sellstockManProfSep.png"
                                  srccredit="Chris Good" width="&img-w;"/>
                     </imageobject>
-                     <imageobject role="fo">
+
+                    <imageobject role="fo">
                       <imagedata fileref="figures/invest_sellstockManProfSep.png"
                                  srccredit="Chris Good"/>
                     </imageobject>
@@ -2617,9 +2878,13 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -2690,9 +2955,13 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
+
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -2761,188 +3030,221 @@ Income
             </tgroup>
           </table>
 
-      <example id="invest-sell-man-prof-sep-net">
-        <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated, Net Pricing</title>
-        <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
+          <example id="invest-sell-man-prof-sep-net">
+            <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated, Net Pricing</title>
 
-        <para>You bought 100 shares of AMZN for $20 per share (including commissions), then later sell them all
-          for $36 per share with a commission of $75. In the split transaction scheme is as follows:
-          <itemizedlist>
-            <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
-            <listitem><simpara>NET_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
-            <listitem><simpara>NET_BUY is $2,000 (the original buying cost),</simpara></listitem>
-            <listitem><simpara>NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)),</simpara></listitem>
-            <listitem><simpara>GROSS_SALE is $3,600, NET_SALE is $3,525,</simpara></listitem>
-            <listitem><simpara>and finally NET_PROFIT is $1,525 (NET_SALE − NET_BUY).</simpara></listitem>
-          </itemizedlist>
-        </para>
+            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.
+            </simpara>
+
+            <para>You bought 100 shares of AMZN for $20 per share (including commissions), then later sell them all
+              for $36 per share with a commission of $75. In the split transaction scheme is as
+              follows:
+              <itemizedlist>
+                <listitem>
+                  <simpara>NUM_SHARES is 100,
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>NET_BUY_PRICE is $20 (the original buying price),
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>NET_BUY is $2,000 (the original buying cost),
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)),
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>GROSS_SALE is $3,600, NET_SALE is $3,525,
+                  </simpara>
+                </listitem>
+
+                <listitem>
+                  <simpara>and finally NET_PROFIT is $1,525 (NET_SALE − NET_BUY).
+                  </simpara>
+                </listitem>
+              </itemizedlist>
+            </para>
 
-        <para>
-        <table>
-          <title>Selling Shares Split Scheme, Sale Transaction, Net Pricing</title>
+            <para><table>
+                <title>Selling Shares Split Scheme, Sale Transaction, Net Pricing</title>
 <?dbfo table-width="70%" ?>
-          <tgroup cols="5">
-            <colspec colnum="1" colwidth="4*"/>
-            <colspec colnum="1" colwidth="2*"/>
-            <colspec colnum="1" colwidth="2*"/>
-            <colspec colnum="1" colwidth="1*"/>
-            <colspec colnum="1" colwidth="1*"/>
-
-            <tbody>
-              <row>
-                <entry>
-                  <emphasis>Account</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Shares</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Price</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Buy</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Sell</emphasis>
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Bank ABC
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  3525.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
-
-                <entry>
-                  −100
-                </entry>
-
-                <entry>
-                  35.25
-                </entry>
-
-                <entry></entry>
-
-                <entry>
-                  3525.00
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-        </para>
+                <tgroup cols="5">
+                  <colspec colnum="1" colwidth="4*"/>
+
+                  <colspec colnum="1" colwidth="2*"/>
+
+                  <colspec colnum="1" colwidth="2*"/>
+
+                  <colspec colnum="1" colwidth="1*"/>
+
+                  <colspec colnum="1" colwidth="1*"/>
+
+                  <tbody>
+                    <row>
+                      <entry>
+                        <emphasis>Account</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Shares</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Price</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Buy</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Sell</emphasis>
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Bank ABC
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3525.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        −100
+                      </entry>
+
+                      <entry>
+                        35.25
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3525.00
+                      </entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </table>
+            </para>
 
-        <para>
-        <table>
-          <title>Selling Shares Split Scheme, Gain Transaction, Net Pricing</title>
+            <para><table>
+                <title>Selling Shares Split Scheme, Gain Transaction, Net Pricing</title>
 <?dbfo table-width="70%" ?>
-          <tgroup cols="5">
-            <colspec colnum="1" colwidth="4*"/>
-            <colspec colnum="1" colwidth="2*"/>
-            <colspec colnum="1" colwidth="2*"/>
-            <colspec colnum="1" colwidth="1*"/>
-            <colspec colnum="1" colwidth="1*"/>
-
-            <tbody>
-              <row>
-                <entry>
-                  <emphasis>Account</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Shares</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Price</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Buy</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Sell</emphasis>
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
-
-                <entry>
-                  0
-                </entry>
-
-                <entry>
-                  0
-                </entry>
-
-                <entry>
-                  1525.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Income:Capital Gain (Long Term):AMZN
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  1525.00
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-        <figure pgwide="1">
-          <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions,
-                    in <guilabel>Transaction Journal</guilabel> View</title>
-            <screenshot id="invest-sellstockManProfSepNet">
-              <mediaobject>
-                <imageobject role="html">
-                  <imagedata fileref="figures/invest_sellstockManProfSepNet.png"
-                             srccredit="Chris Good" width="&img-w;"/>
-                </imageobject>
-                <imageobject role="fo">
-                  <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                             srccredit="Chris Good"/>
-                </imageobject>
-              </mediaobject>
-            </screenshot>
-        </figure>
-        </para>
-      </example>
+                <tgroup cols="5">
+                  <colspec colnum="1" colwidth="4*"/>
+
+                  <colspec colnum="1" colwidth="2*"/>
+
+                  <colspec colnum="1" colwidth="2*"/>
+
+                  <colspec colnum="1" colwidth="1*"/>
+
+                  <colspec colnum="1" colwidth="1*"/>
+
+                  <tbody>
+                    <row>
+                      <entry>
+                        <emphasis>Account</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Shares</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Price</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Buy</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Sell</emphasis>
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
 
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        1525.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Income:Capital Gain (Long Term):AMZN
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        1525.00
+                      </entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </table>
+
+              <figure pgwide="1">
+                <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions, in
+                  <guilabel>Transaction Journal</guilabel> View</title>
+
+                <screenshot id="invest-sellstockManProfSepNet">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest_sellstockManProfSepNet.png"
+                             srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
 
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/invest_sellstockManProfSep.png"
+                             srccredit="Chris Good"/>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </para>
+          </example>
         </sect4>
       </sect3>
     </sect2>
@@ -2955,7 +3257,8 @@ Income
 
         <para><ulink url="&url-wp-en;Lot">Wikipedia</ulink> includes the following definition of a lot:
           <blockquote>
-            <simpara>a set of goods for sale together in an auction; or a quantity of a financial instrument</simpara>
+            <simpara>a set of goods for sale together in an auction; or a quantity of a financial instrument
+            </simpara>
           </blockquote>
         </para>
 
@@ -2971,11 +3274,14 @@ Income
         <para>The term <emphasis>scrub</emphasis> is used because security accounts need to be cleaned after sales
           to ensure the difference between the cost paid for securities, and value received from
           selling them, is accounted for as capital gain or loss. If the capital gain/loss is not
-          correct, the <guimenuitem>Trial Balance</guimenuitem> bottom line total debits will not balance to total credits.
-          To see the <guimenuitem>Trial Balance</guimenuitem>, select <menuchoice>
+          correct, the <guimenuitem>Trial Balance</guimenuitem> bottom line total debits will not
+          balance to total credits. To see the <guimenuitem>Trial Balance</guimenuitem>, select
+          <menuchoice>
             <guimenu>Reports</guimenu> <guisubmenu>Income & Expense</guisubmenu>
             <guimenuitem>Trial Balance</guimenuitem>
-          </menuchoice>.        </para>
+          </menuchoice>
+          .
+        </para>
 
         <note>
           <para>If you make an error, you can delete the lot(s) and capital gain/loss transaction(s) and retry.
@@ -2986,12 +3292,12 @@ Income
           </para>
         </note>
 
-        <para>If you are not familiar with <acronym>FIFO</acronym>, <acronym>LIFO</acronym> or Average costing, please see Wikipedia
+        <para>If you are not familiar with <acronym>FIFO</acronym>, <acronym>LIFO</acronym> or Average costing,
+          please see Wikipedia <ulink
+            url="&url-wp-en;FIFO_and_LIFO_accounting">FIFO and
+          LIFO accounting</ulink> and
           <ulink
-            url="&url-wp-en;FIFO_and_LIFO_accounting">FIFO and LIFO
-          accounting</ulink> and <ulink
-            url="&url-wp-en;Average_cost_method">Average
-          cost method</ulink>.
+            url="&url-wp-en;Average_cost_method">Average cost method</ulink>.
         </para>
 
         <para>If you are not familiar with the difference between &app; transactions and splits, please see
@@ -3000,11 +3306,12 @@ Income
 
         <para>The &app; lot management facility can be a useful feature, reducing manual calculation, especially
           if dividends have been reinvested over years and there are many different costs involved.
-          It can automatically link buy transactions to sell transactions using <acronym>FIFO</acronym> cost method and
-          one can manually link specific buy transactions to sell transactions in order to use <acronym>LIFO</acronym>.
-          Advanced Portfolio Report basis costs and gains/losses will agree with the costs and
-          gain/loss transactions created by scrubbing if either the <acronym>FIFO</acronym> or <acronym>LIFO</acronym> cost methods are
-          used.
+          It can automatically link buy transactions to sell transactions using
+          <acronym>FIFO</acronym> cost method and one can manually link specific buy transactions to
+          sell transactions in order to use <acronym>LIFO</acronym>. Advanced Portfolio Report basis
+          costs and gains/losses will agree with the costs and gain/loss transactions created by
+          scrubbing if either the <acronym>FIFO</acronym> or <acronym>LIFO</acronym> cost methods
+          are used.
         </para>
       </sect3>
 
@@ -3021,20 +3328,25 @@ Income
           select
           <menuchoice>
             <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
-          </menuchoice>.
+          </menuchoice>
+          .
         </para>
 
         <figure pgwide="1">
-          <title>Selling Shares - Capital Gains - Lots in Account window</title><screenshot id="tool-lotsInAcct">
+          <title>Selling Shares - Capital Gains - Lots in Account window</title>
+
+          <screenshot id="tool-lotsInAcct">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
                 srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
                            srccredit="Chris Good"/>
               </imageobject>
+
               <caption>
                 <para>An image of the <emphasis>Lots in Account</emphasis> window.
                 </para>
@@ -3044,8 +3356,8 @@ Income
         </figure>
 
         <para>Refer to the Help Manual, Chapter 8 Tools & Assistants,
-          <ulink url="&url-docs-C;help/tool-lots.html">Lots in Account</ulink>
-          for details of the Lots in Account screen elements.
+          <ulink url="&url-docs-C;help/tool-lots.html">Lots in Account</ulink> for details of the
+          Lots in Account screen elements.
         </para>
       </sect3>
 
@@ -3054,34 +3366,37 @@ Income
 
         <para>Using the lot management facility for the automatic calculation of capital gain or loss typically
           follows these steps:
-
-        <orderedlist>
-          <listitem>
-            <simpara>Record the sale transaction using Net Pricing (but stop short of entering the Capital Gain
-              transaction as it will be created by scrubbing). See
-              <xref linkend="invest-sell-man-prof-sep-net" />.
-            </simpara>
-          </listitem>
+          <orderedlist>
+            <listitem>
+              <simpara>Record the sale transaction using Net Pricing (but stop short of entering the Capital Gain
+                transaction as it will be created by scrubbing). See
+                <xref linkend="invest-sell-man-prof-sep-net" />.
+              </simpara>
+            </listitem>
 <!-- Manual Lot Creation and Linking -->
-          <listitem>
-            <simpara><xref linkend="invest-sellManual" /> (Optional depending on cost method)</simpara>
-          </listitem>
-
-          <listitem>
+            <listitem>
+              <simpara><xref linkend="invest-sellManual" /> (Optional depending on cost method)
+              </simpara>
+            </listitem>
+
+            <listitem>
 <!-- Automatic Creation of Capital Gain Or Loss Transactions -->
-            <simpara><xref linkend="invest-sellAuto" /></simpara>
-          </listitem>
+              <simpara><xref linkend="invest-sellAuto" />
+              </simpara>
+            </listitem>
 
-          <listitem>
+            <listitem>
 <!-- Change Orphaned Gains-CCC to Gain/Loss Account -->
-            <simpara><xref linkend="invest-sellChgCapGainsAcct" /></simpara>
-          </listitem>
+              <simpara><xref linkend="invest-sellChgCapGainsAcct" />
+              </simpara>
+            </listitem>
 
-          <listitem>
+            <listitem>
 <!-- Run a Trial Balance  -->
-            <simpara><xref linkend="invest-sellTrialBal" /> report to ensure total debits balance to total credits.</simpara>
-          </listitem>
-        </orderedlist>
+              <simpara><xref linkend="invest-sellTrialBal" /> report to ensure total debits balance to total credits.
+              </simpara>
+            </listitem>
+          </orderedlist>
         </para>
       </sect3>
 
@@ -3091,16 +3406,16 @@ Income
         <para>Before using this feature, ensure you have read <xref linkend="invest-sellConsiderations" />.
         </para>
 
-        <para>This functionality allows the manual linking of specific buy and sell transactions. It may be used in
-          the case where a user wishes to use a different cost method than the automatic linking
-          method (<acronym>FIFO</acronym>). Effectively, if one wishes the cost basis and capital gains in the Advanced
-          Portfolio Report to be consistent with the capital gains transactions created by
-          scrubbing, manual lot creation only needs to be used when using <acronym>LIFO</acronym> or <quote>sale of
-          designated lots</quote> (the same thing for securities as far as US personal tax law is
-          concerned). This is because the scrub function can automatically do <acronym>FIFO</acronym> linking so there
-          is no need to do it manually and scrubbing cannot be used for average costing.
-
-          See <xref linkend="invest-sellManualExample" />.
+        <para>This functionality allows the manual linking of specific buy and sell transactions. It may be used
+          in the case where a user wishes to use a different cost method than the automatic linking
+          method (<acronym>FIFO</acronym>). Effectively, if one wishes the cost basis and capital
+          gains in the Advanced Portfolio Report to be consistent with the capital gains
+          transactions created by scrubbing, manual lot creation only needs to be used when using
+          <acronym>LIFO</acronym> or <quote>sale of designated lots</quote> (the same thing for
+          securities as far as US personal tax law is concerned). This is because the scrub function
+          can automatically do <acronym>FIFO</acronym> linking so there is no need to do it manually
+          and scrubbing cannot be used for average costing. See
+          <xref linkend="invest-sellManualExample" />.
         </para>
       </sect3>
 
@@ -3108,8 +3423,8 @@ Income
         <title>Automatic Creation of Capital Gain Or Loss Transactions</title>
 
         <note>
-          <para>Do <emphasis>not</emphasis> do this unless you are using <acronym>FIFO</acronym> or <acronym>LIFO</acronym> to cost sales. See
-            <xref linkend="invest-sellConsiderations" />.
+          <para>Do <emphasis>not</emphasis> do this unless you are using <acronym>FIFO</acronym> or
+            <acronym>LIFO</acronym> to cost sales. See <xref linkend="invest-sellConsiderations" />.
           </para>
         </note>
 
@@ -3122,12 +3437,22 @@ Income
 
         <para>See:
           <itemizedlist>
-            <listitem><simpara><xref linkend="invest-sellAutoExample" />,</simpara></listitem>
-            <listitem><simpara><xref linkend="invest-sellAutoExample2" />,</simpara></listitem>
-            <listitem><simpara><xref linkend="invest-sellFifoSplit" />.</simpara></listitem>
+            <listitem>
+              <simpara><xref linkend="invest-sellAutoExample" />,
+              </simpara>
+            </listitem>
+
+            <listitem>
+              <simpara><xref linkend="invest-sellAutoExample2" />,
+              </simpara>
+            </listitem>
+
+            <listitem>
+              <simpara><xref linkend="invest-sellFifoSplit" />.
+              </simpara>
+            </listitem>
           </itemizedlist>
         </para>
-
       </sect3>
 
       <sect3 id="invest-sellChgCapGainsAcct">
@@ -3165,20 +3490,21 @@ Income
             <orderedlist>
               <listitem>
                 <para>If necessary, temporarily change the date of the sell transaction and the capital gain/loss
-                  transaction, so they are the only transactions for a particular date, then run the Trial
-                  Balance as at the day before. If the Trial Balance is still out by the same amount, it
-                  is not the capital gain/loss that is causing the problem.
+                  transaction, so they are the only transactions for a particular date, then run the
+                  Trial Balance as at the day before. If the Trial Balance is still out by the same
+                  amount, it is not the capital gain/loss that is causing the problem.
                 </para>
               </listitem>
+
               <listitem>
                 <para>If you find a prior <emphasis>out of balance</emphasis> Trial Balance, keep running the Trial
                   Balance report with different dates until you find the date it starts being out of
-                  balance. Temporarily change the transaction dates for each transaction on the problem
-                  date to the following day, then change the dates back to the correct date 1 at a time,
-                  running the Trial Balance each time, until you identify the problem transaction. When
-                  you change the date of a security sell transaction, you also need to change the date of
-                  the corresponding capital gain transaction as it is only the sum of these that will
-                  balance in the Trial Balance.
+                  balance. Temporarily change the transaction dates for each transaction on the
+                  problem date to the following day, then change the dates back to the correct date
+                  1 at a time, running the Trial Balance each time, until you identify the problem
+                  transaction. When you change the date of a security sell transaction, you also
+                  need to change the date of the corresponding capital gain transaction as it is
+                  only the sum of these that will balance in the Trial Balance.
                 </para>
               </listitem>
             </orderedlist>
@@ -3194,20 +3520,21 @@ Income
 
         <orderedlist>
           <listitem>
-            <para>&app; implements only the First In/ First Out (<acronym>FIFO</acronym>) cost method when automatically linking buy
-              transactions to sell transactions. That means the oldest securities are always sold first.
-              The Last In First Out (<acronym>LIFO</acronym>) cost method may be used by manually linking the most
-              recent buy security splits to the sell split before scrubbing.
+            <para>&app; implements only the First In/ First Out (<acronym>FIFO</acronym>) cost method when
+              automatically linking buy transactions to sell transactions. That means the oldest
+              securities are always sold first. The Last In First Out (<acronym>LIFO</acronym>) cost
+              method may be used by manually linking the most recent buy security splits to the sell
+              split before scrubbing.
             </para>
           </listitem>
 
           <listitem>
             <para>The Advanced Portfolio Report does not use lot information when calculating costs, just the security
               transaction splits. It calculates the cost basis and gains or losses using the
-              selected <emphasis>Basis calculation method</emphasis> report option (Average, <acronym>FIFO</acronym> or
-              <acronym>LIFO</acronym>). If one wishes the Advanced Portfolio Report costs and gains/losses to be
-              consistent with the capital gain/loss transactions created by scrubbing, the same cost
-              model must be used in both places.
+              selected <emphasis>Basis calculation method</emphasis> report option (Average,
+              <acronym>FIFO</acronym> or <acronym>LIFO</acronym>). If one wishes the Advanced
+              Portfolio Report costs and gains/losses to be consistent with the capital gain/loss
+              transactions created by scrubbing, the same cost model must be used in both places.
             </para>
           </listitem>
 
@@ -3368,484 +3695,578 @@ Income
       </sect3>
 
       <sect3>
-      <title>Examples</title>
-      <example id="invest-sellManualExample">
-        <title>Manual Lot Creation and Linking</title>
+        <title>Examples</title>
 
-        <para>Here is an example of selling part of a security holding using the <acronym>LIFO</acronym> method. In this example, the
-          most recent buy transaction (dated Jul. 1, 2016, a reinvested dividend), is linked to a lot,
-          along with the sell transaction, and the &app; scrub function is used to calculate capital
-          gain or loss and create the capital gain/loss transaction.
-        </para>
+        <example id="invest-sellManualExample">
+          <title>Manual Lot Creation and Linking</title>
 
-        <procedure>
-          <step>
-            <simpara>Open the security account's register.</simpara>
+          <para>Here is an example of selling part of a security holding using the <acronym>LIFO</acronym> method.
+            In this example, the most recent buy transaction (dated Jul. 1, 2016, a reinvested
+            dividend), is linked to a lot, along with the sell transaction, and the &app; scrub
+            function is used to calculate capital gain or loss and create the capital gain/loss
+            transaction.
+          </para>
 
-            <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Security register before scrubbing a single lot</title><screenshot id="invest-lots0reg">
-                <mediaobject>
-                  <imageobject role="html">
-                    <imagedata fileref="figures/investLots0_RegB4Scrub.png"
+          <procedure>
+            <step>
+              <simpara>Open the security account's register.
+              </simpara>
+
+              <figure pgwide="1">
+                <title>Selling Shares - Capital Gains - Security register before scrubbing a single lot</title>
+
+                <screenshot id="invest-lots0reg">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/investLots0_RegB4Scrub.png"
                                srccredit="Chris Good" width="&img-w;"/>
-                  </imageobject>
-                  <imageobject role="fo">
-                    <imagedata fileref="figures/investLots0_RegB4Scrub.png"
+                    </imageobject>
+
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/investLots0_RegB4Scrub.png"
                                srccredit="Chris Good"/>
-                  </imageobject>
-                  <caption>
-                    <simpara>An image of the Security Account register in transaction journal view, before lot scrubbing.</simpara>
-                  </caption>
-                </mediaobject>
-              </screenshot>
-            </figure>
-          </step>
-          <step>
-            <simpara>Ensure all previous capital gain/loss transactions are separate transactions to the sell
-              transactions which record the reduction in the number of shares and the value
-              received.</simpara>
-          </step>
-          <step><simpara>Select
-              <menuchoice>
-                <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
-              </menuchoice>
-              to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
-              security account.
-            </simpara>
+                    </imageobject>
 
-            <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot</title><screenshot id="invest-lots1B4CreateLot">
-                <mediaobject>
-                  <imageobject role="html">
-                    <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
+                    <caption>
+                      <simpara>An image of the Security Account register in transaction journal view, before lot scrubbing.
+                      </simpara>
+                    </caption>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </step>
+
+            <step>
+              <simpara>Ensure all previous capital gain/loss transactions are separate transactions to the sell
+                transactions which record the reduction in the number of shares and the value
+                received.
+              </simpara>
+            </step>
+
+            <step>
+              <simpara>Select
+                <menuchoice>
+                  <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
+                </menuchoice>
+                to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
+                security account.
+              </simpara>
+
+              <figure pgwide="1">
+                <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot</title>
+
+                <screenshot id="invest-lots1B4CreateLot">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
                                srccredit="Chris Good" width="&img-w;"/>
-                  </imageobject>
-                  <imageobject role="fo">
-                    <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
+                    </imageobject>
+
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
                                srccredit="Chris Good"/>
-                  </imageobject>
-                  <caption>
-                    <para>An image of the <emphasis>Lots in Account</emphasis> window before lot scrubbing.
-                    </para>
-                  </caption>
-                </mediaobject>
-              </screenshot>
-            </figure>
-          </step>
+                    </imageobject>
 
-          <step><simpara>Create a new lot using the <guibutton>New Lot</guibutton> button. Initially this lot is not linked to
-              any buy or sell split.</simpara>
-          </step>
+                    <caption>
+                      <para>An image of the <emphasis>Lots in Account</emphasis> window before lot scrubbing.
+                      </para>
+                    </caption>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </step>
 
-          <step>
-            <simpara>Highlight the new lot in the <guilabel>Lots in This Account</guilabel> panel.</simpara>
-          </step>
+            <step>
+              <simpara>Create a new lot using the <guibutton>New Lot</guibutton> button. Initially this lot is not linked
+                to any buy or sell split.
+              </simpara>
+            </step>
 
-          <step><simpara>Highlight the buy split (dated Jul. 1, 2016) of the security to be sold in the <guilabel>Splits
-              free</guilabel> panel.</simpara>
-          </step>
+            <step>
+              <simpara>Highlight the new lot in the <guilabel>Lots in This Account</guilabel> panel.
+              </simpara>
+            </step>
 
-          <step><simpara>Click the <guilabel>>></guilabel> button to link the buy split with the highlighted lot. The
-              split moves from the <guilabel>Splits free</guilabel> panel to the <guilabel>Splits
-              in Lot</guilabel> panel.
-            </simpara>
-          </step>
+            <step>
+              <simpara>Highlight the buy split (dated Jul. 1, 2016) of the security to be sold in the <guilabel>Splits
+                free</guilabel> panel.
+              </simpara>
+            </step>
 
-          <step><simpara>Repeat the previous 2 steps for any other buy splits that should be included in the lot (in this
-              example, there is only 1 buy split in the sale).
-            </simpara>
-          </step>
+            <step>
+              <simpara>Click the <guilabel>>></guilabel> button to link the buy split with the highlighted lot. The
+                split moves from the <guilabel>Splits free</guilabel> panel to the <guilabel>Splits
+                in Lot</guilabel> panel.
+              </simpara>
+            </step>
 
-          <step>
-            <simpara>Highlight the sell split in the <guilabel>Splits free</guilabel> panel.</simpara>
-          </step>
+            <step>
+              <simpara>Repeat the previous 2 steps for any other buy splits that should be included in the lot (in this
+                example, there is only 1 buy split in the sale).
+              </simpara>
+            </step>
 
-          <step>
-            <simpara>Click the <guilabel>>></guilabel> button to link the sell split with the highlighted lot.</simpara>
-          </step>
+            <step>
+              <simpara>Highlight the sell split in the <guilabel>Splits free</guilabel> panel.
+              </simpara>
+            </step>
 
-          <step>
-            <simpara>Check the lot <guilabel>Balance</guilabel> is as expected. In this example the lot balance
-              should be zero as the number of securities sold in the lot, is matched with the same
-              number of security buys.
-            </simpara>
+            <step>
+              <simpara>Click the <guilabel>>></guilabel> button to link the sell split with the highlighted lot.
+              </simpara>
+            </step>
 
-            <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot, after manual linking</title>
-              <screenshot id="invest-lots2B4Scrub1Lot">
-                <mediaobject>
-                  <imageobject role="html">
-                    <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
+            <step>
+              <simpara>Check the lot <guilabel>Balance</guilabel> is as expected. In this example the lot balance should be
+                zero as the number of securities sold in the lot, is matched with the same number of
+                security buys.
+              </simpara>
+
+              <figure pgwide="1">
+                <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot, after manual linking</title>
+
+                <screenshot id="invest-lots2B4Scrub1Lot">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
                                srccredit="Chris Good" width="&img-w;"/>
-                  </imageobject>
-                  <imageobject role="fo">
-                    <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
+                    </imageobject>
+
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
                                srccredit="Chris Good"/>
-                  </imageobject>
-                  <caption>
-                    <simpara>An image of the <emphasis>Lots in Account</emphasis> window before scrubbing a single lot.</simpara>
-                  </caption>
-                </mediaobject>
-              </screenshot>
-            </figure>
-          </step>
+                    </imageobject>
 
-          <step>
-            <simpara>Click the <guibutton>Scrub</guibutton> button (<emphasis>not</emphasis> the <guibutton>Scrub Account</guibutton> button.)
-            </simpara>
-            <para>The <guilabel>Lots in Account</guilabel> window has not changed after using the
-              <guilabel>Scrub</guilabel> button so no example screen image is supplied.
-            </para>
-          </step>
+                    <caption>
+                      <simpara>An image of the <emphasis>Lots in Account</emphasis> window before scrubbing a single lot.
+                      </simpara>
+                    </caption>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </step>
 
-          <step>
-            <simpara>Close the <guilabel>Lots in Account SSSS</guilabel> window and return to the security account
-              register.
-            </simpara>
+            <step>
+              <simpara>Click the <guibutton>Scrub</guibutton> button (<emphasis>not</emphasis> the <guibutton>Scrub
+                Account</guibutton> button.)
+              </simpara>
+
+              <para>The <guilabel>Lots in Account</guilabel> window has not changed after using the
+                <guilabel>Scrub</guilabel> button so no example screen image is supplied.
+              </para>
+            </step>
+
+            <step>
+              <simpara>Close the <guilabel>Lots in Account SSSS</guilabel> window and return to the security account
+                register.
+              </simpara>
+
+              <figure pgwide="1">
+                <title>Selling Shares - Capital Gains - Register after manual linking and scrubbing a single lot</title>
+
+                <screenshot id="invest-lots2RegAftScrub1Lot">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
+                               srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
+
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
+                               srccredit="Chris Good"/>
+                    </imageobject>
+
+                    <caption>
+                      <simpara>An image of the Register after scrubbing a single lot.
+                      </simpara>
+                    </caption>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </step>
+
+            <step>
+              <simpara>Continue to <xref linkend="invest-sellChgCapGainsAcct" />.
+              </simpara>
+            </step>
+          </procedure>
+        </example>
+
+        <example id="invest-sellAutoExample">
+          <title>Automatic Creation of Capital Gain Or Loss Transactions</title>
+
+          <simpara>Create the capital gains transaction by following these steps:
+          </simpara>
+
+          <procedure>
+            <step>
+              <simpara>Open the security account's register.
+              </simpara>
+            </step>
+
+            <step>
+              <simpara>Ensure any previous manually entered capital gain/loss transaction splits have been entered in
+                separate transactions to the the sell transactions.
+              </simpara>
+            </step>
+
+            <step>
+              <simpara>Select
+                <menuchoice>
+                  <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
+                </menuchoice>
+                to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
+                security account.
+              </simpara>
+            </step>
+
+            <step>
+              <simpara>If using <acronym>LIFO</acronym>, use the above procedure <xref linkend="invest-sellManual" /> to
+                create a lot for each sell transaction, link the lot with the sell transaction and
+                each of the buy transactions that make up the sale.
+              </simpara>
+            </step>
+
+            <step>
+              <simpara>Click the <guilabel>Scrub Account</guilabel> button which:
+              </simpara>
+
+              <itemizedlist>
+                <listitem>
+                  <para>Creates lots for any buy transactions that are not already linked to a lot and links them to sell
+                    transactions splits using the <acronym>FIFO</acronym> method. As a transaction
+                    split can only be linked to 1 lot, if a sell transaction needs to be linked to
+                    multiple lots, the sell transaction split is itself split into multiple
+                    subsplits. In the case of multiple subsplits, it is possible to have different
+                    splits from the same transaction in both the <guilabel>Splits free</guilabel>
+                    and <guilabel>Splits in lot</guilabel> panels.
+                  </para>
+                </listitem>
+
+                <listitem>
+                  <simpara>Creates a separate transaction per lot for capital gain/loss.
+                  </simpara>
+                </listitem>
+              </itemizedlist>
+            </step>
+
+            <step>
+              <simpara>Continue to <xref linkend="invest-sellChgCapGainsAcct" />.
+              </simpara>
+            </step>
+          </procedure>
+        </example>
 
+        <example id="invest-sellAutoExample2">
+          <title>Automatic Creation of Capital Gain Or Loss Transactions, 2 Sales at Once</title>
+
+          <para>Here is an example of <acronym>FIFO</acronym> scrubbing without manual lot creation. In this
+            example, the transactions for 2 sales are scrubbed at once but usually scrubbing would
+            be performed after each sale. One reason for scrubbing 2 sales at once, could be because
+            there were multiple sales on the same day.
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Register after manual linking and scrubbing a single lot</title>
-              <screenshot id="invest-lots2RegAftScrub1Lot">
+              <title>Selling Shares - Capital Gains - Register before Scrub Account</title>
+
+              <screenshot id="invest2-lots0reg">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                               srccredit="Chris Good" width="&img-w;"/>
+                    <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
+                             srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
+
                   <imageobject role="fo">
-                    <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                               srccredit="Chris Good"/>
+                    <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
+                             srccredit="Chris Good"/>
                   </imageobject>
+
                   <caption>
-                    <simpara>An image of the Register after scrubbing a single lot.</simpara>
+                    <simpara>An image of the Security Account register in transaction journal view, before Scrub Account is used.
+                    </simpara>
                   </caption>
                 </mediaobject>
               </screenshot>
             </figure>
-          </step>
+          </para>
 
-          <step>
-            <simpara>Continue to <xref linkend="invest-sellChgCapGainsAcct" />.</simpara>
-          </step>
+          <procedure>
+            <step>
+              <simpara>Select
+                <menuchoice>
+                  <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
+                </menuchoice>
+                to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
+                security account.
+              </simpara>
 
-        </procedure>
-      </example>
+              <figure pgwide="1">
+                <title>Selling Shares - Capital Gains - Lots before Scrub Account</title>
 
+                <screenshot id="invest2-lots1B4ScrubAcct">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest2Lots1B4Scrub.png"
+                               srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
 
-      <example id="invest-sellAutoExample">
-        <title>Automatic Creation of Capital Gain Or Loss Transactions</title>
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/invest2Lots1B4Scrub.png"
+                               srccredit="Chris Good"/>
+                    </imageobject>
 
-        <simpara>Create the capital gains transaction by following these steps:</simpara>
+                    <caption>
+                      <simpara>An image of the <emphasis>Lots in Account</emphasis> window before Scrub Account is used.
+                      </simpara>
+                    </caption>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </step>
 
-        <procedure>
-          <step>
-            <simpara>Open the security account's register.</simpara>
-          </step>
+            <step>
+              <simpara>Click the <guilabel>Scrub Account</guilabel> button.
+              </simpara>
 
-          <step>
-            <simpara>Ensure any previous manually entered capital gain/loss transaction splits have been entered in
-            separate transactions to the the sell transactions.</simpara>
-          </step>
+              <figure pgwide="1">
+                <title>Selling Shares - Capital Gains - Lots after Scrub Account</title>
 
-          <step>
-            <simpara>Select
-              <menuchoice>
-                <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
-              </menuchoice>
-              to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
-              security account.</simpara>
-          </step>
+                <screenshot id="invest2-lots2AftScrubAcct">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
+                               srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
 
-          <step>
-            <simpara>If using <acronym>LIFO</acronym>, use the above procedure <xref linkend="invest-sellManual" /> to create a lot for each
-              sell transaction, link the lot with the sell transaction and each of the buy
-              transactions that make up the sale.</simpara>
-          </step>
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
+                               srccredit="Chris Good"/>
+                    </imageobject>
 
-          <step>
-            <simpara>Click the <guilabel>Scrub Account</guilabel> button which:</simpara>
+                    <caption>
+                      <para>An image of the <emphasis>Lots in Account </emphasis> window after using Scrub Account.
+                      </para>
+                    </caption>
+                  </mediaobject>
+                </screenshot>
+              </figure>
 
-            <itemizedlist>
-              <listitem>
-                <para>Creates lots for any buy transactions that are not already linked to a lot and links them to sell
-                  transactions splits using the <acronym>FIFO</acronym> method. As a transaction split can only be
-                  linked to 1 lot, if a sell transaction needs to be linked to multiple lots, the
-                  sell transaction split is itself split into multiple subsplits. In the case of
-                  multiple subsplits, it is possible to have different splits from the same
-                  transaction in both the <guilabel>Splits free</guilabel> and <guilabel>Splits in
-                  lot</guilabel> panels.
+              <note>
+                <para>After using the <guilabel>Scrub Account</guilabel> button only the last lot is shown, so the above
+                  image is after the <guilabel>Lots in Account</guilabel> window has been closed and
+                  reopened so all the lots show.
                 </para>
-              </listitem>
+              </note>
+            </step>
 
-              <listitem>
-                <simpara>Creates a separate transaction per lot for capital gain/loss.</simpara>
-              </listitem>
-            </itemizedlist>
-          </step>
+            <step>
+              <simpara>Close the <guilabel>Lots in Account SSSS</guilabel> window and return to the security account
+                register.
+              </simpara>
 
-          <step>
-            <simpara>Continue to <xref linkend="invest-sellChgCapGainsAcct" />.</simpara>
-          </step>
-        </procedure>
-      </example>
-
-
-      <example id="invest-sellAutoExample2">
-        <title>Automatic Creation of Capital Gain Or Loss Transactions, 2 Sales at Once</title>
-
-        <para>Here is an example of <acronym>FIFO</acronym> scrubbing without manual lot creation. In this example, the transactions
-          for 2 sales are scrubbed at once but usually scrubbing would be performed after each sale.
-          One reason for scrubbing 2 sales at once, could be because there were multiple sales on
-          the same day.
-          <figure pgwide="1">
-            <title>Selling Shares - Capital Gains - Register before Scrub Account</title>
-            <screenshot id="invest2-lots0reg">
-              <mediaobject>
-                <imageobject role="html">
-                  <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                             srccredit="Chris Good" width="&img-w;"/>
-                </imageobject>
-                <imageobject role="fo">
-                  <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                             srccredit="Chris Good"/>
-                </imageobject>
-                <caption>
-                  <simpara>An image of the Security Account register in transaction journal view, before Scrub Account is used.</simpara>
-                </caption>
-              </mediaobject>
-            </screenshot>
-          </figure>
-        </para>
+              <figure pgwide="1">
+                <title>Selling Shares - Capital Gains - Register after Scrub Account</title>
 
-        <procedure>
-          <step><simpara>Select
-              <menuchoice>
-                <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
-              </menuchoice>
-              to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
-              security account.</simpara>
-            <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots before Scrub Account</title>
-              <screenshot id="invest2-lots1B4ScrubAcct">
+                <screenshot id="invest2-lots3AftScrubAcct">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
+                               srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
+
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
+                               srccredit="Chris Good"/>
+                    </imageobject>
+
+                    <caption>
+                      <para>An image of the <emphasis>security register</emphasis> after using Scrub Account.
+                      </para>
+                    </caption>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+
+              <note>
+                <para>The security splits in the sell transactions have been split into subsplits, one subsplit per lot,
+                  and a capital gain transaction has been created for each security subsplit of each
+                  sell transaction.
+                </para>
+              </note>
+            </step>
+
+            <step>
+              <simpara>Continue to <xref linkend="invest-sellChgCapGainsAcct" />.
+              </simpara>
+            </step>
+          </procedure>
+        </example>
+
+        <example id="invest-sellFifoSplit">
+          <title>Automatic Creation of Capital Gain Or Loss Transactions - After a Simple Stock Split</title>
+
+          <para>Here is an example of <acronym>FIFO</acronym> scrubbing without manual lot creation/linking, where
+            the Stock Split Assistant has been used for a simple stock split. In this example, 100
+            shares of security XYZ were bought for $10.00 each, there was a simple 2 for 1 stock
+            split for zero cost (so the holding was then 200 shares @ $5.00 each), then all 200
+            shares were sold for $6.00 each.
+          </para>
+
+          <para><figure pgwide="1">
+              <title>Selling Shares - Capital Gains - Register after Scrub Account</title>
+
+              <screenshot id="investLotsSplitReg">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                               srccredit="Chris Good" width="&img-w;"/>
+                    <imagedata fileref="figures/investLotsSplitReg.png"
+                           srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
+
                   <imageobject role="fo">
-                    <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                               srccredit="Chris Good"/>
+                    <imagedata fileref="figures/investLotsSplitReg.png"
+                           srccredit="Chris Good"/>
                   </imageobject>
+
                   <caption>
-                    <simpara>An image of the <emphasis>Lots in Account</emphasis> window before Scrub Account is used.</simpara>
+                    <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
+                    </para>
                   </caption>
                 </mediaobject>
               </screenshot>
             </figure>
-          </step>
 
-          <step>
-            <simpara>Click the <guilabel>Scrub Account</guilabel> button.</simpara>
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots after Scrub Account</title>
-              <screenshot id="invest2-lots2AftScrubAcct">
+              <title>Selling Shares - Capital Gains - Lot 0 after Scrub Account</title>
+
+              <screenshot id="investLotsSplitLot0">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                               srccredit="Chris Good" width="&img-w;"/>
+                    <imagedata fileref="figures/investLotsSplitLot0.png"
+                           srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
+
                   <imageobject role="fo">
-                    <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                               srccredit="Chris Good"/>
+                    <imagedata fileref="figures/investLotsSplitLot0.png"
+                           srccredit="Chris Good"/>
                   </imageobject>
+
                   <caption>
-                    <para>An image of the <emphasis>Lots in Account </emphasis> window after using Scrub Account.
+                    <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
                     </para>
                   </caption>
                 </mediaobject>
               </screenshot>
             </figure>
 
-            <note>
-              <para>After using the <guilabel>Scrub Account</guilabel> button only the last lot is shown, so the above
-                image is after the <guilabel>Lots in Account</guilabel> window has been closed and
-                reopened so all the lots show.
-              </para>
-            </note>
-          </step>
-
-          <step>
-            <simpara>Close the <guilabel>Lots in Account SSSS</guilabel> window and return to the security account register.</simpara>
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Register after Scrub Account</title>
-              <screenshot id="invest2-lots3AftScrubAcct">
+              <title>Selling Shares - Capital Gains - Lot 1 after Scrub Account</title>
+
+              <screenshot id="investLotsSplitLot1">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                               srccredit="Chris Good" width="&img-w;"/>
+                    <imagedata fileref="figures/investLotsSplitLot1.png"
+                           srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
+
                   <imageobject role="fo">
-                    <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                               srccredit="Chris Good"/>
+                    <imagedata fileref="figures/investLotsSplitLot1.png"
+                           srccredit="Chris Good"/>
                   </imageobject>
+
                   <caption>
-                    <para>An image of the <emphasis>security register</emphasis> after using Scrub Account.
+                    <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
                     </para>
                   </caption>
                 </mediaobject>
               </screenshot>
             </figure>
+          </para>
 
-            <note>
-              <para>The security splits in the sell transactions have been split into subsplits, one subsplit per lot,
-                and a capital gain transaction has been created for each security subsplit of each
-                sell transaction.
-              </para>
-            </note>
-          </step>
-
-          <step>
-            <simpara>Continue to <xref linkend="invest-sellChgCapGainsAcct" />.</simpara>
-          </step>
-        </procedure>
-      </example>
-
-      <example id="invest-sellFifoSplit">
-        <title>Automatic Creation of Capital Gain Or Loss Transactions - After a Simple Stock Split</title>
+          <para>The above screenshots show that scrubbing created:
+            <itemizedlist>
+              <listitem>
+                <simpara>2 lots. A separate lot for each buy (it essentially treats the stock split as a buy of 100 for no
+                  cost.)
+                </simpara>
+              </listitem>
 
-        <para>Here is an example of <acronym>FIFO</acronym> scrubbing without manual lot creation/linking, where the Stock Split
-          Assistant has been used for a simple stock split. In this example, 100 shares of security
-          XYZ were bought for $10.00 each, there was a simple 2 for 1 stock split for zero cost (so
-          the holding was then 200 shares @ $5.00 each), then all 200 shares were sold for $6.00
-          each.
-        </para>
-        <para>
-        <figure pgwide="1">
-          <title>Selling Shares - Capital Gains - Register after Scrub Account</title><screenshot id="investLotsSplitReg">
-            <mediaobject>
-              <imageobject role="html">
-                <imagedata fileref="figures/investLotsSplitReg.png"
-                           srccredit="Chris Good" width="&img-w;"/>
-              </imageobject>
-              <imageobject role="fo">
-                <imagedata fileref="figures/investLotsSplitReg.png"
-                           srccredit="Chris Good"/>
-              </imageobject>
-              <caption>
-                <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
-        </figure>
+              <listitem>
+                <simpara>2 capital gain transactions (one for each lot) on the date of the sale:
+                </simpara>
+
+                <itemizedlist>
+                  <listitem>
+                    <simpara>Lot 0: Jul. 1, 2009 loss $400 (sale $600 − cost $1,000.)
+                    </simpara>
+                  </listitem>
+
+                  <listitem>
+                    <simpara>Lot 1: Jul. 1, 2009 gain $600 (sale $600 − cost $0.)
+                    </simpara>
+                  </listitem>
+                </itemizedlist>
+              </listitem>
+            </itemizedlist>
+          </para>
 
-        <figure pgwide="1">
-          <title>Selling Shares - Capital Gains - Lot 0 after Scrub Account</title><screenshot id="investLotsSplitLot0">
-            <mediaobject>
-              <imageobject role="html">
-                <imagedata fileref="figures/investLotsSplitLot0.png"
-                           srccredit="Chris Good" width="&img-w;"/>
-              </imageobject>
-              <imageobject role="fo">
-                <imagedata fileref="figures/investLotsSplitLot0.png"
-                           srccredit="Chris Good"/>
-              </imageobject>
-              <caption>
-                <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
-        </figure>
+          <para>Total gain $200 is correct. Whether the gain is a single long-term one or one each of long-term and
+            short-term or whether there's even a distinction depends on the user's tax jurisdiction
+            and the way the split is structured. If the user needs help figuring it out they should
+            consult a professional.
+          </para>
+        </example>
 
-        <figure pgwide="1">
-          <title>Selling Shares - Capital Gains - Lot 1 after Scrub Account</title><screenshot id="investLotsSplitLot1">
-            <mediaobject>
-              <imageobject role="html">
-                <imagedata fileref="figures/investLotsSplitLot1.png"
-                           srccredit="Chris Good" width="&img-w;"/>
-              </imageobject>
-              <imageobject role="fo">
-                <imagedata fileref="figures/investLotsSplitLot1.png"
-                           srccredit="Chris Good"/>
-              </imageobject>
-              <caption>
-                <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
-        </figure>
-        </para>
-        <para>The above screenshots show that scrubbing created:
-          <itemizedlist>
-            <listitem>
-              <simpara>2 lots. A separate lot for each buy (it essentially treats the stock split as a buy of 100 for no cost.)</simpara>
-            </listitem>
-            <listitem>
-              <simpara>2 capital gain transactions (one for each lot) on the date of the sale:</simpara>
-              <itemizedlist>
-                <listitem>
-                  <simpara>Lot 0: Jul. 1, 2009 loss $400 (sale $600 − cost $1,000.)</simpara>
-                </listitem>
-                <listitem>
-                  <simpara>Lot 1: Jul. 1, 2009 gain $600 (sale $600 − cost $0.)</simpara>
-                </listitem>
-              </itemizedlist>
-            </listitem>
-          </itemizedlist>
-        </para>
+        <example id="invest-sellChgCapGainsAcctExample">
+          <title>Changing the Orphaned Gains-CCC to Gain/Loss Account</title>
 
-        <para>Total gain $200 is correct. Whether the gain is a single long-term one or one each of long-term and
-          short-term or whether there's even a distinction depends on the user's tax jurisdiction
-          and the way the split is structured. If the user needs help figuring it out they should
-          consult a professional.
-        </para>
+          <procedure>
+            <step>
+              <simpara>Close the <guilabel>Lots in Account SSSS</guilabel> window if open and return to the security
+                account register.
+              </simpara>
 
-      </example>
+              <figure pgwide="1">
+                <title>Selling Shares - Capital Gains - Register after scrubbing a single lot</title>
 
-      <example id="invest-sellChgCapGainsAcctExample">
-        <title>Changing the Orphaned Gains-CCC to Gain/Loss Account</title>
-        <procedure>
-          <step>
-            <simpara>Close the <guilabel>Lots in Account SSSS</guilabel> window if open and return to the security
-              account register.</simpara>
-            <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Register after scrubbing a single lot</title><screenshot id="invest-lots4AftScrub1LotReg">
-                <mediaobject>
-                  <imageobject role="html">
-                    <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
+                <screenshot id="invest-lots4AftScrub1LotReg">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
                                srccredit="Chris Good" width="&img-w;"/>
-                  </imageobject>
-                  <imageobject role="fo">
-                    <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
+                    </imageobject>
+
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
                                srccredit="Chris Good"/>
-                  </imageobject>
-                  <caption>
-                    <para>An image of the <emphasis>security register</emphasis> after scrubbing a single lot.
-                    </para>
-                  </caption>
-                </mediaobject>
-              </screenshot>
-            </figure>
-          </step>
+                    </imageobject>
 
-          <step>
-            <simpara>Find each new <emphasis>Realized Gain/Loss</emphasis> transaction in the security account register
-              (they will have the same date as the sell transactions).
-            </simpara>
-          </step>
+                    <caption>
+                      <para>An image of the <emphasis>security register</emphasis> after scrubbing a single lot.
+                      </para>
+                    </caption>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </step>
 
-          <step>
-            <simpara>Edit the <emphasis>Orphaned Gains-CCC</emphasis> transaction split to re-assign the income account to a more
-              meaningful income (or expense) gain or loss account (for example, <emphasis>Income:Capital Gain (Long Term):IBM</emphasis>).</simpara>
-            <tip>
-              <simpara>You may like to split the capital gain/loss into taxable and non taxable parts if that is in accord
-                with your tax laws.
+            <step>
+              <simpara>Find each new <emphasis>Realized Gain/Loss</emphasis> transaction in the security account register
+                (they will have the same date as the sell transactions).
               </simpara>
-            </tip>
-          </step>
-        </procedure>
-      </example>
+            </step>
+
+            <step>
+              <simpara>Edit the <emphasis>Orphaned Gains-CCC</emphasis> transaction split to re-assign the income account
+                to a more meaningful income (or expense) gain or loss account (for example,
+                <emphasis>Income:Capital Gain (Long Term):IBM</emphasis>).
+              </simpara>
+
+              <tip>
+                <simpara>You may like to split the capital gain/loss into taxable and non taxable parts if that is in accord
+                  with your tax laws.
+                </simpara>
+              </tip>
+            </step>
+          </procedure>
+        </example>
       </sect3>
     </sect2>
   </sect1>
@@ -3871,22 +4292,23 @@ Income
       <para>As an example consider the following; the dividends deposited as cash into the
         <emphasis>Broker</emphasis> Account with a tie to the stock account.
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>Example Of Cash Dividend Transactions</title>
+
         <screenshot id="invest-dividendcash1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_dividendcash.png"
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_dividendcash.png"
                        srccredit="Daniel Dodson"/>
-          </imageobject>
-          <caption>
-            <para>An image of the <emphasis>Brokerage</emphasis> Account register after a series of cash dividends.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+            </imageobject>
+
+            <caption>
+              <para>An image of the <emphasis>Brokerage</emphasis> Account register after a series of cash dividends.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
       </figure>
 
       <note>
@@ -3902,8 +4324,9 @@ Income
 
       <para>If you receive the dividend in the form of an automatic reinvestment, the transaction for this
         should be handled within the stock or mutual fund account as income from
-        <emphasis>Income:Dividends</emphasis> for the appropriate number of reinvested shares. This type of
-        reinvest account is often referred to as a <acronym>DRIP</acronym> (Dividend Re-Investment Program).
+        <emphasis>Income:Dividends</emphasis> for the appropriate number of reinvested shares. This
+        type of reinvest account is often referred to as a <acronym>DRIP</acronym> (Dividend
+        Re-Investment Program).
       </para>
 
       <para>As an example consider the following purchase of NSTAR (NST) stock with the dividends reinvested
@@ -3913,23 +4336,27 @@ Income
       <para>Starting with the purchase of 100 shares on Jan. 3, 2005, all dividends will be reinvested and an
         account is created to track the dividend to the specific stock. &app; simplifies the entry
         by allowing calculations within the cells of the transaction. If the first dividend is
-        $0.29/share, enter <userinput>53.28</userinput> (purchase price + dividend) in the share <guilabel>Price</guilabel>
-        cell and <userinput>100*0.29</userinput> in the <guilabel>Buy</guilabel> cell. &app; will calculate for you the
-        corresponding number of <guilabel>Shares</guilabel>.
+        $0.29/share, enter <userinput>53.28</userinput> (purchase price + dividend) in the share
+        <guilabel>Price</guilabel> cell and <userinput>100*0.29</userinput> in the
+        <guilabel>Buy</guilabel> cell. &app; will calculate for you the corresponding number of
+        <guilabel>Shares</guilabel>.
       </para>
 
       <figure>
         <title>Example Of Dividend Reinvestment Transactions</title>
+
         <screenshot id="invest-dividendreinvest1">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_dividendreinvest1.png"
                           srccredit="Cristian Marchi" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_dividendreinvest1.png"
                           srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>An image of the NST Stock Account register after a dividend reinvestment.
               </para>
@@ -3993,16 +4420,19 @@ Income
 
     <figure>
       <title>Example Of Return Of Capital Transactions</title>
+
       <screenshot id="invest-ret-of-cap">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_ret_of_cap.png"
                         srccredit="Chris Good" width="&img-w;"/>
           </imageobject>
+
           <imageobject role="fo">
             <imagedata fileref="figures/invest_ret_of_cap.png"
                         srccredit="Chris Good"/>
           </imageobject>
+
           <caption>
             <para>An image of the Stock Account register after a return of capital.
             </para>
@@ -4022,7 +4452,8 @@ Income
         unwanted entry from the price database using
         <menuchoice>
           <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
-        </menuchoice>.
+        </menuchoice>
+        .
       </para>
     </tip>
   </sect1>
@@ -4032,9 +4463,9 @@ Income
 
     <para>Companies may split their stock for many reasons but the most common is that the price has risen
       higher than management thinks is a reasonable price for many investors. Some of these splits
-      are simple exchanges (for example, 2 for 1 or 3 for 2) and some are complex exchanges with cash
-      distributions. Splits may also result in fewer shares if the exchange rate is a reverse split
-      (1 for 3 or 0.75 for 1).
+      are simple exchanges (for example, 2 for 1 or 3 for 2) and some are complex exchanges with
+      cash distributions. Splits may also result in fewer shares if the exchange rate is a reverse
+      split (1 for 3 or 0.75 for 1).
     </para>
 
     <sect2 id="invest-simplesplit">
@@ -4047,16 +4478,17 @@ Income
         </menuchoice>
         to start the assistant.
       </para>
-
- <!-- ToDo: unshrink -->
+<!-- ToDo: unshrink -->
       <figure>
         <title>Activation Of The <quote>Stock Split</quote> Assistant</title>
+
         <screenshot id="invest-split1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_split1.png"
                          srccredit="Dave Herman"/>
             </imageobject>
+
             <caption>
               <para>An image of the selection of the stock split assistant.
               </para>
@@ -4072,12 +4504,14 @@ Income
 
       <figure>
         <title>Selection Of A Stock Account In The <quote>Stock Split</quote> Assistant</title>
+
         <screenshot id="invest-split2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_split2.png"
                          srccredit="Dave Herman"/>
             </imageobject>
+
             <caption>
               <para>An image of the stock split assistant at step 2 - Selection of Account/Stock.
               </para>
@@ -4094,34 +4528,52 @@ Income
       </para>
 
       <variablelist>
-      <varlistentry>
-        <term>Date</term>
-        <listitem><simpara>Enter the date of the split.</simpara></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Shares</term>
-        <listitem><para>The number of shares increased (or decreased) in the transaction.
-          In this example, it is a 2 for 1 split so the number of additional shares is the number of shares
-          currently in the register.
-          </para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Description</term>
-        <listitem><simpara>The Description should give a brief explanation of the transaction.</simpara></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>New Price</term>
-        <listitem><simpara>If desired the new price of the stock, after the split, may be entered.</simpara></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Currency</term>
-        <listitem><simpara>The currency of the transaction is required. This should be the same as the stock purchase currency.</simpara></listitem>
-      </varlistentry>
+        <varlistentry>
+          <term>Date</term>
+
+          <listitem>
+            <simpara>Enter the date of the split.
+            </simpara>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Shares</term>
+
+          <listitem>
+            <para>The number of shares increased (or decreased) in the transaction. In this example, it is a 2 for 1
+              split so the number of additional shares is the number of shares currently in the
+              register.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Description</term>
+
+          <listitem>
+            <simpara>The Description should give a brief explanation of the transaction.
+            </simpara>
+          </listitem>
+        </varlistentry>
 
+        <varlistentry>
+          <term>New Price</term>
+
+          <listitem>
+            <simpara>If desired the new price of the stock, after the split, may be entered.
+            </simpara>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Currency</term>
+
+          <listitem>
+            <simpara>The currency of the transaction is required. This should be the same as the stock purchase currency.
+            </simpara>
+          </listitem>
+        </varlistentry>
       </variablelist>
 
       <para>Click on the <guibutton>Forward</guibutton> button.
@@ -4129,12 +4581,14 @@ Income
 
       <figure>
         <title>Split Details In The <quote>Stock Split</quote> Assistant</title>
+
         <screenshot id="invest-split3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_split3.png"
                          srccredit="Dave Herman"/>
-             </imageobject>
+            </imageobject>
+
             <caption>
               <para>An image of the stock split assistant at step 3 - Split Details.
               </para>
@@ -4146,14 +4600,16 @@ Income
       <para>The next screen will be skipped in this example as there was no <quote>Cash in Lieu</quote>.
       </para>
 
-       <figure>
+      <figure>
         <title><quote>Cash In Lieu</quote> In The <quote>Stock Split</quote> Assistant</title>
+
         <screenshot id="invest-split4">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_split4.png"
                          srccredit="Dave Herman"/>
             </imageobject>
+
             <caption>
               <para>An image of the stock split assistant at step 4 - Cash in Lieu.
               </para>
@@ -4166,16 +4622,17 @@ Income
         <guibutton>Cancel</guibutton>, <guibutton>Back</guibutton> to modify any data entered or
         <guibutton>Apply</guibutton> to complete the stock split with the data entered.
       </para>
-
 <!-- ToDo: unshrink -->
-       <figure>
+      <figure>
         <title>The NST Account After A Simple Stock Split</title>
+
         <screenshot id="invest-simplesplit1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_simplesplit1.png"
                          srccredit="Dave Herman"/>
             </imageobject>
+
             <caption>
               <para>An image of the <emphasis>Assets:Investments:DRIPs:NST</emphasis> register after a simple stock
                 split transaction.
@@ -4210,12 +4667,14 @@ Income
 
       <figure>
         <title>Selection Of A Stock Account In The <quote>Stock Split</quote> Assistant—Moderate</title>
+
         <screenshot id="invest-merge2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_merge2.png"
                          srccredit="Dave Herman"/>
             </imageobject>
+
             <caption>
               <para>An image of the stock split assistant at step 2 - Selection of Account/Stock (<emphasis>Investment
                 Account:T</emphasis>).
@@ -4233,36 +4692,54 @@ Income
       </para>
 
       <variablelist>
-      <varlistentry>
-        <term>Date</term>
-        <listitem><simpara>Enter the date of the split. Here we’ll enter November 18, 2005.</simpara></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Shares</term>
-        <listitem><para>The number of shares increased (or decreased) in the transaction.
-          In this example it is a 0.77942 for 1 split so the number of shares will decrease from the number of
-          shares currently in the register. You may use &app;’s ability to perform
-          calculations on an entry form by entering data directly (
-          <userinput>0.77942*100 − 100</userinput>) to calculate the decrease in shares from the
-          split.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Description</term>
-        <listitem><simpara>The Description should give a brief explanation of the transaction.</simpara></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>New Price</term>
-        <listitem><simpara>If desired the new price of the stock, after the split, may be entered.</simpara></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Currency</term>
-        <listitem><simpara>The currency of the transaction is required. This should be the same as the stock purchase currency.</simpara></listitem>
-      </varlistentry>
+        <varlistentry>
+          <term>Date</term>
+
+          <listitem>
+            <simpara>Enter the date of the split. Here we’ll enter November 18, 2005.
+            </simpara>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Shares</term>
+
+          <listitem>
+            <para>The number of shares increased (or decreased) in the transaction. In this example it is a 0.77942
+              for 1 split so the number of shares will decrease from the number of shares currently
+              in the register. You may use &app;’s ability to perform calculations on an entry
+              form by entering data directly ( <userinput>0.77942*100 − 100</userinput>) to
+              calculate the decrease in shares from the split.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Description</term>
+
+          <listitem>
+            <simpara>The Description should give a brief explanation of the transaction.
+            </simpara>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>New Price</term>
+
+          <listitem>
+            <simpara>If desired the new price of the stock, after the split, may be entered.
+            </simpara>
+          </listitem>
+        </varlistentry>
 
+        <varlistentry>
+          <term>Currency</term>
+
+          <listitem>
+            <simpara>The currency of the transaction is required. This should be the same as the stock purchase currency.
+            </simpara>
+          </listitem>
+        </varlistentry>
       </variablelist>
 
       <para>Click on the <guibutton>Forward</guibutton> button.
@@ -4270,12 +4747,14 @@ Income
 
       <figure>
         <title>Split Details In The <quote>Stock Split</quote> Assistant—Moderate</title>
+
         <screenshot id="invest-merge3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_merge3.png"
                          srccredit="Dave Herman"/>
             </imageobject>
+
             <caption>
               <para>An image of the stock split assistant at step 3 - Split Details.
               </para>
@@ -4287,20 +4766,21 @@ Income
       <para>The next screen will be skipped in this example as there was no <quote>Cash in Lieu</quote>.
       </para>
 
-      <para>A final <quote>Finish</quote> screen will give a last option to <guibutton>Back</guibutton> to modify
-        any data entered or <guibutton>Apply</guibutton> to complete the stock split with the data
-        entered.
+      <para>A final <quote>Finish</quote> screen will give a last option to <guibutton>Back</guibutton> to
+        modify any data entered or <guibutton>Apply</guibutton> to complete the stock split with the
+        data entered.
       </para>
-
 <!-- ToDo: unshrink -->
-       <figure>
+      <figure>
         <title>The T Account After A Moderate Stock Split</title>
+
         <screenshot id="invest-stockmerge1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockmerge1.png"
                          srccredit="Dave Herman"/>
             </imageobject>
+
             <caption>
               <para>An image of the <emphasis>Investment Account:T</emphasis> register after a stock split transaction
                 that decreases the shares.
diff --git a/C/guide/ch_loans.xml b/C/guide/ch_loans.xml
index 35bf53f8..dd8985d1 100644
--- a/C/guide/ch_loans.xml
+++ b/C/guide/ch_loans.xml
@@ -183,9 +183,11 @@
        -Mortgage Interest
    -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>
+      Mortgage Loans. To access these predefined account structures, click on
+      <menuchoice>
         <guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy...</guimenuitem>
-      </menuchoice> and select the loan types in which you are interested.
+      </menuchoice>
+      and select the loan types in which you are interested.
     </para>
   </sect1>
 
@@ -194,26 +196,30 @@
 
     <para>Determining loan amortization schedules, periodic payment amounts, total payment value, or interest
       rates can be somewhat complex. To help facilitate these kinds of calculations, &app; has a
-      built-in <guilabel>Loan Repayment Calculator</guilabel>. To access the calculator, go to <menuchoice>
+      built-in <guilabel>Loan Repayment Calculator</guilabel>. To access the calculator, go to
+      <menuchoice>
         <guimenu>Tools</guimenu> <guimenuitem>Loan Repayment Calculator</guimenuitem>
-      </menuchoice>.
+      </menuchoice>
+      .
     </para>
 
     <figure>
       <title>Loan Repayment Calculator</title>
+
       <screenshot id="loans_fcalc">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_fcalc.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
+
           <caption>
             <para>The &app; <guilabel>Loan Repayment Calculator</guilabel>.
             </para>
           </caption>
         </mediaobject>
       </screenshot>
-      </figure>
+    </figure>
 
     <para>The <guilabel>Loan Repayment Calculator</guilabel> can be used to calculate any one of the
       parameters: <guilabel>Payment Periods</guilabel>, <guilabel>Interest Rate</guilabel>,
@@ -340,7 +346,8 @@
       <title>Advanced: Calculation Details</title>
 
       <para>In order to discuss the mathematical formulas used by the <guilabel>Loan Repayment
-        Calculator</guilabel>, we first must define some variables.<screen>
+        Calculator</guilabel>, we first must define some variables.
+<screen>
  n   == number of payment periods
  %i  == nominal interest rate, NAR, charged
  PV  == Present Value
@@ -475,14 +482,15 @@ The simple case for when  PMT == 0 gives the solution:
 
     <figure>
       <title>Accounts Before Receiving Loan</title>
-    <screenshot id="loans_mortgage">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/loans_mortgage1.png"
+
+      <screenshot id="loans_mortgage">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/loans_mortgage1.png"
                      srccredit="Bengt Thuree" />
-        </imageobject>
-      </mediaobject>
-    </screenshot>
+          </imageobject>
+        </mediaobject>
+      </screenshot>
     </figure>
 
     <para>The purchase of the house is recorded with a split transaction in the <emphasis>Assets:Fixed
@@ -567,6 +575,7 @@ The simple case for when  PMT == 0 gives the solution:
 
     <figure>
       <title>Mortgage Split Transaction</title>
+
       <screenshot id="loans_mortgage2.png">
         <mediaobject>
           <imageobject>
@@ -582,6 +591,7 @@ The simple case for when  PMT == 0 gives the solution:
 
     <figure>
       <title>Mortgage Accounts</title>
+
       <screenshot id="loans_mortgage3">
         <mediaobject>
           <imageobject>
@@ -598,7 +608,8 @@ The simple case for when  PMT == 0 gives the solution:
 
     <para>The automobile Loan, or in common terms, car Loan, is treated more or less exactly as the house
       loan. The only difference is different accounts, and different interest rates. The basic car
-      loan account structure is as follows:<screen>-Asset
+      loan account structure is as follows:
+<screen>-Asset
     -Current Assets
         -Saving
     -Fixed Assets
@@ -648,7 +659,8 @@ The simple case for when  PMT == 0 gives the solution:
         rate of 5%.
       </para>
 
-      <para>In summary we have the below details. Peter’s loan details:<itemizedlist>
+      <para>In summary we have the below details. Peter’s loan details:
+        <itemizedlist>
           <listitem>
             <para>Principal Amount - $2,000
             </para>
@@ -688,12 +700,14 @@ The simple case for when  PMT == 0 gives the solution:
 
       <figure>
         <title>Calculation Of Private Loan Details</title>
+
         <screenshot id="loans_OpenOfficePrivateLoanDetails">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/loans_PrivateLoanCalculation.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption id="loans_OpenOfficePrivateLoanDetails.caption">
               Detailed view over the private loan to Peter
             </caption>
@@ -705,7 +719,8 @@ The simple case for when  PMT == 0 gives the solution:
     <sect2 id="loans_personalLoanToSomeOne_accounts">
       <title>Accounts for the loan</title>
 
-      <para>Let’s start with the following accounts. They all have the same currency, in this case USD.<example>
+      <para>Let’s start with the following accounts. They all have the same currency, in this case USD.
+        <example>
           <title>Accounts for the loan to Peter</title>
 
           <itemizedlist>
@@ -791,6 +806,7 @@ The simple case for when  PMT == 0 gives the solution:
 
       <figure>
         <title>Chart of Accounts after lending money</title>
+
         <screenshot id="loans_PrivateLoanInitial">
           <mediaobject>
             <imageobject>
@@ -838,16 +854,17 @@ The simple case for when  PMT == 0 gives the solution:
 
       <para>This can be translated to the following &app; entry
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>First Payment</title>
+
         <screenshot id="loans_PrivateLoanFirstPayment">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>Detailed view over first payment
               </para>
@@ -899,12 +916,14 @@ The simple case for when  PMT == 0 gives the solution:
 
       <figure>
         <title>Second payment</title>
+
         <screenshot id="loans_PrivateLoanSecondPayment">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>Detailed view over the second payment
               </para>
@@ -918,10 +937,10 @@ The simple case for when  PMT == 0 gives the solution:
 
       <para>The Chart of accounts looks now like this:
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>Chart Of Accounts After Second payment</title>
+
         <screenshot id="loans_PrivateLoanSecondPaymentAccounts">
           <mediaobject>
             <imageobject>
diff --git a/C/guide/ch_oview.xml b/C/guide/ch_oview.xml
index ef1f454a..d7eb0e3e 100644
--- a/C/guide/ch_oview.xml
+++ b/C/guide/ch_oview.xml
@@ -37,12 +37,14 @@
 
     <figure>
       <title>A Chart Of Accounts With Multiple Currencies And Investments</title>
+
       <screenshot id="oview-intro">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/oview_intro.png"
                        srccredit="Bengt Thuree"/>
           </imageobject>
+
           <caption>
             <para>This image shows a Chart of Accounts with multiple currencies and investments.
             </para>
@@ -217,10 +219,12 @@
 
       <itemizedlist>
         <listitem>
-          <para><emphasis>Native Languages</emphasis>: &app; has been translated into over 55 languages. Full translated
-            are are Chinese (traditional), Croatian, Dutch, Hebrew, Italian, Portuguese, and
-            Ukrainian. Almost as good, with over 90% translated, are Catalan, Chinese (simplified),
-            German, Indonesian, Japanese, Portuguese (Brazil), and Spanish.<!-- Latvian, Serbian, Russian, Turkish --><footnote>
+          <para><emphasis>Native Languages</emphasis>: &app; has been translated into over 55 languages. Full
+            translated are are Chinese (traditional), Croatian, Dutch, Hebrew, Italian, Portuguese,
+            and Ukrainian. Almost as good, with over 90% translated, are Catalan, Chinese
+            (simplified), German, Indonesian, Japanese, Portuguese (Brazil), and Spanish.
+<!-- Latvian, Serbian, Russian, Turkish -->
+            <footnote>
               <para>If you want to create or improve the translation of your language see
                 <ulink url="&url-wiki-L12N;"/>.
               </para>
@@ -348,25 +352,30 @@
       chapter’s tutorial.
     </para>
 
-    <para>This manual is organized into 3 main parts:<itemizedlist>
+    <para>This manual is organized into 3 main parts:
+      <itemizedlist>
         <listitem>
-          <simpara><xref linkend="part.getting_started"/></simpara>
+          <simpara><xref linkend="part.getting_started"/>
+          </simpara>
         </listitem>
 
         <listitem>
-          <simpara><xref linkend="part.managing_personal"/></simpara>
+          <simpara><xref linkend="part.managing_personal"/>
+          </simpara>
         </listitem>
 
         <listitem>
-          <simpara><xref linkend="part.managing_business"/></simpara>
+          <simpara><xref linkend="part.managing_business"/>
+          </simpara>
         </listitem>
       </itemizedlist>
     </para>
 
     <para><xref linkend="part.getting_started"/> provides you with the most basic information needed to begin
-      using &app;. The chapters in this part explain concepts that are fundamental to using
-      &app;. New users of &app; should familiarize themselves with the information in these chapters
-      to get you up and running:<itemizedlist>
+      using &app;. The chapters in this part explain concepts that are fundamental to using &app;.
+      New users of &app; should familiarize themselves with the information in these chapters to get
+      you up and running:
+      <itemizedlist>
         <listitem>
           <para><xref linkend="chapter_oview"></xref> - (this chapter) gives a general overview of &app;
           </para>
@@ -394,10 +403,11 @@
       </itemizedlist>
     </para>
 
-    <para><xref linkend="part.managing_personal"/> addresses common applications and features of &app;
-      in greater detail. You will see more specific cases, based on frequently asked questions about
+    <para><xref linkend="part.managing_personal"/> addresses common applications and features of &app; in
+      greater detail. You will see more specific cases, based on frequently asked questions about
       applying &app; to everyday situations. Here are the applications and features covered in this
-      part:<itemizedlist>
+      part:
+      <itemizedlist>
         <listitem>
           <para><xref linkend="chapter_cbook"></xref>
           </para>
@@ -430,7 +440,8 @@
       </itemizedlist>
     </para>
 
-    <para><xref linkend="part.managing_business"/> discusses the use of &app; in business accounting:<itemizedlist>
+    <para><xref linkend="part.managing_business"/> discusses the use of &app; in business accounting:
+      <itemizedlist>
         <listitem>
           <para><xref linkend="chapter_bus_features"></xref>
           </para>
@@ -507,9 +518,11 @@
       <title>Context Help</title>
 
       <para>The context help provides detailed instructions for using &app;'s menus, windows, and controls. To
-        open online help, select <menuchoice>
+        open online help, select
+        <menuchoice>
           <guimenu>Help</guimenu> <guimenuitem>Contents</guimenuitem>
-        </menuchoice>.
+        </menuchoice>
+        .
       </para>
 
       <para>The <guilabel>&appname; Help</guilabel> window also acts as a simple web browser, so you can pull up
@@ -525,9 +538,9 @@
       <title>&app; Website</title>
 
       <para>The <ulink
-      url="&url-www;"><citetitle>&appname; website</citetitle></ulink>
-        contains helpful information about the program and about any updates to it. It also contains
-        links to other online resources.
+      url="&url-www;"><citetitle>&appname; website</citetitle></ulink> contains helpful
+        information about the program and about any updates to it. It also contains links to other
+        online resources.
       </para>
     </sect2>
 
@@ -538,22 +551,17 @@
         development may be found in the <ulink url="&url-wiki;">&appname; Wiki</ulink>.
       </para>
     </sect2>
-        
-    <sect2 id="oview-faq">
-        <title>&app; Frequently Asked Questions</title>    
 
-        <para>
-            <ulink url="&url-wiki-faq;">&app; Frequently Asked Questions</ulink> (<acronym>FAQ</acronym>) page 
-            is also on the <xref linkend="wiki" endterm="wiki.title" />.
-            It should be a first stop whenever you encounter difficulty using &app;.
-            It is now translated into German and Simplified Chinese. If you'd like to access to the translated page,
-            see tabs on the top of the <ulink url="&url-wiki-faq;">&app; Frequently Asked Questions</ulink> page.
+    <sect2 id="oview-faq">
+      <title>&app; Frequently Asked Questions</title>
 
-        </para>
-    
+      <para><ulink url="&url-wiki-faq;">&app; Frequently Asked Questions</ulink> (<acronym>FAQ</acronym>) page
+        is also on the <xref linkend="wiki" endterm="wiki.title" />. It should be a first stop
+        whenever you encounter difficulty using &app;. It is now translated into German and
+        Simplified Chinese. If you'd like to access to the translated page, see tabs on the top of
+        the <ulink url="&url-wiki-faq;">&app; Frequently Asked Questions</ulink> page.
+      </para>
     </sect2>
-        
-        
 
     <sect2 id="on-line-assistance">
       <title>&app; On-line Assistance</title>
@@ -566,11 +574,10 @@
     url="mailto:gnucash-user at gnucash.org">user
         mailing list</ulink>. If you prefer a web forum-like presentation, you can use it via
         <ulink
-    url="&url-mail-nabble;">Nabble</ulink>.
-        One must
+    url="&url-mail-nabble;">Nabble</ulink>. One must
         <ulink
-    url="%url-mail-li;gnucash-user">subscribe</ulink>
-        before posting, even if using Nabble.
+    url="%url-mail-li;gnucash-user">subscribe</ulink> before posting, even if using
+        Nabble.
       </para>
 
       <bridgehead>
@@ -578,14 +585,16 @@
       </bridgehead>
 
       <para>Several of the developers monitor the <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>.
-        They are usually busy with other tasks and of course are not always at their computers.
-        Log in, ask your question, and stay logged in; it may take  several hours before your question is noticed and responded.
+        They are usually busy with other tasks and of course are not always at their computers. Log
+        in, ask your question, and stay logged in; it may take several hours before your question is
+        noticed and responded.
         <itemizedlist>
           <listitem>
             <simpara>If you got disconnected <ulink url="&url-logs-irc;">check the IRC logs</ulink> to verify that you
               missed nothing related.
             </simpara>
           </listitem>
+
           <listitem>
             <simpara>Requirements, netiquette, and other details are explained in the <ulink url="&url-wiki-irc;">IRC
               wiki page</ulink>.
@@ -594,9 +603,9 @@
         </itemizedlist>
       </para>
 
-      <para>The <ulink url="&url-www;">&appname; website </ulink> has more details on these channels.
-        You will also find pointers there to additional useful resources such as the &app; wiki and
-        bug tracking system.
+      <para>The <ulink url="&url-www;">&appname; website </ulink> has more details on these channels. You will
+        also find pointers there to additional useful resources such as the &app; wiki and bug
+        tracking system.
       </para>
     </sect2>
 
@@ -618,9 +627,8 @@
     <para>Installation of &app; is usually simple.
     </para>
 
-    <para>The <ulink url="&url-www;download.phtml"><citetitle>&app; download
-      page</citetitle></ulink> contains detailed instructions on how to install &app; for each
-      operating system supported.
+    <para>The <ulink url="&url-www;download.phtml"><citetitle>&app; download page</citetitle></ulink> contains
+      detailed instructions on how to install &app; for each operating system supported.
     </para>
   </sect1>
 </chapter>
diff --git a/C/guide/ch_python_bindings.xml b/C/guide/ch_python_bindings.xml
index be4f038e..206e4e64 100644
--- a/C/guide/ch_python_bindings.xml
+++ b/C/guide/ch_python_bindings.xml
@@ -38,7 +38,8 @@ Translators:
       -DWITH_PYTHON=ON …</code> option enabled, otherwise all what follows won’t work. At
       present this option is not enabled by default, so if you need this, you may have to compile
       &app; from source yourself. But some distributions offer it also as a separate package with a
-      name like<package>
+      name like
+      <package>
         python[<replaceable>version</replaceable>]-&appname;
       </package>
     </para>
diff --git a/C/guide/ch_reports.xml b/C/guide/ch_reports.xml
index 0135aa30..31325c3e 100644
--- a/C/guide/ch_reports.xml
+++ b/C/guide/ch_reports.xml
@@ -24,9 +24,9 @@
   </para>
 
   <para>&app;'s reporting features allow you to display nearly any group of transactions in a wide variety
-    of formats. This makes it easy to answer questions about your finances, such as 
-    <quote>How much did I spend on groceries last month?</quote>
-	or <quote>How much did I earn in the previous six months?</quote>
+    of formats. This makes it easy to answer questions about your finances, such as <quote>How much
+    did I spend on groceries last month?</quote> or <quote>How much did I earn in the previous six
+    months?</quote>
   </para>
 
   <para>&app; includes a number of common report types, which can be modified to meet your specific needs.
@@ -43,8 +43,9 @@
 
     <para>When you select a report from the list of reports, that report is first run with its default
       settings. Once you have opened the report, you can modify its parameters by clicking on the
-      <guibutton>Options</guibutton> button on the toolbar. Under <guilabel>Options</guilabel>, you will see the different settings that you can
-      change for each report. Note that for different reports, the options will be different.
+      <guibutton>Options</guibutton> button on the toolbar. Under <guilabel>Options</guilabel>, you
+      will see the different settings that you can change for each report. Note that for different
+      reports, the options will be different.
     </para>
   </sect1>
 
@@ -52,52 +53,71 @@
     <title>Saved Reports Configurations Concepts</title>
 
     <para>Once you have modified a report to meet your needs, you may wish to save that report for reuse at a
-      later point. &app; allows custom reports to be saved, using the <guimenuitem>Save Report Configuration</guimenuitem>
-      command.
+      later point. &app; allows custom reports to be saved, using the <guimenuitem>Save Report
+      Configuration</guimenuitem> command.
     </para>
 
     <procedure>
-        <title>Save a report configuration</title>
+      <title>Save a report configuration</title>
 
-        <step><para>Go to the <guilabel>Reports</guilabel> Menu and choose the desired report.</para></step>
+      <step>
+        <para>Go to the <guilabel>Reports</guilabel> Menu and choose the desired report.
+        </para>
+      </step>
 
-        <step><para>Change the settings on the report until it includes what is needed.</para></step>
+      <step>
+        <para>Change the settings on the report until it includes what is needed.
+        </para>
+      </step>
 
-        <step><para>Go to the <guilabel>General</guilabel> tab of the report's options and change the Report Name to something meaningful 
-            (Do not confuse this with the Report Title.)
-        </para></step>
+      <step>
+        <para>Go to the <guilabel>General</guilabel> tab of the report's options and change the Report Name to
+          something meaningful (Do not confuse this with the Report Title.)
+        </para>
+      </step>
 
-        <step><para>Apply the changes and close the dialog.</para></step>
+      <step>
+        <para>Apply the changes and close the dialog.
+        </para>
+      </step>
 
-        <step><para>Click the <guibutton>Save Report Configuration</guibutton> or <guibutton>Save Report Configuration As...</guibutton> button.</para></step>
+      <step>
+        <para>Click the <guibutton>Save Report Configuration</guibutton> or <guibutton>Save Report Configuration
+          As...</guibutton> button.
+        </para>
+      </step>
     </procedure>
 
-
-
-
     <para>This will store the report options in a file in your home directory.
     </para>
 
     <para>The first time you save a report with a name that has not already been saved, you can use either the
-      <guibutton>Save Report Configuration</guibutton> or the <guibutton>Save Report Configuration As...</guibutton> button. You can modify the
-      report name before saving it.
+      <guibutton>Save Report Configuration</guibutton> or the <guibutton>Save Report Configuration
+      As...</guibutton> button. You can modify the report name before saving it.
     </para>
 
-    <para>Once a report has been saved with the current name, the <guibutton>Save Report Configuration</guibutton> button will
-      immediately update the saved report configuration. Use the <guibutton>Save Report Configuration As...</guibutton> button
-      to save the current report configuration with a new name.
+    <para>Once a report has been saved with the current name, the <guibutton>Save Report
+      Configuration</guibutton> button will immediately update the saved report configuration. Use
+      the <guibutton>Save Report Configuration As...</guibutton> button to save the current report
+      configuration with a new name.
     </para>
 
-    <para>Saved report configurations are available for use under the <menuchoice><guimenu>Reports</guimenu><guimenuitem>Saved Report Configurations</guimenuitem></menuchoice>
+    <para>Saved report configurations are available for use under the
+      <menuchoice>
+        <guimenu>Reports</guimenu><guimenuitem>Saved Report Configurations</guimenuitem>
+      </menuchoice>
       entry. They will also be available for use on multicolumn reports.
     </para>
 
-    <para>Saved report configurations can be deleted in the <guilabel>Saved Report Configurations</guilabel> dialog by clicking the
-      <guiicon>trashcan</guiicon> icon.
+    <para>Saved report configurations can be deleted in the <guilabel>Saved Report Configurations</guilabel>
+      dialog by clicking the <guiicon>trashcan</guiicon> icon.
     </para>
 
-    <para>To edit saved report configurations, open the report via <menuchoice><guimenu>Reports</guimenu><guimenuitem>Saved Report Configurations</guimenuitem></menuchoice>, edit
-      and apply the new options, and click <guibutton>Save Report Configuration</guibutton>.
+    <para>To edit saved report configurations, open the report via
+      <menuchoice>
+        <guimenu>Reports</guimenu><guimenuitem>Saved Report Configurations</guimenuitem>
+      </menuchoice>
+      , edit and apply the new options, and click <guibutton>Save Report Configuration</guibutton>.
     </para>
   </sect1>
 
@@ -309,8 +329,12 @@
 
         <figure id="fig-investlots" pgwide="1">
           <title>The Investment Lots Report</title>
+
           <screenshot id="InvestmentLotsScreenShot">
-            <screeninfo>1720x982</screeninfo>
+            <screeninfo>
+              1720x982
+            </screeninfo>
+
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Report_Investment_Lots.png"
@@ -326,10 +350,11 @@
         </figure>
 
         <para>The Investment Lots report shows details about lots in a selected set of accounts of type
-        <emphasis>Stock</emphasis> or <emphasis>Mutual Fund</emphasis> (see <xref linkend="invest-sellLots" />).
-        It includes an optional capital gains summary chart and a table with columns for dates, purchases, sales, end
-        balances, capital gains (realized and unrealized, short term and long term), and return on investment (ROI).
-        It also performs optional lot validation checks.
+          <emphasis>Stock</emphasis> or <emphasis>Mutual Fund</emphasis> (see
+          <xref linkend="invest-sellLots" />). It includes an optional capital gains summary chart
+          and a table with columns for dates, purchases, sales, end balances, capital gains
+          (realized and unrealized, short term and long term), and return on investment (ROI). It
+          also performs optional lot validation checks.
         </para>
 
         <para>The report can help answer questions such as:
@@ -342,14 +367,14 @@
           </listitem>
 
           <listitem>
-            <para>What capital gains have been realized for a particular time period (i.e. this year, last year,
-            etc)? Are they long term or short term gains?
+            <para>What capital gains have been realized for a particular time period (i.e. this year, last year, etc)?
+              Are they long term or short term gains?
             </para>
           </listitem>
 
           <listitem>
-            <para>Which lots held longer than 1+ years have the largest unrealized gains, and would therefore be
-            most advantageous (tax-wise) if donated to charity?
+            <para>Which lots held longer than 1+ years have the largest unrealized gains, and would therefore be most
+              advantageous (tax-wise) if donated to charity?
             </para>
           </listitem>
 
@@ -360,10 +385,10 @@
         </itemizedlist>
 
         <para>For more details, see the
-          <ulink url="&url-docs-C;help/report-classes.html#investment-lots-report">Investment Lots</ulink>
-          report documentation in the Manual.
+          <ulink url="&url-docs-C;help/report-classes.html#investment-lots-report">Investment
+          Lots</ulink> report documentation in the Manual.
         </para>
-     </sect3>
+      </sect3>
 
       <sect3 id="rpt_investport">
         <title>Investment Portfolio</title>
diff --git a/C/guide/ch_txns.xml b/C/guide/ch_txns.xml
index 043061e6..6c53d95b 100644
--- a/C/guide/ch_txns.xml
+++ b/C/guide/ch_txns.xml
@@ -84,33 +84,39 @@
       <para>&app; offers several options for viewing your registers. The default style is <guilabel>Basic
         Ledger</guilabel> mode, which displays only the summary of splits affecting the current
         account. This is the style that most closely resembles other popular personal financial
-        packages. You can choose a different register style from the <menuchoice>
+        packages. You can choose a different register style from the
+        <menuchoice>
           <guimenu>View</guimenu>
-        </menuchoice> menu. There are two other view modes:
+        </menuchoice>
+        menu. There are two other view modes:
       </para>
 
       <itemizedlist>
         <listitem>
           <para><menuchoice>
               <guimenu>View</guimenu><guimenuitem>Auto-Split Ledger</guimenuitem>
-            </menuchoice> style expands the current transaction automatically. As you highlight a new transaction in the
-            register, the transaction automatically expands to show all splits.
+            </menuchoice>
+            style expands the current transaction automatically. As you highlight a new transaction
+            in the register, the transaction automatically expands to show all splits.
           </para>
         </listitem>
 
         <listitem>
           <para><menuchoice>
               <guimenu>View</guimenu><guimenuitem>Transaction Journal</guimenuitem>
-            </menuchoice> style shows all splits for all transactions in the register, which is more like an accounting
-            journal.
+            </menuchoice>
+            style shows all splits for all transactions in the register, which is more like an
+            accounting journal.
           </para>
         </listitem>
       </itemizedlist>
 
-      <para>All styles permit you to view your data in either single-line or double-line format. Select <menuchoice>
+      <para>All styles permit you to view your data in either single-line or double-line format. Select
+        <menuchoice>
           <guimenu>View</guimenu> <guimenuitem>Double Line</guimenuitem>
-        </menuchoice>, and you will see your transaction line expand to two register lines. Double-line mode will also
-        display the transaction-level Notes field.
+        </menuchoice>
+        , and you will see your transaction line expand to two register lines. Double-line mode will
+        also display the transaction-level Notes field.
       </para>
 
       <para>Below are screenshots that demonstrate how the Basic Ledger and Transaction Journal views differ.
@@ -125,16 +131,17 @@
 
       <para>First let’s view the Jeans transaction from your checking account:
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>Purchase Of 3 Jeans In Assets:Checking</title>
+
         <screenshot id="txns-registersplit4">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_registersplit4.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>This image shows one split transaction with 3 Jeans purchases.
               </para>
@@ -146,16 +153,17 @@
       <para>Now, let’s open the <emphasis>Expenses:Clothes</emphasis> account, and look at it in Basic
         view.
       </para>
-
- <!-- ToDo: unshrink -->
+<!-- ToDo: unshrink -->
       <figure>
         <title>Purchase Of 3 Jeans In Expenses:Clothes Account In Basic Ledger Mode</title>
+
         <screenshot id="txns-registersplit5">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_registersplit5.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>This image shows them in the <emphasis>Expenses:Clothes</emphasis> account in Basic Ledger mode.
               </para>
@@ -172,16 +180,17 @@
 
       <para>Changing to Transaction Journal mode will display only the original split transaction.
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>Purchase Of 3 Jeans In Expenses:Clothes Account In Transaction Journal Mode</title>
+
         <screenshot id="txns-registersplit6">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_registersplit6.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>This image shows the Expenses:Clothes account in <emphasis>Transaction Journal</emphasis> mode.
               </para>
@@ -213,11 +222,12 @@
           cursor changes to a double-headed arrow (&dArrow;).
         </para>
       </note>
-      
+
       <important>
-        <para>When in split mode there are different column markers in the header for split rows and transaction rows
-          depending on which type of row is active. In order to adjust split column widths one must first make
-          a split row active; to adjust transaction line column widths a transaction row must be active.
+        <para>When in split mode there are different column markers in the header for split rows and transaction
+          rows depending on which type of row is active. In order to adjust split column widths one
+          must first make a split row active; to adjust transaction line column widths a transaction
+          row must be active.
         </para>
       </important>
 
@@ -292,11 +302,13 @@
               automatically append the year. The default this to take such a date in a sliding
               window starting 11 months before the current month. This means that if you enter 1/5
               (January 5th) as date while the current date is in December 2015, the date will be
-              completed as 1/5/16. This default can be changed via <menuchoice>
+              completed as 1/5/16. This default can be changed via
+              <menuchoice>
                 <guimenu>Edit</guimenu><guisubmenu>Preferences</guisubmenu><guisubmenu>Date/Time</guisubmenu>
                 <guilabel>Date Completion</guilabel>
-              </menuchoice>. You can change it to either always evaluate a date in the current calendar year or change the
-              start of the sliding window.
+              </menuchoice>
+              . You can change it to either always evaluate a date in the current calendar year or
+              change the start of the sliding window.
             </para>
           </tip>
         </listitem>
@@ -318,12 +330,15 @@
             completions. When you <keycap>Tab</keycap> with the offered completion text shown &app;
             will copy that previous transaction and focus the <guilabel>Debit</guilabel> or
             <guilabel>Credit</guilabel> value used, selected and ready for you to overwrite it with
-            a new value.<note>
+            a new value.
+            <note>
               <para>This copies the <emphasis>whole transaction</emphasis> including parts that may not be visible like
                 <guilabel>Notes</guilabel> and <guilabel>Price</guilabel>. Unless you intend to
                 exactly duplicate the transaction be sure to edit all fields that should differ.
               </para>
-            </note><tip>
+            </note>
+
+            <tip>
               <para>You can use this feature to fill in the transaction then go back to the
                 <guilabel>Description</guilabel> field and change the description.
               </para>
@@ -336,12 +351,15 @@
             account name and &app; will fill in the remaining part of the name. Typing the separator
             character at any time will complete the current level of the account name, leaving the
             cursor positioned to start the next level of account name. For example, typing
-            <keycombo action='seq'><keycap>A</keycap><keycap>:</keycap><keycap>C</keycap></keycombo> might complete to the <emphasis>Assets:Checking</emphasis> account.
-            Entering the name in sequence this way will pop up the whole account list with the
-            predicted item selected. Alternatively you can type any character sequence in the
-            account name and the popup will display an account list filtered to those accounts
-            containing the characters typed so far. In either case you may use the <keycap>Up
-            Arrow</keycap> or <keycap>Down Arrow</keycap> to select an account from the popup.
+            <keycombo action='seq'>
+              <keycap>A</keycap><keycap>:</keycap><keycap>C</keycap>
+            </keycombo>
+            might complete to the <emphasis>Assets:Checking</emphasis> account. Entering the name in
+            sequence this way will pop up the whole account list with the predicted item selected.
+            Alternatively you can type any character sequence in the account name and the popup will
+            display an account list filtered to those accounts containing the characters typed so
+            far. In either case you may use the <keycap>Up Arrow</keycap> or <keycap>Down
+            Arrow</keycap> to select an account from the popup.
           </para>
         </listitem>
 
@@ -357,12 +375,18 @@
         <listitem>
           <para>All of the menu items have access keys defined, and these are marked by underlined characters in the
             menu names while <keycap>Alt</keycap> is hold. Press
-            <keycombo><keycap>Alt</keycap><keycap><replaceable>underlined character</replaceable></keycap></keycombo>
-            to bring up the menu, then select an item by typing its underlined character. For example, typing <keycombo>
+            <keycombo>
+              <keycap>Alt</keycap><keycap><replaceable>underlined character</replaceable></keycap>
+            </keycombo>
+            to bring up the menu, then select an item by typing its underlined character. For
+            example, typing
+            <keycombo>
               <keycap>Alt</keycap><keycap>A</keycap>
-            </keycombo> brings up the Actions menu, then typing <keycap>P</keycap> will split the transaction. A few of the
-            menu items also have shortcut keys that immediately invoke the command (typically using
-            the <keycap>Ctrl</keycap> key). These shortcuts are listed next to the item.
+            </keycombo>
+            brings up the Actions menu, then typing <keycap>P</keycap> will split the transaction. A
+            few of the menu items also have shortcut keys that immediately invoke the command
+            (typically using the <keycap>Ctrl</keycap> key). These shortcuts are listed next to the
+            item.
           </para>
         </listitem>
 
@@ -372,9 +396,11 @@
 
           <itemizedlist>
             <listitem>
-              <para><keycap>Tab</keycap> to move to the next field, <keycombo>
+              <para><keycap>Tab</keycap> to move to the next field,
+                <keycombo>
                   <keycap>Shift</keycap> <keycap>Tab</keycap>
-                </keycombo> to move to the previous field
+                </keycombo>
+                to move to the previous field
               </para>
             </listitem>
 
@@ -398,9 +424,12 @@
             <listitem>
               <para><keycombo>
                   <keycap>Shift</keycap> <keycap>Page Up</keycap>
-                </keycombo> to go to the first transaction, <keycombo>
+                </keycombo>
+                to go to the first transaction,
+                <keycombo>
                   <keycap>Shift</keycap> <keycap>Page Down</keycap>
-                </keycombo> to go to the last transaction
+                </keycombo>
+                to go to the last transaction
               </para>
             </listitem>
           </itemizedlist>
@@ -412,9 +441,11 @@
 
       <itemizedlist>
         <listitem>
-          <para><keycap>Tab</keycap> moves to the next box and <keycombo>
+          <para><keycap>Tab</keycap> moves to the next box and
+            <keycombo>
               <keycap>Shift</keycap><keycap>Tab</keycap>
-            </keycombo> moves to the previous box
+            </keycombo>
+            moves to the previous box
           </para>
         </listitem>
 
@@ -473,16 +504,17 @@
       separated by gray lines. As you highlight one of the split lines, the column headings change
       to show the split-related fields:
     </para>
-
 <!-- ToDo: unshrink -->
     <figure>
       <title>Salary In The Assets:Checking Account</title>
+
       <screenshot id="txns-registersplit2">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_registersplit2.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
+
           <caption>
             <para>This image shows how split headings change.
             </para>
@@ -514,16 +546,17 @@
     <para>In this example, if you jump to the <emphasis>Income:Salary</emphasis> account, &app; brings up the
       same transaction in the <emphasis>Income:Salary</emphasis> - Register:
     </para>
-
- <!-- ToDo: unshrink -->
+<!-- ToDo: unshrink -->
     <figure>
       <title>Salary In The Income:Salary Account</title>
+
       <screenshot id="txns-registersplit3">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_registersplit3.png"
               srccredit="Bengt Thuree" />
           </imageobject>
+
           <caption>
             <para>This image shows a jump to the <emphasis>Income:Salary</emphasis> account.
             </para>
@@ -550,23 +583,24 @@
 
       <para>In the first transaction row, enter a date (e.g.: March, 1, 2006), a description (e.g.:
         <quote>Opening Balance</quote>), click on the <guilabel>Transfer</guilabel> pop-up menu and
-        select <emphasis>Equity:Opening Balances</emphasis>, add a deposit value of $1,000, and press
-        the <keycap function="enter">Enter</keycap> key. The account register should now appear
-        similar to this figure:
+        select <emphasis>Equity:Opening Balances</emphasis>, add a deposit value of $1,000, and
+        press the <keycap function="enter">Enter</keycap> key. The account register should now
+        appear similar to this figure:
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>The Checking Account After Inserting The Opening Balance Transaction</title>
+
         <screenshot id="txns-register-2account">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_register_2account.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
-              <para>This image shows the <emphasis>Assets:Checking</emphasis> register after inserting the opening balance
-                transaction.
+              <para>This image shows the <emphasis>Assets:Checking</emphasis> register after inserting the opening
+                balance transaction.
               </para>
             </caption>
           </mediaobject>
@@ -583,16 +617,17 @@
         account, you would set <guilabel>Transfer</guilabel> to
         <emphasis>Expenses:Groceries</emphasis>. The account register should now appear:
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>The Checking Account Adding A Transaction For Groceries</title>
+
         <screenshot id="txns-register-2account2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_register_2account2.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>This image shows <emphasis>Assets:Checking</emphasis> - Register after adding a transaction for
                 groceries.
@@ -656,10 +691,10 @@
         <xref
       linkend="txns-registers-features2"/> for details.
       </para>
-
 <!-- ToDo: unshrink -->
       <figure id="txns-register-multiaccount">
         <title>Entering a split transaction</title>
+
         <screenshot>
           <mediaobject>
             <imageobject>
@@ -739,13 +774,16 @@
         transactions, e.g. uncashed checks.
       </para>
 
-      <para>To use the reconciliation windows, select an account from the account tree and click on <menuchoice>
+      <para>To use the reconciliation windows, select an account from the account tree and click on
+        <menuchoice>
           <guimenu>Actions</guimenu> <guimenuitem>Reconcile</guimenuitem>
-        </menuchoice>. A window like the one below will appear in which you can enter the reconcile information.
+        </menuchoice>
+        . A window like the one below will appear in which you can enter the reconcile information.
       </para>
 
       <figure>
         <title>The Initial Reconcile Window</title>
+
         <screenshot id="txns-reconcile-window-1">
           <mediaobject>
             <imageobject>
@@ -876,19 +914,21 @@
 
       <figure>
         <title>Reconcile Window</title>
-          <screenshot id="txns-reconcile-window-2">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/txns_reconcile_window2.png"
+
+        <screenshot id="txns-reconcile-window-2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_reconcile_window2.png"
                            srccredit="Cristian Marchi"/>
-              </imageobject>
-              <caption>
-                <para>The transactions listing in the reconcile window.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
-        </figure>
+            </imageobject>
+
+            <caption>
+              <para>The transactions listing in the reconcile window.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The two panes called <guilabel>Funds In</guilabel> and <guilabel>Funds Out</guilabel>, lists all the
         unreconciled transactions that belongs to the account that is going to be reconciled. The
@@ -901,19 +941,23 @@
 
       <para>If you cannot find a transaction, then perhaps you forgot to enter it, or did not know that the
         transaction had happened. You can use the <guibutton>New</guibutton> button on the
-        <emphasis>Toolbar</emphasis>, or the <menuchoice>
+        <emphasis>Toolbar</emphasis>, or the
+        <menuchoice>
           <guimenu>Transaction</guimenu><guimenuitem>New</guimenuitem>
-        </menuchoice> menu item in the menu, to open a register window and enter the missing transaction. The new item
-        will appear in the <guilabel>Reconcile</guilabel> window when you press the
+        </menuchoice>
+        menu item in the menu, to open a register window and enter the missing transaction. The new
+        item will appear in the <guilabel>Reconcile</guilabel> window when you press the
         <guibutton>Enter</guibutton> button in the register after entering the transaction.
       </para>
 
       <para>When you find the item in the <guilabel>Reconcile</guilabel> window, compare the amount in the item
         to the amount on the statement. If they disagree, you may have made an error when you
         entered the transaction in &app;. You can use the <guibutton>Edit</guibutton> button on the
-        <emphasis>Toolbar</emphasis>, or the <menuchoice>
+        <emphasis>Toolbar</emphasis>, or the
+        <menuchoice>
           <guimenu>Transaction</guimenu><guimenuitem>Edit</guimenuitem>
-        </menuchoice> item, to open a register window and correct the transaction.
+        </menuchoice>
+        item, to open a register window and correct the transaction.
       </para>
 
       <para>If the amounts agree, click on the item in the <guilabel>Reconcile</guilabel> window. A check mark
@@ -966,10 +1010,12 @@
       </note>
 
       <para>When you have marked off all the items on the bank statement and the difference is 0.00, press the
-        <guibutton>Finish</guibutton> button on the <emphasis>Toolbar</emphasis> or select <menuchoice>
+        <guibutton>Finish</guibutton> button on the <emphasis>Toolbar</emphasis> or select
+        <menuchoice>
           <guimenu>Reconcile</guimenu><guimenuitem>Finish</guimenuitem>
-        </menuchoice> from the menu. The <guilabel>Reconcile</guilabel> window will close. In the register window, the
-        <guilabel>R</guilabel> field of the reconciled transactions will change to
+        </menuchoice>
+        from the menu. The <guilabel>Reconcile</guilabel> window will close. In the register window,
+        the <guilabel>R</guilabel> field of the reconciled transactions will change to
         <emphasis>y</emphasis>.
       </para>
 
@@ -981,10 +1027,10 @@
         the bottom of the account register, you will see a summary of what has been reconciled and
         what has been cleared (<guilabel>Cleared:USD 954.79 Reconciled:USD 0.00</guilabel>)
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>The Checking account after postponing the reconciliation</title>
+
         <screenshot id="txns-reconcile-window-3">
           <mediaobject>
             <imageobject>
@@ -1007,8 +1053,8 @@
       create it for you.
     </para>
 
-    <para>In this how-to, we’ll take a monthly Internet subscription of 20 USD as example, which is taken
-      on the 28th of each month.
+    <para>In this how-to, we’ll take a monthly Internet subscription of 20 USD as example, which is
+      taken on the 28th of each month.
     </para>
 
     <para>In &app;, there are two ways of creating scheduled transactions,
@@ -1023,10 +1069,10 @@
         <guilabel>Transfer</guilabel> field for this transaction, type
         <emphasis>Expenses:Internet</emphasis> as shown in the next screenshot.
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>Step 1 Of Creating Scheduled Transaction From The Ledger</title>
+
         <screenshot id="txns-sxn-ledger-1">
           <mediaobject>
             <imageobject>
@@ -1048,6 +1094,7 @@
 
       <figure>
         <title>Step 2 Of Creating Scheduled Transaction From The Ledger</title>
+
         <screenshot id="txns-sxn-ledger-2">
           <mediaobject>
             <imageobject>
@@ -1060,10 +1107,10 @@
 
       <para>A window like this will appear:
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>Step 3 Of Creating Scheduled Transaction From The Ledger</title>
+
         <screenshot id="txns-sxn-ledger-3">
           <mediaobject>
             <imageobject>
@@ -1077,10 +1124,10 @@
       <para>Let’s fill the values, we know that the subscription is taken on the 28th each month, and the
         next one is for next month (since we entered the one for this month manually) :
       </para>
-
 <!-- ToDo: unshrink -->
       <figure>
         <title>Filling In Data To A Scheduled Transaction</title>
+
         <screenshot id="txns-sxn-ledger-4">
           <mediaobject>
             <imageobject>
@@ -1105,21 +1152,25 @@
         once.
       </para>
 
-      <para>From the main accounts windows, select <menuchoice>
+      <para>From the main accounts windows, select
+        <menuchoice>
           <guimenu>Actions</guimenu><guisubmenu>Scheduled Transactions</guisubmenu>
           <guimenuitem>Scheduled Transaction Editor</guimenuitem>
-        </menuchoice> from the <emphasis>Menubar</emphasis>. A new <guilabel>Scheduled Transactions</guilabel> tab will be
-        opened in the current &app; window as shown below:
+        </menuchoice>
+        from the <emphasis>Menubar</emphasis>. A new <guilabel>Scheduled Transactions</guilabel> tab
+        will be opened in the current &app; window as shown below:
       </para>
 
       <figure>
         <title>Empty Scheduled Transactions Tab</title>
-       <screenshot id="txns-sxn-editor-2">
+
+        <screenshot id="txns-sxn-editor-2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_sxn_editor-2.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>Empty <guilabel>Scheduled Transactions</guilabel> tab
               </para>
@@ -1135,16 +1186,19 @@
 
       <figure>
         <title>Overview Tab Of The Edit Scheduled Transaction Window</title>
+
         <screenshot id="txns-sxn-editor-3-overview">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
                          srccredit="Cristian Marchi" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
                          srccredit="Cristian Marchi" />
             </imageobject>
+
             <caption>
               <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Overview</guilabel> tab
               </para>
@@ -1219,16 +1273,19 @@
 
       <figure>
         <title>Frequency Tab Of The Edit Scheduled Transaction Window</title>
+
         <screenshot id="txns-sxn-editor-3-frequency">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
                          srccredit="Cristian Marchi" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
                          srccredit="Cristian Marchi" />
             </imageobject>
+
             <caption>
               <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Frequency</guilabel> tab
               </para>
@@ -1312,16 +1369,19 @@
 
       <figure>
         <title>Template Tab Of The Edit Scheduled Transaction Window</title>
+
         <screenshot id="txns-sxn-editor-3-template">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_sxn_editor-3-template.png"
                          srccredit="Cristian Marchi" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_sxn_editor-3-template.png"
                          srccredit="Cristian Marchi" />
             </imageobject>
+
             <caption>
               <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Template
                 Transaction</guilabel> tab
@@ -1340,6 +1400,7 @@
 
       <figure>
         <title>The Finally Entered Scheduled Transaction</title>
+
         <screenshot id="txns-sxn-editor-4">
           <mediaobject>
             <imageobject>
@@ -1376,13 +1437,14 @@
 
       <figure>
         <title>Scheduled Transaction Popup Reminder</title>
+
         <screenshot id="txns-sxn-editor-slr">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_sxn_editor_slr.png"
                          srccredit="Cristian Marchi" />
             </imageobject>
-         </mediaobject>
+          </mediaobject>
         </screenshot>
       </figure>
 
@@ -1406,9 +1468,11 @@
 
       <note>
         <para>If you entered the transaction for 28 of April at this stage, then please <emphasis>revert
-          back</emphasis> to the last saved &app; file by selecting <menuchoice>
+          back</emphasis> to the last saved &app; file by selecting
+          <menuchoice>
             <guimenu>File</guimenu><guimenuitem>Open</guimenuitem>
-          </menuchoice> and choosing the previously saved <filename>gcashdata_3</filename> &app; file.
+          </menuchoice>
+          and choosing the previously saved <filename>gcashdata_3</filename> &app; file.
         </para>
       </note>
     </sect3>
@@ -1433,12 +1497,14 @@
 
       <figure>
         <title>Starting Point For Putting It All Together</title>
+
         <screenshot id="txns-puttoget1-Charts">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_puttoget_Charts.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>This image shows the starting point for this section.
               </para>
@@ -1504,12 +1570,14 @@
 
       <figure>
         <title>Chart Of Accounts After Setting The Opening Balance</title>
+
         <screenshot id="txns-puttoget1-Charts1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_puttoget_Charts1.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>This image shows the opening balances.
               </para>
@@ -1566,7 +1634,8 @@
           </para>
 
           <para>You could also set up a scheduled transaction to pay your rent, since the value of the rent is
-            likely to be constant for the foreseeable future.<itemizedlist>
+            likely to be constant for the foreseeable future.
+            <itemizedlist>
               <listitem>
                 <para>Start by clicking on the current (April 28) rent transaction, and click on the
                   <guilabel>Schedule</guilabel> icon
@@ -1605,8 +1674,8 @@
             the description of this transaction on the first line (e.g.: <quote>Employers R
             Us</quote>), as well as the date (14 March). In the <quote>split</quote> line below
             this, enter the deposit into <emphasis>Assets:Checking</emphasis> (e.g.:$670). Follow
-            this with the various tax deposits (<emphasis>Expenses:Taxes:Federal</emphasis> account (e.g.: $180),
-            <emphasis>Expenses:Taxes:Medicare</emphasis> account (e.g.: $90), and
+            this with the various tax deposits (<emphasis>Expenses:Taxes:Federal</emphasis> account
+            (e.g.: $180), <emphasis>Expenses:Taxes:Medicare</emphasis> account (e.g.: $90), and
             <emphasis>Expenses:Taxes:Social Security</emphasis> account (e.g.: $60)) and lastly the
             gross total of your paycheck (e.g.: $1,000) as a withdrawal transfer from
             <emphasis>Income:Salary</emphasis>.
@@ -1621,12 +1690,14 @@
 
       <figure>
         <title>Chart Of Accounts After Setting All The Various Transactions</title>
+
         <screenshot id="txns-puttoget2-Charts1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_puttoget_Charts2.png"
                          srccredit="Bengt Thuree" />
             </imageobject>
+
             <caption>
               <para>This image shows the ending balances after <xref
             linkend="chapter_txns" />.
@@ -1665,20 +1736,24 @@
           <para>First let’s have a look at the <guilabel>Cash Flow</guilabel> report for the month of March.
           </para>
 
-          <para>Select the cash flow report from <menuchoice>
+          <para>Select the cash flow report from
+            <menuchoice>
               <guimenu>Reports</guimenu> <guisubmenu>Income & Expense</guisubmenu>
               <guimenuitem>Cash Flow</guimenuitem>
-            </menuchoice>.
+            </menuchoice>
+            .
           </para>
 
           <figure>
             <title>Cash Flow Report For The Month Of March</title>
+
             <screenshot id="txns-puttoget2-Cash">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/txns_CashFlow.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Cash Flow report after <xref
                 linkend="chapter_txns" />.
@@ -1698,19 +1773,23 @@
           <para>Now let’s have a look at corresponding transaction report for the Checking account.
           </para>
 
-          <para>Select the transaction report from <menuchoice>
+          <para>Select the transaction report from
+            <menuchoice>
               <guimenu>Reports</guimenu> <guimenuitem>Transaction Report</guimenuitem>
-            </menuchoice>.
+            </menuchoice>
+            .
           </para>
 
-           <figure>
+          <figure>
             <title>Transaction Report For The Checking Account During March</title>
+
             <screenshot id="txns-puttoget2-TransactionRptChecking">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/txns_TransactionRptChecking.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Transaction Report for the Checking account during March.
                   </para>
@@ -1724,14 +1803,16 @@
           <para>Now let’s change the transaction report to only show the various Expenses accounts.
           </para>
 
-        <figure>
-          <title>Transaction Report For The Expenses Accounts During March</title>
+          <figure>
+            <title>Transaction Report For The Expenses Accounts During March</title>
+
             <screenshot id="txns-puttoget2-TransactionRptExpenses">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/txns_TransactionRptExpenses.png"
                              srccredit="Bengt Thuree" />
                 </imageobject>
+
                 <caption>
                   <para>This image shows the Transaction Report for the various Expense accounts during March.
                   </para>
diff --git a/C/guide/fdl-appendix.xml b/C/guide/fdl-appendix.xml
index c4124a78..044fd966 100644
--- a/C/guide/fdl-appendix.xml
+++ b/C/guide/fdl-appendix.xml
@@ -557,9 +557,8 @@
     </para>
 
     <para>If your document contains nontrivial examples of program code, we recommend releasing these examples
-      in parallel under your choice of free software license, such as the
-      <ulink url="&url-gpl;">GNU General Public License</ulink>,
-      to permit their use in free software.
+      in parallel under your choice of free software license, such as the <ulink url="&url-gpl;">GNU
+      General Public License</ulink>, to permit their use in free software.
     </para>
   </sect1>
 </appendix>
diff --git a/C/guide/index.docbook b/C/guide/index.docbook
index c94f73c5..ec850e23 100644
--- a/C/guide/index.docbook
+++ b/C/guide/index.docbook
@@ -22,9 +22,11 @@
 <!-- appropriate code -->
   <bookinfo>
     <title>&app; Tutorial and Concepts Guide</title>
+
     <subtitle>The Didactical Documentation</subtitle>
     <edition>v&manrevision;</edition>
     <titleabbrev>&appname; Guide &manrevision;</titleabbrev>
+
     <copyright>
       <year>2009-2023</year> <holder>&appname; Documentation Team</holder>
     </copyright>
@@ -56,14 +58,12 @@
     <copyright>
       <year>2001</year> <holder>Carol Champagne and Chris Lyttle</holder>
     </copyright>
-
 <!-- translators: uncomment this:
   <copyright>
    <year>2000</year>
    <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
   </copyright>
 -->
-
     <publisher>
       <publishername>The &appname; Documentation Team</publishername>
 <address>
@@ -84,510 +84,684 @@
         <revnumber>&appname; Tutorial and Concepts Guide 5.2</revnumber>
         <date>25 June 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 5.1</revnumber>
         <date>30 April 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 5.0</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.14</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.903</revnumber>
         <date>12 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.900</revnumber>
         <date>8 January 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.13</revnumber>
         <date>18 December 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.12</revnumber>
         <date>25 September 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.11</revnumber>
         <date>26 June 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.10</revnumber>
         <date>27 March 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.9</revnumber>
         <date>19 December 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
-        </revdescription>
-      </revision>
-      <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.8</revnumber>
-      <date>28 September 2021</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision>
-      <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.7</revnumber>
-      <date>26 September 2021</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision>
-      <revision><revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
-      <date>27 June 2021</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision><revision><revnumber>&appname; Tutorial and Concepts Guide 4.5</revnumber>
-      <date>28 March 2021</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision>
-      <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
-      <date>28 December 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.3</revnumber>
-      <date>27 December 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.2</revnumber>
-      <date>27 September 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.1</revnumber>
-      <date>26 July2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.0</revnumber>
-      <date>28 June 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.11</revnumber>
-      <date>28 June 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.903</revnumber>
-      <date>1 June 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.10</revnumber>
-      <date>11 April 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.9</revnumber>
-      <date>29 March 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.8</revnumber>
-      <date>29 December 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.7</revnumber>
-      <date>9 September 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.6</revnumber>
-      <date>30 June 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.5</revnumber>
-      <date>31 March 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.3</revnumber>
-      <date>30 September 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.2</revnumber>
-      <date>24 June 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.1</revnumber>
-      <date>28 April 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.0</revnumber>
-      <date>1 April 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.20</revnumber>
-      <date>1 April 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.19</revnumber>
-      <date>16 December 2017</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.18</revnumber>
-      <date>24 September 2017</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.17</revnumber>
-      <date>2 July 2017 2017</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.16</revnumber>
-      <date>26 March 2017</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.15</revnumber>
-      <date>18 December 2016</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.11</revnumber>
-      <date>11 January 2016</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.10</revnumber>
-      <date>20 December 2015</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.8</revnumber>
-      <date>27 September 2015</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.7</revnumber>
-      <date>28 June 2015</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.3</revnumber>
-      <date>30 March 2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.2</revnumber>
-      <date>2 March 2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.1</revnumber>
-      <date>26 January 2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.0</revnumber>
-      <date>29 December 2013</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.4.2</revnumber>
-      <date>17 November 2012</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.4.1</revnumber>
-      <date>1 July 2011</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.3.16</revnumber>
-      <date>November 7, 2010</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="author">Bengt Thuree
-        </para>
-
-        <para role="author">Dave Herman
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.0.0</revnumber>
-      <date>July 9, 2006</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="author">Bengt Thuree
-        </para>
-
-        <para role="author">Dave Herman
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.3</revnumber>
-      <date>Aug 2003</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.2</revnumber>
-      <date>Aug 2003</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.1</revnumber>
-      <date>May 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.0</revnumber>
-      <date>Jan 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; User Guide v1.6.5</revnumber> <date>June
-      2002</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; User Guide v1.6.0</revnumber> <date>October
-      2001</date>
-      <revdescription>
-        <para role="author">Carol Champagne
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.8</revnumber>
+        <date>28 September 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.7</revnumber>
+        <date>26 September 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
+        <date>27 June 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.5</revnumber>
+        <date>28 March 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.3</revnumber>
+        <date>27 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.2</revnumber>
+        <date>27 September 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.1</revnumber>
+        <date>26 July2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.0</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.11</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.903</revnumber>
+        <date>1 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.10</revnumber>
+        <date>11 April 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.9</revnumber>
+        <date>29 March 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.8</revnumber>
+        <date>29 December 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.7</revnumber>
+        <date>9 September 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.5</revnumber>
+        <date>31 March 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.3</revnumber>
+        <date>30 September 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.2</revnumber>
+        <date>24 June 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.1</revnumber>
+        <date>28 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.0</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.20</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.19</revnumber>
+        <date>16 December 2017</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.18</revnumber>
+        <date>24 September 2017</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.17</revnumber>
+        <date>2 July 2017 2017</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.16</revnumber>
+        <date>26 March 2017</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.15</revnumber>
+        <date>18 December 2016</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.11</revnumber>
+        <date>11 January 2016</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.10</revnumber>
+        <date>20 December 2015</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.8</revnumber>
+        <date>27 September 2015</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.7</revnumber>
+        <date>28 June 2015</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.3</revnumber>
+        <date>30 March 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.2</revnumber>
+        <date>2 March 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.1</revnumber>
+        <date>26 January 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.0</revnumber>
+        <date>29 December 2013</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.4.2</revnumber>
+        <date>17 November 2012</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.4.1</revnumber>
+        <date>1 July 2011</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.3.16</revnumber>
+        <date>November 7, 2010</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="author">Bengt Thuree
+          </para>
+
+          <para role="author">Dave Herman
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.0.0</revnumber>
+        <date>July 9, 2006</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="author">Bengt Thuree
+          </para>
+
+          <para role="author">Dave Herman
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.3</revnumber>
+        <date>Aug 2003</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.2</revnumber>
+        <date>Aug 2003</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.1</revnumber>
+        <date>May 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.0</revnumber>
+        <date>Jan 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; User Guide v1.6.5</revnumber>
+        <date>June 2002</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; User Guide v1.6.0</revnumber>
+        <date>October 2001</date>
+        <revdescription>
+          <para role="author">Carol Champagne
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
       </revision>
     </revhistory>
 
@@ -715,7 +889,7 @@
 -->
   </preface>
 
-    <xi:include href="ch_oview.xml" />
+  <xi:include href="ch_oview.xml" />
 
   <part id="part.getting_started">
     <title>The Basic Knowledge</title>
diff --git a/C/manual/ch_Account-Actions.xml b/C/manual/ch_Account-Actions.xml
index eed47334..11890de4 100644
--- a/C/manual/ch_Account-Actions.xml
+++ b/C/manual/ch_Account-Actions.xml
@@ -38,7 +38,8 @@
     <warning>
       <para>The Accounts Payable and Accounts Receivable types are used internally by &app;’s business
         features. Transactions involving these accounts should not be added, changed or deleted in
-        any way other than by using<itemizedlist>
+        any way other than by using
+        <itemizedlist>
           <listitem>
             <para>post/unpost bill/invoice/voucher or
             </para>
@@ -328,7 +329,8 @@
       chart of accounts is as a tree. The main branches represent entire categories or groups, while
       the leaves of the tree denote individual bank accounts or expense categories. When a summary
       report is requested, typically only the main branches are shown in the report, rather than the
-      individual accounts. For example, a chart of accounts might look like the following:<xi:include href="chtacctseg.xml"/>
+      individual accounts. For example, a chart of accounts might look like the following:
+      <xi:include href="chtacctseg.xml"/>
     </para>
 
     <note id="accts-code">
@@ -367,9 +369,11 @@
   <sect1 id="acct-create">
     <title>Creating a New Account</title>
 
-    <para>To create a new account go to<menuchoice>
+    <para>To create a new account go to
+      <menuchoice>
         <guimenu>Actions</guimenu><guimenuitem>New Account...</guimenuitem>
-      </menuchoice>or click the <guibutton>New</guibutton> <emphasis>Toolbar</emphasis> icon in the Account Tree
+      </menuchoice>
+      or click the <guibutton>New</guibutton> <emphasis>Toolbar</emphasis> icon in the Account Tree
       Window. The <guilabel>New Account</guilabel> dialog will be opened.
     </para>
 
@@ -418,9 +422,11 @@
         provides a way of connecting the account to stock information if it is one of the currency,
         mutual fund or stock account types. It can also be flagged as a
         <link linkend="accts-placeholder">Placeholder</link> account. It displays if it is flagged
-        as a <guilabel>Tax Related</guilabel> account (which is set through the<menuchoice>
+        as a <guilabel>Tax Related</guilabel> account (which is set through the
+        <menuchoice>
           <guimenu>Edit</guimenu><guimenuitem>Tax Report Options</guimenuitem>
-        </menuchoice>dialog).
+        </menuchoice>
+        dialog).
       </para>
 
       <para>There are seven fields in the <guilabel>Identification</guilabel> section of this tab.
@@ -515,10 +521,12 @@
       <para>The <guilabel>Tax Related</guilabel> check-box means that an account has been flagged to be included
         in the Tax Schedule Report. This flag is only displayed on the <guilabel>Edit
         Account</guilabel> dialog and is set in the <guilabel>Income Tax Information</guilabel>
-        dialog (<menuchoice>
+        dialog (
+        <menuchoice>
           <guimenu>Edit</guimenu><guimenuitem>Tax Report Options</guimenuitem>
-        </menuchoice>). For related reports see the examples like <guilabel>Tax Schedule Report and TXF Export</guilabel>
-        in (<xref linkend="report-regional"/>).
+        </menuchoice>
+        ). For related reports see the examples like <guilabel>Tax Schedule Report and TXF
+        Export</guilabel> in (<xref linkend="report-regional"/>).
       </para>
 
       <para>The <guilabel>Placeholder</guilabel> check-box sets an account to read-only status and prevents the
@@ -533,10 +541,12 @@
       </note>
 
       <para>The <guilabel>Hidden</guilabel> check box hides an account (and any sub-accounts) in the account
-        tree. To reset this option, you will first need to open the<menuchoice>
+        tree. To reset this option, you will first need to open the
+        <menuchoice>
           <guimenu>View</guimenu><guimenuitem>Filter By...</guimenuitem>
-        </menuchoice>dialog for the account tree and check the <guilabel>Show hidden accounts</guilabel> option. Doing so
-        will allow you to select the account and reopen this dialog.
+        </menuchoice>
+        dialog for the account tree and check the <guilabel>Show hidden accounts</guilabel> option.
+        Doing so will allow you to select the account and reopen this dialog.
       </para>
 
       <note id="accts-hidden">
@@ -550,7 +560,8 @@
       </para>
 
       <para>The next pane contains an account tree to choose a <guilabel>Parent Account</guilabel>. To create a
-        new account tree select <guilabel>New top level account</guilabel>.<note>
+        new account tree select <guilabel>New top level account</guilabel>.
+        <note>
           <para>The available choices in the <guilabel>Account Type</guilabel> pane depends on the selected account
             in the <guilabel>Parent Account</guilabel> pane. For example if the <guilabel>Parent
             Account</guilabel> is <emphasis>Assets</emphasis> you will see only
@@ -732,13 +743,15 @@
 
     <para>The <guilabel>Edit Account</guilabel> dialog consists of just the <guilabel>General</guilabel> tab.
       This tab has the same information that was described in <xref linkend="acct-create"></xref>.
-      To access the <guilabel>Edit Account</guilabel> dialog go to<menuchoice>
+      To access the <guilabel>Edit Account</guilabel> dialog go to
+      <menuchoice>
         <shortcut>
         <keycombo>
           <keycap>Ctrl</keycap><keycap>E</keycap>
         </keycombo>
         </shortcut> <guimenu>Edit</guimenu><guimenuitem>Edit Account</guimenuitem>
-      </menuchoice>or click the <guibutton>Edit</guibutton> <emphasis>Toolbar</emphasis> icon in the Account Tree
+      </menuchoice>
+      or click the <guibutton>Edit</guibutton> <emphasis>Toolbar</emphasis> icon in the Account Tree
       Window.
     </para>
   </sect1>
@@ -1070,9 +1083,11 @@
 
     <para>A side effect of removing an account that contains transactions is that you will end up with
       unbalanced accounts. This will be indicated in the account by a gray check-box next to the
-      debit and credit amounts. You can automatically repair these unbalanced accounts by using the<menuchoice>
+      debit and credit amounts. You can automatically repair these unbalanced accounts by using the
+      <menuchoice>
         <guimenu>Actions</guimenu><guimenuitem>Check & Repair</guimenuitem>
-      </menuchoice>menu. This will automatically assign the unbalanced amounts to a new account named
+      </menuchoice>
+      menu. This will automatically assign the unbalanced amounts to a new account named
       <emphasis role="bold">Imbalance. </emphasis>
     </para>
   </sect1>
@@ -1092,9 +1107,11 @@
 
     <tip>
       <para>The Reconcile window is accessed from the account tree window or the account register window by
-        selecting<menuchoice>
+        selecting
+        <menuchoice>
           <guimenu><accel>A</accel>ctions</guimenu><guimenuitem><accel>R</accel>econcile…</guimenuitem>
-        </menuchoice>.
+        </menuchoice>
+        .
       </para>
     </tip>
 
@@ -1102,10 +1119,12 @@
       <para>If you are reconciling an Liability Account of type <guilabel>credit card</guilabel> using a credit
         card statement you have the option of using the <guilabel>Transfer Funds</guilabel> dialogue
         that opens automatically and enter a credit card payment. You can change this behaviour in
-        the <guilabel>&appname; Preferences</guilabel> from the menu<menuchoice>
+        the <guilabel>&appname; Preferences</guilabel> from the menu
+        <menuchoice>
           <guimenu><accel>E</accel>dit</guimenu><guimenuitem>Pr<accel>e</accel>ferences</guimenuitem>
-        </menuchoice>in the <guilabel>Register</guilabel> tab by activating the checkbox <guilabel>Automatic credit card
-        payment</guilabel>. (see <xref linkend="prefs-reg" />)
+        </menuchoice>
+        in the <guilabel>Register</guilabel> tab by activating the checkbox <guilabel>Automatic
+        credit card payment</guilabel>. (see <xref linkend="prefs-reg" />)
       </para>
     </note>
 
@@ -1374,16 +1393,20 @@
         opened.
       </para>
 
-      <para>If you wish to postpone the reconciliation until later use the<menuchoice>
+      <para>If you wish to postpone the reconciliation until later use the
+        <menuchoice>
           <shortcut>
           <keycombo>
             <keycap>Ctrl</keycap><keycap>P</keycap>
           </keycombo>
           </shortcut> <guimenu><accel>R</accel>econcile</guimenu><guimenuitem>Postpone</guimenuitem>
-        </menuchoice>menu item or pressing the <guibutton>Postpone</guibutton> icon. If you wish to cancel the
-        reconciliation use the<menuchoice>
+        </menuchoice>
+        menu item or pressing the <guibutton>Postpone</guibutton> icon. If you wish to cancel the
+        reconciliation use the
+        <menuchoice>
           <guimenu><accel>R</accel>econcile</guimenu><guimenuitem>Cancel</guimenuitem>
-        </menuchoice>menu item or press the <guibutton>Cancel</guibutton> icon.
+        </menuchoice>
+        menu item or press the <guibutton>Cancel</guibutton> icon.
       </para>
 
       <para>All previous commands are also available in the <guilabel>Reconcile</guilabel> dialog menu.
@@ -1394,13 +1417,15 @@
         reflect each selected transaction until the <guilabel>Ending Balance</guilabel>
         <emphasis>equals</emphasis> the <guilabel>Reconciled Balance</guilabel> and the
         <guilabel>Difference</guilabel> is <emphasis>zero</emphasis>. Once this is done select the
-        <guibutton>Finish</guibutton> button or<menuchoice>
+        <guibutton>Finish</guibutton> button or
+        <menuchoice>
           <shortcut>
           <keycombo>
             <keycap>Ctrl</keycap><keycap>W</keycap>
           </keycombo>
           </shortcut> <guimenu><accel>R</accel>econcile</guimenu><guimenuitem>Finish</guimenuitem>
-        </menuchoice>to finish the reconcile process.
+        </menuchoice>
+        to finish the reconcile process.
       </para>
     </sect2>
   </sect1>
diff --git a/C/manual/ch_Business.xml b/C/manual/ch_Business.xml
index 65206b83..230a1301 100644
--- a/C/manual/ch_Business.xml
+++ b/C/manual/ch_Business.xml
@@ -319,8 +319,9 @@
       integrated A/R system will place transactions, debiting it when you post bills and crediting
       it when you receive payments.
     </para>
+
     <example>
-    <title>Basic A/R Account Hierarchy</title>
+      <title>Basic A/R Account Hierarchy</title>
 <screen>-Assets
   -Accounts Receivable
   -Checking
@@ -1128,9 +1129,9 @@
 
       <para>This can best be done starting from the asset account register holding the imported payment
         transaction (like your bank account). In that account, select the payment, right-click
-        (control-click for &mac;) and choose <guilabel>Assign as payment...</guilabel>. The
-        payment window will pop-up, partly filled in with the information from the transaction. Fill
-        in the missing information like the proper customer and invoice to complete the payment.
+        (control-click for &mac;) and choose <guilabel>Assign as payment...</guilabel>. The payment
+        window will pop-up, partly filled in with the information from the transaction. Fill in the
+        missing information like the proper customer and invoice to complete the payment.
       </para>
 
       <para>One caveat: the logic behind <guilabel>Assign as payment...</guilabel> won't properly detect credit
@@ -1252,7 +1253,7 @@
 
           <para>In case the payment has associated <emphasis>lot link</emphasis>
             transactions<link linkend="busnss-ar-baddeb-lot"><superscript>a</superscript></link>,
-             remove those as well.
+            remove those as well.
           </para>
 
           <para>If all is well, your <guilabel>Process Payment</guilabel> window for this customer should list the
@@ -1284,20 +1285,23 @@
       <para>If all is well, your <guilabel>Process Payment</guilabel> window should still be clean: no
         pre-payments, and the bad debt invoice gone.
       </para>
-      <!-- Todo: As soon as yelp understads <footnotelink> convert this into a <footnote> and the links above in <footnotelink>s. -->
+<!-- Todo: As soon as yelp understads <footnotelink> convert this into a <footnote> and the links above in <footnotelink>s. -->
       <caution id="busnss-ar-baddeb-lot">
         <para><superscript>a</superscript> &app; version
           <variablelist>
             <varlistentry>
               <term>2.6.0 to 2.6.4</term>
+
               <listitem>
-                <para>created lot link transactions which show in the A/R account register. This came
-                   with its own set of subtle issues.
+                <para>created lot link transactions which show in the A/R account register. This came with its own set of
+                  subtle issues.
                 </para>
               </listitem>
             </varlistentry>
+
             <varlistentry>
               <term>2.6.5</term>
+
               <listitem>
                 <para>had a flaw in the logic cleaning up the lot links.
                 </para>
@@ -1305,37 +1309,40 @@
             </varlistentry>
           </variablelist>
         </para>
-        <para>
-          It is recommended to upgrade to the latest (or at least 2.6.6) version, which fixes a lot
-          of small problems. Once upgraded, please run
-          <!-- ToDo: Replace the <menuchoice> after the entities are fixed by:  &mc.ac.chk-rep.all; —or at least &mc.ac.chk-rep.acct; 
+
+        <para>It is recommended to upgrade to the latest (or at least 2.6.6) version, which fixes a lot of small
+          problems. Once upgraded, please run
+<!-- ToDo: Replace the <menuchoice> after the entities are fixed by:  &mc.ac.chk-rep.all; —or at least &mc.ac.chk-rep.acct; 
           on your A/R and A/P accounts— -->
           <menuchoice>
             <guimenu> Actions</guimenu><guimenuitem>Check & Repair</guimenuitem>
           </menuchoice>
-          to clean up most of the lot link legacy. Don't forget to make
-          a backup first just in case.
+          to clean up most of the lot link legacy. Don't forget to make a backup first just in case.
         </para>
 
         <variablelist>
           <title>Distinction between <emphasis>Lot</emphasis> and <emphasis>Lot link</emphasis></title>
+
           <varlistentry>
             <term>Lots</term>
+
             <listitem>
-              <para>are used internally for relating payments to invoices. Lots themselves are invisible in the
-                account registers. To see them you need to open the lot viewer, which can be found in &mc.ac.vw-lots;
-                while in any A/R or A/P account register. Select a lot to see the <emphasis>Splits in
-                lot</emphasis>.
+              <para>are used internally for relating payments to invoices. Lots themselves are invisible in the account
+                registers. To see them you need to open the lot viewer, which can be found in
+                &mc.ac.vw-lots; while in any A/R or A/P account register. Select a lot to see the
+                <emphasis>Splits in lot</emphasis>.
               </para>
             </listitem>
           </varlistentry>
+
           <varlistentry>
             <term>Lot links</term>
+
             <listitem>
-              <para>are <emphasis>transactions</emphasis> which you can see in your A/R
-                and A/P accounts. They are unusual in the sense that all their splits are in one account
-                (A/R or A/P). Each split in a lot link transaction is <emphasis>linked</emphasis> (hence
-                the name) to an invoice or payment transaction by means of a lot.
+              <para>are <emphasis>transactions</emphasis> which you can see in your A/R and A/P accounts. They are
+                unusual in the sense that all their splits are in one account (A/R or A/P). Each
+                split in a lot link transaction is <emphasis>linked</emphasis> (hence the name) to
+                an invoice or payment transaction by means of a lot.
               </para>
             </listitem>
           </varlistentry>
@@ -1991,9 +1998,9 @@
 
       <para>This can best be done starting from the asset account register holding the imported payment
         transaction (like your bank account). In that account, select the payment, right-click
-        (control-click for &mac;) and choose <guilabel>Assign as payment...</guilabel>. The
-        payment window will pop-up, partly filled in with the information from the transaction. Fill
-        in the missing information like the proper vendor and bill to complete the payment.
+        (control-click for &mac;) and choose <guilabel>Assign as payment...</guilabel>. The payment
+        window will pop-up, partly filled in with the information from the transaction. Fill in the
+        missing information like the proper vendor and bill to complete the payment.
       </para>
 
       <para>One caveat: the logic behind <guilabel>Assign as payment...</guilabel> won't properly detect credit
diff --git a/C/manual/ch_Customize.xml b/C/manual/ch_Customize.xml
index b1c03c3e..33757e78 100755
--- a/C/manual/ch_Customize.xml
+++ b/C/manual/ch_Customize.xml
@@ -32,26 +32,29 @@ Translators:
       <menuchoice>
         <guimenu>View</guimenu> <guimenuitem>Filter By ...</guimenuitem>
       </menuchoice>
-      is used to set or modify the view of the account tree window.
-      The <guilabel>Accounts</guilabel> tab of this form allows the selection of the types of accounts to display.
-      These selections effect the view on each specific open window of the account tree.
+      is used to set or modify the view of the account tree window. The
+      <guilabel>Accounts</guilabel> tab of this form allows the selection of the types of accounts
+      to display. These selections effect the view on each specific open window of the account tree.
     </para>
 
-    <para>The <guilabel>Other</guilabel> tab allows enabling/disabling of the options; Show Hidden accounts, Show zero total accounts.
+    <para>The <guilabel>Other</guilabel> tab allows enabling/disabling of the options; Show Hidden accounts,
+      Show zero total accounts.
     </para>
 
-    <para>The account tree window, by default, only shows the quantity of each commodity that you own, under the column heading <guilabel>Total</guilabel>.
-      Often, however, you may want to display other values.
-      This is easily accomplished by clicking on the <guibutton>Options</guibutton> button (the small down pointing arrow on the right side of the main account window <emphasis>Titlebar</emphasis>), and selecting the option(s) to display.
-      These selections set the view on all open windows of the account tree.
+    <para>The account tree window, by default, only shows the quantity of each commodity that you own, under
+      the column heading <guilabel>Total</guilabel>. Often, however, you may want to display other
+      values. This is easily accomplished by clicking on the <guibutton>Options</guibutton> button
+      (the small down pointing arrow on the right side of the main account window
+      <emphasis>Titlebar</emphasis>), and selecting the option(s) to display. These selections set
+      the view on all open windows of the account tree.
     </para>
   </sect1>
 
   <sect1 id="set-prefs">
     <title>Setting Preferences</title>
 
-    <para>The <guilabel>&appname; Preferences</guilabel> window allows you to customize your &app; session by setting several options.
-      From the &app; menu select
+    <para>The <guilabel>&appname; Preferences</guilabel> window allows you to customize your &app; session by
+      setting several options. From the &app; menu select
       <menuchoice>
         <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
       </menuchoice>
@@ -59,17 +62,19 @@ Translators:
       <menuchoice>
         <guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem>
       </menuchoice>
-      on &mac;).
-      The <guilabel>&appname; Preferences</guilabel> window will open.
-      Using the tabs on the left make your desired changes.
-      The settings in this dialog are set per user and not stored with the file.
-      This is in contrast to the settings described in <xref linkend="book-options"/>, which are kept with, and are part of, the file (or Book), and as such are common to all users.
-      So <guilabel>&appname; Preferences</guilabel> settings are individual to each user who uses a given file and any changes made by one user will not affect other users of that file.
-      Also, a given user's preferences will be common to all files that that user opens with &app;.
+      on &mac;). The <guilabel>&appname; Preferences</guilabel> window will open. Using the tabs on
+      the left make your desired changes. The settings in this dialog are set per user and not
+      stored with the file. This is in contrast to the settings described in
+      <xref linkend="book-options"/>, which are kept with, and are part of, the file (or Book), and
+      as such are common to all users. So <guilabel>&appname; Preferences</guilabel> settings are
+      individual to each user who uses a given file and any changes made by one user will not affect
+      other users of that file. Also, a given user's preferences will be common to all files that
+      that user opens with &app;.
     </para>
 
     <tip>
-      <para>Pausing the cursor for a couple of seconds over options in these windows will display a tooltip with in-depth information on the choice.
+      <para>Pausing the cursor for a couple of seconds over options in these windows will display a tooltip with
+        in-depth information on the choice.
       </para>
     </tip>
 
@@ -78,16 +83,18 @@ Translators:
       </para>
     </note>
 
-    <para>To close the <guilabel>&appname; Preferences</guilabel> window press the <guibutton>Close</guibutton> button.
+    <para>To close the <guilabel>&appname; Preferences</guilabel> window press the
+      <guibutton>Close</guibutton> button.
     </para>
 
-    <para>Each tab in the <guilabel>&appname; Preferences</guilabel> window is discussed in its own section below.
-      For a listing of the tabs, see <xref linkend="custom-gnucash"/>.
+    <para>Each tab in the <guilabel>&appname; Preferences</guilabel> window is discussed in its own section
+      below. For a listing of the tabs, see <xref linkend="custom-gnucash"/>.
     </para>
 
     <note>
-      <para>The presentation of the sections that follows matches the order of the tabs, which are sorted alphabetically by name, in English.
-        The order of the tabs may be different in other languages.
+      <para>The presentation of the sections that follows matches the order of the tabs, which are sorted
+        alphabetically by name, in English. The order of the tabs may be different in other
+        languages.
       </para>
     </note>
 
@@ -95,7 +102,9 @@ Translators:
       <title>Accounting Period</title>
 
       <figure id="prefs-acct-period-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounting Period</guilabel> tab</title><screenshot id="Prefer_Accounting-Period">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounting Period</guilabel> tab</title>
+
+        <screenshot id="Prefer_Accounting-Period">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_AccntPeriod.png"
@@ -121,15 +130,15 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Relative:</guilabel> Use the specified relative starting date for profit/loss calculations.
-                Also use this date for net assets calculations.
-                Relative defines start by today or start of current/previous year, quarter, month.
+              <para><guilabel>Relative:</guilabel> Use the specified relative starting date for profit/loss
+                calculations. Also use this date for net assets calculations. Relative defines start
+                by today or start of current/previous year, quarter, month.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Absolute:</guilabel> Use the specified absolute starting date for profit/loss calculations.
-                Also use this date for net assets calculations.
+              <para><guilabel>Absolute:</guilabel> Use the specified absolute starting date for profit/loss
+                calculations. Also use this date for net assets calculations.
               </para>
             </listitem>
           </itemizedlist>
@@ -160,12 +169,15 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Include grand total:</guilabel> If checked, show in the <emphasis>Summarybar</emphasis> a grand total of all accounts converted to the default currency.
+              <para><guilabel>Include grand total:</guilabel> If checked, show in the <emphasis>Summarybar</emphasis> a
+                grand total of all accounts converted to the default currency.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Include non-currency totals:</guilabel> if this option is selected, &app; will include in the <emphasis>Summarybar</emphasis> a total for non-currency items (for instance number of shares).
+              <para><guilabel>Include non-currency totals:</guilabel> if this option is selected, &app; will include in
+                the <emphasis>Summarybar</emphasis> a total for non-currency items (for instance
+                number of shares).
               </para>
             </listitem>
           </itemizedlist>
@@ -177,7 +189,9 @@ Translators:
       <title>Accounts</title>
 
       <figure id="prefs-acct-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title><screenshot id="Prefer_Accounts">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title>
+
+        <screenshot id="Prefer_Accounts">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Accnts.png"
@@ -198,25 +212,31 @@ Translators:
 
       <itemizedlist>
         <listitem>
-          <para><guilabel>Separator Character:</guilabel> The account separator is the character that separates a parent account from its sub-account, for example Utilities:Electric.
-            The default is a <keycap>:</keycap> (Colon), but you can also select <keycap>/</keycap> (Slash), <keycap>\</keycap> (Backslash), <keycap>-</keycap> (Dash) or <keycap>.</keycap> (Period), or any Unicode character that isn’t a letter or a number.
+          <para><guilabel>Separator Character:</guilabel> The account separator is the character that separates a
+            parent account from its sub-account, for example Utilities:Electric. The default is a
+            <keycap>:</keycap> (Colon), but you can also select <keycap>/</keycap> (Slash),
+            <keycap>\</keycap> (Backslash), <keycap>-</keycap> (Dash) or <keycap>.</keycap>
+            (Period), or any Unicode character that isn’t a letter or a number.
           </para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Reverse Balanced accounts:</guilabel> This option lets you determine whether account balances will display as positive or negative numbers:
+          <para><guilabel>Reverse Balanced accounts:</guilabel> This option lets you determine whether account
+            balances will display as positive or negative numbers:
           </para>
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Income & Expense</guilabel> assigns a positive credit balance to income account balances and a negative debit balance to expense account balances.
-                See <xref linkend="acct-types"></xref> for more information on these account types.
+              <para><guilabel>Income & Expense</guilabel> assigns a positive credit balance to income account
+                balances and a negative debit balance to expense account balances. See
+                <xref linkend="acct-types"></xref> for more information on these account types.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Credit accounts</guilabel> (default) displays a positive balance for account types that would normally carry a credit balance (income, credit, liability, equity).
-                See <xref linkend="acct-types"></xref> for more information on these account types.
+              <para><guilabel>Credit accounts</guilabel> (default) displays a positive balance for account types that
+                would normally carry a credit balance (income, credit, liability, equity). See
+                <xref linkend="acct-types"></xref> for more information on these account types.
               </para>
             </listitem>
 
@@ -228,12 +248,16 @@ Translators:
         </listitem>
 
         <listitem>
-          <para><guilabel>Labels:</guilabel> Select this option if you want column headings in the register to refer to <guilabel>debits</guilabel> and <guilabel>credits</guilabel> instead of the default informal headings such as <guilabel>withdrawal</guilabel> and <guilabel>deposit</guilabel>.
+          <para><guilabel>Labels:</guilabel> Select this option if you want column headings in the register to refer
+            to <guilabel>debits</guilabel> and <guilabel>credits</guilabel> instead of the default
+            informal headings such as <guilabel>withdrawal</guilabel> and
+            <guilabel>deposit</guilabel>.
           </para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Default Currency:</guilabel> This item determines which currency will be selected by default when creating new accounts.
+          <para><guilabel>Default Currency:</guilabel> This item determines which currency will be selected by
+            default when creating new accounts.
           </para>
 
           <itemizedlist>
@@ -250,17 +274,20 @@ Translators:
         </listitem>
 
         <listitem>
-          <para><guilabel>Account Color:</guilabel> This option lets you manage the display of the account color set in the <guilabel>Edit Account</guilabel> window:
+          <para><guilabel>Account Color:</guilabel> This option lets you manage the display of the account color set
+            in the <guilabel>Edit Account</guilabel> window:
           </para>
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Show the Account Colors as background:</guilabel> show the accounts color as account name background in the Accounts Page.
+              <para><guilabel>Show the Account Colors as background:</guilabel> show the accounts color as account name
+                background in the Accounts Page.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Show the Account Colors on tabs:</guilabel> show the accounts color as background in the account register tabs.
+              <para><guilabel>Show the Account Colors on tabs:</guilabel> show the accounts color as background in the
+                account register tabs.
               </para>
             </listitem>
           </itemizedlist>
@@ -272,7 +299,9 @@ Translators:
       <title>Business</title>
 
       <figure id="prefs-biz-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Business</guilabel> tab</title><screenshot id="Prefer_Business">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Business</guilabel> tab</title>
+
+        <screenshot id="Prefer_Business">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Business.png"
@@ -298,18 +327,20 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Enable extra buttons:</guilabel> If checked, extra toolbar buttons for common business functions are shown.
+              <para><guilabel>Enable extra buttons:</guilabel> If checked, extra toolbar buttons for common business
+                functions are shown.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Open in new window:</guilabel> If checked, each invoice will be opened in its own top level window.
-                If clear, the invoice will be opened in the current window.
+              <para><guilabel>Open in new window:</guilabel> If checked, each invoice will be opened in its own top
+                level window. If clear, the invoice will be opened in the current window.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Accumulate splits on post:</guilabel> Whether multiple entries in an invoice which transfer to the same account should be accumulated into a single split by default.
+              <para><guilabel>Accumulate splits on post:</guilabel> Whether multiple entries in an invoice which
+                transfer to the same account should be accumulated into a single split by default.
               </para>
             </listitem>
           </itemizedlist>
@@ -321,23 +352,25 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Report for printing:</guilabel> Allows to select the invoice report to be used for printing.
+              <para><guilabel>Report for printing:</guilabel> Allows to select the invoice report to be used for
+                printing.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Tax Included:</guilabel> Whether tax is included by default in entries on invoices.
-                This setting is inherited by new customers and vendors.
+              <para><guilabel>Tax Included:</guilabel> Whether tax is included by default in entries on invoices. This
+                setting is inherited by new customers and vendors.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Auto pay on posting:</guilabel> If enabled, at post time automatically attempt to pay customer documents with outstanding pre-payments and counter documents.
+              <para><guilabel>Auto pay on posting:</guilabel> If enabled, at post time automatically attempt to pay
+                customer documents with outstanding pre-payments and counter documents.
               </para>
 
               <note>
-                <para>Counter documents are documents with opposite sign.
-                  For example for an invoice, customer credit notes and negative invoices are considered counter documents.
+                <para>Counter documents are documents with opposite sign. For example for an invoice, customer credit
+                  notes and negative invoices are considered counter documents.
                 </para>
 
                 <para>The pre-payments and documents obviously have to be against the same customer.
@@ -353,28 +386,31 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Notify when due:</guilabel> Lets you set whether you want to be notified at &app; startup of when a bill is soon to be due.
+              <para><guilabel>Notify when due:</guilabel> Lets you set whether you want to be notified at &app; startup
+                of when a bill is soon to be due.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Days in advance:</guilabel> How many days before the due date to warn about bills coming due.
+              <para><guilabel>Days in advance:</guilabel> How many days before the due date to warn about bills coming
+                due.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Tax Included:</guilabel> Whether tax is included by default in entries on bills.
-                This setting is inherited by new customers and vendors.
+              <para><guilabel>Tax Included:</guilabel> Whether tax is included by default in entries on bills. This
+                setting is inherited by new customers and vendors.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Process payments on posting:</guilabel> If enabled, at post time automatically attempt to pay vendor documents with outstanding pre-payments and counter documents.
+              <para><guilabel>Process payments on posting:</guilabel> If enabled, at post time automatically attempt to
+                pay vendor documents with outstanding pre-payments and counter documents.
               </para>
 
               <note>
-                <para>Counter documents are documents with opposite sign.
-                  For example for a bill, vendor credit notes and negative bills are considered counter documents.
+                <para>Counter documents are documents with opposite sign. For example for a bill, vendor credit notes and
+                  negative bills are considered counter documents.
                 </para>
 
                 <para>The pre-payments and documents obviously have to be against the same vendor.
@@ -390,7 +426,9 @@ Translators:
       <title>General</title>
 
       <figure id="prefs-general-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>General</guilabel> tab</title><screenshot id="Prefer_General">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>General</guilabel> tab</title>
+
+        <screenshot id="Prefer_General">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_General.png"
@@ -416,17 +454,20 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Display "Tip of the Day" dialog:</guilabel> This option displays or hides <xref linkend="tip-of-the-day"/> when &app; is started.
+              <para><guilabel>Display "Tip of the Day" dialog:</guilabel> This option displays or hides
+                <xref linkend="tip-of-the-day"/> when &app; is started.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Show splash screen:</guilabel> With this option you can enable or disable the visualization of the startup screen while &app; is starting up.
+              <para><guilabel>Show splash screen:</guilabel> With this option you can enable or disable the
+                visualization of the startup screen while &app; is starting up.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Perform account list setup on new file:</guilabel> This option turns off the display of the <guilabel>New Account Hierarchy Setup</guilabel> assistant when the entry
+              <para><guilabel>Perform account list setup on new file:</guilabel> This option turns off the display of
+                the <guilabel>New Account Hierarchy Setup</guilabel> assistant when the entry
                 <menuchoice>
                   <guimenu>File</guimenu> <guimenuitem>New File</guimenuitem>
                 </menuchoice>
@@ -435,18 +476,33 @@ Translators:
             </listitem>
 
             <listitem>
-              <para><guilabel>Set book option on new files to use split "action" field for "Num" field on registers/reports:</guilabel> If selected, the displayed setting on the <guilabel>New Book Options</guilabel> dialog for the <guilabel>Use Split Action Field for Number</guilabel> setting will be selected and, if saved, the book option for the new file will be set so that the "Num" field on registers shows/updates the split-action field and the transaction-num field is shown on the second line in double line mode (and is not visible in single line mode).
-                Otherwise, the displayed setting on the dialog will not be selected and, if saved, the book option for the new file will be set so that the "Num" field on registers shows/updates the transaction-num field.
-                See the discussion in <xref
-              linkend="book-options"/> about how to set book options including the option for <xref linkend="num-action-book-option"/>.
-                Regardless of the setting of this preference, the user can modify the initially displayed setting for this option on the <guilabel>New Book Options</guilabel> dialog before saving the options.
+              <para><guilabel>Set book option on new files to use split "action" field for "Num" field on
+                registers/reports:</guilabel> If selected, the displayed setting on the
+                <guilabel>New Book Options</guilabel> dialog for the <guilabel>Use Split Action
+                Field for Number</guilabel> setting will be selected and, if saved, the book option
+                for the new file will be set so that the "Num" field on registers shows/updates the
+                split-action field and the transaction-num field is shown on the second line in
+                double line mode (and is not visible in single line mode). Otherwise, the displayed
+                setting on the dialog will not be selected and, if saved, the book option for the
+                new file will be set so that the "Num" field on registers shows/updates the
+                transaction-num field. See the discussion in
+                <xref
+              linkend="book-options"/> about how to set book options including
+                the option for <xref linkend="num-action-book-option"/>. Regardless of the setting
+                of this preference, the user can modify the initially displayed setting for this
+                option on the <guilabel>New Book Options</guilabel> dialog before saving the
+                options.
               </para>
             </listitem>
           </itemizedlist>
 
           <note>
-            <para>If the <guilabel>New Book Options</guilabel> dialog appears in situations where a new book is being set up, the settings from this preference will determine the default setting for the corresponding check box on the dialog.
-              However, the <guibutton>OK</guibutton> button on the <guilabel>New Book Options</guilabel> dialog must be pressed for the setting to be made for the new book; otherwise it will default to <emphasis>not selected</emphasis>.
+            <para>If the <guilabel>New Book Options</guilabel> dialog appears in situations where a new book is being
+              set up, the settings from this preference will determine the default setting for the
+              corresponding check box on the dialog. However, the <guibutton>OK</guibutton> button
+              on the <guilabel>New Book Options</guilabel> dialog must be pressed for the setting to
+              be made for the new book; otherwise it will default to <emphasis>not
+              selected</emphasis>.
             </para>
           </note>
         </listitem>
@@ -462,30 +518,35 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Compress files:</guilabel> This option determines whether the &app; data file will be compressed or not.
+              <para><guilabel>Compress files:</guilabel> This option determines whether the &app; data file will be
+                compressed or not.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Show auto-save confirmation question:</guilabel> If this option is enabled, &app; will show you a confirmation screen each time the auto-save process is started.
+              <para><guilabel>Show auto-save confirmation question:</guilabel> If this option is enabled, &app; will
+                show you a confirmation screen each time the auto-save process is started.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Auto-save time interval:</guilabel> This field sets the number of minutes between each automatic saving of the file.
-                Set to 0 to disable the auto-save feature.
+              <para><guilabel>Auto-save time interval:</guilabel> This field sets the number of minutes between each
+                automatic saving of the file. Set to 0 to disable the auto-save feature.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Enable timout on "Save changes on closing" question:</guilabel> If enabled, the <guilabel>Save changes on closing</guilabel> question will only wait a limited number of seconds for an answer.
-                If the user didn’t answer within that time, the changes will be saved automatically and the question window closed.
-                You can set the number of seconds in the <guilabel>Time to wait for answer</guilabel> field.
+              <para><guilabel>Enable timout on "Save changes on closing" question:</guilabel> If enabled, the
+                <guilabel>Save changes on closing</guilabel> question will only wait a limited
+                number of seconds for an answer. If the user didn’t answer within that time,
+                the changes will be saved automatically and the question window closed. You can set
+                the number of seconds in the <guilabel>Time to wait for answer</guilabel> field.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Retain log files:</guilabel> In this section you can set your preferences about the log files using the provided radio buttons.
+              <para><guilabel>Retain log files:</guilabel> In this section you can set your preferences about the log
+                files using the provided radio buttons.
               </para>
 
               <itemizedlist>
@@ -514,7 +575,8 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>New search limit:</guilabel> Defaults to "new search" if fewer than this number of items is returned.
+              <para><guilabel>New search limit:</guilabel> Defaults to "new search" if fewer than this number of items
+                is returned.
               </para>
             </listitem>
           </itemizedlist>
@@ -526,7 +588,9 @@ Translators:
       <title>Import</title>
 
       <figure id="prefs-import-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Import</guilabel> tab</title><screenshot id="Prefer_Import">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Import</guilabel> tab</title>
+
+        <screenshot id="Prefer_Import">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Import.png"
@@ -552,60 +616,75 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Enable skip transaction action:</guilabel> Enable the SKIP action in the transaction matcher.
-                If enabled, a transaction whose best match’s score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be skipped by default.
+              <para><guilabel>Enable skip transaction action:</guilabel> Enable the SKIP action in the transaction
+                matcher. If enabled, a transaction whose best match’s score is in the yellow
+                zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be
+                skipped by default.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Enable update match action:</guilabel> Enable the UPDATE AND RECONCILE action in the transaction matcher.
-                If enabled, a transaction whose best match’s score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.
+              <para><guilabel>Enable update match action:</guilabel> Enable the UPDATE AND RECONCILE action in the
+                transaction matcher. If enabled, a transaction whose best match’s score is
+                above the Auto-CLEAR threshold and has a different date or amount than the matching
+                existing transaction will cause the existing transaction to be updated and cleared
+                by default.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Use Bayesian matching:</guilabel> Use Bayesian algorithms to match new transactions with existing accounts.
+              <para><guilabel>Use Bayesian matching:</guilabel> Use Bayesian algorithms to match new transactions with
+                existing accounts.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Match display threshold:</guilabel> The minimal score a potential match must have to be displayed in the match list.
+              <para><guilabel>Match display threshold:</guilabel> The minimal score a potential match must have to be
+                displayed in the match list.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Auto-add threshold:</guilabel> A transaction whose best match’s score is in the red zone (above display threshold, but below or equal to Auto-add threshold) will be added by default.
+              <para><guilabel>Auto-add threshold:</guilabel> A transaction whose best match’s score is in the red
+                zone (above display threshold, but below or equal to Auto-add threshold) will be
+                added by default.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Auto-clear threshold:</guilabel> A transaction whose best match’s score is in the green zone (above or equal to Auto-clear threshold) will be cleared by default.
+              <para><guilabel>Auto-clear threshold:</guilabel> A transaction whose best match’s score is in the
+                green zone (above or equal to Auto-clear threshold) will be cleared by default.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Likely match day threshold:</guilabel> A transaction whose date is within the threshold is likely to be a match. Default is 4 days.
+              <para><guilabel>Likely match day threshold:</guilabel> A transaction whose date is within the threshold is
+                likely to be a match. Default is 4 days.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Unlikely match day threshold:</guilabel> A transaction whose date is outside the threshold is unlikely to be a match. Default is 14 days.
+              <para><guilabel>Unlikely match day threshold:</guilabel> A transaction whose date is outside the threshold
+                is unlikely to be a match. Default is 14 days.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Commercial ATM fees threshold:</guilabel> In some places commercial ATMs (not belonging to a financial institution) are installed in places like convenience stores.
-                These
-                ATMs add their fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees.
-                For example, you withdraw $100, and you are charged $101.50 plus Interac fees.
-                If you manually entered that $100, the amounts won’t match.
-                You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognized as a match by &app;.
+              <para><guilabel>Commercial ATM fees threshold:</guilabel> In some places commercial ATMs (not belonging to
+                a financial institution) are installed in places like convenience stores. These ATMs
+                add their fee directly to the amount instead of showing up as a separate transaction
+                or in your monthly banking fees. For example, you withdraw $100, and you are charged
+                $101.50 plus Interac fees. If you manually entered that $100, the amounts
+                won’t match. You should set this to whatever is the maximum such fee in your
+                area (in units of your local currency), so the transaction will be recognized as a
+                match by &app;.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Automatically create new commodities:</guilabel> Enables the automatic creation of new commodities if any unknown commodity is encountered during import.
-                If not enabled, the user will be asked what to do with each unknown commodity.
+              <para><guilabel>Automatically create new commodities:</guilabel> Enables the automatic creation of new
+                commodities if any unknown commodity is encountered during import. If not enabled,
+                the user will be asked what to do with each unknown commodity.
               </para>
             </listitem>
           </itemizedlist>
@@ -617,14 +696,17 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Show documentation:</guilabel> The first time you use the QIF importer you may notice that the importer has detailed instructions on how to import a file.
-                Once you have become familiar with using the importer, you might want to turn off this option.
-                Turning off the option gives you less detail in the importer screens.
+              <para><guilabel>Show documentation:</guilabel> The first time you use the QIF importer you may notice that
+                the importer has detailed instructions on how to import a file. Once you have become
+                familiar with using the importer, you might want to turn off this option. Turning
+                off the option gives you less detail in the importer screens.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Default transaction status (overridden by the status given by the QIF file):</guilabel> In this section you can set the default status for imported transactions using the provided self-explainingradio buttons:
+              <para><guilabel>Default transaction status (overridden by the status given by the QIF file):</guilabel> In
+                this section you can set the default status for imported transactions using the
+                provided self-explainingradio buttons:
               </para>
 
               <itemizedlist>
@@ -653,7 +735,9 @@ Translators:
       <title>Numbers, Date, Time</title>
 
       <figure id="prefs--numbers-date-time-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Numbers, Date, Time</guilabel> tab</title><screenshot id="Prefer_DateTime">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Numbers, Date, Time</guilabel> tab</title>
+
+        <screenshot id="Prefer_DateTime">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_DateTime.png"
@@ -679,36 +763,41 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Force Prices to display as decimals:</guilabel> Prices will round as necessary to display them as
-                decimals instead of displaying the exact fraction if the fractional part cannot be exactly represented as a decimal.
+              <para><guilabel>Force Prices to display as decimals:</guilabel> Prices will round as necessary to display
+                them as decimals instead of displaying the exact fraction if the fractional part
+                cannot be exactly represented as a decimal.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Display negative amounts in red:</guilabel> If you turn off this option, &app; will display negative numbers in black.
+              <para><guilabel>Display negative amounts in red:</guilabel> If you turn off this option, &app; will
+                display negative numbers in black.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Automatic Decimal Point:</guilabel> This option will automatically insert a decimal point into numbers you type in.
+              <para><guilabel>Automatic Decimal Point:</guilabel> This option will automatically insert a decimal point
+                into numbers you type in.
               </para>
 
               <note>
-                <para>When a calculation is entered in the <guilabel>Amount</guilabel> field, the decimal sign is inserted into <emphasis>every</emphasis> operand that omits a decimal separator.
+                <para>When a calculation is entered in the <guilabel>Amount</guilabel> field, the decimal sign is inserted
+                  into <emphasis>every</emphasis> operand that omits a decimal separator.
                 </para>
               </note>
             </listitem>
 
             <listitem>
-              <para><guilabel>Decimal Places:</guilabel> This field allows you to set the number of decimal places to be used.
+              <para><guilabel>Decimal Places:</guilabel> This field allows you to set the number of decimal places to be
+                used.
               </para>
             </listitem>
           </itemizedlist>
         </listitem>
 
         <listitem>
-          <para><guilabel>Date Format:</guilabel> This option controls the appearance of the date (you can see a preview of the date beside each of the choices).
-            The available choices are:
+          <para><guilabel>Date Format:</guilabel> This option controls the appearance of the date (you can see a
+            preview of the date beside each of the choices). The available choices are:
           </para>
 
           <itemizedlist>
@@ -740,16 +829,20 @@ Translators:
         </listitem>
 
         <listitem>
-          <para><guilabel>Date completion:</guilabel> This option lets you manage the case when a date is entered without a year:
+          <para><guilabel>Date completion:</guilabel> This option lets you manage the case when a date is entered
+            without a year:
             <itemizedlist>
               <listitem>
-                <para><guilabel>In the current calendar year:</guilabel> Dates will be completed so that they are within the current calendar year.
+                <para><guilabel>In the current calendar year:</guilabel> Dates will be completed so that they are within
+                  the current calendar year.
                 </para>
               </listitem>
 
               <listitem>
-                <para><guilabel>In a sliding 12-month window starting a configurable number of months before the current month:</guilabel> (Default) Dates will be completed so that they are close to the current date.
-                  You can enter the maximum number of months to go backwards in time when completing dates in a range of 0…11 with 6 as default.
+                <para><guilabel>In a sliding 12-month window starting a configurable number of months before the current
+                  month:</guilabel> (Default) Dates will be completed so that they are close to the
+                  current date. You can enter the maximum number of months to go backwards in time
+                  when completing dates in a range of 0…11 with 6 as default.
                 </para>
               </listitem>
             </itemizedlist>
@@ -762,8 +855,8 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Use 24-hour clock:</guilabel> Lets you specify if you want to use 24 or 12 hours time format.
-                That is if 11 o’clock at night should be represented as 11PM or 23:00.
+              <para><guilabel>Use 24-hour clock:</guilabel> Lets you specify if you want to use 24 or 12 hours time
+                format. That is if 11 o’clock at night should be represented as 11PM or 23:00.
               </para>
             </listitem>
           </itemizedlist>
@@ -775,7 +868,9 @@ Translators:
       <title>Online Banking</title>
 
       <figure id="prefs-online-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Online Banking</guilabel> tab</title><screenshot id="Prefer_OnlineBanking">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Online Banking</guilabel> tab</title>
+
+        <screenshot id="Prefer_OnlineBanking">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_OnlineBanking.png"
@@ -806,17 +901,20 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Close log window when finished:</guilabel> Close the log window when the operation is completed.
+              <para><guilabel>Close log window when finished:</guilabel> Close the log window when the operation is
+                completed.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Remember PIN:</guilabel> Enable this option if you want &app; to remember the PIN you enter for online banking authentication.
+              <para><guilabel>Remember PIN:</guilabel> Enable this option if you want &app; to remember the PIN you
+                enter for online banking authentication.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Verbose debug messages:</guilabel> Enable this option if you want &app; to show more information about the online banking operations.
+              <para><guilabel>Verbose debug messages:</guilabel> Enable this option if you want &app; to show more
+                information about the online banking operations.
               </para>
             </listitem>
           </itemizedlist>
@@ -828,7 +926,9 @@ Translators:
       <title>Online Quotes</title>
 
       <figure id="prefs-quotes-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Online Quotes</guilabel> tab</title><screenshot id="Prefer-online-quotes">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Online Quotes</guilabel> tab</title>
+
+        <screenshot id="Prefer-online-quotes">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Quotes.png"
@@ -847,13 +947,16 @@ Translators:
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Online Quotes</guilabel> tab allows you to set options that affect the fetching of online quotes with the <acronym>perl</acronym> module <application>Finance::Quote</application>.
+      <para>The <guilabel>Online Quotes</guilabel> tab allows you to set options that affect the fetching of
+        online quotes with the <acronym>perl</acronym> module
+        <application>Finance::Quote</application>.
       </para>
 
       <itemizedlist>
         <listitem>
-          <para><guilabel>Alpha Vantage API key:</guilabel> To retrieve online quotes from Alphavantage, this key needs to be set.
-            A key can be retrieved from the <ulink url="&url-av;">Alpha Vantage website</ulink>.
+          <para><guilabel>Alpha Vantage API key:</guilabel> To retrieve online quotes from Alphavantage, this key
+            needs to be set. A key can be retrieved from the <ulink url="&url-av;">Alpha Vantage
+            website</ulink>.
           </para>
         </listitem>
       </itemizedlist>
@@ -867,7 +970,7 @@ Translators:
         </listitem>
 
         <listitem>
-          <!-- TODO: create link to id="currency_howto_Auto" -->
+<!-- TODO: create link to id="currency_howto_Auto" -->
           <para><quote>Automatic Updating Exchange Rates</quote> in the guide.
           </para>
         </listitem>
@@ -878,7 +981,9 @@ Translators:
       <title>Printing</title>
 
       <figure id="prefs-printing-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Printing</guilabel> tab</title><screenshot id="Prefer_Printing">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Printing</guilabel> tab</title>
+
+        <screenshot id="Prefer_Printing">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Printing.png"
@@ -897,22 +1002,27 @@ Translators:
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Printing</guilabel> tab allows you to set some options that affect the printing of checks on paper.
+      <para>The <guilabel>Printing</guilabel> tab allows you to set some options that affect the printing of
+        checks on paper.
       </para>
 
       <itemizedlist>
         <listitem>
-          <para><guilabel>Print date format:</guilabel> Enable this option if you want to print on the check, below the actual date, its format in 8 point type.
+          <para><guilabel>Print date format:</guilabel> Enable this option if you want to print on the check, below
+            the actual date, its format in 8 point type.
           </para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Print blocking chars:</guilabel> Enable this option to print a series of three asterisks before and after each text field in the check.
+          <para><guilabel>Print blocking chars:</guilabel> Enable this option to print a series of three asterisks
+            before and after each text field in the check.
           </para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Default font:</guilabel> Click the button on the left to open a <guilabel>Pick a Font</guilabel> screen in which you can customize the font that will be used to print checks.
+          <para><guilabel>Default font:</guilabel> Click the button on the left to open a <guilabel>Pick a
+            Font</guilabel> screen in which you can customize the font that will be used to print
+            checks.
           </para>
         </listitem>
       </itemizedlist>
@@ -922,7 +1032,9 @@ Translators:
       <title>Register</title>
 
       <figure id="prefs-reg-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register</guilabel> tab</title><screenshot id="Prefer_Register">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register</guilabel> tab</title>
+
+        <screenshot id="Prefer_Register">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Register.png"
@@ -948,18 +1060,23 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>'Enter' moves to blank transaction:</guilabel> If selected, move the cursor to the blank transaction at the end of the register after the user presses the <keycap function="enter">Enter</keycap> key.
-                Otherwise the cursor will be moved down one row.
+              <para><guilabel>'Enter' moves to blank transaction:</guilabel> If selected, move the cursor to the blank
+                transaction at the end of the register after the user presses the
+                <keycap function="enter">Enter</keycap> key. Otherwise the cursor will be moved down
+                one row.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Auto-raise lists:</guilabel> If selected, all lists will automatically be expanded when input focus is in the list field.
+              <para><guilabel>Auto-raise lists:</guilabel> If selected, all lists will automatically be expanded when
+                input focus is in the list field.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Tab order includes Transfer on Memorized Transaction:</guilabel> If selected, when the transaction is auto filled, pressing the <keycap>Tab</keycap> key in the register the cursor’s jump will include the <guilabel>Transfer</guilabel> field.
+              <para><guilabel>Tab order includes Transfer on Memorized Transaction:</guilabel> If selected, when the
+                transaction is auto filled, pressing the <keycap>Tab</keycap> key in the register
+                the cursor’s jump will include the <guilabel>Transfer</guilabel> field.
               </para>
             </listitem>
           </itemizedlist>
@@ -971,17 +1088,20 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Check cleared transactions:</guilabel> If selected, automatically check off cleared transactions when reconciling.
+              <para><guilabel>Check cleared transactions:</guilabel> If selected, automatically check off cleared
+                transactions when reconciling.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Automatic credit card payment:</guilabel> If selected, after reconciling a credit card statement, prompt the user to enter a credit card payment.
+              <para><guilabel>Automatic credit card payment:</guilabel> If selected, after reconciling a credit card
+                statement, prompt the user to enter a credit card payment.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Always reconcile to today:</guilabel> If selected, always open the reconcile screen with today’s date for statement date, regardless of previous reconciliation.
+              <para><guilabel>Always reconcile to today:</guilabel> If selected, always open the reconcile screen with
+                today’s date for statement date, regardless of previous reconciliation.
               </para>
             </listitem>
           </itemizedlist>
@@ -993,23 +1113,28 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Use &appname; built-in color theme:</guilabel> If selected, the original &app; register color theme will be used.
-                Otherwise the system color theme will be applied to register windows.
+              <para><guilabel>Use &appname; built-in color theme:</guilabel> If selected, the original &app; register
+                color theme will be used. Otherwise the system color theme will be applied to
+                register windows.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Double mode colors alternate with transactions:</guilabel> If selected, configures the register window to alternate between the primary and secondary colors with each transaction, instead of each row.
+              <para><guilabel>Double mode colors alternate with transactions:</guilabel> If selected, configures the
+                register window to alternate between the primary and secondary colors with each
+                transaction, instead of each row.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Draw horizontal lines between rows:</guilabel> If selected, &app; will draw a horizontal line between each row.
+              <para><guilabel>Draw horizontal lines between rows:</guilabel> If selected, &app; will draw a horizontal
+                line between each row.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Draw vertical lines between columns:</guilabel> If selected, &app; will draw a vertical line between the cells in each row.
+              <para><guilabel>Draw vertical lines between columns:</guilabel> If selected, &app; will draw a vertical
+                line between the cells in each row.
               </para>
             </listitem>
           </itemizedlist>
@@ -1021,7 +1146,9 @@ Translators:
       <title>Register Defaults</title>
 
       <figure id="prefs-reg-def-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register Defaults</guilabel> tab</title><screenshot id="Prefer_RegisterDefaults">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register Defaults</guilabel> tab</title>
+
+        <screenshot id="Prefer_RegisterDefaults">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_RegisterDefaults.png"
@@ -1040,7 +1167,8 @@ Translators:
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Register Defaults</guilabel> tab preferences affect the behavior of the transaction register windows.
+      <para>The <guilabel>Register Defaults</guilabel> tab preferences affect the behavior of the transaction
+        register windows.
       </para>
 
       <itemizedlist>
@@ -1056,8 +1184,8 @@ Translators:
               </listitem>
 
               <listitem>
-                <para><guilabel>Auto-split ledger:</guilabel> Automatically expand the current transaction to show all splits.
-                  All other transactions are shown on one line. (Two in double line mode.)
+                <para><guilabel>Auto-split ledger:</guilabel> Automatically expand the current transaction to show all
+                  splits. All other transactions are shown on one line. (Two in double line mode.)
                 </para>
               </listitem>
 
@@ -1075,18 +1203,22 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Register opens in a new window:</guilabel> If selected, register will be in a separate window instead of in a tab.
+              <para><guilabel>Register opens in a new window:</guilabel> If selected, register will be in a separate
+                window instead of in a tab.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Double line mode:</guilabel> If selected, show two lines of information for each transaction instead of one.
+              <para><guilabel>Double line mode:</guilabel> If selected, show two lines of information for each
+                transaction instead of one.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Only display leaf account names:</guilabel> If selected, only the name of the leaf accounts will be displayed in the <guilabel>Account</guilabel> selection popup.
-                The default behavior is to display the full account name including the path in the account tree.
+              <para><guilabel>Only display leaf account names:</guilabel> If selected, only the name of the leaf
+                accounts will be displayed in the <guilabel>Account</guilabel> selection popup. The
+                default behavior is to display the full account name including the path in the
+                account tree.
               </para>
 
               <warning>
@@ -1096,8 +1228,8 @@ Translators:
             </listitem>
 
             <listitem>
-              <para><guilabel>Number of transactions:</guilabel> How many transactions to show in a register.
-                Set to 0 to show all transactions.
+              <para><guilabel>Number of transactions:</guilabel> How many transactions to show in a register. Set to 0
+                to show all transactions.
               </para>
             </listitem>
           </itemizedlist>
@@ -1109,7 +1241,9 @@ Translators:
       <title>Reports</title>
 
       <figure id="prefs-reports-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Reports</guilabel> tab</title><screenshot id="Prefer_Reports">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Reports</guilabel> tab</title>
+
+        <screenshot id="Prefer_Reports">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Reports.png"
@@ -1133,8 +1267,8 @@ Translators:
 
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default Report Currency:</guilabel> This item determines which currency will be used by default when creating reports.
-            You can choose:
+          <para><guilabel>Default Report Currency:</guilabel> This item determines which currency will be used by
+            default when creating reports. You can choose:
           </para>
 
           <itemizedlist>
@@ -1156,7 +1290,8 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Report opens in a new window:</guilabel> if you select this option, the reports will open up in a new window, instead of in a tab.
+              <para><guilabel>Report opens in a new window:</guilabel> if you select this option, the reports will open
+                up in a new window, instead of in a tab.
               </para>
             </listitem>
           </itemizedlist>
@@ -1168,7 +1303,9 @@ Translators:
       <title>Scheduled Transactions</title>
 
       <figure id="prefs-sched-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Scheduled Transactions</guilabel> tab</title><screenshot id="Prefer_ScheduledTransactions">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Scheduled Transactions</guilabel> tab</title>
+
+        <screenshot id="Prefer_ScheduledTransactions">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Sched.png"
@@ -1187,8 +1324,9 @@ Translators:
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Scheduled Transactions</guilabel> tab preferences affect the behavior of &app; for scheduling transactions.
-        More information about scheduled transactions can be found in <xref linkend="trans-sched"/>.
+      <para>The <guilabel>Scheduled Transactions</guilabel> tab preferences affect the behavior of &app; for
+        scheduling transactions. More information about scheduled transactions can be found in
+        <xref linkend="trans-sched"/>.
       </para>
 
       <itemizedlist>
@@ -1198,19 +1336,21 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Run when data file opened:</guilabel> If selected, the <guilabel>Since Last Run</guilabel> screen will appear when &app; opens the file.
+              <para><guilabel>Run when data file opened:</guilabel> If selected, the <guilabel>Since Last Run</guilabel>
+                screen will appear when &app; opens the file.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Show notification window:</guilabel> If selected, a list of scheduled and created transactions will appear when &app; opens the file.
+              <para><guilabel>Show notification window:</guilabel> If selected, a list of scheduled and created
+                transactions will appear when &app; opens the file.
               </para>
             </listitem>
 
             <listitem>
-                <para>
-                    <guilabel>Review created transactions:</guilabel> If selected, set <guilabel>Review created transactions</guilabel>
-                    as the default for the <guilabel>Since Last Run</guilabel> dialog.
+              <para><guilabel>Review created transactions:</guilabel> If selected, set <guilabel>Review created
+                transactions</guilabel> as the default for the <guilabel>Since Last Run</guilabel>
+                dialog.
               </para>
             </listitem>
           </itemizedlist>
@@ -1222,18 +1362,22 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Auto-Create new transactions:</guilabel> If selected, new scheduled transactions will automatically be entered into the register.
-                If the auto-create option is enabled, you can also check <guilabel>Notify before transactions are created</guilabel> so that you will be able to confirm creating the transactions.
+              <para><guilabel>Auto-Create new transactions:</guilabel> If selected, new scheduled transactions will
+                automatically be entered into the register. If the auto-create option is enabled,
+                you can also check <guilabel>Notify before transactions are created</guilabel> so
+                that you will be able to confirm creating the transactions.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Create in advance:</guilabel> The default number of days in advance to create the registered scheduled transactions.
+              <para><guilabel>Create in advance:</guilabel> The default number of days in advance to create the
+                registered scheduled transactions.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Remind in advance:</guilabel> The default number of days in advance to remind about new scheduled transactions.
+              <para><guilabel>Remind in advance:</guilabel> The default number of days in advance to remind about new
+                scheduled transactions.
               </para>
             </listitem>
           </itemizedlist>
@@ -1245,7 +1389,9 @@ Translators:
       <title>Windows</title>
 
       <figure id="prefs-windows-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Windows</guilabel> tab</title><screenshot id="Prefer_Windows">
+        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Windows</guilabel> tab</title>
+
+        <screenshot id="Prefer_Windows">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Windows.png"
@@ -1271,7 +1417,8 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Save window size and position:</guilabel> If selected, next time &app; starts it will re-use the window size and position configured in the last run.
+              <para><guilabel>Save window size and position:</guilabel> If selected, next time &app; starts it will
+                re-use the window size and position configured in the last run.
               </para>
             </listitem>
           </itemizedlist>
@@ -1283,24 +1430,28 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>Show close button on notebook tabs:</guilabel> Adds a small close icon on each tab, to make it easier to close the various tabs.
+              <para><guilabel>Show close button on notebook tabs:</guilabel> Adds a small close icon on each tab, to
+                make it easier to close the various tabs.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Bring the most recent tab to the front:</guilabel> If selected, the newly created tab will be shown over the other tabs.
+              <para><guilabel>Bring the most recent tab to the front:</guilabel> If selected, the newly created tab will
+                be shown over the other tabs.
               </para>
             </listitem>
 
             <listitem>
-              <para><guilabel>Open new tabs adjacent to current tab:</guilabel> If selected, open new tabs adjacent to the current tab instead of at the end.
+              <para><guilabel>Open new tabs adjacent to current tab:</guilabel> If selected, open new tabs adjacent to
+                the current tab instead of at the end.
               </para>
             </listitem>
 
             <listitem>
               <para><guilabel>Width:</guilabel> The width of tab label expressed in characters.
                 <note>
-                  <para>If the text in the tab is longer than this value (the test is approximate) then the tab label will have the middle cut and replaced with an ellipsis.
+                  <para>If the text in the tab is longer than this value (the test is approximate) then the tab label will
+                    have the middle cut and replaced with an ellipsis.
                   </para>
                 </note>
               </para>
@@ -1312,7 +1463,8 @@ Translators:
           <para><guilabel>Tab Position</guilabel>
           </para>
 
-          <para>Position the tabs at the <guilabel>Top</guilabel> (default), <guilabel>Bottom</guilabel>, <guilabel>Left</guilabel> or <guilabel>Right</guilabel>.
+          <para>Position the tabs at the <guilabel>Top</guilabel> (default), <guilabel>Bottom</guilabel>,
+            <guilabel>Left</guilabel> or <guilabel>Right</guilabel>.
           </para>
         </listitem>
 
@@ -1320,7 +1472,8 @@ Translators:
           <para><guilabel>Summary Bar Position</guilabel>
           </para>
 
-          <para>Position the Summary Bar at the <guilabel>Top</guilabel> or at the <guilabel>Bottom</guilabel> (default) of the &app; main window.
+          <para>Position the Summary Bar at the <guilabel>Top</guilabel> or at the <guilabel>Bottom</guilabel>
+            (default) of the &app; main window.
           </para>
         </listitem>
       </itemizedlist>
@@ -1334,38 +1487,50 @@ Translators:
       <menuchoice>
         <guimenu>File</guimenu> <guimenuitem>Properties</guimenuitem>
       </menuchoice>
-      menu item is used to set or modify choices that affect how a specific &app; file (also referred to as a Book) operates.
-      Selecting this menu item brings up the <guilabel>Book Options</guilabel>dialog.
-      This dialog also appears in situations where you are importing transactions into a new book, with the title <guilabel>New Book Options</guilabel>.
-      It is automatically raised in these 'new book' situations because these settings can affect how imported data are converted to &app; transactions and so should be considered and set before your first import (specifically, the <xref linkend="num-action-book-option"/> setting).
+      menu item is used to set or modify choices that affect how a specific &app; file (also
+      referred to as a Book) operates. Selecting this menu item brings up the <guilabel>Book
+      Options</guilabel>dialog. This dialog also appears in situations where you are importing
+      transactions into a new book, with the title <guilabel>New Book Options</guilabel>. It is
+      automatically raised in these 'new book' situations because these settings can affect how
+      imported data are converted to &app; transactions and so should be considered and set before
+      your first import (specifically, the <xref linkend="num-action-book-option"/> setting).
     </para>
 
-    <para>The settings in this dialog are kept with, and are part of, the file (or Book).
-      This is in contrast to the settings described in <xref linkend="set-prefs"/>, which are set per user and not stored with the file.
-      So <guilabel>Book Options</guilabel> settings are shared by all users who use a given file and any changes made by one user will affect all users of that file.
+    <para>The settings in this dialog are kept with, and are part of, the file (or Book). This is in contrast
+      to the settings described in <xref linkend="set-prefs"/>, which are set per user and not
+      stored with the file. So <guilabel>Book Options</guilabel> settings are shared by all users
+      who use a given file and any changes made by one user will affect all users of that file.
     </para>
 
     <tip>
-      <para>Pausing the cursor for a couple of seconds over options in these tabs will display a tooltip with a more detailed description of the choice.
+      <para>Pausing the cursor for a couple of seconds over options in these tabs will display a tooltip with a
+        more detailed description of the choice.
       </para>
     </tip>
 
-    <para>The <guilabel>Book Options</guilabel> dialog has five buttons that are common to all tabs.
-      The <guibutton>Reset defaults</guibutton> button takes all items on the visible tab and sets their value to the default setting; it only affects the visible tab.
-      The <guibutton>Help</guibutton> button opens up a help window to this section.
-      The <guibutton>Cancel</guibutton> button closes the dialog, making no changes to the saved settings for <guilabel>Book Options</guilabel>.
-      The <guibutton>Apply</guibutton> button is initially insensitive but becomes sensitive when any setting is set or changed.
-      Selecting it saves the setting(s) for the book but keeps the <guilabel>Book Options</guilabel> dialog open.
-      Typically, the changes are reflected in the affected areas of &app; as soon as the button is pressed, so it can be used to 'see' the effect of a given option without having to re-open the dialog.
-      The <guibutton>Apply</guibutton> button is not sensitive on the dialog if it appears during transaction import (that is, 'new book') situations.
-      The <guibutton>OK</guibutton> button behaves like the <guibutton>Apply</guibutton> button except that it immediately <emphasis>closes</emphasis> the dialog, as well.
+    <para>The <guilabel>Book Options</guilabel> dialog has five buttons that are common to all tabs. The
+      <guibutton>Reset defaults</guibutton> button takes all items on the visible tab and sets their
+      value to the default setting; it only affects the visible tab. The <guibutton>Help</guibutton>
+      button opens up a help window to this section. The <guibutton>Cancel</guibutton> button closes
+      the dialog, making no changes to the saved settings for <guilabel>Book Options</guilabel>. The
+      <guibutton>Apply</guibutton> button is initially insensitive but becomes sensitive when any
+      setting is set or changed. Selecting it saves the setting(s) for the book but keeps the
+      <guilabel>Book Options</guilabel> dialog open. Typically, the changes are reflected in the
+      affected areas of &app; as soon as the button is pressed, so it can be used to 'see' the
+      effect of a given option without having to re-open the dialog. The
+      <guibutton>Apply</guibutton> button is not sensitive on the dialog if it appears during
+      transaction import (that is, 'new book') situations. The <guibutton>OK</guibutton> button
+      behaves like the <guibutton>Apply</guibutton> button except that it immediately
+      <emphasis>closes</emphasis> the dialog, as well.
     </para>
 
     <sect2 id="accounts-book-options">
       <title>Accounts Book Options Tab</title>
 
       <figure id="book-opt-acc-fig">
-        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title><screenshot id="Book_Options_Accounts">
+        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title>
+
+        <screenshot id="Book_Options_Accounts">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Book_Options_Accounts.png"
@@ -1375,13 +1540,15 @@ Translators:
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Accounts</guilabel> tab of this dialog allows the selection of options that affect how accounting registers function.
+      <para>The <guilabel>Accounts</guilabel> tab of this dialog allows the selection of options that affect how
+        accounting registers function.
       </para>
 
       <sect3 id="trading-accounts-book-option">
         <title>Use Trading Accounts</title>
 
-        <para>Check the <guilabel>Use Trading Accounts</guilabel> checkbox to have trading accounts used for transactions involving more than one currency or commodity.
+        <para>Check the <guilabel>Use Trading Accounts</guilabel> checkbox to have trading accounts used for
+          transactions involving more than one currency or commodity.
         </para>
 
         <tip>
@@ -1393,10 +1560,11 @@ Translators:
       <sect3 id="read-only-days-option">
         <title>Day Threshold for Read-Only Transactions</title>
 
-        <para>Use the <guilabel>Day Threshold for Read-Only Transactions</guilabel> spin-box to choose the number of days before today, prior to which, transactions will be read-only and cannot be edited anymore in the registers.
-          This threshold is marked by a red line in the account register windows.
-          If zero, all transactions can be edited and none are read-only.
-          This feature is intended to be used to guard against accidental changes to non-current transactions.
+        <para>Use the <guilabel>Day Threshold for Read-Only Transactions</guilabel> spin-box to choose the number
+          of days before today, prior to which, transactions will be read-only and cannot be edited
+          anymore in the registers. This threshold is marked by a red line in the account register
+          windows. If zero, all transactions can be edited and none are read-only. This feature is
+          intended to be used to guard against accidental changes to non-current transactions.
         </para>
       </sect3>
 
@@ -1408,51 +1576,78 @@ Translators:
           </para>
         </note>
 
-        <para>Check the <guilabel>Use Split Action Field for Number</guilabel> checkbox to have the split action field of the anchor split used for the 'Num' column in registers, reports and import/export functions, where applicable, in place of the transaction number; the transaction number is then shown as 'T-Num' on reports and on the second line of registers.
-          This choice has a corresponding effect on business features.
+        <para>Check the <guilabel>Use Split Action Field for Number</guilabel> checkbox to have the split action
+          field of the anchor split used for the 'Num' column in registers, reports and
+          import/export functions, where applicable, in place of the transaction number; the
+          transaction number is then shown as 'T-Num' on reports and on the second line of
+          registers. This choice has a corresponding effect on business features.
         </para>
 
-        <para>The difference between the two is that with the checkbox not selected, the same 'Num' is displayed for a given transaction regardless of what register it is viewed in and with the checkbox selected, a different 'Num' can be entered/displayed for a given transaction in each register it is viewed in.
-          In both cases, the 'next number logic' of the 'Num' cell is based on the account of the register the transaction is entered to or viewed from but in one case it fills the transaction number, in the other, it fills the split action field of the anchor split.
-          In both cases, both fields are visible and can be viewed and used as free-form text in double-line mode for any value the user wants.
+        <para>The difference between the two is that with the checkbox not selected, the same 'Num' is displayed
+          for a given transaction regardless of what register it is viewed in and with the checkbox
+          selected, a different 'Num' can be entered/displayed for a given transaction in each
+          register it is viewed in. In both cases, the 'next number logic' of the 'Num' cell is
+          based on the account of the register the transaction is entered to or viewed from but in
+          one case it fills the transaction number, in the other, it fills the split action field of
+          the anchor split. In both cases, both fields are visible and can be viewed and used as
+          free-form text in double-line mode for any value the user wants.
         </para>
 
         <warning>
-          <para>Initial setup of &app;: It is expected that, after careful consideration of the consequences, this option will be set when a new &app; file is created and not changed thereafter (see next warning).
-            For this reason, a preference is provided (see <link
-             linkend="prefs-general">Setting Preferences - General </link>) that can establish an initial default setting for new files, so that if you will have more than one file, it is easier to set them all up consistently.
-            You may wish to set up a test file and experiment with the two settings to understand the differences before establishing your first real &app; file.
+          <para>Initial setup of &app;: It is expected that, after careful consideration of the consequences, this
+            option will be set when a new &app; file is created and not changed thereafter (see next
+            warning). For this reason, a preference is provided (see
+            <link
+             linkend="prefs-general">Setting Preferences - General </link>) that
+            can establish an initial default setting for new files, so that if you will have more
+            than one file, it is easier to set them all up consistently. You may wish to set up a
+            test file and experiment with the two settings to understand the differences before
+            establishing your first real &app; file.
           </para>
         </warning>
 
         <tip>
-          <para>Moving from Quicken: For users that are switching from other personal accounting applications, such as Quicken, selecting this option may be more consistent with the numbering approach used there and can preserve the numbering of historical data brought over; this option should be set before performing the initial import.
+          <para>Moving from Quicken: For users that are switching from other personal accounting applications, such
+            as Quicken, selecting this option may be more consistent with the numbering approach
+            used there and can preserve the numbering of historical data brought over; this option
+            should be set before performing the initial import.
           </para>
         </tip>
 
         <warning>
-          <para>Changing this option for an existing &app; file: If you change this option for an existing file, historical data will not be changed.
-            This means that if you set the option one way, enter (or import) transactions, then change the option and enter (or import) additional transactions and switch back-and-forth, you will end up with a file that will appear to have inconsistent treatment of numbers in registers, reports and exports.
-            This is because the setting of this option at the time of data entry/import determines where the number data is stored and the setting at the time of data display/reporting/exporting determines which field is displayed as number.
+          <para>Changing this option for an existing &app; file: If you change this option for an existing file,
+            historical data will not be changed. This means that if you set the option one way,
+            enter (or import) transactions, then change the option and enter (or import) additional
+            transactions and switch back-and-forth, you will end up with a file that will appear to
+            have inconsistent treatment of numbers in registers, reports and exports. This is
+            because the setting of this option at the time of data entry/import determines where the
+            number data is stored and the setting at the time of data display/reporting/exporting
+            determines which field is displayed as number.
           </para>
 
-          <para>There is no reason to avoid changing this option for an existing &app; file if you understand the implications.
-            If you elect to make this change, it should probably be done between accounting periods with the understanding that number data prior to the date the option is changed will be displayed/reported/exported differently from that after the date.
+          <para>There is no reason to avoid changing this option for an existing &app; file if you understand the
+            implications. If you elect to make this change, it should probably be done between
+            accounting periods with the understanding that number data prior to the date the option
+            is changed will be displayed/reported/exported differently from that after the date.
           </para>
         </warning>
 
         <warning>
-          <para>If you change this option, and press <guibutton>Apply </guibutton> or <guibutton>OK</guibutton>, open registers and labels on query and sorting dialogs will be refreshed to reflect the new option immediately.
-            But open reports need to be individually reloaded by the user to have the change reflected on the report.
+          <para>If you change this option, and press <guibutton>Apply </guibutton> or <guibutton>OK</guibutton>,
+            open registers and labels on query and sorting dialogs will be refreshed to reflect the
+            new option immediately. But open reports need to be individually reloaded by the user to
+            have the change reflected on the report.
           </para>
         </warning>
 
         <warning>
-          <para>This option is only available in &app; version 2.6 or later.
-            If a &app; file from an earlier version is opened in version 2.6 or later, and this feature is not used, this feature will not prevent the file from being opened in the earlier version of &app;.
-            However, if the option is set, the file will not be able to be opened by the earlier version, even if the option is set back to its original setting.
-            A warning dialog will be displayed from the earlier version.
-            Do not set this option if you want to open the file with an earlier version.
+          <para>This option is only available in &app; version 2.6 or later. If a &app; file from an earlier version
+            is opened in version 2.6 or later, and this feature is not used, this feature will not
+            prevent the file from being opened in the earlier version of &app;. However, if the
+            option is set, the file will not be able to be opened by the earlier version, even if
+            the option is set back to its original setting. A warning dialog will be displayed from
+            the earlier version. Do not set this option if you want to open the file with an earlier
+            version.
           </para>
         </warning>
       </sect3>
@@ -1462,7 +1657,9 @@ Translators:
       <title>Budgeting Book Options Tab</title>
 
       <figure id="book-opt-bud-fig">
-        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Budgeting</guilabel> tab</title><screenshot id="Book_Options_Budgeting">
+        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Budgeting</guilabel> tab</title>
+
+        <screenshot id="Book_Options_Budgeting">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Book_Options_Budgeting.png"
@@ -1472,7 +1669,8 @@ Translators:
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Budgeting</guilabel> tab allows you to specify the budget to be used for reports when none has otherwise been specified.
+      <para>The <guilabel>Budgeting</guilabel> tab allows you to specify the budget to be used for reports when
+        none has otherwise been specified.
       </para>
     </sect2>
 
@@ -1480,7 +1678,9 @@ Translators:
       <title>Business Book Options Tab</title>
 
       <figure id="book-opt-bus-fig">
-        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Business</guilabel> tab</title><screenshot id="Book_Options_Business">
+        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Business</guilabel> tab</title>
+
+        <screenshot id="Book_Options_Business">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Book_Options_Business.png"
@@ -1490,7 +1690,8 @@ Translators:
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Business</guilabel> tab allows you to enter values that are in turn used by the business features of &app;:
+      <para>The <guilabel>Business</guilabel> tab allows you to enter values that are in turn used by the
+        business features of &app;:
       </para>
 
       <variablelist>
@@ -1577,7 +1778,8 @@ Translators:
       </variablelist>
 
       <note>
-        <para>None of the above values is required to use &app; but, if given, will be used throughout the program. (f.e. in reports, invoices etc...)
+        <para>None of the above values is required to use &app; but, if given, will be used throughout the
+          program. (f.e. in reports, invoices etc...)
         </para>
       </note>
     </sect2>
@@ -1586,7 +1788,9 @@ Translators:
       <title>Counters Book Options Tab</title>
 
       <figure id="book-opt-count-fig">
-        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Counters</guilabel> tab</title><screenshot id="Book_Options_Counters">
+        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Counters</guilabel> tab</title>
+
+        <screenshot id="Book_Options_Counters">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Book_Options_Counters.png"
@@ -1596,24 +1800,32 @@ Translators:
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Counters</guilabel> tab allows you to set the 'previous' value for each number indicated: Bill, Customer, Employee, etc.
-        These counters are used by the <xref linkend="chapter_busnss" /> of &app;.
+      <para>The <guilabel>Counters</guilabel> tab allows you to set the 'previous' value for each number
+        indicated: Bill, Customer, Employee, etc. These counters are used by the
+        <xref linkend="chapter_busnss" /> of &app;.
       </para>
 
-      <para>The <guilabel>number</guilabel> entered here will be incremented when the various business features calculate a value for a corresponding field on a dialog.
-        For example, if you leave the Customer Number field blank on the New Customer dialog, the customer will be assigned the number in the counter field plus 1.
-        The numbers displayed in the tab are incremented as these business features are used. (But note that if you have the <guilabel>Book Options</guilabel> dialog open, you need to close it and re-open it to see the changes; the displayed field values are not automatically refreshed.)
+      <para>The <guilabel>number</guilabel> entered here will be incremented when the various business features
+        calculate a value for a corresponding field on a dialog. For example, if you leave the
+        Customer Number field blank on the New Customer dialog, the customer will be assigned the
+        number in the counter field plus 1. The numbers displayed in the tab are incremented as
+        these business features are used. (But note that if you have the <guilabel>Book
+        Options</guilabel> dialog open, you need to close it and re-open it to see the changes; the
+        displayed field values are not automatically refreshed.)
       </para>
 
-      <para>The corresponding <guilabel>format</guilabel> fields are used to specify printf-style format strings that are used to format the printing of the number.
-        For example, to put the literal "C - " in front of the customer number, you would put "C - %li" (without the quotes) in the customer format string field.
-        If the value in the customer number field was 5, the next customer added would be assigned the number "C - 6".
-        As another example, if you wanted the number to be printed with leading zeros and 5 characters wide, you would enter "C - %05li" and the next customer number would be assigned the number "C - 00006".
+      <para>The corresponding <guilabel>format</guilabel> fields are used to specify printf-style format strings
+        that are used to format the printing of the number. For example, to put the literal "C - "
+        in front of the customer number, you would put "C - %li" (without the quotes) in the
+        customer format string field. If the value in the customer number field was 5, the next
+        customer added would be assigned the number "C - 6". As another example, if you wanted the
+        number to be printed with leading zeros and 5 characters wide, you would enter "C - %05li"
+        and the next customer number would be assigned the number "C - 00006".
       </para>
 
       <note>
-        <para>For historical reasons &app; accepts multiple format specifiers although they all yield the same end result.
-          You can choose "li", "lli" or I64i".
+        <para>For historical reasons &app; accepts multiple format specifiers although they all yield the same end
+          result. You can choose "li", "lli" or I64i".
         </para>
       </note>
     </sect2>
@@ -1622,9 +1834,8 @@ Translators:
   <sect1 id="change-style">
     <title>Changing Style Sheets</title>
 
-    <para>&app; has four default style sheets for web-page reports.
-      These style sheets can be altered by using the <acronym>HTML</acronym> Style Sheets editor.
-      To access the editor go to
+    <para>&app; has four default style sheets for web-page reports. These style sheets can be altered by using
+      the <acronym>HTML</acronym> Style Sheets editor. To access the editor go to
       <menuchoice>
         <guimenu>Edit</guimenu> <guimenuitem>Style Sheets...</guimenuitem>
       </menuchoice>
@@ -1634,21 +1845,23 @@ Translators:
     </para>
 
     <note>
-      <para>Changing the Style Sheet will change the appearance of all reports that have selected that Style Sheet.
-        A <guibutton>Reload</guibutton> is required to view the changes, if the report(s) are currently displayed.
+      <para>Changing the Style Sheet will change the appearance of all reports that have selected that Style
+        Sheet. A <guibutton>Reload</guibutton> is required to view the changes, if the report(s) are
+        currently displayed.
       </para>
     </note>
 
-    <para>To add a new Style Sheet click the <guibutton>New...</guibutton> button in the Style Sheet pane.
-      The <guilabel>New Style Sheet</guilabel> dialog will appear.
-      Fill in the <guilabel>name</guilabel> field with the name of the new Style Sheet and choose a template.
-      To remove a Style Sheet select the Style Sheet from the list and click <guibutton>Delete</guibutton>.
+    <para>To add a new Style Sheet click the <guibutton>New...</guibutton> button in the Style Sheet pane. The
+      <guilabel>New Style Sheet</guilabel> dialog will appear. Fill in the <guilabel>name</guilabel>
+      field with the name of the new Style Sheet and choose a template. To remove a Style Sheet
+      select the Style Sheet from the list and click <guibutton>Delete</guibutton>.
     </para>
 
     <sect2 id="style-default">
       <title>Default Style Sheet</title>
 
-      <para>The Default Style Sheet has four tabs to alter the appearance of reports utilizing it, Colors, Fonts, General and Tables.
+      <para>The Default Style Sheet has four tabs to alter the appearance of reports utilizing it, Colors,
+        Fonts, General and Tables.
       </para>
 
       <sect3 id="style-def-color">
@@ -1656,7 +1869,8 @@ Translators:
 
         <itemizedlist>
           <listitem>
-            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a color that will be applied to alternate table rows.
+            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a color that will
+              be applied to alternate table rows.
             </para>
           </listitem>
         </itemizedlist>
@@ -1718,7 +1932,8 @@ Translators:
           </listitem>
 
           <listitem>
-            <para><guilabel>Background Pixmap:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use as the background in reports.
+            <para><guilabel>Background Pixmap:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
+              picture to use as the background in reports.
             </para>
           </listitem>
 
@@ -1754,7 +1969,8 @@ Translators:
     <sect2 id="style-easy">
       <title>Easy Style Sheet</title>
 
-      <para>The Easy Style Sheet has five tabs to alter the appearance of reports: Colors, Fonts, General, Images and Tables.
+      <para>The Easy Style Sheet has five tabs to alter the appearance of reports: Colors, Fonts, General,
+        Images and Tables.
       </para>
 
       <sect3 id="style-easy-colors">
@@ -1782,22 +1998,26 @@ Translators:
           </listitem>
 
           <listitem>
-            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a new color for alternate table rows.
+            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a new color for
+              alternate table rows.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Subheading/Subtotal Cell Color:</guilabel> Opens the color picker to choose a new color for subheading/subtotal table rows.
+            <para><guilabel>Subheading/Subtotal Cell Color:</guilabel> Opens the color picker to choose a new color
+              for subheading/subtotal table rows.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Sub-subheading/total Cell Color:</guilabel> Opens the color picker to choose a new color for sub-subheading/total table rows.
+            <para><guilabel>Sub-subheading/total Cell Color:</guilabel> Opens the color picker to choose a new color
+              for sub-subheading/total table rows.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Grand Total Cell Color:</guilabel> Opens the color picker to choose a new color for grand total rows.
+            <para><guilabel>Grand Total Cell Color:</guilabel> Opens the color picker to choose a new color for grand
+              total rows.
             </para>
           </listitem>
         </itemizedlist>
@@ -1885,25 +2105,29 @@ Translators:
 
         <itemizedlist>
           <listitem>
-            <para><guilabel>Background Tile:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use as the background in reports.
-              The <guibutton>Clear</guibutton> button will clear the selection.
+            <para><guilabel>Background Tile:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
+              picture to use as the background in reports. The <guibutton>Clear</guibutton> button
+              will clear the selection.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Heading Banner:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use as the heading in reports.
-              The <guibutton>Clear</guibutton> button will clear the selection.
+            <para><guilabel>Heading Banner:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
+              picture to use as the heading in reports. The <guibutton>Clear</guibutton> button will
+              clear the selection.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Heading Alignment:</guilabel> Select from pull-down list; Left, Right, Center, to specify the alignment of the banner at the top of report(s).
+            <para><guilabel>Heading Alignment:</guilabel> Select from pull-down list; Left, Right, Center, to specify
+              the alignment of the banner at the top of report(s).
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Logo:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use as the logo in reports.
-              The <guibutton>Clear</guibutton> button will clear the selection.
+            <para><guilabel>Logo:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use
+              as the logo in reports. The <guibutton>Clear</guibutton> button will clear the
+              selection.
             </para>
           </listitem>
         </itemizedlist>
@@ -1934,7 +2158,8 @@ Translators:
     <sect2 id="style-footer">
       <title>Footer Style Sheet</title>
 
-      <para>The Footer Style Sheet has the same five tabs to alter the appearance of reports as the Easy Style Sheets: Colors, Fonts, General, Images and Tables.
+      <para>The Footer Style Sheet has the same five tabs to alter the appearance of reports as the Easy Style
+        Sheets: Colors, Fonts, General, Images and Tables.
       </para>
 
       <sect3 id="style-footer-colors">
@@ -1962,22 +2187,26 @@ Translators:
           </listitem>
 
           <listitem>
-            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a new color for alternate table rows.
+            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a new color for
+              alternate table rows.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Subheading/Subtotal Cell Color:</guilabel> Opens the color picker to choose a new color for subheading/subtotal table rows.
+            <para><guilabel>Subheading/Subtotal Cell Color:</guilabel> Opens the color picker to choose a new color
+              for subheading/subtotal table rows.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Sub-subheading/total Cell Color:</guilabel> Opens the color picker to choose a new color for sub-subheading/total table rows.
+            <para><guilabel>Sub-subheading/total Cell Color:</guilabel> Opens the color picker to choose a new color
+              for sub-subheading/total table rows.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Grand Total Cell Color:</guilabel> Opens the color picker to choose a new color for grand total rows.
+            <para><guilabel>Grand Total Cell Color:</guilabel> Opens the color picker to choose a new color for grand
+              total rows.
             </para>
           </listitem>
         </itemizedlist>
@@ -2070,25 +2299,29 @@ Translators:
 
         <itemizedlist>
           <listitem>
-            <para><guilabel>Background Tile:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use as the background in reports.
-              The <guibutton>Clear</guibutton> button will clear the selection.
+            <para><guilabel>Background Tile:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
+              picture to use as the background in reports. The <guibutton>Clear</guibutton> button
+              will clear the selection.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Heading Banner:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use as the heading in reports.
-              The <guibutton>Clear</guibutton> button will clear the selection.
+            <para><guilabel>Heading Banner:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
+              picture to use as the heading in reports. The <guibutton>Clear</guibutton> button will
+              clear the selection.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Heading Alignment:</guilabel> Select from pull-down list; Left, Right, Center, to specify the alignment of the banner at the top of report(s).
+            <para><guilabel>Heading Alignment:</guilabel> Select from pull-down list; Left, Right, Center, to specify
+              the alignment of the banner at the top of report(s).
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Logo:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use as the logo in reports.
-              The <guibutton>Clear</guibutton> button will clear the selection.
+            <para><guilabel>Logo:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use
+              as the logo in reports. The <guibutton>Clear</guibutton> button will clear the
+              selection.
             </para>
           </listitem>
         </itemizedlist>
@@ -2119,7 +2352,8 @@ Translators:
     <sect2 id="style-technicolor">
       <title>Technicolor Style Sheet</title>
 
-      <para>The Technicolor Style Sheet has has five tabs to alter the appearance of reports: Colors, Fonts, General, Images and Tables.
+      <para>The Technicolor Style Sheet has has five tabs to alter the appearance of reports: Colors, Fonts,
+        General, Images and Tables.
       </para>
 
       <sect3 id="style-tech-colors">
@@ -2147,22 +2381,26 @@ Translators:
           </listitem>
 
           <listitem>
-            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a new color for alternate table rows.
+            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a new color for
+              alternate table rows.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Subheading/Subtotal Cell Color:</guilabel> Opens the color picker to choose a new color for subheading/subtotal table rows.
+            <para><guilabel>Subheading/Subtotal Cell Color:</guilabel> Opens the color picker to choose a new color
+              for subheading/subtotal table rows.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Sub-subheading/total Cell Color:</guilabel> Opens the color picker to choose a new color for sub-subheading/total table rows.
+            <para><guilabel>Sub-subheading/total Cell Color:</guilabel> Opens the color picker to choose a new color
+              for sub-subheading/total table rows.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Grand Total Cell Color:</guilabel> Opens the color picker to choose a new color for grand total rows.
+            <para><guilabel>Grand Total Cell Color:</guilabel> Opens the color picker to choose a new color for grand
+              total rows.
             </para>
           </listitem>
         </itemizedlist>
@@ -2250,25 +2488,29 @@ Translators:
 
         <itemizedlist>
           <listitem>
-            <para><guilabel>Background Tile:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use as the background in reports.
-              The <guibutton>Clear</guibutton> button will clear the selection.
+            <para><guilabel>Background Tile:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
+              picture to use as the background in reports. The <guibutton>Clear</guibutton> button
+              will clear the selection.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Heading Banner:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use as the heading in reports.
-              The <guibutton>Clear</guibutton> button will clear the selection.
+            <para><guilabel>Heading Banner:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
+              picture to use as the heading in reports. The <guibutton>Clear</guibutton> button will
+              clear the selection.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Heading Alignment:</guilabel> Select from pull-down list; Left, Right, Center, to specify the alignment of the banner at the top of report(s).
+            <para><guilabel>Heading Alignment:</guilabel> Select from pull-down list; Left, Right, Center, to specify
+              the alignment of the banner at the top of report(s).
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Logo:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use as the logo in reports.
-              The <guibutton>Clear</guibutton> button will clear the selection.
+            <para><guilabel>Logo:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use
+              as the logo in reports. The <guibutton>Clear</guibutton> button will clear the
+              selection.
             </para>
           </listitem>
         </itemizedlist>
@@ -2301,34 +2543,37 @@ Translators:
     <title>Setting Tax Report Options</title>
 
     <abstract>
-      <para>The tax report can be used to prepare online tax reports for specific countries, see <xref linkend="report-regional"/>.
-        Currently
-        US and partial DE are supported.
+      <para>The tax report can be used to prepare online tax reports for specific countries, see
+        <xref linkend="report-regional"/>. Currently US and partial DE are supported.
       </para>
     </abstract>
 
     <note>
       <title>Localization</title>
 
-      <para>Before it can be used in other regions, one needs to provide a localized taxtable.
-        See the instructions in the <ulink url="&url-wiki-L12N-tax;">wiki</ulink>.
+      <para>Before it can be used in other regions, one needs to provide a localized taxtable. See the
+        instructions in the <ulink url="&url-wiki-L12N-tax;">wiki</ulink>.
       </para>
     </note>
-    <!-- Translators: you can stop here to translate. After you created or got a 
+<!-- Translators: you can stop here to translate. After you created or got a 
       localized taxtable describe the options, which your report requires.  -->
-    <para>The <guilabel>Income Tax Information</guilabel> dialog is used to set Tax Report Options.
-      The settings on accounts in this dialog are used by the <acronym>TXF</acronym> Export function in reports to select the accounts for export.
-      To access this dialog go to
+    <para>The <guilabel>Income Tax Information</guilabel> dialog is used to set Tax Report Options. The
+      settings on accounts in this dialog are used by the <acronym>TXF</acronym> Export function in
+      reports to select the accounts for export. To access this dialog go to
       <menuchoice>
-        <guimenu><accel>E</accel>dit</guimenu> <guimenuitem>Ta<accel>x</accel> Report Options</guimenuitem>
+        <guimenu><accel>E</accel>dit</guimenu> <guimenuitem>Ta<accel>x</accel> Report
+        Options</guimenuitem>
       </menuchoice>
       .
     </para>
 
     <tip>
-      <para>If the Income Tax features are used, it is strongly recommended that the <guilabel>Tax Info</guilabel> column be made visible on the accounts tab (click large downward-pointing arrow and select <guilabel>Tax Info</guilabel> check box).
-        The <guilabel>Tax Info</guilabel> column will display the Form/Schedule and tax category (e.g., <guilabel>Schedule D Dividend, cap gain distrib.</guilabel>) assigned to an account, if any.
-        Alternatively, it will display the following error messages which can be corrected through
+      <para>If the Income Tax features are used, it is strongly recommended that the <guilabel>Tax
+        Info</guilabel> column be made visible on the accounts tab (click large downward-pointing
+        arrow and select <guilabel>Tax Info</guilabel> check box). The <guilabel>Tax Info</guilabel>
+        column will display the Form/Schedule and tax category (e.g., <guilabel>Schedule D Dividend,
+        cap gain distrib.</guilabel>) assigned to an account, if any. Alternatively, it will display
+        the following error messages which can be corrected through
         <menuchoice>
           <guimenu>Edit</guimenu> <guimenuitem>Tax Report Options</guimenuitem>
         </menuchoice>
@@ -2392,14 +2637,10 @@ Translators:
       </para>
     </tip>
 
-    <para>The Income Tax Identity must be set in order to assign codes to individual accounts.
-      Click <guibutton>Edit</guibutton> to set the identity.
-      The
-      Tax
-      Name is optional.
-      If entered, it will be printed at the top of the report.
-      A <guilabel>Type</guilabel> must be selected in order to activate the tax category selections.
-      The choices are:
+    <para>The Income Tax Identity must be set in order to assign codes to individual accounts. Click
+      <guibutton>Edit</guibutton> to set the identity. The Tax Name is optional. If entered, it will
+      be printed at the top of the report. A <guilabel>Type</guilabel> must be selected in order to
+      activate the tax category selections. The choices are:
       <itemizedlist spacing="compact">
         <listitem>
           <para>Individual, Joint, etc. - Files US Form 1040 Tax Return
@@ -2428,61 +2669,79 @@ Translators:
       </itemizedlist>
     </para>
 
-    <para>While the Income Tax Entity Type can be changed after tax categories have been assigned to accounts, you should be cautioned that you will need to manually change each one if you do so, which could be quite tedious.
-      The tax categories are unique for each Income Tax Entity Type, so changing the type will make all previously assigned categories invalid.
-      It is assumed (and highly recommended) that each &app; file is for only one tax entity and this is where you specify its type of tax entity.
-      You should not keep, for example, personal and partnership accounts mixed in one &app; file if you plan to use the Income Tax Reporting features.
+    <para>While the Income Tax Entity Type can be changed after tax categories have been assigned to accounts,
+      you should be cautioned that you will need to manually change each one if you do so, which
+      could be quite tedious. The tax categories are unique for each Income Tax Entity Type, so
+      changing the type will make all previously assigned categories invalid. It is assumed (and
+      highly recommended) that each &app; file is for only one tax entity and this is where you
+      specify its type of tax entity. You should not keep, for example, personal and partnership
+      accounts mixed in one &app; file if you plan to use the Income Tax Reporting features.
     </para>
 
-    <para>A given <acronym>TXF</acronym> code can be assigned to multiple accounts.
-      The
-      Tax
-      Schedule
-      Report will combine accounts by code and generate a detailed <acronym>TXF</acronym> record for each account and a summary <acronym>TXF</acronym> record for the total as calculated by the report.
+    <para>A given <acronym>TXF</acronym> code can be assigned to multiple accounts. The Tax Schedule Report
+      will combine accounts by code and generate a detailed <acronym>TXF</acronym> record for each
+      account and a summary <acronym>TXF</acronym> record for the total as calculated by the report.
     </para>
 
-    <para>For codes for which the "Payer Name Source" is not grayed, the payer on the <acronym>TXF</acronym> record will be based on what is specified here, either the account name of the account or the account name of the account’s parent account.
-      This feature is typically used for interest accounts or stocks or mutual funds that pay dividends where the individual payees are shown on the tax schedule.
-      For example, if the parent account’s name is the name of your broker and the sub-account’s names are the names of individual stocks that pay dividends and the name on the 1099-DIV received is that of the broker, in order to match that name, you would select ’Parent Account’; the total dividends from the broker would be exported and, if you had several brokers, there would be an amount exported and a subtotal for each broker, along with each brokers name.
-      Alternatively, if you had a parent account named <emphasis>Directly Held</emphasis>, for example, and below it sub-accounts for one or more stocks, you would receive a 1099-DIV from the issuer of each stock separately and, in order to match that name, you would select <guilabel>Current Account</guilabel>; the total dividends from each stock would be exported and, if you had several stocks, there would be an amount exported and a subtotal for each stock, along with each stock’s name as the payer.
+    <para>For codes for which the "Payer Name Source" is not grayed, the payer on the <acronym>TXF</acronym>
+      record will be based on what is specified here, either the account name of the account or the
+      account name of the account’s parent account. This feature is typically used for
+      interest accounts or stocks or mutual funds that pay dividends where the individual payees are
+      shown on the tax schedule. For example, if the parent account’s name is the name of your
+      broker and the sub-account’s names are the names of individual stocks that pay dividends
+      and the name on the 1099-DIV received is that of the broker, in order to match that name, you
+      would select ’Parent Account’; the total dividends from the broker would be
+      exported and, if you had several brokers, there would be an amount exported and a subtotal for
+      each broker, along with each brokers name. Alternatively, if you had a parent account named
+      <emphasis>Directly Held</emphasis>, for example, and below it sub-accounts for one or more
+      stocks, you would receive a 1099-DIV from the issuer of each stock separately and, in order to
+      match that name, you would select <guilabel>Current Account</guilabel>; the total dividends
+      from each stock would be exported and, if you had several stocks, there would be an amount
+      exported and a subtotal for each stock, along with each stock’s name as the payer.
     </para>
 
-    <para>Some tax Forms/Schedules need to have multiple copies filed under some circumstances (for example, Schedule C if a taxpayer and spouse have separate businesses).
-      For tax categories on these Forms/Schedules, the <guilabel>Copy Number</guilabel> is not grayed out and can be used to segregate accounts by copy number.
+    <para>Some tax Forms/Schedules need to have multiple copies filed under some circumstances (for example,
+      Schedule C if a taxpayer and spouse have separate businesses). For tax categories on these
+      Forms/Schedules, the <guilabel>Copy Number</guilabel> is not grayed out and can be used to
+      segregate accounts by copy number.
     </para>
 
     <itemizedlist>
       <listitem>
-        <para>Accounts: This pane contains the list of accounts.
-          Select an account to set a <acronym>TXF</acronym> category.
-          If no account is selected nothing is changed.
-          If multiple accounts are selected, all of the accounts will be set to the selected item.
+        <para>Accounts: This pane contains the list of accounts. Select an account to set a <acronym>TXF</acronym>
+          category. If no account is selected nothing is changed. If multiple accounts are selected,
+          all of the accounts will be set to the selected item.
         </para>
       </listitem>
 
       <listitem>
-        <para>Tax Related: Select this check-box to add tax information to an account then select the <acronym>TXF</acronym> Category below.
-          This setting is displayed on the account edit dialogue but cannot be changed from there.
+        <para>Tax Related: Select this check-box to add tax information to an account then select the
+          <acronym>TXF</acronym> Category below. This setting is displayed on the account edit
+          dialogue but cannot be changed from there.
         </para>
       </listitem>
 
       <listitem>
-        <para>TXF Categories: Select the desired one.
-          A detailed description appears just below (if available, otherwise it says <guilabel>No help available</guilabel>), along with the <acronym>TXF</acronym> code for the category and information about what line number on the form or schedule the amounts are included in by tax year (used for detailed sort on report).
+        <para>TXF Categories: Select the desired one. A detailed description appears just below (if available,
+          otherwise it says <guilabel>No help available</guilabel>), along with the
+          <acronym>TXF</acronym> code for the category and information about what line number on the
+          form or schedule the amounts are included in by tax year (used for detailed sort on
+          report).
         </para>
       </listitem>
 
       <listitem>
-        <para>Payer Name Source: Select an option to determine where the text description that is exported along with the value of the account is derived from, as described above.
-          This is usually the name of a bank, stock, or mutual fund that pays dividends or interest.
-          Occasionally, it is a description of a deduction.
+        <para>Payer Name Source: Select an option to determine where the text description that is exported along
+          with the value of the account is derived from, as described above. This is usually the
+          name of a bank, stock, or mutual fund that pays dividends or interest. Occasionally, it is
+          a description of a deduction.
         </para>
       </listitem>
 
       <listitem>
-        <para>Copy Number: A copy number that is exported along with the value of the account.
-          This is used to segregate amounts between different copies of the same Form/Schedule that may need to be filed (e.g., Schedule C(1), Schedule C(2), etc.).
-          This is also used to sort the report.
+        <para>Copy Number: A copy number that is exported along with the value of the account. This is used to
+          segregate amounts between different copies of the same Form/Schedule that may need to be
+          filed (e.g., Schedule C(1), Schedule C(2), etc.). This is also used to sort the report.
         </para>
       </listitem>
     </itemizedlist>
@@ -2505,8 +2764,8 @@ Translators:
         </listitem>
       </itemizedlist>
 
-      <para>These two codes, from the same payer, are not correlated.
-        The user will have to adjust for this after import.
+      <para>These two codes, from the same payer, are not correlated. The user will have to adjust for this
+        after import.
       </para>
 
       <para>TaxCut 1999, 2000
@@ -2520,7 +2779,8 @@ Translators:
       </itemizedlist>
 
       <para>Does not accept the date field and does not import the individual payment amounts, only the total.
-        The date and individual payment amounts, only matter if you have to compute the penalty. (this may be a TurboTax enhancement)
+        The date and individual payment amounts, only matter if you have to compute the penalty.
+        (this may be a TurboTax enhancement)
       </para>
 
       <itemizedlist>
@@ -2553,10 +2813,11 @@ Translators:
         </listitem>
       </itemizedlist>
 
-      <para>Does not accept the dates outside of the tax year.
-        This is a problem for the last payment that is due Jan 15. &app; changes the the date of the last payment to Dec 31 for the export unless the "Do not use special date processing" option is selected in the report options display tab.
-        The user will have to adjust for this after import.
-        The date only matters if you have to compute the penalty.
+      <para>Does not accept the dates outside of the tax year. This is a problem for the last payment that is
+        due Jan 15. &app; changes the the date of the last payment to Dec 31 for the export unless
+        the "Do not use special date processing" option is selected in the report options display
+        tab. The user will have to adjust for this after import. The date only matters if you have
+        to compute the penalty.
       </para>
 
       <para>TXF Tax eXport Format
@@ -2569,11 +2830,16 @@ Translators:
         </listitem>
       </itemizedlist>
 
-      <para>Codes can be assigned to multiple accounts and the amounts will be summed for all the accounts generating one detail <acronym>TXF</acronym> record per account and one summary <acronym>TXF</acronym> record for the sum.
-        Codes that let you select "Payer Name Source" will generate a separate summary <acronym>TXF</acronym> account with each change in payer.
-        Selecting the "Print <acronym>TXF</acronym> export parameters" option will cause the report to show to which codes this applies (Payer Name Source option Y) and, for the accounts assigned to those codes, the Name Source each account is set to and the <acronym>TXF</acronym> item number that will be assigned to each.
-        A summary <acronym>TXF</acronym> record will be generated for each change in assigned item line number.
-        These may not be handled the same by TaxCut and TurboTax.
+      <para>Codes can be assigned to multiple accounts and the amounts will be summed for all the accounts
+        generating one detail <acronym>TXF</acronym> record per account and one summary
+        <acronym>TXF</acronym> record for the sum. Codes that let you select "Payer Name Source"
+        will generate a separate summary <acronym>TXF</acronym> account with each change in payer.
+        Selecting the "Print <acronym>TXF</acronym> export parameters" option will cause the report
+        to show to which codes this applies (Payer Name Source option Y) and, for the accounts
+        assigned to those codes, the Name Source each account is set to and the
+        <acronym>TXF</acronym> item number that will be assigned to each. A summary
+        <acronym>TXF</acronym> record will be generated for each change in assigned item line
+        number. These may not be handled the same by TaxCut and TurboTax.
       </para>
 
       <itemizedlist>
@@ -2583,21 +2849,30 @@ Translators:
         </listitem>
       </itemizedlist>
 
-      <para>Short term or long term gain or loss from the sale of a security; generates <acronym>TXF</acronym> output for only the date sold and sales amount, with the date acquired and cost basis information left blank (to be separately added in the tax software).
-        The code can be assigned to either a short-, long-, or mixed-term gain/loss income account and the security sales transaction should be entered as illustrated in Section 8.7, Selling Shares, of the &app; Tutorial and Concepts Guide.
-        The report uses the transaction split of the gain/loss account to find one or more other splits in the same transaction with negative share quantities.
-        For each of these found, it generates a detailed <acronym>TXF</acronym> output record with the quantity sold, the name of the security, the date sold, and the sales amount.
-        Note that if, for a given transaction, more than one transaction split is to a gain/loss income account assigned to code 673, <acronym>TXF</acronym> output data will be erroneously repeated.
-        That is because the report will fetch the same data, and re-output it, for each transaction split set to a gain/loss income account within the same transaction.
-        For this reason, there should be no more than one gain/loss account entered per transaction to use this tax reporting code properly. (Note that no amounts are used from &app;’s lot-tracking; a future enhancement is expected to use this data to provide capital gain reporting).
+      <para>Short term or long term gain or loss from the sale of a security; generates <acronym>TXF</acronym>
+        output for only the date sold and sales amount, with the date acquired and cost basis
+        information left blank (to be separately added in the tax software). The code can be
+        assigned to either a short-, long-, or mixed-term gain/loss income account and the security
+        sales transaction should be entered as illustrated in Section 8.7, Selling Shares, of the
+        &app; Tutorial and Concepts Guide. The report uses the transaction split of the gain/loss
+        account to find one or more other splits in the same transaction with negative share
+        quantities. For each of these found, it generates a detailed <acronym>TXF</acronym> output
+        record with the quantity sold, the name of the security, the date sold, and the sales
+        amount. Note that if, for a given transaction, more than one transaction split is to a
+        gain/loss income account assigned to code 673, <acronym>TXF</acronym> output data will be
+        erroneously repeated. That is because the report will fetch the same data, and re-output it,
+        for each transaction split set to a gain/loss income account within the same transaction.
+        For this reason, there should be no more than one gain/loss account entered per transaction
+        to use this tax reporting code properly. (Note that no amounts are used from &app;’s
+        lot-tracking; a future enhancement is expected to use this data to provide capital gain
+        reporting).
       </para>
     </sect2>
 
     <sect2 id="txf-defs">
       <title>Detailed <acronym>TXF</acronym> Category Descriptions</title>
 
-      <para>Table 32.
-        Detailed <acronym>TXF</acronym> Category Descriptions
+      <para>Table 32. Detailed <acronym>TXF</acronym> Category Descriptions
       </para>
 
       <xi:include href="txf-categories.xml" />
@@ -2607,18 +2882,20 @@ Translators:
   <sect1  id="reset-warning">
     <title>Reset Warnings...</title>
 
-    <para>&app; gives warnings when certain operations are attempted, such as removing a transaction or removing the splits of a transaction.
-      The warning message gives you the option to not give you these warnings when attempting the operation.
-      Check-boxes labeled <guilabel>Remember and don’t ask me again</guilabel> and <guilabel>Remember and don’t ask me again this session</guilabel> allow disabling the warnings.
-      This option permits reseting the warnings to the default, IE make the warning happen.
-      Warnings may be selectivly enabled.
+    <para>&app; gives warnings when certain operations are attempted, such as removing a transaction or
+      removing the splits of a transaction. The warning message gives you the option to not give you
+      these warnings when attempting the operation. Check-boxes labeled <guilabel>Remember and
+      don’t ask me again</guilabel> and <guilabel>Remember and don’t ask me again this
+      session</guilabel> allow disabling the warnings. This option permits reseting the warnings to
+      the default, IE make the warning happen. Warnings may be selectivly enabled.
     </para>
   </sect1>
 
   <sect1  id="chang-lang">
     <title>Changing the Language or Region</title>
 
-    <para>The language of the &app; user interface is not modifiable directly from the program’s preferences.
+    <para>The language of the &app; user interface is not modifiable directly from the program’s
+      preferences.
     </para>
 
     <para>The way you can change the language depends on the operating system you are running &app; on.
@@ -2629,20 +2906,22 @@ Translators:
         <term>&lin;</term>
 
         <listitem>
-          <para>In general you should set the <envar>LANGUAGE</envar> and <envar>LANG</envar> environment variables before starting &app;.
-            To do this you need to open a terminal and run the following command:
+          <para>In general you should set the <envar>LANGUAGE</envar> and <envar>LANG</envar> environment variables
+            before starting &app;. To do this you need to open a terminal and run the following
+            command:
           </para>
 
-          <para><command>LANGUAGE=<replaceable>ll_LL</replaceable> LANG=<replaceable>ll_LL</replaceable> gnucash</command>
+          <para><command>LANGUAGE=<replaceable>ll_LL</replaceable> LANG=<replaceable>ll_LL</replaceable>
+            gnucash</command>
           </para>
 
-          <para><replaceable>ll_LL</replaceable> is the locale you want to run &app; with (<emphasis>de_DE</emphasis> for Deutsch, <emphasis>it_IT</emphasis> for Italian etc.)
+          <para><replaceable>ll_LL</replaceable> is the locale you want to run &app; with
+            (<emphasis>de_DE</emphasis> for Deutsch, <emphasis>it_IT</emphasis> for Italian etc.)
           </para>
 
           <note>
-            <para>On some systems (e.g.
-              Ubuntu) the encoding could be part of the locales name, like <replaceable>ll_LL.UTF-8</replaceable>.
-              You can use these names as well.
+            <para>On some systems (e.g. Ubuntu) the encoding could be part of the locales name, like
+              <replaceable>ll_LL.UTF-8</replaceable>. You can use these names as well.
             </para>
           </note>
         </listitem>
@@ -2652,20 +2931,24 @@ Translators:
         <term>&mac;</term>
 
         <listitem>
-          <para>If you want to use a different translation from the one that is automatically selected, you can run the following in <application>Terminal.app</application>:
+          <para>If you want to use a different translation from the one that is automatically selected, you can run
+            the following in <application>Terminal.app</application>:
           </para>
 
-          <para><command>defaults write $(mdls -name kMDItemCFBundleIdentifier -raw /Applications/GnuCash.app) AppleLanguages "(<replaceable>de</replaceable>, <replaceable>en</replaceable>)"</command>
+          <para><command>defaults write $(mdls -name kMDItemCFBundleIdentifier -raw /Applications/GnuCash.app)
+            AppleLanguages "(<replaceable>de</replaceable>,
+            <replaceable>en</replaceable>)"</command>
           </para>
 
-          <para>Use whatever language codes you want, replacing Deutsch and English.
-            It won’t work if there isn’t a translation file for the language you want.
+          <para>Use whatever language codes you want, replacing Deutsch and English. It won’t work if there
+            isn’t a translation file for the language you want.
           </para>
 
           <para>If you want to unset it (that is, return to using the system settings), run this:
           </para>
 
-          <para><command>defaults delete $(mdls -name kMDItemCFBundleIdentifier -raw /Applications/GnuCash.app)</command>
+          <para><command>defaults delete $(mdls -name kMDItemCFBundleIdentifier -raw
+            /Applications/GnuCash.app)</command>
           </para>
         </listitem>
       </varlistentry>
@@ -2674,9 +2957,11 @@ Translators:
         <term><trademark>Windows</trademark></term>
 
         <listitem>
-          <para>If you are running &app; 2.4.0 (or newer) on Windows, you can set the interface language by editing the file <filename>environment</filename> with a text editor (e.g. <application>Notepad</application>).
-            By default this file is installed in <filename role="directory">c:\Program Files\gnucash\etc\gnucash</filename>.
-            Change this file such that the last few lines are:
+          <para>If you are running &app; 2.4.0 (or newer) on Windows, you can set the interface language by editing
+            the file <filename>environment</filename> with a text editor (e.g.
+            <application>Notepad</application>). By default this file is installed in
+            <filename role="directory">c:\Program Files\gnucash\etc\gnucash</filename>. Change this
+            file such that the last few lines are:
           </para>
 
           <para><programlisting linenumbering="unnumbered"># If you wish GnuCash to use a different language, uncomment the two parameters
@@ -2685,14 +2970,16 @@ LANG=ll_LL
 LANGUAGE={LANG}</programlisting>
           </para>
 
-          <para><replaceable>ll_LL</replaceable> is the locale you want to run &app; with (<emphasis>de_DE</emphasis> for Deutsch, <emphasis>it_IT</emphasis> for Italian etc.)
+          <para><replaceable>ll_LL</replaceable> is the locale you want to run &app; with
+            (<emphasis>de_DE</emphasis> for Deutsch, <emphasis>it_IT</emphasis> for Italian etc.)
           </para>
         </listitem>
       </varlistentry>
     </variablelist>
 
     <tip>
-      <para>More and updated information about this topic can be found on the <ulink url="&url-wiki-locale;">Locale Settings page</ulink> of the &app; wiki.
+      <para>More and updated information about this topic can be found on the
+        <ulink url="&url-wiki-locale;">Locale Settings page</ulink> of the &app; wiki.
       </para>
     </tip>
   </sect1>
diff --git a/C/manual/ch_Finance-Quote.xml b/C/manual/ch_Finance-Quote.xml
index 2acbb6dc..94ec99b4 100644
--- a/C/manual/ch_Finance-Quote.xml
+++ b/C/manual/ch_Finance-Quote.xml
@@ -35,6 +35,7 @@ Translators:
     <listitem>
       <para>the &app-perl;-module &app-fq; with any dependencies
       </para>
+
       <para>the &app-perl;-module JSON::Parse to manage the output of &app-fq;.
       </para>
     </listitem>
@@ -58,16 +59,17 @@ Translators:
       </para>
     </abstract>
 
-    <para>To check if &app-perl; is already installed on your system, call the command
-      <userinput>perl -v</userinput> in the terminal.
+    <para>To check if &app-perl; is already installed on your system, call the command <userinput>perl
+      -v</userinput> in the terminal.
 <!-- Fixme: https://bugs.gnucash.org/show_bug.cgi?id=798618 -->
-    <informalexample><?dbfo pgwide="1"?>
+      <informalexample>
+<?dbfo pgwide="1"?>
 <screen language="console">$ perl -v
 This is perl 5, version 30, subversion 0 (v5.30.0) built for x86_64-linux-gnu-thread-multi
 </screen>
-    </informalexample>
-      If you are shown the version number of the &app-perl; interpreter, skip the next details
-      and continue instead with <xref linkend="finance-quote-install" />.
+      </informalexample>
+      If you are shown the version number of the &app-perl; interpreter, skip the next details and
+      continue instead with <xref linkend="finance-quote-install" />.
     </para>
 
     <procedure>
@@ -75,7 +77,8 @@ This is perl 5, version 30, subversion 0 (v5.30.0) built for x86_64-linux-gnu-th
 
       <step>
         <para>On most systems &app-perl; is probably already installed. If with the previous command does not show
-          a version, then the easiest way is to use your system’s package manager for installation.
+          a version, then the easiest way is to use your system’s package manager for
+          installation.
         </para>
       </step>
 
@@ -98,8 +101,8 @@ This is perl 5, version 30, subversion 0 (v5.30.0) built for x86_64-linux-gnu-th
       <title>On &win;</title>
 
       <step>
-        <para>Under &win; run the program &gmi.winOS.inst-fq; to run. This will
-          install <ulink url="&url-wp-en;Strawberry_Perl">Strawberry Perl</ulink>.
+        <para>Under &win; run the program &gmi.winOS.inst-fq; to run. This will install
+          <ulink url="&url-wp-en;Strawberry_Perl">Strawberry Perl</ulink>.
           <footnote>
             <para>&app; Version 2.2.6 and before require <ulink url="&url-wp-en;ActivePerl">ActivePerl</ulink>. in
               version 5.8.
@@ -129,11 +132,11 @@ This is perl 5, version 30, subversion 0 (v5.30.0) built for x86_64-linux-gnu-th
     </procedure>
 
     <tip>
-      <para>Afterwards it’s a good idea to include the folder where &app; is installed,
-        under &win; e.g. <userinput><replaceable>C:\Program Files (x86)\gnucash\bin</replaceable></userinput>,
-        to your <envar>PATH</envar> environment variable.
-        This way it’s easier for you to use some <xref linkend="fq-command-line" /> when needed.
-        Please refer to the documentation for your operating system for more information.
+      <para>Afterwards it’s a good idea to include the folder where &app; is installed, under &win; e.g.
+        <userinput><replaceable>C:\Program Files (x86)\gnucash\bin</replaceable></userinput>, to
+        your <envar>PATH</envar> environment variable. This way it’s easier for you to use
+        some <xref linkend="fq-command-line" /> when needed. Please refer to the documentation for
+        your operating system for more information.
       </para>
     </tip>
   </sect1>
@@ -142,10 +145,11 @@ This is perl 5, version 30, subversion 0 (v5.30.0) built for x86_64-linux-gnu-th
     <title>Installing &app-fq;</title>
 
     <para>To determine if the &app-perl; module &app-fq; is already installed on your system, type
-      <userinput>perldoc Finance::Quote</userinput> in a terminal window and check to see if there is
-      any documentation
+      <userinput>perldoc Finance::Quote</userinput> in a terminal window and check to see if there
+      is any documentation
 <!-- Fixme: https://bugs.gnucash.org/show_bug.cgi?id=798618 -->
-    <informalexample><?dbfo pgwide="1"?>
+      <informalexample>
+<?dbfo pgwide="1"?>
 <screen language="console">
 $ perldoc Finance::Quote
 NAME
@@ -154,10 +158,10 @@ NAME
 SYNOPSIS
        [...]
 </screen>
-    </informalexample>
+      </informalexample>
       available. If you are now shown documentation, then &app-fq; is already installed and you can
-      configure periodical quotes update as described in <xref linkend="fq-auto-quote" />.
-      If no documentation is displayed, you will have to continue with this chapter.
+      configure periodical quotes update as described in <xref linkend="fq-auto-quote" />. If no
+      documentation is displayed, you will have to continue with this chapter.
     </para>
 
     <para>The process of installing &app-fq; depends on the system. For the different supported systems, you
@@ -173,12 +177,12 @@ SYNOPSIS
       </step>
 
       <step>
-        <simpara>Run the <userinput>gnucash-cli --quotes info</userinput> command to verify that the program is already in a directory
-          that is entered in the <envar>PATH</envar> environment variable.
+        <simpara>Run the <userinput>gnucash-cli --quotes info</userinput> command to verify that the program is
+          already in a directory that is entered in the <envar>PATH</envar> environment variable.
           <footnote>
             <simpara>If you’ve installed &app; packages provided by your distribution,
-              <filename>gnucash-cli</filename> must be on your <envar>PATH</envar>. The currentness of your
-              distribution can be checked under
+              <filename>gnucash-cli</filename> must be on your <envar>PATH</envar>. The currentness
+              of your distribution can be checked under
               <ulink url="&url-repo;perl:finance-quote/versions"><citetitle>&app-fq;-
               versions</citetitle></ulink>.
             </simpara>
@@ -192,17 +196,22 @@ SYNOPSIS
       </step>
 
       <step>
-        <simpara>Run <userinput>gnucash-cli --quotes info</userinput> to check &app-fq; works properly. This command returns the
-          version number of &app-fq; module currently installed as well as a list of sources
-          available via the &app-fq; module. It will also inform you if there is a problem with your
-          installation or if it is missing, and may suggest a fix.
+        <simpara>Run <userinput>gnucash-cli --quotes info</userinput> to check &app-fq; works properly. This command
+          returns the version number of &app-fq; module currently installed as well as a list of
+          sources available via the &app-fq; module. It will also inform you if there is a problem
+          with your installation or if it is missing, and may suggest a fix.
         </simpara>
       </step>
     </procedure>
 
     <procedure>
       <title>On &mac;</title>
-      <note><para>You must be logged in with a user id that can administer the mac to use this procedure.</para></note>
+
+      <note>
+        <para>You must be logged in with a user id that can administer the mac to use this procedure.
+        </para>
+      </note>
+
       <step>
         <simpara>Close &app;.
         </simpara>
@@ -211,25 +220,40 @@ SYNOPSIS
       <step>
         <simpara>Install &app-xcode;
           <footnote>
-            <para>You can install &app-xcode; from the App Store or install the
-              much smaller Xcode command line tools by running <userinput>
-              sudo xcode-select --install</userinput> from a Terminal.app prompt.
+            <para>You can install &app-xcode; from the App Store or install the much smaller Xcode command line tools
+              by running <userinput> sudo xcode-select --install</userinput> from a Terminal.app
+              prompt.
             </para>
           </footnote>
-         if it is not installed. It contains devel tools, which are required
-         by CPAN to build and test the needed &app-fq; modules.
+          if it is not installed. It contains devel tools, which are required by CPAN to build and
+          test the needed &app-fq; modules.
         </simpara>
       </step>
 
       <step>
-        <simpara>Open a Finder window, select <guimenu>Applications</guimenu> from the sidebar, double-click <guimenu>Utilities</guimenu> in the file area, then double-click on <guimenu>Terminal</guimenu> to open <application>Terminal</application></simpara>
+        <simpara>Open a Finder window, select <guimenu>Applications</guimenu> from the sidebar, double-click
+          <guimenu>Utilities</guimenu> in the file area, then double-click on
+          <guimenu>Terminal</guimenu> to open <application>Terminal</application>
+        </simpara>
       </step>
+
       <step>
-        <simpara>In the Terminal window enter <userinput>sudo /Applications/Gnucash.app/Contents/Resources/bin/gnc-fq-update</userinput>. That script asks lots of questions. Accept the default for each.
+        <simpara>In the Terminal window enter <userinput>sudo
+          /Applications/Gnucash.app/Contents/Resources/bin/gnc-fq-update</userinput>. That script
+          asks lots of questions. Accept the default for each.
         </simpara>
       </step>
+
       <step>
-        <simpara>Type <userinput>exit</userinput> or <keycombo action='simul'><keycap>Control</keycap><keycap>D</keycap></keycombo> to terminate the shell followed by <keycombo action='simul'><keycap>Command</keycap><keycap>Q</keycap></keycombo> to quit <application>Terminal</application>.
+        <simpara>Type <userinput>exit</userinput> or
+          <keycombo action='simul'>
+            <keycap>Control</keycap><keycap>D</keycap>
+          </keycombo>
+          to terminate the shell followed by
+          <keycombo action='simul'>
+            <keycap>Command</keycap><keycap>Q</keycap>
+          </keycombo>
+          to quit <application>Terminal</application>.
         </simpara>
       </step>
     </procedure>
@@ -253,15 +277,22 @@ SYNOPSIS
     <title>Using &app-cli; for Testing and Automation.</title>
 
     <abstract>
-      <para>&app; provides a commandline facility &app-cli; that one can use in a terminal session to check the version and supported source modules, to display the quotes or exchange rates for selected securities or currencies, or to update all of the prices in a book without launching the GUI.
+      <para>&app; provides a commandline facility &app-cli; that one can use in a terminal session to check the
+        version and supported source modules, to display the quotes or exchange rates for selected
+        securities or currencies, or to update all of the prices in a book without launching the
+        GUI.
       </para>
     </abstract>
+
     <sect2 id="fq-check-version">
       <title>Displaying the Finance::Quote Version and Supported Sources</title>
-      <para><command>gnucash-cli --quotes info</command> produces the following output:</para>
-      <!-- Fixme: https://bugs.gnucash.org/show_bug.cgi?id=798618 -->
-      <informalexample><?dbfo pgwide="1"?>
-      <screen language="console">
+
+      <para><command>gnucash-cli --quotes info</command> produces the following output:
+      </para>
+<!-- Fixme: https://bugs.gnucash.org/show_bug.cgi?id=798618 -->
+      <informalexample>
+<?dbfo pgwide="1"?>
+<screen language="console">
   $ gnucash-cli --quotes info
   Found Finance::Quote version 1.52.
   Finance::Quote sources:
@@ -279,31 +310,56 @@ SYNOPSIS
   tiaacref     tmx          tradeville   troweprice   troweprice_direct
   tsp          ukfunds      unionfunds   usa          usfedbonds   yahoo_json
   za
-      </screen></informalexample>
-      <para>If there's a problem with your installation it will tell you about it. For example in this case we're missing the Perl modules Finance::Quote and JSON::Parse:</para>
-      <informalexample><?dbfo pgwide="1"?>
-      <screen language="console">
+      </screen>
+      </informalexample>
+
+      <para>If there's a problem with your installation it will tell you about it. For example in this case
+        we're missing the Perl modules Finance::Quote and JSON::Parse:
+      </para>
+
+      <informalexample>
+<?dbfo pgwide="1"?>
+<screen language="console">
   $ gnucash-cli --quotes info
   Failed to initialize Finance::Quote: missing_modules Finance::Quote JSON::Parse
-      </screen></informalexample>
+      </screen>
+      </informalexample>
     </sect2>
 
     <sect2 id="fq-print-quotes">
       <title>Displaying Quotes in a Terminal Window</title>
-      <para>To display a quote for one or more stocks or the exchange rate for one or more currencies you can use <userinput>gnucash-cli --quotes dump</userinput> as follows. It offers two output forms for non-currency securities and one for currency exchange rates.
-      <itemizedlist>
-        <listitem><para>Currencies use the source <userinput>currency</userinput> and require at least two ISO-4217 currency codes; the exchange rates are denominated in the first code. For example:
-      <informalexample><?dbfo pgwide="1"?>
-      <screen language="console">
+
+      <para>To display a quote for one or more stocks or the exchange rate for one or more currencies you can
+        use <userinput>gnucash-cli --quotes dump</userinput> as follows. It offers two output forms
+        for non-currency securities and one for currency exchange rates.
+        <itemizedlist>
+          <listitem>
+            <para>Currencies use the source <userinput>currency</userinput> and require at least two ISO-4217 currency
+              codes; the exchange rates are denominated in the first code. For example:
+              <informalexample>
+<?dbfo pgwide="1"?>
+<screen language="console">
         $ gnucash-cli --quotes dump currency USD GBP EUR
         1 GBP = 1.11917349089527 USD
 
         1 EUR = 0.9717 USD
-      </screen></informalexample></para></listitem>
-      <listitem><para>Stocks</para><itemizedlist>
-      <listitem><para>A short form displaying only the fields that GnuCash uses along with comments indicating whether the fields are optional or required; you can use this to determine if GnuCash will be able to use the quote to update your book's price database.
-      <informalexample><?dbfo pgwide="1"?>
-      <screen language="console">
+      </screen>
+              </informalexample>
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>Stocks
+            </para>
+
+            <itemizedlist>
+              <listitem>
+                <para>A short form displaying only the fields that GnuCash uses along with comments indicating whether the
+                  fields are optional or required; you can use this to determine if GnuCash will be
+                  able to use the quote to update your book's price database.
+                  <informalexample>
+<?dbfo pgwide="1"?>
+<screen language="console">
         $ gnucash-cli --quotes dump yahoo_json AAPL
         Finance::Quote fields GnuCash uses:
             symbol: AAPL            <=== required
@@ -312,10 +368,18 @@ SYNOPSIS
               last: 138.38          <=\
                nav:                 <=== one of these
              price:                 <=/
-      </screen></informalexample></para></listitem>
-      <listitem><para>With the <userinput>-v</userinput> option a possibly longer output showing all of the fields &app-fq; returned. This can be useful to troubleshoot problems with a &app-fq; source module.
-      <informalexample><?dbfo pgwide="1"?>
-      <screen language="console">
+      </screen>
+                  </informalexample>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>With the <userinput>-v</userinput> option a possibly longer output showing all of the fields
+                  &app-fq; returned. This can be useful to troubleshoot problems with a &app-fq;
+                  source module.
+                  <informalexample>
+<?dbfo pgwide="1"?>
+<screen language="console">
         $ ALPHAVANTAGE_API_KEY=123456789 bin/gnucash-cli -V --quotes dump alphavantage INTC
         INTC:
                      method => alphavantage
@@ -333,90 +397,100 @@ SYNOPSIS
                      symbol => INTC
                      volume => 48118005
                        last => 25.9100
-      </screen></informalexample>
-      Notice that in this case we used alphavantage and provided the <userinput>ALPHAVANTAGE_API_KEY</userinput> on the command line. That's not necessary if the key is already stored in the shell environment or in GnuCash preferences.</para>
-      </listitem></itemizedlist></listitem>
-      </itemizedlist>
-      </para></sect2>
+      </screen>
+                  </informalexample>
+                  Notice that in this case we used alphavantage and provided the
+                  <userinput>ALPHAVANTAGE_API_KEY</userinput> on the command line. That's not
+                  necessary if the key is already stored in the shell environment or in GnuCash
+                  preferences.
+                </para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </sect2>
+
     <sect2 id="fq-auto-quote">
       <title>Updating Prices Automatically with &app-cli;</title>
-    <para>You have to register the &app-cli; with a scheduler in order to get Online
-      Quotes automatically and periodically. The method depends on your OS.
-    </para>
 
-    <example>
-      <title>Automated quote retrieval every Friday at 4:00 p.m.</title>
+      <para>You have to register the &app-cli; with a scheduler in order to get Online Quotes automatically and
+        periodically. The method depends on your OS.
+      </para>
 
-      <procedure>
-        <title>On &lin; and &mac;</title>
+      <example>
+        <title>Automated quote retrieval every Friday at 4:00 p.m.</title>
 
-        <para>Register <command>gnucash-cli</command> with <application>cron</application>.
-        </para>
+        <procedure>
+          <title>On &lin; and &mac;</title>
 
-        <step>
-          <simpara>Run <command>crontab -e</command>.
-          </simpara>
-        </step>
+          <para>Register <command>gnucash-cli</command> with <application>cron</application>.
+          </para>
 
-        <step>
-          <para>Add the following line to your crontab:
-            <informalexample>
+          <step>
+            <simpara>Run <command>crontab -e</command>.
+            </simpara>
+          </step>
+
+          <step>
+            <para>Add the following line to your crontab:
+              <informalexample>
 <screen>0 16 * * 5 gnucash-cli --quotes get &user-datafile; > /dev/null 2>&1</screen>
-            </informalexample>
+              </informalexample>
 
-            <important>
-              <para>On &lin; if there is no graphic session that has already started the dbus, running on your computer at the
-                time of the quote request, you must do the entry as follows instead:
-                <informalexample>
+              <important>
+                <para>On &lin; if there is no graphic session that has already started the dbus, running on your computer
+                  at the time of the quote request, you must do the entry as follows instead:
+                  <informalexample>
 <screen>0 16 * * 5 env `dbus-launch` sh -c 'trap "kill $DBUS_SESSION_BUS_PID" EXIT;
 gnucash-cli --quotes get &user-datafile; > /dev/null 2>&1</screen>
-                </informalexample>
-                (Do not copy the line breaks into the crontab, they were inserted here only for the
-                purpose of readability).
-              </para>
-            </important>
+                  </informalexample>
+                  (Do not copy the line breaks into the crontab, they were inserted here only for
+                  the purpose of readability).
+                </para>
+              </important>
+            </para>
+          </step>
+        </procedure>
+
+        <procedure>
+          <title>On &win;</title>
+
+          <para>Register <command>gnucash-cli</command> with Task Scheduler.
           </para>
-        </step>
-      </procedure>
 
-      <procedure>
-        <title>On &win;</title>
+          <step>
+            <simpara>Select
+              <menuchoice>
+                <guimenu>Start</guimenu><guisubmenu>Windows Administrative
+                Tools</guisubmenu><guimenuitem>Task Scheduler</guimenuitem>
+              </menuchoice>
+              .
+            </simpara>
+          </step>
 
-        <para>Register <command>gnucash-cli</command> with Task Scheduler.
-        </para>
+          <step>
+            <simpara>Select <guimenuitem>Create Task</guimenuitem>.
+            </simpara>
+          </step>
 
-        <step>
-          <simpara>Select
-            <menuchoice>
-              <guimenu>Start</guimenu><guisubmenu>Windows Administrative
-              Tools</guisubmenu><guimenuitem>Task Scheduler</guimenuitem>
-            </menuchoice>
-            .
-          </simpara>
-        </step>
-
-        <step>
-          <simpara>Select <guimenuitem>Create Task</guimenuitem>.
-          </simpara>
-        </step>
-
-        <step>
-          <simpara>Enter the appropirate items on <guilabel>Create Task</guilabel> Window.
-          </simpara>
-        </step>
-      </procedure>
-
-      <para>Adjust the time to the close of the stock exchange and consider <emphasis>fund quotes</emphasis>,
-        that the net asset value (NAV) is determined well after the markets closed. The types have
-        their description in <xref linkend="tool-price" />.
+          <step>
+            <simpara>Enter the appropirate items on <guilabel>Create Task</guilabel> Window.
+            </simpara>
+          </step>
+        </procedure>
+
+        <para>Adjust the time to the close of the stock exchange and consider <emphasis>fund quotes</emphasis>,
+          that the net asset value (NAV) is determined well after the markets closed. The types have
+          their description in <xref linkend="tool-price" />.
 <!-- FIXME: adjust the link to a proper ID -->
-      </para>
-    </example>
+        </para>
+      </example>
 
-    <para>Some users have made additions to the wiki and shared their experiences on the
-      <ulink url="&url-wiki-OQ;#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page on
-      GnuCash Wiki</ulink>.
-    </para>
+      <para>Some users have made additions to the wiki and shared their experiences on the
+        <ulink url="&url-wiki-OQ;#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page
+        on GnuCash Wiki</ulink>.
+      </para>
     </sect2>
   </sect1>
 </chapter>
diff --git a/C/manual/ch_GUIMenus.xml b/C/manual/ch_GUIMenus.xml
index bac4db44..46b4b7a4 100644
--- a/C/manual/ch_GUIMenus.xml
+++ b/C/manual/ch_GUIMenus.xml
@@ -39,11 +39,14 @@
     </para>
 
     <figure id="Main_WindowCallouts">
-      <title>The Main &app; Window</title><mediaobject>
+      <title>The Main &app; Window</title>
+
+      <mediaobject>
         <imageobject>
           <imagedata fileref="figures/Main-window-callouts.png"
                      srccredit="Frank H. Ellenberger"/>
         </imageobject>
+
         <caption>
           <para>The parts in which the main &app; window is divided.
           </para>
@@ -148,19 +151,22 @@
         </menuchoice>
         .
       </para>
-      </tip>
+    </tip>
   </sect1>
 
   <sect1 id="gui-acct-tree">
     <title>Account Tree Display</title>
 
     <figure>
-      <title>The <emphasis>Account Tree</emphasis> Display.</title><screenshot id="AccTree_Screen">
+      <title>The <emphasis>Account Tree</emphasis> Display.</title>
+
+      <screenshot id="AccTree_Screen">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/AccountTree_Screen.png"
                        srccredit="Cristian Marchi"/>
           </imageobject>
+
           <caption>
             <para>This is an image of the <guilabel>Accounts</guilabel> tab.
             </para>
@@ -1131,8 +1137,7 @@
                   <note>
                     <para>Issue a new international European (SEPA) direct debit note online through Online Banking. With the
                       changeover to <acronym>SEPA</acronym>, this menu entry has disappeared, but is
-                      still possible. See the German
-                      <ulink url="&url-wiki;De/SEPA-Lastschrift"/>.
+                      still possible. See the German <ulink url="&url-wiki;De/SEPA-Lastschrift"/>.
                     </para>
                   </note>
                 </entry>
@@ -3211,16 +3216,20 @@
       </para>
 
       <figure>
-        <title>The <emphasis>Account Register</emphasis> Display.</title><screenshot id="AccountReg_Screen">
+        <title>The <emphasis>Account Register</emphasis> Display.</title>
+
+        <screenshot id="AccountReg_Screen">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/AccountReg_Screen.png"
                          srccredit="Cristian Marchi" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/AccountReg_Screen.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This is an image of the <emphasis>Account Register</emphasis> tab.
               </para>
@@ -3232,10 +3241,11 @@
       <tip>
         <para>Appearance of the Account Register Display is highly customizable (see
           <ulink
-url="&url-docs-C;guide/chapter_txns.html#txns-regstyle1">
-          Tutorial and Concepts Guide, Choosing a Register Style</ulink>)  and <ulink
-url="&url-docs-C;guide/chapter_txns.html#txns-columnwidths1">Setting
-          Column Widths</ulink>).
+url="&url-docs-C;guide/chapter_txns.html#txns-regstyle1"> Tutorial and Concepts
+          Guide, Choosing a Register Style</ulink>) and
+          <ulink
+url="&url-docs-C;guide/chapter_txns.html#txns-columnwidths1">Setting Column
+          Widths</ulink>).
         </para>
       </tip>
 
@@ -3409,8 +3419,8 @@ url="&url-docs-C;guide/chapter_txns.html#txns-columnwidths1">Setting
 
                 <entry namest="c2" nameend="c3">
                   <para>Radio button to select register display mode. See
-                    <ulink url="&url-docs-C;guide/chapter_txns.html#txns-regstyle1">
-                    Tutorial and Concepts Guide, Choosing a Register Style</ulink>.
+                    <ulink url="&url-docs-C;guide/chapter_txns.html#txns-regstyle1"> Tutorial and
+                    Concepts Guide, Choosing a Register Style</ulink>.
                   </para>
                 </entry>
               </row>
@@ -4318,16 +4328,20 @@ url="&url-docs-C;guide/chapter_txns.html#txns-columnwidths1">Setting
       </note>
 
       <figure>
-        <title>The <emphasis>Report Window</emphasis></title><screenshot id="Report_Screen">
+        <title>The <emphasis>Report Window</emphasis></title>
+
+        <screenshot id="Report_Screen">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Report_Screen.png"
                          srccredit="Cristian Marchi" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/Report_Screen.png"
                          srccredit="Cristian Marchi"/>
             </imageobject>
+
             <caption>
               <para>This is an image of the <guilabel>Income/Expense Chart</guilabel>.
               </para>
diff --git a/C/manual/ch_GettingHelp.xml b/C/manual/ch_GettingHelp.xml
index a837a101..432df919 100644
--- a/C/manual/ch_GettingHelp.xml
+++ b/C/manual/ch_GettingHelp.xml
@@ -287,17 +287,18 @@
       <bridgehead>
         Chat
       </bridgehead>
-
-      <!-- ToDo: Consider to join the following ulink with that in Guide's oview, but perhaps also the whole section. -->
-      <para>Several of the developers and experienced users monitor the <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>.
-        They are usually busy with other tasks and of course are not always at their computers.
-        Log in, ask your question, and stay logged in; it may take  several hours before your question is noticed and responded.
+<!-- ToDo: Consider to join the following ulink with that in Guide's oview, but perhaps also the whole section. -->
+      <para>Several of the developers and experienced users monitor the <ulink url='&url-irc;'>#gnucash channel
+        at &srv-irc;</ulink>. They are usually busy with other tasks and of course are not always at
+        their computers. Log in, ask your question, and stay logged in; it may take several hours
+        before your question is noticed and responded.
         <itemizedlist>
           <listitem>
             <simpara>If you got disconnected <ulink url="&url-logs-irc;">check the IRC logs</ulink> to verify that you
               missed nothing related.
             </simpara>
           </listitem>
+
           <listitem>
             <simpara>Requirements, netiquette, and other details are explained in the <ulink url="&url-wiki-irc;">IRC
               wiki page</ulink>.
@@ -310,14 +311,20 @@
 
   <sect1 id="Help-Mouse-Buttons">
     <title>Mouse Buttons</title>
-    <para>This document refers to mouse buttons as Button1, Button2 etc.</para>
-      <itemizedlist>
-        <listitem>
-          <simpara>Button1 is typically the left mouse button or the right button in a left-handed setup</simpara>
-        </listitem>
-        <listitem>
-          <simpara>Button2 is typically the right mouse button or the left button in a left-handed setup</simpara>
-        </listitem>
-      </itemizedlist>
+
+    <para>This document refers to mouse buttons as Button1, Button2 etc.
+    </para>
+
+    <itemizedlist>
+      <listitem>
+        <simpara>Button1 is typically the left mouse button or the right button in a left-handed setup
+        </simpara>
+      </listitem>
+
+      <listitem>
+        <simpara>Button2 is typically the right mouse button or the left button in a left-handed setup
+        </simpara>
+      </listitem>
+    </itemizedlist>
   </sect1>
 </chapter>
diff --git a/C/manual/ch_GettingStarted.xml b/C/manual/ch_GettingStarted.xml
index 8e7fe928..ea99ec48 100644
--- a/C/manual/ch_GettingStarted.xml
+++ b/C/manual/ch_GettingStarted.xml
@@ -23,7 +23,9 @@ Translators:
     <title>The <quote>Welcome to &appname;!</quote> Screen</title>
 
     <figure pgwide="1">
-      <title><quote>Welcome to &appname;!</quote> Screen</title><screenshot>
+      <title><quote>Welcome to &appname;!</quote> Screen</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/welcome.png"
@@ -33,12 +35,15 @@ Translators:
       </screenshot>
     </figure>
 
-    <para>This screen is intended for you to use to get up and running quickly.
-      The <guibutton>Cancel</guibutton> button is used to exit the screen.
-      It will then prompt you with <guilabel>Display Welcome Dialog Again?</guilabel>.</para>
+    <para>This screen is intended for you to use to get up and running quickly. The
+      <guibutton>Cancel</guibutton> button is used to exit the screen. It will then prompt you with
+      <guilabel>Display Welcome Dialog Again?</guilabel>.
+    </para>
 
     <figure pgwide="1">
-      <title>Display Welcome Dialog Again?</title><screenshot>
+      <title>Display Welcome Dialog Again?</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/welcome-cancel.png"
@@ -48,18 +53,21 @@ Translators:
       </screenshot>
     </figure>
 
-    <para>
-      If you do not want to see the <guilabel>Welcome to &appname;!</guilabel> menu again click the <guibutton>No</guibutton> button.
-      Click the <guibutton>Yes</guibutton> button or press the keyboard <keycap function="enter">Enter</keycap> key for the default which is to have the <guilabel>Welcome to &appname;!</guilabel> screen run again.
+    <para>If you do not want to see the <guilabel>Welcome to &appname;!</guilabel> menu again click the
+      <guibutton>No</guibutton> button. Click the <guibutton>Yes</guibutton> button or press the
+      keyboard <keycap function="enter">Enter</keycap> key for the default which is to have the
+      <guilabel>Welcome to &appname;!</guilabel> screen run again.
     </para>
 
     <note>
-      <para>Selecting either of these options will leave you with a minimal &app; main window.
-        Operations in this window are described in <xref linkend="GUIMenus"></xref>.
+      <para>Selecting either of these options will leave you with a minimal &app; main window. Operations in
+        this window are described in <xref linkend="GUIMenus"></xref>.
       </para>
 
       <figure pgwide="1">
-        <title>Minimal &app; main window</title><screenshot>
+        <title>Minimal &app; main window</title>
+
+        <screenshot>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/window-main-empty.png"
@@ -74,8 +82,9 @@ Translators:
   <sect1 id="acct-hierarchy">
     <title>New Account Hierarchy Setup</title>
 
-    <para>This assistant helps you to create a set of &app; accounts.
-      It will appear if you choose <guibutton>Create a new set of accounts</guibutton> in the <guilabel>Welcome to &appname;!</guilabel> menu, or if you select
+    <para>This assistant helps you to create a set of &app; accounts. It will appear if you choose
+      <guibutton>Create a new set of accounts</guibutton> in the <guilabel>Welcome to
+      &appname;!</guilabel> menu, or if you select
       <menuchoice>
         <guimenu>File</guimenu><guimenuitem>New</guimenuitem>
       </menuchoice>
@@ -86,24 +95,28 @@ Translators:
   <sect1 id="import-qif">
     <title>Import QIF Files</title>
 
-    <para>This Assistant helps you import Quicken <acronym>QIF</acronym> files.
-      It will appear if you choose <guibutton>Import my QIF files</guibutton> in the <guilabel>Welcome to &appname;!</guilabel> menu.
+    <para>This Assistant helps you import Quicken <acronym>QIF</acronym> files. It will appear if you choose
+      <guibutton>Import my QIF files</guibutton> in the <guilabel>Welcome to &appname;!</guilabel>
+      menu.
     </para>
 
     <para>To start this assistant manually go to
       <menuchoice>
-        <guimenu>File</guimenu> <guisubmenu>Import ...</guisubmenu> <guimenuitem>Import QIF...</guimenuitem>
+        <guimenu>File</guimenu> <guisubmenu>Import ...</guisubmenu> <guimenuitem>Import
+        QIF...</guimenuitem>
       </menuchoice>
       .
     </para>
 
-    <para>In the following all the screens that you can see in this assistant are described in order of appearance.
+    <para>In the following all the screens that you can see in this assistant are described in order of
+      appearance.
     </para>
 
     <orderedlist>
       <listitem>
-        <para>The <guilabel>Import QIF files</guilabel> assistant opens with a screen that briefly describes what this assistant does and requests the file(s) to import.
-          The three buttons at the very bottom of the screen will not change while using the assistant.
+        <para>The <guilabel>Import QIF files</guilabel> assistant opens with a screen that briefly describes what
+          this assistant does and requests the file(s) to import. The three buttons at the very
+          bottom of the screen will not change while using the assistant.
         </para>
 
         <itemizedlist>
@@ -118,7 +131,8 @@ Translators:
           </listitem>
 
           <listitem>
-            <para><guibutton>Back:</guibutton> brings up the previous screen so that you can change a previous selection until the first screen.
+            <para><guibutton>Back:</guibutton> brings up the previous screen so that you can change a previous
+              selection until the first screen.
             </para>
           </listitem>
 
@@ -130,29 +144,35 @@ Translators:
       </listitem>
 
       <listitem>
-        <para>The next screen allows you to <guilabel>Select a QIF file to load</guilabel>.
-          The <guibutton>Select...</guibutton> button on this screen is used to access the list of files.
-          The <guibutton>Select...</guibutton> button brings up the <guilabel>Select QIF File</guilabel> dialog.
+        <para>The next screen allows you to <guilabel>Select a QIF file to load</guilabel>. The
+          <guibutton>Select...</guibutton> button on this screen is used to access the list of
+          files. The <guibutton>Select...</guibutton> button brings up the <guilabel>Select QIF
+          File</guilabel> dialog.
         </para>
 
-        <para>Navigate to where you have stored your <acronym>QIF</acronym> files and select the first one then click <guibutton>Import</guibutton>.
-          The next screen will display it in the <guilabel>Select a QIF File to Load</guilabel> field.
+        <para>Navigate to where you have stored your <acronym>QIF</acronym> files and select the first one then
+          click <guibutton>Import</guibutton>. The next screen will display it in the
+          <guilabel>Select a QIF File to Load</guilabel> field.
         </para>
 
         <note>
-          <para>If the file you are loading does not have an <acronym>QIF</acronym> date listed in it you will see the <guilabel>Set a date format for this QIF file</guilabel> screen.
-            Select the proper format from the pull down list and continue.
+          <para>If the file you are loading does not have an <acronym>QIF</acronym> date listed in it you will see
+            the <guilabel>Set a date format for this QIF file</guilabel> screen. Select the proper
+            format from the pull down list and continue.
           </para>
         </note>
 
         <note>
-          <para>If the file you are loading does not have an account name listed in it you will see the <guilabel>Set the default QIF account name</guilabel> screen.
-            Otherwise you will skip this screen and go on to the screen in the next section that shows loaded <acronym>QIF</acronym> files.
+          <para>If the file you are loading does not have an account name listed in it you will see the
+            <guilabel>Set the default QIF account name</guilabel> screen. Otherwise you will skip
+            this screen and go on to the screen in the next section that shows loaded
+            <acronym>QIF</acronym> files.
           </para>
 
           <itemizedlist>
             <listitem>
-              <para>The <guilabel>Account name:</guilabel> field is used to set an account name for this <acronym>QIF</acronym> file.
+              <para>The <guilabel>Account name:</guilabel> field is used to set an account name for this
+                <acronym>QIF</acronym> file.
               </para>
             </listitem>
           </itemizedlist>
@@ -160,9 +180,9 @@ Translators:
       </listitem>
 
       <listitem>
-        <para>The next screen shows you the <guilabel>QIF files you have loaded</guilabel>.
-          You can use this screen to return to the previous screen and load more <acronym>QIF</acronym> files.
-          It will also let you unload any files you have loaded by mistake.
+        <para>The next screen shows you the <guilabel>QIF files you have loaded</guilabel>. You can use this
+          screen to return to the previous screen and load more <acronym>QIF</acronym> files. It
+          will also let you unload any files you have loaded by mistake.
         </para>
 
         <itemizedlist>
@@ -172,22 +192,26 @@ Translators:
           </listitem>
 
           <listitem>
-            <para>The <guibutton>Load another file</guibutton> button takes you back to the previous screen to load another <acronym>QIF</acronym> file.
+            <para>The <guibutton>Load another file</guibutton> button takes you back to the previous screen to load
+              another <acronym>QIF</acronym> file.
             </para>
           </listitem>
 
           <listitem>
-            <para>The <guibutton>Unload selected file</guibutton> button allows you to select a file from the top panel and remove it from the list.
+            <para>The <guibutton>Unload selected file</guibutton> button allows you to select a file from the top
+              panel and remove it from the list.
             </para>
           </listitem>
         </itemizedlist>
 
-        <para>When you have selected all the <acronym>QIF</acronym> files to be imported, click the <guibutton>Forward</guibutton> button.
+        <para>When you have selected all the <acronym>QIF</acronym> files to be imported, click the
+          <guibutton>Forward</guibutton> button.
         </para>
       </listitem>
 
       <listitem>
-        <para>Depending on the type of data contained in the <acronym>QIF</acronym> files to be imported, you may see only one or all of the following screens:
+        <para>Depending on the type of data contained in the <acronym>QIF</acronym> files to be imported, you may
+          see only one or all of the following screens:
         </para>
 
         <variablelist termlength="8">
@@ -195,21 +219,27 @@ Translators:
             <term><guilabel>Accounts and stock holdings</guilabel></term>
 
             <listitem>
-              <para>This screen gives a description of the <guilabel>Accounts and stock holdings</guilabel> matching process on the following <guilabel>Match QIF accounts with &appname; accounts</guilabel> screen.
+              <para>This screen gives a description of the <guilabel>Accounts and stock holdings</guilabel> matching
+                process on the following <guilabel>Match QIF accounts with &appname;
+                accounts</guilabel> screen.
               </para>
 
               <tip>
-                <para>This and other informational screens in the <guilabel>Import QIF files</guilabel> assistant can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="prefs-online"/>) under <guilabel>&appname; Preferences</guilabel>.
+                <para>This and other informational screens in the <guilabel>Import QIF files</guilabel> assistant can be
+                  turned off in the <guilabel>Online Banking</guilabel> tab (see
+                  <xref linkend="prefs-online"/>) under <guilabel>&appname; Preferences</guilabel>.
                 </para>
               </tip>
 
-              <para>The next screen lets you <guilabel>Match QIF accounts with &appname; accounts</guilabel>.
-                You will see a list of <guilabel>QIF account names</guilabel> on the left and suggested <guilabel>&appname; account names</guilabel> on the right.
-                The <guilabel>New?</guilabel> column indicates if the &app; account name will be created by the <acronym>QIF</acronym> Import.
+              <para>The next screen lets you <guilabel>Match QIF accounts with &appname; accounts</guilabel>. You will
+                see a list of <guilabel>QIF account names</guilabel> on the left and suggested
+                <guilabel>&appname; account names</guilabel> on the right. The
+                <guilabel>New?</guilabel> column indicates if the &app; account name will be created
+                by the <acronym>QIF</acronym> Import.
               </para>
 
-              <para>To change the &app; account to a different one select the <acronym>QIF</acronym> account.
-                A screen will pop up to select another account or create a new one.
+              <para>To change the &app; account to a different one select the <acronym>QIF</acronym> account. A screen
+                will pop up to select another account or create a new one.
               </para>
 
               <itemizedlist>
@@ -219,7 +249,8 @@ Translators:
                 </listitem>
 
                 <listitem>
-                  <para>The <guibutton>New Account</guibutton> button allows you to add a new account name as a sub-account (child of selected) of the selected account.
+                  <para>The <guibutton>New Account</guibutton> button allows you to add a new account name as a sub-account
+                    (child of selected) of the selected account.
                   </para>
                 </listitem>
 
@@ -229,7 +260,8 @@ Translators:
                 </listitem>
 
                 <listitem>
-                  <para>The <guibutton>Cancel</guibutton> button is used to exit the dialog without using any changes you have made.
+                  <para>The <guibutton>Cancel</guibutton> button is used to exit the dialog without using any changes you
+                    have made.
                   </para>
                 </listitem>
               </itemizedlist>
@@ -240,21 +272,27 @@ Translators:
             <term><guilabel>Income and Expense categories</guilabel></term>
 
             <listitem>
-              <para>This screen gives a description of the <guilabel>Income and Expense categories</guilabel> matching process on the following <guilabel>Match QIF categories with &appname; accounts</guilabel> screen.
+              <para>This screen gives a description of the <guilabel>Income and Expense categories</guilabel> matching
+                process on the following <guilabel>Match QIF categories with &appname;
+                accounts</guilabel> screen.
               </para>
 
               <tip>
-                <para>This and other informational screens in the <guilabel>Import QIF files</guilabel> assistant can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="prefs-online"/>) under <guilabel>&appname; Preferences</guilabel>.
+                <para>This and other informational screens in the <guilabel>Import QIF files</guilabel> assistant can be
+                  turned off in the <guilabel>Online Banking</guilabel> tab (see
+                  <xref linkend="prefs-online"/>) under <guilabel>&appname; Preferences</guilabel>.
                 </para>
               </tip>
 
-              <para>The next screen lets you <guilabel>Match QIF categories with &appname; accounts</guilabel>.
-                You will see a list of <guilabel>QIF category names</guilabel> on the left and suggested <guilabel>&appname; account names</guilabel> on the right.
-                The <guilabel>New?</guilabel> column indicates if the &app; account name will be created by the QIF Import.
+              <para>The next screen lets you <guilabel>Match QIF categories with &appname; accounts</guilabel>. You will
+                see a list of <guilabel>QIF category names</guilabel> on the left and suggested
+                <guilabel>&appname; account names</guilabel> on the right. The
+                <guilabel>New?</guilabel> column indicates if the &app; account name will be created
+                by the QIF Import.
               </para>
 
-              <para>To change the &app; account to a different one select the QIF category.
-                A dialog will pop up to select another account or create a new one.
+              <para>To change the &app; account to a different one select the QIF category. A dialog will pop up to
+                select another account or create a new one.
               </para>
 
               <itemizedlist>
@@ -264,7 +302,8 @@ Translators:
                 </listitem>
 
                 <listitem>
-                  <para>The <guibutton>New Account</guibutton> button allows you to add a new account name as a sub-account (child of selected) of the selected account.
+                  <para>The <guibutton>New Account</guibutton> button allows you to add a new account name as a sub-account
+                    (child of selected) of the selected account.
                   </para>
                 </listitem>
 
@@ -274,7 +313,8 @@ Translators:
                 </listitem>
 
                 <listitem>
-                  <para>The <guibutton>Cancel</guibutton> button is used to exit the dialog without using any changes you have made.
+                  <para>The <guibutton>Cancel</guibutton> button is used to exit the dialog without using any changes you
+                    have made.
                   </para>
                 </listitem>
               </itemizedlist>
@@ -285,22 +325,26 @@ Translators:
             <term><guilabel>Payees and memos</guilabel></term>
 
             <listitem>
-              <para>This screen gives a description of the <guilabel>Payees and memos</guilabel> matching process on the following <guilabel>Match payees/memos to &appname; accounts</guilabel> screen.
+              <para>This screen gives a description of the <guilabel>Payees and memos</guilabel> matching process on the
+                following <guilabel>Match payees/memos to &appname; accounts</guilabel> screen.
               </para>
 
               <tip>
-                <para>This and other informational screens in the <guilabel>Import QIF files</guilabel> assistant can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="prefs-online"/>) under <guilabel>&appname; Preferences</guilabel>.
+                <para>This and other informational screens in the <guilabel>Import QIF files</guilabel> assistant can be
+                  turned off in the <guilabel>Online Banking</guilabel> tab (see
+                  <xref linkend="prefs-online"/>) under <guilabel>&appname; Preferences</guilabel>.
                 </para>
               </tip>
 
-              <para>The next screen lets you <guilabel>Match payees/memos to &appname; accounts</guilabel>.
-                You will see a list of <guilabel>QIF payee/memo names</guilabel> on the left and suggested <guilabel>&appname; account names</guilabel> on the right.
-                The default &app; account used is called <guilabel>Unspecified</guilabel>.
-                The <guilabel>New?</guilabel> column indicates if the &app; account name will be created by the QIF Import.
+              <para>The next screen lets you <guilabel>Match payees/memos to &appname; accounts</guilabel>. You will see
+                a list of <guilabel>QIF payee/memo names</guilabel> on the left and suggested
+                <guilabel>&appname; account names</guilabel> on the right. The default &app; account
+                used is called <guilabel>Unspecified</guilabel>. The <guilabel>New?</guilabel>
+                column indicates if the &app; account name will be created by the QIF Import.
               </para>
 
-              <para>To change the &app; account to a different one select the QIF payee/memo.
-                A dialog will pop up to select another account or create a new one.
+              <para>To change the &app; account to a different one select the QIF payee/memo. A dialog will pop up to
+                select another account or create a new one.
               </para>
 
               <itemizedlist>
@@ -310,7 +354,8 @@ Translators:
                 </listitem>
 
                 <listitem>
-                  <para>The <guibutton>New Account</guibutton> button allows you to add a new account name as a sub-account of the selected account.
+                  <para>The <guibutton>New Account</guibutton> button allows you to add a new account name as a sub-account
+                    of the selected account.
                   </para>
                 </listitem>
 
@@ -320,7 +365,8 @@ Translators:
                 </listitem>
 
                 <listitem>
-                  <para>The <guibutton>Cancel</guibutton> button is used to exit the dialog without using any changes you have made.
+                  <para>The <guibutton>Cancel</guibutton> button is used to exit the dialog without using any changes you
+                    have made.
                   </para>
                 </listitem>
               </itemizedlist>
@@ -330,9 +376,10 @@ Translators:
       </listitem>
 
       <listitem>
-        <para>The next screen allows you to <guilabel>Enter the QIF file currency</guilabel>.
-          The drop down list defaults to the currency configured in the <guilabel>Accounts</guilabel> tab (see <xref linkend="prefs-accounts"/>) under <guilabel>&appname; Preferences</guilabel>.
-          If you wish the new accounts to use a different currency, select one from the list.
+        <para>The next screen allows you to <guilabel>Enter the QIF file currency</guilabel>. The drop down list
+          defaults to the currency configured in the <guilabel>Accounts</guilabel> tab (see
+          <xref linkend="prefs-accounts"/>) under <guilabel>&appname; Preferences</guilabel>. If you
+          wish the new accounts to use a different currency, select one from the list.
         </para>
 
         <para>When you have selected the currency, click the <guibutton>Forward</guibutton> button.
@@ -340,7 +387,8 @@ Translators:
       </listitem>
 
       <listitem>
-        <para>Depending on the type of data contained in the <acronym>QIF</acronym> files to be imported, you may or may not see one or more of the following screens:
+        <para>Depending on the type of data contained in the <acronym>QIF</acronym> files to be imported, you may
+          or may not see one or more of the following screens:
         </para>
 
         <variablelist termlength="8">
@@ -348,15 +396,21 @@ Translators:
             <term><guilabel>Tradable Commodities</guilabel></term>
 
             <listitem>
-              <para>This screen gives a description of the <guilabel>Tradable Commodities</guilabel> process on the screen.
+              <para>This screen gives a description of the <guilabel>Tradable Commodities</guilabel> process on the
+                screen.
               </para>
 
               <tip>
-                <para>This and other informational screens in the <guilabel>Import QIF files</guilabel> assistant can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="prefs-online"/>) under <guilabel>&appname; Preferences</guilabel>.
+                <para>This and other informational screens in the <guilabel>Import QIF files</guilabel> assistant can be
+                  turned off in the <guilabel>Online Banking</guilabel> tab (see
+                  <xref linkend="prefs-online"/>) under <guilabel>&appname; Preferences</guilabel>.
                 </para>
               </tip>
 
-              <para>A series of screens, one for each of the stock, mutual fund, or commodity, displays the exchange, full name, and symbol for each of the commodities listed in the <acronym>QIF</acronym> file you are importing so that you can check them before proceeding.
+              <para>A series of screens, one for each of the stock, mutual fund, or commodity, displays the exchange,
+                full name, and symbol for each of the commodities listed in the
+                <acronym>QIF</acronym> file you are importing so that you can check them before
+                proceeding.
               </para>
             </listitem>
           </varlistentry>
@@ -365,16 +419,20 @@ Translators:
             <term><guilabel>Match duplicate transactions</guilabel></term>
 
             <listitem>
-              <para>This screen gives a description of the <guilabel>Match duplicate transactions</guilabel> process on the following <guilabel>Select possible duplicates</guilabel> screen.
+              <para>This screen gives a description of the <guilabel>Match duplicate transactions</guilabel> process on
+                the following <guilabel>Select possible duplicates</guilabel> screen.
               </para>
 
               <tip>
-                <para>This and other informational screens in the <guilabel>Import QIF files</guilabel> assistant can be turned off in the <guilabel>Online Banking</guilabel> tab (see <xref linkend="prefs-online"/>) under <guilabel>&appname; Preferences</guilabel>.
+                <para>This and other informational screens in the <guilabel>Import QIF files</guilabel> assistant can be
+                  turned off in the <guilabel>Online Banking</guilabel> tab (see
+                  <xref linkend="prefs-online"/>) under <guilabel>&appname; Preferences</guilabel>.
                 </para>
               </tip>
 
-              <para>The next screen lets you <guilabel>Select possible duplicate transactions</guilabel>.
-                Imported transactions are shown on the left panel and possible matches to each selected transaction are shown on the right.
+              <para>The next screen lets you <guilabel>Select possible duplicate transactions</guilabel>. Imported
+                transactions are shown on the left panel and possible matches to each selected
+                transaction are shown on the right.
               </para>
 
               <itemizedlist>
@@ -384,8 +442,8 @@ Translators:
                 </listitem>
 
                 <listitem>
-                  <para>The right panel shows the list of <emphasis>possible</emphasis> duplicates for the selected imported transaction.
-                    Select the one that most closely matches
+                  <para>The right panel shows the list of <emphasis>possible</emphasis> duplicates for the selected imported
+                    transaction. Select the one that most closely matches
                   </para>
                 </listitem>
               </itemizedlist>
@@ -395,7 +453,8 @@ Translators:
       </listitem>
 
       <listitem>
-        <para>The last screen, <guibutton>Update your &appname; accounts</guibutton>, gives you a list of three choices to finish the assistant.
+        <para>The last screen, <guibutton>Update your &appname; accounts</guibutton>, gives you a list of three
+          choices to finish the assistant.
         </para>
 
         <itemizedlist>
@@ -410,7 +469,8 @@ Translators:
           </listitem>
 
           <listitem>
-            <para><guibutton>Back:</guibutton> brings up the previous screen so that you can change a previous selection until the first screen.
+            <para><guibutton>Back:</guibutton> brings up the previous screen so that you can change a previous
+              selection until the first screen.
             </para>
           </listitem>
 
@@ -426,8 +486,8 @@ Translators:
     </para>
 
     <tip>
-      <para>Imported transactions might need to be <emphasis role="strong">reconciled</emphasis>.
-        This process is described in the &app; Tutorial and Concepts guide.
+      <para>Imported transactions might need to be <emphasis role="strong">reconciled</emphasis>. This process
+        is described in the &app; Tutorial and Concepts guide.
       </para>
     </tip>
   </sect1>
@@ -436,7 +496,9 @@ Translators:
     <title>The <quote>Tip of The Day</quote> Screen</title>
 
     <figure pgwide="1">
-      <title><quote>Tip of The Day</quote> Screen</title><screenshot>
+      <title><quote>Tip of The Day</quote> Screen</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/window-tip.png"
@@ -446,9 +508,10 @@ Translators:
       </screenshot>
     </figure>
 
-    <para>The <guilabel>Tip of the Day</guilabel> screen starts whenever you start &app; unless it has been disabled in the <guilabel>&appname; Preferences</guilabel>.
-      It gives tips on features and using &app;.
-      You can use the three buttons at the bottom of the screen to look through the tips:
+    <para>The <guilabel>Tip of the Day</guilabel> screen starts whenever you start &app; unless it has been
+      disabled in the <guilabel>&appname; Preferences</guilabel>. It gives tips on features and
+      using &app;. You can use the three buttons at the bottom of the screen to look through the
+      tips:
       <variablelist>
         <varlistentry>
           <term><guibutton><accel>P</accel>revious</guibutton>
@@ -487,10 +550,13 @@ Translators:
       </variablelist>
     </para>
 
-    <para>The checkbox <guibutton><accel>S</accel>how tips at startup</guibutton> can be used to enable or disable the <guilabel>Tip of the Day</guilabel> from running at &app; start-up.
+    <para>The checkbox <guibutton><accel>S</accel>how tips at startup</guibutton> can be used to enable or
+      disable the <guilabel>Tip of the Day</guilabel> from running at &app; start-up.
     </para>
 
-    <para>It is also possible to configure the <guilabel>Tip of the Day</guilabel> to run at start-up by the checkbox <guilabel>Display "<accel>t</accel>ip of the day" dialog</guilabel> on the <guilabel>General</guilabel> tab of
+    <para>It is also possible to configure the <guilabel>Tip of the Day</guilabel> to run at start-up by the
+      checkbox <guilabel>Display "<accel>t</accel>ip of the day" dialog</guilabel> on the
+      <guilabel>General</guilabel> tab of
       <menuchoice>
         <guimenu><accel>E</accel>dit</guimenu><guimenuitem>Pr<accel>e</accel>ferences</guimenuitem>
       </menuchoice>
@@ -499,7 +565,8 @@ Translators:
 
     <para>The <guilabel>Tip of the Day</guilabel> can also be run manually by going to
       <menuchoice>
-        <guimenu><accel>H</accel>elp</guimenu><guimenuitem><accel>T</accel>ip of the Day</guimenuitem>
+        <guimenu><accel>H</accel>elp</guimenu><guimenuitem><accel>T</accel>ip of the
+        Day</guimenuitem>
       </menuchoice>
       .
     </para>
diff --git a/C/manual/ch_Intro.xml b/C/manual/ch_Intro.xml
index b10574d4..287288b8 100644
--- a/C/manual/ch_Intro.xml
+++ b/C/manual/ch_Intro.xml
@@ -17,8 +17,7 @@
 <chapter id="intro-to-gnucash">
   <title>Introduction to &app;</title>
 
-  <subtitle>What is &app;?
-  </subtitle>
+  <subtitle>What is &app;?</subtitle>
 
   <para>&app; is a personal and small business finance application. It’s designed to be easy to use,
     yet powerful and flexible. &app; allows you to track your income and expenses, reconcile bank
diff --git a/C/manual/ch_Reports.xml b/C/manual/ch_Reports.xml
index 5d2b8460..43f505e8 100644
--- a/C/manual/ch_Reports.xml
+++ b/C/manual/ch_Reports.xml
@@ -414,7 +414,9 @@
           <title>Report Options</title>
 
           <figure>
-            <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="TxRptOpt_Screen">
+            <title><emphasis>Transaction Report, Report Options</emphasis></title>
+
+            <screenshot id="TxRptOpt_Screen">
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/TxRptOpt_Screen.png"
@@ -2092,8 +2094,12 @@ Income (type INCOME)
 
           <figure id="fig-investlots" pgwide="1">
             <title>The Investment Lots Report</title>
+
             <screenshot id="InvestmentLotsScreenShot">
-              <screeninfo>1720x982</screeninfo>
+              <screeninfo>
+                1720x982
+              </screeninfo>
+
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/Report_Investment_Lots.png"
@@ -2110,17 +2116,17 @@ Income (type INCOME)
 
           <abstract>
             <para>The Investment Lots report shows details about lots in a selected set of accounts of type
-            <emphasis>Stock</emphasis> or <emphasis>Mutual Fund</emphasis>.
-            It includes an optional <link linkend="investment-lots-report-chart">capital gains summary chart</link>
-            and a <link linkend="investment-lots-report-columns">table</link> with columns for
-            <link linkend="investment-lots-report-column-d">dates</link>,
-            <link linkend="investment-lots-report-column-b">purchases</link>,
-            <link linkend="investment-lots-report-column-s">sales</link>,
-            <link linkend="investment-lots-report-column-e">end balances</link>,
-            capital gains (<link linkend="investment-lots-report-column-r">realized</link> and
-            <link linkend="investment-lots-report-column-r">unrealized</link>,
-            short term and long term), and return on investment (ROI). It also performs optional lot
-            <link linkend="investment-lots-report-options-val">validation checks</link>.
+              <emphasis>Stock</emphasis> or <emphasis>Mutual Fund</emphasis>. It includes an
+              optional <link linkend="investment-lots-report-chart">capital gains summary
+              chart</link> and a <link linkend="investment-lots-report-columns">table</link> with
+              columns for <link linkend="investment-lots-report-column-d">dates</link>,
+              <link linkend="investment-lots-report-column-b">purchases</link>,
+              <link linkend="investment-lots-report-column-s">sales</link>,
+              <link linkend="investment-lots-report-column-e">end balances</link>, capital gains
+              (<link linkend="investment-lots-report-column-r">realized</link> and
+              <link linkend="investment-lots-report-column-r">unrealized</link>, short term and long
+              term), and return on investment (ROI). It also performs optional lot
+              <link linkend="investment-lots-report-options-val">validation checks</link>.
             </para>
           </abstract>
 
@@ -2129,29 +2135,31 @@ Income (type INCOME)
               <listitem>
                 <para><xref linkend="tool-lots-cap" />
                 </para>
+
                 <note>
                   <para>Lots can be used for both securities and invoices, but this report applies to securities.
                   </para>
                 </note>
               </listitem>
+
               <listitem>
                 <para>Tutorial and Concepts Guide
                 </para>
+
                 <itemizedlist>
                   <listitem>
-                    <para>
-                      <ulink url="&url-docs-C;guide/invest-sell1.html#invest-sellLots">
-                                Selling Shares with Automatic Calculation of Capital Gain or Loss Using Lots</ulink>
+                    <para><ulink url="&url-docs-C;guide/invest-sell1.html#invest-sellLots"> Selling Shares with Automatic
+                      Calculation of Capital Gain or Loss Using Lots</ulink>
                     </para>
                   </listitem>
+
                   <listitem>
-                    <para>
-                      <ulink url="&url-docs-C;guide/rpt_standardrpts.html#rpt_investlots">
-                                Investment Lots</ulink> report
+                    <para><ulink url="&url-docs-C;guide/rpt_standardrpts.html#rpt_investlots"> Investment Lots</ulink> report
                     </para>
                   </listitem>
                 </itemizedlist>
               </listitem>
+
               <listitem>
                 <para>Wiki: <ulink url="&url-wiki-lots;">Concept of Lots</ulink>
                 </para>
@@ -2164,242 +2172,302 @@ Income (type INCOME)
 
           <para id="investment-lots-report-columns">Table Columns
           </para>
+
           <note>
             <para>Most of the columns can be hidden in the report
-            <link linkend="investment-lots-report-options-columns">Column options</link>.
+              <link linkend="investment-lots-report-options-columns">Column options</link>.
             </para>
           </note>
+
           <note>
             <para>The Amount columns are denominated in each account's commodity. But the Value, Basis, Price, and
-            Gain columns are always denominated in the <guilabel>Report's currency</guilabel>, converted if necessary.
+              Gain columns are always denominated in the <guilabel>Report's currency</guilabel>,
+              converted if necessary.
             </para>
           </note>
+
           <itemizedlist>
             <listitem  id="investment-lots-report-column-title">
               <para><guilabel>Lot Title</guilabel>
               </para>
             </listitem>
+
             <listitem id="investment-lots-report-column-guid">
               <para><guilabel>GUID</guilabel>: The lot's internal, globally unique identifier. This column is hidden by
-              default, as it is probably not useful for most use cases. But it could come in handy for directly querying
-              the &app; back end data store.
+                default, as it is probably not useful for most use cases. But it could come in handy
+                for directly querying the &app; back end data store.
               </para>
             </listitem>
+
             <listitem id="investment-lots-report-column-d">
               <para>Date columns
               </para>
+
               <itemizedlist>
                 <listitem id="investment-lots-report-column-opened">
-                  <para><guilabel>Opened</guilabel>: The date on which the lot was opened. In a well-formed lot, this
-                  is the transaction date of the first (and ideally only) purchase split.
+                  <para><guilabel>Opened</guilabel>: The date on which the lot was opened. In a well-formed lot, this is the
+                    transaction date of the first (and ideally only) purchase split.
                   </para>
+
                   <warning>
                     <para>Placing more than one purchase split into a single lot can make ambiguous the holding period,
-                    preventing gains from being accurately grouped by short term and long term.
+                      preventing gains from being accurately grouped by short term and long term.
                     </para>
                   </warning>
                 </listitem>
+
                 <listitem id="investment-lots-report-column-closed">
-                  <para><guilabel>Closed</guilabel>: The date on which the lot was closed, which is the transaction date
-                  of the sale split that reduces the lot balance to zero. If the lot is still open on the report end
-                  date, then <guilabel>Closed</guilabel> is blank.
+                  <para><guilabel>Closed</guilabel>: The date on which the lot was closed, which is the transaction date of
+                    the sale split that reduces the lot balance to zero. If the lot is still open on
+                    the report end date, then <guilabel>Closed</guilabel> is blank.
                   </para>
                 </listitem>
               </itemizedlist>
             </listitem>
+
             <listitem id="investment-lots-report-column-b">
               <para>Bought columns
               </para>
+
               <itemizedlist>
                 <listitem id="investment-lots-report-column-ba">
                   <para><guilabel>Bought Amount</guilabel>: The total number of purchased shares.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-column-bv">
                   <para><guilabel>Bought Value (Basis)</guilabel>: The total purchase value of the
-                  <link linkend="investment-lots-report-column-ba"><guilabel>Bought Amount</guilabel></link>. This is the basis used for computing gains.
+                    <link linkend="investment-lots-report-column-ba"><guilabel>Bought
+                    Amount</guilabel></link>. This is the basis used for computing gains.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-column-bp">
                   <para><guilabel>Bought Average Price</guilabel>: The average price of each purchased share.
                   </para>
                 </listitem>
               </itemizedlist>
             </listitem>
+
             <listitem id="investment-lots-report-column-s">
               <para>Sold columns
               </para>
+
               <itemizedlist>
                 <listitem id="investment-lots-report-column-ss">
                   <para><guilabel>Sold Splits</guilabel>: The total number of sold splits.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-column-sa">
                   <para><guilabel>Sold Amount</guilabel>: The total number of sold shares.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-column-sb">
                   <para><guilabel>Sold Basis</guilabel>: The total basis (purchase value) of the
-                  <link linkend="investment-lots-report-column-sa"><guilabel>Sold Amount</guilabel></link>.
+                    <link linkend="investment-lots-report-column-sa"><guilabel>Sold
+                    Amount</guilabel></link>.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-column-sv">
                   <para><guilabel>Sold Value</guilabel>: The total value (sales proceeds) of the
-                  <link linkend="investment-lots-report-column-sa"><guilabel>Sold Amount</guilabel></link>.
+                    <link linkend="investment-lots-report-column-sa"><guilabel>Sold
+                    Amount</guilabel></link>.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-column-sp">
                   <para><guilabel>Sold Average Price</guilabel>: The average sale price of each sold share.
                   </para>
                 </listitem>
               </itemizedlist>
+
               <note>
-                <para>The
-                <link linkend="investment-lots-report-column-sa"><guilabel>Sold Amount</guilabel></link>,
-                <link linkend="investment-lots-report-column-sb"><guilabel>Sold Basis</guilabel></link>, and
-                <link linkend="investment-lots-report-column-sv"><guilabel>Sold Value</guilabel></link> columns can be
-                optionally split into short-term and long-term columns (e.g. <guilabel>ST Sold Amount</guilabel> and
-                <guilabel>LT Sold Amount</guilabel> instead of
-                <link linkend="investment-lots-report-column-sa"><guilabel>Sold Amount</guilabel></link>, etc.) via
-                the <link linkend="investment-lots-report-options-columns-gg"><guilabel>Group gains by age (short
-                term and long term)</guilabel></link> Columns option.
+                <para>The <link linkend="investment-lots-report-column-sa"><guilabel>Sold Amount</guilabel></link>,
+                  <link linkend="investment-lots-report-column-sb"><guilabel>Sold
+                  Basis</guilabel></link>, and
+                  <link linkend="investment-lots-report-column-sv"><guilabel>Sold
+                  Value</guilabel></link> columns can be optionally split into short-term and
+                  long-term columns (e.g. <guilabel>ST Sold Amount</guilabel> and <guilabel>LT Sold
+                  Amount</guilabel> instead of
+                  <link linkend="investment-lots-report-column-sa"><guilabel>Sold
+                  Amount</guilabel></link>, etc.) via the
+                  <link linkend="investment-lots-report-options-columns-gg"><guilabel>Group gains by
+                  age (short term and long term)</guilabel></link> Columns option.
                 </para>
               </note>
             </listitem>
+
             <listitem id="investment-lots-report-column-e">
               <para>End columns
               </para>
+
               <itemizedlist>
                 <listitem id="investment-lots-report-column-ea">
                   <para><guilabel>End Amount</guilabel>: The number of shares in the lot on the end date.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-column-eb">
                   <para><guilabel>End Basis</guilabel>: The basis (purchase value) of the
-                  <link linkend="investment-lots-report-column-ea"><guilabel>End Amount</guilabel></link>.
+                    <link linkend="investment-lots-report-column-ea"><guilabel>End
+                    Amount</guilabel></link>.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-column-ev">
                   <para><guilabel>End Value</guilabel>: The value of the
-                  <link linkend="investment-lots-report-column-ea"><guilabel>End Amount</guilabel></link>, using the
-                  share end price from the <guilabel>Price Source</guilabel> (e.g. the latest price on the end date).
+                    <link linkend="investment-lots-report-column-ea"><guilabel>End
+                    Amount</guilabel></link>, using the share end price from the <guilabel>Price
+                    Source</guilabel> (e.g. the latest price on the end date).
                   </para>
+
                   <note>
-                    <para>The end price used to compute the
-                    <link linkend="investment-lots-report-column-ev"><guilabel>End Value</guilabel></link> is displayed between
-                    the account name and the lot rows.
+                    <para>The end price used to compute the <link linkend="investment-lots-report-column-ev"><guilabel>End
+                      Value</guilabel></link> is displayed between the account name and the lot
+                      rows.
                     </para>
                   </note>
                 </listitem>
               </itemizedlist>
             </listitem>
+
             <listitem id="investment-lots-report-column-r">
               <para>Realized gain columns
               </para>
+
               <itemizedlist>
                 <listitem id="investment-lots-report-column-rg">
                   <para><guilabel>Realized Gain</guilabel>: The capital gains (or losses) realized on sold shares.
-                  <link linkend="investment-lots-report-column-sv"><guilabel>Sold Value</guilabel></link> minus
-                  <link linkend="investment-lots-report-column-sb"><guilabel>Sold Basis</guilabel></link>.
+                    <link linkend="investment-lots-report-column-sv"><guilabel>Sold
+                    Value</guilabel></link> minus
+                    <link linkend="investment-lots-report-column-sb"><guilabel>Sold
+                    Basis</guilabel></link>.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-column-rr">
                   <para><guilabel>Realized ROI</guilabel>: The realized return on investment.
-                  <link linkend="investment-lots-report-column-rg"><guilabel>Realized Gain</guilabel></link> divided by
-                  <link linkend="investment-lots-report-column-sb"><guilabel>Sold Basis</guilabel></link>, as a percentage.
+                    <link linkend="investment-lots-report-column-rg"><guilabel>Realized
+                    Gain</guilabel></link> divided by
+                    <link linkend="investment-lots-report-column-sb"><guilabel>Sold
+                    Basis</guilabel></link>, as a percentage.
                   </para>
                 </listitem>
               </itemizedlist>
             </listitem>
+
             <listitem id="investment-lots-report-column-u">
               <para>Unrealized gain columns
               </para>
+
               <itemizedlist>
                 <listitem id="investment-lots-report-column-ug">
-                  <para><guilabel>Unrealized Gain</guilabel>: The capital gains (or losses) that would be realized
-                  if the remaining shares were sold on the end date.
-                  <link linkend="investment-lots-report-column-ev"><guilabel>End Value</guilabel></link> minus
-                  <link linkend="investment-lots-report-column-eb"><guilabel>End Basis</guilabel></link>.
+                  <para><guilabel>Unrealized Gain</guilabel>: The capital gains (or losses) that would be realized if the
+                    remaining shares were sold on the end date.
+                    <link linkend="investment-lots-report-column-ev"><guilabel>End
+                    Value</guilabel></link> minus
+                    <link linkend="investment-lots-report-column-eb"><guilabel>End
+                    Basis</guilabel></link>.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-column-ur">
                   <para><guilabel>Unrealized ROI</guilabel>: The unrealized return on investment.
-                  <link linkend="investment-lots-report-column-ug"><guilabel>Unrealized Gain</guilabel></link> divided by
-                  <link linkend="investment-lots-report-column-eb"><guilabel>End Basis</guilabel></link>, as a percentage.
+                    <link linkend="investment-lots-report-column-ug"><guilabel>Unrealized
+                    Gain</guilabel></link> divided by
+                    <link linkend="investment-lots-report-column-eb"><guilabel>End
+                    Basis</guilabel></link>, as a percentage.
                   </para>
                 </listitem>
               </itemizedlist>
             </listitem>
           </itemizedlist>
+
           <note>
-            <para>The realized and unrealized gain columns can be optionally split into short-term and
-            long-term columns (e.g. <guilabel>ST Realized Gain</guilabel> and <guilabel>LT Realized Gain</guilabel>
-            instead of <link linkend="investment-lots-report-column-rg"><guilabel>Realized Gain</guilabel></link>,
-            etc.) via the <link linkend="investment-lots-report-options-columns-gg"><guilabel>Group gains by age (short
-            term and long term)</guilabel></link> Columns option.
+            <para>The realized and unrealized gain columns can be optionally split into short-term and long-term
+              columns (e.g. <guilabel>ST Realized Gain</guilabel> and <guilabel>LT Realized
+              Gain</guilabel> instead of
+              <link linkend="investment-lots-report-column-rg"><guilabel>Realized
+              Gain</guilabel></link>, etc.) via the
+              <link linkend="investment-lots-report-options-columns-gg"><guilabel>Group gains by age
+              (short term and long term)</guilabel></link> Columns option.
             </para>
           </note>
 
           <para id="investment-lots-report-options">Report Options
           </para>
+
           <itemizedlist>
             <listitem id="investment-lots-report-options-accounts">
               <para>Accounts tab
               </para>
+
               <para>These options control which accounts to include in the report, using a standard account selector.
-              Selected accounts that are not of type <emphasis>Stock</emphasis> or <emphasis>Mutual Fund</emphasis>
-              are ignored.
+                Selected accounts that are not of type <emphasis>Stock</emphasis> or
+                <emphasis>Mutual Fund</emphasis> are ignored.
               </para>
+
               <tip>
                 <para>Select only taxable accounts to scope the report to taxable capital gains.
                 </para>
               </tip>
+
               <para>Additional options:
               </para>
+
               <itemizedlist>
                 <listitem id="investment-lots-report-options-accounts-ns">
-                  <para><guilabel>Include accounts with no shares</guilabel>: When disabled, accounts with an
-                  empty balance on the report's end date are ignored. This can be useful when wanting to see
-                  only unrealized gains.
+                  <para><guilabel>Include accounts with no shares</guilabel>: When disabled, accounts with an empty balance
+                    on the report's end date are ignored. This can be useful when wanting to see
+                    only unrealized gains.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-accounts-nl">
-                  <para><guilabel>Include accounts with no lots</guilabel>: If some commodity accounts intentionally do
-                  not use lots, then disabling this option is a convenient way to prevent such accounts from cluttering
-                  the report.
+                  <para><guilabel>Include accounts with no lots</guilabel>: If some commodity accounts intentionally do not
+                    use lots, then disabling this option is a convenient way to prevent such
+                    accounts from cluttering the report.
                   </para>
                 </listitem>
               </itemizedlist>
             </listitem>
+
             <listitem id="investment-lots-report-options-chart">
               <para>Chart tab
               </para>
-              <para>These options control the
-              <link linkend="investment-lots-report-chart"><guilabel>Account Lot Gains</guilabel></link> chart.
+
+              <para>These options control the <link linkend="investment-lots-report-chart"><guilabel>Account Lot
+                Gains</guilabel></link> chart.
               </para>
+
               <itemizedlist>
                 <listitem id="investment-lots-report-options-chart-sc">
-                  <para><guilabel>Show Chart</guilabel>: The other
-                  chart options are ignored when this option is disabled.
+                  <para><guilabel>Show Chart</guilabel>: The other chart options are ignored when this option is disabled.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-chart-ct">
                   <para><guilabel>Chart type</guilabel>
                   </para>
+
                   <informaltable>
                     <tgroup cols="1">
                       <tbody>
                         <row>
                           <entry>
-                            <emphasis>Option
-                            </emphasis>
+                            <emphasis>Option </emphasis>
                           </entry>
                         </row>
+
                         <row>
                           <entry>
                             Stacked Bar Chart (default)
                           </entry>
                         </row>
+
                         <row>
                           <entry>
                             Bar Chart
@@ -2408,14 +2476,19 @@ Income (type INCOME)
                       </tbody>
                     </tgroup>
                   </informaltable>
-                  <para>The following chart examples each show the same four accounts that contain a mix of realized
-                  and unrealized gains and losses, both short-term and long-term:
+
+                  <para>The following chart examples each show the same four accounts that contain a mix of realized and
+                    unrealized gains and losses, both short-term and long-term:
                   </para>
 
                   <figure id="fig-investlots-stackedbar" pgwide="1">
                     <title>The Investment Lots Report, Stacked Bar Chart</title>
+
                     <screenshot id="InvestmentLotsStackedBarChart">
-                      <screeninfo>800x630</screeninfo>
+                      <screeninfo>
+                        800x630
+                      </screeninfo>
+
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/Report_Investment_Lots_StackedBar.png"
@@ -2427,8 +2500,12 @@ Income (type INCOME)
 
                   <figure id="fig-investlots-bar" pgwide="1">
                     <title>The Investment Lots Report, Bar Chart</title>
+
                     <screenshot id="InvestmentLotsBarChart">
-                      <screeninfo>800x667</screeninfo>
+                      <screeninfo>
+                        800x667
+                      </screeninfo>
+
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/Report_Investment_Lots_Bar.png"
@@ -2437,36 +2514,40 @@ Income (type INCOME)
                       </mediaobject>
                     </screenshot>
                   </figure>
-
                 </listitem>
+
                 <listitem id="investment-lots-report-options-chart-cl">
                   <para><guilabel>Chart location</guilabel>
                   </para>
+
                   <informaltable>
                     <tgroup cols="2">
                       <tbody>
                         <row>
                           <entry>
-                            <emphasis>Option
-                            </emphasis>
+                            <emphasis>Option </emphasis>
                           </entry>
+
                           <entry>
-                            <emphasis>Description
-                            </emphasis>
+                            <emphasis>Description </emphasis>
                           </entry>
                         </row>
+
                         <row>
                           <entry>
                             Top (default)
                           </entry>
+
                           <entry>
                             Display the chart at the top of the report, above the table
                           </entry>
                         </row>
+
                         <row>
                           <entry>
                             Bottom
                           </entry>
+
                           <entry>
                             Display the chart at the bottom of the report, below the table
                           </entry>
@@ -2475,253 +2556,321 @@ Income (type INCOME)
                     </tgroup>
                   </informaltable>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-chart-pwh">
-                  <para><guilabel>Plot width</guilabel> and <guilabel>Plot height</guilabel>: Controls the
-                  chart's dimensions.
+                  <para><guilabel>Plot width</guilabel> and <guilabel>Plot height</guilabel>: Controls the chart's
+                    dimensions.
                   </para>
                 </listitem>
               </itemizedlist>
+
               <note>
                 <para>The chart gain categories are controlled by the Columns tab's
-                <link linkend="investment-lots-report-options-columns-gains">Gains options</link>.
+                  <link linkend="investment-lots-report-options-columns-gains">Gains options</link>.
                 </para>
               </note>
             </listitem>
+
             <listitem id="investment-lots-report-options-columns">
               <para>Columns tab
               </para>
+
               <para>These options control which table columns are visible.
               </para>
+
               <itemizedlist>
                 <listitem id="investment-lots-report-options-columns-gd">
                   <para><link linkend="investment-lots-report-column-guid"><guilabel>Show lot guid column</guilabel></link>:
-                  Disabled by default.
+                    Disabled by default.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-columns-d">
                   <para><link linkend="investment-lots-report-column-d"><guilabel>Show date columns</guilabel></link>
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-columns-b">
                   <para><link linkend="investment-lots-report-column-b"><guilabel>Show bought columns</guilabel></link>
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-columns-s">
                   <para><link linkend="investment-lots-report-column-s"><guilabel>Show sold columns</guilabel></link>
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-columns-e">
                   <para><link linkend="investment-lots-report-column-e"><guilabel>Show end columns</guilabel></link>
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-columns-gains">
                   <para>Gains options
                   </para>
+
                   <note>
                     <para>These options impact both the table columns and the chart.
                     </para>
                   </note>
+
                   <itemizedlist>
                     <listitem id="investment-lots-report-options-columns-r">
-                      <para><link linkend="investment-lots-report-column-r"><guilabel>Show realized gain columns</guilabel></link>
+                      <para><link linkend="investment-lots-report-column-r"><guilabel>Show realized gain
+                        columns</guilabel></link>
                       </para>
                     </listitem>
+
                     <listitem id="investment-lots-report-options-columns-u">
-                      <para><link linkend="investment-lots-report-column-u"><guilabel>Show unrealized gain columns</guilabel></link>
+                      <para><link linkend="investment-lots-report-column-u"><guilabel>Show unrealized gain
+                        columns</guilabel></link>
                       </para>
                     </listitem>
+
                     <listitem id="investment-lots-report-options-columns-gg">
-                      <para><guilabel>Group gains by age (short term and long term)</guilabel>: Different governments can have different
-                      rules regarding how long shares must be held to qualify for different tax treatment.
+                      <para><guilabel>Group gains by age (short term and long term)</guilabel>: Different governments can have
+                        different rules regarding how long shares must be held to qualify for
+                        different tax treatment.
                       </para>
+
                       <informaltable>
                         <tgroup cols="2">
                           <tbody>
                             <row>
                               <entry>
-                                <emphasis>Option
-                                </emphasis>
+                                <emphasis>Option </emphasis>
                               </entry>
+
                               <entry>
-                                <emphasis>Description
-                                </emphasis>
+                                <emphasis>Description </emphasis>
                               </entry>
                             </row>
+
                             <row>
                               <entry>
                                 No
                               </entry>
+
                               <entry>
                                 Do not group gains by age
                               </entry>
                             </row>
+
                             <row>
                               <entry>
                                 Gains Only (default)
                               </entry>
+
                               <entry>
                                 Group gains by age
                               </entry>
                             </row>
+
                             <row>
                               <entry>
                                 Gains and Sales
                               </entry>
+
                               <entry>
-                                Also group the <link linkend="investment-lots-report-column-s">Sold columns</link> by age
+                                Also group the <link linkend="investment-lots-report-column-s">Sold
+                                columns</link> by age
                               </entry>
                             </row>
                           </tbody>
                         </tgroup>
                       </informaltable>
                     </listitem>
+
                     <listitem id="investment-lots-report-options-columns-ga">
-                      <para><guilabel>Long term gains age (years)</guilabel>: Shares held longer than this many years count as long
-                      term. This option is ignored when the
-                      <link linkend="investment-lots-report-options-columns-gg"><guilabel>Group gains by age (short term and long term)</guilabel></link>
-                      option is disabled. Default: 1 year.
+                      <para><guilabel>Long term gains age (years)</guilabel>: Shares held longer than this many years count as
+                        long term. This option is ignored when the
+                        <link linkend="investment-lots-report-options-columns-gg"><guilabel>Group
+                        gains by age (short term and long term)</guilabel></link> option is
+                        disabled. Default: 1 year.
                       </para>
                     </listitem>
                   </itemizedlist>
                 </listitem>
               </itemizedlist>
             </listitem>
+
             <listitem id="investment-lots-report-options-display">
               <para>Display tab
               </para>
+
               <itemizedlist>
                 <listitem id="investment-lots-report-options-display-an">
-                  <para><guilabel>Show long account names</guilabel>: Controls which name to use for all accounts in the report:
-                  long (fully-qualified) or short.
+                  <para><guilabel>Show long account names</guilabel>: Controls which name to use for all accounts in the
+                    report: long (fully-qualified) or short.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-display-mn">
-                  <para><guilabel>Show mnemonic in amounts</guilabel>: Controls whether the currency mnemonic will be use when
-                  reporting amounts. I.e. "123 RIO" versus just "123". This setting only impacts amounts not values, which are
-                  always displayed in the <guilabel>Report's currency</guilabel>, with its mnemonic.
+                  <para><guilabel>Show mnemonic in amounts</guilabel>: Controls whether the currency mnemonic will be use
+                    when reporting amounts. I.e. "123 RIO" versus just "123". This setting only
+                    impacts amounts not values, which are always displayed in the <guilabel>Report's
+                    currency</guilabel>, with its mnemonic.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-display-cl">
-                  <para><guilabel>Include closed lots</guilabel>: Allows closed lots to be filtered out. This can be useful when
-                  wanting to see only unrealized gains.
+                  <para><guilabel>Include closed lots</guilabel>: Allows closed lots to be filtered out. This can be useful
+                    when wanting to see only unrealized gains.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-display-bz">
-                  <para><guilabel>Show blanks instead of zeros in table cells</guilabel>: This can make the report table look less
-                  cluttered. Does not apply to <guilabel>Account Lots Total</guilabel> and <guilabel>Grand Total</guilabel> rows.
+                  <para><guilabel>Show blanks instead of zeros in table cells</guilabel>: This can make the report table
+                    look less cluttered. Does not apply to <guilabel>Account Lots Total</guilabel>
+                    and <guilabel>Grand Total</guilabel> rows.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-display-sr">
                   <para><guilabel>Show lot split rows</guilabel>: When enabled, rows for each of the bought and sold splits
-                  pertaining to the lot (within the report's date window) will be displayed nested under each lot row.
-                  Disabled by default.
+                    pertaining to the lot (within the report's date window) will be displayed nested
+                    under each lot row. Disabled by default.
                   </para>
                 </listitem>
               </itemizedlist>
             </listitem>
+
             <listitem id="investment-lots-report-options-general">
               <para>General tab
               </para>
+
               <para>See <xref linkend="report-common"/>.
               </para>
+
               <note>
                 <para>The <guilabel>Start date</guilabel> and <guilabel>End date</guilabel> options define the lot's date
-                window. Splits outside of this window are not included in the report. Except that splits from before the
-                <guilabel>Start date</guilabel> are counted only insofar as needed to calculate the
-                <link linkend="investment-lots-report-column-sb"><guilabel>Sold Basis</guilabel></link>,
-                <link linkend="investment-lots-report-column-eb"><guilabel>End Basis</guilabel></link>,
-                and
-                <link linkend="investment-lots-report-column-ea"><guilabel>End Amount</guilabel></link> columns. But these
-                splits are not included in the report's other
-                <link linkend="investment-lots-report-column-b">Bought columns</link> and
-                <link linkend="investment-lots-report-column-s">Sold columns</link>, nor are they shown when the
-                <link linkend="investment-lots-report-options-display-sr"><guilabel>Show lot split rows</guilabel></link>
-                option is enabled.
+                  window. Splits outside of this window are not included in the report. Except that
+                  splits from before the <guilabel>Start date</guilabel> are counted only insofar as
+                  needed to calculate the
+                  <link linkend="investment-lots-report-column-sb"><guilabel>Sold
+                  Basis</guilabel></link>,
+                  <link linkend="investment-lots-report-column-eb"><guilabel>End
+                  Basis</guilabel></link>, and
+                  <link linkend="investment-lots-report-column-ea"><guilabel>End
+                  Amount</guilabel></link> columns. But these splits are not included in the
+                  report's other <link linkend="investment-lots-report-column-b">Bought
+                  columns</link> and <link linkend="investment-lots-report-column-s">Sold
+                  columns</link>, nor are they shown when the
+                  <link linkend="investment-lots-report-options-display-sr"><guilabel>Show lot split
+                  rows</guilabel></link> option is enabled.
                 </para>
               </note>
             </listitem>
+
             <listitem id="investment-lots-report-options-val">
               <para>Validation tab
               </para>
-              <para>These options control how lots and accounts are validated. The report shows optional validation warnings
-              that help identify potential lot problems.
+
+              <para>These options control how lots and accounts are validated. The report shows optional validation
+                warnings that help identify potential lot problems.
               </para>
+
               <itemizedlist>
                 <listitem id="investment-lots-report-options-val-aw">
                   <para><guilabel>Include only accounts with warnings</guilabel>: Enable this option to see only accounts
-                  that have one of more of the enabled warnings. This can be useful for quickly validating that lots are
-                  well-formed, especially in combination with selecting all accounts and all dates. Disabled by default.
+                    that have one of more of the enabled warnings. This can be useful for quickly
+                    validating that lots are well-formed, especially in combination with selecting
+                    all accounts and all dates. Disabled by default.
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-val-mb">
                   <para><guilabel>Warn if a lot has more than one bought split</guilabel>: The Scrub operation only adds one
-                  purchase per lot, but &app; does not stop a user from manually adding multiple purchase splits to the same
-                  lot--even though this is arguably bad practice. Having multiple purchase dates makes the holding period ambiguous.
-                  But if this is desired, consider disabling both this warning and the Columns tab's
-                  <link linkend="investment-lots-report-options-columns-gg"><guilabel>Group gains by age (short term and long term)
-                  </guilabel></link> option.
-                  If the column option is left enabled, then the report will use the date of the last purchase split for
-                  determining the holding period, but continue to use the first purchase date for the lot
-                  <link linkend="investment-lots-report-column-opened"><guilabel>Opened</guilabel></link> column.
+                    purchase per lot, but &app; does not stop a user from manually adding multiple
+                    purchase splits to the same lot--even though this is arguably bad practice.
+                    Having multiple purchase dates makes the holding period ambiguous. But if this
+                    is desired, consider disabling both this warning and the Columns tab's
+                    <link linkend="investment-lots-report-options-columns-gg"><guilabel>Group gains
+                    by age (short term and long term) </guilabel></link> option. If the column
+                    option is left enabled, then the report will use the date of the last purchase
+                    split for determining the holding period, but continue to use the first purchase
+                    date for the lot
+                    <link linkend="investment-lots-report-column-opened"><guilabel>Opened</guilabel></link>
+                    column.
                   </para>
+
                   <note>
-                    <para>The last purchase date is used to calculate the holding period because long term gains often receive favorable
-                    tax treatment, so it is probably worse to misidentify a gain as long-term rather than as short-term. But better
-                    still is to not have more than one purchase per lot, so the holding periods are unambiguous.
+                    <para>The last purchase date is used to calculate the holding period because long term gains often receive
+                      favorable tax treatment, so it is probably worse to misidentify a gain as
+                      long-term rather than as short-term. But better still is to not have more than
+                      one purchase per lot, so the holding periods are unambiguous.
                     </para>
                   </note>
+
                   <para>Example:
                   </para>
-                  <para><computeroutput>Warning: Above lot has 2 bought splits. Consider separating them into their own lots.</computeroutput>
+
+                  <para><computeroutput>Warning: Above lot has 2 bought splits. Consider separating them into their own
+                    lots.</computeroutput>
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-val-nb">
-                  <para><guilabel>Warn if a lot's balance drops below zero</guilabel>: The Scrub operation will not create negative
-                  lot balances. But &app; does not prevent users from manually creating them. When this option is enabled, the report
-                  shows a warning if a lot's balance becomes negative during the report date window.
+                  <para><guilabel>Warn if a lot's balance drops below zero</guilabel>: The Scrub operation will not create
+                    negative lot balances. But &app; does not prevent users from manually creating
+                    them. When this option is enabled, the report shows a warning if a lot's balance
+                    becomes negative during the report date window.
                   </para>
+
                   <para>Example:
                   </para>
-                  <para><computeroutput>Warning: Above lot's balance is negative on 10/29/2022. Consider removing the responsible sale
-                  split from the lot and then scrubbing.</computeroutput>
+
+                  <para><computeroutput>Warning: Above lot's balance is negative on 10/29/2022. Consider removing the
+                    responsible sale split from the lot and then scrubbing.</computeroutput>
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-val-bt">
-                  <para><guilabel>Warn if a lot has a blank title</guilabel>: Disabled by default. Lot titles are optional. Enabling
-                  this warning will flag lots with blank (empty or whitespace) titles.
+                  <para><guilabel>Warn if a lot has a blank title</guilabel>: Disabled by default. Lot titles are optional.
+                    Enabling this warning will flag lots with blank (empty or whitespace) titles.
                   </para>
+
                   <para>Example:
                   </para>
+
                   <para><computeroutput>Warning: Above lot's title is blank.</computeroutput>
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-val-rg">
-                  <para><guilabel>Warn if the "Realized Gain/Loss" split(s) sum does not match the computed gains</guilabel>: The
-                  report recomputes the gain/loss values from each sale, compares them with the sum of the lot's generated
-                  <quote>Realized Gain/Loss</quote> splits and warns if they do not match.
+                  <para><guilabel>Warn if the "Realized Gain/Loss" split(s) sum does not match the computed
+                    gains</guilabel>: The report recomputes the gain/loss values from each sale,
+                    compares them with the sum of the lot's generated <quote>Realized
+                    Gain/Loss</quote> splits and warns if they do not match.
                   </para>
+
                   <para>Example:
                   </para>
-                  <para><computeroutput>Warning: Above lot's computed gain $(1,518.79) is not equal to the "Realized Gain/Loss" split(s)
-                   sum $(1,518.80). Difference: $0.01</computeroutput>
-                   </para>
-                   <para>
-                    <note>
+
+                  <para><computeroutput>Warning: Above lot's computed gain $(1,518.79) is not equal to the "Realized
+                    Gain/Loss" split(s) sum $(1,518.80). Difference: $0.01</computeroutput>
+                  </para>
+
+                  <para><note>
                       <para>If a <quote>Realized Gain/Loss</quote> split is incorrect, it can often be repaired thus:
                       </para>
+
                       <orderedlist >
                         <listitem>
                           <para>Remove the sale split from the lot,
                           </para>
                         </listitem>
+
                         <listitem>
                           <para>Delete the bad <quote>Realized Gain/Loss</quote> split,
                           </para>
                         </listitem>
+
                         <listitem>
                           <para>Add the sale split back to the lot, to recreate the <quote>Realized Gain/Loss</quote> split, and
                           </para>
                         </listitem>
+
                         <listitem>
                           <para><guibutton>Reload</guibutton> this report and verify that the warning is gone.
                           </para>
@@ -2730,43 +2879,51 @@ Income (type INCOME)
                     </note>
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-val-os">
-                  <para><guilabel>Warn if a split is not assigned to a lot</guilabel>: Realized and unrealized gains cannot be
-                  computed for splits that are not in a lot. This warning flags accounts containing unassigned splits.
+                  <para><guilabel>Warn if a split is not assigned to a lot</guilabel>: Realized and unrealized gains cannot
+                    be computed for splits that are not in a lot. This warning flags accounts
+                    containing unassigned splits.
                   </para>
+
                   <informaltable>
                     <tgroup cols="2">
                       <tbody>
                         <row>
                           <entry>
-                            <emphasis>Option
-                            </emphasis>
+                            <emphasis>Option </emphasis>
                           </entry>
+
                           <entry>
-                            <emphasis>Description
-                            </emphasis>
+                            <emphasis>Description </emphasis>
                           </entry>
                         </row>
+
                         <row>
                           <entry>
                             No
                           </entry>
+
                           <entry>
                             Warning disabled
                           </entry>
                         </row>
+
                         <row>
                           <entry>
                             Count (default)
                           </entry>
+
                           <entry>
                             Warning message identifies the number of unassigned splits
                           </entry>
                         </row>
+
                         <row>
                           <entry>
                             List
                           </entry>
+
                           <entry>
                             Unassigned splits are listed after the warning message
                           </entry>
@@ -2774,19 +2931,26 @@ Income (type INCOME)
                       </tbody>
                     </tgroup>
                   </informaltable>
+
                   <para>Example:
                   </para>
-                  <para><computeroutput>Warning: 2 split(s) are not assigned to a lot. Do lots need to be scrubbed?</computeroutput>
+
+                  <para><computeroutput>Warning: 2 split(s) are not assigned to a lot. Do lots need to be
+                    scrubbed?</computeroutput>
                   </para>
                 </listitem>
+
                 <listitem id="investment-lots-report-options-val-ab">
-                  <para><guilabel>Warn if the account balance does not match the computed lots' end balance</guilabel>:
-                  This is often another indication that the account has splits that are not included in a lot.
+                  <para><guilabel>Warn if the account balance does not match the computed lots' end balance</guilabel>: This
+                    is often another indication that the account has splits that are not included in
+                    a lot.
                   </para>
+
                   <para>Example:
                   </para>
+
                   <para><computeroutput>Warning: End amount 236.5 RIO is not equal to actual account balance 234 RIO.
-                  Difference: 2.5 RIO. Do lots need to be scrubbed?</computeroutput>
+                    Difference: 2.5 RIO. Do lots need to be scrubbed?</computeroutput>
                   </para>
                 </listitem>
               </itemizedlist>
@@ -2900,9 +3064,8 @@ Income (type INCOME)
           <title>Report Options</title>
 
           <note>
-            <para>See <xref linkend="report-common"/> in the <emphasis>Configuring
-              Reports and Charts</emphasis> section of this help manual for more details of the
-              common options.
+            <para>See <xref linkend="report-common"/> in the <emphasis>Configuring Reports and Charts</emphasis>
+              section of this help manual for more details of the common options.
             </para>
           </note>
 
@@ -3195,9 +3358,8 @@ Income (type INCOME)
           <title>Report Options</title>
 
           <note>
-            <para>See <xref linkend="report-common"/> in the <emphasis>Configuring
-              Reports and Charts</emphasis> section of this help manual for more details of the
-              common options.
+            <para>See <xref linkend="report-common"/> in the <emphasis>Configuring Reports and Charts</emphasis>
+              section of this help manual for more details of the common options.
             </para>
           </note>
 
diff --git a/C/manual/ch_Tools_Assistants.xml b/C/manual/ch_Tools_Assistants.xml
index 2ed50614..ddc8f40d 100644
--- a/C/manual/ch_Tools_Assistants.xml
+++ b/C/manual/ch_Tools_Assistants.xml
@@ -55,37 +55,35 @@
       <title>Find Transaction</title>
 
       <para><guilabel>Find Transaction</guilabel> is used to search for transactions in &app; and display the
-        results in a <link linkend="general-journal">General Journal</link> type tab. To open the <guilabel>Find Transaction</guilabel> dialog in
-        you can type the keyboard shortcut
+        results in a <link linkend="general-journal">General Journal</link> type tab. To open the
+        <guilabel>Find Transaction</guilabel> dialog in you can type the keyboard shortcut
         <keycombo>
           <keycap>Ctrl</keycap><keycap>F</keycap>
         </keycombo>
-        or from the main menu use<menuchoice><guimenu>Edit</guimenu><guimenuitem>Find...</guimenuitem></menuchoice>. 
+        or from the main menu use
+        <menuchoice>
+          <guimenu>Edit</guimenu><guimenuitem>Find...</guimenuitem>
+        </menuchoice>
+        .
       </para>
 
-      <para>
-        Search results differ depending on the tab from which you open
-        it. Aside from the transaction fields Description, Number,
-        Notes, and Date Posted, all of the searchable fields are part
-        of individual splits, and splits are associated with a single
-        account. When you open the <guilabel>Find
-        Transactions</guilabel> dialog from an account register tab
-        only the splits associated with that register will be
-        searched. There is one exception, the <guilabel>All
+      <para>Search results differ depending on the tab from which you open it. Aside from the transaction fields
+        Description, Number, Notes, and Date Posted, all of the searchable fields are part of
+        individual splits, and splits are associated with a single account. When you open the
+        <guilabel>Find Transactions</guilabel> dialog from an account register tab only the splits
+        associated with that register will be searched. There is one exception, the <guilabel>All
         Accounts</guilabel> item, see the footnote about it in table
-        <xref linkend="tool-find-bttns"/> below. For the transactions
-        fields only transactions linked to a split in that register
-        are inspecected and for the rest only the split attached to
-        that account is, with one exception, <guilabel>All
-        Accounts</guilabel>. If you filter the transactions in a
-        register using <menuchoice> <guimenuitem>View
-        </guimenuitem><guimenuitem> Filter By... </guimenuitem>
-        </menuchoice> , then only transactions in that account and
-        shown by the filter will be searched. If you start from the
-        Accounts page or a <link linkend="general-journal">General
-        Journal</link> register then all splits in all applicable
-        transactions (in the latter case those included in the
-        register) are inspected.
+        <xref linkend="tool-find-bttns"/> below. For the transactions fields only transactions
+        linked to a split in that register are inspecected and for the rest only the split attached
+        to that account is, with one exception, <guilabel>All Accounts</guilabel>. If you filter the
+        transactions in a register using
+        <menuchoice>
+          <guimenuitem>View </guimenuitem><guimenuitem> Filter By... </guimenuitem>
+        </menuchoice>
+        , then only transactions in that account and shown by the filter will be searched. If you
+        start from the Accounts page or a <link linkend="general-journal">General Journal</link>
+        register then all splits in all applicable transactions (in the latter case those included
+        in the register) are inspected.
       </para>
 
       <note>
@@ -178,9 +176,9 @@
         </para>
       </note>
 
-      <para>Once you've set the search criteria, you can press the <guibutton>Find</guibutton> button. You will be
-        presented with the search results in a new register tab. A report of the search results may
-        created and printed using
+      <para>Once you've set the search criteria, you can press the <guibutton>Find</guibutton> button. You will
+        be presented with the search results in a new register tab. A report of the search results
+        may created and printed using
         <menuchoice>
           <guimenu> Reports</guimenu><guimenuitem>Account Report</guimenuitem>
         </menuchoice>
@@ -249,7 +247,8 @@
               <entry morerows="2" valign="middle">
                 <para>Description
                   <footnote id="DMN">
-                    <para>The Description, Number, Notes, and Date Posted fields belong to the transaction, all other searchable fields are part of individual splits.
+                    <para>The Description, Number, Notes, and Date Posted fields belong to the transaction, all other
+                      searchable fields are part of individual splits.
                     </para>
                   </footnote>
                 </para>
@@ -415,7 +414,11 @@
 
             <row>
               <entry morerows="2" valign="middle">
-                <para>Description, Notes, or Memo<footnote><para>Searches for a term in the transaction's Description and Notes fields and the Split's Memo field.</para></footnote>
+                <para>Description, Notes, or Memo
+                  <footnote>
+                    <para>Searches for a term in the transaction's Description and Notes fields and the Split's Memo field.
+                    </para>
+                  </footnote>
                 </para>
               </entry>
 
@@ -1093,10 +1096,14 @@
             <row>
               <entry>
                 <para>Closing Entries
-                <footnote>
-                  <para>The Closing Entries selection will find transactions whose split is marked as a closing entry by <menuchoice><guimenu>Tools</guimenu><guimenuitem>Close Book</guimenuitem></menuchoice>.
-                  </para>
-                </footnote>
+                  <footnote>
+                    <para>The Closing Entries selection will find transactions whose split is marked as a closing entry by
+                      <menuchoice>
+                        <guimenu>Tools</guimenu><guimenuitem>Close Book</guimenuitem>
+                      </menuchoice>
+                      .
+                    </para>
+                  </footnote>
                 </para>
               </entry>
 
@@ -1134,9 +1141,14 @@
             <row>
               <entry>
                 <para>Balanced
-                <footnote>
-                  <para>Balanced finds transactions that are or are not balanced. Since &app; nearly always succeeds in balancing transactions this will almost always return all possible transactions. However it is possible to create a transaction containing multiple commodities that cannot be balanced and unchecking the box will find those transactions.</para>
-                </footnote>
+                  <footnote>
+                    <para>Balanced finds transactions that are or are not balanced. Since &app; nearly always succeeds in
+                      balancing transactions this will almost always return all possible
+                      transactions. However it is possible to create a transaction containing
+                      multiple commodities that cannot be balanced and unchecking the box will find
+                      those transactions.
+                    </para>
+                  </footnote>
                 </para>
               </entry>
 
@@ -1151,7 +1163,7 @@
               </entry>
 
               <entry >
-                <para> </para>
+                <para></para>
               </entry>
 
               <entry>
@@ -1175,21 +1187,15 @@
               <entry morerows="1" valign="middle">
                 <para>Account
                   <footnote>
-                    <para>When the <guilabel>Find
-                    Transactions</guilabel> dialog is started from the
-                    <guilabel>Accounts</guilabel> tab or a
-                    <guilabel>General Journal</guilabel> register the
-                    <guilabel>Account</guilabel> option performs a
-                    search where the accounts selected in the
-                    <guilabel>Choose Accounts</guilabel> dialog will
-                    both be searched individually for results. This
-                    means that a match in any of the selected accounts
-                    will either be displayed (matches any account) or
-                    discarded (matches no account). If the
-                    <guilabel>FindTransactions</guilabel> dialog is
-                    started in a regular account register and the
-                    current account is selected return all of the
-                    transactions or if it is not, no transactions.
+                    <para>When the <guilabel>Find Transactions</guilabel> dialog is started from the
+                      <guilabel>Accounts</guilabel> tab or a <guilabel>General Journal</guilabel>
+                      register the <guilabel>Account</guilabel> option performs a search where the
+                      accounts selected in the <guilabel>Choose Accounts</guilabel> dialog will both
+                      be searched individually for results. This means that a match in any of the
+                      selected accounts will either be displayed (matches any account) or discarded
+                      (matches no account). If the <guilabel>FindTransactions</guilabel> dialog is
+                      started in a regular account register and the current account is selected
+                      return all of the transactions or if it is not, no transactions.
                     </para>
                   </footnote>
                 </para>
@@ -1238,25 +1244,18 @@
               <entry>
                 <para>All Accounts
                   <footnote>
-                    <para>The <guilabel>All Accounts</guilabel> option
-                    performs a search where accounts selected in the
-                    <guilabel>Choose Accounts</guilabel> dialog will
-                    return transactions containing at least one split
-                    in every one of the accounts chosen. When run from
-                    a regular account register this is the only
-                    criterion that will inspect splits from other
-                    accounts so if you start the <guilabel>Find
-                    Transactions</guilabel> dialog from your
-                    Assets:Current Assets:Checking register and want
-                    to find all of the transactions in that account
-                    with a split in Expenses:Groceries, this is the
-                    criterion to use. Keep in mind, though, that it's
-                    an "and" search: If you also include Expenses:Misc
-                    it will find <emphasis role="italic">only</emphasis>
-                    those transactions with a split in each of the
-                    two, <emphasis role="italic">not</emphasis>
-                    transactions with a single split in either of
-                    them.
+                    <para>The <guilabel>All Accounts</guilabel> option performs a search where accounts selected in the
+                      <guilabel>Choose Accounts</guilabel> dialog will return transactions
+                      containing at least one split in every one of the accounts chosen. When run
+                      from a regular account register this is the only criterion that will inspect
+                      splits from other accounts so if you start the <guilabel>Find
+                      Transactions</guilabel> dialog from your Assets:Current Assets:Checking
+                      register and want to find all of the transactions in that account with a split
+                      in Expenses:Groceries, this is the criterion to use. Keep in mind, though,
+                      that it's an "and" search: If you also include Expenses:Misc it will find
+                      <emphasis role="italic">only</emphasis> those transactions with a split in
+                      each of the two, <emphasis role="italic">not</emphasis> transactions with a
+                      single split in either of them.
                     </para>
                   </footnote>
                 </para>
@@ -4856,83 +4855,217 @@
 
   <sect1 id="stock-assistant">
     <title>Recording a Stock Transaction</title>
-    <para>While with practice you can quickly enter any stock transaction directly in the register as explained in the <quote>Investments</quote> chapter in the guide, &app; provides an assistant that can help walk you through most common transactions and several less common ones that you might encounter.</para>
-    <para>The assistant is accessed from the <guilabel>Action</guilabel> menu when the current register is for a Stock or Mutual Fund account.</para>
+
+    <para>While with practice you can quickly enter any stock transaction directly in the register as
+      explained in the <quote>Investments</quote> chapter in the guide, &app; provides an assistant
+      that can help walk you through most common transactions and several less common ones that you
+      might encounter.
+    </para>
+
+    <para>The assistant is accessed from the <guilabel>Action</guilabel> menu when the current register is for
+      a Stock or Mutual Fund account.
+    </para>
 
     <itemizedlist>
       <title>Types of stock transactions supported by the <guilabel>Stock Transaction Assistant</guilabel></title>
+
       <listitem>
-        <para>Buy</para>
+        <para>Buy
+        </para>
       </listitem>
+
       <listitem>
-        <para>Sell</para>
+        <para>Sell
+        </para>
       </listitem>
+
       <listitem>
-        <para>Dividend</para>
-        <note><para>This is for cash dividends; use <guilabel>Stock Split</guilabel> for share dividends.</para></note>
-        <note><para>The assistant does not support recording reinvested dividends in a single transaction. If you reinvest dividends, even if it's done automatically by your broker, mutual fund company, or the issuer of the shares, you must record the share purchase with a second pass through the assistant.</para></note>
+        <para>Dividend
+        </para>
+
+        <note>
+          <para>This is for cash dividends; use <guilabel>Stock Split</guilabel> for share dividends.
+          </para>
+        </note>
+
+        <note>
+          <para>The assistant does not support recording reinvested dividends in a single transaction. If you
+            reinvest dividends, even if it's done automatically by your broker, mutual fund company,
+            or the issuer of the shares, you must record the share purchase with a second pass
+            through the assistant.
+          </para>
+        </note>
       </listitem>
+
       <listitem>
-        <para>Return of Capital</para>
+        <para>Return of Capital
+        </para>
       </listitem>
+
       <listitem>
-        <para>Notional Distribution</para>
+        <para>Notional Distribution
+        </para>
       </listitem>
+
       <listitem>
-        <para>Stock Split</para>
+        <para>Stock Split
+        </para>
       </listitem>
+
       <listitem>
-        <para>Reverse Split</para>
+        <para>Reverse Split
+        </para>
       </listitem>
     </itemizedlist>
-    <para>The assistant recognizes long and short positions in the account and adjusts pages it presents to you depending on the transaction type and whether the position is long or short. It optionally capitalizes commissions and fees.</para>
+
+    <para>The assistant recognizes long and short positions in the account and adjusts pages it presents to
+      you depending on the transaction type and whether the position is long or short. It optionally
+      capitalizes commissions and fees.
+    </para>
+
     <sect2>
       <title>Transaction Details Page</title>
-      <para> Enter the transaction post date and description on this page.</para>
+
+      <para>Enter the transaction post date and description on this page.
+      </para>
     </sect2>
+
     <sect2>
       <title>Transaction Type Page</title>
-      <para>Select the type of transaction from the list. The assistant will display a description of what it will do when you make a selection.</para>
+
+      <para>Select the type of transaction from the list. The assistant will display a description of what it
+        will do when you make a selection.
+      </para>
     </sect2>
+
     <sect2>
       <title>Stock Amount Page</title>
-      <para>This page is displayed for <guilabel>Buy</guilabel>, <guilabel>Sell</guilabel>, <guilabel>Stock Split</guilabel>, and <guilabel>Reverse Split</guilabel> transactions to collect the new share information. For a <guilabel>Buy</guilabel> or <guilabel>Sell</guilabel> it will display the current share balance, ask for the number of shares traded, and once that's entered it will display the new share balance. For a <guilabel>Stock Split</guilabel> or <guilabel>Reverse Split</guilabel> it will ask for the new balance after the split and display the split ratio.</para>
+
+      <para>This page is displayed for <guilabel>Buy</guilabel>, <guilabel>Sell</guilabel>, <guilabel>Stock
+        Split</guilabel>, and <guilabel>Reverse Split</guilabel> transactions to collect the new
+        share information. For a <guilabel>Buy</guilabel> or <guilabel>Sell</guilabel> it will
+        display the current share balance, ask for the number of shares traded, and once that's
+        entered it will display the new share balance. For a <guilabel>Stock Split</guilabel> or
+        <guilabel>Reverse Split</guilabel> it will ask for the new balance after the split and
+        display the split ratio.
+      </para>
     </sect2>
+
     <sect2>
       <title>Stock Value Page</title>
-      <para>Displayed for <guilabel>Buy</guilabel> and <guilabel>Sell</guilabel> to collect the value of the shares bought or sold net of commissions and fees, which are collected on another page. For example if you sell 100 shares of stock for $10.00 per share with a 2% commission and a $10.00 SEC fee the net value for this page is $1000.00.</para>
+
+      <para>Displayed for <guilabel>Buy</guilabel> and <guilabel>Sell</guilabel> to collect the value of the
+        shares bought or sold net of commissions and fees, which are collected on another page. For
+        example if you sell 100 shares of stock for $10.00 per share with a 2% commission and a
+        $10.00 SEC fee the net value for this page is $1000.00.
+      </para>
     </sect2>
+
     <sect2>
       <title>Cash Page</title>
-      <para>Displayed for all transaction types.</para>
-      <para>Enter the asset account to or from which the money for the transaction will go.</para>
-      <note><para>Only asset accounts denominated in the stock account's currency—that of the nearest parent account denominated in currency—will be offered. The stock assistant does not support multi-currency stock trading.</para></note>
-      <note><para>For a stock split or reverse split this will collect any cash in lieu recieved for fractional shares.</para></note>
-      <para>Enter the gross amount of the transaction including commissions and fees. In the example from the Stock Value Page that would be $970.00: $1000.00 for the stock less $20 for the 2% commission and the $10.00 fee. Had it been buy you would have added the commission and fees to the amount.</para>
-      <para>There is a field for you to enter a memo on the cash split. It defaults to Cash.</para>
+
+      <para>Displayed for all transaction types.
+      </para>
+
+      <para>Enter the asset account to or from which the money for the transaction will go.
+      </para>
+
+      <note>
+        <para>Only asset accounts denominated in the stock account's currency—that of the nearest parent
+          account denominated in currency—will be offered. The stock assistant does not
+          support multi-currency stock trading.
+        </para>
+      </note>
+
+      <note>
+        <para>For a stock split or reverse split this will collect any cash in lieu recieved for fractional
+          shares.
+        </para>
+      </note>
+
+      <para>Enter the gross amount of the transaction including commissions and fees. In the example from the
+        Stock Value Page that would be $970.00: $1000.00 for the stock less $20 for the 2%
+        commission and the $10.00 fee. Had it been buy you would have added the commission and fees
+        to the amount.
+      </para>
+
+      <para>There is a field for you to enter a memo on the cash split. It defaults to Cash.
+      </para>
     </sect2>
+
     <sect2>
       <title>Fees Page</title>
-      <para>Displayed for all transactions. There is a checkbox to select whether the fees will be incorporated into the value of the stock split (capitalized) or separately credited to an expense account.</para>
-      <para>If the amount is to be expensed select the account. Expense acconts will be offered and there's a button to create a new one.</para>
-      <para> Amount: Enter the total of any commissions, fees, or taxes on the transaction.</para>
-      <note><para>There's only one amount and one account. If you want separate accounts for say commissions and taxes, enter the total and one of the accounts here and then edit the transaction afterwards to create the extra splits.</para></note>
-      <para>As with the Cash Page there's a memo field for this split's memo.</para>
+
+      <para>Displayed for all transactions. There is a checkbox to select whether the fees will be incorporated
+        into the value of the stock split (capitalized) or separately credited to an expense
+        account.
+      </para>
+
+      <para>If the amount is to be expensed select the account. Expense acconts will be offered and there's a
+        button to create a new one.
+      </para>
+
+      <para>Amount: Enter the total of any commissions, fees, or taxes on the transaction.
+      </para>
+
+      <note>
+        <para>There's only one amount and one account. If you want separate accounts for say commissions and
+          taxes, enter the total and one of the accounts here and then edit the transaction
+          afterwards to create the extra splits.
+        </para>
+      </note>
+
+      <para>As with the Cash Page there's a memo field for this split's memo.
+      </para>
     </sect2>
+
     <sect2>
       <title>Dividend Page</title>
-      <para>Displayed only for <guilabel>Dividend</guilabel> transactions. Select or create an income account and enter the gross amount of the dividend. There's a memo field as usual.</para>
+
+      <para>Displayed only for <guilabel>Dividend</guilabel> transactions. Select or create an income account
+        and enter the gross amount of the dividend. There's a memo field as usual.
+      </para>
     </sect2>
+
     <sect2>
       <title>Capital Gains Page</title>
-      <para>Displayed only for <guilabel>Sell</guilabel> of a long position or <guilabel>Buy</guilabel> of a short position. As with the <guilabel>Dividend Page</guilabel> select an income account for the capital gain or create a new one, enter the amount of the gain—losses should be entered as a negative amount—and optionally edit the memo for the capital gain split.</para>
-      <note><para>The assistant doesn't do any calculating for you: It's up to you to determine the basis by whatever strategy you choose subject to the tax laws in your jurisdiction and to compute the difference between the basis and the proceeds.</para></note>
-      <note><para>If you prefer to use the <guilabel>View Lots</guilabel> dialog to compute capital gains/losses you should leave the <guilabel>Amount</guilabel> field in this page blank.</para></note>
+
+      <para>Displayed only for <guilabel>Sell</guilabel> of a long position or <guilabel>Buy</guilabel> of a
+        short position. As with the <guilabel>Dividend Page</guilabel> select an income account for
+        the capital gain or create a new one, enter the amount of the gain—losses should be
+        entered as a negative amount—and optionally edit the memo for the capital gain split.
+      </para>
+
+      <note>
+        <para>The assistant doesn't do any calculating for you: It's up to you to determine the basis by whatever
+          strategy you choose subject to the tax laws in your jurisdiction and to compute the
+          difference between the basis and the proceeds.
+        </para>
+      </note>
+
+      <note>
+        <para>If you prefer to use the <guilabel>View Lots</guilabel> dialog to compute capital gains/losses you
+          should leave the <guilabel>Amount</guilabel> field in this page blank.
+        </para>
+      </note>
     </sect2>
+
     <sect2>
       <title>Finish Page</title>
-      <para> The final page displays a list of the splits the assistant will create along with errors that would prevent the transaction from being complete. If there are errors the <guilabel>Apply</guilabel> button will be disabled. You must use the <guilabel>Back</guilabel> button to navigate to the appropriate page and correct the error. Once all of the errors are resolved click the <guilabel>Apply</guilabel> button to create the transaction.</para>
-      <note><para>The assistant provides a <guilabel>Finish</guilabel> button to move to the <guilabel>Finish Page</guilabel> from any other.</para></note>
+
+      <para>The final page displays a list of the splits the assistant will create along with errors that would
+        prevent the transaction from being complete. If there are errors the
+        <guilabel>Apply</guilabel> button will be disabled. You must use the
+        <guilabel>Back</guilabel> button to navigate to the appropriate page and correct the error.
+        Once all of the errors are resolved click the <guilabel>Apply</guilabel> button to create
+        the transaction.
+      </para>
+
+      <note>
+        <para>The assistant provides a <guilabel>Finish</guilabel> button to move to the <guilabel>Finish
+          Page</guilabel> from any other.
+        </para>
+      </note>
     </sect2>
   </sect1>
 
@@ -5382,10 +5515,11 @@
 
       <listitem>
         <para><emphasis role="bold">Code:</emphasis> This is any numeric or alphanumeric code that is used to
-          identify the commodity. The <acronym>ISIN</acronym> code is an international unique identifying numeric
-          string that is associated with every stock, bond or mutual fund, and most kinds of traded options,
-          futures and commodities. There are also regional valid codes available like <acronym>CUSIP</acronym> in
-          the North America, <acronym>WKN</acronym> in DE, … This code is not required.
+          identify the commodity. The <acronym>ISIN</acronym> code is an international unique
+          identifying numeric string that is associated with every stock, bond or mutual fund, and
+          most kinds of traded options, futures and commodities. There are also regional valid codes
+          available like <acronym>CUSIP</acronym> in the North America, <acronym>WKN</acronym> in
+          DE, … This code is not required.
         </para>
       </listitem>
 
@@ -5523,8 +5657,8 @@
     </itemizedlist>
 
     <para>Examples of using the <guilabel>Loan Repayment Calculator</guilabel> are given in the Tutorial and
-      Concepts Guide. <ulink url="&url-docs-C;guide/loans_calcs1.html"> &app; Tutorial and
-      Concepts Guide’s Chapter on Loans</ulink>
+      Concepts Guide. <ulink url="&url-docs-C;guide/loans_calcs1.html"> &app; Tutorial and Concepts
+      Guide’s Chapter on Loans</ulink>
     </para>
   </sect1>
 
@@ -5661,16 +5795,20 @@
       </para>
 
       <figure pgwide="1">
-        <title>Lots in Account window for Security Capital Gains</title><screenshot id="tool-lotsInAcctStk">
+        <title>Lots in Account window for Security Capital Gains</title>
+
+        <screenshot id="tool-lotsInAcctStk">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Tool_LotsStk.png"
               srccredit="Chris Good" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/Tool_LotsStk.png"
                          srccredit="Chris Good"/>
             </imageobject>
+
             <caption>
               <para>An image of the <emphasis>Lots in Account </emphasis> window for a security account.
               </para>
@@ -5709,6 +5847,7 @@
               <imagedata fileref="figures/Tool_Lots_h_double_arrow.png"
                 width="48px" />
             </imageobject>
+
             <textobject>
               <phrase><-></phrase>
             </textobject>
@@ -5922,24 +6061,24 @@
 
         <itemizedlist>
           <listitem>
-            <para><guilabel>>>:</guilabel> Links a free split (buy or sell) to a lot. This button is not
-              enabled until both a lot and a free split are highlighted. The split moves from the
+            <para><guilabel>>>:</guilabel> Links a free split (buy or sell) to a lot. This button is not enabled
+              until both a lot and a free split are highlighted. The split moves from the
               <guilabel>Splits free</guilabel> panel to the <guilabel>Splits in lot</guilabel>
               panel.
             </para>
 
             <para>Multiple buy splits and multiple sell splits may be linked to the same lot. Refer to following
-              section about the <guilabel>Scrub Account</guilabel> button for details of the
-              capital gains transactions created in these situations.
+              section about the <guilabel>Scrub Account</guilabel> button for details of the capital
+              gains transactions created in these situations.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel><<:</guilabel> Unlinks a split from a lot. The split moves from the
-              <guilabel>Splits in lot</guilabel> panel to the <guilabel>Splits free</guilabel>
-              panel. This button is not enabled until a split in the <guilabel>Splits in
-              lot</guilabel> panel is highlighted. When the last split is unlinked from a lot, the
-              lot is automatically deleted if there is no capital gain/loss transaction.
+            <para><guilabel><<:</guilabel> Unlinks a split from a lot. The split moves from the <guilabel>Splits
+              in lot</guilabel> panel to the <guilabel>Splits free</guilabel> panel. This button is
+              not enabled until a split in the <guilabel>Splits in lot</guilabel> panel is
+              highlighted. When the last split is unlinked from a lot, the lot is automatically
+              deleted if there is no capital gain/loss transaction.
             </para>
           </listitem>
 
@@ -6039,13 +6178,15 @@
 
         <para>For more details, see:
         </para>
+
         <itemizedlist>
           <listitem>
             <para>Tutorial and Concepts Guide,
-              <ulink url="&url-docs-C;guide/invest-sell1.html#invest-sellLots">Automatic
-              Calculation of Capital Gain or Loss Using Lots</ulink>.
+              <ulink url="&url-docs-C;guide/invest-sell1.html#invest-sellLots">Automatic Calculation
+              of Capital Gain or Loss Using Lots</ulink>.
             </para>
           </listitem>
+
           <listitem>
             <para><link linkend="investment-lots-report">Investment Lots</link> report.
             </para>
@@ -6072,8 +6213,8 @@
           <listitem>
             <para>To enquire about which payments or credit notes offset particular invoices. For each invoice and
               credit note, &app; automatically creates 1 (and only 1) lot. By selecting the lot for
-              the invoice or credit note in the <guilabel>Lots in This Account</guilabel> panel,
-              all the transaction splits for that lot show in the <guilabel>Splits in Lot</guilabel>
+              the invoice or credit note in the <guilabel>Lots in This Account</guilabel> panel, all
+              the transaction splits for that lot show in the <guilabel>Splits in Lot</guilabel>
               panel.
             </para>
 
@@ -6107,16 +6248,20 @@
         </para>
 
         <figure pgwide="1">
-          <title>Lots in Account window for business features</title><screenshot id="tool-lotsInAcctBus">
+          <title>Lots in Account window for business features</title>
+
+          <screenshot id="tool-lotsInAcctBus">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Tool_LotsBus.png"
                 srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/Tool_LotsBus.png"
                            srccredit="Chris Good"/>
               </imageobject>
+
               <caption>
                 <para>An image of the <guilabel>Lots in Account</guilabel> window for an Accounts Receivable account.
                 </para>
diff --git a/C/manual/ch_Transactions.xml b/C/manual/ch_Transactions.xml
index f8e370ab..e6d4591b 100644
--- a/C/manual/ch_Transactions.xml
+++ b/C/manual/ch_Transactions.xml
@@ -171,9 +171,8 @@ Translators:
         radio button and a numeric entry.
       </para>
 
-      <para>If a relevant price is available in the price database (see
-        <xref linkend="tool-price-manual"/>) the <guilabel>Exchange Rate</guilabel> will have
-        that as a default entry.
+      <para>If a relevant price is available in the price database (see <xref linkend="tool-price-manual"/>) the
+        <guilabel>Exchange Rate</guilabel> will have that as a default entry.
       </para>
 
       <itemizedlist>
@@ -201,9 +200,9 @@ Translators:
       <note>
         <para>If you have created a price in the <guilabel>Price Editor</guilabel> (see
           <xref
-      linkend="tool-price-manual"/>) for the current date quote retrieval
-          will not update that price. You must first delete the manually-created price in the
-          <guilabel>Price Editor</guilabel> before you
+      linkend="tool-price-manual"/>) for the current date quote retrieval will not
+          update that price. You must first delete the manually-created price in the <guilabel>Price
+          Editor</guilabel> before you
           <keycombo action="click">
             <mousebutton>Button1</mousebutton>
           </keycombo>
@@ -395,14 +394,16 @@ Translators:
       doing just that.
     </para>
 
-    <para>Select a transaction in the <guilabel>Register</guilabel> and <mousebutton>Button2</mousebutton> click it to present the
-      <guimenu>Context Menu</guimenu> and select <guimenuitem>Update Association for
-      Transaction</guimenuitem>. You will be presented with the <guilabel>Change a Transaction
-      Association</guilabel> dialog.
+    <para>Select a transaction in the <guilabel>Register</guilabel> and <mousebutton>Button2</mousebutton>
+      click it to present the <guimenu>Context Menu</guimenu> and select <guimenuitem>Update
+      Association for Transaction</guimenuitem>. You will be presented with the <guilabel>Change a
+      Transaction Association</guilabel> dialog.
     </para>
 
     <figure pgwide="1">
-      <title>Change a Transaction Association Dialog</title><screenshot>
+      <title>Change a Transaction Association Dialog</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/Trans_Assoc_Dialog.png"
@@ -443,7 +444,9 @@ Translators:
     </para>
 
     <figure float="1">
-      <title>Chain and Paperclip</title><screenshot>
+      <title>Chain and Paperclip</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/Trans_Assoc_Symbols.png"
@@ -873,10 +876,9 @@ Translators:
         <term><guilabel>c</guilabel></term>
 
         <listitem>
-          <para>Cleared. Status may be assigned either manually or by an import process.
-            Indicates the transaction is included in the bank's record of the account
-            transactions but has not yet been reconciled to a bank statement
-            in &app;.
+          <para>Cleared. Status may be assigned either manually or by an import process. Indicates the transaction
+            is included in the bank's record of the account transactions but has not yet been
+            reconciled to a bank statement in &app;.
           </para>
         </listitem>
       </varlistentry>
@@ -1290,24 +1292,35 @@ Translators:
         </listitem>
 
         <listitem>
-          <para><emphasis role="bold"><link linkend="trans-import-aqbanking">Others</link></emphasis> <guilabel>Import with AQBanking</guilabel> supports importing several European and International file formats including:
-          <itemizedlist>
-            <listitem>
-              <para><emphasis role="bold">CAMT 052</emphasis>Daily Bank Statements</para>
-            </listitem>
-            <listitem>
-              <para>OLYMPIC Banking System <emphasis role="bold">ERI</emphasis></para>
-            </listitem>
-            <listitem>
-              <para>Spanish <emphasis role="bold">Q45</emphasis></para>
-            </listitem>
-            <listitem>
-              <para><emphasis role="bold">SWIFT MT535, MT940, MT942.</emphasis>Bank Statements</para>
-            </listitem>
-            <listitem>
-              <para>Swiss <emphasis role="bold">YellowNet XML</emphasis></para>
-            </listitem>
-          </itemizedlist>
+          <para><emphasis role="bold"><link linkend="trans-import-aqbanking">Others</link></emphasis>
+            <guilabel>Import with AQBanking</guilabel> supports importing several European and
+            International file formats including:
+            <itemizedlist>
+              <listitem>
+                <para><emphasis role="bold">CAMT 052</emphasis>Daily Bank Statements
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>OLYMPIC Banking System <emphasis role="bold">ERI</emphasis>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>Spanish <emphasis role="bold">Q45</emphasis>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><emphasis role="bold">SWIFT MT535, MT940, MT942.</emphasis>Bank Statements
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>Swiss <emphasis role="bold">YellowNet XML</emphasis>
+                </para>
+              </listitem>
+            </itemizedlist>
           </para>
         </listitem>
       </itemizedlist>
@@ -1364,7 +1377,9 @@ Translators:
         </para>
 
         <figure pgwide="1">
-          <title>The Import QIF Files Assistent</title><screenshot id="ImportQIFDruid">
+          <title>The Import QIF Files Assistent</title>
+
+          <screenshot id="ImportQIFDruid">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Import_QIF_Druid.png"
@@ -1652,24 +1667,28 @@ Translators:
             steps in the CSV import process are:
           </para>
         </highlights>
+
         <step>
           <title>Introductory information panel</title>
 
-      <figure pgwide="1">
-        <title>The CSV Transaction Import Assistant - Introduction</title><screenshot id="CSV_Transaction_Import_Assistant">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/CSV_Transaction_Import_Assistant.png"
+          <figure pgwide="1">
+            <title>The CSV Transaction Import Assistant - Introduction</title>
+
+            <screenshot id="CSV_Transaction_Import_Assistant">
+              <mediaobject>
+                <imageobject role="html">
+                  <imagedata fileref="figures/CSV_Transaction_Import_Assistant.png"
                          srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
+                </imageobject>
 
-            <imageobject role="fo">
-              <imagedata fileref="figures/CSV_Transaction_Import_Assistant.png"
+                <imageobject role="fo">
+                  <imagedata fileref="figures/CSV_Transaction_Import_Assistant.png"
                          srccredit="David Cousens"/>
-            </imageobject>
-          </mediaobject>
-        </screenshot>
-      </figure>
+                </imageobject>
+              </mediaobject>
+            </screenshot>
+          </figure>
+
           <para>Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to continue;
           </para>
         </step>
@@ -1685,16 +1704,20 @@ Translators:
           <para><emphasis role="bold">Import Preview</emphasis>: The Import Preview pane controls set options for
             the import of CSV data and provides a preview of the data to be imported.
             <figure pgwide="1">
-              <title>The CSV Import Preview Pane</title><screenshot id="CSV_Import_Preview">
+              <title>The CSV Import Preview Pane</title>
+
+              <screenshot id="CSV_Import_Preview">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/CSV_Import_transactions_Preview.png" width="&img-w;"
                                srccredit="David Cousens"/>
                   </imageobject>
+
                   <imageobject role="fo">
                     <imagedata fileref="figures/CSV_Import_transactions_Preview.png"
                                srccredit="David Cousens"/>
                   </imageobject>
+
                   <caption>
                     The CSV Import Preview Pane with settings to import the shown data.
                   </caption>
@@ -1704,9 +1727,11 @@ Translators:
 
             <itemizedlist>
               <title>Import preview Controls</title>
+
               <listitem>
                 <variablelist id="trans-import-csv-save">
                   <title>Load and Save Settings</title>
+
                   <abstract>
                     <para>The settings group <emphasis role="bold"><guilabel>&appname; Export Settings</guilabel></emphasis>
                       defines a setting group for used for the export and reimport of
@@ -1714,26 +1739,32 @@ Translators:
                       data previously exported from <application>&appname;</application>.
                     </para>
                   </abstract>
+
                   <varlistentry>
                     <term>Save</term>
+
                     <listitem>
-                      <para>Once you have set all the import parameters, you can save these settings by typing a
-                        unique name in the <guilabel>Load and Save Settings Entry</guilabel> combo box
-                        and clicking the Save icon just to the right of the box.
+                      <para>Once you have set all the import parameters, you can save these settings by typing a unique name in
+                        the <guilabel>Load and Save Settings Entry</guilabel> combo box and clicking
+                        the Save icon just to the right of the box.
                       </para>
                     </listitem>
                   </varlistentry>
+
                   <varlistentry>
                     <term>Load</term>
+
                     <listitem>
-                      <para>A previously defined settings group can be retrieved by selecting the appropriate setting group
-                        name from the dropdown list activated by the down arrow at the right end of
-                        the text box. This will set all other settings to the stored values.
+                      <para>A previously defined settings group can be retrieved by selecting the appropriate setting group name
+                        from the dropdown list activated by the down arrow at the right end of the
+                        text box. This will set all other settings to the stored values.
                       </para>
                     </listitem>
                   </varlistentry>
+
                   <varlistentry>
                     <term>Delete</term>
+
                     <listitem>
                       <para>The delete/trashcan icon to the right of the Save icon can be used to remove the saved settings
                         group selected from the drop down list for the box.
@@ -1745,9 +1776,9 @@ Translators:
 
               <listitem>
                 <para><emphasis role="bold"><guilabel>Account</guilabel></emphasis>: If the data you are importing does
-                  not specify the source account for the transaction an account can be selected
-                  from the drop down list will import all transactions to the selected account.
-                  Leave blank if your imported data specifies a source account;
+                  not specify the source account for the transaction an account can be selected from
+                  the drop down list will import all transactions to the selected account. Leave
+                  blank if your imported data specifies a source account;
                 </para>
               </listitem>
 
@@ -1756,24 +1787,22 @@ Translators:
                   <itemizedlist>
                     <listitem>
                       <para><emphasis role="bold"><guilabel>Separators</guilabel></emphasis>: Selecting this radio button will
-                        allow you to define characters which will be used to distinguish columns
-                        in the input file. The default is comma separated. In countries using
-                        the comma as decimal separator the semicolon is common as column
-                        separator. However spaces, tabs, colons or semicolons or any combination
-                        of them may be used to separate columns in the input file by selecting
-                        the appropriate check boxes. You may also define custom separators by
-                        typing the required characters into the text box and selecting the
-                        <guilabel>Custom</guilabel> checkbox. This may be used in combination
-                        with any of the predefined separators;
+                        allow you to define characters which will be used to distinguish columns in
+                        the input file. The default is comma separated. In countries using the comma
+                        as decimal separator the semicolon is common as column separator. However
+                        spaces, tabs, colons or semicolons or any combination of them may be used to
+                        separate columns in the input file by selecting the appropriate check boxes.
+                        You may also define custom separators by typing the required characters into
+                        the text box and selecting the <guilabel>Custom</guilabel> checkbox. This
+                        may be used in combination with any of the predefined separators;
                       </para>
                     </listitem>
 
                     <listitem>
                       <para><emphasis role="bold"><guilabel>Fixed-Width</guilabel></emphasis>: Selecting this radio button will
-                        allow you to define column boundaries by double clicking at the
-                        appropriate positions in the sample records displayed in the panel
-                        below. Single clicking in a column will narrow, widen or merge the
-                        column.
+                        allow you to define column boundaries by double clicking at the appropriate
+                        positions in the sample records displayed in the panel below. Single
+                        clicking in a column will narrow, widen or merge the column.
                       </para>
                     </listitem>
                   </itemizedlist>
@@ -1782,28 +1811,28 @@ Translators:
 
               <listitem>
                 <para><emphasis role="bold"><guilabel>Multi-split</guilabel></emphasis>: Selecting this check box allows
-                  the splits for a single transaction to be defined on consecutive lines within
-                  the file with each line defining a single split. If not selected each line is
-                  assumed to contain the information for a single transaction including one or
-                  two splits;
+                  the splits for a single transaction to be defined on consecutive lines within the
+                  file with each line defining a single split. If not selected each line is assumed
+                  to contain the information for a single transaction including one or two splits;
                 </para>
 
-                <para>Multi-split is a gnucash specific variant of a csv file to support easier
-                  data preparation.
+                <para>Multi-split is a gnucash specific variant of a csv file to support easier data preparation.
                 </para>
 
                 <para>Each line should define one split by
                   <variablelist>
                     <varlistentry>
                       <term>transaction-specific fields</term>
+
                       <listitem>
-                        <para>date and description as bare minimum
-                          <emphasis>and</emphasis>
+                        <para>date and description as bare minimum <emphasis>and</emphasis>
                         </para>
                       </listitem>
                     </varlistentry>
+
                     <varlistentry>
                       <term>split specific fields</term>
+
                       <listitem>
                         <para>account and deposit/withdrawal as bare minimum.
                         </para>
@@ -1813,16 +1842,15 @@ Translators:
                 </para>
 
                 <tip>
-                  <para>There is a convenience feature built-in so you don't have to repeat the
-                    transaction fields if the split belongs to the same transaction as the
-                    previous one (though you can repeat them if that makes csv preparation
-                    easier).
+                  <para>There is a convenience feature built-in so you don't have to repeat the transaction fields if the
+                    split belongs to the same transaction as the previous one (though you can repeat
+                    them if that makes csv preparation easier).
                   </para>
                 </tip>
 
                 <example>
                   <title>Sample Multi-split.csv</title>
-                  <programlisting language="csv">Date,Description,Deposit,Account
+<programlisting language="csv">Date,Description,Deposit,Account
 05/03/2006,Grocery Store,-45.21,Assets:Checking
 ,,45.21,Expenses:Groceries
 14/03/2006,Employers R Us,670.00,Assets:Checking
@@ -1858,15 +1886,20 @@ Translators:
 
                     <listitem>
                       <para><emphasis role="bold"><guilabel>Leading Lines to Skip</guilabel></emphasis>: Select the number of
-                        header lines to skip in the imported file;<footnote id='txn-imp-skip'><simpara>
-                          While we only want to import <emphasis>transactions</emphasis>, some banks send additional informations like
-                          a <emphasis>fieldname</emphasis> header or <emphasis>account status</emphasis> information as header or footer.</simpara></footnote>
+                        header lines to skip in the imported file;
+                        <footnote id='txn-imp-skip'>
+                          <simpara>While we only want to import <emphasis>transactions</emphasis>, some banks send additional
+                            informations like a <emphasis>fieldname</emphasis> header or
+                            <emphasis>account status</emphasis> information as header or footer.
+                          </simpara>
+                        </footnote>
                       </para>
                     </listitem>
 
                     <listitem>
                       <para><emphasis role="bold"><guilabel>Trailing Lines to Skip</guilabel></emphasis>: Select the number of
-                        trailing lines to skip in the import file;<footnoteref linkend='txn-imp-skip'/>
+                        trailing lines to skip in the import
+                        file;<footnoteref linkend='txn-imp-skip'/>
                       </para>
                     </listitem>
 
@@ -1876,8 +1909,8 @@ Translators:
                       </para>
                     </listitem>
                   </itemizedlist>
-                  to match the settings for the file you are importing. Tooltips may also
-                  contain information on the setting and options.
+                  to match the settings for the file you are importing. Tooltips may also contain
+                  information on the setting and options.
                 </para>
               </listitem>
             </itemizedlist>
@@ -1969,13 +2002,12 @@ Translators:
 
               <listitem>
                 <para><emphasis role="bold"><guilabel>Deposit</guilabel></emphasis>: Apply this header to a column
-                  containing the amount of the transaction. Positive amounts in the column
-                  generally represent an increase in the account balance and negative amounts a
-                  decrease in the balance (asset accounts: Checking, Savings). In external
-                  statements supplied by a bank for a check or savings account, a credit (Cr) is
-                  normally an increase in the account balance and a debit (Dr) a decrease in the
-                  account balance. In the banks eyes, your savings or checking account is a
-                  Liability to them;
+                  containing the amount of the transaction. Positive amounts in the column generally
+                  represent an increase in the account balance and negative amounts a decrease in
+                  the balance (asset accounts: Checking, Savings). In external statements supplied
+                  by a bank for a check or savings account, a credit (Cr) is normally an increase in
+                  the account balance and a debit (Dr) a decrease in the account balance. In the
+                  banks eyes, your savings or checking account is a Liability to them;
                 </para>
 
                 <para>If the amount data is in separate columns for debits and credits you will have to apply both this
@@ -1986,8 +2018,8 @@ Translators:
               <listitem>
                 <para><emphasis role="bold"><guilabel>Withdrawal</guilabel></emphasis>: Apply this header to a column with
                   the amount of the transaction where positive amounts in the column represent a
-                  decrease in the account balance and negative amounts an increase in the
-                  balance (e.g. Liability account: credit card).
+                  decrease in the account balance and negative amounts an increase in the balance
+                  (e.g. Liability account: credit card).
                 </para>
 
                 <para>Where separate columns are used for debits and credit to the account apply it to the opposite to the
@@ -2010,9 +2042,9 @@ Translators:
               <listitem>
                 <para><emphasis role="bold"><guilabel>Memo</guilabel></emphasis>: Additional column containing descriptive
                   information relevant to one split of a transaction. If in the first line of a
-                  multi-split import it will apply to the source account. In subsequent
-                  lines/splits it is applied to the transfer account defined in that line or
-                  allocated to it in the matcher;
+                  multi-split import it will apply to the source account. In subsequent lines/splits
+                  it is applied to the transfer account defined in that line or allocated to it in
+                  the matcher;
                 </para>
               </listitem>
 
@@ -2037,8 +2069,8 @@ Translators:
 
               <listitem>
                 <para><emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>: This header should be
-                  applied to a column which specifies the transfer account for the second split
-                  of a single line import and/or for subsequent splits in multiline exported
+                  applied to a column which specifies the transfer account for the second split of a
+                  single line import and/or for subsequent splits in multiline exported
                   transactions;
                 </para>
               </listitem>
@@ -2080,21 +2112,20 @@ Translators:
 
         <step>
           <para><emphasis role="bold">Match Import and <application>&appname;</application> accounts</emphasis>:
-            This window allows you to map the accounts identified in the account columns
-            (Account and Transfer Account) with accounts in the
-            <application>&appname;</application> account tree (Account name). Double click on a
-            row to bring up a dialog to select the matching <application>&appname;</application>
-            account. If you have previously imported transactions to this account and account
-            mappings can be matched automatically, this window will not be displayed. When you
-            have selected a match for all accounts, click on the
-            <emphasis role="bold"><guibutton>Next</guibutton></emphasis> button;
+            This window allows you to map the accounts identified in the account columns (Account
+            and Transfer Account) with accounts in the <application>&appname;</application> account
+            tree (Account name). Double click on a row to bring up a dialog to select the matching
+            <application>&appname;</application> account. If you have previously imported
+            transactions to this account and account mappings can be matched automatically, this
+            window will not be displayed. When you have selected a match for all accounts, click on
+            the <emphasis role="bold"><guibutton>Next</guibutton></emphasis> button;
           </para>
         </step>
 
         <step>
           <para><emphasis role="bold">Transaction Information</emphasis>: The Transaction Information panel allows
-            review of data entry settings so far. Clicking Next will perform checks on the data.
-            If there are errors you will be returned to the <emphasis role="bold">Import
+            review of data entry settings so far. Clicking Next will perform checks on the data. If
+            there are errors you will be returned to the <emphasis role="bold">Import
             Preview</emphasis> pane to edit the settings. For no errors you proceed to the next
             step;
           </para>
@@ -2125,12 +2156,32 @@ Translators:
 
     <sect2 id="trans-import-aqbanking">
       <title>Import several file formats with AQBanking</title>
-      <para>If &app; was built with &app-aqb; support and you have &app-aqb; installed on your computer you may use <guilabel>Import using AQBanking</guilabel> to import files in several formats.</para>
-      <para>You will first be presented with a dialog box having two lists. The left one lists importer plugins and the right one lists file format profiles available for that importer. In some cases, for example <guilabel>swift</guilabel>, the profiles include specialized formats for particular bank: Continuing the example the <guilabel>swift</guilabel> importer can import both generic <guilabel>MT940</guilabel> and <guilabel>MT942</guilabel> statements and those specialized for the Netherlands's AMRO Bank.</para>
-      <para>Select an importer and a profile from the lists. &app; will remember your selection for the next time you do an import.</para>
-      <para>Click <guilabel>OK</guilabel> to proceed to the filechooser. Select a file to import and click the <guilabel>Import</guilabel> button to proceed.</para>
-      <para><application>&appname;</application> will process the selected file and map the account description in the import file onto the selected account and use it for future imports from the same account. The imported transactions will then be displayed in the
-        <link linkend="trans-import-matcher"><emphasis role="bold"><guimenuitem>Generic Import Transaction Matcher</guimenuitem></emphasis></link> for review.
+
+      <para>If &app; was built with &app-aqb; support and you have &app-aqb; installed on your computer you may
+        use <guilabel>Import using AQBanking</guilabel> to import files in several formats.
+      </para>
+
+      <para>You will first be presented with a dialog box having two lists. The left one lists importer plugins
+        and the right one lists file format profiles available for that importer. In some cases, for
+        example <guilabel>swift</guilabel>, the profiles include specialized formats for particular
+        bank: Continuing the example the <guilabel>swift</guilabel> importer can import both generic
+        <guilabel>MT940</guilabel> and <guilabel>MT942</guilabel> statements and those specialized
+        for the Netherlands's AMRO Bank.
+      </para>
+
+      <para>Select an importer and a profile from the lists. &app; will remember your selection for the next
+        time you do an import.
+      </para>
+
+      <para>Click <guilabel>OK</guilabel> to proceed to the filechooser. Select a file to import and click the
+        <guilabel>Import</guilabel> button to proceed.
+      </para>
+
+      <para><application>&appname;</application> will process the selected file and map the account description
+        in the import file onto the selected account and use it for future imports from the same
+        account. The imported transactions will then be displayed in the
+        <link linkend="trans-import-matcher"><emphasis role="bold"><guimenuitem>Generic Import
+        Transaction Matcher</guimenuitem></emphasis></link> for review.
       </para>
     </sect2>
 
@@ -2139,17 +2190,22 @@ Translators:
 
       <sect3>
         <title>Introduction</title>
+
         <figure id="fig-fil-imp-match" pgwide="1">
-          <title>The Generic Transaction Import Matcher Window</title><screenshot id="ImportMatcherScreenShot">
+          <title>The Generic Transaction Import Matcher Window</title>
+
+          <screenshot id="ImportMatcherScreenShot">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Import_Transaction_matcher_1.png" width="&img-w;"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/Import_Transaction_matcher_1.png"
                            srccredit="David Cousens"/>
               </imageobject>
+
               <caption>
                 This is an image of the import transaction matcher window after opening a file to
                 import.
@@ -2160,20 +2216,20 @@ Translators:
 
         <para>The Import Matcher checks whether an imported transaction matches an existing transaction already
           recorded in <application>&appname;</application> within a predefined time window (~+_42
-          days) for the account into which the transactions are being imported. A match probablity is
-          calculated based on the Date, Amount, Transaction ID's (if present), Check numbers (if
-          present) and the Description and split Memo fields. Exact matches will generate a high match
-          probability and flag a transaction as matching an existing transaction and therefore not to
-          be imported. If there is a lower quality match to an existing transaction, the imported
-          transaction may be flagged for updating of non-matching information in the
-          <application>&appname;</application> record of the matching transaction. These decisions can
-          be overridden by the user.
+          days) for the account into which the transactions are being imported. A match probablity
+          is calculated based on the Date, Amount, Transaction ID's (if present), Check numbers (if
+          present) and the Description and split Memo fields. Exact matches will generate a high
+          match probability and flag a transaction as matching an existing transaction and therefore
+          not to be imported. If there is a lower quality match to an existing transaction, the
+          imported transaction may be flagged for updating of non-matching information in the
+          <application>&appname;</application> record of the matching transaction. These decisions
+          can be overridden by the user.
         </para>
 
         <para>If no matching transaction can be identified the transaction will be flagged for import. The matcher
-          will attempt to assign a transfer account based on matches between tokenized information for
-          previously imported transactions stored in lists associated with the transfer accounts which
-          were assigned to them on import.
+          will attempt to assign a transfer account based on matches between tokenized information
+          for previously imported transactions stored in lists associated with the transfer accounts
+          which were assigned to them on import.
           <itemizedlist>
             <listitem>
               <para>If a good match is obtained, the transfer account is assigned and the transaction is flagged as
@@ -2183,9 +2239,9 @@ Translators:
 
             <listitem>
               <para>If a transfer account cannot be assigned, the transaction will be flagged for import and manual
-                assignment of the transfer account by the user. By default, if no transfer account is
-                assigned, transactions will be assigned to an Imbalance account on import. This is to
-                indicate that they need an appropriate account assigned to them.
+                assignment of the transfer account by the user. By default, if no transfer account
+                is assigned, transactions will be assigned to an Imbalance account on import. This
+                is to indicate that they need an appropriate account assigned to them.
               </para>
             </listitem>
           </itemizedlist>
@@ -2193,7 +2249,8 @@ Translators:
       </sect3>
 
       <sect3>
-          <title>Import Formats</title>
+        <title>Import Formats</title>
+
         <para>The generic import transaction matcher is invoked when transaction data is imported using any of the
           following import formats:
           <itemizedlist spacing="compact">
@@ -2232,6 +2289,7 @@ Translators:
 
       <sect3>
         <title>Controls</title>
+
         <sect4>
           <title>List of Controls</title>
 
@@ -2246,42 +2304,45 @@ Translators:
               </listitem>
 
               <listitem>
-                <para><emphasis role="bold"><guibutton>Show Account column</guibutton></emphasis>: Checkbox to
-                  display the account into which the transactions are being imported. This is the
-                  second column labelled <guilabel>Account</guilabel> in the screenshot;
+                <para><emphasis role="bold"><guibutton>Show Account column</guibutton></emphasis>: Checkbox to display the
+                  account into which the transactions are being imported. This is the second column
+                  labelled <guilabel>Account</guilabel> in the screenshot;
                 </para>
               </listitem>
 
               <listitem>
-                <para><emphasis role="bold"><guibutton>Show Memo column</guibutton></emphasis>: Checkbox to
-                display the <guilabel>Memo</guilabel> from the imported transactions after the column
-                labelled <guilabel>Description</guilabel>;
+                <para><emphasis role="bold"><guibutton>Show Memo column</guibutton></emphasis>: Checkbox to display the
+                  <guilabel>Memo</guilabel> from the imported transactions after the column labelled
+                  <guilabel>Description</guilabel>;
                 </para>
               </listitem>
 
               <listitem>
                 <para><emphasis role="bold"><guibutton>Show matched information</guibutton></emphasis>: Checkbox to
                   display the matched transaction which has been already imported or entered into
-                  <application>&appname;</application>.  If there is one, this will be a line with a white
-                  background (by default) after the imported transaction. This is either the manually selected match
-                  if one has been selected or the best possible match otherwise;
+                  <application>&appname;</application>. If there is one, this will be a line with a
+                  white background (by default) after the imported transaction. This is either the
+                  manually selected match if one has been selected or the best possible match
+                  otherwise;
                 </para>
               </listitem>
 
               <listitem>
-                <para><emphasis role="bold"><guibutton>Append</guibutton></emphasis>: Checkbox to indicate
-                  that when updating and clearing a matched transaction, the imported <guilabel>Description</guilabel>
-                  and <guilabel>Notes</guilabel> are to be appended to the matched transaction
-                  <guilabel>Description</guilabel> and <guilabel>Notes</guilabel> respectively, rather than
-                  overwriting them. When the <emphasis role="bold"> <guibutton>OK</guibutton></emphasis>
-                  button is clicked, the state of the checkbox is saved so the next import for that account
-                  will automatically default it to the saved state;
+                <para><emphasis role="bold"><guibutton>Append</guibutton></emphasis>: Checkbox to indicate that when
+                  updating and clearing a matched transaction, the imported
+                  <guilabel>Description</guilabel> and <guilabel>Notes</guilabel> are to be appended
+                  to the matched transaction <guilabel>Description</guilabel> and
+                  <guilabel>Notes</guilabel> respectively, rather than overwriting them. When the
+                  <emphasis role="bold"> <guibutton>OK</guibutton></emphasis> button is clicked, the
+                  state of the checkbox is saved so the next import for that account will
+                  automatically default it to the saved state;
                 </para>
               </listitem>
 
               <listitem>
                 <para><emphasis role="bold"><guibutton>Reconcile after match</guibutton></emphasis>: Checkbox to
-                  automatically start the reconciliation process after transactions have been matched and imported;
+                  automatically start the reconciliation process after transactions have been
+                  matched and imported;
                 </para>
               </listitem>
 
@@ -2307,6 +2368,7 @@ Translators:
 
         <sect4 id="trans-match-col">
           <title>List of downloaded transactions</title>
+
           <para>The <guilabel>List of downloaded transactions</guilabel> has the following columns which display the
             following information for each of the downloaded transactions:
           </para>
@@ -2351,9 +2413,10 @@ Translators:
             </listitem>
 
             <listitem>
-              <para><emphasis role="bold"><guilabel>U+C</guilabel></emphasis> - Update and Clear - Checkbox which indicates that the
-                transaction matches an existing transaction but has some differences and the existing
-                transaction will be updated with the different information;
+              <para><emphasis role="bold"><guilabel>U+C</guilabel></emphasis> - Update and Clear - Checkbox which
+                indicates that the transaction matches an existing transaction but has some
+                differences and the existing transaction will be updated with the different
+                information;
               </para>
             </listitem>
 
@@ -2365,13 +2428,14 @@ Translators:
 
             <listitem>
               <para><emphasis role="bold"><guilabel>Info</guilabel></emphasis> - For transactions which have been
-                matched to an existing transaction, this column displays a bar indicating the quality of the match;
+                matched to an existing transaction, this column displays a bar indicating the
+                quality of the match;
               </para>
             </listitem>
 
             <listitem>
-              <para><emphasis role="bold"><guilabel>Additional Comments</guilabel></emphasis> - Shows what is to happen to the
-                transaction and the transfer account if known;
+              <para><emphasis role="bold"><guilabel>Additional Comments</guilabel></emphasis> - Shows what is to happen
+                to the transaction and the transfer account if known;
               </para>
             </listitem>
           </itemizedlist>
@@ -2379,9 +2443,10 @@ Translators:
 
         <sect4>
           <title>Import Status</title>
+
           <para>In addition to the checkboxes, the import status of each transaction is indicated by the background
-            color of the transaction row. The checkbox state, background colors and their meaning are
-            described in <xref linkend="match_status"/>.
+            color of the transaction row. The checkbox state, background colors and their meaning
+            are described in <xref linkend="match_status"/>.
           </para>
 
           <table id="match_status" frame="all">
@@ -2417,29 +2482,29 @@ Translators:
                   </entry>
 
                   <entry>
-    <?dbhtml bgcolor="#FFD700"?>
-    <?dbfo bgcolor="#FFD700"?>
+<?dbhtml bgcolor="#FFD700"?>
+<?dbfo bgcolor="#FFD700"?>
                     Gold
                   </entry>
 
                   <entry>
-    <?dbhtml bgcolor="#FFD700"?>
-    <?dbfo bgcolor="#FFD700"?>
-                    No matches, flagged for input and no transfer account matched – Import as a
-                    new transaction. Intervention required to select a transfer account.
+<?dbhtml bgcolor="#FFD700"?>
+<?dbfo bgcolor="#FFD700"?>
+                    No matches, flagged for input and no transfer account matched – Import as
+                    a new transaction. Intervention required to select a transfer account.
                   </entry>
                 </row>
 
                 <row>
                   <entry>
-    <?dbhtml bgcolor="#CFFFCB"?>
-    <?dbfo bgcolor="#CFFFCB"?>
+<?dbhtml bgcolor="#CFFFCB"?>
+<?dbfo bgcolor="#CFFFCB"?>
                     DarkSeaGreen1
                   </entry>
 
                   <entry>
-    <?dbhtml bgcolor="#CFFFCB"?>
-    <?dbfo bgcolor="#CFFFCB"?>
+<?dbhtml bgcolor="#CFFFCB"?>
+<?dbfo bgcolor="#CFFFCB"?>
                     No matches detected, flagged for input and a transfer account is matched –
                     Import as a new transaction. Reconciliation status will be set as cleared (c) on
                     import. Intervention is not required.
@@ -2452,17 +2517,17 @@ Translators:
                   </entry>
 
                   <entry>
-    <?dbhtml bgcolor="#CFFFCB"?>
-    <?dbfo bgcolor="#CFFFCB"?>
+<?dbhtml bgcolor="#CFFFCB"?>
+<?dbfo bgcolor="#CFFFCB"?>
                     DarkSeaGreen1
                   </entry>
 
                   <entry>
-    <?dbhtml bgcolor="#CFFFCB"?>
-    <?dbfo bgcolor="#CFFFCB"?>
+<?dbhtml bgcolor="#CFFFCB"?>
+<?dbfo bgcolor="#CFFFCB"?>
                     Matches an existing transaction but not exactly on date and/or amount –
-                    Intervention not required, import and update. Reconciliation status will be set as
-                    cleared (c) on import.
+                    Intervention not required, import and update. Reconciliation status will be set
+                    as cleared (c) on import.
                   </entry>
                 </row>
 
@@ -2472,17 +2537,17 @@ Translators:
                   </entry>
 
                   <entry>
-    <?dbhtml bgcolor="#CFFFCB"?>
-    <?dbfo bgcolor="#CFFFCB"?>
+<?dbhtml bgcolor="#CFFFCB"?>
+<?dbfo bgcolor="#CFFFCB"?>
                     DarkSeaGreen1
                   </entry>
 
                   <entry>
-    <?dbhtml bgcolor="#CFFFCB"?>
-    <?dbfo bgcolor="#CFFFCB"?>
+<?dbhtml bgcolor="#CFFFCB"?>
+<?dbfo bgcolor="#CFFFCB"?>
                     Matches an existing transaction: – Not to be imported. The existing
-                    transaction reconciliation status will be as cleared (c) on import. Intervention is
-                    not required
+                    transaction reconciliation status will be as cleared (c) on import. Intervention
+                    is not required
                   </entry>
                 </row>
 
@@ -2490,14 +2555,14 @@ Translators:
                   <entry></entry>
 
                   <entry>
-    <?dbhtml bgcolor="#FF4040"?>
-    <?dbfo bgcolor="#FF4040"?>
+<?dbhtml bgcolor="#FF4040"?>
+<?dbfo bgcolor="#FF4040"?>
                     Brown1
                   </entry>
 
                   <entry>
-    <?dbhtml bgcolor="#FF4040"?>
-    <?dbfo bgcolor="#FF4040"?>
+<?dbhtml bgcolor="#FF4040"?>
+<?dbfo bgcolor="#FF4040"?>
                     Transaction has poor matches and no action was set: – Not to be imported.
                     Intervention required.
                   </entry>
@@ -2507,14 +2572,14 @@ Translators:
                   <entry></entry>
 
                   <entry>
-    <?dbhtml bgcolor="#6495ED"?>
-    <?dbfo bgcolor="#6495ED"?>
+<?dbhtml bgcolor="#6495ED"?>
+<?dbfo bgcolor="#6495ED"?>
                     Cornflower Blue
                   </entry>
 
                   <entry>
-    <?dbhtml bgcolor="#6495ED"?>
-    <?dbfo bgcolor="#6495ED"?>
+<?dbhtml bgcolor="#6495ED"?>
+<?dbfo bgcolor="#6495ED"?>
                     Row is selected
                   </entry>
                 </row>
@@ -2551,21 +2616,21 @@ Translators:
 
           <itemizedlist>
             <listitem>
-              <para><emphasis role="bold">Click <mousebutton>Button1</mousebutton>
-                (see <link linkend="Help-Mouse-Buttons">Mouse Buttons</link>) on a row</emphasis>:
-                Select this row (row is displayed with a blue background);
+              <para><emphasis role="bold">Click <mousebutton>Button1</mousebutton> (see
+                <link linkend="Help-Mouse-Buttons">Mouse Buttons</link>) on a row</emphasis>: Select
+                this row (row is displayed with a blue background);
               </para>
             </listitem>
 
             <listitem>
               <para><emphasis role="bold">Double-click <mousebutton>Button1</mousebutton> on a row</emphasis>: If the
                 transactions is flagged for import (see below) this will open an account selection
-                dialog to select a destination/transfer account to be used in the second split of the
-                imported transaction. You may create a new account if necessary in this dialog using the
-                <emphasis role="bold"><guibutton>New Account</guibutton></emphasis> button. If the
-                transaction is flagged as matching an existing transaction either for import or
-                updating, the match picker dialog is opened to allow the matched transactions to be
-                examined and a correct match selected;
+                dialog to select a destination/transfer account to be used in the second split of
+                the imported transaction. You may create a new account if necessary in this dialog
+                using the <emphasis role="bold"><guibutton>New Account</guibutton></emphasis>
+                button. If the transaction is flagged as matching an existing transaction either for
+                import or updating, the match picker dialog is opened to allow the matched
+                transactions to be examined and a correct match selected;
               </para>
             </listitem>
 
@@ -2584,8 +2649,8 @@ Translators:
                 <keycombo action="simul">
                   <keycap>Shift</keycap><mousebutton>Button1</mousebutton>
                 </keycombo>
-                on a row</emphasis>: Select all rows between the last selected row and this row and add
-                them to the current selection of rows;
+                on a row</emphasis>: Select all rows between the last selected row and this row and
+                add them to the current selection of rows;
               </para>
             </listitem>
 
@@ -2599,40 +2664,40 @@ Translators:
 
           <important>
             <para>It is important to assign a transfer account to each transaction prior to import of the
-              transactions. Otherwise the tokenized information from the imported transaction will not
-              be appended to the list of tokens for an assigned account for use in future matching of
-              transactions to transfer accounts.
+              transactions. Otherwise the tokenized information from the imported transaction will
+              not be appended to the list of tokens for an assigned account for use in future
+              matching of transactions to transfer accounts.
             </para>
           </important>
 
           <note>
             <para>Note that "reconciled" in this context does not mean the same as "reconciled" in the process of
-              reconciling an account to an external statement. The reconciliation status of an imported
-              transaction is set to cleared (c) on import of a new transaction.
-              See <link linkend="trans-stts">Setting the reconcile status (R field) of a transaction</link>
-              for details of the values of reconciliation status.
+              reconciling an account to an external statement. The reconciliation status of an
+              imported transaction is set to cleared (c) on import of a new transaction. See
+              <link linkend="trans-stts">Setting the reconcile status (R field) of a
+              transaction</link> for details of the values of reconciliation status.
             </para>
           </note>
 
           <para>Where a row has been matched to an existing transaction or is to update an existing transaction it
             will have a DarkSeaGreen background. <emphasis role="bold">Double-clicking
             <mousebutton>Button1</mousebutton></emphasis> on the row will bring up the Match Picker
-            dialog which displays detail of the imported. If you, feel the wrong transfer account has
-            been assigned or the matcher has not produced a valid result, you may change the checkbox
-            selection if you disagree with the matcher decisions and you may reassign an assigned
-            transfer account (see below).
+            dialog which displays detail of the imported. If you, feel the wrong transfer account
+            has been assigned or the matcher has not produced a valid result, you may change the
+            checkbox selection if you disagree with the matcher decisions and you may reassign an
+            assigned transfer account (see below).
           </para>
 
           <para><emphasis role="bold">Double-clicking <mousebutton>Button1</mousebutton></emphasis> on a row marked
-            as New with a <phrase>DarkSeaGreen1</phrase> background and a transfer account assigned to
-            it will bring up the account selection dialog to allow you to choose a different transfer
-            account for the second split.
+            as New with a <phrase>DarkSeaGreen1</phrase> background and a transfer account assigned
+            to it will bring up the account selection dialog to allow you to choose a different
+            transfer account for the second split.
           </para>
 
           <para><emphasis role="bold">Double-clicking <mousebutton>Button1</mousebutton></emphasis> on a row marked
-            New with no transfer account matched with a <phrase>Gold</phrase> background will also bring
-            up the account selection dialog to allow you to assign a suitable transfer account to the
-            transaction.
+            New with no transfer account matched with a <phrase>Gold</phrase> background will also
+            bring up the account selection dialog to allow you to assign a suitable transfer account
+            to the transaction.
           </para>
         </sect4>
       </sect3>
@@ -2640,8 +2705,8 @@ Translators:
       <sect3>
         <title>Assign a Destination Account to a Single Transaction</title>
 
-        <para>Select the required row by clicking <mousebutton>Button1</mousebutton> on it. It is
-          displayed with a <phrase>
+        <para>Select the required row by clicking <mousebutton>Button1</mousebutton> on it. It is displayed with a
+          <phrase>
 <?dbhtml bgcolor="#6495ED"?>
 <?dbfo bgcolor="#6495ED"?>
           Cornflower Blue</phrase> background color.
@@ -2774,7 +2839,9 @@ Translators:
       </para>
 
       <figure pgwide="1">
-        <title>The Match Picker Dialog</title><screenshot id="ImportMatcherPicker">
+        <title>The Match Picker Dialog</title>
+
+        <screenshot id="ImportMatcherPicker">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Import_MatchPicker.png" width="&img-w;"
@@ -2914,16 +2981,20 @@ Translators:
       </para>
 
       <figure pgwide="1">
-        <title>The Import Map Editor</title><screenshot>
+        <title>The Import Map Editor</title>
+
+        <screenshot>
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Import_Map_Editor.png" width="&img-w;"
                          srccredit="David Cousens"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/Import_Map_Editor.png"
                          srccredit="David Cousens"/>
             </imageobject>
+
             <caption>
               The Import Map Editor illustrating typical entries for the Bayesian matcher.
             </caption>
@@ -3090,12 +3161,15 @@ Translators:
     </para>
 
     <figure pgwide="1">
-      <title>The Export Transactions Wizard.</title><screenshot id="export-transactions-wizard">
+      <title>The Export Transactions Wizard.</title>
+
+      <screenshot id="export-transactions-wizard">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Choose_Export_Settings.png" width="&img-w;"
                        srccredit="David Cousens"/>
           </imageobject>
+
           <imageobject role="fo">
             <imagedata fileref="figures/Choose_Export_Settings.png"
                        srccredit="David Cousens"/>
diff --git a/C/manual/fdl-appendix.xml b/C/manual/fdl-appendix.xml
index 7724fd47..b2cf511a 100644
--- a/C/manual/fdl-appendix.xml
+++ b/C/manual/fdl-appendix.xml
@@ -555,9 +555,8 @@
     </para>
 
     <para>If your document contains nontrivial examples of program code, we recommend releasing these examples
-      in parallel under your choice of free software license, such as the
-      <ulink url="&url-gpl;">GNU General Public License</ulink>,
-      to permit their use in free software.
+      in parallel under your choice of free software license, such as the <ulink url="&url-gpl;">GNU
+      General Public License</ulink>, to permit their use in free software.
     </para>
   </sect1>
 </appendix>
diff --git a/C/manual/index.docbook b/C/manual/index.docbook
index b0f3a975..ef794778 100644
--- a/C/manual/index.docbook
+++ b/C/manual/index.docbook
@@ -15,20 +15,20 @@
 <!-- appropriate code -->
   <bookinfo>
     <title>&appname; Manual</title>
+
     <subtitle>The Technical Reference</subtitle>
     <edition>v&manrevision;</edition>
     <titleabbrev>&appname; Manual &manrevision;</titleabbrev>
+
     <copyright>
       <year>2002-2023</year> <holder>&appname; Documentation Team</holder>
     </copyright>
-
 <!-- translators: uncomment this:
    <copyright>
       <year>2000</year>
       <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
    </copyright>
 -->
-
     <publisher>
       <publishername>&appname; Documentation Team</publishername>
 <address><email>gnucash-user at gnucash.org</email></address>
@@ -47,448 +47,615 @@
         <revnumber>&appname; Help Manual 5.2</revnumber>
         <date>25 June 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 5.1</revnumber>
         <date>30 April 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 5.0</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.14</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.903</revnumber>
         <date>12 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.900</revnumber>
         <date>8 January 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.13</revnumber>
         <date>18 December 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.12</revnumber>
         <date>25 September 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.11</revnumber>
         <date>26 June 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.10</revnumber>
         <date>27 March 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.9</revnumber>
         <date>19 December 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.8</revnumber>
         <date>28 September 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.7</revnumber>
         <date>26 September 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.6</revnumber>
         <date>27 June 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.5</revnumber>
         <date>28 March 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
-        </revdescription>
-      </revision>
-      <revision> <revnumber>&appname; Help Manual 4.4</revnumber> <date>28 December
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual 4.3</revnumber> <date>27 December
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual 4.2</revnumber> <date>27 September
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual 4.1</revnumber> <date>26 July
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual 4.0</revnumber> <date>28 June
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v3.11</revnumber> <date>28 June
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v3.10</revnumber> <date>11 April
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v3.9</revnumber> <date>29 March
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v3.8</revnumber> <date>29 December
-      2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v3.7</revnumber> <date>8 September
-      2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v3.6</revnumber> <date>30 June
-      2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v3.5</revnumber> <date>31 March
-      2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v3.3</revnumber> <date>30 September
-      2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v3.2</revnumber> <date>24 June
-      2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v3.1</revnumber> <date>28 April
-      2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v3.0</revnumber> <date>1 April
-      2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.6.20</revnumber> <date>1 April
-      2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.6.19</revnumber> <date>16 December
-      2017</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.6.16</revnumber> <date>26 March
-      2017</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.6.11</revnumber> <date>11 January
-      2016</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.6.8</revnumber> <date>27 September
-      2015</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.6.7</revnumber> <date>28 June
-      2015</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.6.3</revnumber> <date>30 March
-      2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.6.2</revnumber> <date>2 March
-      2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.6.1</revnumber> <date>26 January
-      2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.6.0</revnumber> <date>29 December
-      2013</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.4.2</revnumber> <date>17 November
-      2012</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.4.1</revnumber> <date>1 July
-      2011</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.3.16</revnumber> <date>November 7,
-      2010</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
-
-        <para role="author">Dave Herman <email>dvherman at bigfoot.com</email>
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.0.2</revnumber> <date>March
-      2007</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v2.0.0</revnumber> <date>July
-      2006</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v1.8.3</revnumber> <date>Aug
-      2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v1.8.2</revnumber> <date>Aug
-      2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v1.8.1</revnumber> <date>May
-      2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Help Manual v1.8.0</revnumber> <date>Jan
-      2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; User Manual</revnumber> <date>June 2002</date>
-      <revdescription>
-        <para role="author">&appname; Developers and Documentors <email>gnucash-devel at gnucash.org</email>
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual 4.3</revnumber>
+        <date>27 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual 4.2</revnumber>
+        <date>27 September 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual 4.1</revnumber>
+        <date>26 July 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual 4.0</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v3.11</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v3.10</revnumber>
+        <date>11 April 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v3.9</revnumber>
+        <date>29 March 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v3.8</revnumber>
+        <date>29 December 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v3.7</revnumber>
+        <date>8 September 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v3.5</revnumber>
+        <date>31 March 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v3.3</revnumber>
+        <date>30 September 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v3.2</revnumber>
+        <date>24 June 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v3.1</revnumber>
+        <date>28 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v3.0</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.6.20</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.6.19</revnumber>
+        <date>16 December 2017</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.6.16</revnumber>
+        <date>26 March 2017</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.6.11</revnumber>
+        <date>11 January 2016</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.6.8</revnumber>
+        <date>27 September 2015</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.6.7</revnumber>
+        <date>28 June 2015</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.6.3</revnumber>
+        <date>30 March 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.6.2</revnumber>
+        <date>2 March 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.6.1</revnumber>
+        <date>26 January 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.6.0</revnumber>
+        <date>29 December 2013</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.4.2</revnumber>
+        <date>17 November 2012</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.4.1</revnumber>
+        <date>1 July 2011</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.3.16</revnumber>
+        <date>November 7, 2010</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="author">Dave Herman <email>dvherman at bigfoot.com</email>
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.0.2</revnumber>
+        <date>March 2007</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v2.0.0</revnumber>
+        <date>July 2006</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v1.8.3</revnumber>
+        <date>Aug 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v1.8.2</revnumber>
+        <date>Aug 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v1.8.1</revnumber>
+        <date>May 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual v1.8.0</revnumber>
+        <date>Jan 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; User Manual</revnumber>
+        <date>June 2002</date>
+        <revdescription>
+          <para role="author">&appname; Developers and Documentors <email>gnucash-devel at gnucash.org</email>
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
       </revision>
     </revhistory>
 
@@ -618,7 +785,6 @@
 <!-- subchapters:
   txf-ategories.xml
 -->
-
   <xi:include href="ch_Finance-Quote.xml" />
 
   <xi:include href="tips-appendix.xml" />
diff --git a/C/manual/txf-categories.xml b/C/manual/txf-categories.xml
index 13af7fda..bbce7e98 100644
--- a/C/manual/txf-categories.xml
+++ b/C/manual/txf-categories.xml
@@ -4973,6 +4973,5 @@
       </tbody>
     </tgroup>
   </table>
-  Source:
-  <ulink url="&url-gh-gc-maint-txf-hlp;us/txf-help.scm"/>
+  Source: <ulink url="&url-gh-gc-maint-txf-hlp;us/txf-help.scm"/>
 </para>
diff --git a/de/guide/appendixa.xml b/de/guide/appendixa.xml
index 022cc4e6..68a4b011 100644
--- a/de/guide/appendixa.xml
+++ b/de/guide/appendixa.xml
@@ -15,7 +15,7 @@
 -->
 <appendix id="appendixa">
   <title>Migration Guide</title>
-  
+
   <para>&untranslated-de;
   </para>
 <!--
diff --git a/de/guide/ch_basics.xml b/de/guide/ch_basics.xml
index c02048e9..fecb6798 100644
--- a/de/guide/ch_basics.xml
+++ b/de/guide/ch_basics.xml
@@ -134,7 +134,9 @@
       </para>
 
       <figure pgwide="1">
-        <title>Die Beziehungen der Grundkonten</title><screenshot id="basics-AccountRelationships">
+        <title>Die Beziehungen der Grundkonten</title>
+
+        <screenshot id="basics-AccountRelationships">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_AccountRelationships.png"
@@ -777,26 +779,23 @@
         <guibutton>Drucken</guibutton>-Schaltfläche wie in einem Standard- Web-Browser.
       </para>
 
-      <para>Die <ulink url="&url-www;">&appname; Website</ulink> enthält
-        hilfreiche Informationen über das Programm und über mögliche Aktualisierungen. Sie
-        enthält ferner Verknüpfungen zu den
-        <ulink url="&url-mail-li;"><citetitle>&appname;
-        Mailinglisten</citetitle></ulink> für Entwickler und Nutzer und Sie können die
-        <ulink url="&url-mail-ar;gnucash-de/"><citetitle>Archive der
-        deutschsprachigen &app; Mailinglisten</citetitle></ulink> nach Diskussionen über bestimmte
-        Themen durchsuchen. Falls Sie keine Antwort auf Ihre Frage finden, können Sie diese an die
-        englischsprachige
-        <ulink url="&url-mail-li;gnucash-user"><citetitle>&appname;-user</citetitle></ulink>
-        oder die deutschsprachige
+      <para>Die <ulink url="&url-www;">&appname; Website</ulink> enthält hilfreiche Informationen über das
+        Programm und über mögliche Aktualisierungen. Sie enthält ferner Verknüpfungen zu den
+        <ulink url="&url-mail-li;"><citetitle>&appname; Mailinglisten</citetitle></ulink> für
+        Entwickler und Nutzer und Sie können die
+        <ulink url="&url-mail-ar;gnucash-de/"><citetitle>Archive der deutschsprachigen &app;
+        Mailinglisten</citetitle></ulink> nach Diskussionen über bestimmte Themen durchsuchen.
+        Falls Sie keine Antwort auf Ihre Frage finden, können Sie diese an die englischsprachige
+        <ulink url="&url-mail-li;gnucash-user"><citetitle>&appname;-user</citetitle></ulink> oder
+        die deutschsprachige
         <ulink url="&url-mail-li;gnucash-de"><citetitle>&appname;-de</citetitle></ulink>
         Mailingliste richten, und jemand von der Liste wird versuchen, Ihnen eine Antwort zu geben.
       </para>
 
       <para>Die aktuellste <guilabel>&appname; FAQ</guilabel> befinde sich unter
-        <ulink url="&url-wiki-faq;"><citetitle>&appname;
-        FAQ</citetitle></ulink> und enthält Antworten auf die häufigsten Fragen. Auch eine partielle
-        <ulink url="url-wiki-faq-de"><citetitle>deutschsprachige
-        HGF</citetitle></ulink> gibt es.
+        <ulink url="&url-wiki-faq;"><citetitle>&appname; FAQ</citetitle></ulink> und enthält
+        Antworten auf die häufigsten Fragen. Auch eine partielle
+        <ulink url="url-wiki-faq-de"><citetitle>deutschsprachige HGF</citetitle></ulink> gibt es.
       </para>
     </sect2>
 
@@ -907,7 +906,9 @@
               </para>
 
               <figure>
-                <title>Speichern, wenn <acronym>XML</acronym> oder <acronym>sqlite3</acronym> ausgewählt ist.</title><screenshot id="basics-SaveXML">
+                <title>Speichern, wenn <acronym>XML</acronym> oder <acronym>sqlite3</acronym> ausgewählt ist.</title>
+
+                <screenshot id="basics-SaveXML">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveXML.png"
@@ -966,7 +967,9 @@
               </para>
 
               <figure>
-                <title>Speicherdialog, wenn <acronym>mysql</acronym> oder <acronym>postgres</acronym> ausgewählt ist.</title><screenshot id="basics-SaveSQL">
+                <title>Speicherdialog, wenn <acronym>mysql</acronym> oder <acronym>postgres</acronym> ausgewählt ist.</title>
+
+                <screenshot id="basics-SaveSQL">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveSQL.png"
@@ -1583,7 +1586,9 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
         </note>
 
         <figure pgwide="1">
-          <title>Neuer Kontenplan: Übersicht</title><screenshot id="basics-NewAccountHierarchySetup">
+          <title>Neuer Kontenplan: Übersicht</title>
+
+          <screenshot id="basics-NewAccountHierarchySetup">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
@@ -1619,12 +1624,13 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
           ändern.
 <!-- ToDo -->
           Für die Details dieser Optionen, sehen Sie im englischen &app; Manual,
-          <ulink url="&url-docs-C;-help/book-options.html"/>, nach bis der Teil
-          übersetzt ist.
+          <ulink url="&url-docs-C;-help/book-options.html"/>, nach bis der Teil übersetzt ist.
         </para>
 
         <figure pgwide="1">
-          <title>Neuer Kontenplan: Buch-Optionen</title><screenshot id="basics-NewBookOptions">
+          <title>Neuer Kontenplan: Buch-Optionen</title>
+
+          <screenshot id="basics-NewBookOptions">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewBookOpts.png"
@@ -1658,7 +1664,9 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
         </note>
 
         <figure pgwide="1">
-          <title>Neuer Kontenplan: Währung wählen</title><screenshot id="basics-NewAccountHierarchySetup-currency">
+          <title>Neuer Kontenplan: Währung wählen</title>
+
+          <screenshot id="basics-NewAccountHierarchySetup-currency">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
@@ -1694,7 +1702,9 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
         </note>
 
         <figure pgwide="1">
-          <title>Neuer Kontenplan: Konten-Auswahl</title><screenshot id="basics-NewAccountHierarchySetup-Accounts">
+          <title>Neuer Kontenplan: Konten-Auswahl</title>
+
+          <screenshot id="basics-NewAccountHierarchySetup-Accounts">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
@@ -1726,7 +1736,9 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
         </para>
 
         <figure pgwide="1">
-          <title>Neuer Kontenplan: Konten einrichten</title><screenshot id="basics-NewAccountHierarchySetup-Setup.png">
+          <title>Neuer Kontenplan: Konten einrichten</title>
+
+          <screenshot id="basics-NewAccountHierarchySetup-Setup.png">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
@@ -1754,7 +1766,9 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
         </para>
 
         <figure pgwide="1">
-          <title>Neuer Kontenplan: Konteneinrichtung fertigstellen</title><screenshot id="basics-NewAccountHierarchySetup-Finish">
+          <title>Neuer Kontenplan: Konteneinrichtung fertigstellen</title>
+
+          <screenshot id="basics-NewAccountHierarchySetup-Finish">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
@@ -1789,7 +1803,9 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
         </para>
 
         <figure pgwide="1">
-          <title>Tutorial: Anfängliche Kontenübersicht der Testdatei</title><screenshot id="basics-EmptyAccounts">
+          <title>Tutorial: Anfängliche Kontenübersicht der Testdatei</title>
+
+          <screenshot id="basics-EmptyAccounts">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
diff --git a/de/guide/ch_budgets.xml b/de/guide/ch_budgets.xml
index 5c25f6fb..480c1e3b 100644
--- a/de/guide/ch_budgets.xml
+++ b/de/guide/ch_budgets.xml
@@ -14,69 +14,75 @@
 <chapter id="chapter_budgets">
   <title>Budget</title>
 
-  <para>Dieses Kapitel erklärt, wie Budgets oder Finanzpläne mit  &app; erzeugt und genutzt werden.
+  <para>Dieses Kapitel erklärt, wie Budgets oder Finanzpläne mit &app; erzeugt und genutzt werden.
   </para>
 
   <sect1 id="budget_concepts1">
     <title>Grundkonzepte</title>
 
     <para>Ein Budget ist ein Hilfsmittel zum Abschätzen der zu erwartenden Einnahmen und Ausgaben. Sie
-      können es verwenden, um zu planen, wie sich Ihre Finanzen über einen bestimmten Zeitraum verändern sollen
-      und um zu prüfen, wie Ihre tatsächlichen Finanztransaktionen in diesem Zeitraum mit den geplanten 
-      Transaktionen übereinstimmen.
+      können es verwenden, um zu planen, wie sich Ihre Finanzen über einen bestimmten Zeitraum
+      verändern sollen und um zu prüfen, wie Ihre tatsächlichen Finanztransaktionen in diesem
+      Zeitraum mit den geplanten Transaktionen übereinstimmen.
     </para>
 
-    <para>Das Konzept der Budgetierung ist recht allgemein, daher bietet &app; ein Budgetierungswerkzeug,
-      das sowohl einfach als auch flexibel ist. Sie, der Benutzer, müssen entscheiden, wie komplex oder 
-      einfach Sie Ihr Budget gestalten wollen. Dieser Leitfaden wird Ihnen helfen, einige dieser Entscheidungen zu treffen.
+    <para>Das Konzept der Budgetierung ist recht allgemein, daher bietet &app; ein Budgetierungswerkzeug, das
+      sowohl einfach als auch flexibel ist. Sie, der Benutzer, müssen entscheiden, wie komplex oder
+      einfach Sie Ihr Budget gestalten wollen. Dieser Leitfaden wird Ihnen helfen, einige dieser
+      Entscheidungen zu treffen.
     </para>
 
     <sect2 id="budget_conceptsterms2">
       <title>Fachbegriffe</title>
 
-      <para>Im Folgenden sind einige hilfreiche Begriffe aufgeführt, die bei der Diskussion der Budgetierung verwendet werden.
+      <para>Im Folgenden sind einige hilfreiche Begriffe aufgeführt, die bei der Diskussion der Budgetierung
+        verwendet werden.
       </para>
 
       <itemizedlist>
         <listitem>
-          <para><emphasis>Budget</emphasis> - Ein Finanzplan, der die erwarteten Einnahmen und/oder Auszahlungen für eine
-            bestimmte Zeitspanne beschreibt.
+          <para><emphasis>Budget</emphasis> - Ein Finanzplan, der die erwarteten Einnahmen und/oder Auszahlungen
+            für eine bestimmte Zeitspanne beschreibt.
           </para>
         </listitem>
 
         <listitem>
           <para><emphasis>Kassenbudget</emphasis> - Eine Budgetplanung für erwartete Bareinnahmen und
-            -auszahlungen. Diese Art von Budget verfolgt den Cashflow - woher Ihr Geld kommt,
-            wohin es geht, und natürlich, wie viel.
+            -auszahlungen. Diese Art von Budget verfolgt den Cashflow - woher Ihr Geld kommt, wohin
+            es geht, und natürlich, wie viel.
           </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Ausgabenbudget</emphasis> - Ein Budget, das hauptsächlich dazu dient, zu planen, wofür Sie
-            Ihr Geld ausgeben. Diese Art von Budget verfolgt Ihre Ausgaben. Es befasst sich normalerweise nicht 
-            mit Dingen wie Wertsteigerung oder Rückzahlung von Verbindlichkeiten. Es berücksichtigt jedoch die Zinsaufwendungen.
-            Wenn Sie z. B. Lebensmittel im Wert von 100 € mit Ihrer Kreditkarte kaufen, entstehen Ihnen Ausgaben 
-            für Lebensmittel im Wert von 100 € und eine Verbindlichkeit von 100 € gegenüber Ihrer Kreditkartengesellschaft.
-            Wenn Sie die Kreditkartenrechnung in Höhe von 110 € bezahlen, fallen zusätzliche Zinskosten in Höhe von 10 € an.
-            Ein Ausgabenbudget plant die Transaktion des Kaufs der Lebensmittel und die Zahlung der Zinsen, nicht aber 
+          <para><emphasis>Ausgabenbudget</emphasis> - Ein Budget, das hauptsächlich dazu dient, zu planen, wofür
+            Sie Ihr Geld ausgeben. Diese Art von Budget verfolgt Ihre Ausgaben. Es befasst sich
+            normalerweise nicht mit Dingen wie Wertsteigerung oder Rückzahlung von
+            Verbindlichkeiten. Es berücksichtigt jedoch die Zinsaufwendungen. Wenn Sie z. B.
+            Lebensmittel im Wert von 100 € mit Ihrer Kreditkarte kaufen, entstehen Ihnen Ausgaben
+            für Lebensmittel im Wert von 100 € und eine Verbindlichkeit von 100 € gegenüber
+            Ihrer Kreditkartengesellschaft. Wenn Sie die Kreditkartenrechnung in Höhe von 110 €
+            bezahlen, fallen zusätzliche Zinskosten in Höhe von 10 € an. Ein Ausgabenbudget
+            plant die Transaktion des Kaufs der Lebensmittel und die Zahlung der Zinsen, nicht aber
             die Rückzahlung an die Kreditkartenfirma.
           </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Kapitalbudget</emphasis> - Ein Budget, das einen Plan für die Finanzierung einer großen zukünftigen 
-            Ausgabe, oftmals durch eine Kombination aus Sparen und Kreditaufnahme, beschreibt. Hinweis: Kapitalbudgets
-            können manchmal ziemlich komplex werden, weil sie versuchen, die Frage "Können wir uns dies und das leisten?"
-            zu beantworten, indem verschiedene hypothetische Szenarien untersucht werden, die hypothetische Konten beinhalten
-            können.
+          <para><emphasis>Kapitalbudget</emphasis> - Ein Budget, das einen Plan für die Finanzierung einer großen
+            zukünftigen Ausgabe, oftmals durch eine Kombination aus Sparen und Kreditaufnahme,
+            beschreibt. Hinweis: Kapitalbudgets können manchmal ziemlich komplex werden, weil sie
+            versuchen, die Frage "Können wir uns dies und das leisten?" zu beantworten, indem
+            verschiedene hypothetische Szenarien untersucht werden, die hypothetische Konten
+            beinhalten können.
           </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Planungszeitraum</emphasis> - Die Zeitspanne, in der der Plan voraussichtlich realisiert wird.
-            Die gebräuchlichsten Planungszeiträume sind jährlich und monatlich. Unter Umständen können Sie das Budget
-            der Einfachheit halber oder, weil Sie eine detailliertere Planung benötigen, für mehrere aufeinanderfolgende
-            Perioden zugleich erstellen. Ein Jahresbudget kann z. B. 12 monatliche Budgetperioden umfassen.
+          <para><emphasis>Planungszeitraum</emphasis> - Die Zeitspanne, in der der Plan voraussichtlich realisiert
+            wird. Die gebräuchlichsten Planungszeiträume sind jährlich und monatlich. Unter
+            Umständen können Sie das Budget der Einfachheit halber oder, weil Sie eine
+            detailliertere Planung benötigen, für mehrere aufeinanderfolgende Perioden zugleich
+            erstellen. Ein Jahresbudget kann z. B. 12 monatliche Budgetperioden umfassen.
           </para>
         </listitem>
       </itemizedlist>
@@ -87,31 +93,34 @@
     <title>Ein Budget erstellen</title>
 
     <para>Noch bevor Sie beginnen, ein Budget zu erstellen, ist es wichtig, sich Gedanken über Ihre
-      Kontohierarchie zu machen. Wenn Sie z. B. einen bestimmten Betrag für Ihre Stromrechnung und einen
-      bestimmten Betrag für Ihre Wasserrechnung planen wollen, können Sie nicht nur ein
-      <emphasis>Ausgaben:Versorger</emphasis> Konto haben. Ihre Konten müssen mindestens so spezifisch sein
-      wie Ihr Budget.
+      Kontohierarchie zu machen. Wenn Sie z. B. einen bestimmten Betrag für Ihre Stromrechnung und
+      einen bestimmten Betrag für Ihre Wasserrechnung planen wollen, können Sie nicht nur ein
+      <emphasis>Ausgaben:Versorger</emphasis> Konto haben. Ihre Konten müssen mindestens so
+      spezifisch sein wie Ihr Budget.
     </para>
 
     <sect2 id="budget_creation2">
       <title>Auswählen, welche Konten geplant werden sollen</title>
 
-      <para>Der erste Schritt bei der Erstellung eines Budgets ist die Entscheidung, wofür Sie planen wollen. 
-        Diese Entscheidung wird beeinflussen, welche Konten Sie in Ihr Budget aufnehmen. Wenn Sie z. B. nur 
-        daran interessiert sind, Ihre Ausgaben verfolgen zu wollen, können Sie ein Ausgabenbudget erstellen,indem Sie
-        nur Beträge für Aufwandskonten eingeben. Wenn Sie andererseits Ihren gesamten Cashflow verfolgen wollen, können
-        Sie ein Cashflow-Budget erstellen, indem Sie Beträge für Aktiv-, Passiv-, Ertrags- und Aufwandskonten eingeben.
+      <para>Der erste Schritt bei der Erstellung eines Budgets ist die Entscheidung, wofür Sie planen wollen.
+        Diese Entscheidung wird beeinflussen, welche Konten Sie in Ihr Budget aufnehmen. Wenn Sie z.
+        B. nur daran interessiert sind, Ihre Ausgaben verfolgen zu wollen, können Sie ein
+        Ausgabenbudget erstellen,indem Sie nur Beträge für Aufwandskonten eingeben. Wenn Sie
+        andererseits Ihren gesamten Cashflow verfolgen wollen, können Sie ein Cashflow-Budget
+        erstellen, indem Sie Beträge für Aktiv-, Passiv-, Ertrags- und Aufwandskonten eingeben.
       </para>
 
-      <para>Bevor Sie beginnen, Ihr Budget zu erstellen, müssen Sie zwei Entscheidungen treffen: Für welche Konten möchte
-        ich budgetieren? Und: Für welchen Zeitraum soll mein Budget gelten? Sie können Ihre Meinung später immer noch ändern,
-        nachdem Sie ein Budget erstellt haben, aber Sie müssen mit etwas beginnen.
+      <para>Bevor Sie beginnen, Ihr Budget zu erstellen, müssen Sie zwei Entscheidungen treffen: Für welche
+        Konten möchte ich budgetieren? Und: Für welchen Zeitraum soll mein Budget gelten? Sie
+        können Ihre Meinung später immer noch ändern, nachdem Sie ein Budget erstellt haben, aber
+        Sie müssen mit etwas beginnen.
       </para>
 
       <tip>
-        <para>Als Faustregel gilt: Wenn Sie sich hauptsächlich darum kümmern, <emphasis>wofür</emphasis> Sie Ihr Geld ausgeben,
-          möchten Sie vielleicht eine Spesenabrechnung machen. Wenn Sie sich auch darum kümmern, dass Sie genug
-          Geld zur richtigen Zeit an der richtigen Stelle haben, sollten Sie ein Cashflow-Budget verwenden.
+        <para>Als Faustregel gilt: Wenn Sie sich hauptsächlich darum kümmern, <emphasis>wofür</emphasis> Sie
+          Ihr Geld ausgeben, möchten Sie vielleicht eine Spesenabrechnung machen. Wenn Sie sich
+          auch darum kümmern, dass Sie genug Geld zur richtigen Zeit an der richtigen Stelle haben,
+          sollten Sie ein Cashflow-Budget verwenden.
         </para>
       </tip>
     </sect2>
@@ -119,11 +128,13 @@
     <sect2>
       <title>Auswählen eines Planungszeitraums</title>
 
-      <para>Bevor Sie ein Budget erstellen, müssen Sie auch entscheiden, für welchen Zeitraum Sie planen wollen. Die
-        gängigsten Planungszeiträume sind monatlich und jährlich. Wenn Sie Ihr Budget Veränderungen der finanziellen
-        Verhältnisse im Laufe der Zeit berücksichtigen soll, sollten Sie mehrere Budgetperioden in Ihr Budget einbeziehen.
-        Wenn Sie z. B. höhere Betriebskosten im Winter als im Sommer einplanen wollen, dann könnten Sie Ihr Jahresbudget in
-        4 Quartale oder sogar 12 Monate aufteilen und höhere Wert für die Wintermonate als für die Sommermonate einplanen.
+      <para>Bevor Sie ein Budget erstellen, müssen Sie auch entscheiden, für welchen Zeitraum Sie planen
+        wollen. Die gängigsten Planungszeiträume sind monatlich und jährlich. Wenn Sie Ihr Budget
+        Veränderungen der finanziellen Verhältnisse im Laufe der Zeit berücksichtigen soll,
+        sollten Sie mehrere Budgetperioden in Ihr Budget einbeziehen. Wenn Sie z. B. höhere
+        Betriebskosten im Winter als im Sommer einplanen wollen, dann könnten Sie Ihr Jahresbudget
+        in 4 Quartale oder sogar 12 Monate aufteilen und höhere Wert für die Wintermonate als für
+        die Sommermonate einplanen.
       </para>
     </sect2>
 
@@ -135,15 +146,15 @@
           <guimenu>Aktionen</guimenu> <guisubmenu>Budget</guisubmenu><guimenuitem>Neues
           Budget</guimenuitem>
         </menuchoice>
-        . Sie sehen sofort ein neues Budget mit den Standardeinstellungen und ohne Einträge. Klicken Sie dann
-        auf die Schaltfläche <guibutton>Optionen</guibutton>. Die wichtigsten Optionen sind die Budget
-        Perioden und die Anzahl der Perioden. Wählen Sie für die Budgetperiode das Anfangsdatum und die
-        kleinste Zeitspanne, in der Sie planen möchten. Wählen Sie dann bei der Anzahl der Perioden aus,
-        für wie viele Perioden Sie planen wollen.
+        . Sie sehen sofort ein neues Budget mit den Standardeinstellungen und ohne Einträge.
+        Klicken Sie dann auf die Schaltfläche <guibutton>Optionen</guibutton>. Die wichtigsten
+        Optionen sind die Budget Perioden und die Anzahl der Perioden. Wählen Sie für die
+        Budgetperiode das Anfangsdatum und die kleinste Zeitspanne, in der Sie planen möchten.
+        Wählen Sie dann bei der Anzahl der Perioden aus, für wie viele Perioden Sie planen wollen.
       </para>
 
-      <para>Die Budgetseite zeigt jetzt eine Liste von Konten mit einer Spalte für jede Budgetperiode. Das Datum im
-        Titel jeder Spalte ist der Beginn der jeweiligen Budgetperiode.
+      <para>Die Budgetseite zeigt jetzt eine Liste von Konten mit einer Spalte für jede Budgetperiode. Das
+        Datum im Titel jeder Spalte ist der Beginn der jeweiligen Budgetperiode.
       </para>
     </sect2>
 
@@ -151,18 +162,19 @@
       <title>Eingeben von Budgetwerten</title>
 
       <para>Nun müssen Sie die Budgetwerte eingeben - die Beträge, die sich Ihrer Meinung nach während der
-        Budgetperiode ändern werden. Es gibt zwei Möglichkeiten, Budgetwerte einzugeben. Die erste Möglichkeit ist,
-        einfach auf die Zelle zu klicken und einen Betrag einzugeben.
+        Budgetperiode ändern werden. Es gibt zwei Möglichkeiten, Budgetwerte einzugeben. Die erste
+        Möglichkeit ist, einfach auf die Zelle zu klicken und einen Betrag einzugeben.
       </para>
 
-      <para>Wenn Sie zurückliegende Transaktionen in &app; aufgezeichnet haben, ist die zweite Möglichkeit, die Budgetwerte
-        von &app; schätzen zu lassen, indem es sich diese Transaktionen ansieht. Wählen Sie zunächst die Konten aus, für
-        die &app; eine Schätzung vornehmen soll. Klicken Sie dann auf die <guibutton>Abschätzen</guibutton> der
-        <emphasis>Symbolleiste</emphasis>. Wählen Sie im Dialog <guilabel>Budget abschätzen</guilabel> das Datum, ab dem
-        &app; nach zurückliegenden Transaktionen suchen soll. &app; beginnt an diesem Datum und sucht
-        für die Dauer Ihres Budgets vorwärts. Wenn Sie zum Beispiel ein Jahresbudget erstellen,
-        und Sie den 1. Januar 2005 auswählen, sucht &app; alle Transaktionen in diesem Konto vom 1.
-        1.1.2005 bis zum 31.12.2005.
+      <para>Wenn Sie zurückliegende Transaktionen in &app; aufgezeichnet haben, ist die zweite Möglichkeit,
+        die Budgetwerte von &app; schätzen zu lassen, indem es sich diese Transaktionen ansieht.
+        Wählen Sie zunächst die Konten aus, für die &app; eine Schätzung vornehmen soll. Klicken
+        Sie dann auf die <guibutton>Abschätzen</guibutton> der <emphasis>Symbolleiste</emphasis>.
+        Wählen Sie im Dialog <guilabel>Budget abschätzen</guilabel> das Datum, ab dem &app; nach
+        zurückliegenden Transaktionen suchen soll. &app; beginnt an diesem Datum und sucht für die
+        Dauer Ihres Budgets vorwärts. Wenn Sie zum Beispiel ein Jahresbudget erstellen, und Sie den
+        1. Januar 2005 auswählen, sucht &app; alle Transaktionen in diesem Konto vom 1. 1.1.2005
+        bis zum 31.12.2005.
       </para>
     </sect2>
   </sect1>
@@ -170,40 +182,45 @@
   <sect1 id="budget_reporting1">
     <title>Budget-Bericht</title>
 
-    <para>Sie haben den schwierigsten Teil bereits erledigt - die Erstellung Ihres Budgets. Aber jetzt wollen Sie
-      wissen, sich Ihre tatsächlichen Finanztransaktionen im Vergleich zu Ihrem Plan darstellen. Sie müssen den
-      Budgetbericht ausführen.
+    <para>Sie haben den schwierigsten Teil bereits erledigt - die Erstellung Ihres Budgets. Aber jetzt wollen
+      Sie wissen, sich Ihre tatsächlichen Finanztransaktionen im Vergleich zu Ihrem Plan
+      darstellen. Sie müssen den Budgetbericht ausführen.
     </para>
 
-    <para>Klicken Sie auf 
+    <para>Klicken Sie auf
       <menuchoice>
-        <guimenu>Berichte</guimenu><guisubmenu>Budget</guisubmenu> <guimenuitem>Budget-Bericht</guimenuitem>
+        <guimenu>Berichte</guimenu><guisubmenu>Budget</guisubmenu>
+        <guimenuitem>Budget-Bericht</guimenuitem>
       </menuchoice>
-      . Für jedes Konto zeigt der Budgetbericht die budgetierten und die tatsächlichen Beträge in zwei
-      nebeneinander liegenden Spalten für jede Periode des Budgets an. Wenn Sie mehrere Budgets erstellt haben,
-      können Sie in den Budgetberichtsoptionen auswählen, welches Budget im Bericht verwendet werden soll.
+      . Für jedes Konto zeigt der Budgetbericht die budgetierten und die tatsächlichen Beträge in
+      zwei nebeneinander liegenden Spalten für jede Periode des Budgets an. Wenn Sie mehrere
+      Budgets erstellt haben, können Sie in den Budgetberichtsoptionen auswählen, welches Budget
+      im Bericht verwendet werden soll.
     </para>
 
     <para>Zwei andere Arten von Budgetberichten werden häufig in kleinen Unternehmen verwendet. Sie sind die
-      <emphasis>Geplante Gewinn- und Verlustrechnung</emphasis> und die <emphasis>Geplante Bilanz</emphasis>.
+      <emphasis>Geplante Gewinn- und Verlustrechnung</emphasis> und die <emphasis>Geplante
+      Bilanz</emphasis>.
     </para>
 
     <sect2>
       <title>Geplante Gewinn- und Verlustrechnung</title>
 
-      <para>Die Plan-Gewinn- und Verlustrechnung ist ähnlich der Gewinn- und Verlustrechnung. Beide zeigen die Einnahmen
-        und Aufwendungen für eine bestimmte Periode sowie den Gewinn, der sich aus der Differenz von Ertrag - Ausgaben ergibt.
-        Die Gewinn- und Verlustrechnung basiert auf historischen Daten, aber die <emphasis>geplante</emphasis> Gewinn- und 
-        Verlustrechnung basiert auf den Vorhersagen, die im  Budget gemacht wurden.
+      <para>Die Plan-Gewinn- und Verlustrechnung ist ähnlich der Gewinn- und Verlustrechnung. Beide zeigen die
+        Einnahmen und Aufwendungen für eine bestimmte Periode sowie den Gewinn, der sich aus der
+        Differenz von Ertrag - Ausgaben ergibt. Die Gewinn- und Verlustrechnung basiert auf
+        historischen Daten, aber die <emphasis>geplante</emphasis> Gewinn- und Verlustrechnung
+        basiert auf den Vorhersagen, die im Budget gemacht wurden.
       </para>
     </sect2>
 
     <sect2>
       <title>Planbilanz</title>
 
-      <para>Die Planbilanz ist ähnlich der Bilanz. Beide zeigen die Aktiva, Passiva und das Eigenkapital. Der Unterschied
-        besteht darin, dass die Bilanz auf historischen Daten basiert, während die <emphasis>Budgetierte</emphasis> Bilanz auf 
-        den Prognosen basiert, die im Budget gemacht wurden.
+      <para>Die Planbilanz ist ähnlich der Bilanz. Beide zeigen die Aktiva, Passiva und das Eigenkapital. Der
+        Unterschied besteht darin, dass die Bilanz auf historischen Daten basiert, während die
+        <emphasis>Budgetierte</emphasis> Bilanz auf den Prognosen basiert, die im Budget gemacht
+        wurden.
       </para>
     </sect2>
   </sect1>
diff --git a/de/guide/ch_bus_features.xml b/de/guide/ch_bus_features.xml
index e34e1ccd..f799e01a 100644
--- a/de/guide/ch_bus_features.xml
+++ b/de/guide/ch_bus_features.xml
@@ -47,7 +47,8 @@
     <title>Einrichtung der geschäftlichen Buchhaltung</title>
 
     <para>Um &app; so einzurichten, Debitoren- und Kreditorenkonten für Unternehmen zu händeln, müssen
-      diese vorbereitenden Schritte durchgeführt werden.<itemizedlist>
+      diese vorbereitenden Schritte durchgeführt werden.
+      <itemizedlist>
         <listitem>
           <para>Erstellen Sie eine sachgemäße Kontenhierarchie.
           </para>
@@ -81,10 +82,12 @@
       <para>Es gibt viele verschiedene Möglichkeiten, eine Geschäftskontenhierarchie einzurichten. Sie können
         mit der Einrichtung der Geschäftskonten anfangen, die mit dem Neuen Kontenplan erstellen
         Assistenten zur Verfügung gestellt werden oder einen Kontenplan händisch erstellen. Um auf
-        die vorgefertigten Geschäftskontenpläne zuzugreifen, starten Sie &app; und klicken auf<menuchoice>
+        die vorgefertigten Geschäftskontenpläne zuzugreifen, starten Sie &app; und klicken auf
+        <menuchoice>
           <guimenu>Datei</guimenu><guimenuitem>Neue Datei </guimenuitem>
-        </menuchoice>und fahren fort, bis Sie eine Liste der verfügbaren Kontenpläne sehen. Dort wählen Sie den
-        gewünschten Kontenrahmen (z.B. SKR03 oder SKR04) aus.
+        </menuchoice>
+        und fahren fort, bis Sie eine Liste der verfügbaren Kontenpläne sehen. Dort wählen Sie
+        den gewünschten Kontenrahmen (z.B. SKR03 oder SKR04) aus.
       </para>
 
       <para>Die vorgefertigte Geschäftskontenhierarchie wird nicht exakt Ihren Bedürfnissen entsprechen. Sie
@@ -138,7 +141,8 @@
 
         <para>Buchungen, an denen die Konten Offene Forderungen oder Verbindlichkeiten beteiligt sind, sollten
           nicht in irgendeiner anderen Art und Weise hinzugefügt, geändert oder gelöscht werden
-          als unter Nutzung von:<itemizedlist>
+          als unter Nutzung von:
+          <itemizedlist>
             <listitem>
               <para>einbuchen/ausbuchen der Eingangs-/Ausgangsrechnung/Gutschrift oder
               </para>
@@ -171,20 +175,26 @@
       </para>
 
       <para>Die Standardsteuertabelle für neue Kunden oder neuen Lieferanten kann in dem Fenster
-        <emphasis>Buch-Optionen </emphasis> bestimmt werden, auf das Sie unter<menuchoice>
+        <emphasis>Buch-Optionen </emphasis> bestimmt werden, auf das Sie unter
+        <menuchoice>
           <guimenu>Datei</guimenu> <guisubmenu>Eigenschaften</guisubmenu> <guimenuitem>Reiter
           Geschäft</guimenuitem>
-        </menuchoice>zugreifen können.
+        </menuchoice>
+        zugreifen können.
       </para>
 
       <para>Steuertabellen werden durch Nutzung des Editors <emphasis>Steuertabellen</emphasis> genutzt, auf den
-        Sie im Menü unter<menuchoice>
+        Sie im Menü unter
+        <menuchoice>
           <guimenu>Geschäft</guimenu><guimenuitem>Steuertabellen </guimenuitem>
-        </menuchoice>zugreifen können.
+        </menuchoice>
+        zugreifen können.
       </para>
 
       <figure pgwide="1">
-        <title>Steuertabellen</title><screenshot id="bus-taxmain">
+        <title>Steuertabellen</title>
+
+        <screenshot id="bus-taxmain">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_tax_main.png"
@@ -204,7 +214,9 @@
       </figure>
 
       <figure pgwide="1">
-        <title>Neue Steuertabellen</title><screenshot id="bus-taxnew">
+        <title>Neue Steuertabellen</title>
+
+        <screenshot id="bus-taxnew">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_tax_new.png"
@@ -268,13 +280,17 @@
       <para>Nachdem Sie die Kontenstruktur erstellt und die Steuertabellen eingerichtet haben, registrieren Sie
         die &app; Datei als zum Unternehmen gehörig. Um Ihr Unternehmen zu registrieren, wählen
         Sie den Reiter <guilabel>Geschäft</guilabel> in dem Fenster
-        <guilabel>Buch-Optionen</guilabel>, auf das Sie unter<menuchoice>
+        <guilabel>Buch-Optionen</guilabel>, auf das Sie unter
+        <menuchoice>
           <guimenu>Datei</guimenu><guimenuitem>Eigenschaften</guimenuitem>
-        </menuchoice>zugreifen können.
+        </menuchoice>
+        zugreifen können.
       </para>
 
       <figure pgwide="1">
-        <title>Unternehmensregistrierung</title><screenshot id="bus-co-reg">
+        <title>Unternehmensregistrierung</title>
+
+        <screenshot id="bus-co-reg">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_co_reg.png"
@@ -319,11 +335,16 @@
     <sect2 id="bus_setup_pref">
       <title>Einstellungen für das Unternehmen</title>
 
-      <para>Stellen Sie die Optionen im Reiter Geschäft in den &app; Einstellungen ein, auf welche Sie unter<menuchoice>
+      <para>Stellen Sie die Optionen im Reiter Geschäft in den &app; Einstellungen ein, auf welche Sie unter
+        <menuchoice>
           <guimenu>Bearbeiten</guimenu><guimenuitem>Einstellungen</guimenuitem>
-        </menuchoice>(<menuchoice>
+        </menuchoice>
+        (
+        <menuchoice>
           <guimenu>GnuCash</guimenu><guimenuitem>Einstellungen</guimenuitem>
-        </menuchoice>unter &mac;).<!--
+        </menuchoice>
+        unter &mac;).
+<!--
         See Help manual chapter 10.3.3 Business Book Options Tab.
         -->
       </para>
@@ -345,7 +366,8 @@
 
         <para>Der Skonto für vorzeitige Zahlung ist nicht umgesetzt. Es gibt Wege, wie dies getan werden kann.
           wenn auch keine davon empfohlen wird und fragen Sie professionelle Berater um Rat, ob
-          diese Bestimmungen mit dem folgenden übereinstimmen:<itemizedlist>
+          diese Bestimmungen mit dem folgenden übereinstimmen:
+          <itemizedlist>
             <listitem>
               <para>Nach der Eingabe und der Buchung der Zahlung in voller Höhe wird die Buchung der Zahlung manuell
                 bearbeitet (gewöhnlich dringend abgeraten) und die Zahlung gesplittet, um den
@@ -370,13 +392,17 @@
         Lieferantenzahlungsbedingungen vorgegeben.
       </para>
 
-      <para>Zahlungsbedingungen werden im Editor für die Zahlungsbedingungen gepflegt, auf den Sie unter<menuchoice>
+      <para>Zahlungsbedingungen werden im Editor für die Zahlungsbedingungen gepflegt, auf den Sie unter
+        <menuchoice>
           <guimenu>Geschäft</guimenu> <guimenuitem>Zahlungsbedingungen…</guimenuitem>
-        </menuchoice>zugreifen können.
+        </menuchoice>
+        zugreifen können.
       </para>
 
       <figure pgwide="1">
-        <title>Zahlungsbedingungen-Editor</title><screenshot id="bus-termsmain">
+        <title>Zahlungsbedingungen-Editor</title>
+
+        <screenshot id="bus-termsmain">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_terms_main.png"
@@ -396,7 +422,9 @@
       </figure>
 
       <figure pgwide="1">
-        <title>Neue Zahlungsbedingungen</title><screenshot id="bus-termsnew">
+        <title>Neue Zahlungsbedingungen</title>
+
+        <screenshot id="bus-termsnew">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_terms_new.png"
@@ -511,9 +539,11 @@
       <para>&app; hat eine integrierte Debitorenbuchhaltung. Die von der Debitorenbuchhaltung generierten
         Geschäftsvorfälle werden innerhalb der Forderungskonten aufgezeichnet. Normalerweise
         werden Sie nicht direkt mit diesen Konten arbeiten. Sie werden normalerweise mit den vier
-        integrierten &app; Debitorenanwendungen arbeiten, die im Menü unter<menuchoice>
+        integrierten &app; Debitorenanwendungen arbeiten, die im Menü unter
+        <menuchoice>
           <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu>
-        </menuchoice>zu finden sind. Diese vier Komponenten sind:
+        </menuchoice>
+        zu finden sind. Diese vier Komponenten sind:
       </para>
 
       <itemizedlist>
@@ -564,11 +594,13 @@
       <sect3 id="bus-ar-custnew2">
         <title>Neuer Kunde</title>
 
-        <para>Um einen neuen Kunden einzutragen, öffnen Sie das Menü<menuchoice>
+        <para>Um einen neuen Kunden einzutragen, öffnen Sie das Menü
+          <menuchoice>
             <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu><guimenuitem>Neuer
             Kunde…</guimenuitem>
-          </menuchoice>. Geben Sie die Kundeninformationen ein, wie Name des Unternehmens, Adresse, Telefon-, Faxnummer
-          etc.
+          </menuchoice>
+          . Geben Sie die Kundeninformationen ein, wie Name des Unternehmens, Adresse, Telefon-,
+          Faxnummer etc.
         </para>
 
         <screenshot id="bus-ar-custnew">
@@ -593,10 +625,12 @@
       <sect3 id="bus-ar-custfind2">
         <title>Suchen und Bearbeiten</title>
 
-        <para>Um einen existierenden Kunden zu suchen, nutzen Sie das Fenster<menuchoice>
+        <para>Um einen existierenden Kunden zu suchen, nutzen Sie das Fenster
+          <menuchoice>
             <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
+          </menuchoice>
+          . Sie wählen einen Kunden aus den Ergebnissen der Suche aus mit der Schaltfläche
           <guilabel>anzeigen/bearbeiten</guilabel>. Dieses Fenster wird auch genutzt, um Kunden zur
           Erstellung von Ausgangsrechnungen und zur Verarbeitung von Zahlungen nachzuschlagen.
         </para>
@@ -670,10 +704,12 @@
         <title>Neue Ausgangsrechnung</title>
 
         <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>
+          erstellen. Um eine Rechnung zu erstellen, nutzen Sie
+          <menuchoice>
             <guimenu>Geschäft</guimenu><guisubmenu>Kunde</guisubmenu><guimenuitem>Neue
             Rechnung…</guimenuitem>
-          </menuchoice>. Das Fenster Neue Rechnung muss entsprechend ausgefüllt werden.
+          </menuchoice>
+          . Das Fenster Neue Rechnung muss entsprechend ausgefüllt werden.
         </para>
 
         <screenshot id="bus-ar-invoicenew">
@@ -762,11 +798,13 @@
       <sect3 id="bus-ar-invoicefind2">
         <title>Suchen</title>
 
-        <para>Um eine existierende Rechnung zu finden, nutzen Sie den Menüeintrag<menuchoice>
+        <para>Um eine existierende Rechnung zu finden, nutzen Sie den Menüeintrag
+          <menuchoice>
             <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 zu
-          bearbeiten.
+          </menuchoice>
+          . In den Suchergebnissen können Sie eine Rechnung auswählen, um diese zu betrachten oder
+          zu bearbeiten.
         </para>
 
         <note>
@@ -802,9 +840,11 @@
         <title>Drucken</title>
 
         <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>
+          Rechnung zu drucken, Nutzen Sie den Menüeintrag
+          <menuchoice>
             <guimenu>Datei</guimenu><guimenuitem>Rechnung drucken</guimenuitem>
-          </menuchoice>.
+          </menuchoice>
+          .
         </para>
 
         <screenshot id="bus-ar-invoiceprint">
@@ -832,19 +872,23 @@
           </para>
         </note>
 
-        <para>Rechnungen können auch vom Hauptfenster aus ausgedruckt werden, indem dort aus dem Hauptmenü<menuchoice>
+        <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
             Rechnung…</guimenuitem>
-          </menuchoice>Hauptmenü ausgewählt wird. Das sich ergebende Berichtsfenster stellt fest, dass keine gültige
-          Rechnung ausgewählt wurde. Um die Rechnung zum Drucken auszuwählen:
+          </menuchoice>
+          Hauptmenü ausgewählt wird. Das sich ergebende Berichtsfenster stellt fest, dass keine
+          gültige Rechnung ausgewählt wurde. Um die Rechnung zum Drucken auszuwählen:
         </para>
 
         <orderedlist>
           <listitem>
             <para>Nutzen Sie die Schaltfläche <guibutton>Optionen</guibutton> in der
-              <emphasis>Werkzeugleiste</emphasis> oder wählen Sie in der Menüleiste<menuchoice>
+              <emphasis>Werkzeugleiste</emphasis> oder wählen Sie in der Menüleiste
+              <menuchoice>
                 <guimenu>Bearbeiten</guimenu><guimenuitem>Berichtsoptionen </guimenuitem>
-              </menuchoice>aus.
+              </menuchoice>
+              aus.
             </para>
           </listitem>
 
@@ -880,9 +924,11 @@
           Nummern.
         </para>
 
-        <para>Sie können die erste Rechnungsnummer ändern, wenn dies für Sie wichtig ist. Nutzen Sie<menuchoice>
+        <para>Sie können die erste Rechnungsnummer ändern, wenn dies für Sie wichtig ist. Nutzen Sie
+          <menuchoice>
             <guimenu>Datei</guimenu><guimenuitem>Eigenschaften </guimenuitem>
-          </menuchoice>, greifen Sie auf den Reiter <guilabel>Zähler </guilabel> zu, ändern Sie den Wert der
+          </menuchoice>
+          , greifen Sie auf den Reiter <guilabel>Zähler </guilabel> zu, ändern Sie den Wert der
           <guilabel>Rechnungsnummer</guilabel> dergestalt, dass sie um eins kleiner ist als Ihre
           erwartete erste Rechnungsnummer, und klicken Sie die Schaltfläche
           <guibutton>OK</guibutton> oder die Schaltfläche <guibutton>Anwenden</guibutton>.
@@ -918,28 +964,35 @@
         </mediaobject>
       </screenshot>
 
-      <para>Um Kundenauftrag zu nutzen, müssen Sie diese erstellen, in dem Sie den Menüeintrag<menuchoice>
+      <para>Um Kundenauftrag zu nutzen, müssen Sie diese erstellen, in dem Sie den Menüeintrag
+        <menuchoice>
           <guimenu>Geschäft</guimenu><guisubmenu>Kunden </guisubmenu><guimenuitem>Neuer
           Auftrag…</guimenuitem>
-        </menuchoice>nutzen. Sie werden das Fenster <guilabel>Neuer Auftrag</guilabel> sehen.
+        </menuchoice>
+        nutzen. Sie werden das Fenster <guilabel>Neuer Auftrag</guilabel> sehen.
       </para>
 
-      <para>Um eine vorhandene Kundenauftrag zu bearbeiten, nutzen Sie den Menüeintrag<menuchoice>
+      <para>Um eine vorhandene Kundenauftrag zu bearbeiten, nutzen Sie den Menüeintrag
+        <menuchoice>
           <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 Schaltfläche
-        <guilabel>Auftrag ansehen/bearbeiten</guilabel>.
+        </menuchoice>
+        . Wählen Sie den erwünschten Auftrag in den Suchergebnissen und klicken Sie auf die
+        Schaltfläche <guilabel>Auftrag ansehen/bearbeiten</guilabel>.
       </para>
 
       <para>Zum Auswählen der Rechnungen und Gutschriften, die mit einer Auftrag verbunden sind, nutzen Sie den
-        Menüeintrag<menuchoice>
+        Menüeintrag
+        <menuchoice>
           <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu><guimenuitem>Auftrag
           suchen… </guimenuitem>
-        </menuchoice>. Wählen Sie die gewünschte Auftrag in den Suchergebnissen und klicken Sie die Schaltfläche
-        <guilabel>Rechnungsansicht</guilabel>. Ein Fenster mit einer Liste von Rechnungen und
-        Gutschriften, die mit diesem Auftrag verbunden sind, erscheint. Wählen Sie eine Rechnung
-        oder Gutschrift aus und klicken Sie die Schaltfläche <guilabel>Rechnungsansicht</guilabel>,
-        um das Rechnungsbearbeitungsfenster im Hauptanwendungsfenster zu öffnen.
+        </menuchoice>
+        . Wählen Sie die gewünschte Auftrag in den Suchergebnissen und klicken Sie die
+        Schaltfläche <guilabel>Rechnungsansicht</guilabel>. Ein Fenster mit einer Liste von
+        Rechnungen und Gutschriften, die mit diesem Auftrag verbunden sind, erscheint. Wählen Sie
+        eine Rechnung oder Gutschrift aus und klicken Sie die Schaltfläche
+        <guilabel>Rechnungsansicht</guilabel>, um das Rechnungsbearbeitungsfenster im
+        Hauptanwendungsfenster zu öffnen.
       </para>
     </sect2>
 
@@ -947,10 +1000,12 @@
       <title>Zahlung verarbeiten</title>
 
       <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>
+        Zahlungen aufzuzeichnen, nutzen Sie die Anwendung Zahlung verarbeiten, zu finden unter
+        <menuchoice>
           <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu><guimenuitem>Zahlung
           verarbeiten… </guimenuitem>
-        </menuchoice>.
+        </menuchoice>
+        .
       </para>
 
       <screenshot id="bus-ar-payment">
@@ -982,18 +1037,23 @@
         einiges machen, um das Erscheinungsbild der Rechnung zu ändern.
       </para>
 
-      <para>Nutzen Sie<menuchoice>
+      <para>Nutzen Sie
+        <menuchoice>
           <guimenu>Datei</guimenu><guimenuitem> Eigenschaften</guimenuitem>
-        </menuchoice>, um Ihre Firmenangaben im Register <guilabel>Geschäft</guilabel> des Fensters
+        </menuchoice>
+        , um Ihre Firmenangaben im Register <guilabel>Geschäft</guilabel> des Fensters
         <guilabel>Buch-Optionen</guilabel> einzugeben. Einige der eingegebenen Informationen werden
         auf der rechten Seite der Rechnungen gedruckt.
       </para>
 
       <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>
+        ändern Sie die Rechnungsstilvorlagen. Um dies zu tun, gehen Sie zu
+        <menuchoice>
           <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:
+        </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:
       </para>
 
       <screenshot id="bus-ar-invoicechange1">
@@ -1116,9 +1176,11 @@
         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ü<menuchoice>
+        sind im Untermenü
+        <menuchoice>
           <guimenu>Geschäft</guimenu><guisubmenu>Kunden</guisubmenu>
-        </menuchoice>erreichbar. Diese Passiva-Anwendungsbestandteile sind:
+        </menuchoice>
+        erreichbar. Diese Passiva-Anwendungsbestandteile sind:
       </para>
 
       <itemizedlist>
@@ -1171,11 +1233,13 @@
       <sect3 id="bus-ap-vendornew2">
         <title>Neuer Lieferant</title>
 
-        <para>Um einen neuen Lieferanten zu registrieren, wählen Sie den Menüeintrag<menuchoice>
+        <para>Um einen neuen Lieferanten zu registrieren, wählen Sie den Menüeintrag
+          <menuchoice>
             <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Neuer
             Lieferant…</guimenuitem>
-          </menuchoice>. Geben Sie die allgemeinen Informationen über den Lieferanten, wie Firmenname, Adresse, Telefon-
-          und Faxnummer etc. ein. Unten finden Sie eine Liste weiterer Optionen:
+          </menuchoice>
+          . Geben Sie die allgemeinen Informationen über den Lieferanten, wie Firmenname, Adresse,
+          Telefon- und Faxnummer etc. ein. Unten finden Sie eine Liste weiterer Optionen:
         </para>
 
         <para>So sieht das Registrierungsfenster für einen neuen Lieferanten aus:
@@ -1203,12 +1267,14 @@
       <sect3 id="bus-ap-vendorfind2">
         <title>Lieferant suchen</title>
 
-        <para>Um einen existierenden Lieferanten zu suchen, nutzen Sie das Fenster<menuchoice>
+        <para>Um einen existierenden Lieferanten zu suchen, nutzen Sie das Fenster
+          <menuchoice>
             <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Lieferanten
             suchen…</guimenuitem>
-          </menuchoice>. Sie wählen einen Lieferanten mit <guibutton>Lieferant anzeigen/bearbeiten</guibutton> aus den
-          Suchergebnissen aus. Dieses Fenster wird auch benutzt, um einen Lieferanten zu suchen,
-          wenn Rechnungen eingehen und Zahlungen geleistet werden.
+          </menuchoice>
+          . Sie wählen einen Lieferanten mit <guibutton>Lieferant anzeigen/bearbeiten</guibutton>
+          aus den Suchergebnissen aus. Dieses Fenster wird auch benutzt, um einen Lieferanten zu
+          suchen, wenn Rechnungen eingehen und Zahlungen geleistet werden.
         </para>
 
         <screenshot id="bus-ar-vendorfind">
@@ -1280,10 +1346,12 @@
 
         <para>Wenn Sie eine Rechnung von einem Lieferanten erhalten und diese in &app; eingeben wollen, müssen
           Sie eine neue Rechnung erstellen. Um eine neue Rechnung zu erstellen, nutzen Sie den
-          Menüeintrag<menuchoice>
+          Menüeintrag
+          <menuchoice>
             <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Neue
             Rechnung</guimenuitem>
-          </menuchoice>, und füllen das erscheinende Fenster entsprechend aus.
+          </menuchoice>
+          , und füllen das erscheinende Fenster entsprechend aus.
         </para>
 
         <screenshot id="bus-ap-billnew">
@@ -1374,10 +1442,13 @@
       <sect3 id="bus-ap-billfind2">
         <title>Suchen</title>
 
-        <para>Um eine vorhandene Rechnung zu suchen, nutzen Sie den Menüeintrag<menuchoice>
+        <para>Um eine vorhandene Rechnung zu suchen, nutzen Sie den Menüeintrag
+          <menuchoice>
             <guimenu>Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu>
             <guimenuitem>Lieferantenrechnung suchen…</guimenuitem>
-          </menuchoice>. Von den Suchergebnissen können Sie eine Rechnung zur Bearbeitung oder zur Ansicht auswählen.
+          </menuchoice>
+          . Von den Suchergebnissen können Sie eine Rechnung zur Bearbeitung oder zur Ansicht
+          auswählen.
         </para>
 
         <note>
@@ -1404,10 +1475,12 @@
         und alle Rechnungen und Gutschriften für einen einzelnen Auftrag anschauen wollen.
       </para>
 
-      <para>Um Aufträge zu nutzen, müssen Sie diese unter<menuchoice>
+      <para>Um Aufträge zu nutzen, müssen Sie diese unter
+        <menuchoice>
           <guimenu> Geschäft</guimenu><guisubmenu>Lieferant</guisubmenu><guimenuitem>Neuer Auftrag
           </guimenuitem>
-        </menuchoice>erstellen. Sie werden nun das Fenster <guilabel>Neuer Auftrag</guilabel> sehen.
+        </menuchoice>
+        erstellen. Sie werden nun das Fenster <guilabel>Neuer Auftrag</guilabel> sehen.
       </para>
 
       <screenshot id="bus-ap-jobnew">
@@ -1428,32 +1501,38 @@
         </mediaobject>
       </screenshot>
 
-      <para>Um einen vorhandenen Lieferantenauftrag zu bearbeiten, nutzen Sie den Menüeintrag<menuchoice>
+      <para>Um einen vorhandenen Lieferantenauftrag zu bearbeiten, nutzen Sie den Menüeintrag
+        <menuchoice>
           <guimenu>Geschäft</guimenu><guisubmenu> Lieferant</guisubmenu><guimenuitem>Aufträge
           suchen</guimenuitem>
-        </menuchoice>. Wählen Sie den gewünschten Auftrag in den Suchergebnissen und klicken Sie die Schaltfläche
-        <guilabel>Auftrag anzeigen/bearbeiten</guilabel>.
+        </menuchoice>
+        . Wählen Sie den gewünschten Auftrag in den Suchergebnissen und klicken Sie die
+        Schaltfläche <guilabel>Auftrag anzeigen/bearbeiten</guilabel>.
       </para>
 
       <para>Um eine Auswahl unter den Rechnungen, die mit einem gegebenen Auftrag verbunden sind, zu treffen,
-        nutzen Sie den Menüeintrag<menuchoice>
+        nutzen Sie den Menüeintrag
+        <menuchoice>
           <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 Schaltfläche
-        <guilabel>Rechnungen anzeigen</guilabel>. Ein Fenster erscheint, das die Rechnungen und
-        Gutschriften, die mit diesem Auftrag verbunden sind, auflistet. Wählen Sie eine Rechnung
-        oder Gutschrift und klicken Sie die Schaltfläche <guilabel>Rechnung anzeigen</guilabel>, um
-        den Rechnungseditor im Hauptanwendungsfenster zu öffnen.
+        </menuchoice>
+        . Wählen Sie den gewünschten Auftrag in den Suchergebnissen und klicken Sie die
+        Schaltfläche <guilabel>Rechnungen anzeigen</guilabel>. Ein Fenster erscheint, das die
+        Rechnungen und Gutschriften, die mit diesem Auftrag verbunden sind, auflistet. Wählen Sie
+        eine Rechnung oder Gutschrift und klicken Sie die Schaltfläche <guilabel>Rechnung
+        anzeigen</guilabel>, um den Rechnungseditor im Hauptanwendungsfenster zu öffnen.
       </para>
     </sect2>
 
     <sect2 id="bus-ap-payment1">
       <title>Zahlung verarbeiten</title>
 
-      <para>Irgendwann müssen Sie Ihre Rechnungen auch bezahlen. Dazu nutzen Sie die Zahlungsanwendung unter<menuchoice>
+      <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
           verarbeiten…</guimenuitem>
-        </menuchoice>.
+        </menuchoice>
+        .
       </para>
 
       <para>Darunter ist das Fenster &app; Zahlungen verarbeiten.
@@ -2069,4 +2148,4 @@
     </sect2>
 -->
   </sect1>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/de/guide/ch_cbook.xml b/de/guide/ch_cbook.xml
index 2cb1addc..dc883c7c 100644
--- a/de/guide/ch_cbook.xml
+++ b/de/guide/ch_cbook.xml
@@ -129,8 +129,8 @@
   <sect1 id="cbook-withdrawals1">
     <title>Ausgaben eingeben</title>
 
-    <para>Wenn Sie Geld von Ihrem Girokonto abheben, egal aus welchem Grunde, übertragen Sie Geld von
-      Ihrem Bankkonto an einen anderen Ort. In &app; ist dieser andere Ort auch ein Konto. Je mehr
+    <para>Wenn Sie Geld von Ihrem Girokonto abheben, egal aus welchem Grunde, übertragen Sie Geld von Ihrem
+      Bankkonto an einen anderen Ort. In &app; ist dieser andere Ort auch ein Konto. Je mehr
       detaillierte Konten Sie anlegen und für Ihre Ausgaben nutzen, desto mehr Informationen werden
       Sie erhalten, wo Ihr Geld hingeht.
     </para>
@@ -209,8 +209,8 @@
     <sect2 id="cbook-puttoget-open2">
       <title>Anfangsbestände</title>
 
-      <para>Lassen Sie uns mit der Datei starten, die Sie im letzten Kapitel
-        (<filename>test.gnucash</filename>) gespeichert haben. Ihr Kontenblatt sollte so aussehen:
+      <para>Lassen Sie uns mit der Datei starten, die Sie im letzten Kapitel (<filename>test.gnucash</filename>)
+        gespeichert haben. Ihr Kontenblatt sollte so aussehen:
       </para>
 
       <screenshot id="cbook-gcashdata4">
@@ -359,8 +359,8 @@
             <menuchoice>
               <guimenu>Aktionen</guimenu> <guimenuitem>Abgleichen</guimenuitem>
             </menuchoice>
-            und tragen Sie als Schlusssaldo 1.451,79 € ein. Klicken Sie <guibutton>OK</guibutton>, um
-            mit dem Abgleichen des Kontos zu beginnen. Prüfen Sie die Einträge wie sie auf dem
+            und tragen Sie als Schlusssaldo 1.451,79 € ein. Klicken Sie <guibutton>OK</guibutton>,
+            um mit dem Abgleichen des Kontos zu beginnen. Prüfen Sie die Einträge wie sie auf dem
             Kontenauszugsmuster erscheinen. Wenn Sie all Ihre Einträge geprüft haben, sollte das
             Abgleichfenster so aussehen:
           </para>
diff --git a/de/guide/ch_currency.xml b/de/guide/ch_currency.xml
index 5aa68095..f589899e 100644
--- a/de/guide/ch_currency.xml
+++ b/de/guide/ch_currency.xml
@@ -156,12 +156,12 @@
     <sect2 id="currency_acct_user2">
       <title>Benutzerdefinierte Währungen</title>
 
-      <para>Wenn wir über Währungen reden, meinen wir normalerweise staatlich gesicherte Währungen —oder noch
-        genauer, gemäß internationalem Standard
-        <ulink url="&url-wp-de;ISO_4217">ISO 4217</ulink> definierte
-        Währungen. &app; erlaubt es Ihnen nicht, eigene Währungen zu schaffen. Wenn Sie
-        nicht-<acronym>ISO</acronym>-Währungen beobachten wollen, können Sie einen von zwei
-        Workarounds nutzen, abhängig davon, welcher Ihre Bedürfnisse besser erfüllt.
+      <para>Wenn wir über Währungen reden, meinen wir normalerweise staatlich gesicherte Währungen —oder
+        noch genauer, gemäß internationalem Standard <ulink url="&url-wp-de;ISO_4217">ISO
+        4217</ulink> definierte Währungen. &app; erlaubt es Ihnen nicht, eigene Währungen zu
+        schaffen. Wenn Sie nicht-<acronym>ISO</acronym>-Währungen beobachten wollen, können Sie
+        einen von zwei Workarounds nutzen, abhängig davon, welcher Ihre Bedürfnisse besser
+        erfüllt.
       </para>
 
       <para>Nehmen wir an, dass Sie beispielsweise Bonusmeilen aufzeichnen wollen, die zählen, wie viele
diff --git a/de/guide/ch_dep.xml b/de/guide/ch_dep.xml
index 75e2392b..951f0f9f 100644
--- a/de/guide/ch_dep.xml
+++ b/de/guide/ch_dep.xml
@@ -15,26 +15,30 @@
 <chapter id="chapter_dep">
   <title>Abschreibung</title>
 
-  <para>In diesem Kapitel wird das Konzept der Abschreibung in der Buchhaltung vorgestellt und es werden einige Beispiele aus der Praxis gegeben.
+  <para>In diesem Kapitel wird das Konzept der Abschreibung in der Buchhaltung vorgestellt und es werden
+    einige Beispiele aus der Praxis gegeben.
   </para>
 
   <sect1 id="dep_concepts1">
     <title>Grundkonzepte</title>
 
-    <para>Die Abschreibung ist die Buchhaltungsmethode, mit der Anschaffungen im Laufe der Zeit als Aufwand verbucht werden. Es gibt zwei
-      Gründe, warum Sie die Abschreibung aufzeichnen möchten: Sie führen die Buchhaltung für Ihre eigenen Finanzen und möchten Ihr
-      Nettovermögen im Auge behalten, oder Sie führen die Buchhaltung für ein kleines Unternehmen und müssen einen Finanzbericht erstellen,
-      auf dessen Grundlage Sie die Steuererklärung erstellen.
+    <para>Die Abschreibung ist die Buchhaltungsmethode, mit der Anschaffungen im Laufe der Zeit als Aufwand
+      verbucht werden. Es gibt zwei Gründe, warum Sie die Abschreibung aufzeichnen möchten: Sie
+      führen die Buchhaltung für Ihre eigenen Finanzen und möchten Ihr Nettovermögen im Auge
+      behalten, oder Sie führen die Buchhaltung für ein kleines Unternehmen und müssen einen
+      Finanzbericht erstellen, auf dessen Grundlage Sie die Steuererklärung erstellen.
     </para>
 
-    <para>Die Methode zur Erfassung der Abschreibung ist in beiden Fällen die gleiche, aber das Ergebnis ist unterschiedlich. In diesem
-      Abschnitt werden die Unterschiede zwischen den beiden diskutiert. Aber zuerst einige Begriffe.
+    <para>Die Methode zur Erfassung der Abschreibung ist in beiden Fällen die gleiche, aber das Ergebnis ist
+      unterschiedlich. In diesem Abschnitt werden die Unterschiede zwischen den beiden diskutiert.
+      Aber zuerst einige Begriffe.
     </para>
 
     <itemizedlist>
       <listitem>
-        <para><emphasis>Kumulierte Abschreibungen</emphasis> - die kumulierte Summe der handelsrechtlichen Abschreibungen, die
-          über die Lebensdauer der Anlage ermittelt wird. Diese wird auf dem Abschreibungskonto im Anlagenteil kumuliert.
+        <para><emphasis>Kumulierte Abschreibungen</emphasis> - die kumulierte Summe der handelsrechtlichen
+          Abschreibungen, die über die Lebensdauer der Anlage ermittelt wird. Diese wird auf dem
+          Abschreibungskonto im Anlagenteil kumuliert.
         </para>
       </listitem>
 
@@ -45,33 +49,34 @@
       </listitem>
 
       <listitem>
-        <para><emphasis>Fairer Marktwert</emphasis> - der Betrag, für den ein Vermögenswert zu einem bestimmten Zeitpunkt verkauft
-          werden könnte.
+        <para><emphasis>Fairer Marktwert</emphasis> - der Betrag, für den ein Vermögenswert zu einem bestimmten
+          Zeitpunkt verkauft werden könnte.
         </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Nettobuchwert</emphasis> - dies ist die Differenz zwischen den ursprünglichen Anschaffungskosten und den
-          bisher vorgenommenen Abschreibungen.
+        <para><emphasis>Nettobuchwert</emphasis> - dies ist die Differenz zwischen den ursprünglichen
+          Anschaffungskosten und den bisher vorgenommenen Abschreibungen.
         </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Ausgangskosten</emphasis> - dies ist der Betrag, den Sie für die Anschaffung der Anlage bezahlt haben.
-          Dazu gehören auch alle Kosten, um das Wirtschaftsgut in einen Zustand zu versetzen, in dem Sie es nutzen können, z. B.
-          Versand, Installationskosten, spezielle Schulung.
+        <para><emphasis>Ausgangskosten</emphasis> - dies ist der Betrag, den Sie für die Anschaffung der Anlage
+          bezahlt haben. Dazu gehören auch alle Kosten, um das Wirtschaftsgut in einen Zustand zu
+          versetzen, in dem Sie es nutzen können, z. B. Versand, Installationskosten, spezielle
+          Schulung.
         </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Restwert</emphasis> - dies ist der Wert, für den das Wirtschaftsgut nach Ihrer Einschätzung am Ende
-          der (für Sie relevanten) Nutzungsdauer verkauft werden kann.
+        <para><emphasis>Restwert</emphasis> - dies ist der Wert, für den das Wirtschaftsgut nach Ihrer
+          Einschätzung am Ende der (für Sie relevanten) Nutzungsdauer verkauft werden kann.
         </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Steuerliche Abschreibung</emphasis> - dies ist der Betrag der Abschreibung, den Sie für Einkommensteuerzwecke
-          vornehmen.
+        <para><emphasis>Steuerliche Abschreibung</emphasis> - dies ist der Betrag der Abschreibung, den Sie für
+          Einkommensteuerzwecke vornehmen.
         </para>
       </listitem>
     </itemizedlist>
@@ -79,65 +84,75 @@
     <sect2 id="dep_concepts_personal2">
       <title>Persönliche Finanzen</title>
 
-      <para>Die Abschreibung wird in den persönlichen Finanzen verwendet, um den Wert eines Vermögenswerts periodisch zu
-        senken, damit Sie eine genaue Schätzung Ihres aktuellen Nettovermögens erhalten. Wenn Sie zum Beispiel ein Auto besitzen,
-        können Sie den aktuellen Wert des Autos verfolgen, indem Sie jedes Jahr die Abschreibung aufzeichnen. Um dies zu erreichen,
-        erfassen Sie den ursprünglichen Kauf als Vermögenswert und verbuchen dann jedes Jahr einen Abschreibungsaufwand
-        (siehe <xref linkend="dep_example1" /> für ein Beispiel). Dies würde dazu führen, dass der Nettobuchwert
-        ungefähr dem Marktwert der Anlage am Ende des Jahres entspricht.
+      <para>Die Abschreibung wird in den persönlichen Finanzen verwendet, um den Wert eines Vermögenswerts
+        periodisch zu senken, damit Sie eine genaue Schätzung Ihres aktuellen Nettovermögens
+        erhalten. Wenn Sie zum Beispiel ein Auto besitzen, können Sie den aktuellen Wert des Autos
+        verfolgen, indem Sie jedes Jahr die Abschreibung aufzeichnen. Um dies zu erreichen, erfassen
+        Sie den ursprünglichen Kauf als Vermögenswert und verbuchen dann jedes Jahr einen
+        Abschreibungsaufwand (siehe <xref linkend="dep_example1" /> für ein Beispiel). Dies würde
+        dazu führen, dass der Nettobuchwert ungefähr dem Marktwert der Anlage am Ende des Jahres
+        entspricht.
       </para>
 
-      <para>Die Abschreibung für die persönlichen Finanzen hat keine steuerlichen Auswirkungen. Sie wird einfach dazu verwendet,
-        Ihr Nettovermögen zu schätzen. Aus diesem Grund gibt es keine Regeln dafür, wie Sie die Abschreibung schätzen, schätzen Sie
-        nach bestem Wissen.
+      <para>Die Abschreibung für die persönlichen Finanzen hat keine steuerlichen Auswirkungen. Sie wird
+        einfach dazu verwendet, Ihr Nettovermögen zu schätzen. Aus diesem Grund gibt es keine
+        Regeln dafür, wie Sie die Abschreibung schätzen, schätzen Sie nach bestem Wissen.
       </para>
 
-      <para>Für welche Vermögenswerte sollten Sie die Abschreibung veranschlagen? Da die Idee der Abschreibung für persönliche
-        Finanzen eine Schätzung Ihres persönlichen Nettowertes geben soll, müssen Sie nur die Abschreibung von Vermögenswerten
-        mit erheblichen Wert, die Sie potenziell verkaufen könnten, wie z. B. ein Auto oder Boot, verfolgen.
+      <para>Für welche Vermögenswerte sollten Sie die Abschreibung veranschlagen? Da die Idee der Abschreibung
+        für persönliche Finanzen eine Schätzung Ihres persönlichen Nettowertes geben soll,
+        müssen Sie nur die Abschreibung von Vermögenswerten mit erheblichen Wert, die Sie
+        potenziell verkaufen könnten, wie z. B. ein Auto oder Boot, verfolgen.
       </para>
     </sect2>
 
     <sect2 id="dep_concepts_business2">
       <title>Geschäftliche Finanzen</title>
 
-      <para>Im Gegensatz zu den persönlichen Finanzen, bei denen das Ziel die Verfolgung des persönlichen Wertes ist, geht es
-        in der Wirtschaft darum, die Kosten für die Anschaffung von Kapitalanlagen mit den durch sie generierten Einnahmen
-        in Einklang zu bringen. Diese wird durch Buchabschreibungen erreicht. Unternehmen müssen sich auch mit den lokalen
-        Steuergesetzen zur Abschreibung von Vermögenswerten auseinandersetzen. Dies wird als steuerliche Abschreibung bezeichnet.
-        Es steht dem Unternehmen frei, die Methode für die handelsrechtliche Abschreibung zu wählen, aber die Methode für die
-        steuerliche Abschreibung ist festgelegt. Dies führt häufig zu Differenzen zwischen der handelsrechtlichen und der
-        steuerlichen Abschreibung, es können aber Maßnahmen ergriffen werden, um diese Unterschiede zu verringern.
+      <para>Im Gegensatz zu den persönlichen Finanzen, bei denen das Ziel die Verfolgung des persönlichen
+        Wertes ist, geht es in der Wirtschaft darum, die Kosten für die Anschaffung von
+        Kapitalanlagen mit den durch sie generierten Einnahmen in Einklang zu bringen. Diese wird
+        durch Buchabschreibungen erreicht. Unternehmen müssen sich auch mit den lokalen
+        Steuergesetzen zur Abschreibung von Vermögenswerten auseinandersetzen. Dies wird als
+        steuerliche Abschreibung bezeichnet. Es steht dem Unternehmen frei, die Methode für die
+        handelsrechtliche Abschreibung zu wählen, aber die Methode für die steuerliche
+        Abschreibung ist festgelegt. Dies führt häufig zu Differenzen zwischen der
+        handelsrechtlichen und der steuerlichen Abschreibung, es können aber Maßnahmen ergriffen
+        werden, um diese Unterschiede zu verringern.
       </para>
 
-      <para>Welche Anschaffungen sollten nun aktiviert werden? Wenn Sie erwarten, dass etwas, das Sie kaufen, Ihnen helfen wird,
-        Einkommen für mehr als nur das laufende Jahr zu erzielen, dann sollte es aktiviert werden. Dazu gehören Dinge wie
-        Grundstücke, Gebäude, Ausrüstung, Autos und Computer - solange sie für geschäftliche Zwecke genutzt werden. Nicht dazu
-        gehören Gegenstände, die als Inventar zu betrachten sind. Wenn Sie also einen Kauf mit der Absicht getätigt haben,
-        den Gegenstand weiterzuverkaufen, sollte er nicht aktiviert werden.
+      <para>Welche Anschaffungen sollten nun aktiviert werden? Wenn Sie erwarten, dass etwas, das Sie kaufen,
+        Ihnen helfen wird, Einkommen für mehr als nur das laufende Jahr zu erzielen, dann sollte es
+        aktiviert werden. Dazu gehören Dinge wie Grundstücke, Gebäude, Ausrüstung, Autos und
+        Computer - solange sie für geschäftliche Zwecke genutzt werden. Nicht dazu gehören
+        Gegenstände, die als Inventar zu betrachten sind. Wenn Sie also einen Kauf mit der Absicht
+        getätigt haben, den Gegenstand weiterzuverkaufen, sollte er nicht aktiviert werden.
       </para>
 
-      <para>Neben dem Erwerb des Vermögenswerts selbst sind auch alle Kosten zu aktivieren, die damit verbunden sind, den
-        Vermögenswert in einen Zustand zu versetzen, damit Sie ihn nutzen können. Wenn Sie z. B. ein Gerät kaufen und dieses von
-        außerhalb der Stadt transportiert werden muss, einige elektrische Arbeiten durchgeführt werden müssen, damit Sie
-        die Maschine anschließen können und eine spezielle Schulung erforderlich ist, damit Sie die Maschine bedienen können, sind
-        all diese Kosten zu den Kosten des Geräts hinzuzuzählen.
+      <para>Neben dem Erwerb des Vermögenswerts selbst sind auch alle Kosten zu aktivieren, die damit verbunden
+        sind, den Vermögenswert in einen Zustand zu versetzen, damit Sie ihn nutzen können. Wenn
+        Sie z. B. ein Gerät kaufen und dieses von außerhalb der Stadt transportiert werden muss,
+        einige elektrische Arbeiten durchgeführt werden müssen, damit Sie die Maschine
+        anschließen können und eine spezielle Schulung erforderlich ist, damit Sie die Maschine
+        bedienen können, sind all diese Kosten zu den Kosten des Geräts hinzuzuzählen.
       </para>
 
-      <para>Sie müssen auch den geschätzten Restwert der Anlage kennen. Im Allgemeinen wird dieser als Null angenommen. Die Idee
-        hinter der Kenntnis des Restwerts ist, dass das Wirtschaftsgut abgeschrieben wird, bis der Restbuchwert (Anschaffungskosten 
-        abzüglich Abschreibung) gleich dem Restwert ist. Wenn die Anlage dann abgeschrieben wird, entsteht kein Gewinn oder Verlust
+      <para>Sie müssen auch den geschätzten Restwert der Anlage kennen. Im Allgemeinen wird dieser als Null
+        angenommen. Die Idee hinter der Kenntnis des Restwerts ist, dass das Wirtschaftsgut
+        abgeschrieben wird, bis der Restbuchwert (Anschaffungskosten abzüglich Abschreibung) gleich
+        dem Restwert ist. Wenn die Anlage dann abgeschrieben wird, entsteht kein Gewinn oder Verlust
         aus dem Abgang des Vermögenswerts.
       </para>
 
-      <para>Der letzte Schritt besteht darin, die Abschreibungsmethode zu bestimmen, die Sie verwenden möchten. Dies wird
-        auf den nächsten Seiten besprochen.
+      <para>Der letzte Schritt besteht darin, die Abschreibungsmethode zu bestimmen, die Sie verwenden möchten.
+        Dies wird auf den nächsten Seiten besprochen.
       </para>
 
       <warning>
-        <para>Seien Sie sich bewusst, dass verschiedene Länder eine sehr unterschiedliche Steuerpolitik für Abschreibungen haben
-          können. Alles, was dieses Dokument wirklich bieten kann, sind einige der zugrunde liegenden Ideen, die Ihnen helfen,
-          Ihre <quote>bevorzugte</quote> Steuer-/Abschreibungspolitik anzuwenden.
+        <para>Seien Sie sich bewusst, dass verschiedene Länder eine sehr unterschiedliche Steuerpolitik für
+          Abschreibungen haben können. Alles, was dieses Dokument wirklich bieten kann, sind einige
+          der zugrunde liegenden Ideen, die Ihnen helfen, Ihre <quote>bevorzugte</quote>
+          Steuer-/Abschreibungspolitik anzuwenden.
         </para>
       </warning>
     </sect2>
@@ -146,24 +161,27 @@
   <sect1 id="dep_value1">
     <title>Schätzung der Bewertung</title>
 
-    <para>Ein zentrales Thema bei der Abschreibung ist die Frage, wie Sie den zukünftigen Wert des Vermögenswertes schätzen.
-      Im Vergleich zu den oft unsicheren Schätzungen, die man bei der Wertsteigerung von Vermögenswerten machen muss, befinden wir uns hier
-      auf etwas festerem Boden. Die Verwendung der unten aufgeführten Quellen sollte es ermöglichen, die Schätzung des zukünftigen
-      Wertes Ihrer abzuschreibenden Anlagen recht einfach machen.
+    <para>Ein zentrales Thema bei der Abschreibung ist die Frage, wie Sie den zukünftigen Wert des
+      Vermögenswertes schätzen. Im Vergleich zu den oft unsicheren Schätzungen, die man bei der
+      Wertsteigerung von Vermögenswerten machen muss, befinden wir uns hier auf etwas festerem
+      Boden. Die Verwendung der unten aufgeführten Quellen sollte es ermöglichen, die Schätzung
+      des zukünftigen Wertes Ihrer abzuschreibenden Anlagen recht einfach machen.
     </para>
 
     <itemizedlist>
       <listitem>
-        <para><emphasis>Abgabenordnung:</emphasis> Für Unternehmen, die Abschreibungen für steuerliche Zwecke nutzen wollen,
-          neigen Regierungen dazu, genaue Regeln aufzustellen, wie Sie die Abschreibung zu berechnen haben. Konsultieren Sie Ihre
-          lokalen Steuergesetze, die explizit angeben sollten, wie Sie die Abschreibung vorzunehmen haben.
+        <para><emphasis>Abgabenordnung:</emphasis> Für Unternehmen, die Abschreibungen für steuerliche Zwecke
+          nutzen wollen, neigen Regierungen dazu, genaue Regeln aufzustellen, wie Sie die
+          Abschreibung zu berechnen haben. Konsultieren Sie Ihre lokalen Steuergesetze, die explizit
+          angeben sollten, wie Sie die Abschreibung vorzunehmen haben.
         </para>
       </listitem>
 
       <listitem>
         <para><emphasis>Referenzlisten:</emphasis> Für Automobile ist es einfach, in Referenzen wie z. B. der
-          <quote>Schwacke Liste</quote> nachzuschlagen, was ein Auto nach einer gewissen Zeit in der Zukunft wert sein sollte.
-          Daraus können Sie dann ein Modell für die Abschreibung entwickeln.
+          <quote>Schwacke Liste</quote> nachzuschlagen, was ein Auto nach einer gewissen Zeit in der
+          Zukunft wert sein sollte. Daraus können Sie dann ein Modell für die Abschreibung
+          entwickeln.
         </para>
       </listitem>
     </itemizedlist>
@@ -171,30 +189,36 @@
     <sect2 id="dep_valueschemes2">
       <title>Abschreibungsmethoden</title>
 
-      <para>Eine <emphasis>Abschreibungsmethode</emphasis> ist ein mathematisches Modell, wie ein Vermögenswert im Laufe der Zeit
-        als Aufwand verbucht wird. Für jedes Wirtschaftsgut, das abgeschrieben wird, müssen Sie sich für eine Abschreibungsmethode
-        entscheiden. Ein wichtiger Punkt, den Sie beachten müssen, ist, dass Sie für Steuerzwecke Ihre Anlagen mit einer bestimmten
-        Rate abschreiben müssen. Dies wird als steuerliche Abschreibung bezeichnet. Für Bilanzierungszwecke können Sie die Methode
-        frei wählen. Dies ist die Buchabschreibung. Die meisten kleinen Unternehmen verwenden den gleichen Satz für die steuerliche
-        und handelsrechtliche Abschreibung. Auf diese Weise gibt es weniger Unterschiede zwischen dem Nettoeinkommen in der Bilanz
-        und dem steuerpflichtigen Einkommen.
+      <para>Eine <emphasis>Abschreibungsmethode</emphasis> ist ein mathematisches Modell, wie ein Vermögenswert
+        im Laufe der Zeit als Aufwand verbucht wird. Für jedes Wirtschaftsgut, das abgeschrieben
+        wird, müssen Sie sich für eine Abschreibungsmethode entscheiden. Ein wichtiger Punkt, den
+        Sie beachten müssen, ist, dass Sie für Steuerzwecke Ihre Anlagen mit einer bestimmten Rate
+        abschreiben müssen. Dies wird als steuerliche Abschreibung bezeichnet. Für
+        Bilanzierungszwecke können Sie die Methode frei wählen. Dies ist die Buchabschreibung. Die
+        meisten kleinen Unternehmen verwenden den gleichen Satz für die steuerliche und
+        handelsrechtliche Abschreibung. Auf diese Weise gibt es weniger Unterschiede zwischen dem
+        Nettoeinkommen in der Bilanz und dem steuerpflichtigen Einkommen.
       </para>
 
-      <para>In diesem Abschnitt werden drei der gängigsten Abschreibungsmethoden vorgestellt: <emphasis>linear</emphasis>,
-        <emphasis>Geometrisch-degressiv</emphasis> und <emphasis>digital</emphasis>. Um die Beispiele zu vereinfachen, nehmen wir
-        an, dass der Restwert der abzuschreibenden Anlage gleich Null ist. Wenn Sie sich für die Verwendung eines Restwerts
-        entscheiden, würden Sie die Abschreibung der Anlage beenden, sobald der Restbuchwert dem Restwert entspricht.
+      <para>In diesem Abschnitt werden drei der gängigsten Abschreibungsmethoden vorgestellt:
+        <emphasis>linear</emphasis>, <emphasis>Geometrisch-degressiv</emphasis> und
+        <emphasis>digital</emphasis>. Um die Beispiele zu vereinfachen, nehmen wir an, dass der
+        Restwert der abzuschreibenden Anlage gleich Null ist. Wenn Sie sich für die Verwendung
+        eines Restwerts entscheiden, würden Sie die Abschreibung der Anlage beenden, sobald der
+        Restbuchwert dem Restwert entspricht.
       </para>
 
       <orderedlist>
         <listitem>
-          <para><emphasis>Lineare Abschreibung</emphasis> vermindert den Wert eines Vermögenswerts um einen festen Betrag pro Periode,
-            bis der Nettowert Null ist. Dies ist die einfachste Berechnung, da Sie eine sinnvolle Nutzungsdauer schätzen und die Kosten einfach
-            gleichmäßig über diese Lebensdauer aufteilen.
+          <para><emphasis>Lineare Abschreibung</emphasis> vermindert den Wert eines Vermögenswerts um einen festen
+            Betrag pro Periode, bis der Nettowert Null ist. Dies ist die einfachste Berechnung, da
+            Sie eine sinnvolle Nutzungsdauer schätzen und die Kosten einfach gleichmäßig über
+            diese Lebensdauer aufteilen.
           </para>
 
-          <para>Beispiel: Sie haben einen Computer für 1500 € gekauft und möchten ihn über einen Zeitraum von fünf Jahren abschreiben.
-            Jedes Jahr beträgt der Abschreibungsbetrag 300 €, was zu den folgenden Berechnungen führt:
+          <para>Beispiel: Sie haben einen Computer für 1500 € gekauft und möchten ihn über einen Zeitraum von
+            fünf Jahren abschreiben. Jedes Jahr beträgt der Abschreibungsbetrag 300 €, was zu
+            den folgenden Berechnungen führt:
           </para>
 
           <para><table>
@@ -306,10 +330,11 @@
         </listitem>
 
         <listitem>
-          <para>Bei der <emphasis>Geometrisch-degressiven Abschreibung</emphasis> wird um einen festen Prozentsatz des
-            Anlagenwertes in der vorangegangenen Periode abgeschrieben. Bei dieser Abschreibungsmethode erfolgen in den ersten Jahren
-            höhere Abschreibungen; der Wert einer Anlage sinkt exponentiell,so dass am Ende ein Wert übrig bleibt, 
-            der größer als Null ist (d. h.: ein Wiederverkaufswert).
+          <para>Bei der <emphasis>Geometrisch-degressiven Abschreibung</emphasis> wird um einen festen Prozentsatz
+            des Anlagenwertes in der vorangegangenen Periode abgeschrieben. Bei dieser
+            Abschreibungsmethode erfolgen in den ersten Jahren höhere Abschreibungen; der Wert
+            einer Anlage sinkt exponentiell,so dass am Ende ein Wert übrig bleibt, der größer als
+            Null ist (d. h.: ein Wiederverkaufswert).
           </para>
 
           <para>Beispiel: Wir verwenden dasselbe Beispiel wie oben, mit einer jährlichen Abschreibung von 30%.
@@ -423,25 +448,28 @@
           </para>
 
           <note>
-            <para>Achtung! Die Steuerbehörden können in der ersten Periode einen höheren Prozentsatz verlangen (oder erlauben).
-              (Andererseits ist dies in Kanada umgekehrt, da sie nur den halben Anteil der <quote>Kapitalkostenpauschale</quote>
-              im ersten Jahr erlauben) Das Ergebnis dieses Ansatzes ist, dass der Vermögenswert am Anfang schneller abnimmt
-              als am Ende, was für die meisten Anlagen wahrscheinlich realistischer ist als eine lineare Abschreibungsmethode.
-              Dies ist sicherlich für Fahrzeuge zutreffend.
+            <para>Achtung! Die Steuerbehörden können in der ersten Periode einen höheren Prozentsatz verlangen
+              (oder erlauben). (Andererseits ist dies in Kanada umgekehrt, da sie nur den halben
+              Anteil der <quote>Kapitalkostenpauschale</quote> im ersten Jahr erlauben) Das Ergebnis
+              dieses Ansatzes ist, dass der Vermögenswert am Anfang schneller abnimmt als am Ende,
+              was für die meisten Anlagen wahrscheinlich realistischer ist als eine lineare
+              Abschreibungsmethode. Dies ist sicherlich für Fahrzeuge zutreffend.
             </para>
           </note>
         </listitem>
 
         <listitem>
-          <para><emphasis>Digitale Abschreibung</emphasis> ist eine Abschreibungsmethode, die der geometrischen Abschreibung ähnelt,
-            mit dem Unterschied, dass der Wert der Anlage am Ende der Periode Null erreicht. Bei dieser Abschreibungsmethode erfolgen
-            in den ersten Jahren höhere Abschreibungen. Diese Methode wird am häufigsten in angelsächsischen
-            Ländern angewendet. Hier ist eine Illustration:
+          <para><emphasis>Digitale Abschreibung</emphasis> ist eine Abschreibungsmethode, die der geometrischen
+            Abschreibung ähnelt, mit dem Unterschied, dass der Wert der Anlage am Ende der Periode
+            Null erreicht. Bei dieser Abschreibungsmethode erfolgen in den ersten Jahren höhere
+            Abschreibungen. Diese Methode wird am häufigsten in angelsächsischen Ländern
+            angewendet. Hier ist eine Illustration:
           </para>
 
-          <para>Beispiel: Zunächst dividieren Sie den Wert des Wirtschaftsguts durch die Summe der Nutzungsjahre. Für unser
-            Beispiel von oben mit einem Wirtschaftsgut im Wert von 1500 €, das über einen Zeitraum von fünf Jahren genutzt wird,
-            erhalten Sie 1500/(1+2+3+4+5)=100. Die Abschreibung und der Anlagenwert werden dann wie folgt berechnet:
+          <para>Beispiel: Zunächst dividieren Sie den Wert des Wirtschaftsguts durch die Summe der Nutzungsjahre.
+            Für unser Beispiel von oben mit einem Wirtschaftsgut im Wert von 1500 €, das über
+            einen Zeitraum von fünf Jahren genutzt wird, erhalten Sie 1500/(1+2+3+4+5)=100. Die
+            Abschreibung und der Anlagenwert werden dann wie folgt berechnet:
           </para>
 
           <para><table>
@@ -559,27 +587,29 @@
     <title>Konto einrichten</title>
 
     <para>Wie bei den meisten Buchhaltungspraktiken gibt es eine Reihe von verschiedenen Möglichkeiten,
-      Abschreibungskonten einzurichten. Wir werden hier eine allgemeine Methode vorstellen, die flexibel
-      genug sein sollte, um die meisten Situationen zu bewältigen. Das erste Konto, das Sie benötigen, ist
-      ein <emphasis>Anlagevermögenskosten</emphasis>-Konto (&app; Kontotyp <guilabel>Aktiva</guilabel>),
-      das einfach ein Ort ist, an dem Sie den ursprünglichen Kauf des Vermögensgegenstandes aufzeichnen.
-      Normalerweise erfolgt dieser Kauf durch eine Transaktion von Ihrem Bankkonto.
+      Abschreibungskonten einzurichten. Wir werden hier eine allgemeine Methode vorstellen, die
+      flexibel genug sein sollte, um die meisten Situationen zu bewältigen. Das erste Konto, das
+      Sie benötigen, ist ein <emphasis>Anlagevermögenskosten</emphasis>-Konto (&app; Kontotyp
+      <guilabel>Aktiva</guilabel>), das einfach ein Ort ist, an dem Sie den ursprünglichen Kauf des
+      Vermögensgegenstandes aufzeichnen. Normalerweise erfolgt dieser Kauf durch eine Transaktion
+      von Ihrem Bankkonto.
     </para>
 
-    <para>Um die Abschreibung der Anlage zu verfolgen, benötigen Sie zwei Abschreibungskonten. Das erste
-      ist ein <emphasis>Kumulierte Abschreibung</emphasis>-Konto, in dem die Summe aller Abschreibungsbeträge
-      gesammelt wird und das negative Werte enthält. In &app; ist dies ein Kontotyp <emphasis>Aktiva</emphasis>.
-      Das <emphasis>Kumulierte Abschreibung</emphasis>-Konto wird durch ein
-      <emphasis>Abschreibungsaufwand</emphasis>-Konto ausgeglichen, in dem alle periodischen 
-      Abschreibungsaufwendungen erfasst werden. In &app; ist dies eine Kontoart <emphasis>Aufwand</emphasis>.
+    <para>Um die Abschreibung der Anlage zu verfolgen, benötigen Sie zwei Abschreibungskonten. Das erste ist
+      ein <emphasis>Kumulierte Abschreibung</emphasis>-Konto, in dem die Summe aller
+      Abschreibungsbeträge gesammelt wird und das negative Werte enthält. In &app; ist dies ein
+      Kontotyp <emphasis>Aktiva</emphasis>. Das <emphasis>Kumulierte Abschreibung</emphasis>-Konto
+      wird durch ein <emphasis>Abschreibungsaufwand</emphasis>-Konto ausgeglichen, in dem alle
+      periodischen Abschreibungsaufwendungen erfasst werden. In &app; ist dies eine Kontoart
+      <emphasis>Aufwand</emphasis>.
     </para>
 
-    <para>Nachfolgend sehen Sie eine generische Kontenhierarchie für die Verfolgung der Abschreibung von zwei Anlagen,
-      <emphasis>Anlage 1</emphasis> und <emphasis>Anlage 2</emphasis>. Die <emphasis>Anlagekosten</emphasis> Konten werden
-      durch das <emphasis>Bank</emphasis>-Konto ausgeglichen, das <emphasis>Akkumulierte Abschreibung</emphasis>-Konto durch das
-       <emphasis>Aufwendungen:Abschreibung</emphasis>-Konto.
+    <para>Nachfolgend sehen Sie eine generische Kontenhierarchie für die Verfolgung der Abschreibung von zwei
+      Anlagen, <emphasis>Anlage 1</emphasis> und <emphasis>Anlage 2</emphasis>. Die
+      <emphasis>Anlagekosten</emphasis> Konten werden durch das <emphasis>Bank</emphasis>-Konto
+      ausgeglichen, das <emphasis>Akkumulierte Abschreibung</emphasis>-Konto durch das
+      <emphasis>Aufwendungen:Abschreibung</emphasis>-Konto.
     </para>
-    
 <screen>
 -Aktiva
    -Anlagevermögen
@@ -594,46 +624,50 @@
 -Aufwendungen
    -Abschreibungen        (Konto Abschreibungskosten)
 </screen>
-    
     <para>Eines der Merkmale der oben gezeigten Kontenhierarchie ist, dass Sie einige wichtige
       zusammenfassende Werte über Ihre abzuschreibende Anlage leicht sehen können. Die Summe des
-      <emphasis>Aktiva:Anlagevermögen:Anlage 1</emphasis>-Konto zeigt Ihnen den aktuellen Schätzwert
-      für Anlage 1, das <emphasis>Aktiva:Anlagevermögen:Anlage 1:Kosten</emphasis> zeigt Ihnen,
-      was Sie ursprünglich für Anlage 1 bezahlt haben,
-      <emphasis>Anlagevermögen:Anlagevermögen:Anlage 1:Abschreibung</emphasis> zeigt Ihnen die aufgelaufene
-      Abschreibung für Anlage 1 und schließlich zeigt <emphasis>Aufwendungen:Abschreibung</emphasis> die
-      gesamte kumulierte Abschreibung für alle Ihre Anlagen.
+      <emphasis>Aktiva:Anlagevermögen:Anlage 1</emphasis>-Konto zeigt Ihnen den aktuellen
+      Schätzwert für Anlage 1, das <emphasis>Aktiva:Anlagevermögen:Anlage 1:Kosten</emphasis>
+      zeigt Ihnen, was Sie ursprünglich für Anlage 1 bezahlt haben,
+      <emphasis>Anlagevermögen:Anlagevermögen:Anlage 1:Abschreibung</emphasis> zeigt Ihnen die
+      aufgelaufene Abschreibung für Anlage 1 und schließlich zeigt
+      <emphasis>Aufwendungen:Abschreibung</emphasis> die gesamte kumulierte Abschreibung für alle
+      Ihre Anlagen.
     </para>
 
     <para>Es ist natürlich möglich, eine andere Kontohierarchie zu verwenden. Eine beliebte Kontenstruktur
-      ist die einer Kombination der <emphasis>Anlagevermögenskosten</emphasis>- und <emphasis>Abschreibungen</emphasis>-
-      Anlagenkonten. Dies hat den Vorteil, dass weniger Konten die Kontenhierarchie durcheinander bringen.
-      Nachteilig ist, dass Sie zum Ermitteln einiger der im obigen Absatz erwähnten zusammenfassenden Details die
-      Kontenregisterfenster öffnen müssen. Wie bei den meisten Dingen gibt es viele Möglichkeiten – finden Sie
-      diejenige, die für Sie am besten funktioniert.
+      ist die einer Kombination der <emphasis>Anlagevermögenskosten</emphasis>- und
+      <emphasis>Abschreibungen</emphasis>- Anlagenkonten. Dies hat den Vorteil, dass weniger Konten
+      die Kontenhierarchie durcheinander bringen. Nachteilig ist, dass Sie zum Ermitteln einiger der
+      im obigen Absatz erwähnten zusammenfassenden Details die Kontenregisterfenster öffnen
+      müssen. Wie bei den meisten Dingen gibt es viele Möglichkeiten – finden Sie diejenige,
+      die für Sie am besten funktioniert.
     </para>
 
-    <para>Die eigentliche Eingabe der Abschreibungsbeträge erfolgt in jeder Abrechnungsperiode von Hand. Es gibt keine
-      Möglichkeit in &app;, die Berechnungen der Abschreibung automatisch durchzuführen oder die die Werte automatisch
-      in die entsprechenden Konten einzugeben. Da jedoch eine Buchhaltungsperiode typischerweise ein Jahr ist, ist dies
-      wirklich nicht viel Arbeit, die von Hand zu erledigen ist.
+    <para>Die eigentliche Eingabe der Abschreibungsbeträge erfolgt in jeder Abrechnungsperiode von Hand. Es
+      gibt keine Möglichkeit in &app;, die Berechnungen der Abschreibung automatisch durchzuführen
+      oder die die Werte automatisch in die entsprechenden Konten einzugeben. Da jedoch eine
+      Buchhaltungsperiode typischerweise ein Jahr ist, ist dies wirklich nicht viel Arbeit, die von
+      Hand zu erledigen ist.
     </para>
   </sect1>
 
   <sect1 id="dep_example1">
     <title>Beispiel</title>
 
-    <para>Lassen Sie uns schrittweise durch ein Beispiel gehen. Stellen Sie sich vor, Sie sind ein Fotograf und
-      nutzen ein Auto und eine teure Kamera für Ihr persönliches Geschäft. Sie werden die Abschreibung dieser Gegenstände
-      nachverfolgen wollen, weil Sie die Abschreibung wahrscheinlich von Ihren Gewerbesteuern absetzen können.
+    <para>Lassen Sie uns schrittweise durch ein Beispiel gehen. Stellen Sie sich vor, Sie sind ein Fotograf
+      und nutzen ein Auto und eine teure Kamera für Ihr persönliches Geschäft. Sie werden die
+      Abschreibung dieser Gegenstände nachverfolgen wollen, weil Sie die Abschreibung
+      wahrscheinlich von Ihren Gewerbesteuern absetzen können.
     </para>
 
-    <para>Der erste Schritt ist der Aufbau der Kontenhierarchie (wie im vorherigen Abschnitt gezeigt, ersetzen Sie
-      <emphasis>Anlage 1</emphasis> und <emphasis>Anlage 2</emphasis> durch <quote>Auto</quote> und <quote>Kamera</quote>). Erfassen
-      Sie nun den Kauf Ihrer Anlagen, indem Sie das Geld von Ihrem Bankkonto auf die entsprechenden <emphasis>Anlagekosten</emphasis>-
-      Konten für jeden Artikel (z.B. das <emphasis>Aktiva:Anlagevermögen:Auto:Kosten</emphasis>-Konto für das Auto). In
-      diesem Beispiel beginnen Sie mit einem Guthaben von 30.000 € auf der Bank, das Auto kostete 20.000 € und die Kamera 10.000 €
-      und wurden beide am 1. Januar 2000 gekauft.
+    <para>Der erste Schritt ist der Aufbau der Kontenhierarchie (wie im vorherigen Abschnitt gezeigt, ersetzen
+      Sie <emphasis>Anlage 1</emphasis> und <emphasis>Anlage 2</emphasis> durch <quote>Auto</quote>
+      und <quote>Kamera</quote>). Erfassen Sie nun den Kauf Ihrer Anlagen, indem Sie das Geld von
+      Ihrem Bankkonto auf die entsprechenden <emphasis>Anlagekosten</emphasis>- Konten für jeden
+      Artikel (z.B. das <emphasis>Aktiva:Anlagevermögen:Auto:Kosten</emphasis>-Konto für das
+      Auto). In diesem Beispiel beginnen Sie mit einem Guthaben von 30.000 € auf der Bank, das
+      Auto kostete 20.000 € und die Kamera 10.000 € und wurden beide am 1. Januar 2000 gekauft.
     </para>
 
     <screenshot id="dep_example">
@@ -654,17 +688,21 @@
       </mediaobject>
     </screenshot>
 
-    <para>Wenn wir uns die Abgabenordnung ansehen, stellen wir fest, dass wir die Abschreibung für diese Gegenstände
-      nach der <quote>Digitalen Abschreibung</quote> über einen Zeitraum von 5 Jahren durchführen müssen. Die jährlichen
-      Abschreibungsbeträge für das Auto betragen also 6667 €, 5333 €, 4000 €, 2667 €, 1333 € für die Jahre 1 bis 5, jeweils
-      gerundet auf den nächsten Euro. Die jährlichen Abschreibungsbeträge für die Kamera sind 3333 €, 2667 €, 2000 €,
-      1333 €, 667 €. Die Formel für die Berechnung dieser Werte finden Sie im vorherigen Abschnitt über Abschreibungsmethoden.
+    <para>Wenn wir uns die Abgabenordnung ansehen, stellen wir fest, dass wir die Abschreibung für diese
+      Gegenstände nach der <quote>Digitalen Abschreibung</quote> über einen Zeitraum von 5 Jahren
+      durchführen müssen. Die jährlichen Abschreibungsbeträge für das Auto betragen also 6667
+      €, 5333 €, 4000 €, 2667 €, 1333 € für die Jahre 1 bis 5, jeweils gerundet auf den
+      nächsten Euro. Die jährlichen Abschreibungsbeträge für die Kamera sind 3333 €, 2667 €,
+      2000 €, 1333 €, 667 €. Die Formel für die Berechnung dieser Werte finden Sie im
+      vorherigen Abschnitt über Abschreibungsmethoden.
     </para>
 
-    <para>Für jede Buchungsperiode (z. B. Geschäftsjahr) verbuchen Sie die Abschreibung als Aufwand auf dem entsprechenden 
-      <emphasis>Abschreibung</emphasis>-Konto (z. B. das <emphasis>Aktiva:Anlagevermögen:Auto:Abschreibungen</emphasis>
-      für das Auto). Die beiden folgenden Fenster zeigen für das Auto das Konto der aufgelaufenen Abschreibungen und das Hauptfenster
-      nach dem dritten Jahr (also drei Perioden) der Abschreibung nach der Methode der <guilabel>Digitalen Abschreibung</guilabel>.
+    <para>Für jede Buchungsperiode (z. B. Geschäftsjahr) verbuchen Sie die Abschreibung als Aufwand auf dem
+      entsprechenden <emphasis>Abschreibung</emphasis>-Konto (z. B. das
+      <emphasis>Aktiva:Anlagevermögen:Auto:Abschreibungen</emphasis> für das Auto). Die beiden
+      folgenden Fenster zeigen für das Auto das Konto der aufgelaufenen Abschreibungen und das
+      Hauptfenster nach dem dritten Jahr (also drei Perioden) der Abschreibung nach der Methode der
+      <guilabel>Digitalen Abschreibung</guilabel>.
     </para>
 
     <screenshot id="dep_assetreg">
@@ -704,12 +742,12 @@
     </screenshot>
 
     <note>
-      <para>Ein Wort der Warnung: Da Abschreibung und Steuerfragen eng miteinander verknüpft sind, sind Sie möglicherweise
-        nicht immer frei in der Wahl Ihrer bevorzugten Methode. Falsche Berechnungen zu korrigieren, kostet viel mehr Zeit und
-        Ärger, als wenn Sie die Berechnungen gleich beim ersten Mal richtig machen. Wenn Sie also planen, Anlagen abzuschreiben,
-        ist es ratsam, sich über die Abschreibungsmethoden, die Sie verwenden dürfen oder müssen, zu informieren.
+      <para>Ein Wort der Warnung: Da Abschreibung und Steuerfragen eng miteinander verknüpft sind, sind Sie
+        möglicherweise nicht immer frei in der Wahl Ihrer bevorzugten Methode. Falsche Berechnungen
+        zu korrigieren, kostet viel mehr Zeit und Ärger, als wenn Sie die Berechnungen gleich beim
+        ersten Mal richtig machen. Wenn Sie also planen, Anlagen abzuschreiben, ist es ratsam, sich
+        über die Abschreibungsmethoden, die Sie verwenden dürfen oder müssen, zu informieren.
       </para>
     </note>
   </sect1>
-
 </chapter>
diff --git a/de/guide/ch_expenses.xml b/de/guide/ch_expenses.xml
index d7029b79..4b2a6f23 100644
--- a/de/guide/ch_expenses.xml
+++ b/de/guide/ch_expenses.xml
@@ -73,12 +73,12 @@
   <sect1 id="expenses-entering">
     <title>Eingabe der Aufwandsbuchungen</title>
 
-    <para>Während es möglich ist, Buchungen direkt in die Aufwandskonten einzugeben, ist es nicht
-      normal, wie diese einzugeben sind. Für die meisten Leute werden die Buchungen für ein
-      Aufwandskonto hinzugefügt, wenn der Nutzer Daten in ein anderes Konto in der Buchung
-      eingibt. Mit anderen Worten: wenn Sie ein Aufwandskonto für gemeinnützige Spenden haben
-      (z.B. Aufwendungen:Spenden), werden Sie normalerweise eine Buchung dem Aufwandskonto
-      hinzufügen, indem Sie die Buchung auf dem Girokonto dem Spendenkonto zuweisen.
+    <para>Während es möglich ist, Buchungen direkt in die Aufwandskonten einzugeben, ist es nicht normal,
+      wie diese einzugeben sind. Für die meisten Leute werden die Buchungen für ein Aufwandskonto
+      hinzugefügt, wenn der Nutzer Daten in ein anderes Konto in der Buchung eingibt. Mit anderen
+      Worten: wenn Sie ein Aufwandskonto für gemeinnützige Spenden haben (z.B.
+      Aufwendungen:Spenden), werden Sie normalerweise eine Buchung dem Aufwandskonto hinzufügen,
+      indem Sie die Buchung auf dem Girokonto dem Spendenkonto zuweisen.
     </para>
 
     <para>Wenn Sie ein Aufwandskonto öffnen, werden Sie ein Kontenblatt sehen, wie Sie es auch an den anderen
diff --git a/de/guide/ch_invest.xml b/de/guide/ch_invest.xml
index b2cb9dea..26d1ece9 100644
--- a/de/guide/ch_invest.xml
+++ b/de/guide/ch_invest.xml
@@ -1308,13 +1308,12 @@ Einnahmen
           </itemizedlist>
         </para>
 
-        <para>&mac;: Sie müssen XCode installiert haben. XCode ist ein
-          zusätzliches Element auf Ihrer &mac; Distributions-DVD. Starten Sie die
-          <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.
+        <para>&mac;: Sie müssen XCode installiert haben. XCode ist ein zusätzliches Element auf Ihrer &mac;
+          Distributions-DVD. Starten Sie die <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.
         </para>
 
         <para>&lin;:
@@ -1356,8 +1355,8 @@ Einnahmen
         <note>
           <para>Wenn Sie sich unbehaglich bei der Durchführung der Schritte fühlen, mailen Sie entweder an die
             &app;-user mailing list (<email>gnucash-de at gnucash.org</email>) und bitten um Hilfe oder
-            kommen in den <ulink url='&url-irc;'>#gnucash IRC-Kanal auf &srv-irc;</ulink>. Sie können diesen Schritt auch
-            auslassen und händisch die Preise der Aktien aktualisieren.
+            kommen in den <ulink url='&url-irc;'>#gnucash IRC-Kanal auf &srv-irc;</ulink>. Sie
+            können diesen Schritt auch auslassen und händisch die Preise der Aktien aktualisieren.
           </para>
         </note>
       </sect3>
@@ -2177,7 +2176,9 @@ Einnahmen
         </para>
 
         <figure pgwide="1">
-          <title>Aktienverkauf - Kapitalgewinn - Lose im Fenster Posten anzeigen…</title><screenshot id="tool-lotsInAcct">
+          <title>Aktienverkauf - Kapitalgewinn - Lose im Fenster Posten anzeigen…</title>
+
+          <screenshot id="tool-lotsInAcct">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
@@ -2200,10 +2201,10 @@ Einnahmen
             </mediaobject>
           </screenshot>
         </figure>
-        <!-- Fixme: Title still untranslated? -->
-        <para>Refer to the <ulink url="&url-docs-de;help/tool-lots.html"> Manual:
-            Kapitel 8. Assistenten und ähnliche Werkzeuge; Lose in Konto</ulink>
-            für die Details von <quote>Lose in Konto</quote>-Fenstern.
+<!-- Fixme: Title still untranslated? -->
+        <para>Refer to the <ulink url="&url-docs-de;help/tool-lots.html"> Manual: Kapitel 8. Assistenten und
+          ähnliche Werkzeuge; Lose in Konto</ulink> für die Details von <quote>Lose in
+          Konto</quote>-Fenstern.
         </para>
       </sect3>
 
diff --git a/de/guide/ch_loans.xml b/de/guide/ch_loans.xml
index 27940465..8db1eb3e 100644
--- a/de/guide/ch_loans.xml
+++ b/de/guide/ch_loans.xml
@@ -129,8 +129,8 @@
 
     <para>Ein Darlehen ist Fremdkapital, die anfallenden Zinsen für das Darlehen sind fortlaufender Aufwand
       und alle Verwaltungsgebühren, die gezahlt werden müssen, sind sonstiger Aufwand. Der
-      Gegenstand, der mit dem Geld des Darlehens gekauft wird, gehört zu den Aktiva. Mit diesen Parametern
-      können wir jetzt die grundlegende Kontohierarchie für Darlehen aufzeigen.
+      Gegenstand, der mit dem Geld des Darlehens gekauft wird, gehört zu den Aktiva. Mit diesen
+      Parametern können wir jetzt die grundlegende Kontohierarchie für Darlehen aufzeigen.
     </para>
 <screen>Grundlegende Kontostrukturen für Darlehen
 
diff --git a/de/guide/ch_oview.xml b/de/guide/ch_oview.xml
index 609f8525..ac6a9e35 100644
--- a/de/guide/ch_oview.xml
+++ b/de/guide/ch_oview.xml
@@ -166,11 +166,11 @@
 
         <listitem>
           <para><emphasis>Verfügbarkeit auf mehreren Plattformen: </emphasis> &app; ist für eine Vielzahl von
-            Plattformen und Betriebssysteme verfügbar. Für &app; &vers-stable; sind dies:
-            &lin; (x86, x86_64), FreeBSD (x86, x86_64), OpenBSD (x86, x86_64), &mac; (Intel
-            64) und &win;. Ältere Versionen von &app; liefen bereits auf SGI IRIX (MIPS), IBM AIX 4.1.5
-            (RS/6000), Unixware 7 (Intel), SCO OpenServer 5.0.4 (Intel), und Solaris (SPARC), aber
-            ihr gegenwärtiger Status ist nicht bekannt.
+            Plattformen und Betriebssysteme verfügbar. Für &app; &vers-stable; sind dies: &lin;
+            (x86, x86_64), FreeBSD (x86, x86_64), OpenBSD (x86, x86_64), &mac; (Intel 64) und &win;.
+            Ältere Versionen von &app; liefen bereits auf SGI IRIX (MIPS), IBM AIX 4.1.5 (RS/6000),
+            Unixware 7 (Intel), SCO OpenServer 5.0.4 (Intel), und Solaris (SPARC), aber ihr
+            gegenwärtiger Status ist nicht bekannt.
           </para>
         </listitem>
       </itemizedlist>
@@ -373,8 +373,7 @@
       Informationen in diesem Kapitel vertraut machen, um es für sich lauffähig zu machen:
       <itemizedlist>
         <listitem>
-          <para><xref linkend="chapter_oview"></xref> - gibt einen allgemeinen Überblick über
-            &app;
+          <para><xref linkend="chapter_oview"></xref> - gibt einen allgemeinen Überblick über &app;
           </para>
         </listitem>
 
@@ -523,10 +522,10 @@
       <title>&app; Wiki</title>
 
       <para>Eine umfangreiche weniger formale Dokumentation, sowohl von &app; selbst als auch der Pflege und
-        Entwicklung von &app; kann man im <ulink url="&url-wiki-de;">&appname;-Wiki</ulink> finden; die Seite mit
-        <ulink url="&url-wiki-faq;">Häufig gestellten Fragen (en)</ulink>
-        sollte immer dann die erste Anlaufstelle sein, wenn man auf Schwierigkeiten bei der Nutzung
-        von &app; stößt.
+        Entwicklung von &app; kann man im <ulink url="&url-wiki-de;">&appname;-Wiki</ulink> finden;
+        die Seite mit <ulink url="&url-wiki-faq;">Häufig gestellten Fragen (en)</ulink> sollte
+        immer dann die erste Anlaufstelle sein, wenn man auf Schwierigkeiten bei der Nutzung von
+        &app; stößt.
       </para>
     </sect2>
 
@@ -538,28 +537,27 @@
       </bridgehead>
 
       <para>Die erste Quelle der Unterstützung für Nutzer ist die
-        <ulink url="mailto:gnucash-de at gnucash.org">deutschsprachige Mailingliste</ulink>. Wenn Sie eine
-        Web-Forum ähnliche Darstellung bevorzugen, können Sie sie via
-        <ulink url="&url-mail-nabble;">Nabble</ulink>
-        nutzen. um einen Beitrag zu veröffentlichen, muss man auf
-        <ulink url="&url-mail-li;gnucash-de">&appname;-de</ulink>
-        eingeschrieben sein.
+        <ulink url="mailto:gnucash-de at gnucash.org">deutschsprachige Mailingliste</ulink>. Wenn Sie
+        eine Web-Forum ähnliche Darstellung bevorzugen, können Sie sie via
+        <ulink url="&url-mail-nabble;">Nabble</ulink> nutzen. um einen Beitrag zu veröffentlichen,
+        muss man auf <ulink url="&url-mail-li;gnucash-de">&appname;-de</ulink> eingeschrieben sein.
       </para>
 
       <bridgehead>
         IRC
       </bridgehead>
 
-      <para>Etliche Entwickler beobachten den <ulink url='&url-irc;'>#gnucash Kanal auf &srv-irc;</ulink>. Normalerweise sind sie auch mit
-        anderen Dingen beschäftigt und natürlich nicht immer an ihren Computern. Loggen Sie sich
-        ein, stellen Ihre Frage und bleiben Sie eingeloggt; es kann mehrere Stunden dauern, bis
-        Ihre Frage bemerkt und darauf geantwortet wird. Um nachzusehen, ob Sie etwas verpasst haben,
-        <ulink url="&url-logs-irc;">prüfen Sie die IRC-Protokolle</ulink>.
+      <para>Etliche Entwickler beobachten den <ulink url='&url-irc;'>#gnucash Kanal auf &srv-irc;</ulink>.
+        Normalerweise sind sie auch mit anderen Dingen beschäftigt und natürlich nicht immer an
+        ihren Computern. Loggen Sie sich ein, stellen Ihre Frage und bleiben Sie eingeloggt; es kann
+        mehrere Stunden dauern, bis Ihre Frage bemerkt und darauf geantwortet wird. Um nachzusehen,
+        ob Sie etwas verpasst haben, <ulink url="&url-logs-irc;">prüfen Sie die
+        IRC-Protokolle</ulink>.
       </para>
 
-      <para>Auf der <ulink url="&url-www;">&app; Webseite</ulink> finden Sie weitere Einzelheiten
-        zu diesen Kanälen. Sie werden dort auch Hinweise zu weiteren nützlichen Ressourcen, wie
-        das &app; wiki und das Fehlerverfolgungssystem, finden.
+      <para>Auf der <ulink url="&url-www;">&app; Webseite</ulink> finden Sie weitere Einzelheiten zu diesen
+        Kanälen. Sie werden dort auch Hinweise zu weiteren nützlichen Ressourcen, wie das &app;
+        wiki und das Fehlerverfolgungssystem, finden.
       </para>
     </sect2>
   </sect1>
@@ -576,9 +574,9 @@
     <para>Die Installation von &app; ist normalerweise sehr einfach.
     </para>
 
-    <para>Die <ulink url="&url-www;download.phtml"><citetitle>&app;
-      Download-Seite</citetitle></ulink> enthält ausführliche Anweisungen, wie &app; auf den
-      unterstützten Systemen installiert wird.
+    <para>Die <ulink url="&url-www;download.phtml"><citetitle>&app; Download-Seite</citetitle></ulink>
+      enthält ausführliche Anweisungen, wie &app; auf den unterstützten Systemen installiert
+      wird.
     </para>
   </sect1>
 </chapter>
diff --git a/de/guide/ch_reports.xml b/de/guide/ch_reports.xml
index 3a258a6c..32c05d23 100644
--- a/de/guide/ch_reports.xml
+++ b/de/guide/ch_reports.xml
@@ -440,11 +440,11 @@ Durchschnittswerte für den aktuellen Abrechnungszeitraum an.</para>
       <sect3 id="rpt_pricescatter">
         <title>Kursdiagramm</title>
 
-        <para>Das Kursdiagramm zeigt den Wert eines Wertpapiers im Verhältnis zu einem anderen Wertpapier an,
-          zum Beispiel den Wert einer Aktie im Verhältnis zu einer Währung. Bei der ersten
-          Ausführung lädt dieser Bericht keine Daten, und die Berichtsoptionen müssen geändert
-          werden, um Informationen aus der Datei abzurufen. Insbesondere muss die Einstellung "Preis
-          der Devise/Wertpapier" auf der Registerkarte "Kurs" an ein bestimmtes Wertpapier gehängt
+        <para>Das Kursdiagramm zeigt den Wert eines Wertpapiers im Verhältnis zu einem anderen Wertpapier an, zum
+          Beispiel den Wert einer Aktie im Verhältnis zu einer Währung. Bei der ersten Ausführung
+          lädt dieser Bericht keine Daten, und die Berichtsoptionen müssen geändert werden, um
+          Informationen aus der Datei abzurufen. Insbesondere muss die Einstellung "Preis der
+          Devise/Wertpapier" auf der Registerkarte "Kurs" an ein bestimmtes Wertpapier gehängt
           werden.
         </para>
       </sect3>
@@ -935,9 +935,10 @@ Durchschnittswerte für den aktuellen Abrechnungszeitraum an.</para>
         </itemizedlist>
 
         <para>Nehmen wir als Beispiel an, ein Unternehmen hat die folgenden Buchungen: Es tätigt Verkäufe in
-          Höhe von 1.000 € plus 5 % MwSt und erhält 1.050 €. Außerdem tätigt es Umsatzsteuer-befreite
-          Verkäufe in Höhe von 600 €. Es kauft Waren/Dienstleistungen im Wert von 400 € plus 5% =
-          420 €. Die folgenden Buchungen werden die Geschäftsaktivitäten aufzeichnen:
+          Höhe von 1.000 € plus 5 % MwSt und erhält 1.050 €. Außerdem tätigt es
+          Umsatzsteuer-befreite Verkäufe in Höhe von 600 €. Es kauft Waren/Dienstleistungen im
+          Wert von 400 € plus 5% = 420 €. Die folgenden Buchungen werden die
+          Geschäftsaktivitäten aufzeichnen:
         </para>
 
         <table>
@@ -1762,8 +1763,8 @@ Durchschnittswerte für den aktuellen Abrechnungszeitraum an.</para>
           </listitem>
 
           <listitem>
-            <para>Aus der Registerkarte <guilabel>Allgemein</guilabel>, wählen Sie einen geeigneten Datumsbereich,
-              z. B. die letzten 3 Monate
+            <para>Aus der Registerkarte <guilabel>Allgemein</guilabel>, wählen Sie einen geeigneten Datumsbereich, z.
+              B. die letzten 3 Monate
             </para>
           </listitem>
 
diff --git a/de/guide/ch_txns.xml b/de/guide/ch_txns.xml
index 73f84288..a065c99d 100644
--- a/de/guide/ch_txns.xml
+++ b/de/guide/ch_txns.xml
@@ -297,8 +297,8 @@
           <menuchoice>
             <guimenu>Bearbeiten</guimenu><guimenuitem>Einstellungen</guimenuitem>
           </menuchoice>
-          im Abschnitt <guilabel>Zahl, Datum, Zeit</guilabel> über <guilabel>Datum vervollständigen</guilabel>
-          konfiguriert.
+          im Abschnitt <guilabel>Zahl, Datum, Zeit</guilabel> über <guilabel>Datum
+          vervollständigen</guilabel> konfiguriert.
         </para>
       </tip>
 
@@ -315,9 +315,12 @@
         Anfangsbuchstaben des Kontonamens ein und &app; ergänzt den fehlenden Teil des Namens. Wenn
         Sie (zu einem beliebigen Zeitpunkt) das Trennzeichen <keycap>:</keycap> eingeben, wird der
         bisher gewählte Teil des Namens abgeschlossen und mit der Auswahl des Unterkontos begonnen.
-        Zum Beispiel wird die Eingabe <keycombo action='seq'><keycap>A</keycap><keycap>:</keycap><keycap>G</keycap></keycombo> in unserem Beispielkontorahmen ergänzt
-        zum Konto <emphasis>Aktiva:Girokonto</emphasis>. Sie können auch die Tasten
-        <keycap>Menü</keycap> oder
+        Zum Beispiel wird die Eingabe
+        <keycombo action='seq'>
+          <keycap>A</keycap><keycap>:</keycap><keycap>G</keycap>
+        </keycombo>
+        in unserem Beispielkontorahmen ergänzt zum Konto <emphasis>Aktiva:Girokonto</emphasis>. Sie
+        können auch die Tasten <keycap>Menü</keycap> oder
         <keycombo>
           <keycap>Ctrl</keycap><keycap>Down</keycap>
         </keycombo>
@@ -437,12 +440,11 @@
       enthält das <guilabel>Datum</guilabel>, optional die <guilabel>Nr.</guilabel> (wie die
       Überweisungsnummer), Buchungs-<guilabel>Beschreibung</guilabel>, Gesamtbetrag für das
       laufende Konto (<guilabel>Gesamt Soll</guilabel> oder <guilabel>Gesamt Aufwand</guilabel>),
-      und den aktuellen Konten-<guilabel>Saldo</guilabel> nach der aktuellen Buchung.
-      Beachten Sie, dass in der erweiterten Ansicht der Spaltenkopf der
-      <guilabel>Buchungs</guilabel>spalte verschwindet und es gibt keinen Kontennamen in diesem
-      Feld. Diese Zeile zeigt Ihnen nur eine Zusammenfassung der Auswirkung der Buchung auf dem
-      laufenden Konto. Für mehr Informationen können Sie in die einzelnen Teilbuchungen schauen,
-      die die mehrteilige Buchung ausmachen.
+      und den aktuellen Konten-<guilabel>Saldo</guilabel> nach der aktuellen Buchung. Beachten Sie,
+      dass in der erweiterten Ansicht der Spaltenkopf der <guilabel>Buchungs</guilabel>spalte
+      verschwindet und es gibt keinen Kontennamen in diesem Feld. Diese Zeile zeigt Ihnen nur eine
+      Zusammenfassung der Auswirkung der Buchung auf dem laufenden Konto. Für mehr Informationen
+      können Sie in die einzelnen Teilbuchungen schauen, die die mehrteilige Buchung ausmachen.
     </para>
 
     <note>
@@ -476,15 +478,14 @@
       </mediaobject>
     </screenshot>
 
-    <para>Jede Teilbuchung enthält ein optionales Feld <guilabel>Aktion</guilabel> oder Art der
-      Teilbuchung, welches Sie entweder durch eintippen, oder durch Auswahl in einer Auswahlliste
-      eingeben können. Weiterhin enthält sie ein optionales Feld <guilabel>Buchungstext</guilabel>,
-      welches die Teilbuchung beschreibt. Jede Teilbuchung beeinflusst ein
-      <guilabel>Konto</guilabel>, welches aus einer mit Ihren Kontenbezeichnungen gefüllten
-      Auswahlliste gewählt werden kann. Das Feld <guilabel>J</guilabel> zeigt an, ob eine
-      Teilbuchung schon abgeglichen wurde. Die letzten zwei Spalten zeigen den Betrag der
-      Teilbuchung, und ob das Geld auf das Konto (Soll), oder von dem Konto (Haben) transferiert
-      wurde.
+    <para>Jede Teilbuchung enthält ein optionales Feld <guilabel>Aktion</guilabel> oder Art der Teilbuchung,
+      welches Sie entweder durch eintippen, oder durch Auswahl in einer Auswahlliste eingeben
+      können. Weiterhin enthält sie ein optionales Feld <guilabel>Buchungstext</guilabel>, welches
+      die Teilbuchung beschreibt. Jede Teilbuchung beeinflusst ein <guilabel>Konto</guilabel>,
+      welches aus einer mit Ihren Kontenbezeichnungen gefüllten Auswahlliste gewählt werden kann.
+      Das Feld <guilabel>J</guilabel> zeigt an, ob eine Teilbuchung schon abgeglichen wurde. Die
+      letzten zwei Spalten zeigen den Betrag der Teilbuchung, und ob das Geld auf das Konto (Soll),
+      oder von dem Konto (Haben) transferiert wurde.
     </para>
 
     <para>Wie schon in Kapitel <xref linkend="basics-accounting1" /> besprochen, muss für jede Buchung die
@@ -616,13 +617,13 @@
       <para>Um die Gehaltszahlung in der Buchungsansicht des Kontos <emphasis>Aktiva:Girokonto</emphasis>
         einzugeben klicken Sie auf eine neue Buchungszeile und klicken dann auf
         <guibutton>Vollständig</guibutton>. Geben Sie jetzt in der ersten Zeile die Beschreibung
-        der Buchung ein (zum Beispiel <quote>Lohn ALDI</quote>). In die darunterliegenden
-        Zeilen geben Sie nacheinander die verschiedenen Teilbuchungen ein, aus denen die Buchung
-        besteht. Wählen Sie zuerst das Konto, und geben danach den auf dieses Konto zu
-        transferierenden Betrag ein. Dann klicken Sie auf die nächste Zeile und wiederholen den
-        Vorgang. Beachten Sie, dass sich in der Aktivakontoansicht, der Betrag in der linken Spalte
-        das Saldo erhöht und der Betrag in der rechten Spalte das Saldo erniedrigt (mehr finden Sie
-        unter <xref linkend="basics-transactions2"/>). Nach Tab oder durch klicken kommen Sie in die
+        der Buchung ein (zum Beispiel <quote>Lohn ALDI</quote>). In die darunterliegenden Zeilen
+        geben Sie nacheinander die verschiedenen Teilbuchungen ein, aus denen die Buchung besteht.
+        Wählen Sie zuerst das Konto, und geben danach den auf dieses Konto zu transferierenden
+        Betrag ein. Dann klicken Sie auf die nächste Zeile und wiederholen den Vorgang. Beachten
+        Sie, dass sich in der Aktivakontoansicht, der Betrag in der linken Spalte das Saldo erhöht
+        und der Betrag in der rechten Spalte das Saldo erniedrigt (mehr finden Sie unter
+        <xref linkend="basics-transactions2"/>). Nach Tab oder durch klicken kommen Sie in die
         nächste Zeile der Teilbuchungen und wiederholen den Prozess. Nutzen Sie die
         <keycap>Enter</keycap>-Taste um die Buchung auf das Ausgleichskonto zu erzeugen.
       </para>
@@ -646,18 +647,19 @@
         Konto <emphasis>Ertrag:Gehalt</emphasis> ein.
       </para>
 
-      <para>Die komplette mehrteilige Buchung sollte wie in
-        <xref linkend="txns-register-multiaccount"/> aussehen. Vergessen Sie nicht, nach Eingabe der
-        Teilbuchungen, die Buchung durch Druck der Taste <keycap function="enter">Enter</keycap>
-        abzuschließen. Die Ansicht der Buchung wechselt durch Druck auf die Taste
-        <keycap function="enter">Enter</keycap> wieder auf die einzeilige Darstellung. Die Einträge
-        der Teilbuchungen sind noch vorhanden, und können durch klicken auf
-        <guilabel>Vollständig</guilabel> wieder angezeigt werden. Siehe auch
+      <para>Die komplette mehrteilige Buchung sollte wie in <xref linkend="txns-register-multiaccount"/>
+        aussehen. Vergessen Sie nicht, nach Eingabe der Teilbuchungen, die Buchung durch Druck der
+        Taste <keycap function="enter">Enter</keycap> abzuschließen. Die Ansicht der Buchung
+        wechselt durch Druck auf die Taste <keycap function="enter">Enter</keycap> wieder auf die
+        einzeilige Darstellung. Die Einträge der Teilbuchungen sind noch vorhanden, und können
+        durch klicken auf <guilabel>Vollständig</guilabel> wieder angezeigt werden. Siehe auch
         <xref linkend="txns-registers-features2"/> für weitere Einzelheiten.
       </para>
 
       <figure id="txns-register-multiaccount">
-        <title>Eingabe einer mehrteiligen Buchung</title><mediaobject>
+        <title>Eingabe einer mehrteiligen Buchung</title>
+
+        <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_multiaccount.png"
                        srccredit="Mechtilde Stehmann" />
@@ -1037,8 +1039,8 @@
     </para>
 
     <para>In &app; gibt es zwei Wege, um terminierte Buchungen anzulegen, <link linkend="txns-sxn-ledger2">in
-      der Buchungsansicht</link> oder durch den
-      <link linkend="txns-sxn-editor2">Editor für terminierte Buchungen</link>.
+      der Buchungsansicht</link> oder durch den <link linkend="txns-sxn-editor2">Editor für
+      terminierte Buchungen</link>.
     </para>
 
     <sect2 id="txns-sxn-ledger2">
@@ -1588,9 +1590,9 @@
         <listitem>
           <para>In der Buchungsansicht des Kontos <emphasis>Aktiva:Barvermögen:Sparkonto</emphasis> geben Sie für
             den Anfangsbestand eine 2-Konten-Buchung von 1000,-€ ein, übertragen von
-            <emphasis>Anfangsbestand</emphasis>. Erinnern Sie sich, dass eine Basisbuchung Geld
-            von einem Quellkonto auf ein Zielkonto überweist. Zeichnen Sie die Buchung auf
-            (Drücken der <keycap function="enter">Enter</keycap>-Taste oder klicken Sie auf das
+            <emphasis>Anfangsbestand</emphasis>. Erinnern Sie sich, dass eine Basisbuchung Geld von
+            einem Quellkonto auf ein Zielkonto überweist. Zeichnen Sie die Buchung auf (Drücken
+            der <keycap function="enter">Enter</keycap>-Taste oder klicken Sie auf das
             <guibutton>Übernehmen</guibutton> Symbol).
           </para>
         </listitem>
@@ -1642,10 +1644,10 @@
       <title>Zusätzliche Buchungsbeispiele</title>
 
       <para>Fügen Sie nun einige Buchungen hinzu, um die monatlichen Aufwendungen nachzubilden. Während des
-        Monats werden 78,- € für Strom, 45,- € für Telefon und 350,- € für Miete gezahlt. Alles
-        wird vom Girokonto bezahlt. Wir zahlen auch 45,21 € für Lebensmittel, erhalten 670,- €
-        Gehalt und zahlen unsere Internetrechnung diesen Monat. Schließlich übertragen wir 100,-
-        € vom Sparkonto auf das Girokonto.
+        Monats werden 78,- € für Strom, 45,- € für Telefon und 350,- € für Miete gezahlt.
+        Alles wird vom Girokonto bezahlt. Wir zahlen auch 45,21 € für Lebensmittel, erhalten
+        670,- € Gehalt und zahlen unsere Internetrechnung diesen Monat. Schließlich übertragen
+        wir 100,- € vom Sparkonto auf das Girokonto.
       </para>
 
       <orderedlist>
@@ -1715,11 +1717,11 @@
         </listitem>
 
         <listitem>
-          <para>Als weiteres Beispiel einer einfachen 2-Konten-Buchung fügen Sie eine weitere Buchung hinzu, um
-            die Ausgabe von 45,21 € für Lebensmittel vom 05.03.2015 zu beschreiben. Im Konto
-            <emphasis>Aktiva:Barvermögen:Girokonto</emphasis> <guilabel>Buchen</guilabel> Sie
-            auf <emphasis>Aufwendungen:Lebensmittel</emphasis>.
-            <!-- "Die Kontenansicht erscheint nun:" fehlendes Bild? -->
+          <para>Als weiteres Beispiel einer einfachen 2-Konten-Buchung fügen Sie eine weitere Buchung hinzu, um die
+            Ausgabe von 45,21 € für Lebensmittel vom 05.03.2015 zu beschreiben. Im Konto
+            <emphasis>Aktiva:Barvermögen:Girokonto</emphasis> <guilabel>Buchen</guilabel> Sie auf
+            <emphasis>Aufwendungen:Lebensmittel</emphasis>.
+<!-- "Die Kontenansicht erscheint nun:" fehlendes Bild? -->
           </para>
         </listitem>
 
@@ -1730,10 +1732,10 @@
             zuerst das Buchungsdatum (14. März) und die Beschreibung der Buchung ein (Zum Beispiel
             <quote>Arbeitgeber</quote>). In den folgenden Zeilen der Teilbuchungen geben Sie die
             Einzahlung auf das Konto <emphasis>Aktiva:Girokonto</emphasis> (670,- €), gefolgt von
-            den verschiedenen Abgaben <emphasis>Aufwendungen:Steuern:Einkommensteuer</emphasis> (180,-
-            €), <emphasis>Aufwendungen:Steuern:Krankenversicherung</emphasis> (90,- €), und
-            <emphasis>Aufwendungen:Steuern:Rentenversicherung</emphasis> (60,- €) und zuletzt das
-            Bruttogehalt (1.000,- €) als Abbuchung von Ihrem Konto
+            den verschiedenen Abgaben <emphasis>Aufwendungen:Steuern:Einkommensteuer</emphasis>
+            (180,- €), <emphasis>Aufwendungen:Steuern:Krankenversicherung</emphasis> (90,- €),
+            und <emphasis>Aufwendungen:Steuern:Rentenversicherung</emphasis> (60,- €) und zuletzt
+            das Bruttogehalt (1.000,- €) als Abbuchung von Ihrem Konto
             <emphasis>Ertrag:Gehalt</emphasis>.
           </para>
         </listitem>
@@ -1795,7 +1797,8 @@
             <menuchoice>
               <guimenu>Berichte</guimenu> <guisubmenu>Aufwand & Ertrag</guisubmenu>
               <guimenuitem>Kapitalfluss</guimenuitem>
-            </menuchoice>.
+            </menuchoice>
+            .
           </para>
 
           <screenshot id="txns-puttoget2-Cash">
diff --git a/de/guide/fdl-appendix.xml b/de/guide/fdl-appendix.xml
index 2dd0ff8c..335a2fe1 100644
--- a/de/guide/fdl-appendix.xml
+++ b/de/guide/fdl-appendix.xml
@@ -557,9 +557,8 @@
     </para>
 
     <para>If your document contains nontrivial examples of program code, we recommend releasing these examples
-      in parallel under your choice of free software license, such as the
-      <ulink url="&url-gpl;">GNU General Public License</ulink>,
-      to permit their use in free software.
+      in parallel under your choice of free software license, such as the <ulink url="&url-gpl;">GNU
+      General Public License</ulink>, to permit their use in free software.
     </para>
   </sect1>
 </appendix>
diff --git a/de/guide/glossary.xml b/de/guide/glossary.xml
index 78adf5c5..66df9ad2 100644
--- a/de/guide/glossary.xml
+++ b/de/guide/glossary.xml
@@ -320,8 +320,7 @@
       <para>QIF-Dateien enthalten u.a. unzureichende Konto Informationen und können zu doppelten Transaktionen
         führen.
       </para>
-      <glossseealso>
-      <ulink url="&url-wp-en;Quicken_Interchange_Format"><citetitle>QIF
+      <glossseealso> <ulink url="&url-wp-en;Quicken_Interchange_Format"><citetitle>QIF
       Spezifikation</citetitle></ulink> </glossseealso>
       <glossseealso otherterm="ofx"></glossseealso>
     </glossdef>
@@ -361,8 +360,8 @@
         speichert seine Daten in einer einzigen portablen Datei. SQLite benötigt keine
         Konfiguration, keine Benutzerverwaltung und keinen Server.
       </para>
-      <glossseealso> <ulink url="&url-sqlite;/"><citetitle>SQLite
-      Homepage</citetitle></ulink> </glossseealso>
+      <glossseealso> <ulink url="&url-sqlite;/"><citetitle>SQLite Homepage</citetitle></ulink>
+      </glossseealso>
     </glossdef>
   </glossentry>
 
diff --git a/de/guide/index.docbook b/de/guide/index.docbook
index cad4aee9..200daa32 100644
--- a/de/guide/index.docbook
+++ b/de/guide/index.docbook
@@ -93,79 +93,110 @@
         <revnumber>&appname; Tutorial and Concepts Guide 5.2</revnumber>
         <date>25 June 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 5.1</revnumber>
         <date>30 April 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 5.0</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.14</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.903</revnumber>
         <date>12 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.900</revnumber>
         <date>8 January 2023</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.13</revnumber>
         <date>18 December 2022</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.12</revnumber>
         <date>25 September 2022</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.11</revnumber>
         <date>26 June 2022</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.10</revnumber>
         <date>27 March 2022</date>
@@ -177,6 +208,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.9</revnumber>
         <date>19 December 2021</date>
@@ -188,6 +220,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.8</revnumber>
         <date>28 September 2021</date>
@@ -198,8 +231,9 @@
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
-      </revision> 
-     <revision>
+      </revision>
+
+      <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.7</revnumber>
         <date>26 September 2021</date>
         <revdescription>
@@ -210,6 +244,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
         <date>27 June 2021</date>
@@ -221,370 +256,485 @@
           </para>
         </revdescription>
       </revision>
-      <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.5</revnumber>
-      <date>28 March 2021</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision>
-      <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
-      <date>28 December 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v4.3</revnumber>
-      <date>27 December 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v4.2</revnumber>
-      <date>27 September 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v4.1</revnumber>
-      <date>26 July 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v4.0</revnumber>
-      <date>28 June 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.11</revnumber>
-      <date>28 June 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.903</revnumber>
-      <date>1 June 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.10</revnumber>
-      <date>11 April 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.9</revnumber>
-      <date>29 March 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.8</revnumber>
-      <date>29 December 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.7</revnumber>
-      <date>8 September 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.6</revnumber>
-      <date>30 June 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.1</revnumber>
-      <date>31 March 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.1</revnumber>
-      <date>28 April 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.0</revnumber>
-      <date>1 April 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.20</revnumber>
-      <date>1 April 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.19</revnumber>
-      <date>16 December 2017</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.18</revnumber>
-      <date>24 September 2017</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.16</revnumber>
-      <date>26 March 2017</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.15</revnumber>
-      <date>18 December 2016</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.11</revnumber>
-      <date>11 January 2016</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.10</revnumber>
-      <date>20 December 2015</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.8</revnumber>
-      <date>27 September 2015</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.7</revnumber>
-      <date>28 June 2015</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.3</revnumber>
-      <date>30 March 2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.2</revnumber>
-      <date>2 March 2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.1</revnumber>
-      <date>26 January 2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.0</revnumber>
-      <date>29 December 2013</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.4.2</revnumber>
-      <date>17 November 2012</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.4.1</revnumber>
-      <date>1 July 2011</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.3.16</revnumber>
-      <date>November 7, 2010</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="author">Bengt Thuree
-        </para>
-
-        <para role="author">Dave Herman
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.0.0</revnumber>
-      <date>9. Juli 2006</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="author">Bengt Thuree
-        </para>
-
-        <para role="author">Dave Herman
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.3</revnumber>
-      <date>Aug 2003</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.2</revnumber>
-      <date>Aug 2003</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.1</revnumber>
-      <date>May 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.0</revnumber>
-      <date>Jan 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; User Guide v1.6.5</revnumber> <date>June
-      2002</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; User Guide v1.6.0</revnumber> <date>October
-      2001</date>
-      <revdescription>
-        <para role="author">Carol Champagne
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.5</revnumber>
+        <date>28 March 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v4.3</revnumber>
+        <date>27 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v4.2</revnumber>
+        <date>27 September 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v4.1</revnumber>
+        <date>26 July 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v4.0</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.11</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.903</revnumber>
+        <date>1 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.10</revnumber>
+        <date>11 April 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.9</revnumber>
+        <date>29 March 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.8</revnumber>
+        <date>29 December 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.7</revnumber>
+        <date>8 September 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.1</revnumber>
+        <date>31 March 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.1</revnumber>
+        <date>28 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.0</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.20</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.19</revnumber>
+        <date>16 December 2017</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.18</revnumber>
+        <date>24 September 2017</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.16</revnumber>
+        <date>26 March 2017</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.15</revnumber>
+        <date>18 December 2016</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.11</revnumber>
+        <date>11 January 2016</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.10</revnumber>
+        <date>20 December 2015</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.8</revnumber>
+        <date>27 September 2015</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.7</revnumber>
+        <date>28 June 2015</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.3</revnumber>
+        <date>30 March 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.2</revnumber>
+        <date>2 March 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.1</revnumber>
+        <date>26 January 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.0</revnumber>
+        <date>29 December 2013</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.4.2</revnumber>
+        <date>17 November 2012</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.4.1</revnumber>
+        <date>1 July 2011</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.3.16</revnumber>
+        <date>November 7, 2010</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="author">Bengt Thuree
+          </para>
+
+          <para role="author">Dave Herman
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.0.0</revnumber>
+        <date>9. Juli 2006</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="author">Bengt Thuree
+          </para>
+
+          <para role="author">Dave Herman
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.3</revnumber>
+        <date>Aug 2003</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.2</revnumber>
+        <date>Aug 2003</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.1</revnumber>
+        <date>May 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.0</revnumber>
+        <date>Jan 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; User Guide v1.6.5</revnumber>
+        <date>June 2002</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; User Guide v1.6.0</revnumber>
+        <date>October 2001</date>
+        <revdescription>
+          <para role="author">Carol Champagne
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
       </revision>
     </revhistory>
 
diff --git a/de/manual/ch_Account-Actions.xml b/de/manual/ch_Account-Actions.xml
index d2ee026f..1121ea23 100644
--- a/de/manual/ch_Account-Actions.xml
+++ b/de/manual/ch_Account-Actions.xml
@@ -43,11 +43,10 @@
       </para>
     </tip>
 
-    <para>Neben den im <ulink url="&url-docs-de;guide/accts-types1.html">&app; Tutorial und
-      Konzepte</ulink> beschriebenen grundsätzlichen Kontoarten bietet &app; noch ein paar
-      spezielle. Diese zeichnen sich insbesondere durch angepasste Vorschlagslisten –Zins- oder
-      Dividendenzahlung– im Aktion-Feld und angepaßte Aktionen –z.B. gibt es beim Bankkonto
-      keine Aktienteilung– aus.
+    <para>Neben den im <ulink url="&url-docs-de;guide/accts-types1.html">&app; Tutorial und Konzepte</ulink>
+      beschriebenen grundsätzlichen Kontoarten bietet &app; noch ein paar spezielle. Diese zeichnen
+      sich insbesondere durch angepasste Vorschlagslisten –Zins- oder Dividendenzahlung– im
+      Aktion-Feld und angepaßte Aktionen –z.B. gibt es beim Bankkonto keine Aktienteilung– aus.
     </para>
 
     <table frame="topbot" id="TypeAccounts">
@@ -94,8 +93,8 @@
             </entry>
 
             <entry namest="c3" nameend="c4">
-              <para>Die Auswertung &mc.rep.ass-lia.bal-she; gibt Ihnen eine Übersicht zu
-                jedem beliebigen <emphasis>Stichtag</emphasis>.
+              <para>Die Auswertung &mc.rep.ass-lia.bal-she; gibt Ihnen eine Übersicht zu jedem beliebigen
+                <emphasis>Stichtag</emphasis>.
               </para>
             </entry>
           </row>
@@ -165,7 +164,8 @@
                 Finanzinstitut geführt werden. Einige dieser Konten können Zinsen tragen. Diese
                 Kontoart eignet sich auch für das <emphasis>PayPal</emphasis>-Konto sowie Debit-
                 und andere Guthaben-Karten wie z.B. <emphasis>Bonus-Meilen</emphasis> und
-                <emphasis>Geldkarte</emphasis>.<footnote>
+                <emphasis>Geldkarte</emphasis>.
+                <footnote>
                   <para>Für einige dieser Konten besteht die Möglichkeit, per Online-Banking Aufträge an das
                     Geldinstitute zu senden sowie Buchungen abzurufen und zu importieren. (siehe
                     hierzu auch <xref linkend="trans-online" />)
@@ -177,7 +177,8 @@
 
           <row>
             <entry namest="c2" rowsep="1">
-              <para>(Offene) Forderungen<footnote id="fn-receivables-kat">
+              <para>(Offene) Forderungen
+                <footnote id="fn-receivables-kat">
                   <para><warning>
                       <para>Die Kontenarten Verbindlichkeiten und Forderungen werden zur Verwaltung offener Rechnungen, auch
                         <quote>offene Posten</quote> genannt, verwendet. Buchungen, die diese Konten
@@ -192,9 +193,12 @@
                             <para>verarbeiten von Zahlung
                             </para>
                           </listitem>
-                        </itemizedlist>hinzugefügt, geändert oder gelöscht werden.
+                        </itemizedlist>
+                        hinzugefügt, geändert oder gelöscht werden.
                       </para>
-                    </warning><tip>
+                    </warning>
+
+                    <tip>
                       <para>Legen Sie nur ein Konto pro benötigter Währung an. Die verschiedenen Kunden, bzw Lieferanten hält
                         &app; automatisch auseinander.
                       </para>
@@ -229,10 +233,13 @@
 
             <entry namest="c3">
               <para>Die Aktie ist ein Wertpapier, das den Anteil an einer Aktiengesellschaft oder einer
-                Kommanditgesellschaft auf Aktien (KGaA) verbrieft.<footnote>
+                Kommanditgesellschaft auf Aktien (KGaA) verbrieft.
+                <footnote>
                   <para><ulink url="&url-wp-de;Aktie"/>
                   </para>
-                </footnote><footnote>
+                </footnote>
+
+                <footnote>
                   <para><tip>
                       <para>Solange Kryptowährungen von &app; nicht als Währungen unterstützt werden, wird empfohlen, sie
                         ebenfalls als Aktie anzulegen.
@@ -288,11 +295,10 @@
             </entry>
 
             <entry namest="c3">
-              <para>Die Kontoart Kreditkarte kommt für die Konten zum Einsatz, die im Gegensatz zu normalen
-                Bankkonten häufig im Minus sind. Diese Kontoart kann sowohl für Kreditkarten die
-                eine gleitende Kreditlinie erlauben (z. B. VISA, oder MasterCard) als auch bei
-                Karten, die keine laufenden Guthaben zulassen (z. B. American Express), verwendet
-                werden.
+              <para>Die Kontoart Kreditkarte kommt für die Konten zum Einsatz, die im Gegensatz zu normalen Bankkonten
+                häufig im Minus sind. Diese Kontoart kann sowohl für Kreditkarten die eine
+                gleitende Kreditlinie erlauben (z. B. VISA, oder MasterCard) als auch bei Karten,
+                die keine laufenden Guthaben zulassen (z. B. American Express), verwendet werden.
               </para>
             </entry>
           </row>
@@ -346,7 +352,8 @@
 
           <row rowsep="1">
             <entry namest="c1" nameend="c2">
-              <para>Erfolgskonten<footnote id="fn-quick-kat">
+              <para>Erfolgskonten
+                <footnote id="fn-quick-kat">
                   <para>Wird in <application>Quicken</application> bzw. <application>Lexware FinanzManager</application> und
                     anderen, nicht auf doppelter Buchführung basierenden, Programmen als
                     <quote>Kategorie</quote> bezeichnet.
@@ -372,7 +379,8 @@
 
             <entry namest="c3">
               <para>Einnahmen jeder Art, die Sie z.B. durch Gehalt, geldwerte Vorteile (Dienstwagen), Zinsen, Dividenden
-                oder auch Geschenke usw. haben. <footnoteref linkend="fn-quick-kat" /><!-- footnoteref funktioniert in Yelp nicht ! -->
+                oder auch Geschenke usw. haben. <footnoteref linkend="fn-quick-kat" />
+<!-- footnoteref funktioniert in Yelp nicht ! -->
               </para>
             </entry>
 
@@ -474,7 +482,8 @@
                 Devisenhandels. Sobald sie den ersten Kauf tätigen, etwa Umtausch Ihrer
                 Heimwährung in die des Urlaubslandes, wird für beide Währungen ein Konto
                 angelegt, sofern es nicht bereits existiert. Die Details hat Peter Selinger in
-                &ulink-sel-tut; und &ulink-sel-gnc; beschrieben (nur in englischer Sprache verfügbar).
+                &ulink-sel-tut; und &ulink-sel-gnc; beschrieben (nur in englischer Sprache
+                verfügbar).
               </para>
             </entry>
 
@@ -525,7 +534,8 @@
       dargestellt und nicht die Einzelkonten.
     </para>
 
-    <para>Eine Kontenhierarchie könnte beispielsweise wie folgt aussehen:<xi:include href="chtacctseg.xml"/>
+    <para>Eine Kontenhierarchie könnte beispielsweise wie folgt aussehen:
+      <xi:include href="chtacctseg.xml"/>
     </para>
 
     <tip id="accts-code">
@@ -545,8 +555,9 @@
         vermeiden um eine Eindeutigkeit zu erzielen. Es bietet sich an, bei der Festlegung der
         Kontonummern zunächst die Ziffern zu verwenden. Reichen die nicht aus, können Sie auch die
         Buchstaben <quote>a</quote> bis <quote>z</quote> benutzen. &app; kann Sie bei der
-        Nummerierung Ihre Konten unterstützen. Verwenden Sie hierfür den Assistenten &mc.ed.acc-renum;
-        zu Hilfe. Ein Beispiel ist in <xref linkend="chart-renumber" /> beschrieben.
+        Nummerierung Ihre Konten unterstützen. Verwenden Sie hierfür den Assistenten
+        &mc.ed.acc-renum; zu Hilfe. Ein Beispiel ist in <xref linkend="chart-renumber" />
+        beschrieben.
       </para>
     </tip>
 <!-- FIXME Is this section still valid? -->
@@ -565,20 +576,22 @@
     </para>
 
     <tip>
-      <para>Sie können den Assistenten später erneut ausführen. Hierfür gehen Sie im Menü zu &mc.fi.new; 
-        falls Sie eine neue Datei erstellen wollen. Wenn Sie den Assistenten innerhalb der geöffneten Datei
-        laufen lassen wollen, benutzen Sie stattdessen &mc.ac.act-hier; wenn das Kontenhierarchie-Register
-        angezeigt wird.
+      <para>Sie können den Assistenten später erneut ausführen. Hierfür gehen Sie im Menü zu &mc.fi.new;
+        falls Sie eine neue Datei erstellen wollen. Wenn Sie den Assistenten innerhalb der
+        geöffneten Datei laufen lassen wollen, benutzen Sie stattdessen &mc.ac.act-hier; wenn das
+        Kontenhierarchie-Register angezeigt wird.
       </para>
     </tip>
 
     <figure pgwide="1">
       <title>Der Assistent <quote>Neuen Kontoplan erstellen</quote></title>
+
       <screenshot>
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/AccountTreeCreate.png" srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
+
           <imageobject role="fo">
             <imagedata fileref="figures/AccountTreeCreate.png" srccredit="Christian Wehling" />
           </imageobject>
@@ -663,9 +676,10 @@
             <para>Dieser Dialogschritt wird <emphasis>nicht</emphasis> angezeigt, wenn Sie den Assistenten in der
               Kontenansicht einer bestehen &app;-Datei mit dem Menüpunkt &mc.ac.act-hier; starten.
             </para>
-          </note>In diesem Schritt können Sie generelle Einstellungen für die &app;-Datei vornehmen, die in der
-          Datei gespeichert werden und somit für alle Benutzer gelten. Der Dialog wird ausführlich
-          in <xref linkend="book-options" /> beschrieben.
+          </note>
+          In diesem Schritt können Sie generelle Einstellungen für die &app;-Datei vornehmen, die
+          in der Datei gespeichert werden und somit für alle Benutzer gelten. Der Dialog wird
+          ausführlich in <xref linkend="book-options" /> beschrieben.
         </para>
       </step>
 
@@ -679,8 +693,8 @@
         <para>Die Dropdown-Liste ist standardmäßig auf die Währung eingestellt, die in der Registerkarte
           <xref linkend="prefs-accounts"/> in den <guilabel>&appname; Einstellungen</guilabel>
           eingestellt ist. Sie erreichen diesen Dialog im Menü &mc.ed.pref;. Wenn Sie stattdessen
-          für Ihre Konten eine andere Standardwährung verwenden wollen, wählen Sie
-          diese aus der Liste aus.
+          für Ihre Konten eine andere Standardwährung verwenden wollen, wählen Sie diese aus der
+          Liste aus.
         </para>
       </step>
 
@@ -848,9 +862,9 @@
     <title>Kontenplan bearbeiten</title>
 
     <para>Wenn Sie Ihren aktuellen Kontenplan modifizieren möchten, so können Sie das mit dem Menüeintrag
-      &mc.ed.acc-edit;
-      durchführen oder Sie betätigen die <guibutton>Bearbeiten</guibutton>-Schaltfläche in der
-      <guilabel>Werkzeugleiste</guilabel> der <quote>Kontenübersicht</quote>.
+      &mc.ed.acc-edit; durchführen oder Sie betätigen die
+      <guibutton>Bearbeiten</guibutton>-Schaltfläche in der <guilabel>Werkzeugleiste</guilabel> der
+      <quote>Kontenübersicht</quote>.
     </para>
 
     <para>Es öffnet sich der Dialog <guilabel>Konto bearbeiten</guilabel>, in dessem unteren Bereich das
@@ -880,10 +894,11 @@
     </caution>
 <!-- Translators: For your country list search https://github.com/Gnucash/gnucash/tree/maint/data/accounts for the usual language+country codes -->
     <tip>
-      <para>Für einige Länder wie AT, CH, DE haben Anwender einige Vorlagen beigesteuert, die Sie im dritten Schritt
-        des Assistenten zur <xref linkend="acct-hierarchy" /> auswählen können. Sofern Sie auch
-        einen noch fehlenden Kontenrahmen oder Verbesserungen an einem vorhandenen beisteuern
-        möchten, informieren sie sich bitte unter <ulink url="&url-wiki;Account_Hierarchy_Template"/> (in Englisch).
+      <para>Für einige Länder wie AT, CH, DE haben Anwender einige Vorlagen beigesteuert, die Sie im dritten
+        Schritt des Assistenten zur <xref linkend="acct-hierarchy" /> auswählen können. Sofern Sie
+        auch einen noch fehlenden Kontenrahmen oder Verbesserungen an einem vorhandenen beisteuern
+        möchten, informieren sie sich bitte unter
+        <ulink url="&url-wiki;Account_Hierarchy_Template"/> (in Englisch).
       </para>
     </tip>
   </sect1>
@@ -894,21 +909,19 @@
     <abstract>
       <para>Wenn Sie erst einmal für Ihre Konten einen Kontenplan angelegt haben, werden Sie im Laufe der Zeit
         die Notwendigkeit sehen, diesen zu erweitern oder in Details anzupassen. In diesem Abschnitt
-        wird beschrieben, wie Sie ein neues Konto anlegen oder die Eigenschaften für ein vorhandenes
-        Konto bearbeiten können.
+        wird beschrieben, wie Sie ein neues Konto anlegen oder die Eigenschaften für ein
+        vorhandenes Konto bearbeiten können.
       </para>
     </abstract>
 
     <para>Um ein <emphasis>neues Konto anzulegen</emphasis> wählen Sie in der Kontenübersicht in dem Menü
-      &mc.ac.act-new;
-      oder klicken auf die Schaltfläche <guibutton>Neu</guibutton> in der
+      &mc.ac.act-new; oder klicken auf die Schaltfläche <guibutton>Neu</guibutton> in der
       <guilabel>Werkzeugleiste</guilabel> und der Dialog <guilabel>Neues Konto</guilabel> wird
       geöffnet.
     </para>
 <!-- FIXME source: changed content from "account edit" -->
     <para>Wollen Sie stattdessen ein <emphasis>vorhandenes Konto bearbeiten</emphasis>, wählen Sie
-      &mc.ed.acc-edit;
-      oder klicken die <guibutton>Bearbeiten</guibutton>-Schaltfläche in der
+      &mc.ed.acc-edit; oder klicken die <guibutton>Bearbeiten</guibutton>-Schaltfläche in der
       <guilabel>Werkzeugleiste</guilabel> des Fensters <quote>Konten</quote> an, woraufhin sich der
       Dialog <guilabel>Konto bearbeiten</guilabel> öffnet.
     </para>
@@ -956,7 +969,9 @@
       </para>
 
       <figure pgwide="1">
-        <title>Neues Konto erstellen oder bearbeiten, Reiter Allgemein</title><screenshot>
+        <title>Neues Konto erstellen oder bearbeiten, Reiter Allgemein</title>
+
+        <screenshot>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/AcctCreate_General.png" 
@@ -1040,11 +1055,11 @@
             </para>
 
             <tip>
-              <para>Grundsätzlich speichert und arbeitet &app; mit rationalen Zahlen. Somit treten bei der
-                Ausgabe einer Dezimalzahl dann bei heutigen 64-bit-Prozessoren nach maximal
-                9 Dezimalstellen Rundungsfehler auf. Wenn Ihre schöne neue Kryptowährung ZZZ nun 12
-                Dezimalstellen hat, empfiehlt es sich, sie zur korrekten Darstellung in Tausendstel zu
-                erfassen und mit mZZZ zu bezeichnen.
+              <para>Grundsätzlich speichert und arbeitet &app; mit rationalen Zahlen. Somit treten bei der Ausgabe
+                einer Dezimalzahl dann bei heutigen 64-bit-Prozessoren nach maximal 9 Dezimalstellen
+                Rundungsfehler auf. Wenn Ihre schöne neue Kryptowährung ZZZ nun 12 Dezimalstellen
+                hat, empfiehlt es sich, sie zur korrekten Darstellung in Tausendstel zu erfassen und
+                mit mZZZ zu bezeichnen.
               </para>
             </tip>
           </listitem>
@@ -1078,9 +1093,9 @@
           <listitem>
             <para><guilabel>Steuerrelevant</guilabel> bedeutet, dass das Konto ausgewählt wurde, um in einem
               Steuer-Bericht berücksichtigt zu werden. Dieses Kennzeichen wird hier nur angezeigt
-              und ist im Dialog <guilabel>Optionen Steuerbericht</guilabel> einzustellen (&mc.ed.tax-rep-opt;).
-              Der dazu gehörige Bericht ist im Menü &mc.rep.tax-xml; zu finden.
-              Siehe auch <xref linkend="report-regional"/>.
+              und ist im Dialog <guilabel>Optionen Steuerbericht</guilabel> einzustellen
+              (&mc.ed.tax-rep-opt;). Der dazu gehörige Bericht ist im Menü &mc.rep.tax-xml; zu
+              finden. Siehe auch <xref linkend="report-regional"/>.
             </para>
           </listitem>
         </varlistentry>
@@ -1090,18 +1105,17 @@
 
           <listitem>
             <para>Mit diesem Kontrollkästchen wird ein Konto (und alle Unterkonten) in der Kontenübersicht
-              ausgeblendet. Das kann sinnvoll sein, wenn das Konto <quote>geschlossen</quote> wurde, also
-              in der aktuellen Buchführungsperiode nicht mehr verwendet wird, weil z.B. das enthaltene
-              Wertpapier vor Jahren verkauft wurde.
+              ausgeblendet. Das kann sinnvoll sein, wenn das Konto <quote>geschlossen</quote> wurde,
+              also in der aktuellen Buchführungsperiode nicht mehr verwendet wird, weil z.B. das
+              enthaltene Wertpapier vor Jahren verkauft wurde.
             </para>
 
-            <para>Um diese Option zurückzusetzen, müssen Sie zunächst den &mc.vw.f-by;
-              Dialog für den Kontenbaum öffnen und die Option <guilabel>Versteckte Konten
-              anzeigen</guilabel> aktivieren. Auf diese Weise können Sie das Konto auswählen und
-              diesen Dialog erneut öffnen.
+            <para>Um diese Option zurückzusetzen, müssen Sie zunächst den &mc.vw.f-by; Dialog für den Kontenbaum
+              öffnen und die Option <guilabel>Versteckte Konten anzeigen</guilabel> aktivieren. Auf
+              diese Weise können Sie das Konto auswählen und diesen Dialog erneut öffnen.
               <note>
-                <para>Versteckte Konten erscheinen weiterhin in der Kontenliste eines Registers. Um ein Konto auch
-                  aus dieser Kontenliste zu entfernen, aktivieren Sie das Kontrollkästchen
+                <para>Versteckte Konten erscheinen weiterhin in der Kontenliste eines Registers. Um ein Konto auch aus
+                  dieser Kontenliste zu entfernen, aktivieren Sie das Kontrollkästchen
                   <guilabel>Platzhalter</guilabel>.
                 </para>
               </note>
@@ -1128,8 +1142,8 @@
 
               <note>
                 <para>Wenn Sie ein Konto als <guilabel>Platzhalter</guilabel> deklarieren, wird dieses Konto auch in der
-                  Kontenliste eines Registers ausgeblendet. Unterkonten des Platzhalterkontos
-                  werden jedoch weiterhin im Popup-Fenster angezeigt.
+                  Kontenliste eines Registers ausgeblendet. Unterkonten des Platzhalterkontos werden
+                  jedoch weiterhin im Popup-Fenster angezeigt.
                 </para>
               </note>
             </para>
@@ -1142,8 +1156,9 @@
           <listitem>
             <para>Mit einer <guilabel>Automatischen Zinsbuchung</guilabel> wird angegeben, dass vor dem Abgleichen
               eines Kontos mit Haben- oder Sollzinsen nachgefragt wird, ob eine Buchung für die
-              Zinszahlung erstellt wird. Logischerweise ist das nur für <emphasis>Bestandskonten</emphasis> möglich,
-              macht jedoch für Konten vom Typ <emphasis>Aufwand</emphasis> und <emphasis>Ertrag</emphasis> keinen Sinn.
+              Zinszahlung erstellt wird. Logischerweise ist das nur für
+              <emphasis>Bestandskonten</emphasis> möglich, macht jedoch für Konten vom Typ
+              <emphasis>Aufwand</emphasis> und <emphasis>Ertrag</emphasis> keinen Sinn.
             </para>
           </listitem>
         </varlistentry>
@@ -1154,8 +1169,8 @@
           <listitem>
             <para>Wenn dieses Konto die Anfangsbestand-Buchungen enthalten soll, dann ist dieses Kontrollkästchen zu
               aktivieren. Pro Währung kann nur ein Konto die Buchungen des Anfangsbestands
-              enthalten. Wobei nur Konten vom Typ <emphasis>Eigenkapital</emphasis> die Gegenbuchungen
-              des Anfangsbestands aufnehmen können.
+              enthalten. Wobei nur Konten vom Typ <emphasis>Eigenkapital</emphasis> die
+              Gegenbuchungen des Anfangsbestands aufnehmen können.
             </para>
           </listitem>
         </varlistentry>
@@ -1211,9 +1226,9 @@
       </para>
 
       <note>
-        <para>Der Reiter <guilabel>Anfangsbestand</guilabel> wird <emphasis>nicht</emphasis> eingeblendet,
-          wenn Sie die Eigenschaften für ein Konto der letzten Hierarchiestufe <emphasis>bearbeiten</emphasis>
-          und dieses bereits Buchungen enthält.
+        <para>Der Reiter <guilabel>Anfangsbestand</guilabel> wird <emphasis>nicht</emphasis> eingeblendet, wenn
+          Sie die Eigenschaften für ein Konto der letzten Hierarchiestufe
+          <emphasis>bearbeiten</emphasis> und dieses bereits Buchungen enthält.
         </para>
       </note>
 
@@ -1225,7 +1240,9 @@
       </note>
 
       <figure pgwide="1">
-        <title>Neues Konto erstellen, Reiter Anfangsbestand</title><screenshot>
+        <title>Neues Konto erstellen, Reiter Anfangsbestand</title>
+
+        <screenshot>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/AcctCreate_OpenBal.png" 
@@ -1237,15 +1254,15 @@
 
       <para>Wenn Sie ihre &app;-Datei über einen längeren Zeitraum fortlaufend nutzen, können Sie mit Hilfe
         des <xref linkend="tool-close-book" /> (&mc.to.cls-bok;) den Anfangsbestand automatisch
-        berechnen lassen. Hierbei ist der Abschlußsaldo der vorherigen
-        Periode der Anfangsbestand der neuen Periode.
+        berechnen lassen. Hierbei ist der Abschlußsaldo der vorherigen Periode der Anfangsbestand
+        der neuen Periode.
       </para>
 <!-- FIXME source: insert Link to "Guide" -->
       <note>
         <para>Für Konten vom Typ <emphasis>Aktien</emphasis> und <emphasis>Investmentfonds</emphasis> müssen Sie
           die Anfangsbestände händisch eingeben. Bitte lesen Sie hierfür im
-          <ulink url="&url-docs-de;guide/invest-buy-stock1.html">&app; Tutorial und
-          Konzepte</ulink> die Beispiele, wie Sie diese Eingaben vornehmen können.
+          <ulink url="&url-docs-de;guide/invest-buy-stock1.html">&app; Tutorial und Konzepte</ulink>
+          die Beispiele, wie Sie diese Eingaben vornehmen können.
         </para>
       </note>
 
@@ -1303,9 +1320,8 @@
   <sect1 id="chart-renumber">
     <title>Neunummerierung der Unterkonten</title>
 
-    <para>Verwenden Sie &mc.ed.acc-renum;, um die Kontonummern für alle Unterkonten
-      des aktuellen Kontos neu zu schreiben. Sie haben zum Beispiel die folgende
-      Kontostruktur:
+    <para>Verwenden Sie &mc.ed.acc-renum;, um die Kontonummern für alle Unterkonten des aktuellen Kontos neu
+      zu schreiben. Sie haben zum Beispiel die folgende Kontostruktur:
     </para>
 
     <table frame="topbot" id="table-renumber1">
@@ -1621,18 +1637,21 @@
   <sect1 id="acct-cascade">
     <title>Kontoeigenschaften vererben</title>
 
-    <para>Mit dem Menübefehl &mc.ed.acc-casc;
-      in der Ansicht der Kontenhierarchie haben Sie die Möglichkeit, einige Eigenschaften auf das
-      aktuell ausgewählte Konto und die dazugehörigen Unterkonten zu übertragen.
+    <para>Mit dem Menübefehl &mc.ed.acc-casc; in der Ansicht der Kontenhierarchie haben Sie die Möglichkeit,
+      einige Eigenschaften auf das aktuell ausgewählte Konto und die dazugehörigen Unterkonten zu
+      übertragen.
     </para>
 
     <figure pgwide="1">
-      <title>Kontoeigenschaften vererben</title><screenshot>
+      <title>Kontoeigenschaften vererben</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/AccountTreeCascade.png" 
                          srccredit="Christian Wehling" width="&img-w;"/>
           </imageobject>
+
           <imageobject role="fo">
             <imagedata fileref="figures/AccountTreeCascade.png" 
                          srccredit="Christian Wehling"/>
@@ -1724,18 +1743,18 @@
     <title>Konto löschen</title>
 <!-- FIXME source: new behavior, it open a new dialog "account delete" -->
     <para>Wenn Sie ein Konto löschen wollen, dann können Sie dies in der Kontenhierarchie mit
-      &mc.ed.acc-del; vornehmen oder Sie betätigen die <guibutton>Löschen</guibutton>-Schaltfläche in der
-      <guilabel>Werkzeugleiste</guilabel> des Fensters <quote>Konten</quote>.
+      &mc.ed.acc-del; vornehmen oder Sie betätigen die
+      <guibutton>Löschen</guibutton>-Schaltfläche in der <guilabel>Werkzeugleiste</guilabel> des
+      Fensters <quote>Konten</quote>.
     </para>
 
     <tip>
       <para>Es empfiehlt sich, dass Sie vor dem Löschen eines Kontos die &app;-Datei speichern. Habe Sie aus
-        Versehen ein Konto gelöscht, so können Sie sich mit dem Befehl &mc.fi.rev; aus der Bedrouille
-        befreien. &app; bietet Ihnen dann in einem Dialog an, ob Sie die Änderungen
+        Versehen ein Konto gelöscht, so können Sie sich mit dem Befehl &mc.fi.rev; aus der
+        Bedrouille befreien. &app; bietet Ihnen dann in einem Dialog an, ob Sie die Änderungen
         verwerfen möchten und die Datei erneut laden wollen.
       </para>
     </tip>
-
 <!-- Verbesserungsvorschlag: Fallunterscheidung in Liste verwandeln.
      Entweder einfach in <itemizedlist> 
      oder mit der jeweiligen Bedingung als <term> einer <variablelist> -->
@@ -1745,7 +1764,9 @@
     </para>
 
     <figure>
-      <title>Warnhinweis beim Löschen von Konten inklusive Unterkonten</title><screenshot>
+      <title>Warnhinweis beim Löschen von Konten inklusive Unterkonten</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/chart_acct_delete_msg.png" 
@@ -1774,7 +1795,9 @@
           <row valign="bottom">
             <entry>
               <para><figure>
-                  <title>Unterkonten</title><screenshot>
+                  <title>Unterkonten</title>
+
+                  <screenshot>
                     <mediaobject>
                       <imageobject>
                         <imagedata fileref="figures/chart_acct_delete_01.png" 
@@ -1788,7 +1811,9 @@
 
             <entry>
               <para><figure>
-                  <title>Buchungen</title><screenshot>
+                  <title>Buchungen</title>
+
+                  <screenshot>
                     <mediaobject>
                       <imageobject>
                         <imagedata fileref="figures/chart_acct_delete_02.png" 
@@ -1802,7 +1827,9 @@
 
             <entry>
               <para><figure>
-                  <title>Buchungen in Unterkonten</title><screenshot>
+                  <title>Buchungen in Unterkonten</title>
+
+                  <screenshot>
                     <mediaobject>
                       <imageobject>
                         <imagedata fileref="figures/chart_acct_delete_03.png" 
@@ -1947,16 +1974,15 @@
         abgleichen, haben Sie die Möglichkeit, mit Hilfe des sich automatisch öffnenden
         <guilabel>Buchen</guilabel>-Dialogs eine Überweisung zum Bezahlen der offenen Rechnung zu
         erfassen. Dieses Verhalten können Sie in den <guilabel>&app; Einstellungen</guilabel> im
-        Menü &mc.ed.pref; im Reiter <xref linkend="prefs-reg" /> durch betätigen des Kontrollkästchens
-        <guilabel>Automatische Kreditkartenbezahlung</guilabel> beeinflussen.
+        Menü &mc.ed.pref; im Reiter <xref linkend="prefs-reg" /> durch betätigen des
+        Kontrollkästchens <guilabel>Automatische Kreditkartenbezahlung</guilabel> beeinflussen.
       </para>
     </note>
 
     <tip>
       <para>Das Fenster <guilabel>Abgleichen</guilabel> wird aus der Kontohierarchie oder dem Buchungsfenster
         aufgerufen, indem Sie im Menü &mc.ac.rec; auswählen oder Sie verwenden die
-        <guibutton>Abgleichen</guibutton>-Schaltfläche in der
-        <guilabel>Werkzeugleiste</guilabel>.
+        <guibutton>Abgleichen</guibutton>-Schaltfläche in der <guilabel>Werkzeugleiste</guilabel>.
       </para>
     </tip>
 
@@ -2047,9 +2073,8 @@
       <note>
         <para>Wenn Sie die Option <guilabel>Buchungsüberschriften aus Rechnungswesen</guilabel> in dem Abschnitt
           <guilabel>Konten</guilabel> im &app; Menü &mc.ed.pref; aktiviert haben, werden die beiden
-          Listenbereiche mit <guilabel>Soll</guilabel> und
-          <guilabel>Haben</guilabel> anstelle von <guilabel>Gutschrift</guilabel> und
-          <guilabel>Belastung</guilabel> bezeichnet sein.
+          Listenbereiche mit <guilabel>Soll</guilabel> und <guilabel>Haben</guilabel> anstelle von
+          <guilabel>Gutschrift</guilabel> und <guilabel>Belastung</guilabel> bezeichnet sein.
         </para>
       </note>
 
@@ -2120,9 +2145,11 @@
       <tip>
         <para>Sie können alle Buchungen gleichzeit in einem der beiden Bereiche auswählen und als abgeglichen
           kennzeichnen, indem Sie auf eine Buchung im gewünschten Bereich klicken und dann die
-          Tastenkombination <keycombo action='simul'>
+          Tastenkombination
+          <keycombo action='simul'>
             &kc.ctrl;<keycap>A</keycap>&kc.space;
-          </keycombo> betätigen. Dies schaltet den Status des Abgleichs für alle Buchungen im Fensterbereich
+          </keycombo>
+          betätigen. Dies schaltet den Status des Abgleichs für alle Buchungen im Fensterbereich
           gleichzeitig entweder auf markiert oder nicht markiert. Der Vorgang kann wiederholt
           werden, um den gewünschten Status für die Geschäftsvorgänge im Fensterbereich zu
           erreichen.
@@ -2205,9 +2232,9 @@
       </para>
 
       <para>Wenn Sie den Abgleich bis zu einem späteren Zeitpunkt unterbechen wollen, wählen Sie im Menü
-        &mc.rec.rec.pp; oder verwenden die Schaltfläche <guibutton>Unterbrechen</guibutton>. Zum Abbrechen des
-        Abgleichvorgangs verwenden Sie den Menüpunkt &mc.rec.rec.cnl; oder drücken Sie
-        <guibutton>Abbrechen</guibutton>.
+        &mc.rec.rec.pp; oder verwenden die Schaltfläche <guibutton>Unterbrechen</guibutton>. Zum
+        Abbrechen des Abgleichvorgangs verwenden Sie den Menüpunkt &mc.rec.rec.cnl; oder drücken
+        Sie <guibutton>Abbrechen</guibutton>.
       </para>
 <!-- FIXME source: delete sentence -->
       <para>Wählen Sie jeden nicht abgeglichenen Geschäftsvorgang, der sich auf dem Kontoauszug wiederfindet,
@@ -2229,7 +2256,8 @@
       wird, da es sich um ein festes Format handelt. Falls ein Konto mit der
       <guilabel>vollständigen Kontobezeichnung</guilabel> bisher nicht existiert, wird es erstellt,
       sofern die Währung oder das Wertpapier, in dem es notiert wird, bereits im Programm oder
-      Ihrer &app;-Datei definiert ist.<note>
+      Ihrer &app;-Datei definiert ist.
+      <note>
         <para>Eine weitere Möglichkeit, Konten zu importieren, bietet der Assistent für das
           <xref linkend="trans-import-qif" />. Im Zuge diese Importvorgangs werden ebenfalls Konten
           in Ihre &app;-Datendatei importiert.
@@ -2263,7 +2291,9 @@
     </para>
 
     <figure pgwide="1">
-      <title>Assistent für den Import von Konten im CSV-Format</title><screenshot id="accounts-import-csv-wizard">
+      <title>Assistent für den Import von Konten im CSV-Format</title>
+
+      <screenshot id="accounts-import-csv-wizard">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/AccountTree_Import_CSV.png" srccredit="Christian Wehling" width="&img-w;" />
@@ -2308,7 +2338,9 @@
         </para>
 
         <figure pgwide="1">
-          <title>Der CSV Import Vorschau Bereich</title><screenshot id="accounts-import-csv-preview">
+          <title>Der CSV Import Vorschau Bereich</title>
+
+          <screenshot id="accounts-import-csv-preview">
             <mediaobject>
               <imageobject role="html">
                 <imagedata  fileref="figures/AccountTree_Import_CSV_Preview.png" srccredit="Christian Wehling" width="&img-w;" />
@@ -2372,12 +2404,15 @@
                 <title><guilabel>Benutzerdefinierter regulärer Ausdruck</guilabel></title>
 
                 <para>Mit Auswahl dieser Option öffnet sich ein kleines Eingabefenster in dem Sie einen <quote>regulären
-                  Ausdruck</quote><footnote>
+                  Ausdruck</quote>
+                  <footnote>
                     <para>Für weitere Informationen können Sie den Artikel
-                      <ulink url="&url-wp-de;Regul%C3%A4rer_Ausdruck">Regulärer
-                      Ausdruck</ulink> in der Wikipedia lesen.
+                      <ulink url="&url-wp-de;Regul%C3%A4rer_Ausdruck">Regulärer Ausdruck</ulink> in
+                      der Wikipedia lesen.
                     </para>
-                  </footnote>, auch als <foreignphrase><abbrev>RegEx</abbrev></foreignphrase> bekannt, eingeben können.
+                  </footnote>
+                  , auch als <foreignphrase><abbrev>RegEx</abbrev></foreignphrase> bekannt, eingeben
+                  können.
                 </para>
               </step>
             </substeps>
@@ -2478,7 +2513,8 @@
         <title><guilabel>Konten jetzt importieren</guilabel></title>
 
         <para>Der Dateiname und Pfad der zu importierenden Datei wird angezeigt. Um die Kontenstruktur jetzt
-          endgültig zu importieren betätigen Sie die <guibutton>Anwenden</guibutton>-Schaltfläche.
+          endgültig zu importieren betätigen Sie die
+          <guibutton>Anwenden</guibutton>-Schaltfläche.
         </para>
 
         <para>Nach einer kurzen Zeit, in der die Daten verarbeitet werden, öffnet sich der Dialog
@@ -2530,11 +2566,10 @@
     <sect2 id="acct-export-xml">
       <title>Konten in ein neues &appname;-Buch exportieren</title>
 
-      <para>Mit dem Menüpunkt &mc.fi.exp.acct; können Sie Ihre vollständige &app;-Kontenhierarchie
-        in eine <acronym>XML</acronym>- oder
-        <acronym>SQLite3</acronym>-Datei oder auch in eine Datenbank exportieren. Mit dieser
-        Funktion haben Sie die Möglichkeit z.B. am Ende eines Jahres einen Buchabschluss
-        vorzunehmen und mit einer leeren &app;-Datei in das neue Jahr zu starten.
+      <para>Mit dem Menüpunkt &mc.fi.exp.acct; können Sie Ihre vollständige &app;-Kontenhierarchie in eine
+        <acronym>XML</acronym>- oder <acronym>SQLite3</acronym>-Datei oder auch in eine Datenbank
+        exportieren. Mit dieser Funktion haben Sie die Möglichkeit z.B. am Ende eines Jahres einen
+        Buchabschluss vorzunehmen und mit einer leeren &app;-Datei in das neue Jahr zu starten.
       </para>
 
       <para>Es wird der übliche Datei-Speichern-Dialog geöffnet, der im oberen Bereich ein Auswahlfeld für
@@ -2555,7 +2590,9 @@
             <row valign="top">
               <entry>
                 <para><figure>
-                    <title>Exportieren in Datei</title><screenshot>
+                    <title>Exportieren in Datei</title>
+
+                    <screenshot>
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/AccountTree_Export_file.png" 
@@ -2569,7 +2606,9 @@
 
               <entry>
                 <para><figure>
-                    <title>Exportieren in Datenbank</title><screenshot>
+                    <title>Exportieren in Datenbank</title>
+
+                    <screenshot>
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/AccountTree_Export_dbms.png" 
@@ -2615,9 +2654,9 @@
         </varlistentry>
       </variablelist>
 
-      <para>Die exportierte Datei kann über &mc.fi.open; in &app; geöffnet werden. Sie müssen dann noch
-        für alle Konten manuell die Anfangsbestände
-        eintragen.<tip>
+      <para>Die exportierte Datei kann über &mc.fi.open; in &app; geöffnet werden. Sie müssen dann noch für
+        alle Konten manuell die Anfangsbestände eintragen.
+        <tip>
           <para>Öffnen sie hierfür z.B. eine 2. Instanz von &app;, um die Schlussbilanz der alten Datei als
             Anfangsbestand in die neue Datei zu übertragen.
           </para>
@@ -2639,7 +2678,9 @@
       </para>
 
       <figure pgwide="1">
-        <title>Assistent für den Export der Kontenhierarchie im CSV-Format</title><screenshot id="accounts-export-wizard">
+        <title>Assistent für den Export der Kontenhierarchie im CSV-Format</title>
+
+        <screenshot id="accounts-export-wizard">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/AccountTree_Export_CSV.png" srccredit="Christian Wehling" width="&img-w;" />
@@ -2740,7 +2781,8 @@
           <title><guilabel>Datei jetzt exportieren…</guilabel></title>
 
           <para>Der Dateiname und Pfad der zu exportierenden Datei und die Anzahl der zu exportierenden Konten wird
-            angezeigt. Um den Export fortzusetzen betätigen Sie die <guibutton>Anwenden</guibutton>-Schaltfläche.
+            angezeigt. Um den Export fortzusetzen betätigen Sie die
+            <guibutton>Anwenden</guibutton>-Schaltfläche.
           </para>
         </step>
 
diff --git a/de/manual/ch_Business.xml b/de/manual/ch_Business.xml
index f1013ccb..262f84ea 100644
--- a/de/manual/ch_Business.xml
+++ b/de/manual/ch_Business.xml
@@ -54,9 +54,8 @@
       <para>There are many different ways to set up a business account hierarchy. You can start with the
         Business Accounts setup which is available from the New Account Hierarchy assistant, or you
         could build one manually. To access the prebuilt Business Accounts, start &app; and click on
-        &mc.fi.new;
-        and proceed until you see the list of available accounts, select <emphasis>Business
-        Accounts</emphasis>.
+        &mc.fi.new; and proceed until you see the list of available accounts, select
+        <emphasis>Business Accounts</emphasis>.
       </para>
 
       <note>
@@ -102,15 +101,12 @@
       </para>
 
       <para>The default tax table for new customers or new vendors can be specified in the <emphasis>Book
-        Options </emphasis> window which can be accessed by
-        &mc.fi.new; <guilabel>Business</guilabel>
-        tab.
+        Options </emphasis> window which can be accessed by &mc.fi.new;
+        <guilabel>Business</guilabel> tab.
       </para>
 
       <para>Tax Tables are maintained using the <emphasis>Sales Tax Table</emphasis> editor which is accessed
-        via menu
-        &mc.bus.tax-tab;
-        . The following fields should be entered:
+        via menu &mc.bus.tax-tab; . The following fields should be entered:
       </para>
 
       <itemizedlist>
@@ -153,9 +149,7 @@
 
       <para>After you have built the account structure and defined your tax tables, register the &app; file as
         belonging to your company by filling in the data requested in the
-        <xref linkend="business-book-options" /> accessible from the
-        &mc.fi.new;
-        menu item.
+        <xref linkend="business-book-options" /> accessible from the &mc.fi.new; menu item.
       </para>
     </sect2>
 
@@ -170,11 +164,8 @@
     <sect2 id="busnss_setup_pref">
       <title>Business Preferences</title>
 
-      <para>Set options on the Business tab of the &app; preferences, which is accessed via
-        &mc.ed.pref;
-        (
-        &mc.macOS.gc.pref;
-        on &mac;). See <xref linkend="prefs-biz" />.
+      <para>Set options on the Business tab of the &app; preferences, which is accessed via &mc.ed.pref; (
+        &mc.macOS.gc.pref; on &mac;). See <xref linkend="prefs-biz" />.
       </para>
     </sect2>
 
@@ -217,8 +208,7 @@
       </para>
 
       <para>Billing Terms are maintained using the Billing Terms Editor which is accessed via menu
-        &mc.bus.bil-edit;
-        . The following fields should be entered:
+        &mc.bus.bil-edit; . The following fields should be entered:
       </para>
 
       <itemizedlist>
@@ -342,8 +332,7 @@
     <para>The transactions generated by the A/R system are recorded within the <emphasis>Accounts
       Receivable</emphasis> account. You generally do not work directly with this account. You
       generally work with the four integrated &app; A/R application components available through the
-      &mc.bus.cus;
-      sub-menu. These four components are:
+      &mc.bus.cus; sub-menu. These four components are:
     </para>
 
     <variablelist>
@@ -400,10 +389,8 @@
     <sect2 id="busnss-ar-custnew2">
       <title>New</title>
 
-      <para>To register a new customer, enter the menu
-        &mc.bus.cus.new-cus;
-        . Fill in customer information, such as Company Name, Address, Phone, Fax, etc. Below is a
-        list of the other options:
+      <para>To register a new customer, enter the menu &mc.bus.cus.new-cus; . Fill in customer information, such
+        as Company Name, Address, Phone, Fax, etc. Below is a list of the other options:
       </para>
 
       <itemizedlist>
@@ -447,9 +434,7 @@
 
         <listitem>
           <para><guilabel>Billing Information - Terms</guilabel> - specifies the default billing terms for this
-            customer. Billing terms must be preregistered using
-            &mc.bus.bil-edit;
-            .
+            customer. Billing terms must be preregistered using &mc.bus.bil-edit; .
           </para>
         </listitem>
 
@@ -484,11 +469,7 @@
 
               <listitem>
                 <para><guilabel>Use Global</guilabel> means to use the setting made in the global preferences accessible
-                  through
-                  &mc.ed.pref;
-                  (
-                  &mc.macOS.gc.pref;
-                  on &mac;).
+                  through &mc.ed.pref; ( &mc.macOS.gc.pref; on &mac;).
                 </para>
               </listitem>
             </itemizedlist>
@@ -497,9 +478,7 @@
 
         <listitem>
           <para><guilabel>Billing Information - Tax Table</guilabel> - specifies a default tax table to apply to
-            invoice line items. Tax tables must be registered from the
-            &mc.bus.tax-tab;
-            menu item.
+            invoice line items. Tax tables must be registered from the &mc.bus.tax-tab; menu item.
           </para>
         </listitem>
 
@@ -515,11 +494,9 @@
     <sect2 id="busnss-ar-custfind2">
       <title>Find and Edit</title>
 
-      <para>To search for an existing customer, use the
-        &mc.bus.cus.find-cus;
-        window. You select a customer to <guilabel>View/Edit</guilabel> from the results of the
-        search. This window is also used to look up customers when creating invoices and processing
-        payments.
+      <para>To search for an existing customer, use the &mc.bus.cus.find-cus; window. You select a customer to
+        <guilabel>View/Edit</guilabel> from the results of the search. This window is also used to
+        look up customers when creating invoices and processing payments.
       </para>
 
       <para>If many customers match the search criteria you provide, the search can be refined by running an
@@ -569,8 +546,7 @@
       <title>New</title>
 
       <para>To send an invoice to a customer you must first create a new invoice. To create an invoice use
-        &mc.bus.cus.new-inv;
-        . The New Invoice window must be filled in appropriately:
+        &mc.bus.cus.new-inv; . The New Invoice window must be filled in appropriately:
       </para>
 
       <itemizedlist>
@@ -650,8 +626,8 @@
         <note>
           <para>Saved column layout works a bit differently in invoices from the account registers: Layouts are not
             saved for each invoice; instead a layout can be saved as a default for invoices to
-            override the calculated widths using the &mc.vw.use-lay-cus; and the calculated widths restored
-            as the default with &mc.vw.res-lay-cus;.
+            override the calculated widths using the &mc.vw.use-lay-cus; and the calculated widths
+            restored as the default with &mc.vw.res-lay-cus;.
           </para>
         </note>
       </para>
@@ -884,9 +860,8 @@
     <sect2 id="busnss-ar-invoicefind2">
       <title>Find</title>
 
-      <para>To find an existing invoice, use the
-        &mc.bus.cus.find-inv;
-        menu item. From the results of the search, you can select an invoice to edit or view.
+      <para>To find an existing invoice, use the &mc.bus.cus.find-inv; menu item. From the results of the
+        search, you can select an invoice to edit or view.
       </para>
 
       <note>
@@ -921,8 +896,7 @@
       <title>Print</title>
 
       <para>After you post an invoice, you should print it and send it to your customer. To print an invoice use
-        &mc.fi.prin-inv;
-        menu item.
+        &mc.fi.prin-inv; menu item.
       </para>
 
       <tip>
@@ -932,16 +906,14 @@
         </para>
       </tip>
 
-      <para>Invoices can also be printed from the main window by selecting
-        &mc.rep.bus.pnt-rep;
-        from the main menu. The resulting report window states that no valid invoice is selected. To
-        select the invoice to print:
+      <para>Invoices can also be printed from the main window by selecting &mc.rep.bus.pnt-rep; from the main
+        menu. The resulting report window states that no valid invoice is selected. To select the
+        invoice to print:
       </para>
 
       <orderedlist>
         <listitem>
-          <para>Use the <guibutton>Options</guibutton> <emphasis>Toolbar</emphasis> button or select
-            &mc.ed.rep-opt;
+          <para>Use the <guibutton>Options</guibutton> <emphasis>Toolbar</emphasis> button or select &mc.ed.rep-opt;
             from the main menu.
           </para>
         </listitem>
@@ -976,11 +948,10 @@
         sooner or later leads to duplicate numbers.
       </para>
 
-      <para>You can change the starting invoice number if it is important you. Use
-        &mc.fi.prop;
-        , access the <guilabel>Counters</guilabel> tab, change the <guilabel>Invoice
-        number</guilabel> value to be one less than your desired starting invoice number and click
-        the <guibutton>OK</guibutton> button or the <guibutton>Apply</guibutton> button.
+      <para>You can change the starting invoice number if it is important you. Use &mc.fi.prop; , access the
+        <guilabel>Counters</guilabel> tab, change the <guilabel>Invoice number</guilabel> value to
+        be one less than your desired starting invoice number and click the
+        <guibutton>OK</guibutton> button or the <guibutton>Apply</guibutton> button.
       </para>
     </sect2>
   </sect1>
@@ -994,9 +965,8 @@
       credit notes related to a single job.
     </para>
 
-    <para>To use customer jobs, you must create them using the
-      &mc.bus.cus.new-job;
-      menu item. You will see the <guilabel>New Job</guilabel> window. The editable fields are:
+    <para>To use customer jobs, you must create them using the &mc.bus.cus.new-job; menu item. You will see
+      the <guilabel>New Job</guilabel> window. The editable fields are:
     </para>
 
     <itemizedlist>
@@ -1038,14 +1008,11 @@
       </listitem>
     </itemizedlist>
 
-    <para>To edit an existing customer job, use the
-      &mc.bus.cus.find-job;
-      menu item. Select the desired job in the search results, and click the <guilabel>View/Edit
-      Job</guilabel> button.
+    <para>To edit an existing customer job, use the &mc.bus.cus.find-job; menu item. Select the desired job in
+      the search results, and click the <guilabel>View/Edit Job</guilabel> button.
     </para>
 
-    <para>To select from the invoices and credit notes associated with a given job, use
-      &mc.bus.cus.find-job;
+    <para>To select from the invoices and credit notes associated with a given job, use &mc.bus.cus.find-job;
       menu item. Select the desired job in the search results and click the <guilabel>View
       Invoices</guilabel> button. A window listing invoices and credit notes associated with this
       job appears. Select an invoice or credit note and click the <guilabel>View Invoice</guilabel>
@@ -1057,9 +1024,7 @@
     <title>Process Invoice Payment</title>
 
     <para>Eventually, you will receive payment from your customers for outstanding invoices. To register these
-      payments, use the Process Payment application found in
-      &mc.bus.cus.pro-pay;
-      .
+      payments, use the Process Payment application found in &mc.bus.cus.pro-pay; .
     </para>
 
     <tip>
@@ -1071,9 +1036,9 @@
 
       <para>This can best be done starting from the asset account register holding the imported payment
         transaction (like your bank account). In that account, select the payment, right-click
-        (control-click for &mac;) and choose <guilabel>Assign as payment...</guilabel>. The
-        payment window will pop-up, partly filled in with the information from the transaction. Fill
-        in the missing information like the proper customer and invoice to complete the payment.
+        (control-click for &mac;) and choose <guilabel>Assign as payment...</guilabel>. The payment
+        window will pop-up, partly filled in with the information from the transaction. Fill in the
+        missing information like the proper customer and invoice to complete the payment.
       </para>
 
       <para>One caveat: the logic behind <guilabel>Assign as payment...</guilabel>won't properly detect credit
@@ -1232,16 +1197,14 @@
           register. This came with its own set of subtle issues. It is recommended to upgrade to the
           latest (or at least 2.6.6) version, which fixes a lot of small problems. Version 2.6.5 had
           a flaw in the logic cleaning up the lot links. Once upgraded, please run
-          &mc.ac.chk-rep.acct;
-          on your A/R and A/P accounts to clean up most of the lot link legacy. Don't forget to make
-          a backup first just in case.
+          &mc.ac.chk-rep.acct; on your A/R and A/P accounts to clean up most of the lot link legacy.
+          Don't forget to make a backup first just in case.
         </para>
 
         <para>Lots are used internally for relating payments to invoices. Lots themselves are invisible in the
           account registers. To see them you need to open the lot viewer, which can be found in
-          &mc.ac.vw-lots;
-          while in any A/R or A/P account register. Select a lot to see the <emphasis>Splits in
-          lot</emphasis>.
+          &mc.ac.vw-lots; while in any A/R or A/P account register. Select a lot to see the
+          <emphasis>Splits in lot</emphasis>.
         </para>
 
         <para><emphasis>Lot links</emphasis> are <emphasis>transactions</emphasis> which you can see in your A/R
@@ -1265,18 +1228,14 @@
       company letterhead paper. There are some things you can do to change invoice appearance.
     </para>
 
-    <para>Use
-      &mc.fi.prop;
-      to enter your Company information in the <guilabel>Business</guilabel> tab of the
+    <para>Use &mc.fi.prop; to enter your Company information in the <guilabel>Business</guilabel> tab of the
       <guilabel>Book Options</guilabel> window. Some of the entered information is printed on the
       right side of invoices.
     </para>
 
     <para>To add a customized background, heading banner or logo to invoices, modify the invoice style sheets.
-      To do this, go to
-      &mc.ed.css;
-      and select the <guibutton>New</guibutton> button in the <guilabel>Select HTML Style
-      Sheet</guilabel> window that will appear.
+      To do this, go to &mc.ed.css; and select the <guibutton>New</guibutton> button in the
+      <guilabel>Select HTML Style Sheet</guilabel> window that will appear.
     </para>
 
     <para>Give a <guilabel>Name</guilabel> to the new style sheet (e.g. <guilabel>Custom Invoice</guilabel>)
@@ -1326,9 +1285,7 @@
       <emphasis>Accounts Payable</emphasis> accounts accrue the amounts you owe to others, so bills
       credit these accounts and payments and credit memos debit these accounts. Generally you do not
       directly work with this account but use the four integrated &app; A/P application components.
-      The A/P components are available from the
-      &mc.bus.ven;
-      sub-menu.
+      The A/P components are available from the &mc.bus.ven; sub-menu.
     </para>
 
     <para>These A/P components are:
@@ -1374,10 +1331,9 @@
     <sect2 id="busnss-ap-vendornew2">
       <title>New</title>
 
-      <para>To register a new vendor, select the
-        &mc.bus.ven.new-ven;
-        menu item. Fill in general information about the vendor, such as Company Name, Address,
-        Phone, Fax, etc. Below is a list of the other options:
+      <para>To register a new vendor, select the &mc.bus.ven.new-ven; menu item. Fill in general information
+        about the vendor, such as Company Name, Address, Phone, Fax, etc. Below is a list of the
+        other options:
       </para>
 
       <itemizedlist>
@@ -1421,9 +1377,7 @@
 
         <listitem>
           <para><guilabel>Payment Information - Terms</guilabel> - specifies the default payment terms for this
-            vendor. Payment terms must be preregistered using
-            &mc.bus.bil-edit;
-            .
+            vendor. Payment terms must be preregistered using &mc.bus.bil-edit; .
           </para>
         </listitem>
 
@@ -1446,11 +1400,7 @@
 
             <listitem>
               <para><guilabel>Use Global</guilabel> means to use the setting made in the global preferences accessible
-                through
-                &mc.ed.pref;
-                (
-                &mc.macOS.gc.pref;
-                on &mac;).
+                through &mc.ed.pref; ( &mc.macOS.gc.pref; on &mac;).
               </para>
             </listitem>
           </itemizedlist>
@@ -1458,9 +1408,8 @@
 
         <listitem>
           <para><guilabel>Payment Information - Tax Table</guilabel> - specifies a default tax table to apply to
-            bills from this vendor. Tax tables must be registered using the
-            &mc.bus.tax-tab;
-            menu item.
+            bills from this vendor. Tax tables must be registered using the &mc.bus.tax-tab; menu
+            item.
           </para>
         </listitem>
       </itemizedlist>
@@ -1469,11 +1418,9 @@
     <sect2 id="busnss-ap-vendorfind2">
       <title>Find and Edit</title>
 
-      <para>To search for an existing vendor, use the
-        &mc.bus.ven.find-ven;
-        window. You select a vendor to <guibutton>View/Edit</guibutton> from the results of the
-        search. This window is also used to look up a vendor when entering bills and processing
-        payments.
+      <para>To search for an existing vendor, use the &mc.bus.ven.find-ven; window. You select a vendor to
+        <guibutton>View/Edit</guibutton> from the results of the search. This window is also used to
+        look up a vendor when entering bills and processing payments.
       </para>
 
       <para>If many vendors match the search criteria you provide, the search can be refined by running an
@@ -1523,9 +1470,8 @@
       <title>New</title>
 
       <para>When you receive a bill from a vendor and want to enter it into &app;, you must create a new bill.
-        To create a new bill use the
-        &mc.bus.ven.new-bil;
-        menu item, and fill in the resulting window appropriately.
+        To create a new bill use the &mc.bus.ven.new-bil; menu item, and fill in the resulting
+        window appropriately.
       </para>
 
       <itemizedlist>
@@ -1610,8 +1556,8 @@
         <note>
           <para>Saved column layout works a bit differently in invoices from the account registers: Layouts are not
             saved for each invoice; instead a layout can be saved as a default for invoices to
-            override the calculated widths using the &mc.vw.use-lay-ven; and the calculated widths restored as
-            the default with &mc.vw.res-lay-ven;.
+            override the calculated widths using the &mc.vw.use-lay-ven; and the calculated widths
+            restored as the default with &mc.vw.res-lay-ven;.
           </para>
         </note>
       </para>
@@ -1769,9 +1715,8 @@
     <sect2 id="busnss-ap-billfind2">
       <title>Find</title>
 
-      <para>To find an existing bill, use the
-        &mc.bus.ven.find-bil;
-        menu item. From the results of the search, you can select a bill to edit, or view.
+      <para>To find an existing bill, use the &mc.bus.ven.find-bil; menu item. From the results of the search,
+        you can select a bill to edit, or view.
       </para>
 
       <note>
@@ -1796,9 +1741,8 @@
       notes for a single job.
     </para>
 
-    <para>To use vendor jobs, you must create them using the
-      &mc.bus.ven.new-job;
-      menu item. You will see the <guilabel>New Job</guilabel> window. The editable fields are:
+    <para>To use vendor jobs, you must create them using the &mc.bus.ven.new-job; menu item. You will see the
+      <guilabel>New Job</guilabel> window. The editable fields are:
     </para>
 
     <itemizedlist>
@@ -1831,14 +1775,11 @@
       </listitem>
     </itemizedlist>
 
-    <para>To edit an existing vendor job, use the
-      &mc.bus.ven.find-job;
-      menu item. Select the desired job in the search results, and click the <guilabel>View/Edit
-      Job</guilabel> button.
+    <para>To edit an existing vendor job, use the &mc.bus.ven.find-job; menu item. Select the desired job in
+      the search results, and click the <guilabel>View/Edit Job</guilabel> button.
     </para>
 
-    <para>To select from the bills and credit notes associated with a given job, use the
-      &mc.bus.ven.find-job;
+    <para>To select from the bills and credit notes associated with a given job, use the &mc.bus.ven.find-job;
       menu item. Select the desired job in the search results and click the <guilabel>View
       Invoices</guilabel> button. A window listing bills and credit notes associated with this job
       appears. Select a bill or credit note and click the <guilabel>View Invoice</guilabel> button
@@ -1850,8 +1791,7 @@
     <title>Process Bill Payment</title>
 
     <para>Eventually, you need to pay your bills. To do so, use the Process Payment application found in
-      &mc.bus.ven.pro-pay;
-      .
+      &mc.bus.ven.pro-pay; .
     </para>
 
     <tip>
@@ -1861,9 +1801,9 @@
 
       <para>This can best be done starting from the asset account register holding the imported payment
         transaction (like your bank account). In that account, select the payment, right-click
-        (control-click for &mac;) and choose <guilabel>Assign as payment...</guilabel>. The
-        payment window will pop-up, partly filled in with the information from the transaction. Fill
-        in the missing information like the proper vendor and bill to complete the payment.
+        (control-click for &mac;) and choose <guilabel>Assign as payment...</guilabel>. The payment
+        window will pop-up, partly filled in with the information from the transaction. Fill in the
+        missing information like the proper vendor and bill to complete the payment.
       </para>
 
       <para>One caveat: the logic behind <guilabel>Assign as payment...</guilabel>won't properly detect credit
@@ -1963,9 +1903,8 @@
     <sect2 id="busnss-emplynew">
       <title>New Employee</title>
 
-      <para>To register a new employee, select the
-        &mc.bus.emp.new-emp;
-        menu item. The <guilabel>New Employee</guilabel> window will open with two tabs:
+      <para>To register a new employee, select the &mc.bus.emp.new-emp; menu item. The <guilabel>New
+        Employee</guilabel> window will open with two tabs:
       </para>
 
       <itemizedlist>
@@ -2026,9 +1965,7 @@
 
         <listitem>
           <para><guilabel>Payment Information - Terms</guilabel> (Optional) - specifies the default payment terms
-            for this employee. Payment terms must be preregistered using
-            &mc.bus.bil-edit;
-            .
+            for this employee. Payment terms must be preregistered using &mc.bus.bil-edit; .
           </para>
         </listitem>
 
@@ -2073,11 +2010,9 @@
     <sect2 id="busnss-emplyedit">
       <title>Find and Edit</title>
 
-      <para>To search for an existing employee, use the
-        &mc.bus.emp.find-emp;
-        menu. You select an employee to <guibutton>View/Edit</guibutton> from the results of the
-        search. This window is also used to look up an employee when entering voucher and processing
-        payments.
+      <para>To search for an existing employee, use the &mc.bus.emp.find-emp; menu. You select an employee to
+        <guibutton>View/Edit</guibutton> from the results of the search. This window is also used to
+        look up an employee when entering voucher and processing payments.
       </para>
 
       <para>If many employees match the search criteria you provide, the search can be refined by running an
@@ -2109,10 +2044,8 @@
     <sect2 id="busnss-emply-newvchr">
       <title>New Expense Voucher/Credit Note</title>
 
-      <para>To register a new expense voucher/ Credit Note, select the
-        &mc.bus.emp.new-exp-vou;
-        menu item. The <guilabel>New Expense Voucher</guilabel> window will open. You can enter the
-        following data:
+      <para>To register a new expense voucher/ Credit Note, select the &mc.bus.emp.new-exp-vou; menu item. The
+        <guilabel>New Expense Voucher</guilabel> window will open. You can enter the following data:
       </para>
 
       <itemizedlist>
@@ -2205,11 +2138,10 @@
     <sect2 id="busnss-emply-editvchr">
       <title>Find Expense Voucher/Credit Note</title>
 
-      <para>To search for an existing Expense Voucher, use the
-        &mc.bus.emp.find-exp-vou;
-        menu item. You select an Expense Voucher to <guibutton>View/Edit</guibutton> from the
-        results of the search. This window is also used to look up an expense voucher when entering
-        vouchers and processing payments.
+      <para>To search for an existing Expense Voucher, use the &mc.bus.emp.find-exp-vou; menu item. You select
+        an Expense Voucher to <guibutton>View/Edit</guibutton> from the results of the search. This
+        window is also used to look up an expense voucher when entering vouchers and processing
+        payments.
       </para>
 
       <para>If many expense vouchers match the search criteria you provide, the search can be refined by running
@@ -2248,8 +2180,8 @@
         <note>
           <para>Saved column layout works a bit differently in invoices from the account registers: Layouts are not
             saved for each invoice; instead a layout can be saved as a default for invoices to
-            override the calculated widths using the &mc.vw.use-lay-emp; and the calculated widths restored
-            as the default with &mc.vw.res-lay-emp;.
+            override the calculated widths using the &mc.vw.use-lay-emp; and the calculated widths
+            restored as the default with &mc.vw.res-lay-emp;.
           </para>
         </note>
       </para>
diff --git a/de/manual/ch_Customize.xml b/de/manual/ch_Customize.xml
index 3f3f4936..9e34c629 100644
--- a/de/manual/ch_Customize.xml
+++ b/de/manual/ch_Customize.xml
@@ -44,15 +44,13 @@ Translators:
 
     <para>Im Fenster <guilabel>&appname;-Einstellungen</guilabel> können Sie das Verhalten Ihrer &app;
       Sitzung anpassen, indem Sie verschiedene Optionen einstellen. Wählen Sie aus dem &app; Menü
-      &mc.ed.pref;
-      (
-      &mc.macOS.gc.pref;
-      bei &mac;). Das Fenster <guilabel>&appname;-Einstellungen</guilabel> wird geöffnet. Wählen
-      Sie auf der linken Seite die gewünschte Kategorie und nehmen Sie rechts die gewünschten
-      Änderungen vor. Die Einstellungen in diesem Dialog werden pro Benutzer festgelegt und nicht
-      in der Datei gespeichert. Dies steht im Gegensatz zu den in <xref linkend="book-options"/>
-      beschriebenen Einstellungen, die mit der Datei (oder dem Buch) gespeichert werden und Teil
-      davon sind und als solche für alle Benutzer gemeinsam gelten. Die
+      &mc.ed.pref; ( &mc.macOS.gc.pref; bei &mac;). Das Fenster
+      <guilabel>&appname;-Einstellungen</guilabel> wird geöffnet. Wählen Sie auf der linken Seite
+      die gewünschte Kategorie und nehmen Sie rechts die gewünschten Änderungen vor. Die
+      Einstellungen in diesem Dialog werden pro Benutzer festgelegt und nicht in der Datei
+      gespeichert. Dies steht im Gegensatz zu den in <xref linkend="book-options"/> beschriebenen
+      Einstellungen, die mit der Datei (oder dem Buch) gespeichert werden und Teil davon sind und
+      als solche für alle Benutzer gemeinsam gelten. Die
       <guilabel>&appname;-Einstellungen</guilabel> gelten somit für alle Dateien des Benutzers als
       Vorgabe. Sie können aber teilweise durch individuelle
       <link linkend="book-options">Buch-Optionen</link> für einzelne Dateien außer Kraft gesetzt
@@ -89,8 +87,9 @@ Translators:
       <title>Buchführungsperioden</title>
 
       <figure id="prefs-acct-period-fig">
-        <title>Die &app;-&gmi.ed.pref; für die
-          <guilabel>Buchführungsperioden</guilabel></title><screenshot id="Prefer_Accounting-Period">
+        <title>Die &app;-&gmi.ed.pref; für die <guilabel>Buchführungsperioden</guilabel></title>
+
+        <screenshot id="Prefer_Accounting-Period">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_AccntPeriod.png" 
@@ -218,7 +217,9 @@ Translators:
       <title>Konten</title>
 
       <figure id="prefs-acct-fig">
-        <title>Die &app;-&gmi.ed.pref; für die <guilabel>Konten</guilabel></title><screenshot id="Prefer_Accounts">
+        <title>Die &app;-&gmi.ed.pref; für die <guilabel>Konten</guilabel></title>
+
+        <screenshot id="Prefer_Accounts">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Accnts.png" 
@@ -348,8 +349,8 @@ Translators:
           <term><guilabel>Kontofarbe</guilabel></term>
 
           <listitem>
-            <para>Mit dieser Option können Sie die Verwendung der Kontofarbe steuern, die unter
-              &mc.ed.acc-edit; eingestellt wird.
+            <para>Mit dieser Option können Sie die Verwendung der Kontofarbe steuern, die unter &mc.ed.acc-edit;
+              eingestellt wird.
             </para>
 
             <variablelist>
@@ -380,7 +381,9 @@ Translators:
       <title>Geschäft</title>
 
       <figure id="prefs-biz-fig">
-        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Geschäft</guilabel></title><screenshot id="Prefer_Business">
+        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Geschäft</guilabel></title>
+
+        <screenshot id="Prefer_Business">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Business.png" 
@@ -538,7 +541,9 @@ Translators:
       <title>Zahl, Datum, Zeit</title>
 
       <figure id="prefs-date-time-fig">
-        <title>Die &app;-&gmi.ed.pref; für <guilabel>Zahl, Datum, Zeit</guilabel></title><screenshot id="Prefer_DateTime">
+        <title>Die &app;-&gmi.ed.pref; für <guilabel>Zahl, Datum, Zeit</guilabel></title>
+
+        <screenshot id="Prefer_DateTime">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_DateTime.png" 
@@ -723,7 +728,9 @@ Translators:
       <title>Allgemein</title>
 
       <figure id="prefs-general-fig">
-        <title>Die &app;-&gmi.ed.pref; für alles <guilabel>Allgemein</guilabel>e</title><screenshot id="Prefer_General">
+        <title>Die &app;-&gmi.ed.pref; für alles <guilabel>Allgemein</guilabel>e</title>
+
+        <screenshot id="Prefer_General">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_General.png" 
@@ -992,7 +999,9 @@ Translators:
       <title>Import</title>
 
       <figure id="prefs-import-fig">
-        <title>Die &app;-&gmi.ed.pref; für den <guilabel>Import</guilabel></title><screenshot id="Prefer_Import">
+        <title>Die &app;-&gmi.ed.pref; für den <guilabel>Import</guilabel></title>
+
+        <screenshot id="Prefer_Import">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Import.png"
@@ -1204,7 +1213,9 @@ Translators:
       <title>Onlinebanking</title>
 
       <figure id="prefs-online-fig">
-        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Onlinebanking</guilabel></title><screenshot id="Prefer_OnlineBanking">
+        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Onlinebanking</guilabel></title>
+
+        <screenshot id="Prefer_OnlineBanking">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_OnlineBanking.png"
@@ -1293,7 +1304,9 @@ Translators:
       <title>Online Kurse</title>
 
       <figure id="prefs-quotes-fig">
-        <title>Die &app;-&gmi.ed.pref; die <guilabel>Online Kurse</guilabel></title><screenshot id="Prefer-online-quotes">
+        <title>Die &app;-&gmi.ed.pref; die <guilabel>Online Kurse</guilabel></title>
+
+        <screenshot id="Prefer-online-quotes">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Quotes.png"
@@ -1344,7 +1357,9 @@ Translators:
       <title>Drucken</title>
 
       <figure id="prefs-printing-fig">
-        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Drucken</guilabel></title><screenshot id="Prefer_Printing">
+        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Drucken</guilabel></title>
+
+        <screenshot id="Prefer_Printing">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Printing.png"
@@ -1412,7 +1427,9 @@ Translators:
       <title>Kontobuch</title>
 
       <figure id="prefs-reg-fig">
-        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Kontobuch</guilabel></title><screenshot id="Prefer_Register">
+        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Kontobuch</guilabel></title>
+
+        <screenshot id="Prefer_Register">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Register.png"
@@ -1446,8 +1463,8 @@ Translators:
 
                 <listitem>
                   <para>Wenn ausgewählt, wird der Cursor auf eine neue leere Buchung am Ende des Kontobuchs bewegt, nachdem
-                    der Benutzer die &kc.enter; drückt.
-                    Andernfalls wird der Cursor eine Zeile nach unten bewegt.
+                    der Benutzer die &kc.enter; drückt. Andernfalls wird der Cursor eine Zeile nach
+                    unten bewegt.
                     <tip>
                       <para>Es wird empfohlen, innerhalb des Buchungssatzes mit den Tasten
                         <keycombo>
@@ -1483,10 +1500,9 @@ Translators:
                     </para>
                   </note>
 
-                  <para>Wenn aktiviert, wird beim automatischen Ausfüllen der Buchung durch Drücken der
-                    &kc.tab;-Taste im Kontobuch der Cursor in das
-                    <guilabel>Buchen</guilabel> Feld springen. Ansonsten bewegt sich der
-                    Eingabefokus in das Feld <guilabel>Soll</guilabel>/
+                  <para>Wenn aktiviert, wird beim automatischen Ausfüllen der Buchung durch Drücken der &kc.tab;-Taste im
+                    Kontobuch der Cursor in das <guilabel>Buchen</guilabel> Feld springen. Ansonsten
+                    bewegt sich der Eingabefokus in das Feld <guilabel>Soll</guilabel>/
                     <guilabel>Einzahlung</guilabel> oder <guilabel>Haben</guilabel>/
                     <guilabel>Auszahlung</guilabel>.
                   </para>
@@ -1629,8 +1645,9 @@ Translators:
       <title>Voreinstellungen Kontobuch</title>
 
       <figure id="prefs-reg-def-fig">
-        <title>Die &app;-&gmi.ed.pref; der <guilabel>Voreinstellungen
-          Kontobuch</guilabel></title><screenshot id="Prefer_RegisterDefaults">
+        <title>Die &app;-&gmi.ed.pref; der <guilabel>Voreinstellungen Kontobuch</guilabel></title>
+
+        <screenshot id="Prefer_RegisterDefaults">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_RegisterDefaults.png"
@@ -1758,7 +1775,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Berichte</title>
 
       <figure id="prefs-reports-fig">
-        <title>Die &app;-&gmi.ed.pref; für die <guilabel>Berichte</guilabel></title><screenshot id="Prefer_Reports">
+        <title>Die &app;-&gmi.ed.pref; für die <guilabel>Berichte</guilabel></title>
+
+        <screenshot id="Prefer_Reports">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Reports.png"
@@ -1851,7 +1870,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Terminierte Buchungen</title>
 
       <figure id="prefs-sched-fig">
-        <title>Die &app;-&gmi.ed.pref; für <guilabel>Terminierte Buchungen</guilabel></title><screenshot id="Prefer_ScheduledTransactions">
+        <title>Die &app;-&gmi.ed.pref; für <guilabel>Terminierte Buchungen</guilabel></title>
+
+        <screenshot id="Prefer_ScheduledTransactions">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Sched.png"
@@ -1970,7 +1991,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Fenster</title>
 
       <figure id="prefs-windows-fig">
-        <title>Die &app;-&gmi.ed.pref; für die <guilabel>Fenster</guilabel></title><screenshot id="Prefer_Windows">
+        <title>Die &app;-&gmi.ed.pref; für die <guilabel>Fenster</guilabel></title>
+
+        <screenshot id="Prefer_Windows">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Windows.png"
@@ -2107,9 +2130,8 @@ Scrolling to older transactions is not possible. If you want to see all entries
   <sect1 id="book-options">
     <title>Buch Einstellungen</title>
 
-    <para>Die &mc.fi.prop;
-      können dazu genutzt werden, um Optionen festzulegen oder zu ändern, die sich auf die
-      Funktionsweise einer bestimmten &app; Datei (auch als Buch bezeichnet) beziehen. Wenn Sie
+    <para>Die &mc.fi.prop; können dazu genutzt werden, um Optionen festzulegen oder zu ändern, die sich auf
+      die Funktionsweise einer bestimmten &app; Datei (auch als Buch bezeichnet) beziehen. Wenn Sie
       diesen Menüpunkt auswählen, wird der Dialog <guilabel>Buch-Optionen</guilabel> aufgerufen.
       Dieser Dialog erscheint auch in der Situation, in der Sie Buchungen in ein neues Buch ohne
       Kontenstruktur importieren, dann mit dem Dialogtitel <guilabel>Buch-Optionen für neues
@@ -2152,7 +2174,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Reiter Konten</title>
 
       <figure id="book-opt-acc-fig">
-        <title>Der Reiter <quote>Konten</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Accounts">
+        <title>Der Reiter <quote>Konten</quote> im Fenster der Buch-Optionen</title>
+
+        <screenshot id="Book_Options_Accounts">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Book_Options_Accounts.png"
@@ -2202,10 +2226,10 @@ Scrolling to older transactions is not possible. If you want to see all entries
             <tip>
 <!-- Translators: Check your government's rules on electronic accounting and adjust the recommendation -->
 <!-- In some contries like DE ... -->
-              <para>Will man die <ulink url="&url-wiki-de;Projekte#GoBD"> Grund­sät­ze zur
-                ord­nungs­mä­ßi­gen Füh­rung und Auf­be­wah­rung von Bü­chern,
-                Auf­zeich­nun­gen und Un­ter­la­gen in elek­tro­ni­scher Form so­wie zum
-                Da­ten­zu­griff (GoDB)</ulink> ansatzweise erfüllen, sollte man 1 wählen.
+              <para>Will man die <ulink url="&url-wiki-de;Projekte#GoBD"> Grund­sät­ze zur ord­nungs­mä­ßi­gen
+                Füh­rung und Auf­be­wah­rung von Bü­chern, Auf­zeich­nun­gen und
+                Un­ter­la­gen in elek­tro­ni­scher Form so­wie zum Da­ten­zu­griff
+                (GoDB)</ulink> ansatzweise erfüllen, sollte man 1 wählen.
               </para>
             </tip>
           </listitem>
@@ -2343,7 +2367,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Reiter Budgets</title>
 
       <figure id="book-opt-bud-fig">
-        <title>Der Reiter <quote>Budgets</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Budgeting">
+        <title>Der Reiter <quote>Budgets</quote> im Fenster der Buch-Optionen</title>
+
+        <screenshot id="Book_Options_Budgeting">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Book_Options_Budgeting.png"
@@ -2367,7 +2393,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Reiter Geschäft</title>
 
       <figure id="book-opt-bus-fig">
-        <title>Der Reiter <quote>Geschäft</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Business">
+        <title>Der Reiter <quote>Geschäft</quote> im Fenster der Buch-Optionen</title>
+
+        <screenshot id="Book_Options_Business">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Book_Options_Business.png"
@@ -2384,9 +2412,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
 
       <para>Auf dem Reiter <guilabel>Geschäft</guilabel> können Sie Werte eingeben, die vornehmlich von den
         Geschäftsfunktionen von &app; verwendet werden. Sinnvoll ist es in diesem Zusammenhang,
-        wenn Sie unter &mc.bus.tax-tab;
-        die Tabelle ihrer Verkaufssteuern definieren. Aber auch in einigen privaten Berichten kann
-        es sich gut machen, z.B. als <quote>Firmenname</quote> seinen Namen einzusetzen:
+        wenn Sie unter &mc.bus.tax-tab; die Tabelle ihrer Verkaufssteuern definieren. Aber auch in
+        einigen privaten Berichten kann es sich gut machen, z.B. als <quote>Firmenname</quote>
+        seinen Namen einzusetzen:
       </para>
 
       <variablelist>
@@ -2486,7 +2514,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Reiter Nummern-Zähler</title>
 
       <figure id="book-opt-count-fig">
-        <title>Der Reiter <quote>Nummern-Zähler</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Counters">
+        <title>Der Reiter <quote>Nummern-Zähler</quote> im Fenster der Buch-Optionen</title>
+
+        <screenshot id="Book_Options_Counters">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Book_Options_Counters.png"
@@ -2566,7 +2596,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Reiter Steuern</title>
 
       <figure id="book-opt-tax-fig">
-        <title>Der Reiter <quote>Steuern</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Tax">
+        <title>Der Reiter <quote>Steuern</quote> im Fenster der Buch-Optionen</title>
+
+        <screenshot id="Book_Options_Tax">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Book_Options_Tax.png"
@@ -2624,7 +2656,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Stilvorlagen auswählen</title>
 <!-- FIXME source: new figure -->
       <figure id="style-choose-fig">
-        <title>Die Auswahl von HTML-Stilvorlagen</title><screenshot id="Style_Choose">
+        <title>Die Auswahl von HTML-Stilvorlagen</title>
+
+        <screenshot id="Style_Choose">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Style_Choose.png"
@@ -2673,7 +2707,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
               Ihrer neuen Stilvorlage dient.
 <!-- FIXME source: new figure -->
               <figure id="style-new-fig">
-                <title>Eine neue Stilvorlagen erstellen</title><screenshot>
+                <title>Eine neue Stilvorlagen erstellen</title>
+
+                <screenshot>
                   <mediaobject>
                     <imageobject>
                       <imagedata fileref="figures/Style_New.png"
@@ -2878,8 +2914,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
                   <listitem>
                     <para>Verwenden Sie die Schaltfläche <guibutton>Durchsuchen</guibutton>, um eine Grafik, wie z.B. Ihr
                       Logo oder Lieblingsbriefpapier, auszuwählen, das als Hintergrund in den
-                      Berichten verwendet wird. Mit der <guibutton>Zurücksetzen</guibutton>-Schaltfläche
-                      können Sie Ihre Auswahl wieder zurücknehmen.
+                      Berichten verwendet wird. Mit der
+                      <guibutton>Zurücksetzen</guibutton>-Schaltfläche können Sie Ihre Auswahl
+                      wieder zurücknehmen.
                     </para>
                   </listitem>
                 </varlistentry>
@@ -3709,7 +3746,9 @@ Scrolling to older transactions is not possible. If you want to see all entries
     </para>
 
     <figure id="reset-warning-fig">
-      <title>Das <guilabel>Warnungen zurücksetzen</guilabel> Fenster</title><screenshot>
+      <title>Das <guilabel>Warnungen zurücksetzen</guilabel> Fenster</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Reset_Warnings.png" 
@@ -3806,9 +3845,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
 
         <listitem>
           <para>Wenn Sie eine andere als die automatisch gewählte Übersetzung verwenden möchten, können Sie
-            unter
-            &mc.macOS.sys.gen.lang;
-            eine andere Sprache einstellen.
+            unter &mc.macOS.sys.gen.lang; eine andere Sprache einstellen.
           </para>
         </listitem>
       </varlistentry>
@@ -3817,8 +3854,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <term>&win;</term>
 
         <listitem>
-          <para>&mc.winOS.pref.lang.local;
-            und stellen dann das Gebietsschema ein.
+          <para>&mc.winOS.pref.lang.local; und stellen dann das Gebietsschema ein.
           </para>
         </listitem>
       </varlistentry>
diff --git a/de/manual/ch_Finance-Quote.xml b/de/manual/ch_Finance-Quote.xml
index cc8e54a5..37577b23 100644
--- a/de/manual/ch_Finance-Quote.xml
+++ b/de/manual/ch_Finance-Quote.xml
@@ -18,9 +18,9 @@ Translators:
 
   <abstract>
     <para>Wenn Sie mehr als ein paar Devisen und Wertpapiere besitzen, werden Sie es vielleicht bald leid
-      sein, die Kurse ständig per Hand aktualisieren zu müssen. &app; bietet Ihnen die Möglichkeit,
-      automatisch den aktuellsten Kurs für Ihre Devisen und Wertpapiere über das Internet
-      herunterzuladen. Hierfür wird das &app-perl;-Modul &app-fq; verwendet.
+      sein, die Kurse ständig per Hand aktualisieren zu müssen. &app; bietet Ihnen die
+      Möglichkeit, automatisch den aktuellsten Kurs für Ihre Devisen und Wertpapiere über das
+      Internet herunterzuladen. Hierfür wird das &app-perl;-Modul &app-fq; verwendet.
     </para>
   </abstract>
 
@@ -39,9 +39,9 @@ Translators:
   </itemizedlist>
 
   <note>
-    <para>Wenn Sie bei der Durchführung der hier beschriebenen Schritte nicht mehr weiterwissen, 
-      können Sie auf den unter <xref linkend="more_help" /> genannten Kanäle viele hilfsbereiten
-      Anwender erreichen.
+    <para>Wenn Sie bei der Durchführung der hier beschriebenen Schritte nicht mehr weiterwissen, können Sie
+      auf den unter <xref linkend="more_help" /> genannten Kanäle viele hilfsbereiten Anwender
+      erreichen.
     </para>
   </note>
 
@@ -60,13 +60,15 @@ Translators:
     <para>Um zu überprüfen ob auf Ihrem System &app-perl; bereits installiert ist, rufen Sie den Befehl
       <userinput>perl -v</userinput> im Terminal auf.
 <!-- Fixme: https://bugs.gnucash.org/show_bug.cgi?id=798618 -->
-    <informalexample><?dbfo pgwide="1"?>
+      <informalexample>
+<?dbfo pgwide="1"?>
 <screen language="console">$ perl -v
 This is perl 5, version 30, subversion 0 (v5.30.0) built for x86_64-linux-gnu-thread-multi
 </screen>
-    </informalexample>
+      </informalexample>
       Wird Ihnen die Versionsnummer des &app-perl;-Interpreters angezeigt, dann überspringen Sie
-      die nächsten Angaben und fahren Sie stattdessen mit <xref linkend="finance-quote-install" /> fort.
+      die nächsten Angaben und fahren Sie stattdessen mit <xref linkend="finance-quote-install" />
+      fort.
     </para>
 
     <procedure>
@@ -99,8 +101,8 @@ This is perl 5, version 30, subversion 0 (v5.30.0) built for x86_64-linux-gnu-th
       <title>Unter &win;</title>
 
       <step>
-        <para>Unter &win; führen Sie das Programm &mc.winOS.inst-fq; aus. Dies
-          wird <ulink url="&url-wp-en;Strawberry_Perl">Strawberry Perl</ulink> installieren.
+        <para>Unter &win; führen Sie das Programm &mc.winOS.inst-fq; aus. Dies wird
+          <ulink url="&url-wp-en;Strawberry_Perl">Strawberry Perl</ulink> installieren.
           <footnote>
             <para>&app; Version 2.2.6 und früher benötigen <ulink url="&url-wp-en;ActivePerl">ActivePerl</ulink> in
               Version 5.8.
@@ -130,11 +132,11 @@ This is perl 5, version 30, subversion 0 (v5.30.0) built for x86_64-linux-gnu-th
     </procedure>
 
     <tip>
-      <para>Es empfiehlt sich anschließend, das Verzeichnis in dem &app; installiert ist, unter &win;
-        z.B. <userinput><replaceable>C:\Programme (x86)\gnucash\bin</replaceable></userinput>, zu Ihrer
-        <envar>PATH</envar>-Umgebungsvariable hinzuzufügen. Auf diese Weise ist es für Sie einfacher, bei Bedarf die
-        <xref linkend="finance-quote-helper" /> zu nutzen. Hierzu informieren Sie sich bitte in
-        den Unterlagen zu Ihrem Betriebssystem.
+      <para>Es empfiehlt sich anschließend, das Verzeichnis in dem &app; installiert ist, unter &win; z.B.
+        <userinput><replaceable>C:\Programme (x86)\gnucash\bin</replaceable></userinput>, zu Ihrer
+        <envar>PATH</envar>-Umgebungsvariable hinzuzufügen. Auf diese Weise ist es für Sie
+        einfacher, bei Bedarf die <xref linkend="finance-quote-helper" /> zu nutzen. Hierzu
+        informieren Sie sich bitte in den Unterlagen zu Ihrem Betriebssystem.
       </para>
     </tip>
   </sect1>
@@ -143,10 +145,11 @@ This is perl 5, version 30, subversion 0 (v5.30.0) built for x86_64-linux-gnu-th
     <title>Installieren von &app-fq;</title>
 
     <para>Um festzustellen, ob das &app-perl;-Modul &app-fq; bereits auf Ihrem System verfügbar ist, geben
-      Sie <userinput>perldoc Finance::Quote</userinput> in einem Terminalfenster ein. Wird Ihnen jetzt
-      eine Dokumentation in dieser Form
+      Sie <userinput>perldoc Finance::Quote</userinput> in einem Terminalfenster ein. Wird Ihnen
+      jetzt eine Dokumentation in dieser Form
 <!-- Fixme: https://bugs.gnucash.org/show_bug.cgi?id=798618 -->
-    <informalexample><?dbfo pgwide="1"?>
+      <informalexample>
+<?dbfo pgwide="1"?>
 <screen language="console">
 $ perldoc Finance::Quote
 NAME
@@ -155,7 +158,7 @@ NAME
 SYNOPSIS
        [...]
 </screen>
-    </informalexample>
+      </informalexample>
       angezeigt, dann ist &app-fq; installiert und Sie können, wie in
       <xref linkend="finance-quote-scheduler" /> beschrieben, den automatisierten Kursabruf
       konfigurieren. Wenn nicht, dann gibt Ihnen dieser Abschnitt eine Anleitung zur Installation.
@@ -175,11 +178,12 @@ SYNOPSIS
 
       <step>
         <simpara>Führen Sie den Befehl <userinput>gnc-fq-check</userinput> aus, um zu überprüfen, ob das Programm
-          bereits in einem Verzeichnis liegt, welches in der Umgebungsvariable <envar>PATH</envar> eingetragen ist.
+          bereits in einem Verzeichnis liegt, welches in der Umgebungsvariable <envar>PATH</envar>
+          eingetragen ist.
           <footnote>
             <simpara>Wenn Sie die von Ihrer Distribution bereitgestellten &app; Pakete installiert haben, sollte
-              <filename>gnc-fq-check</filename> bereits in Ihrem <envar>PATH</envar> sein. Die Aktualität ihrer
-              Distribution können Sie unter
+              <filename>gnc-fq-check</filename> bereits in Ihrem <envar>PATH</envar> sein. Die
+              Aktualität ihrer Distribution können Sie unter
               <ulink url="&url-repo;perl:finance-quote/versions"><citetitle>&app-fq;-
               Versionen</citetitle></ulink> nachlesen.
             </simpara>
@@ -188,16 +192,16 @@ SYNOPSIS
       </step>
 
       <step>
-        <simpara>Als nächstes aktualisieren Sie mit <userinput>sudo gnc-fq-update</userinput> oder
-          <userinput>su -c gnc-fq-update</userinput> mit Root-Rechten &app-fq;. Die richtige Syntax
-          ist von der jeweiligen Distribution abhängig. Weitere Informationen finden Sie im nächsten
-          Kapitel unter <xref linkend="gnc-fq-update" />.
+        <simpara>Als nächstes aktualisieren Sie mit <userinput>sudo gnc-fq-update</userinput> oder <userinput>su -c
+          gnc-fq-update</userinput> mit Root-Rechten &app-fq;. Die richtige Syntax ist von der
+          jeweiligen Distribution abhängig. Weitere Informationen finden Sie im nächsten Kapitel
+          unter <xref linkend="gnc-fq-update" />.
         </simpara>
       </step>
 
       <step>
-        <simpara>Führen Sie <userinput>gnc-fq-check</userinput> aus, um zu prüfen, ob &app-fq; richtig installiert ist.
-          Wenn dies so ist, dann werden die Versionsnummer sowie die von &app-fq; verwendbaren
+        <simpara>Führen Sie <userinput>gnc-fq-check</userinput> aus, um zu prüfen, ob &app-fq; richtig installiert
+          ist. Wenn dies so ist, dann werden die Versionsnummer sowie die von &app-fq; verwendbaren
           Quellen für eine Kursabfrage aufgelistet. Bei Problemen mit der Installation von &app-fq;
           wird eventuell eine Lösung vorgeschlagen.
         </simpara>
@@ -215,13 +219,13 @@ SYNOPSIS
       <step>
         <simpara>Installieren Sie &app-xcode;
           <footnote>
-            <para>Sie können &app-xcode; aus dem App Store installieren oder Sie installieren die
-              viel kleineren Xcode-Befehlszeilentools, indem Sie <userinput>
-              sudo xcode-select --install</userinput> in einer Terminal.app Eingabeaufforderung
-              ausführen.
+            <para>Sie können &app-xcode; aus dem App Store installieren oder Sie installieren die viel kleineren
+              Xcode-Befehlszeilentools, indem Sie <userinput> sudo xcode-select
+              --install</userinput> in einer Terminal.app Eingabeaufforderung ausführen.
             </para>
-          </footnote>, falls noch nicht geschehen. Es enthält Entwicklungswerkzeuge, die von CPAN
-          benötigt werden, um die benötigten &app-fq; Module zu bauen und zu testen.
+          </footnote>
+          , falls noch nicht geschehen. Es enthält Entwicklungswerkzeuge, die von CPAN benötigt
+          werden, um die benötigten &app-fq; Module zu bauen und zu testen.
         </simpara>
       </step>
 
@@ -246,8 +250,8 @@ SYNOPSIS
       </step>
 
       <step>
-        <simpara>Führen Sie &mc.winOS.inst-fq; aus. Dies ist ein kleines Hilfsprogramm,
-          das &app-fq; für Sie installiert.
+        <simpara>Führen Sie &mc.winOS.inst-fq; aus. Dies ist ein kleines Hilfsprogramm, das &app-fq; für Sie
+          installiert.
         </simpara>
       </step>
     </procedure>
@@ -257,11 +261,10 @@ SYNOPSIS
     <title>Hilfsprogramme zur Symbolsuche und Aktualisierung</title>
 
     <abstract>
-      <para>&app; bietet Hilfsprogramme, die Sie bei der Auswahl der
-        richtigen Symbole und der Verifikation für die gewünschte Online-
-        Kursquelle unterstützen. Ein weiteres Skript führt die erstmalige
-        Installation durch oder bringt &app-fq; auf den aktuellen Stand.
-        Und letztendlich stehen auch Tools zur Fehleranalyse bereit.
+      <para>&app; bietet Hilfsprogramme, die Sie bei der Auswahl der richtigen Symbole und der Verifikation für
+        die gewünschte Online- Kursquelle unterstützen. Ein weiteres Skript führt die erstmalige
+        Installation durch oder bringt &app-fq; auf den aktuellen Stand. Und letztendlich stehen
+        auch Tools zur Fehleranalyse bereit.
       </para>
     </abstract>
 
@@ -269,21 +272,21 @@ SYNOPSIS
       <title>&app-perl; Skripts unter &win; ausführen</title>
 
       <step>
-        <simpara>Öffnen Sie ein <application>CMD</application>- oder <application>Powershell
-          </application>-Fenster: Klicken Sie auf &gm.win;
-          und geben Sie entweder <userinput>cmd</userinput> oder <userinput>powershell</userinput>
-          ein und wählen Sie den entsprechenden Menüpunkt. Das muss nicht als Administrator ausgeführt werden.
+        <simpara>Öffnen Sie ein <application>CMD</application>- oder <application>Powershell </application>-Fenster:
+          Klicken Sie auf &gm.win; und geben Sie entweder <userinput>cmd</userinput> oder
+          <userinput>powershell</userinput> ein und wählen Sie den entsprechenden Menüpunkt. Das
+          muss nicht als Administrator ausgeführt werden.
         </simpara>
       </step>
 
       <step>
-        <simpara>Da, wie zuvor empfohlen, das &app;-Verzeichnis in die <envar>PATH</envar>
-          Umgebungsvariable eingetragen wurde, müssen Sie jetzt nur noch jedem gnc-fq-xxx
-          &app-perl; Skriptbefehl <quote>Perl</quote> und ein Leerzeichen voranstellen,
-          z.B. <userinput>perl gnc-fq-check</userinput>.
-          Andernfalls müssen Sie den Befehl in der Form <userinput><replaceable>
-          C:\strawberry-perl\bin\</replaceable>perl.exe <replaceable>C:\Programme (x86)\gnucash\bin\
-          </replaceable>gnc-fq-check</userinput> ausführen.
+        <simpara>Da, wie zuvor empfohlen, das &app;-Verzeichnis in die <envar>PATH</envar> Umgebungsvariable
+          eingetragen wurde, müssen Sie jetzt nur noch jedem gnc-fq-xxx &app-perl; Skriptbefehl
+          <quote>Perl</quote> und ein Leerzeichen voranstellen, z.B. <userinput>perl
+          gnc-fq-check</userinput>. Andernfalls müssen Sie den Befehl in der Form
+          <userinput><replaceable> C:\strawberry-perl\bin\</replaceable>perl.exe
+          <replaceable>C:\Programme (x86)\gnucash\bin\ </replaceable>gnc-fq-check</userinput>
+          ausführen.
         </simpara>
       </step>
     </procedure>
@@ -292,14 +295,14 @@ SYNOPSIS
       <title>gnc-fq-check</title>
 
       <abstract>
-        <para>Dieses Programm liefert die Versionsnummer des derzeit installierten &app-fq; Moduls
-          sowie eine Liste der über &app-fq; verfügbaren Quellen. Es informiert Sie auch, wenn es ein Problem
-          mit Ihrer Installation gibt und schlägt eventuell eine Lösung vor. 
+        <para>Dieses Programm liefert die Versionsnummer des derzeit installierten &app-fq; Moduls sowie eine
+          Liste der über &app-fq; verfügbaren Quellen. Es informiert Sie auch, wenn es ein Problem
+          mit Ihrer Installation gibt und schlägt eventuell eine Lösung vor.
         </para>
       </abstract>
-
 <!-- Fixme: https://bugs.gnucash.org/show_bug.cgi?id=798618 -->
-      <informalexample><?dbfo pgwide="1"?>
+      <informalexample>
+<?dbfo pgwide="1"?>
 <screen language="console">
 $ gnc-fq-check
 Can't locate Mozilla/CA.pm in @INC (you may need to install the Mozilla::CA module)
@@ -327,8 +330,10 @@ BEGIN failed--compilation aborted at (eval 303) line 1.
       </informalexample>
 
       <para>Der erste Teil ist die Fehlermeldung über ein fehlendes &app-perl;-Modul Mozilla/CA.pm. Am Ende in
-        Klammern steht die normale Ausgabe der aktuell installierten &app-fq;-Version<footnote>
-        <para>Die neueste &app-fq; Version ist &app-fq-vers;.</para>
+        Klammern steht die normale Ausgabe der aktuell installierten &app-fq;-Version
+        <footnote>
+          <para>Die neueste &app-fq; Version ist &app-fq-vers;.
+          </para>
         </footnote>
         und eine Liste der verfügbaren Kursdaten-Quellen.
       </para>
@@ -344,19 +349,19 @@ BEGIN failed--compilation aborted at (eval 303) line 1.
       <title>gnc-fq-update</title>
 
       <abstract>
-        <para>Dieses Programm installiert oder aktualisiert das &app-fq; Softwaremodul und löst bei Bedarf
-          die Abhängigkeiten zu weiteren Softwarepaketen auf.
+        <para>Dieses Programm installiert oder aktualisiert das &app-fq; Softwaremodul und löst bei Bedarf die
+          Abhängigkeiten zu weiteren Softwarepaketen auf.
           <note>
-            <para>Windows-Benutzer sind im Allgemeinen besser beraten, wenn sie das Update-Tool
-              &mc.winOS.inst-fq; ausführen.
+            <para>Windows-Benutzer sind im Allgemeinen besser beraten, wenn sie das Update-Tool &mc.winOS.inst-fq;
+              ausführen.
             </para>
           </note>
         </para>
       </abstract>
 
       <note>
-        <para>Dieses Programm erfordert für eine Installation unter &lin; oder &mac; Superuser-
-          oder Administratorrechte, aber nicht in &win;.
+        <para>Dieses Programm erfordert für eine Installation unter &lin; oder &mac; Superuser- oder
+          Administratorrechte, aber nicht in &win;.
         </para>
       </note>
 
@@ -367,11 +372,11 @@ BEGIN failed--compilation aborted at (eval 303) line 1.
             Informationen.
           </simpara>
         </footnote>
-        um die Installation vorzunehmen. Wenn Sie CPAN zum ersten Mal verwenden,
-        müssen Sie es konfigurieren, wobei Sie auf den meisten Systemen jedoch
-        die Standardvorgaben akzeptieren und die erste Frage <computeroutput>Are you ready for
-        manual configuration? [yes]</computeroutput> mit <userinput>no</userinput> beantworten können,
-        damit &app-fq; erfolgreich installiert wird.
+        um die Installation vorzunehmen. Wenn Sie CPAN zum ersten Mal verwenden, müssen Sie es
+        konfigurieren, wobei Sie auf den meisten Systemen jedoch die Standardvorgaben akzeptieren
+        und die erste Frage <computeroutput>Are you ready for manual configuration?
+        [yes]</computeroutput> mit <userinput>no</userinput> beantworten können, damit &app-fq;
+        erfolgreich installiert wird.
       </para>
     </sect2>
 
@@ -379,50 +384,59 @@ BEGIN failed--compilation aborted at (eval 303) line 1.
       <title>gnc-fq-dump</title>
 <!-- Todo: insert link to wiki and/or guide -->
       <abstract>
-        <para>Dieses Programm liefert Kursdaten für eine Quelle und eine Liste von Symbolen in einem Format,
-          das für Menschen leicht zu lesen ist. Es ist nützlich, um zu überprüfen, ob eine bestimmte
+        <para>Dieses Programm liefert Kursdaten für eine Quelle und eine Liste von Symbolen in einem Format, das
+          für Menschen leicht zu lesen ist. Es ist nützlich, um zu überprüfen, ob eine bestimmte
           Online-Kursquelle erreichbar ist und funktioniert.
         </para>
       </abstract>
-      
-      <para>Mit Hilfe diesen Befehls können Sie überprüfen, ob das <xref linkend="tool-ge-Symbol" />,
-        welches Sie für Ihr Wertpapier zum Online-Kursabruf verwenden möchten, bei der
-        gewünschten <xref linkend="tool-ge-TypeQuoteSource" /> funktioniert.
+
+      <para>Mit Hilfe diesen Befehls können Sie überprüfen, ob das <xref linkend="tool-ge-Symbol" />, welches
+        Sie für Ihr Wertpapier zum Online-Kursabruf verwenden möchten, bei der gewünschten
+        <xref linkend="tool-ge-TypeQuoteSource" /> funktioniert.
       </para>
-      
+
       <tip>
-        <para>Mit <userinput>gnc-fq-dump</userinput> können Sie Symbole schneller als aus
-          &app; heraus überprüfen, wenn während des Abrufs mit &app; ein Fehler auftritt.
-          Dies kann Sie davor bewahren, &app; mit aktiviertem Debug-Logging laufen zu
-          lassen, während Sie ein nicht funktionierendes Symbol überprüfen.
+        <para>Mit <userinput>gnc-fq-dump</userinput> können Sie Symbole schneller als aus &app; heraus
+          überprüfen, wenn während des Abrufs mit &app; ein Fehler auftritt. Dies kann Sie davor
+          bewahren, &app; mit aktiviertem Debug-Logging laufen zu lassen, während Sie ein nicht
+          funktionierendes Symbol überprüfen.
         </para>
       </tip>
 
       <itemizedlist>
         <listitem>
-          <para>Um ausführliche Inforamtionen zu einem Wertpapier zu erhalten, führen Sie in
-            der Befehlszeile einen Befehl in dieser Form aus:
+          <para>Um ausführliche Inforamtionen zu einem Wertpapier zu erhalten, führen Sie in der Befehlszeile
+            einen Befehl in dieser Form aus:
             <cmdsynopsis>
               <command>gnc-fq-dump</command>
-              <arg choice="opt">-v</arg>
-              <arg choice="plain"><replaceable>Quelle</replaceable></arg>
-              <arg choice="plain" rep="repeat"><replaceable>Symbol</replaceable></arg>
+              <arg choice="opt">
+                -v
+              </arg>
+
+              <arg choice="plain">
+                <replaceable>Quelle</replaceable>
+              </arg>
+
+              <arg choice="plain" rep="repeat">
+                <replaceable>Symbol</replaceable>
+              </arg>
             </cmdsynopsis>
             zum Beispiel <command>gnc-fq-dump -v yahoo_json IBM</command>.
           </para>
         </listitem>
-        
+
         <listitem>
-          <para>Zum Abrufen eines Wechselkurses führen Sie folgenden Befehl aus:
-            <command>gnc-fq-dump <optional>-v</optional> currency USD EUR</command>
+          <para>Zum Abrufen eines Wechselkurses führen Sie folgenden Befehl aus: <command>gnc-fq-dump
+            <optional>-v</optional> currency USD EUR</command>
             <footnote>
-              <para>Seit &app-fq; 1.41 ist die Standardquelle für Währungen <quote>Alpha Vantage</quote>.
-                Lesen Sie auch die Hinweise zu <xref linkend="gnc-tbl-fq-currency-source" />.
+              <para>Seit &app-fq; 1.41 ist die Standardquelle für Währungen <quote>Alpha Vantage</quote>. Lesen Sie
+                auch die Hinweise zu <xref linkend="gnc-tbl-fq-currency-source" />.
               </para>
             </footnote>
+
             <footnote>
-              <para>Die alten Yahoo-Währungen sind immer noch verfügbar als
-                <command>gnc-fq-dump yahoo_json USDEUR=X</command>.
+              <para>Die alten Yahoo-Währungen sind immer noch verfügbar als <command>gnc-fq-dump yahoo_json
+                USDEUR=X</command>.
               </para>
             </footnote>
           </para>
@@ -432,29 +446,33 @@ BEGIN failed--compilation aborted at (eval 303) line 1.
       <para>Um zu testen, ob &app-fq; für Währungen innerhalb von &app; funktioniert,
         <orderedlist numeration="arabic">
           <listitem>
-            <para>nehmen Sie eine Buchung zwischen dem gewünschtem Handelsgut und der Buchwährung,</para>
+            <para>nehmen Sie eine Buchung zwischen dem gewünschtem Handelsgut und der Buchwährung,
+            </para>
           </listitem>
+
           <listitem>
-            <para>machen einen Rechtsklick darauf, und dann</para>
+            <para>machen einen Rechtsklick darauf, und dann
+            </para>
           </listitem>
+
           <listitem>
-            <para>wählen Sie im Kontextmenü die Option &gmi.ac.ed-ex;.</para>
+            <para>wählen Sie im Kontextmenü die Option &gmi.ac.ed-ex;.
+            </para>
           </listitem>
         </orderedlist>
         Der <xref linkend="trans-win-enter" /> wird angezeigt. Klicken Sie auf die Schaltfläche
-        <guilabel>Wechselkurs abrufen</guilabel>, und wenn alles gut läuft, wird der aktuelle
-         Kurs in das Feld für den Wechselkurs eingetragen.
+        <guilabel>Wechselkurs abrufen</guilabel>, und wenn alles gut läuft, wird der aktuelle Kurs
+        in das Feld für den Wechselkurs eingetragen.
       </para>
     </sect2>
 
     <sect2 id="gnc-fq-helper">
       <title>gnc-fq-helper</title>
 
-      <para>Dies ist ein Skript, das &app; zum Abrufen von Kursen verwendet und musss
-        normalerweise vom Benutzer nicht verwendet werden. Sollte der Abruf eines
-        Kurses in &app; zu einem Fehlverhalten führen, kann mit diesem Skript eine
-        Diagnose durchgeführt werden und hilft Entwicklern bei der Entscheidung,
-        ob der Fehler in &app; oder &app-fq; liegt.
+      <para>Dies ist ein Skript, das &app; zum Abrufen von Kursen verwendet und musss normalerweise vom Benutzer
+        nicht verwendet werden. Sollte der Abruf eines Kurses in &app; zu einem Fehlverhalten
+        führen, kann mit diesem Skript eine Diagnose durchgeführt werden und hilft Entwicklern bei
+        der Entscheidung, ob der Fehler in &app; oder &app-fq; liegt.
       </para>
     </sect2>
   </sect1>
@@ -475,9 +493,9 @@ BEGIN failed--compilation aborted at (eval 303) line 1.
       &app;-Datendatei schreiben ohne die Benutzeroberfläche zu starten. Somit ist eine
       automatische, regelmäßige Aktualisierung der Kursdatenbank möglich.
       <note>
-        <para>Der Befehl schlägt fehl, wenn kein exclusiver Zugriff auf die Datendatei
-          möglich ist, z.B. weil die Datendatei in einer anderen &app; Instanz geöffnet
-          ist oder die letzte Sitzung für die Datei abgestürzt ist.
+        <para>Der Befehl schlägt fehl, wenn kein exclusiver Zugriff auf die Datendatei möglich ist, z.B. weil
+          die Datendatei in einer anderen &app; Instanz geöffnet ist oder die letzte Sitzung für
+          die Datei abgestürzt ist.
         </para>
       </note>
     </para>
@@ -486,10 +504,10 @@ BEGIN failed--compilation aborted at (eval 303) line 1.
       Datendatei. Dies lässt sich anhand des Namens feststellen, der im oberen Rahmen des &app;
       Fensters vor dem <quote>-</quote> angezeigt wird.
       <tip>
-        <para>Der Dateiname ist auch in der Liste der zuletzt geöffneten Dateien im
-          &gm.file;-Menü zu finden. Wenn Sie den Mauszeiger über dem Menüeintrag
-          mit der Nummer 1 in der Liste der zuletzt geöffneten Dateien platzieren, wird in der
-          <guilabel>Statusleiste</guilabel> die vollständige Dateibezeichnung angezeigt.
+        <para>Der Dateiname ist auch in der Liste der zuletzt geöffneten Dateien im &gm.file;-Menü zu finden.
+          Wenn Sie den Mauszeiger über dem Menüeintrag mit der Nummer 1 in der Liste der zuletzt
+          geöffneten Dateien platzieren, wird in der <guilabel>Statusleiste</guilabel> die
+          vollständige Dateibezeichnung angezeigt.
         </para>
       </tip>
     </para>
@@ -543,9 +561,7 @@ gnucash-cli --quotes get &user-datafile; > /dev/null 2>&1</screen>
         </para>
 
         <step>
-          <simpara>Wählen Sie
-            &mc.winOS.sys.tasks;
-            .
+          <simpara>Wählen Sie &mc.winOS.sys.tasks; .
           </simpara>
         </step>
 
diff --git a/de/manual/ch_GUIMenus.xml b/de/manual/ch_GUIMenus.xml
index 129deb85..46859331 100644
--- a/de/manual/ch_GUIMenus.xml
+++ b/de/manual/ch_GUIMenus.xml
@@ -27,7 +27,9 @@
     <title>Bereiche des &app; Hauptfensters</title>
 
     <figure id="Main_WindowCallouts">
-      <title>Die Bereiche des &app;-Hauptfensters</title><mediaobject>
+      <title>Die Bereiche des &app;-Hauptfensters</title>
+
+      <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/Main-window-callouts.png"
                        srccredit="Frank H. Ellenberger" width="&img-w;" />
@@ -155,14 +157,13 @@
     </para>
 
     <tip>
-      <para>Um eine zusätzliche Ansicht der Kontenübersicht zu öffnen, gehen Sie auf
-        &mc.vw.new-page;. Dadurch wird eine weitere Kontenübersicht im bestehenden Fenster geöffnet.
+      <para>Um eine zusätzliche Ansicht der Kontenübersicht zu öffnen, gehen Sie auf &mc.vw.new-page;.
+        Dadurch wird eine weitere Kontenübersicht im bestehenden Fenster geöffnet.
       </para>
     </tip>
 
     <tip>
-      <para>Um ein neues Fenster mit der Kontenübersicht zu öffnen, gehen Sie zu
-        &mc.win.page;.
+      <para>Um ein neues Fenster mit der Kontenübersicht zu öffnen, gehen Sie zu &mc.win.page;.
       </para>
     </tip>
   </sect1>
@@ -767,8 +768,8 @@
       <title>&gm.act;-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-ActionsMenu">
-        <title>Aktionen-Menü - Anlegen terminierter Buchungen, Überprüfen von Konten, Durchführen
-          von Aktienteilungen, Buchen und Abgleichen von Geschäftsvorgängen</title>
+        <title>Aktionen-Menü - Anlegen terminierter Buchungen, Überprüfen von Konten, Durchführen von
+          Aktienteilungen, Buchen und Abgleichen von Geschäftsvorgängen</title>
 
         <titleabbrev>&appname; - Aktionen-Menü</titleabbrev>
 
@@ -814,8 +815,7 @@
                 </note>
 
                 <important>
-                  <para>Die Menüeinträge werden erst nach dem vollständigen Bearbeiten von
-                    &mc.to.aqb; aktiviert.
+                  <para>Die Menüeinträge werden erst nach dem vollständigen Bearbeiten von &mc.to.aqb; aktiviert.
                   </para>
                 </important>
 
@@ -2420,7 +2420,7 @@
 
     <sect2 id="gui-window-windows-menu">
       <title>&gm.win;-Menü</title>
-      
+
       <table pgwide="1" frame="topbot" id="GUI-Window-WindowsMenu">
         <title>Fenster-Menü</title>
 
@@ -2566,7 +2566,9 @@
     <title id="gui-acct-tree2">Kontenübersicht</title>
 
     <figure>
-      <title>Die Anzeige der <emphasis>Kontenübersicht</emphasis></title><screenshot id="AccTree_Screen">
+      <title>Die Anzeige der <emphasis>Kontenübersicht</emphasis></title>
+
+      <screenshot id="AccTree_Screen">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/AccountTree_Screen.png"
@@ -2652,7 +2654,9 @@
       </para>
 
       <figure pgwide="1">
-        <title>Der Spaltenselektor</title><screenshot>
+        <title>Der Spaltenselektor</title>
+
+        <screenshot>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/column-selector-0.png"
@@ -2667,7 +2671,9 @@
       </para>
 
       <figure pgwide="1">
-        <title>Die Spaltenauswahl im Spaltenselektor</title><screenshot>
+        <title>Die Spaltenauswahl im Spaltenselektor</title>
+
+        <screenshot>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/column-selector-1.png"
@@ -2680,8 +2686,8 @@
       <para>Die Spalte <guilabel>Kontobezeichnung</guilabel> kann nicht deaktiviert werden. Die momentan in der
         <guilabel>Kontenübersicht</guilabel> aktiven Spalten werden in der Liste markiert
         angezeigt. Einige Spalten die zur Auswahl stehen, zeigen die statischen Eigenschaften der
-        Konten an und sind in <xref linkend="acct-create-or-edit" /> beschrieben. Daneben stehen weitere
-        Spalten zur Anzeige von dynamischen Inhalten zur Verfügung. Diese gibt es in zwei
+        Konten an und sind in <xref linkend="acct-create-or-edit" /> beschrieben. Daneben stehen
+        weitere Spalten zur Anzeige von dynamischen Inhalten zur Verfügung. Diese gibt es in zwei
         unterschiedliche Ausprägungen.
         <orderedlist>
           <listitem>
@@ -2806,8 +2812,7 @@
         hinzuzufügen. Klicken Sie erneut auf die Spaltenbeschreibung, um sie auszublenden.
       </para>
 <!-- FIXME source: moved from ch_Customize -->
-      <para>Der Dialog <guilabel>Konten filtern nach…</guilabel> wird mit dem Menüpunkt
-        &mc.vw.f-by;
+      <para>Der Dialog <guilabel>Konten filtern nach…</guilabel> wird mit dem Menüpunkt &mc.vw.f-by;
         geöffnet und beeinflusst die Darstellung in den einzelnen geöffneten Fenstern der
         Kontenübersicht in der Art, dass die Auswahl der darzustellenden
         <emphasis>Zeilen</emphasis> Ihren Anforderungen angepasst wird.
@@ -2821,7 +2826,9 @@
             <row>
               <entry>
                 <para><figure id="acct-opt-fig0">
-                    <title>Der Reiter <quote>Kontoart</quote></title><screenshot id="Account-View-Options-0">
+                    <title>Der Reiter <quote>Kontoart</quote></title>
+
+                    <screenshot id="Account-View-Options-0">
                       <mediaobject>
                         <imageobject role="html">
                           <imagedata fileref="figures/AcctViewOptions-0.png" 
@@ -2840,7 +2847,9 @@
 
               <entry>
                 <para><figure id="acct-opt-fig1">
-                    <title>Der Reiter <quote>Weitere</quote></title><screenshot id="Account-View-Options-1">
+                    <title>Der Reiter <quote>Weitere</quote></title>
+
+                    <screenshot id="Account-View-Options-1">
                       <mediaobject>
                         <imageobject role="html">
                           <imagedata fileref="figures/AcctViewOptions-1.png" 
@@ -2974,14 +2983,18 @@
       </para>
 
       <figure pgwide="1">
-        <title>Die Zusammenfassungsleiste der Kontenübersicht</title><screenshot>
+        <title>Die Zusammenfassungsleiste der Kontenübersicht</title>
+
+        <screenshot>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/summarybar-selector-1.png"
                    srccredit="Christian Wehling" />
             </imageobject>
           </mediaobject>
-        </screenshot><screenshot>
+        </screenshot>
+
+        <screenshot>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/summarybar-selector-2.png"
@@ -3153,7 +3166,8 @@
                 </entry>
 
                 <entry>
-                  <para>Ändert den Namen oder die Eigenschaften des ausgewählten Kontos. <xref linkend="acct-create-or-edit"></xref>
+                  <para>Ändert den Namen oder die Eigenschaften des ausgewählten Kontos.
+                    <xref linkend="acct-create-or-edit"></xref>
                   </para>
                 </entry>
               </row>
@@ -3521,8 +3535,8 @@
 
       <para>Das &app; Hauptfenster hat eine Reihe von Schaltflächen in der <emphasis>Werkzeugleiste</emphasis>
         um schnell auf einige allgemeine Funktionen zuzugreifen, die mit der jeweils aktiven
-        Registerkarte interagieren. Die <emphasis>Werkzeugleiste</emphasis> kann unter
-        &mc.vw.tbar; ein- oder ausgeblendet werden.
+        Registerkarte interagieren. Die <emphasis>Werkzeugleiste</emphasis> kann unter &mc.vw.tbar;
+        ein- oder ausgeblendet werden.
       </para>
 
       <note>
@@ -3611,7 +3625,8 @@
               </entry>
 
               <entry>
-                <para>Bearbeitet die Eigenschaften für das ausgewählte Konto. <xref linkend="acct-create-or-edit"></xref>
+                <para>Bearbeitet die Eigenschaften für das ausgewählte Konto.
+                  <xref linkend="acct-create-or-edit"></xref>
                 </para>
               </entry>
             </row>
@@ -3623,7 +3638,8 @@
               </entry>
 
               <entry>
-                <para>Startet den Assistenten zum Erstellen eines neuen Kontos. <xref linkend="acct-create-or-edit"></xref>
+                <para>Startet den Assistenten zum Erstellen eines neuen Kontos.
+                  <xref linkend="acct-create-or-edit"></xref>
                 </para>
               </entry>
             </row>
@@ -3650,7 +3666,9 @@
 <!-- Fixme: 1. Journal noch nicht eingeführt,
             2. wäre nicht Kontenblatt angemessener als Kontobuch? -->
     <figure>
-      <title>Die Ansicht des <emphasis>Kontenblatt</emphasis>s</title><screenshot id="AccountReg_Screen">
+      <title>Die Ansicht des <emphasis>Kontenblatt</emphasis>s</title>
+
+      <screenshot id="AccountReg_Screen">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/AccountReg_Screen.png"
@@ -3680,18 +3698,18 @@
       </para>
 
       <para>Um die Buchungsansicht für ein Konto zu öffnen, wählen Sie das Konto in der Kontenübersicht und
-        gehen Sie dann zu &mc.ed.acc-open;
-        Schaltfläche. Dies öffnet ein neues Fenster mit dem gewähltem Kontenblatt. Das Drücken
-        von <guibutton>Öffnen</guibutton> in der <emphasis>Werkzeugleiste</emphasis> im Fenster
-        <emphasis>Kontenübersicht</emphasis> oder die Schaltfläche <guibutton>Springen</guibutton>
-        im Fenster <emphasis>Kontenblatt</emphasis> sind weiter Möglichkeiten.
+        gehen Sie dann zu &mc.ed.acc-open; Schaltfläche. Dies öffnet ein neues Fenster mit dem
+        gewähltem Kontenblatt. Das Drücken von <guibutton>Öffnen</guibutton> in der
+        <emphasis>Werkzeugleiste</emphasis> im Fenster <emphasis>Kontenübersicht</emphasis> oder
+        die Schaltfläche <guibutton>Springen</guibutton> im Fenster
+        <emphasis>Kontenblatt</emphasis> sind weiter Möglichkeiten.
       </para>
 
       <tip>
         <para>Das Aussehen der Anzeige eines Kontenblatts ist in hohem Maße konfigurierbar. (siehe
           <ulink
-url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
-          Konzepte, Auswahl eines Registerstils</ulink>).
+url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und Konzepte,
+          Auswahl eines Registerstils</ulink>).
         </para>
       </tip>
 
@@ -3711,12 +3729,11 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         <guilabel>Buchen</guilabel> und <guilabel>Saldo</guilabel>.
       </para>
 
-      <para>Sie können das Menü &gm.view; verwenden, um das Erscheinungsbild der Liste zu
-        verändert. Beispielsweise ist es möglich, die Anzahl der angezeigten Buchungen
-        einzuschränken, eine andere Sortierreihenfolge zu verwenden oder den Anzeigestil zu
-        ändern, um die Buchungen übersichtlicher darzustellen. Darüber hinaus gestattet die
-        Schaltfläche <guibutton>Vollständig</guibutton> einen schnellen Zugriff auf alle
-        Buchungsbestandteile.
+      <para>Sie können das Menü &gm.view; verwenden, um das Erscheinungsbild der Liste zu verändert.
+        Beispielsweise ist es möglich, die Anzahl der angezeigten Buchungen einzuschränken, eine
+        andere Sortierreihenfolge zu verwenden oder den Anzeigestil zu ändern, um die Buchungen
+        übersichtlicher darzustellen. Darüber hinaus gestattet die Schaltfläche
+        <guibutton>Vollständig</guibutton> einen schnellen Zugriff auf alle Buchungsbestandteile.
       </para>
     </sect2>
 
@@ -3730,8 +3747,8 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         <guilabel>abgeglichener</guilabel> Saldo und ein <guilabel>vorraussichtliches
         Minimum</guilabel> angezeigt. Eine Ausnahme bilden Aktienkonten, hier erscheint stattdessen
         die Summe der Anteile und deren aktueller Wert. Die
-        <emphasis>Zusammenfassungsleiste</emphasis> kann im Menü &mc.vw.sum;
-        ein- und ausgeblendet werden.
+        <emphasis>Zusammenfassungsleiste</emphasis> kann im Menü &mc.vw.sum; ein- und ausgeblendet
+        werden.
       </para>
     </sect2>
 
@@ -3745,9 +3762,8 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <sect3 id="Trans-file-menu">
         <title>Kontenblatt - &gm.file;-Menü</title>
 
-        <para>Wenn Sie in der <emphasis>Menüleiste</emphasis> auf &gm.file; klicken, wird das
-          Menü mit den in <xref linkend="gui-window-file-menu"/> beschriebenen
-          Auswahlmöglichkeiten geöffnet.
+        <para>Wenn Sie in der <emphasis>Menüleiste</emphasis> auf &gm.file; klicken, wird das Menü mit den in
+          <xref linkend="gui-window-file-menu"/> beschriebenen Auswahlmöglichkeiten geöffnet.
         </para>
 
         <para>Für die Arbeit in der Buchungsansicht sind zusätzlich die nachfolgend beschriebenen Menüeinträge
@@ -3858,9 +3874,8 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <sect3 id="Trans-view-menu">
         <title>Kontenblatt - &gm.view;-Menü</title>
 
-        <para>Das &gm.view;-Menü in der <emphasis>Menüleiste</emphasis>
-          <xref linkend="gui-window-view-menu"/> wird für die Buchungsansicht um die nachfolgenden
-          Einträge ergänzt.
+        <para>Das &gm.view;-Menü in der <emphasis>Menüleiste</emphasis> <xref linkend="gui-window-view-menu"/>
+          wird für die Buchungsansicht um die nachfolgenden Einträge ergänzt.
         </para>
 
         <table pgwide="1" frame="topbot" id="Trans-ViewMenu">
@@ -4328,8 +4343,8 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <sect3 id="Trans-actions-menu">
         <title>Kontenblatt - &gm.act;-Menü</title>
 
-        <para>Der Grundumfang des Menüs &gm.act; in der <emphasis>Menüleiste</emphasis> ist
-          in <xref linkend="gui-window-actions-menu"/> beschrieben. Ergänzend stehen die folgenden
+        <para>Der Grundumfang des Menüs &gm.act; in der <emphasis>Menüleiste</emphasis> ist in
+          <xref linkend="gui-window-actions-menu"/> beschrieben. Ergänzend stehen die folgenden
           Menüpunkte zur Verfügung.
         </para>
 
@@ -4506,8 +4521,8 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <sect3 id="Trans-tools-menu">
         <title>Kontenblatt - &gm.tool;-Menü</title>
 
-        <para>Die im Menü &gm.tool; genannten Einträge sind in
-          <xref linkend="gui-window-tools-menu" /> beschrieben.
+        <para>Die im Menü &gm.tool; genannten Einträge sind in <xref linkend="gui-window-tools-menu" />
+          beschrieben.
         </para>
       </sect3>
 
@@ -4533,9 +4548,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <para>Das Kontenblatt verfügt über eine Reihe von Schaltflächen in der
         <emphasis>Werkzeugleiste</emphasis> um schnell auf einige allgemeine Funktionen zuzugreifen,
         die mit der jeweils aktiven Registerkarte interagieren. Die
-        <emphasis>Werkzeugleiste</emphasis> kann unter
-        &mc.vw.tbar;
-        ein- oder ausgeblendet werden.
+        <emphasis>Werkzeugleiste</emphasis> kann unter &mc.vw.tbar; ein- oder ausgeblendet werden.
       </para>
 
       <note>
@@ -4672,8 +4685,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
               </entry>
 
               <entry>
-                <para>Alle Buchungsteile des aktuellen Buchungssatzes anzeigen. Nicht hervorgehoben, wenn
-                  &mc.vw.spl-led;
+                <para>Alle Buchungsteile des aktuellen Buchungssatzes anzeigen. Nicht hervorgehoben, wenn &mc.vw.spl-led;
                   aktiviert ist.
                 </para>
               </entry>
@@ -4737,7 +4749,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
     <title>Berichte</title>
 
     <figure>
-      <title>Das <emphasis>Berichtsfenster</emphasis></title><screenshot id="Report_Screen">
+      <title>Das <emphasis>Berichtsfenster</emphasis></title>
+
+      <screenshot id="Report_Screen">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Report_Screen.png"
@@ -4764,10 +4778,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         &gm.rep; aufrufen.
       </para>
 
-      <para>Um das Berichtsfenster zu öffnen, wählen Sie einen Bericht aus dem Menü
-        &gm.rep; in der <emphasis>Menüleiste</emphasis>. Dadurch wird ein neues
-        Fenster mit dem angezeigten Bericht geöffnet. Es bietet eine webbrowserartige Anzeige mit
-        aktiven Links zu Kontodaten.
+      <para>Um das Berichtsfenster zu öffnen, wählen Sie einen Bericht aus dem Menü &gm.rep; in der
+        <emphasis>Menüleiste</emphasis>. Dadurch wird ein neues Fenster mit dem angezeigten Bericht
+        geöffnet. Es bietet eine webbrowserartige Anzeige mit aktiven Links zu Kontodaten.
       </para>
 
       <note>
@@ -4787,9 +4800,8 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         können Sie bearbeiten, was der Bericht anzeigt und von welchen Konten die Informationen
         bezogen werden. Im Abschnitt <xref linkend="report-classes"></xref> werden spezifische
         Einstellungen für die verfügbaren Berichte und Diagramme erläutert. Durch Auswahl von
-        &mc.ed.css;
-        können Sie die Eigenschaften der <acronym>HTML</acronym>-Seite auswählen, in welcher ihr
-        Bericht angezeigt wird.
+        &mc.ed.css; können Sie die Eigenschaften der <acronym>HTML</acronym>-Seite auswählen, in
+        welcher ihr Bericht angezeigt wird.
       </para>
 
       <para>Der Bericht verhält sich wie ein Webbrowser, wenn er Links zu externen Webseiten enthält. Die
@@ -4815,9 +4827,8 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <sect3 id="Report-file-menu">
         <title>Berichte - &gm.file;-Menü</title>
 
-        <para>Wenn Sie in der <emphasis>Menüleiste</emphasis> auf &gm.file; klicken, wird das
-          Menü mit den in <xref linkend="gui-window-file-menu"/> beschriebenen
-          Auswahlmöglichkeiten geöffnet.
+        <para>Wenn Sie in der <emphasis>Menüleiste</emphasis> auf &gm.file; klicken, wird das Menü mit den in
+          <xref linkend="gui-window-file-menu"/> beschriebenen Auswahlmöglichkeiten geöffnet.
         </para>
 
         <para>Ergänzend stehen diese Menüeinträge zur Verfügung.
@@ -4952,9 +4963,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <sect3 id="Report-view-menu">
         <title>Berichte - &gm.view;-Menü</title>
 
-        <para>Mit Ausnahme des Menüpunktes &gmi.vw.f-by; entspricht das
-          &gm.view;-Menü in der <emphasis>Menüleiste</emphasis> der Beschreibung
-          in <xref linkend="gui-window-view-menu"/>.
+        <para>Mit Ausnahme des Menüpunktes &gmi.vw.f-by; entspricht das &gm.view;-Menü in der
+          <emphasis>Menüleiste</emphasis> der Beschreibung in
+          <xref linkend="gui-window-view-menu"/>.
         </para>
       </sect3>
 
@@ -5022,8 +5033,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                   <para>Speichert die aktuelle Berichtskonfiguration. Wenn Sie mit einer nicht gespeicherten
                     Berichtskonfiguration arbeiten, werden Sie aufgefordert einen Namen zu vergeben.
                     Sie können den Bericht erneut öffnen, indem Sie die Funktion
-                    &mc.rep.saved-rep-conf;
-                    aufrufen.
+                    &mc.rep.saved-rep-conf; aufrufen.
                   </para>
                 </entry>
               </row>
@@ -5036,9 +5046,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
                 <entry nameend="c3" namest="c2">
                   <para>Speichert die aktuelle Berichtskonfiguration unter einem neuen Namen. Sie können den Bericht erneut
-                    öffnen, indem Sie die Funktion
-                    &mc.rep.saved-rep-conf;
-                    aufrufen.
+                    öffnen, indem Sie die Funktion &mc.rep.saved-rep-conf; aufrufen.
                   </para>
                 </entry>
               </row>
@@ -5050,8 +5058,8 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <sect3 id="Report-tools-menu">
         <title>Berichte - &gm.tool;-Menü</title>
 
-        <para>Die im Menü &gm.tool; genannten Einträge sind in
-          <xref linkend="gui-window-tools-menu" /> beschrieben.
+        <para>Die im Menü &gm.tool; genannten Einträge sind in <xref linkend="gui-window-tools-menu" />
+          beschrieben.
         </para>
       </sect3>
 
@@ -5077,9 +5085,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <para>Das Berichtsfenster verfügt über eine Reihe von Schaltflächen in der
         <emphasis>Werkzeugleiste</emphasis> um schnell auf einige allgemeine Funktionen zuzugreifen,
         die mit der jeweils aktiven Registerkarte interagieren. Die
-        <emphasis>Werkzeugleiste</emphasis> kann unter
-        &mc.vw.tbar;
-        ein- oder ausgeblendet werden.
+        <emphasis>Werkzeugleiste</emphasis> kann unter &mc.vw.tbar; ein- oder ausgeblendet werden.
       </para>
 
       <note>
@@ -5220,8 +5226,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                 <para>Speichert die aktuelle Berichtskonfiguration. Wenn Sie mit einer nicht gespeicherten
                   Berichtskonfiguration arbeiten, werden Sie aufgefordert einen Namen zu vergeben.
                   Sie können den Bericht erneut öffnen, indem Sie die Funktion
-                  &mc.rep.saved-rep-conf;
-                  aufrufen.
+                  &mc.rep.saved-rep-conf; aufrufen.
                 </para>
               </entry>
             </row>
@@ -5234,9 +5239,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <entry>
                 <para>Speichert die aktuelle Berichtskonfiguration unter einem neuen Namen. Sie können den Bericht erneut
-                  öffnen, indem Sie die Funktion
-                  &mc.rep.saved-rep-conf;
-                  aufrufen.
+                  öffnen, indem Sie die Funktion &mc.rep.saved-rep-conf; aufrufen.
                 </para>
               </entry>
             </row>
@@ -5275,7 +5278,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
     <title>Abgleichen</title>
 
     <figure pgwide="1">
-      <title>Der Assistent zum Abgleichen von Buchungen</title><screenshot>
+      <title>Der Assistent zum Abgleichen von Buchungen</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Reconcile_Screen.png" srccredit="Christian Wehling" width="&img-w;" />
@@ -5302,9 +5307,8 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         </para>
       </tip>
 
-      <para>Um das Fenster <guilabel>Abgleichen</guilabel> zu öffnen, wählen Sie auf
-        &mc.ac.rec;
-        in der <emphasis>Menüleiste</emphasis> oder klicken die Schaltfläche
+      <para>Um das Fenster <guilabel>Abgleichen</guilabel> zu öffnen, wählen Sie auf &mc.ac.rec; in der
+        <emphasis>Menüleiste</emphasis> oder klicken die Schaltfläche
         <guibutton>Abgleichen</guibutton> aus der <emphasis>Werkzeugleiste</emphasis> eines
         Kontenblatts an. Dadurch wird ein <guilabel>Abgleichen</guilabel>-Dialog geöffnet, in dem
         Sie das <guilabel>Datum des Kontoauszugs</guilabel> und den
@@ -5530,7 +5534,8 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                 </entry>
 
                 <entry>
-                  <para>Ändert den Namen oder die Eigenschaften des ausgewählten Kontos. <xref linkend="acct-create-or-edit"></xref>
+                  <para>Ändert den Namen oder die Eigenschaften des ausgewählten Kontos.
+                    <xref linkend="acct-create-or-edit"></xref>
                   </para>
                 </entry>
               </row>
@@ -5861,7 +5866,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
     <title>Terminierte Buchungen</title>
 
     <figure pgwide="1">
-      <title>Arbeiten mit terminierten Buchungen</title><screenshot>
+      <title>Arbeiten mit terminierten Buchungen</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Scheduled_Transactions.png" srccredit="Christian Wehling" width="&img-w;" />
@@ -5887,10 +5894,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         </para>
       </note>
 
-      <para>Dieses Ansicht wird geöffnet, wenn
-        &gmi.ac.scd.tr-ed;
-        in der <emphasis>Menüleiste</emphasis> ausgewählt wird. Dadurch wird eine neue
-        Registerkarte geöffnet, in dem die terminierten Buchungen geplant werden.
+      <para>Dieses Ansicht wird geöffnet, wenn &gmi.ac.scd.tr-ed; in der <emphasis>Menüleiste</emphasis>
+        ausgewählt wird. Dadurch wird eine neue Registerkarte geöffnet, in dem die terminierten
+        Buchungen geplant werden.
       </para>
 
       <sect3 id="tools-SX-win">
@@ -6184,7 +6190,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
     <title>Budget</title>
 
     <figure pgwide="1">
-      <title>Die Budgetansicht</title><screenshot>
+      <title>Die Budgetansicht</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Budget_Screen.png" srccredit="Christian Wehling" width="&img-w;" />
@@ -6231,9 +6239,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         </step>
 
         <step>
-          <para>Betätige
-              &kc.enter;
-            um die Eingabe zu beenden.
+          <para>Betätige &kc.enter; um die Eingabe zu beenden.
           </para>
         </step>
       </procedure>
@@ -6242,10 +6248,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
     <sect2 id="budget-menus">
       <title>Menüleiste</title>
 
-      <para>Der Menüeintrag
-        &mc.ac.bgt.open;
-        öffnet das Standardbudget oder bietet eine Auswahl an, wenn es mehr als ein Budget gibt. Es
-        wird eine neue Registerkarte mit dem angezeigten Budget geöffnet.
+      <para>Der Menüeintrag &mc.ac.bgt.open; öffnet das Standardbudget oder bietet eine Auswahl an, wenn es
+        mehr als ein Budget gibt. Es wird eine neue Registerkarte mit dem angezeigten Budget
+        geöffnet.
       </para>
 
       <para>Im Folgenden werden die Menüpunkte beschrieben, die für die Budgetplanung nützlich sind.
@@ -6396,8 +6401,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
           <para>Wenn es mehr als ein Budget gibt, verwenden die Berichte das standardmäßig in den Buchoptionen
             ausgewählte Budget. Siehe <xref linkend="book-options"></xref> und
             <xref linkend="budgeting-book-options"></xref> für weitere Details. Nachdem der Bericht
-            angezeigt wurde, kann das darin verwendete Budget unter dem Menüeintrag
-            &mc.ed.bgt.opt;
+            angezeigt wurde, kann das darin verwendete Budget unter dem Menüeintrag &mc.ed.bgt.opt;
             Reiter <guilabel>Allgemein</guilabel> geändert werden.
           </para>
         </note>
@@ -6669,8 +6673,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Kundenübersicht</title>
 
       <para>Um die Anzeige der <guilabel>Kundenübersicht</guilabel> zu öffnen, klicken Sie auf
-        &mc.bus.cus.o-view;
-        .
+        &mc.bus.cus.o-view; .
       </para>
 
       <table pgwide="1" id="business-customer-overview-toolbar-table">
@@ -6850,8 +6853,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Lieferantenübersicht</title>
 
       <para>Um die Anzeige der <guilabel>Lieferantenübersicht</guilabel> zu öffnen, klicken Sie auf
-        &mc.bus.ven.o-view;
-        .
+        &mc.bus.ven.o-view; .
       </para>
 
       <table pgwide="1" id="business-vendor-overview-toolbar-table">
@@ -7031,8 +7033,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Mitarbeiterübersicht</title>
 
       <para>Um die Anzeige der <guilabel>Mitarbeiterübersicht</guilabel> zu öffnen, klicken Sie auf
-        &mc.bus.emp.o-view;
-        .
+        &mc.bus.emp.o-view; .
       </para>
 
       <table pgwide="1" id="business-employee-overview-toolbar-table">
diff --git a/de/manual/ch_GettingHelp.xml b/de/manual/ch_GettingHelp.xml
index 3e6ad243..6f6b1a35 100644
--- a/de/manual/ch_GettingHelp.xml
+++ b/de/manual/ch_GettingHelp.xml
@@ -267,8 +267,8 @@
       </bridgehead>
 
       <para>Einige der Entwickler und erfahrene Benutzer verfolgen den <ulink url="&url-irc;">#gnucash-Kanal bei
-        &srv-irc;</ulink>. Sie sind meist auch mit etwas anderem beschäftigt und natürlich
-        nicht immer an ihrem Computer. Loggen Sie sich ein, stellen Sie Ihre Frage, und bleiben Sie
+        &srv-irc;</ulink>. Sie sind meist auch mit etwas anderem beschäftigt und natürlich nicht
+        immer an ihrem Computer. Loggen Sie sich ein, stellen Sie Ihre Frage, und bleiben Sie
         eingeloggt; es kann einige Stunden dauern, bis Ihre Frage bemerkt und beantwortet wird.
         <itemizedlist>
           <listitem>
diff --git a/de/manual/ch_GettingStarted.xml b/de/manual/ch_GettingStarted.xml
index a2eda170..45498d62 100644
--- a/de/manual/ch_GettingStarted.xml
+++ b/de/manual/ch_GettingStarted.xml
@@ -34,13 +34,15 @@ Translators:
     <title>Der Startbildschirm</title>
 
     <abstract>
-      <para>Damit Sie über den Fortschritt des Programmstarts informiert sind, wird
-        im Begrüßungsbild von &app; ein Statusbalken angezeigt.
+      <para>Damit Sie über den Fortschritt des Programmstarts informiert sind, wird im Begrüßungsbild von
+        &app; ein Statusbalken angezeigt.
       </para>
     </abstract>
-    
+
     <figure pgwide="1">
-      <title>Der Startbildschirm</title><screenshot>
+      <title>Der Startbildschirm</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/splash.png" 
@@ -53,15 +55,18 @@ Translators:
     <para>Wenn Sie der Ansicht des Startbildschirms überdrüssig sind, können Sie diesen in den
       &app;-Einstellungen auf dem Reiter <xref linkend="prefs-general" /> die Anzeige abschalten.
       <caution>
-        <para>Wenn Sie diese Anzeige deaktivieren, kann bei dem Programmstart der Eindruck entstehen,
-          das &app; scheinbar nicht reagiert. Es ist z.B. möglich, dass eine neue Version beim ersten Laden einer
-          Datei zusätzliche Prüfungen oder Umwandlungen vornimmt, die zeitaufwendig sein können.
+        <para>Wenn Sie diese Anzeige deaktivieren, kann bei dem Programmstart der Eindruck entstehen, das &app;
+          scheinbar nicht reagiert. Es ist z.B. möglich, dass eine neue Version beim ersten Laden
+          einer Datei zusätzliche Prüfungen oder Umwandlungen vornimmt, die zeitaufwendig sein
+          können.
         </para>
       </caution>
     </para>
 
     <itemizedlist>
-      <para>Im unteren Bereich des Startbildschirms werden u.a. diese Informationen dargestellt:</para>
+      <para>Im unteren Bereich des Startbildschirms werden u.a. diese Informationen dargestellt:
+      </para>
+
       <listitem>
         <para>Die Versionsnummer von &app;
         </para>
@@ -88,13 +93,15 @@ Translators:
     <title>Willkommen in &appname;!</title>
 
     <abstract>
-      <para>Beim <emphasis>ersten</emphasis> Start von &app; soll Sie dieser Dialog dabei unterstützen,
-        schnell mit Ihrer Arbeit in &app; beginnen zu können.
+      <para>Beim <emphasis>ersten</emphasis> Start von &app; soll Sie dieser Dialog dabei unterstützen, schnell
+        mit Ihrer Arbeit in &app; beginnen zu können.
       </para>
     </abstract>
 
     <figure pgwide="1">
-      <title>Der <quote>Willkommen in &appname;!</quote>-Dialog</title><screenshot>
+      <title>Der <quote>Willkommen in &appname;!</quote>-Dialog</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/welcome.png" 
@@ -110,7 +117,6 @@ Translators:
     <glosslist>
       <glossentry>
         <glossterm><guibutton><accel>N</accel>eue Konten erstellen</guibutton></glossterm>
-
         <glossdef>
           <para>Startet den Assistenten <xref linkend="acct-hierarchy"/>, der Ihnen dabei behilflich ist, eine erste
             sinnvolle Struktur für Konten, einen sogenannten Kontenplan, in &app; anzulegen.
@@ -120,7 +126,6 @@ Translators:
 
       <glossentry>
         <glossterm><guibutton>QIF-Dateien <accel>i</accel>mportieren</guibutton></glossterm>
-
         <glossdef>
           <para>Sind Sie bereits im Besitz von z.B. Quicken-Dateien (<filename>.qif</filename>-Dateien) aus einem
             anderen Finanzprogramm und möchten diese importieren, dann entscheiden Sie sich für
@@ -130,20 +135,19 @@ Translators:
       </glossentry>
 
       <glossentry>
-        <glossterm><guibutton>Die <accel>E</accel>inführung für neue Benutzer öffnen</guibutton></glossterm>
-
+        <glossterm><guibutton>Die <accel>E</accel>inführung für neue Benutzer
+        öffnen</guibutton></glossterm>
         <glossdef>
           <para>Benutzen Sie &app; das erste Mal und wollen sich vorerst nur über die Möglichkeiten der Anwendung
             informieren oder kennen sich noch nicht mit doppelter Buchführung aus, so kann die
-            Lektüre von <ulink url="&url-docs-de;guide">&app; Kurs und Konzepte</ulink> eine
-            gute Wahl sein.
+            Lektüre von <ulink url="&url-docs-de;guide">&app; Kurs und Konzepte</ulink> eine gute
+            Wahl sein.
           </para>
         </glossdef>
       </glossentry>
 
       <glossentry>
         <glossterm><guibutton>Ok</guibutton></glossterm>
-
         <glossdef>
           <para>Mit <guibutton>Ok</guibutton> wird die zuvor gewählte Aktion gestartet.
           </para>
@@ -152,11 +156,12 @@ Translators:
 
       <glossentry>
         <glossterm><guibutton>Abbrechen</guibutton></glossterm>
-
         <glossdef>
           <para>Die Schaltfläche dient dazu, diesen Eingabebildschirm zu verlassen. Es wird dann wie folgt gefragt:
             <figure pgwide="1">
-              <title>Soll das Begrüßungsfenster erneut angezeigt werden?</title><screenshot>
+              <title>Soll das Begrüßungsfenster erneut angezeigt werden?</title>
+
+              <screenshot>
                 <mediaobject>
                   <imageobject>
                     <imagedata fileref="figures/welcome-cancel.png" 
@@ -181,8 +186,8 @@ Translators:
                 <term><guibutton>Ja</guibutton></term>
 
                 <listitem>
-                  <para>Klicken Sie diese Schaltfläche oder drücken Sie &kc.enter; auf Ihrer Tastatur damit
-                    der <guilabel>Willkommen bei &appname;!</guilabel> Bildschirm abermals angezeigt
+                  <para>Klicken Sie diese Schaltfläche oder drücken Sie &kc.enter; auf Ihrer Tastatur damit der
+                    <guilabel>Willkommen bei &appname;!</guilabel> Bildschirm abermals angezeigt
                     wird.
                   </para>
                 </listitem>
@@ -191,13 +196,16 @@ Translators:
 
             <note>
               <para>Nach Auswahl einer der beiden oberen Antworten lässt Sie &app; mit einem minimalen
-                &app;-Hauptfenster alleine. Welche Möglichkeiten Ihnen dann für Ihre weitere Arbeit
-                zur Verfügung stehen wird in <xref linkend="gui-window-nofile" /> beschrieben.
+                &app;-Hauptfenster alleine. Welche Möglichkeiten Ihnen dann für Ihre weitere
+                Arbeit zur Verfügung stehen wird in <xref linkend="gui-window-nofile" />
+                beschrieben.
               </para>
             </note>
 
             <figure pgwide="1">
-              <title>Minimales &app; Hauptfenster</title><screenshot>
+              <title>Minimales &app; Hauptfenster</title>
+
+              <screenshot>
                 <mediaobject>
                   <imageobject>
                     <imagedata fileref="figures/window-main-empty.png" 
@@ -216,9 +224,9 @@ Translators:
         beschäftigen. In diesem Fall ist aber der <guilabel>Willkommen bei
         &appname;!</guilabel>-Dialog dann nicht mehr zugänglich. Um die anderen
         Auswahlmöglichkeiten zu testen, lesen Sie bitte in <xref linkend="acct-hierarchy" />,
-        <xref linkend="trans-import-qif" /> sowie in <ulink url="&url-docs-de;guide">&app;
-        Kurs und Konzepte</ulink> nach. Dort erfahren Sie, wie Sie diese aus dem &app;-Menü heraus
-        starten können.
+        <xref linkend="trans-import-qif" /> sowie in <ulink url="&url-docs-de;guide">&app; Kurs und
+        Konzepte</ulink> nach. Dort erfahren Sie, wie Sie diese aus dem &app;-Menü heraus starten
+        können.
       </para>
     </note>
   </sect1>
@@ -243,7 +251,9 @@ Translators:
     </abstract>
 
     <figure pgwide="1">
-      <title>Der <quote>Tipp des Tages</quote>.</title><screenshot>
+      <title>Der <quote>Tipp des Tages</quote>.</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/tip-window.png" 
@@ -260,17 +270,15 @@ Translators:
     <glosslist>
       <glossentry>
         <glossterm>Tipps beim Programmstart anzeigen</glossterm>
-
         <glossdef>
-          <para>Mit dem Kontrollkästchen können Sie festlegen, ob Sie einen <guilabel>Tipp des
-          Tages</guilabel> bei jedem Programmstart von &app; lesen wollen oder nicht.
+          <para>Mit dem Kontrollkästchen können Sie festlegen, ob Sie einen <guilabel>Tipp des Tages</guilabel>
+            bei jedem Programmstart von &app; lesen wollen oder nicht.
           </para>
         </glossdef>
       </glossentry>
 
       <glossentry>
         <glossterm>Vorheriger</glossterm>
-
         <glossdef>
           <para>Zeigt den vorherigen Tipp an.
           </para>
@@ -279,7 +287,6 @@ Translators:
 
       <glossentry>
         <glossterm>Nächster</glossterm>
-
         <glossdef>
           <para>Geht zum nächsten Tipp weiter.
           </para>
@@ -288,7 +295,6 @@ Translators:
 
       <glossentry>
         <glossterm>Schließen</glossterm>
-
         <glossdef>
           <para>Verlässt diese Darstellung mit den hilfreichen <guilabel>Tipps des Tages</guilabel>.
           </para>
@@ -296,11 +302,11 @@ Translators:
       </glossentry>
     </glosslist>
 
-    <para>Auf der Registerkarte <xref linkend="prefs-general" /> in den &app;-Einstellungen, die Sie
-      im Menü unter &mc.ed.pref; erreichen, ist möglich, den <guilabel>Tipp des Tages</guilabel> wieder
-      zu aktivieren, falls Sie die Anzeige einmal abgestellt haben. Das <guilabel>Tipp des
-      Tages</guilabel>-Fenster kann auch manuell geöffnet werden, indem Sie im Menü &mc.help.tip; auswählen.
+    <para>Auf der Registerkarte <xref linkend="prefs-general" /> in den &app;-Einstellungen, die Sie im Menü
+      unter &mc.ed.pref; erreichen, ist möglich, den <guilabel>Tipp des Tages</guilabel> wieder zu
+      aktivieren, falls Sie die Anzeige einmal abgestellt haben. Das <guilabel>Tipp des
+      Tages</guilabel>-Fenster kann auch manuell geöffnet werden, indem Sie im Menü &mc.help.tip;
+      auswählen.
     </para>
   </sect1>
 </chapter>
-
diff --git a/de/manual/ch_Intro.xml b/de/manual/ch_Intro.xml
index 01ce1ce4..eadd712b 100644
--- a/de/manual/ch_Intro.xml
+++ b/de/manual/ch_Intro.xml
@@ -17,8 +17,7 @@
 <chapter id="intro-to-gnucash">
   <title>Einführung zu &app;</title>
 
-  <subtitle>Wofür steht &app;?
-  </subtitle>
+  <subtitle>Wofür steht &app;?</subtitle>
 
   <para>&app; ist eine Finanzsoftware, die sich sowohl an den Bedürfnissen von Privatanwendern orientiert
     als auch in Kleinbetrieben für deren Buchhaltung eingesetzt werden kann. Einfache
diff --git a/de/manual/ch_Reports.xml b/de/manual/ch_Reports.xml
index c6af38be..4dd3603e 100644
--- a/de/manual/ch_Reports.xml
+++ b/de/manual/ch_Reports.xml
@@ -40,11 +40,9 @@
       section will present an explanation of the main &app; reports and how to adjust them.
     </para>
 
-    <para>To run a report or chart, click on the
-      &gm.rep;
-      menu, then either select a report (it will open with standard options), or click on
-      <guibutton> Saved Report Configuration</guibutton> to select a report you have previously
-      configured and saved.
+    <para>To run a report or chart, click on the &gm.rep; menu, then either select a report (it will open with
+      standard options), or click on <guibutton> Saved Report Configuration</guibutton> to select a
+      report you have previously configured and saved.
     </para>
 
     <para>Once the report has opened, click on the <emphasis>toolbar</emphasis> button
@@ -61,20 +59,17 @@
 
     <tip>
       <para>If you often run a report with a date as at the start or end of an accounting period, set the
-        accounting period start and end dates in
-        &mc.ed.pref; <guilabel>Buchführungsperioden</guilabel>
-        then select appropriate report date options. See <xref linkend="prefs-accounting-period" />.
+        accounting period start and end dates in &mc.ed.pref;
+        <guilabel>Buchführungsperioden</guilabel> then select appropriate report date options. See
+        <xref linkend="prefs-accounting-period" />.
       </para>
     </tip>
 
     <tip>
       <para>If you cannot find a specific report to suit your requirements, you may be able to use the
-        <guilabel>Find Transaction</guilabel> assistant (
-        &mc.ed.find;
-        ) to select a set of transactions, and then report them using
-        &mc.rep.acct-rep;
-        . Further formatting or analysis may be done by copying and pasting the report into a
-        spreadsheet.
+        <guilabel>Find Transaction</guilabel> assistant ( &mc.ed.find; ) to select a set of
+        transactions, and then report them using &mc.rep.acct-rep; . Further formatting or analysis
+        may be done by copying and pasting the report into a spreadsheet.
       </para>
     </tip>
 
@@ -116,8 +111,7 @@
         configuration with a new name.
       </para>
 
-      <para>After your customized report has been saved, it is available for use by the
-        &mc.rep.saved-rep-conf;
+      <para>After your customized report has been saved, it is available for use by the &mc.rep.saved-rep-conf;
         menu and it will also be listed when starting
         <menuchoice>
           <guimenu>Reports</guimenu><guisubmenu>Sample & Custom</guisubmenu><guimenuitem>Custom
@@ -130,11 +124,10 @@
     <sect2 id="report-working">
       <title>Working with Saved Report Configurations</title>
 
-      <para>Selecting
-        &mc.rep.saved-rep-conf;
-        will open a dialog window with the list of the <emphasis>Saved Report
-        Configurations</emphasis> you have previously created. In this context <emphasis>Saved
-        Report Configurations</emphasis> means the set of customized settings for standard reports.
+      <para>Selecting &mc.rep.saved-rep-conf; will open a dialog window with the list of the <emphasis>Saved
+        Report Configurations</emphasis> you have previously created. In this context
+        <emphasis>Saved Report Configurations</emphasis> means the set of customized settings for
+        standard reports.
       </para>
 
       <para>The <emphasis>Saved Report Configurations</emphasis> window lists each of your previously saved
@@ -231,10 +224,9 @@
 
           <tip>
             <para>If you often run a report with a date as at the start or end of an accounting period, set the
-              accounting period start and end dates in
-              &mc.ed.pref; <guilabel>Buchführungsperioden</guilabel>
-              then select appropriate report date options. See
-              <xref linkend="prefs-accounting-period" />.
+              accounting period start and end dates in &mc.ed.pref;
+              <guilabel>Buchführungsperioden</guilabel> then select appropriate report date
+              options. See <xref linkend="prefs-accounting-period" />.
             </para>
           </tip>
         </listitem>
@@ -276,9 +268,8 @@
           <para>Style Sheet: Select a Style Sheet. Style sheets control how reports are displayed. At the moment,
             there are four style sheets: <guilabel>Default</guilabel>, <guilabel>Easy</guilabel>,
             <guilabel>Footer</guilabel> and <guilabel>Technicolor</guilabel>. You can customize each
-            of these from the
-            &mc.ed.css;
-            menu item. This is described in the <xref linkend="change-style"></xref>
+            of these from the &mc.ed.css; menu item. This is described in the
+            <xref linkend="change-style"></xref>
 <!--Changing Style Sheets-->
             section.
           </para>
@@ -295,9 +286,8 @@
             for display.
           </para>
 
-          <para>The default Report Currency is defined in
-            &mc.ed.pref;
-            Reports tab. See <xref linkend="prefs-reports" />.
+          <para>The default Report Currency is defined in &mc.ed.pref; Reports tab. See
+            <xref linkend="prefs-reports" />.
           </para>
         </listitem>
 
@@ -397,12 +387,15 @@
           <title>Report Options</title>
 
           <figure>
-            <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="TxRptOpt_Screen">
+            <title><emphasis>Transaction Report, Report Options</emphasis></title>
+
+            <screenshot id="TxRptOpt_Screen">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/TxRptOpt_Screen.png"
                      srccredit="Geert Janssens"/>
                 </imageobject>
+
                 <caption>
                   <para>This is an image of the <emphasis>Transaction Report, Report Options, Display tab.</emphasis>
                   </para>
@@ -3076,8 +3069,7 @@ Income (type INCOME)
           <emphasis>deductible</emphasis> and <emphasis>non deductible</emphasis> expenses. The user
           must also set the <guilabel>TXF category</guilabel> of each tax related account. This can
           be done by the <guimenuitem>Income Tax Information</guimenuitem> dialog, reachable by
-          &mc.ed.tax-rep-opt;
-          . Its usage is explained in <xref linkend="set-tax-options"></xref>.
+          &mc.ed.tax-rep-opt; . Its usage is explained in <xref linkend="set-tax-options"></xref>.
         </para>
       </important>
 
@@ -3146,11 +3138,9 @@ Income (type INCOME)
 
     <para>&app; is able to print reports and to export the reports to <acronym>HTML</acronym> (web) pages. The
       Print &app; Document dialog is accessed from the <guibutton>Print</guibutton> button on the
-      <emphasis>toolbar</emphasis> or go to
-      &mc.fi.prin;
-      in the menu. To Export a report to a web page (<acronym>HTML</acronym>) select the
-      <guibutton>Export</guibutton> button on the <emphasis>Toolbar</emphasis> and type in a file
-      name.
+      <emphasis>toolbar</emphasis> or go to &mc.fi.prin; in the menu. To Export a report to a web
+      page (<acronym>HTML</acronym>) select the <guibutton>Export</guibutton> button on the
+      <emphasis>Toolbar</emphasis> and type in a file name.
     </para>
 
     <para>Most reports, being presented in HTML, can also be copied and pasted into a spreadsheet.
diff --git a/de/manual/ch_Tools_Assistants.xml b/de/manual/ch_Tools_Assistants.xml
index 5b078845..849deac1 100644
--- a/de/manual/ch_Tools_Assistants.xml
+++ b/de/manual/ch_Tools_Assistants.xml
@@ -18,15 +18,15 @@
   <title>Assistenten und ähnliche Werkzeuge</title>
 
   <abstract>
-    <para>&app; enthält eine Reihe von Werkzeuge, um zeitaufwendige oder komplexere Vorgänge zu vereinfachen.
-      Wenn das aktuelle Fenster das Standardmenü beinhaltet, kann, sofern es keinen passenderen Kontext gibt, über das Menü &gm.tool;
-      darauf zugegriffen werden. Weitere Assistenten sind auch im Menü &gm.act; enthalten. 
+    <para>&app; enthält eine Reihe von Werkzeuge, um zeitaufwendige oder komplexere Vorgänge zu
+      vereinfachen. Wenn das aktuelle Fenster das Standardmenü beinhaltet, kann, sofern es keinen
+      passenderen Kontext gibt, über das Menü &gm.tool; darauf zugegriffen werden. Weitere
+      Assistenten sind auch im Menü &gm.act; enthalten.
     </para>
   </abstract>
 
   <important>
-    <para>
-      Einige dieser Werkzeuge können aus den folgenden Gründen deaktiviert sein:
+    <para>Einige dieser Werkzeuge können aus den folgenden Gründen deaktiviert sein:
       <itemizedlist>
         <listitem>
           <para>Die Werkzeuge sind nicht für das aktuelle Fenster geeignet.
@@ -34,18 +34,19 @@
         </listitem>
 
         <listitem>
-          <para>&app; kann die erforderliche Software, z.B. &app-fq; für den Abruf von Online-Kursen, nicht auf Ihrem System finden.
+          <para>&app; kann die erforderliche Software, z.B. &app-fq; für den Abruf von Online-Kursen, nicht auf
+            Ihrem System finden.
           </para>
         </listitem>
 
         <listitem>
-          <para>Der Paketbetreuer hat sie während des Erstellungsprozesses deaktiviert, z,B. &app-aqb; für das Online-Banking.
+          <para>Der Paketbetreuer hat sie während des Erstellungsprozesses deaktiviert, z,B. &app-aqb; für das
+            Online-Banking.
           </para>
         </listitem>
       </itemizedlist>
-      </para>
-    </important>
-
+    </para>
+  </important>
 
   <sect1 id="tool-find">
     <title>Find</title>
@@ -73,9 +74,8 @@
       <para>Exactly which transactions are searched depends on where you invoke the tool from. If you start from
         the main accounts hierarchy page, all transactions will be searched. If you start from an
         individual account register, only transactions in that account will be searched. And if you
-        filter the transactions in a register using
-        &mc.vw.f-by;
-        , then only transactions in that account and shown by the filter will be searched.
+        filter the transactions in a register using &mc.vw.f-by; , then only transactions in that
+        account and shown by the filter will be searched.
       </para>
 
       <note>
@@ -105,11 +105,10 @@
       </para>
 
       <para>In the <guilabel>Type of Search</guilabel> pane there are five selections. The first option is
-        always enabled, the following three are available when you invoke the
-        &gmi.ed.find; option from a register window or after performing the
-        first <guibutton>Find</guibutton> if the &gmi.ed.find; command was
-        invoked from any other window. The last option is available only for
-        <link linkend="tool-find-bsnss">Business search</link>.
+        always enabled, the following three are available when you invoke the &gmi.ed.find; option
+        from a register window or after performing the first <guibutton>Find</guibutton> if the
+        &gmi.ed.find; command was invoked from any other window. The last option is available only
+        for <link linkend="tool-find-bsnss">Business search</link>.
       </para>
 
       <variablelist>
@@ -170,12 +169,10 @@
 
       <para>When search criteria are selected, you can press the <guibutton>Find</guibutton> button. You will be
         presented with the search results in a new register tab. A report of the search results may
-        created and printed using
-        &mc.rep.acct-rep;
-        . The Account Report has limited formatting options but, like all &app; reports, being in
-        html format, can be copied and pasted into a spreadsheet for further formatting.
-        Alternatively, the Account Report can be exported to an html file, and the html file may be
-        opened in a spreadsheet.
+        created and printed using &mc.rep.acct-rep; . The Account Report has limited formatting
+        options but, like all &app; reports, being in html format, can be copied and pasted into a
+        spreadsheet for further formatting. Alternatively, the Account Report can be exported to an
+        html file, and the html file may be opened in a spreadsheet.
       </para>
 
       <note>
@@ -1129,9 +1126,8 @@
 
       <para>The business find assistant is used to search for business related items (Customer, Invoice, Job,
         Vendor, Bill, Employee, Expense Voucher). To open the business search dialog select the
-        desired item to <guimenuitem>Find</guimenuitem> from the
-        &mc.bus.cus.find-cus;, &mc.bus.ven.find-ven; or &mc.bus.emp.find-emp;
-        submenus.
+        desired item to <guimenuitem>Find</guimenuitem> from the &mc.bus.cus.find-cus;,
+        &mc.bus.ven.find-ven; or &mc.bus.emp.find-emp; submenus.
       </para>
 
       <tip>
@@ -4189,37 +4185,43 @@
     <title>Der <quote>Seit letztem Aufruf</quote> Dialog</title>
 
     <abstract>
-      <para>Falls Sie mit <xref linkend="trans-sched" /> arbeiten, kann mit Hilfe des <guilabel>Seit
-        letztem Aufruf</guilabel> Dialogs geprüft werden, ob seit der letzten &app;-Sitzung mindestens
-        eine davon zur Ausführung ansteht. Er dient der Kontrolle von geplanten Buchungen vor der Eintragung in
-        die Konten.
+      <para>Falls Sie mit <xref linkend="trans-sched" /> arbeiten, kann mit Hilfe des <guilabel>Seit letztem
+        Aufruf</guilabel> Dialogs geprüft werden, ob seit der letzten &app;-Sitzung mindestens eine
+        davon zur Ausführung ansteht. Er dient der Kontrolle von geplanten Buchungen vor der
+        Eintragung in die Konten.
       </para>
     </abstract>
+
     <para>Der Dialog kann auf zwei verschiedene Arten gestartet werden:
       <variablelist>
         <varlistentry>
           <term>manuell</term>
+
           <listitem>
-            <para>Im Menü unter &mc.ac.scd.slr;. Dies kann dann hilfreich sein, wenn Sie im <xref linkend="sched-editor" />
-              etwas Neues ausprobiert haben oder zum Neustart nach einem versehentlichen Abbruch.
+            <para>Im Menü unter &mc.ac.scd.slr;. Dies kann dann hilfreich sein, wenn Sie im
+              <xref linkend="sched-editor" /> etwas Neues ausprobiert haben oder zum Neustart nach
+              einem versehentlichen Abbruch.
             </para>
           </listitem>
         </varlistentry>
 
         <varlistentry>
           <term>automatisch</term>
+
           <listitem>
-            <para>Durch Aktivierung in den <guilabel>&appname; Eigenschaften</guilabel> auf
-              dem Reiter <xref linkend="prefs-sched" /> wird der Dialog selbsttätig während
-              des &app;-Starts ausgeführt.
+            <para>Durch Aktivierung in den <guilabel>&appname; Eigenschaften</guilabel> auf dem Reiter
+              <xref linkend="prefs-sched" /> wird der Dialog selbsttätig während des &app;-Starts
+              ausgeführt.
             </para>
           </listitem>
         </varlistentry>
       </variablelist>
-    </para>      
+    </para>
 
     <figure pgwide="1">
-      <title>Der <quote>Seit letztem Aufruf</quote> Dialog</title><screenshot>
+      <title>Der <quote>Seit letztem Aufruf</quote> Dialog</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/Tools_SinceLastRun.png" srccredit="Christian Wehling" />
@@ -4234,37 +4236,38 @@
 
     <glosslist>
       <title>Beschreibung der Spalten des <quote>Seit letztem Aufruf</quote> Dialogs</title>
+
       <glossentry>
         <glossterm>Buchung</glossterm>
-
         <glossdef>
-          <para>Der Name der geplanten Buchung, der in dem <xref linkend="sched-editor" /> zur
-            Identifizierung der eingetragen wurde.
+          <para>Der Name der geplanten Buchung, der in dem <xref linkend="sched-editor" /> zur Identifizierung der
+            eingetragen wurde.
           </para>
         </glossdef>
       </glossentry>
 
       <glossentry>
         <glossterm>Status</glossterm>
-
         <glossdef>
           <variablelist>
-          <title>Aktionen für die geplante Buchung:</title>
+            <title>Aktionen für die geplante Buchung:</title>
+
             <tip>
-              <para>Klicken Sie auf das Feld <guilabel>Status</guilabel> in der Zeile einer Buchung, um ihren Status
-                zu ändern. Diese Option ist nur verfügbar, wenn das Feld für den
+              <para>Klicken Sie auf das Feld <guilabel>Status</guilabel> in der Zeile einer Buchung, um ihren Status zu
+                ändern. Diese Option ist nur verfügbar, wenn das Feld für den
                 <guilabel>Status</guilabel> nicht <emphasis>leer</emphasis> ist.
               </para>
             </tip>
 
-           <varlistentry>
+            <varlistentry>
               <term>Ignoriert</term>
 
               <listitem>
-                <para>Wenn eine Buchung angezeigt wird, die entweder erstellt werden soll oder als Erinnerung
-                  dient, kann der Benutzer den Status auf <guilabel>Ignoriert</guilabel> setzen, um
-                  dieses Ereignis zu überspringen. Die Buchung wird <emphasis>nicht</emphasis> in das
-                  Konto eingetragen und die nächste Erinnerung für diese Buchung ist das nächste geplante Vorkommnis.
+                <para>Wenn eine Buchung angezeigt wird, die entweder erstellt werden soll oder als Erinnerung dient, kann
+                  der Benutzer den Status auf <guilabel>Ignoriert</guilabel> setzen, um dieses
+                  Ereignis zu überspringen. Die Buchung wird <emphasis>nicht</emphasis> in das
+                  Konto eingetragen und die nächste Erinnerung für diese Buchung ist das nächste
+                  geplante Vorkommnis.
                 </para>
 
                 <para>Wenn Sie zum Beispiel eine geplante Buchung mit einer Erinnerung zur Überweisung von 500 Euro am
@@ -4284,15 +4287,15 @@
                   diese aber zurückhalten und noch nicht in Ihr Konto eintragen wollen, dann
                   können Sie den <guilabel>Status</guilabel> auf
                   <guilabel>Zurückgestellt</guilabel> setzen. Wenn Sie ihn zu einem späteren
-                  Zeitpunkt wieder auf <guilabel>Zu Erstellen</guilabel> ändern, wird die
-                  Buchung mit dem ursprünglichen Buchungsdatum angelegt. Möchten Sie stattdessen
-                  ein anderes Datum verwenden, müssen Sie die Buchung nach ihrer Erstellung manuell
+                  Zeitpunkt wieder auf <guilabel>Zu Erstellen</guilabel> ändern, wird die Buchung
+                  mit dem ursprünglichen Buchungsdatum angelegt. Möchten Sie stattdessen ein
+                  anderes Datum verwenden, müssen Sie die Buchung nach ihrer Erstellung manuell
                   bearbeiten.
                 </para>
 
                 <para>Wenn Sie z.B. für eine geplante Buchung den exakten Betrag erst noch überprüfen wollen, bietet es
-                  sich an, mit dem Kennzeichen <guilabel>Zurückgestellt</guilabel> die Ausführung dieser Buchung
-                  aufzuschieben und zu einem späteren Zeitpunkt auszuführen.                  
+                  sich an, mit dem Kennzeichen <guilabel>Zurückgestellt</guilabel> die Ausführung
+                  dieser Buchung aufzuschieben und zu einem späteren Zeitpunkt auszuführen.
                 </para>
               </listitem>
             </varlistentry>
@@ -4301,12 +4304,11 @@
               <term>Erinnerung</term>
 
               <listitem>
-                <para>Es verbleiben noch <emphasis>n</emphasis> Tage, bevor die Buchung fällig wird. Die Anzahl
-                  der Tage <emphasis>n</emphasis> an die im Voraus erinnert werden soll, wird
-                  entweder in den <guilabel>&appname; Einstellungen</guilabel> unter
-                  <xref linkend="prefs-sched" /> oder auf der Registerkarte
-                  <guilabel>Übersicht</guilabel> in dem <xref linkend="sched-editor" />
-                  angegeben.
+                <para>Es verbleiben noch <emphasis>n</emphasis> Tage, bevor die Buchung fällig wird. Die Anzahl der Tage
+                  <emphasis>n</emphasis> an die im Voraus erinnert werden soll, wird entweder in den
+                  <guilabel>&appname; Einstellungen</guilabel> unter <xref linkend="prefs-sched" />
+                  oder auf der Registerkarte <guilabel>Übersicht</guilabel> in dem
+                  <xref linkend="sched-editor" /> angegeben.
                 </para>
               </listitem>
             </varlistentry>
@@ -4324,8 +4326,8 @@
               <term>Leer</term>
 
               <listitem>
-                <para>Wird eine Buchung aufgelistet, für die kein Ausführungsdatum angezeigt wird, bedeutet das,
-                  dass eine Buchung im <xref linkend="sched-editor" /> geplant ist, allerdings momentan
+                <para>Wird eine Buchung aufgelistet, für die kein Ausführungsdatum angezeigt wird, bedeutet das, dass
+                  eine Buchung im <xref linkend="sched-editor" /> geplant ist, allerdings momentan
                   keine Vorgänge zur Ausführung anstehen.
                 </para>
               </listitem>
@@ -4336,11 +4338,11 @@
 
       <glossentry>
         <glossterm>Wert</glossterm>
-
         <glossdef>
           <para>Ist für die Eintragung in das Konto noch die Angabe des Buchungswerts notwendig, so wird das mit
             dem Hinweis <emphasis>(Wert benötigt)</emphasis> angezeigt. Dies kann z.B. bei einer
-            Buchung zwischen zwei Konten mit unterschiedlichen Währungen auf Grund von Kursschwankungen notwendig sein.
+            Buchung zwischen zwei Konten mit unterschiedlichen Währungen auf Grund von
+            Kursschwankungen notwendig sein.
           </para>
 
           <para>Sie können mit einem Doppelklick auf den Hinweistext ein Eingabefeld öffnen und einen Wert für
@@ -4353,9 +4355,9 @@
 
     <glosslist>
       <title>Steuerelemente des <quote>Seit letztem Aufruf</quote> Dialogs</title>
+
       <glossentry>
         <glossterm>Erzeugte Buchungen durchsehen</glossterm>
-
         <glossdef>
           <para>Wenn diese Option aktiviert ist, während eine oder mehrere Buchungen <guilabel>Zu
             erstellen</guilabel> sind, wird durch Drücken von <guibutton>OK</guibutton> ein neues
@@ -4367,7 +4369,6 @@
 
       <glossentry>
         <glossterm>Hilfe</glossterm>
-
         <glossdef>
           <para>Öffnet diese Seite im Hilfe-Fenster.
           </para>
@@ -4376,7 +4377,6 @@
 
       <glossentry>
         <glossterm>Abbrechen</glossterm>
-
         <glossdef>
           <para>Beendet den Dialog ohne Änderungen an Ihren Daten vorzunehmen.
           </para>
@@ -4385,7 +4385,6 @@
 
       <glossentry>
         <glossterm>Ok</glossterm>
-
         <glossdef>
           <para>Die Schaltfläche schließt den Dialog und führt die anstehenden Vorgänge aus.
           </para>
@@ -4399,9 +4398,7 @@
 
     <para>This assistant creates a loan repayment scheduled transaction. When used to setup a scheduled
       transaction, the assistant creates a variable formula so that the compounding interest is
-      correctly calculated. To start this assistant manually go to
-      &mc.ac.scd.loan;
-      .
+      correctly calculated. To start this assistant manually go to &mc.ac.scd.loan; .
     </para>
 
     <para>It does not support zero-interest loans, but one doesn't really need an assistant for that: Just
@@ -4740,9 +4737,7 @@
         result of the stock split.
       </para>
 
-      <para>The Stock Split assistant is accessed by going to
-        &mc.ac.stk-spt;
-        .
+      <para>The Stock Split assistant is accessed by going to &mc.ac.stk-spt; .
       </para>
 
       <para>The Stock Split assistant opens with a screen that briefly describes what this assistant does. The
@@ -5008,9 +5003,8 @@
     </para>
 
     <tip>
-      <para>If &gmi.to.aqb; does not appear in your &gm.tool; menu,
-        verify that you are in an <guilabel>Account Tree</guilabel> or <guilabel>Register</guilabel>
-        tab.
+      <para>If &gmi.to.aqb; does not appear in your &gm.tool; menu, verify that you are in an <guilabel>Account
+        Tree</guilabel> or <guilabel>Register</guilabel> tab.
       </para>
     </tip>
 
@@ -5072,30 +5066,31 @@
 
     <abstract>
       <para>Die Kurs-Datenbank listet die Kurse Ihrer Handelsgüter zu verschiedenen Zeitpunkten und ggf. auf
-        verschiedenen Märkten in Bezug zu Ihrer Buchwährung auf. Neue
-        Kurse können hinzugefügt oder gelöscht, bestehende Kurse bearbeitet und aus
-        einer Auswahl von verschiedenen Quellen im Internet abgerufen werden, wenn das
-        Handelsgut hierfür richtig konfiguriert ist.
+        verschiedenen Märkten in Bezug zu Ihrer Buchwährung auf. Neue Kurse können hinzugefügt
+        oder gelöscht, bestehende Kurse bearbeitet und aus einer Auswahl von verschiedenen Quellen
+        im Internet abgerufen werden, wenn das Handelsgut hierfür richtig konfiguriert ist.
       </para>
-      
-      <para>Auch die Kurse, die Sie mittels &mc.fi.imp.pri-csv; nach &app; importiert haben,
-        werden hier aufgeführt.
+
+      <para>Auch die Kurse, die Sie mittels &mc.fi.imp.pri-csv; nach &app; importiert haben, werden hier
+        aufgeführt.
       </para>
     </abstract>
 
     <formalpara>
       <title>Aufruf des Assistenten</title>
-        <para>Mit dem Menüpunkt &mc.to.price; wird er in einem separaten Fenster gestartet.
-        </para>
+
+      <para>Mit dem Menüpunkt &mc.to.price; wird er in einem separaten Fenster gestartet.
+      </para>
     </formalpara>
 
     <glosslist>
       <title>Begriffe</title>
+
       <glossentry>
         <glossterm>Handelsgut</glossterm>
         <glossdef>
-          <para>Steht in &app; für alles, was zählt: Währungen, Wertpapiere (d.h. Werte wie
-            Aktien oder Investmentfondsanteile und Anleihen), oder Sachwerte wie Lastwagen und Computer.
+          <para>Steht in &app; für alles, was zählt: Währungen, Wertpapiere (d.h. Werte wie Aktien oder
+            Investmentfondsanteile und Anleihen), oder Sachwerte wie Lastwagen und Computer.
           </para>
         </glossdef>
       </glossentry>
@@ -5113,19 +5108,20 @@
         <glossdef>
           <para>In einem Kauf oder Verkauf realisierter Kurs, welcher also in einer Buchung verwendet wird.
             <note>
-              <para>In der Umgangssprache und einigen &app;-Dialogen wird der Begriff weiter gefaßt, also
-                auch dort verwendet, wo es sich strenggenommen um einen  <xref linkend="tool-price-ge-quote" /> handelt.
+              <para>In der Umgangssprache und einigen &app;-Dialogen wird der Begriff weiter gefaßt, also auch dort
+                verwendet, wo es sich strenggenommen um einen <xref linkend="tool-price-ge-quote" />
+                handelt.
               </para>
             </note>
           </para>
         </glossdef>
-      </glossentry>    
+      </glossentry>
     </glosslist>
 
     <note>
-      <para>Im weiteren Verlauf dieses Abschnitts verwenden wir den Begriff <quote>Kurs</quote> sowohl
-        für den Preis als auch den Wechselkurs und <quote>Handelsgut</quote> für jede Art von
-        Ware, außer wenn das Währungsverhalten unterschiedlich ist.
+      <para>Im weiteren Verlauf dieses Abschnitts verwenden wir den Begriff <quote>Kurs</quote> sowohl für den
+        Preis als auch den Wechselkurs und <quote>Handelsgut</quote> für jede Art von Ware, außer
+        wenn das Währungsverhalten unterschiedlich ist.
       </para>
     </note>
 
@@ -5133,7 +5129,9 @@
       <title>Benutzen der Kurs-Datenbank</title>
 
       <figure pgwide="1">
-        <title>Die Kurs-Datenbank</title><screenshot>
+        <title>Die Kurs-Datenbank</title>
+
+        <screenshot>
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Tools_PriceDatabase.png" srccredit="Christian Wehling" width="&img-w;" />
@@ -5142,236 +5140,240 @@
             <imageobject role="fo">
               <imagedata fileref="figures/Tools_PriceDatabase.png" srccredit="Christian Wehling" />
             </imageobject>
-            <caption><simpara>In diesem Bild sind alle verfügbaren Spalten eingeblendet.</simpara></caption>
+
+            <caption>
+              <simpara>In diesem Bild sind alle verfügbaren Spalten eingeblendet.
+              </simpara>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <para>Damit die <guilabel>Kurs-Datenbank</guilabel> nicht unnötig groß wird, kann jedes Handelsgut
-        in &app; <emphasis>nur einen</emphasis> Kurs pro Tag haben. Daher eignet sich &app;
-        nicht sonderlich für Intra-Day-Trading. Ein bestehender Kurs wird nur dann
-        durch einen neueren Kurs überschrieben, wenn der neuere Kurs die gleiche oder eine höher
-        priorisierte Quelle hat.
-        Ungeachtet davon können an einem Tag beliebig viele Buchungen auch unterschiedliche Preise speichern.
+      <para>Damit die <guilabel>Kurs-Datenbank</guilabel> nicht unnötig groß wird, kann jedes Handelsgut in
+        &app; <emphasis>nur einen</emphasis> Kurs pro Tag haben. Daher eignet sich &app; nicht
+        sonderlich für Intra-Day-Trading. Ein bestehender Kurs wird nur dann durch einen neueren
+        Kurs überschrieben, wenn der neuere Kurs die gleiche oder eine höher priorisierte Quelle
+        hat. Ungeachtet davon können an einem Tag beliebig viele Buchungen auch unterschiedliche
+        Preise speichern.
       </para>
 
       <formalpara id="tool-price-db-gl-rows">
         <title>Zeilen der Kurs-Datenbank</title>
 
-        <para>Den größten Teil des Editors nimmt ein tabellarischer Bereich ein, in welchem Ihre
-          Handelsgüter, nach <xref linkend="tool-ge-Namespace" /> gruppiert, aufgelistet sind. Die Zeilen
-          der Tabelle enthalten die Einträge, die Sie bei der Eingabe von Buchungen angeben,
-          automatisch berechnet oder per Import erfasst wurden. Auch die Daten einer Kursabfrage
-          mit &app-fq; werden hier angezeigt. 
+        <para>Den größten Teil des Editors nimmt ein tabellarischer Bereich ein, in welchem Ihre Handelsgüter,
+          nach <xref linkend="tool-ge-Namespace" /> gruppiert, aufgelistet sind. Die Zeilen der
+          Tabelle enthalten die Einträge, die Sie bei der Eingabe von Buchungen angeben,
+          automatisch berechnet oder per Import erfasst wurden. Auch die Daten einer Kursabfrage mit
+          &app-fq; werden hier angezeigt.
         </para>
       </formalpara>
 
       <formalpara id="tool-price-db-gl-column">
         <title>Spalten der Kurs-Datenbank</title>
 
-        <para>Nachfolgend werden die einzelnen Spalten der <guilabel>Kurs-Datenbank</guilabel>
-          beschrieben.
+        <para>Nachfolgend werden die einzelnen Spalten der <guilabel>Kurs-Datenbank</guilabel> beschrieben.
           &tip-col-sel;
         </para>
       </formalpara>
 
-        <glosslist>
-          <glossentry>
-            <glossterm>Wertpapier</glossterm>
-            <glossdef>
-              <para>Das zu bepreisende Wertpapier oder die Währung. Die Anzeige ist nach dem
-                Namensraum sortiert, in dem die einzelnen Wertpapiere gelistet
-                sind. Die Liste wird durch einen Klick auf das <guilabel>Dreieck</guilabel> links
-                neben dem Namen erweitert.
-              </para>
-            </glossdef>
-          </glossentry>
+      <glosslist>
+        <glossentry>
+          <glossterm>Wertpapier</glossterm>
+          <glossdef>
+            <para>Das zu bepreisende Wertpapier oder die Währung. Die Anzeige ist nach dem Namensraum sortiert, in
+              dem die einzelnen Wertpapiere gelistet sind. Die Liste wird durch einen Klick auf das
+              <guilabel>Dreieck</guilabel> links neben dem Namen erweitert.
+            </para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm>Währung</glossterm>
-            <glossdef>
-              <para>Die Währung, in welcher der Preis erfasst wird.
-              </para>
-            </glossdef>
-          </glossentry>
+        <glossentry>
+          <glossterm>Währung</glossterm>
+          <glossdef>
+            <para>Die Währung, in welcher der Preis erfasst wird.
+            </para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm>Datum</glossterm>
-            <glossdef>
-              <para>Das Datum, zu dem der Preis erfasst wurde.
-              </para>
-            </glossdef>
-          </glossentry>
+        <glossentry>
+          <glossterm>Datum</glossterm>
+          <glossdef>
+            <para>Das Datum, zu dem der Preis erfasst wurde.
+            </para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry id="tool-ge-PriceSource">
-            <glossterm>Quellen</glossterm>
-            <glossdef>
-              <para>Die Quelle der Kursnotierung der oben aufgeführten Handelsgüter (wird durch &app; ermittelt).
-                Der erste Eintrag ist die am meisten bevorzugte Quelle:
-                <glosslist>
-                  <glossentry>
+        <glossentry id="tool-ge-PriceSource">
+          <glossterm>Quellen</glossterm>
+          <glossdef>
+            <para>Die Quelle der Kursnotierung der oben aufgeführten Handelsgüter (wird durch &app; ermittelt). Der
+              erste Eintrag ist die am meisten bevorzugte Quelle:
+              <glosslist>
+                <glossentry>
                   <glossterm>user:price-editor</glossterm>
-                    <glossdef>
-                      <para>Manuell im Kurs-Editor eingetragene Kurse.
-                        <note>
-                          <para>Manuell eingetragene Kurse werden gegenüber den mittels &app-fq; 
-                            abgerufenen Kursen bevorzugt. &app-fq; wird daher diese Kurse nicht aktualisieren.
-                          </para>
-                        </note>
-                      </para>
-                    </glossdef>
-                  </glossentry>
-
-                  <glossentry>
-                    <glossterm>Finance::Quote</glossterm>
-                    <glossdef>
-                      <para>Kurse mit Hilfe von &app-fq; online abgerufen.
-                      </para>
-                    </glossdef>
-                  </glossentry>
-
-                  <glossentry>
-                    <glossterm>user:price</glossterm>
-                    <glossdef>
-                      <para>Preise, die explizit als <guilabel>Wechselkurs</guilabel> im Dialog <guilabel>Buchen</guilabel>
-                        (<xref linkend="trans-win-price" />) oder in der Spalte
-                        <guilabel>Preis</guilabel> eines Registers für ein Konto des Typs
-                        Aktienkonto oder Investmentfonds eingetragen wurden. Mit diesem Eintrag werden auch die Kurse
-                        gekennzeichnet, die mit dem <guilabel>Kurs-Import-Assistent</guilabel> erfasst wurden.
-                        (&mc.fi.imp.pri-csv;)
-                      </para>
-                    </glossdef>
-                  </glossentry>
-
-                  <glossentry>
-                    <glossterm>user:xfer-dialog</glossterm>
-                    <glossdef>
-                      <para>Preise, die aus dem Eintrag im <guilabel>Zum Betrag</guilabel>-Feld des Dialogs
-                        <guilabel>Buchen</guilabel> (<xref linkend="trans-win-price" />) errechnet
-                        wurden.
-                      </para>
-                    </glossdef>
-                  </glossentry>
-
-                  <glossentry>
-                    <glossterm>user:split-register</glossterm>
-                    <glossdef>
-                      <para>Preise, die aus den Spalten <guilabel>Anteile</guilabel> und <guilabel>Kauf</guilabel> oder
-                        <guilabel>Verkauf</guilabel> (bei informellen Bezeichnungen) eines Registers
-                        für ein Konto des Typs Aktienkontos oder Investmentfonds berechnet wurden.
-                      </para>
-                    </glossdef>
-                  </glossentry>
-
-                  <glossentry>
-                    <glossterm>user:stock-split</glossterm>
-                    <glossdef>
-                      <para>Preise, die in dem <guilabel>Aktienteilungs-Assistent</guilabel> (<xref linkend="stock-split" />)
-                        eingegeben wurden.
-                      </para>
-                    </glossdef>
-                  </glossentry>
-                </glosslist>
-              </para>
-            </glossdef>
-          </glossentry>
+                  <glossdef>
+                    <para>Manuell im Kurs-Editor eingetragene Kurse.
+                      <note>
+                        <para>Manuell eingetragene Kurse werden gegenüber den mittels &app-fq; abgerufenen Kursen bevorzugt.
+                          &app-fq; wird daher diese Kurse nicht aktualisieren.
+                        </para>
+                      </note>
+                    </para>
+                  </glossdef>
+                </glossentry>
 
-          <glossentry>
-            <glossterm>Typ (Kursart)</glossterm>
-            <glossdef>
-              <para>Die Art, die für Kursnotierungen Ihrer Wertpapiere genutzt werden. Die einzelnen
-                Begriffe werden nachfolgend unter <xref linkend="tool-price-db-gl-typ" /> erläutert.
-              </para>
-            </glossdef>
-          </glossentry>
+                <glossentry>
+                  <glossterm>Finance::Quote</glossterm>
+                  <glossdef>
+                    <para>Kurse mit Hilfe von &app-fq; online abgerufen.
+                    </para>
+                  </glossdef>
+                </glossentry>
 
-          <glossentry>
-            <glossterm>Preis</glossterm>
-            <glossdef>
-              <para>Der tatsächliche Preis des Handelsgutes.
-              </para>
-            </glossdef>
-          </glossentry>
-        </glosslist>
+                <glossentry>
+                  <glossterm>user:price</glossterm>
+                  <glossdef>
+                    <para>Preise, die explizit als <guilabel>Wechselkurs</guilabel> im Dialog <guilabel>Buchen</guilabel>
+                      (<xref linkend="trans-win-price" />) oder in der Spalte
+                      <guilabel>Preis</guilabel> eines Registers für ein Konto des Typs Aktienkonto
+                      oder Investmentfonds eingetragen wurden. Mit diesem Eintrag werden auch die
+                      Kurse gekennzeichnet, die mit dem <guilabel>Kurs-Import-Assistent</guilabel>
+                      erfasst wurden. (&mc.fi.imp.pri-csv;)
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry>
+                  <glossterm>user:xfer-dialog</glossterm>
+                  <glossdef>
+                    <para>Preise, die aus dem Eintrag im <guilabel>Zum Betrag</guilabel>-Feld des Dialogs
+                      <guilabel>Buchen</guilabel> (<xref linkend="trans-win-price" />) errechnet
+                      wurden.
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry>
+                  <glossterm>user:split-register</glossterm>
+                  <glossdef>
+                    <para>Preise, die aus den Spalten <guilabel>Anteile</guilabel> und <guilabel>Kauf</guilabel> oder
+                      <guilabel>Verkauf</guilabel> (bei informellen Bezeichnungen) eines Registers
+                      für ein Konto des Typs Aktienkontos oder Investmentfonds berechnet wurden.
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry>
+                  <glossterm>user:stock-split</glossterm>
+                  <glossdef>
+                    <para>Preise, die in dem <guilabel>Aktienteilungs-Assistent</guilabel> (<xref linkend="stock-split" />)
+                      eingegeben wurden.
+                    </para>
+                  </glossdef>
+                </glossentry>
+              </glosslist>
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Typ (Kursart)</glossterm>
+          <glossdef>
+            <para>Die Art, die für Kursnotierungen Ihrer Wertpapiere genutzt werden. Die einzelnen Begriffe werden
+              nachfolgend unter <xref linkend="tool-price-db-gl-typ" /> erläutert.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Preis</glossterm>
+          <glossdef>
+            <para>Der tatsächliche Preis des Handelsgutes.
+            </para>
+          </glossdef>
+        </glossentry>
+      </glosslist>
 
       <formalpara id="tool-price-db-buttons">
         <title>Schaltflächen der Kurs-Datenbank</title>
 
-        <para>Die Steuerelemente in dem Dialog bieten, oft erst nach Auswahl eines Eintrags in der Tabelle,
-          die nachfolgenden Funktionen, wobei der Doppelklick auf eine Zeile den markierten Eintrag
+        <para>Die Steuerelemente in dem Dialog bieten, oft erst nach Auswahl eines Eintrags in der Tabelle, die
+          nachfolgenden Funktionen, wobei der Doppelklick auf eine Zeile den markierten Eintrag
           direkt zur Bearbeitung öffnet.
         </para>
       </formalpara>
 
-        <glosslist>
-          <glossentry>
-            <glossterm>Hinzufügen</glossterm>
-            <glossdef>
-              <para>Ermöglicht das manuelle Eintragen eines Kurses. Das Vorgehen hierbei wird in
-                <xref linkend="tool-price-manual" /> beschrieben.
-              </para>
-            </glossdef>
-          </glossentry>
+      <glosslist>
+        <glossentry>
+          <glossterm>Hinzufügen</glossterm>
+          <glossdef>
+            <para>Ermöglicht das manuelle Eintragen eines Kurses. Das Vorgehen hierbei wird in
+              <xref linkend="tool-price-manual" /> beschrieben.
+            </para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm>Entfernen</glossterm>
-            <glossdef>
-              <para>Löscht markierte Kurswerte aus der Datenbank, eine Mehrfachauswahl ist möglich.
-              </para>
-            </glossdef>
-          </glossentry>
+        <glossentry>
+          <glossterm>Entfernen</glossterm>
+          <glossdef>
+            <para>Löscht markierte Kurswerte aus der Datenbank, eine Mehrfachauswahl ist möglich.
+            </para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm>Bearbeiten</glossterm>
-            <glossdef>
-              <para>Bietet die Möglichkeit einen markierten Kurs zu bearbeiten, siehe
-                <xref linkend="tool-price-manual" />
-              </para>
-            </glossdef>
-          </glossentry>
+        <glossentry>
+          <glossterm>Bearbeiten</glossterm>
+          <glossdef>
+            <para>Bietet die Möglichkeit einen markierten Kurs zu bearbeiten, siehe
+              <xref linkend="tool-price-manual" />
+            </para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm>Alte Entfernen</glossterm>
-            <glossdef>
-              <para>Ermöglicht in einem weiteren Dialog das <xref linkend="tool-price-delete" /> an Hand einer
-                Datumsauswahl.
-              </para>
-            </glossdef>
-          </glossentry>
+        <glossentry>
+          <glossterm>Alte Entfernen</glossterm>
+          <glossdef>
+            <para>Ermöglicht in einem weiteren Dialog das <xref linkend="tool-price-delete" /> an Hand einer
+              Datumsauswahl.
+            </para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry id="tool-ge-pricedb-getQuotes">
-            <glossterm>Kurse abrufen</glossterm>
-            <glossdef>
-              <para>Ist &app-fq; installiert und eine Online-Quelle für die Kurse ausgewählt, werden mit
-                Betätigen dieser Schaltfläche für konfigurierte Währungen und
-                Wertpapiere die Kurse online abgerufen und eingetragen. Wie Sie Ihre Kurs für den Kursabruf
-                konfigurieren können Sie unter <xref linkend="tool-ge-GetOnlineQuotes" /> nachlesen.
-                Ist die Schaltfläche nicht aktiv, dann können Sie &app-fq; mit Hilfe der Beschreibung
-                auf <xref linkend="finance-quote" /> installieren.
-              </para>
-            </glossdef>
-          </glossentry>
+        <glossentry id="tool-ge-pricedb-getQuotes">
+          <glossterm>Kurse abrufen</glossterm>
+          <glossdef>
+            <para>Ist &app-fq; installiert und eine Online-Quelle für die Kurse ausgewählt, werden mit Betätigen
+              dieser Schaltfläche für konfigurierte Währungen und Wertpapiere die Kurse online
+              abgerufen und eingetragen. Wie Sie Ihre Kurs für den Kursabruf konfigurieren können
+              Sie unter <xref linkend="tool-ge-GetOnlineQuotes" /> nachlesen. Ist die Schaltfläche
+              nicht aktiv, dann können Sie &app-fq; mit Hilfe der Beschreibung auf
+              <xref linkend="finance-quote" /> installieren.
+            </para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm>Schließen</glossterm>
-            <glossdef>
-              <para>Schließt das Fenster der Kursdatenbank.
-              </para>
-            </glossdef>
-          </glossentry>
-        </glosslist>
+        <glossentry>
+          <glossterm>Schließen</glossterm>
+          <glossdef>
+            <para>Schließt das Fenster der Kursdatenbank.
+            </para>
+          </glossdef>
+        </glossentry>
+      </glosslist>
     </sect2>
 
     <sect2 id="tool-price-manual">
       <title>Hinzufügen oder Bearbeiten von Kursen</title>
 
       <para>Nachdem Sie in der Kurs-Datenbank entweder die Schaltfläche <guibutton>Hinzufügen</guibutton> oder
-        <guibutton>Bearbeiten</guibutton> betätigt haben, oder nach einem Doppelklick auf einen Kurseintrag,
-          wird Ihnen dieser Dialog angezeigt.
+        <guibutton>Bearbeiten</guibutton> betätigt haben, oder nach einem Doppelklick auf einen
+        Kurseintrag, wird Ihnen dieser Dialog angezeigt.
       </para>
 
       <figure pgwide="1">
-        <title>Der Kurs-Editor</title><screenshot>
+        <title>Der Kurs-Editor</title>
+
+        <screenshot>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Tools_PriceEditor_add.png"
@@ -5381,9 +5383,9 @@
         </screenshot>
       </figure>
 
-      <para>Der <guilabel>Kurs-Editor</guilabel> bietet Ihnen die Möglichkeit, den Kurs eines Wertpapiers
-        oder einer Währung zu erfassen oder zu modifizieren. Die Bedeutung der einzelnen Felder ist unter
-        <xref linkend="tool-price-db-gl-column" /> beschrieben.
+      <para>Der <guilabel>Kurs-Editor</guilabel> bietet Ihnen die Möglichkeit, den Kurs eines Wertpapiers oder
+        einer Währung zu erfassen oder zu modifizieren. Die Bedeutung der einzelnen Felder ist
+        unter <xref linkend="tool-price-db-gl-column" /> beschrieben.
       </para>
 
       <formalpara id="tool-price-db-gl-typ">
@@ -5393,125 +5395,130 @@
         </para>
       </formalpara>
 
-        <glosslist>
-          <glossentry>
-            <glossterm>Bid (Geldkurs)</glossterm>
-            <glossdef>
-              <para>Gibt an, was ein Fachhändler für ein Wertpapier zu zahlen bereit ist, also wenn Sie verkaufen.
-                Der Geldkurs ist in der Regel niedriger als der Briefkurs.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Ask (Briefkurs)</glossterm>
-            <glossdef>
-              <para>Gibt an, zu welchem Kurs der Händler bereit ist, ein Wertpapier zu verkaufen.
-                Sie tatigen also einen Kauf.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Last (Zuletzt)</glossterm>
-            <glossdef>
-              <para>Bezeichnet den Kurs, zu dem der letzte Handel dieses Wertpapier vollzogen wurde.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Net Asset Value (Nettoanteilswert)</glossterm>
-            <glossdef>
-              <para>Werden in der Regel für Investmentfonds verwendet und ist zugleich der Rücknahme-Preis.
-                Beim Kauf wird zusätzlich ein Ausgabeaufschlag/Agio erhoben. Sie werden auf der Grundlage
-                des Nettowerts des Fondsvermögens jeden Tag um den Zeitpunkt des Marktschlusses berechnet
-                und gelten bis zur nächsten Neuberechnung. Informieren Sie sich bei der Fondsgesellschaft
-                nach dem Zeitpunkt der Kursermittlung.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>transaction (Buchung)</glossterm>
-            <glossdef>
-              <para>Ist der Preis, der bei der Eingabe einer Buchung verwendet wurde.
-              </para>
-            </glossdef>
-          </glossentry>
+      <glosslist>
+        <glossentry>
+          <glossterm>Bid (Geldkurs)</glossterm>
+          <glossdef>
+            <para>Gibt an, was ein Fachhändler für ein Wertpapier zu zahlen bereit ist, also wenn Sie verkaufen. Der
+              Geldkurs ist in der Regel niedriger als der Briefkurs.
+            </para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm>Unknown (Unbekannt)</glossterm>
-            <glossdef>
-              <para>Zeigt an, das die Art des eingetragenen Kurses nicht bekannt ist. Dieser fehlerhafte Typ
-                könnte möglicherweise bei einem Import entstanden sein, z.B. weil die Angabe in einer anderen Sprache war.
-              </para>
-            </glossdef>
-          </glossentry>
-        </glosslist>
+        <glossentry>
+          <glossterm>Ask (Briefkurs)</glossterm>
+          <glossdef>
+            <para>Gibt an, zu welchem Kurs der Händler bereit ist, ein Wertpapier zu verkaufen. Sie tatigen also
+              einen Kauf.
+            </para>
+          </glossdef>
+        </glossentry>
 
-      <para>Der Vollständigkeit halber sind hier noch einige weitere Kursarten genannt, welche zwar
-        durch &app-fq; ermittelt, jedoch in &app; nicht weiter verwendet werden, da diese in
-        erster Linie der <ulink url="&url-wp-de;Technische_Analyse">Chart-Analyse</ulink> dienen
-        und damit den Rahmen von GnuCash sprengen.
-        <footnote>
-          <para>Den vollständigen Umfang, der von &app-fq; bereitgestellten Informationen, können Sie in
-          mit dem Kommando <userinput>man &app-fq;</userinput> unter dem Abschnitt 
-          <computeroutput>LABELS</computeroutput> der Dokumentation in einem Terminal nachlesen.
-          </para>
-        </footnote>
-      <glosslist>
         <glossentry>
-          <glossterm>Open (Eröffnungskurs)</glossterm>
+          <glossterm>Last (Zuletzt)</glossterm>
           <glossdef>
-            <para>Ist der Kurs, zu dem der erste Handel eines Börsentages erfolgt.
+            <para>Bezeichnet den Kurs, zu dem der letzte Handel dieses Wertpapier vollzogen wurde.
             </para>
           </glossdef>
         </glossentry>
 
         <glossentry>
-          <glossterm>Close (Schlusskurs)</glossterm>
+          <glossterm>Net Asset Value (Nettoanteilswert)</glossterm>
           <glossdef>
-            <para>Bezeichnet den letzten festgestellten Kurs an einem Börsentag. Dieser Preis wird meistens in den Medien genannt.
+            <para>Werden in der Regel für Investmentfonds verwendet und ist zugleich der Rücknahme-Preis. Beim Kauf
+              wird zusätzlich ein Ausgabeaufschlag/Agio erhoben. Sie werden auf der Grundlage des
+              Nettowerts des Fondsvermögens jeden Tag um den Zeitpunkt des Marktschlusses berechnet
+              und gelten bis zur nächsten Neuberechnung. Informieren Sie sich bei der
+              Fondsgesellschaft nach dem Zeitpunkt der Kursermittlung.
             </para>
           </glossdef>
         </glossentry>
 
         <glossentry>
-          <glossterm>Low (Tiefstkurs)</glossterm>
+          <glossterm>transaction (Buchung)</glossterm>
           <glossdef>
-            <para>Bezeichnet den tiefsten Kurs eines Wertpapiers in einem Zeitraum.
+            <para>Ist der Preis, der bei der Eingabe einer Buchung verwendet wurde.
             </para>
           </glossdef>
         </glossentry>
 
         <glossentry>
-          <glossterm>High (Höchstkurs)</glossterm>
+          <glossterm>Unknown (Unbekannt)</glossterm>
           <glossdef>
-            <para>Bezeichnet den höchsten Kurs eines Wertpapiers in einem Zeitraum.
+            <para>Zeigt an, das die Art des eingetragenen Kurses nicht bekannt ist. Dieser fehlerhafte Typ könnte
+              möglicherweise bei einem Import entstanden sein, z.B. weil die Angabe in einer
+              anderen Sprache war.
             </para>
           </glossdef>
         </glossentry>
       </glosslist>
+
+      <para>Der Vollständigkeit halber sind hier noch einige weitere Kursarten genannt, welche zwar durch
+        &app-fq; ermittelt, jedoch in &app; nicht weiter verwendet werden, da diese in erster Linie
+        der <ulink url="&url-wp-de;Technische_Analyse">Chart-Analyse</ulink> dienen und damit den
+        Rahmen von GnuCash sprengen.
+        <footnote>
+          <para>Den vollständigen Umfang, der von &app-fq; bereitgestellten Informationen, können Sie in mit dem
+            Kommando <userinput>man &app-fq;</userinput> unter dem Abschnitt
+            <computeroutput>LABELS</computeroutput> der Dokumentation in einem Terminal nachlesen.
+          </para>
+        </footnote>
+
+        <glosslist>
+          <glossentry>
+            <glossterm>Open (Eröffnungskurs)</glossterm>
+            <glossdef>
+              <para>Ist der Kurs, zu dem der erste Handel eines Börsentages erfolgt.
+              </para>
+            </glossdef>
+          </glossentry>
+
+          <glossentry>
+            <glossterm>Close (Schlusskurs)</glossterm>
+            <glossdef>
+              <para>Bezeichnet den letzten festgestellten Kurs an einem Börsentag. Dieser Preis wird meistens in den
+                Medien genannt.
+              </para>
+            </glossdef>
+          </glossentry>
+
+          <glossentry>
+            <glossterm>Low (Tiefstkurs)</glossterm>
+            <glossdef>
+              <para>Bezeichnet den tiefsten Kurs eines Wertpapiers in einem Zeitraum.
+              </para>
+            </glossdef>
+          </glossentry>
+
+          <glossentry>
+            <glossterm>High (Höchstkurs)</glossterm>
+            <glossdef>
+              <para>Bezeichnet den höchsten Kurs eines Wertpapiers in einem Zeitraum.
+              </para>
+            </glossdef>
+          </glossentry>
+        </glosslist>
       </para>
     </sect2>
 
     <sect2 id="tool-price-delete">
       <title>Entfernen von alten Kurswerten</title>
 
-      <para>Wenn Sie über einen langen Zeitraum die Kurs Ihrer Wertpapiere eingetragen haben, dann kann
-        es sinnvoll sein, alte Kurse zu löschen. Dadurch kann die Zeit für das Laden der &app;-Daten
+      <para>Wenn Sie über einen langen Zeitraum die Kurs Ihrer Wertpapiere eingetragen haben, dann kann es
+        sinnvoll sein, alte Kurse zu löschen. Dadurch kann die Zeit für das Laden der &app;-Daten
         reduziert werden.
       </para>
-      
+
       <para>Um nur einen Kurs zu entfernen, markieren Sie den Eintrag und klicken Sie auf die Schaltfläche
-        <guibutton>Entfernen</guibutton>. Möchten Sie alle Kurse, die älter als ein bestimmtes Datum
-        sind, entfernen, so betätigen Sie die Schaltfläche <guibutton>Alte
+        <guibutton>Entfernen</guibutton>. Möchten Sie alle Kurse, die älter als ein bestimmtes
+        Datum sind, entfernen, so betätigen Sie die Schaltfläche <guibutton>Alte
         entfernen</guibutton> und geben die Details in das Dialogfenster ein.
       </para>
 
       <figure pgwide="1">
-        <title>Löschen von Kurswerten</title><screenshot>
+        <title>Löschen von Kurswerten</title>
+
+        <screenshot>
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Tools_PriceEditor_del.png" srccredit="Christian Wehling" width="&img-w;" />
@@ -5554,14 +5561,14 @@
                 <glossentry>
                   <glossterm>Automatisch erzeugte</glossterm>
                   <glossdef>
-                    <para>&app; legt automatisch einen Kurs an, der zeitlich zu der Buchung passt, welche mehr als eine Währung
-                      betrifft. Wenn Sie dieses Kontrollkästchen aktivieren, werden diese Einträge
-                      ebenfalls gelöscht.
+                    <para>&app; legt automatisch einen Kurs an, der zeitlich zu der Buchung passt, welche mehr als eine
+                      Währung betrifft. Wenn Sie dieses Kontrollkästchen aktivieren, werden diese
+                      Einträge ebenfalls gelöscht.
                       <warning>
-                        <para>Bitte seien Sie mit der Verwendung dieser Möglichkeit vorsichtig. Wird z.B. der Kurs
-                          eines möglichen Berichtstags gelöscht, so wird stattdessen ein anderer Kurs genommen,
-                          wodurch das Ergebnis ungenau wird. Beachten Sie hierbei Ihre Einstellung der
-                          <xref linkend="prefs-accounting-period" />.
+                        <para>Bitte seien Sie mit der Verwendung dieser Möglichkeit vorsichtig. Wird z.B. der Kurs eines
+                          möglichen Berichtstags gelöscht, so wird stattdessen ein anderer Kurs
+                          genommen, wodurch das Ergebnis ungenau wird. Beachten Sie hierbei Ihre
+                          Einstellung der <xref linkend="prefs-accounting-period" />.
                         </para>
                       </warning>
                     </para>
@@ -5660,7 +5667,8 @@
 
     <abstract>
       <para>Der Wertpapier-Editor wird zum Anlegen und Bearbeiten von allen Handelsgütern genutzt, die keine
-        Währungen gemäß <ulink url="&url-wp-de;ISO_4217">ISO 4217</ulink> sind. Darunter fallen z.B.:
+        Währungen gemäß <ulink url="&url-wp-de;ISO_4217">ISO 4217</ulink> sind. Darunter fallen
+        z.B.:
         <itemizedlist>
           <listitem>
             <para>Aktien und andere Wertpapiere,
@@ -5668,31 +5676,33 @@
           </listitem>
 
           <listitem>
-            <para>Inventar und ähnliches, 
+            <para>Inventar und ähnliches,
             </para>
           </listitem>
 
           <listitem>
-            <para>Stundensätze für Dienstleistungen oder auch den Preis für einen Liter Diesel. 
+            <para>Stundensätze für Dienstleistungen oder auch den Preis für einen Liter Diesel.
             </para>
           </listitem>
         </itemizedlist>
         Er zeigt auch die Definitionen der ISO-Währungen, die in &app; verfügbar sind.
       </para>
-    </abstract>  
-      
-    <para>  
-      Aufgerufen wird der <guilabel>Wertpapier-Editor</guilabel> mit dem
-      gleichnamigen Menüpunkt &mc.to.sec;.
+    </abstract>
+
+    <para>Aufgerufen wird der <guilabel>Wertpapier-Editor</guilabel> mit dem gleichnamigen Menüpunkt
+      &mc.to.sec;.
     </para>
 
     <figure pgwide="1">
-      <title>Der Wertpapier-Editor</title><screenshot>
+      <title>Der Wertpapier-Editor</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Tools_SecurityEditor.png" 
                          srccredit="Christian Wehling" width="&img-w;"/>
           </imageobject>
+
           <imageobject role="fo">
             <imagedata fileref="figures/Tools_SecurityEditor.png" 
                          srccredit="Christian Wehling"/>
@@ -5707,8 +5717,8 @@
       klicken und die gewünschte Information aus der Liste auswählen.
     </para>
 
-    <para>Die Bedeutung der einzelnen Spalten wird im <xref linkend="tool-commodity" /> beschrieben,
-      wobei zwei Spalten von &app; an Hand Ihrer Eingaben automatisch ausgefüllt werden.
+    <para>Die Bedeutung der einzelnen Spalten wird im <xref linkend="tool-commodity" /> beschrieben, wobei
+      zwei Spalten von &app; an Hand Ihrer Eingaben automatisch ausgefüllt werden.
     </para>
 
     <glosslist>
@@ -5724,8 +5734,8 @@
       <glossentry id="tool-ge-UniqueName">
         <glossterm>Eindeutiger Name</glossterm>
         <glossdef>
-          <para>Der <guilabel>Eindeutige Name</guilabel> setzt sich aus dem <guilabel>Namensraum</guilabel>
-            und dem <guilabel>Symbol</guilabel> zusammen.
+          <para>Der <guilabel>Eindeutige Name</guilabel> setzt sich aus dem <guilabel>Namensraum</guilabel> und dem
+            <guilabel>Symbol</guilabel> zusammen.
           </para>
         </glossdef>
       </glossentry>
@@ -5738,13 +5748,11 @@
     <glosslist>
       <glossentry>
         <glossterm>Nationale Währungen anzeigen</glossterm>
-
         <glossdef>
           <para>Mit Aktivieren dieses Kontrollkästchens werden die ISO-Währungen zu Ihrer Information
             eingeblendet.
             <note>
-              <para>
-                Da diese fest in &app; eingetragen sind, können diese Einträge weder
+              <para>Da diese fest in &app; eingetragen sind, können diese Einträge weder
                 <itemizedlist>
                   <listitem>
                     <para>hinzugefügt noch
@@ -5758,25 +5766,23 @@
                 </itemizedlist>
                 werden.
               </para>
-            </note>            
+            </note>
           </para>
         </glossdef>
       </glossentry>
 
       <glossentry>
         <glossterm>Hinzufügen</glossterm>
-
         <glossdef>
           <para>Öffnet den Dialog <guilabel>Neues Wertpapier</guilabel> in dem Sie ein neues Wertpapier (Aktie,
-            Investmentfonds, Anleihe, Option usw.) anlegen können. Dies erfolgt mit dem selben Dialog
-            in dem Sie auch ein <xref linkend="tools-commodity-add" /> können.
+            Investmentfonds, Anleihe, Option usw.) anlegen können. Dies erfolgt mit dem selben
+            Dialog in dem Sie auch ein <xref linkend="tools-commodity-add" /> können.
           </para>
         </glossdef>
       </glossentry>
 
       <glossentry>
         <glossterm>Entfernen</glossterm>
-
         <glossdef>
           <para>Hiermit löschen Sie das markierte Wertpapier aus der &app;-Datendatei.
             <note>
@@ -5791,7 +5797,6 @@
 
       <glossentry>
         <glossterm>Bearbeiten</glossterm>
-
         <glossdef>
           <para>Möchten Sie ein Wertpapier oder eine Währung bearbeiten, markieren Sie es in der Liste, und die
             Daten werden in dem Dialog <xref linkend="tools-commodity-add" /> bzw.
@@ -5802,7 +5807,6 @@
 
       <glossentry>
         <glossterm>Schließen</glossterm>
-
         <glossdef>
           <para>Beendet den Wertpapier-Editor.
           </para>
@@ -5815,97 +5819,106 @@
 
       <abstract>
         <para>Der Wertpapier-Editor stellt ein weiteres Dialogfenster zu Verfügung in dem Sie Wertpapiere neu
-          anlegen und Vorhandene auch bearbeiten können. Mit dem selben Dialog können Sie ebenfalls die ISO-Währungen
-          bearbeiten. Nachfolgend werden Ihnen die Möglichkeiten beschrieben, die der Editor Ihnen
-          bietet.
+          anlegen und Vorhandene auch bearbeiten können. Mit dem selben Dialog können Sie
+          ebenfalls die ISO-Währungen bearbeiten. Nachfolgend werden Ihnen die Möglichkeiten
+          beschrieben, die der Editor Ihnen bietet.
         </para>
       </abstract>
-      
+
       <sect3 id="tools-commodity-add">
         <title>Wertpapier bearbeiten</title>
 
         <abstract>
-          <para>Dieser Dialog untertützt Sie dabei ein neues Handelsgut anzulegen
-            oder ein bestehendes Handelsgut zu bearbeiten.
+          <para>Dieser Dialog untertützt Sie dabei ein neues Handelsgut anzulegen oder ein bestehendes Handelsgut
+            zu bearbeiten.
           </para>
         </abstract>
 
         <figure>
-          <title>Wertpapier anlegen oder bearbeiten</title><screenshot>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/Tools_SecurityEditor_add.png" 
+          <title>Wertpapier anlegen oder bearbeiten</title>
+
+          <screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/Tools_SecurityEditor_add.png" 
                          srccredit="Christian Wehling"/>
               </imageobject>
             </mediaobject>
           </screenshot>
         </figure>
 
-      <variablelist>
-        <varlistentry>
-          <term>Wertpapierinformationen</term>
+        <variablelist>
+          <varlistentry>
+            <term>Wertpapierinformationen</term>
 
-          <listitem>
-            <glosslist>
-              <glossentry id="tool-ge-FullName">
-                <glossterm>Voller Name</glossterm>
-                <glossdef>
-                  <para>Der vollständige Name sollte eine für Sie verständliche Beschreibung, wie z.B.
-                    <emphasis>US-Dollar</emphasis> oder <emphasis>Amazon Stammaktie</emphasis>
-                    bei Wertpaieren oder bei Anleihen z.B. <emphasis>Emitent, x %, Endfälligkeitsdatum</emphasis> sein.
-                    <tip>
-                      <para>Bei Anleihen empfiehlt es sich, die regelmäßigen Zinszahlungen und die Endfälligkeit gleich als
-                        <xref linkend="trans-sched" /> anzulegen. Das hilft den Überblick bei seiner Liquidität zu behalten.
-                      </para>
-                      <para>Zu den Ausschüttungen von Aktien und Fonds kann man das auch, allerdings muss man für die Höhe
-                        eine Variable verwenden, da die Dividende oder Gewinnausschüttung jetzt noch nicht bekannt ist.
-                      </para>
-                    </tip>
-                  </para>
-                </glossdef>
-              </glossentry>
-
-              <glossentry id="tool-ge-Symbol">
-                <glossterm>Symbol/Abkürzung</glossterm>
-                <glossdef>
-                  <para>Geben Sie das Symbol oder die Abkürzung für das Wertpapier an. Dies ist in der Regel das
-                    Tickersymbol (bei Aktien) oder die WKN bei vielen deutschen Fonds-Gesellschaften. Für nationale Währungen
-                    entspricht das Symbol der ISO 4217.
-                    <tip>
-                      <para>Wenn Sie Ihre Kursdaten mit &app-fq; abrufen möchten, ist zu Beachten, dass das
-                        Symbol mit dem in der zugeordneten Kursquelle übereinstimmt.
-                        Beachten Sie auch die Hinweise zu dem <xref linkend="tool-ge-TypeQuoteSource" />.
-                      </para>
-                    </tip>
-                  </para>
-                </glossdef>
-              </glossentry>
-
-              <glossentry id="tool-ge-DisplaySymbol">
-                <glossterm>Anzeigesymbol</glossterm>
-                <glossdef>
-                  <para>Wenn Sie hier keinen Eintrag vornehmen, wird das zuvor eingetragene Symbol bzw. die Abkürzung
-                    auch als Anzeigesymbol genutzt. Bei einer Währung ist hier das Währungssymbol eingestellt.
-                    <tip>
-                      <para>Will man z.B. als Kanadier nur das <quote>$</quote>-Zeichen angezeigt bekommen, fügt man
-                        zuvor beim USD <quote>US</quote> vor dem $ ein und kann anschließend den Präfix beim CAD entfernen.
-                      </para>
-                    </tip>
-                  </para>
-                </glossdef>
-              </glossentry>
-
-              <glossentry id="tool-ge-Namespace">
-                <glossterm>Namensraum</glossterm>
-                <glossdef>
-                  <para>Kennzeichnet Kategorien zur Strukturierung Ihrer Handelsgüter. Die Angabe hat für &app;
-                    keine Bedeutung, sie dient nur dazu, Ihnen das Auffinden des Handelsgutes in den
-                    Auswahllisten zu erleichtern.
-                    <note>
-                      <para>Ähnlich einer Kontonummer bietet der Namensraum eine Möglichkeit,
-                        seine Investments sachlich zu sortieren. Grundsätzlich bietet es sich an, sie nach
-                        Risiko zu gruppieren. Zum Beispiel kann als erste Ebene der Typ des Wertpapiers
-                        angegeben werden und als optionale 2. Ebene die Nominalwährung.
+            <listitem>
+              <glosslist>
+                <glossentry id="tool-ge-FullName">
+                  <glossterm>Voller Name</glossterm>
+                  <glossdef>
+                    <para>Der vollständige Name sollte eine für Sie verständliche Beschreibung, wie z.B.
+                      <emphasis>US-Dollar</emphasis> oder <emphasis>Amazon Stammaktie</emphasis> bei
+                      Wertpaieren oder bei Anleihen z.B. <emphasis>Emitent, x %,
+                      Endfälligkeitsdatum</emphasis> sein.
+                      <tip>
+                        <para>Bei Anleihen empfiehlt es sich, die regelmäßigen Zinszahlungen und die Endfälligkeit gleich als
+                          <xref linkend="trans-sched" /> anzulegen. Das hilft den Überblick bei
+                          seiner Liquidität zu behalten.
+                        </para>
+
+                        <para>Zu den Ausschüttungen von Aktien und Fonds kann man das auch, allerdings muss man für die Höhe
+                          eine Variable verwenden, da die Dividende oder Gewinnausschüttung jetzt
+                          noch nicht bekannt ist.
+                        </para>
+                      </tip>
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry id="tool-ge-Symbol">
+                  <glossterm>Symbol/Abkürzung</glossterm>
+                  <glossdef>
+                    <para>Geben Sie das Symbol oder die Abkürzung für das Wertpapier an. Dies ist in der Regel das
+                      Tickersymbol (bei Aktien) oder die WKN bei vielen deutschen
+                      Fonds-Gesellschaften. Für nationale Währungen entspricht das Symbol der ISO
+                      4217.
+                      <tip>
+                        <para>Wenn Sie Ihre Kursdaten mit &app-fq; abrufen möchten, ist zu Beachten, dass das Symbol mit dem in
+                          der zugeordneten Kursquelle übereinstimmt. Beachten Sie auch die Hinweise
+                          zu dem <xref linkend="tool-ge-TypeQuoteSource" />.
+                        </para>
+                      </tip>
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry id="tool-ge-DisplaySymbol">
+                  <glossterm>Anzeigesymbol</glossterm>
+                  <glossdef>
+                    <para>Wenn Sie hier keinen Eintrag vornehmen, wird das zuvor eingetragene Symbol bzw. die Abkürzung auch
+                      als Anzeigesymbol genutzt. Bei einer Währung ist hier das Währungssymbol
+                      eingestellt.
+                      <tip>
+                        <para>Will man z.B. als Kanadier nur das <quote>$</quote>-Zeichen angezeigt bekommen, fügt man zuvor beim
+                          USD <quote>US</quote> vor dem $ ein und kann anschließend den Präfix
+                          beim CAD entfernen.
+                        </para>
+                      </tip>
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry id="tool-ge-Namespace">
+                  <glossterm>Namensraum</glossterm>
+                  <glossdef>
+                    <para>Kennzeichnet Kategorien zur Strukturierung Ihrer Handelsgüter. Die Angabe hat für &app; keine
+                      Bedeutung, sie dient nur dazu, Ihnen das Auffinden des Handelsgutes in den
+                      Auswahllisten zu erleichtern.
+                      <note>
+                        <para>Ähnlich einer Kontonummer bietet der Namensraum eine Möglichkeit, seine Investments sachlich zu
+                          sortieren. Grundsätzlich bietet es sich an, sie nach Risiko zu
+                          gruppieren. Zum Beispiel kann als erste Ebene der Typ des Wertpapiers
+                          angegeben werden und als optionale 2. Ebene die Nominalwährung.
 <screen>:
 |
 +--Anleihe
@@ -5917,254 +5930,269 @@
 |   |--GBP
 |
 :</screen>
-                      </para>
-                    </note>
-                  </para>
-
-                  <para>Obwohl &app; Ihnen hier keine Vorgaben mehr macht<footnote>
-                      <para>Bis GnuCash 4.9 gab es eine Vorschlagsliste die sehr nordamerikanisch geprägt war und
-                        für Benutzer in anderen Teilen der Welt eher störend war.
-                      </para>
-                    </footnote>, können in dem Auswahlfeld noch Einträge aus vorherigen Eingaben enthalten sein.
-                    Sie können die Liste selber mit weiteren Typen ergänzen, denkbar wäre z.B. diese Gruppierung:
-                  </para>
-
-                  <itemizedlist>
-                    <listitem>
-                      <para>Handelsplatz für Wertpapiere wie z.B. DAX, EUREX usw.
-                      </para>
-                    </listitem>
-                    
-                    <listitem>
-                      <para>Crypto-Währung
-                      </para>
-                    </listitem>
-                    
-                    <listitem>
-                      <para>Inventar
-                      </para>
-                    </listitem>
-
-                    <listitem>
-                      <para>Dienstleistungen, z.B. mit unterschiedlichen Stundensätzen
-                      </para>
-                    </listitem>
-
-                    <listitem>
-                      <para>Benzinpreise für einen <quote>Spritrechner</quote> 
-                      </para>
-                    </listitem>
-                  </itemizedlist>
-
-                  <para>
-                    <caution>
-                      <para>Da das Wort <computeroutput>template</computeroutput> in dieser Liste ein reserviertes Wort ist,
-                        darf es von Ihnen <emphasis>nicht</emphasis> verwendet werden!
-                      </para>
-                    </caution>
-                  </para>
-                </glossdef>
-              </glossentry>
-
-              <glossentry id="tool-ge-ISIN">
-                <glossterm>ISIN, WKN oder anderer Code</glossterm>
-                <glossdef>
-                  <para>Dies ist ein numerischer oder alphanumerischer Code, der verwendet wird, um das Wertpapier zu
-                    identifizieren. Die
-                    <ulink url="&url-wp-de;Internationale_Wertpapierkennnummer"><acronym>ISIN</acronym></ulink>
-                    ist eine internationale eindeutige numerische Zeichenfolge, die mit jeder Aktie,
-                    Anleihe oder jedem Investmentfonds und den meisten Arten von gehandelten
-                    Optionen, Futures und Rohstoffen verbunden ist. In Deutschland ist auch noch die
-                    <ulink url="&url-wp-de;Wertpapierkennnummer"><acronym>WKN</acronym></ulink> und in der Schweiz die
-                    <ulink url="&url-wp-de;Valorennummer">Valorennummer</ulink> gebräuchlich.
-                  </para>
-
-                  <para>Die Angabe des Code ist nicht erforderlich, kann aber beispielsweise nützlich sein um sich
-                    hierin gleich auch die ISIN zu merken, z.B. falls Sie später die Quelle für den Kursabruf wechseln.
-                  </para>
-                </glossdef>
-              </glossentry>
-
-              <glossentry id="tool-ge-Fraction">
-                <glossterm>Handelbare Stückelung</glossterm>
-                <glossdef>
-                  <para>Dies ist die kleinste gehandelte Einheit des Wertpapiers, ausgedrückt als Bruchteil einer einzelnen
-                    Nominaleinheit. Diese Einheit wird von &app;-Konten als Standardstückelung für
-                    den Handel mit dem Wertpapier, beispielsweise bei offenen Fonds, aus denen Depot- oder Verwaltungs-Gebühren
-                    durch Verkäufe in Hundertstel oder Tausendstel beglichen werden, verwendet.
-                  </para>
-                </glossdef>
-              </glossentry>
-            </glosslist>
-          </listitem>
-        </varlistentry>
+                        </para>
+                      </note>
+                    </para>
 
-        <varlistentry>
-          <term>Börsenkursquelle</term>
+                    <para>Obwohl &app; Ihnen hier keine Vorgaben mehr macht
+                      <footnote>
+                        <para>Bis GnuCash 4.9 gab es eine Vorschlagsliste die sehr nordamerikanisch geprägt war und für Benutzer
+                          in anderen Teilen der Welt eher störend war.
+                        </para>
+                      </footnote>
+                      , können in dem Auswahlfeld noch Einträge aus vorherigen Eingaben enthalten
+                      sein. Sie können die Liste selber mit weiteren Typen ergänzen, denkbar wäre
+                      z.B. diese Gruppierung:
+                    </para>
 
-          <listitem>
-            <glosslist>
-              <glossentry id="tool-ge-GetOnlineQuotes">
-                <glossterm>Börsenkurse online abrufen</glossterm>
-                <glossdef>
-                  <para>Das Aktivieren dieses Kontrollkästchens ermöglicht, den Abruf der Kurse von Währung oder
-                    Wertpapier von einer Online-Datenquelle.
-                    <note>
-                      <para>Wenn die Schaltfläche nicht angeklickt werden kann, dann ist das Paket &app-fq; nicht
-                        oder nicht richtig installiert. Lesen Sie in diesem Fall die Installationanleitung unter
-                        <xref linkend="finance-quote" />.
-                      </para>
-                    </note>
-                  </para>
-                </glossdef>
-              </glossentry>
-
-              <glossentry id="tool-ge-TypeQuoteSource">
-                <glossterm>Art der Kursabruf-Quelle</glossterm>
-                <glossdef>
-                  <para>Verwenden Sie die Optionsfelder, um die Quelle für die Online-Kurse auszuwählen.
-                    <variablelist>
-                      <varlistentry>
-                        <term><guilabel>Einzel</guilabel></term>
-
-                        <listitem>
-                          <para>Diese Auswahl ruft die Daten nur aus der angegebenen Quelle ab.
-                          </para>
-                        </listitem>
-                      </varlistentry>
-
-                      <varlistentry>
-                        <term><guilabel>Mehrere Kursquellen</guilabel></term>
-
-                        <listitem>
-                          <para>Kursquellen wie <quote>Europa</quote> sollten verwendet werden, wenn eine Ausfallsicherung
-                            gegenüber mehreren Datenquellen erwünscht ist.
-                          </para>
-
-                          <caution>
-                            <para>Die Option <guilabel>Mehrere Kursquellen</guilabel> ist nur sinnvoll, wenn alle ausgewählten
-                              Quellen das gleiche Symbol für Ihre Wertpapier verwenden.
+                    <itemizedlist>
+                      <listitem>
+                        <para>Handelsplatz für Wertpapiere wie z.B. DAX, EUREX usw.
+                        </para>
+                      </listitem>
+
+                      <listitem>
+                        <para>Crypto-Währung
+                        </para>
+                      </listitem>
+
+                      <listitem>
+                        <para>Inventar
+                        </para>
+                      </listitem>
+
+                      <listitem>
+                        <para>Dienstleistungen, z.B. mit unterschiedlichen Stundensätzen
+                        </para>
+                      </listitem>
+
+                      <listitem>
+                        <para>Benzinpreise für einen <quote>Spritrechner</quote>
+                        </para>
+                      </listitem>
+                    </itemizedlist>
+
+                    <para><caution>
+                        <para>Da das Wort <computeroutput>template</computeroutput> in dieser Liste ein reserviertes Wort ist,
+                          darf es von Ihnen <emphasis>nicht</emphasis> verwendet werden!
+                        </para>
+                      </caution>
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry id="tool-ge-ISIN">
+                  <glossterm>ISIN, WKN oder anderer Code</glossterm>
+                  <glossdef>
+                    <para>Dies ist ein numerischer oder alphanumerischer Code, der verwendet wird, um das Wertpapier zu
+                      identifizieren. Die
+                      <ulink url="&url-wp-de;Internationale_Wertpapierkennnummer"><acronym>ISIN</acronym></ulink>
+                      ist eine internationale eindeutige numerische Zeichenfolge, die mit jeder
+                      Aktie, Anleihe oder jedem Investmentfonds und den meisten Arten von
+                      gehandelten Optionen, Futures und Rohstoffen verbunden ist. In Deutschland ist
+                      auch noch die
+                      <ulink url="&url-wp-de;Wertpapierkennnummer"><acronym>WKN</acronym></ulink>
+                      und in der Schweiz die
+                      <ulink url="&url-wp-de;Valorennummer">Valorennummer</ulink> gebräuchlich.
+                    </para>
+
+                    <para>Die Angabe des Code ist nicht erforderlich, kann aber beispielsweise nützlich sein um sich hierin
+                      gleich auch die ISIN zu merken, z.B. falls Sie später die Quelle für den
+                      Kursabruf wechseln.
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry id="tool-ge-Fraction">
+                  <glossterm>Handelbare Stückelung</glossterm>
+                  <glossdef>
+                    <para>Dies ist die kleinste gehandelte Einheit des Wertpapiers, ausgedrückt als Bruchteil einer einzelnen
+                      Nominaleinheit. Diese Einheit wird von &app;-Konten als Standardstückelung
+                      für den Handel mit dem Wertpapier, beispielsweise bei offenen Fonds, aus
+                      denen Depot- oder Verwaltungs-Gebühren durch Verkäufe in Hundertstel oder
+                      Tausendstel beglichen werden, verwendet.
+                    </para>
+                  </glossdef>
+                </glossentry>
+              </glosslist>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>Börsenkursquelle</term>
+
+            <listitem>
+              <glosslist>
+                <glossentry id="tool-ge-GetOnlineQuotes">
+                  <glossterm>Börsenkurse online abrufen</glossterm>
+                  <glossdef>
+                    <para>Das Aktivieren dieses Kontrollkästchens ermöglicht, den Abruf der Kurse von Währung oder
+                      Wertpapier von einer Online-Datenquelle.
+                      <note>
+                        <para>Wenn die Schaltfläche nicht angeklickt werden kann, dann ist das Paket &app-fq; nicht oder nicht
+                          richtig installiert. Lesen Sie in diesem Fall die Installationanleitung
+                          unter <xref linkend="finance-quote" />.
+                        </para>
+                      </note>
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry id="tool-ge-TypeQuoteSource">
+                  <glossterm>Art der Kursabruf-Quelle</glossterm>
+                  <glossdef>
+                    <para>Verwenden Sie die Optionsfelder, um die Quelle für die Online-Kurse auszuwählen.
+                      <variablelist>
+                        <varlistentry>
+                          <term><guilabel>Einzel</guilabel></term>
+
+                          <listitem>
+                            <para>Diese Auswahl ruft die Daten nur aus der angegebenen Quelle ab.
                             </para>
-                          </caution>
-                        </listitem>
-                      </varlistentry>
+                          </listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                          <term><guilabel>Mehrere Kursquellen</guilabel></term>
 
-                      <varlistentry>
-                        <term><guilabel>unbekannt</guilabel></term>
+                          <listitem>
+                            <para>Kursquellen wie <quote>Europa</quote> sollten verwendet werden, wenn eine Ausfallsicherung
+                              gegenüber mehreren Datenquellen erwünscht ist.
+                            </para>
+
+                            <caution>
+                              <para>Die Option <guilabel>Mehrere Kursquellen</guilabel> ist nur sinnvoll, wenn alle ausgewählten
+                                Quellen das gleiche Symbol für Ihre Wertpapier verwenden.
+                              </para>
+                            </caution>
+                          </listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                          <term><guilabel>unbekannt</guilabel></term>
 <!-- Maintainers: To add, modify, remove sources
 edit https://github.com/Gnucash/gnucash/blob/maint/libgnucash/engine/gnc-commodity.c
 and update the appendix. -->
-                        <listitem>
-                          <para>&app; hat hier kein Hintergrundwissen über die Quelle. Das kann zwei verschiedene Gründe haben.
-                            Sie versuchen eine Quelle zu verwenden, die
-                            <itemizedlist>
-                              <listitem>
-                                <para>es <emphasis>nicht (mehr)</emphasis> in &app-fq; gibt oder
-                                </para>
-                              </listitem>
-
-                              <listitem>
-                                <para>neu in &app-fq; ist, aber <emphasis>noch nicht</emphasis> in &app; eingepflegt wurde.
-                                </para>
-                              </listitem>
-                            </itemizedlist>
-                          </para>
-                        </listitem>
-                      </varlistentry>
-                    </variablelist>
-                  </para>
-
-                  <para>Nachdem Sie die Art der Quelle für Kursangebote ausgewählt haben, wählen Sie eine Datenquelle aus
-                    dem Pulldown-Menü. Die zur Verfügung stehenden Datenquellen sind abhängig von
-                    der installierten Version von &app-fq; und werden Ihnen bei Verwendung des
-                    Befehls <command>gnc-fq-check</command> angezeigt. Details zu den derzeit
-                    unterstützten Datenquellen finden Sie unter <xref linkend="fq-sources"></xref>.
-                    <note>
+                          <listitem>
+                            <para>&app; hat hier kein Hintergrundwissen über die Quelle. Das kann zwei verschiedene Gründe haben.
+                              Sie versuchen eine Quelle zu verwenden, die
+                              <itemizedlist>
+                                <listitem>
+                                  <para>es <emphasis>nicht (mehr)</emphasis> in &app-fq; gibt oder
+                                  </para>
+                                </listitem>
+
+                                <listitem>
+                                  <para>neu in &app-fq; ist, aber <emphasis>noch nicht</emphasis> in &app; eingepflegt wurde.
+                                  </para>
+                                </listitem>
+                              </itemizedlist>
+                            </para>
+                          </listitem>
+                        </varlistentry>
+                      </variablelist>
+                    </para>
+
+                    <para>Nachdem Sie die Art der Quelle für Kursangebote ausgewählt haben, wählen Sie eine Datenquelle aus
+                      dem Pulldown-Menü. Die zur Verfügung stehenden Datenquellen sind abhängig
+                      von der installierten Version von &app-fq; und werden Ihnen bei Verwendung des
+                      Befehls <command>gnc-fq-check</command> angezeigt. Details zu den derzeit
+                      unterstützten Datenquellen finden Sie unter
+                      <xref linkend="fq-sources"></xref>.
+                      <note>
 <!-- Is this note still valid? -->
-                      <para>Die Kursdatenquelle <quote>Yahoo as JSON</quote> liefert dabei auch die Kurse für die übrigen genannten
-                        Unternehmen (z.B. Fidelity Investments und T.Rowe Price).
-                      </para>
-                    </note>
-                  </para>
+                        <para>Die Kursdatenquelle <quote>Yahoo as JSON</quote> liefert dabei auch die Kurse für die übrigen
+                          genannten Unternehmen (z.B. Fidelity Investments und T.Rowe Price).
+                        </para>
+                      </note>
+                    </para>
 <!-- Translators: You can add a sentence about your secondary regional exchanges from table
 "gnc-tbl-fq-yahoo-exchange-codes"in tips_appendix.xml -->
-                  <para>Beachten Sie allerdings, dass Sie bei Verwendung von <quote>Yahoo as JSON</quote> zusätzlich das
-                    Börsenplatzkürzel des Wertpapiers anfügen sollten, z.B. <quote>F</quote> für Frankfurt,
-                    <quote>SW</quote> für Swiss oder <quote>VI</quote> für Vienna, usw. Als Beispiele sind
-                    hier VOW.F, NESN.SW und VOE.VI genannt. <quote>DE</quote> steht hier für
-                    <emphasis>Deutsche Börse XETRA</emphasis>.
-                    <xref linkend="gnc-tbl-fq-yahoo-exchange-codes"></xref> enthält eine Liste von
-                    Suffixen für verschiedene Märkte auf der ganzen Welt.
+                    <para>Beachten Sie allerdings, dass Sie bei Verwendung von <quote>Yahoo as JSON</quote> zusätzlich das
+                      Börsenplatzkürzel des Wertpapiers anfügen sollten, z.B. <quote>F</quote>
+                      für Frankfurt, <quote>SW</quote> für Swiss oder <quote>VI</quote> für
+                      Vienna, usw. Als Beispiele sind hier VOW.F, NESN.SW und VOE.VI genannt.
+                      <quote>DE</quote> steht hier für <emphasis>Deutsche Börse XETRA</emphasis>.
+                      <xref linkend="gnc-tbl-fq-yahoo-exchange-codes"></xref> enthält eine Liste
+                      von Suffixen für verschiedene Märkte auf der ganzen Welt.
 <!-- Translators: Some fund companies create their own pseudo-symbols that differ from the regional codes, such as
 the TIAA-CREF fund as a regional fund. You are free to add corresponding tables from your language area in the
 tips_appendix.xml and to adapt the text here. -->
-                    <footnote>
-                      <para>Pseudo-Symbole für den amerikanischen Lehrer-Pensionsfond TIAA-CREF-Fonds sind in der Tabelle
-                        <xref linkend="PsSymbs-TIAA-CREF"></xref> aufgeführt.
-                      </para>
-                    </footnote>
-                    <tip>
-                      <para>Da einige Symbole eine spezielle Schreibweise erfordern, schauen Sie sich auch die Beispiele unter
-                        <ulink url="&url-wiki;Online_Quotes#Setting_up_online_quotes_in_GnuCash" /> an.
-                      </para>
-                    </tip>
-                  </para>
-                </glossdef>
-              </glossentry>
-
-              <glossentry id="tool-ge-TimeZone">
-                <glossterm>Zeitzone</glossterm>
-                <glossdef>
-                  <para>Wählen Sie die Zeitzone für die Quelle der von Ihnen empfangenen Online-Börsenkurse.
-                    Beispielsweise verwendet Yahoo gewöhnlich die US-Eastern-Zeitzone, wählen Sie
-                    also <quote>America/New York</quote>, wenn Sie diese Börsenkursquelle
-                    verwenden.
-                  </para>
-                </glossdef>
-              </glossentry>
-            </glosslist>
+                      <footnote>
+                        <para>Pseudo-Symbole für den amerikanischen Lehrer-Pensionsfond TIAA-CREF-Fonds sind in der Tabelle
+                          <xref linkend="PsSymbs-TIAA-CREF"></xref> aufgeführt.
+                        </para>
+                      </footnote>
 
-            <tip>
-              <para>Denken Sie daran, dass die <quote>Kurse</quote> von Investmentfonds in Wirklichkeit
-                <quote>Nettoinventarwerte</quote><footnote><para>auch Nettovermögenswert, engl. Net Asset
-                Value (NAV), siehe <ulink url="&url-wp-de;NAV" /></para></footnote>  sind, und erst mehrere
-                Stunden nach Börsenschluss verfügbar sind. Wenn die <quote>Kurse</quote> aktualisiert
-                werden, bevor die Nettoinventarwerte des aktuellen Tages durch die Fopnfsgesellschaft
-                ermittelt wurden, werden die Werte vom vorherigen Handelstag abgerufen.
-              </para>
+                      <tip>
+                        <para>Da einige Symbole eine spezielle Schreibweise erfordern, schauen Sie sich auch die Beispiele unter
+                          <ulink url="&url-wiki;Online_Quotes#Setting_up_online_quotes_in_GnuCash" />
+                          an.
+                        </para>
+                      </tip>
+                    </para>
+                  </glossdef>
+                </glossentry>
 
-              <para>Wenn sie den Zeitpunkt der Wertermittlung genau wissen wollen, informieren sie sich
-                bei der ausgebenden Fonds-Gesellschaft.
-              </para>
-            </tip>
+                <glossentry id="tool-ge-TimeZone">
+                  <glossterm>Zeitzone</glossterm>
+                  <glossdef>
+                    <para>Wählen Sie die Zeitzone für die Quelle der von Ihnen empfangenen Online-Börsenkurse.
+                      Beispielsweise verwendet Yahoo gewöhnlich die US-Eastern-Zeitzone, wählen
+                      Sie also <quote>America/New York</quote>, wenn Sie diese Börsenkursquelle
+                      verwenden.
+                    </para>
+                  </glossdef>
+                </glossentry>
+              </glosslist>
 
-            <note>
-              <para>Die Kursdatenquelle <quote>Yahoo as JSON</quote> gibt den Kurs normalerweise zeitverzögert
-                zur Original-Datenquelle an. Wie groß die zeitliche Abweichung ist, können Sie in der Tabelle
-                <xref linkend="gnc-tbl-fq-yahoo-exchange-codes" /> nachlesen.
-              </para>
-            </note>
-          </listitem>
-        </varlistentry>
-      </variablelist>
+              <tip>
+                <para>Denken Sie daran, dass die <quote>Kurse</quote> von Investmentfonds in Wirklichkeit
+                  <quote>Nettoinventarwerte</quote>
+                  <footnote>
+                    <para>auch Nettovermögenswert, engl. Net Asset Value (NAV), siehe <ulink url="&url-wp-de;NAV" />
+                    </para>
+                  </footnote>
+                  sind, und erst mehrere Stunden nach Börsenschluss verfügbar sind. Wenn die
+                  <quote>Kurse</quote> aktualisiert werden, bevor die Nettoinventarwerte des
+                  aktuellen Tages durch die Fopnfsgesellschaft ermittelt wurden, werden die Werte
+                  vom vorherigen Handelstag abgerufen.
+                </para>
+
+                <para>Wenn sie den Zeitpunkt der Wertermittlung genau wissen wollen, informieren sie sich bei der
+                  ausgebenden Fonds-Gesellschaft.
+                </para>
+              </tip>
+
+              <note>
+                <para>Die Kursdatenquelle <quote>Yahoo as JSON</quote> gibt den Kurs normalerweise zeitverzögert zur
+                  Original-Datenquelle an. Wie groß die zeitliche Abweichung ist, können Sie in
+                  der Tabelle <xref linkend="gnc-tbl-fq-yahoo-exchange-codes" /> nachlesen.
+                </para>
+              </note>
+            </listitem>
+          </varlistentry>
+        </variablelist>
       </sect3>
-      
+
       <sect3 id="tools-commodity-currency-edit">
         <title>ISO-Währung bearbeiten</title>
 
         <abstract>
-          <para>Mit Hilfe dieses Dialoges haben Sie die Möglichkeit ISO-Währung zu bearbeiten.
-            Allerdings sind die meisten Eigenschaften von der ISO definiert sind, können nicht verändert werden.
+          <para>Mit Hilfe dieses Dialoges haben Sie die Möglichkeit ISO-Währung zu bearbeiten. Allerdings sind die
+            meisten Eigenschaften von der ISO definiert sind, können nicht verändert werden.
           </para>
         </abstract>
 
         <figure>
-          <title>Währung bearbeiten</title><screenshot>
+          <title>Währung bearbeiten</title>
+
+          <screenshot>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/Tools_SecurityEditor_edit.png" 
                            srccredit="Christian Wehling"/>
-                </imageobject>
+              </imageobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -6172,15 +6200,18 @@ tips_appendix.xml and to adapt the text here. -->
         <para>Bei den fest vorgegeben ISO-Währungen besteht <emphasis>nur</emphasis> die Möglichkeit,
           <itemizedlist>
             <listitem>
-              <para>das <xref linkend="tool-ge-DisplaySymbol" />,</para>
+              <para>das <xref linkend="tool-ge-DisplaySymbol" />,
+              </para>
             </listitem>
-            
+
             <listitem>
-              <para>die <xref linkend="tool-ge-TypeQuoteSource" /> und</para>
+              <para>die <xref linkend="tool-ge-TypeQuoteSource" /> und
+              </para>
             </listitem>
-            
+
             <listitem>
-              <para>die <xref linkend="tool-ge-TimeZone" /></para>
+              <para>die <xref linkend="tool-ge-TimeZone" />
+              </para>
             </listitem>
           </itemizedlist>
           anzupassen.
@@ -6283,8 +6314,8 @@ tips_appendix.xml and to adapt the text here. -->
     </itemizedlist>
 
     <para>Examples of using the <guilabel>Loan Repayment Calculator</guilabel> are given in the Tutorial and
-      Concepts Guide. <ulink url="&url-docs-C;guide/loans_calcs1.html"> &app; Tutorial and
-      Concepts Guide’s Chapter on Loans</ulink>
+      Concepts Guide. <ulink url="&url-docs-C;guide/loans_calcs1.html"> &app; Tutorial and Concepts
+      Guide’s Chapter on Loans</ulink>
     </para>
   </sect1>
 
@@ -6294,14 +6325,14 @@ tips_appendix.xml and to adapt the text here. -->
     <abstract>
       <para>Der Dialog <guilabel>Buch abschließen</guilabel>, welcher über den Menüeintrag &mc.to.cls-bok;
         geöffnet wird, dient zum <quote>Abschließen der Bücher</quote>, einem Vorgang in der
-        Buchhaltung, bei dem die Salden der Ertrags- und Aufwandskonten zurückgesetzt werden.
-        Bei diesem Vorgang werden die Salden der Ertragskonten und der Aufwandskonto in ein Konto
-        vom Typ Eigenkapital übertragen.
+        Buchhaltung, bei dem die Salden der Ertrags- und Aufwandskonten zurückgesetzt werden. Bei
+        diesem Vorgang werden die Salden der Ertragskonten und der Aufwandskonto in ein Konto vom
+        Typ Eigenkapital übertragen.
       </para>
 
       <para>In der betrieblichen Praxis erfolgt zuvor eine Gruppierung in den GuV-Konten nach
-        <ulink url="&url-laws-de;hgb/__275.html">§275 HGB</ulink>.
-        Siehe auch <ulink url="&url-wp-de;Gewinn-_und_Verlustrechnung">Gewinn- und Verlustrechnung</ulink>
+        <ulink url="&url-laws-de;hgb/__275.html">§275 HGB</ulink>. Siehe auch
+        <ulink url="&url-wp-de;Gewinn-_und_Verlustrechnung">Gewinn- und Verlustrechnung</ulink>
       </para>
     </abstract>
 
@@ -6321,14 +6352,14 @@ tips_appendix.xml and to adapt the text here. -->
         <term>geschäftliche Nutzung</term>
 
         <listitem>
-          <para>Man möchte die Zahlen, welche man extern, z.B. den Finanz-, Zoll- und sonstigen Behörden, berufständischen
-            Organisationen wie IHK, Geldgebern/Anteilseignern (Gewinnverwendung) und den Kreditgebern
-            (Sicherheit)) gemeldet hat, auch im Buch dokumentieren. Dann ist die Abschluß-Funktion
-            der richtige Ansatz.
+          <para>Man möchte die Zahlen, welche man extern, z.B. den Finanz-, Zoll- und sonstigen Behörden,
+            berufständischen Organisationen wie IHK, Geldgebern/Anteilseignern (Gewinnverwendung)
+            und den Kreditgebern (Sicherheit)) gemeldet hat, auch im Buch dokumentieren. Dann ist
+            die Abschluß-Funktion der richtige Ansatz.
           </para>
 
-          <para>Als Nebeneffekt können Sie direkt im Kontenplan die Einnahmen und Ausgaben des aktuellen
-            Zeitraums sehen.
+          <para>Als Nebeneffekt können Sie direkt im Kontenplan die Einnahmen und Ausgaben des aktuellen Zeitraums
+            sehen.
           </para>
         </listitem>
       </varlistentry>
@@ -6345,14 +6376,13 @@ tips_appendix.xml and to adapt the text here. -->
         </listitem>
       </varlistentry>
     </variablelist>
-
 <!-- FIXME source: Join warning & note to important. -->
     <important>
-      <para>Ohne angepaßte Konfiguration, wie im Tip zum Abschlußdatum erläutert, verringert der
-        Abschluss der Bücher den Nutzen der Standardberichte, weil einige Berichte derzeit keine
+      <para>Ohne angepaßte Konfiguration, wie im Tip zum Abschlußdatum erläutert, verringert der Abschluss
+        der Bücher den Nutzen der Standardberichte, weil einige Berichte derzeit keine
         abschließenden Buchungen verstehen. Aus ihrer Sicht sieht es also so aus, als ob die
-        Nettoeinnahmen oder -ausgaben in jedem Konto für frühere Buchungsperioden einfach
-        null waren.
+        Nettoeinnahmen oder -ausgaben in jedem Konto für frühere Buchungsperioden einfach null
+        waren.
       </para>
     </important>
 
@@ -6360,7 +6390,9 @@ tips_appendix.xml and to adapt the text here. -->
       <title>Beschreibung des Dialogs</title>
 
       <figure pgwide="1">
-        <title>Der Dialog <quote>Buch abschließen</quote></title><screenshot>
+        <title>Der Dialog <quote>Buch abschließen</quote></title>
+
+        <screenshot>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Tools_CloseBook.png" 
@@ -6392,9 +6424,9 @@ tips_appendix.xml and to adapt the text here. -->
         <glossentry>
           <glossterm>Erträge gesamt</glossterm>
           <glossdef>
-            <para>Wählen Sie das Konto vom Typ <emphasis>Eigenkapital</emphasis> aus, auf das der Gesamtsaldo aller Ertragskonten übertragen werden soll.
-              Optional können Sie über die Schaltfläche <guibutton>Neu…</guibutton> ein neues
-              Konto anlegen.
+            <para>Wählen Sie das Konto vom Typ <emphasis>Eigenkapital</emphasis> aus, auf das der Gesamtsaldo aller
+              Ertragskonten übertragen werden soll. Optional können Sie über die Schaltfläche
+              <guibutton>Neu…</guibutton> ein neues Konto anlegen.
             </para>
           </glossdef>
         </glossentry>
@@ -6402,12 +6434,13 @@ tips_appendix.xml and to adapt the text here. -->
         <glossentry>
           <glossterm>Aufwendungen gesamt</glossterm>
           <glossdef>
-            <para>Geben Sie das Eigenkapitalkonto an, auf das der Gesamtsaldo aller Aufwandskonten übertragen wird. Auch hier
-              können Sie optional ein neues Konto mit Hilfe der Schaltfläche
+            <para>Geben Sie das Eigenkapitalkonto an, auf das der Gesamtsaldo aller Aufwandskonten übertragen wird.
+              Auch hier können Sie optional ein neues Konto mit Hilfe der Schaltfläche
               <guibutton>Neu…</guibutton> anlegen.
               <tip>
                 <para>Die Konten für <guilabel>Ertrag</guilabel> und <guilabel>Aufwand</guilabel> können auch identisch
-                  sein, etwa <userinput>Eigenkapital:<replaceable>Jahresabschluß</replaceable></userinput>.
+                  sein, etwa
+                  <userinput>Eigenkapital:<replaceable>Jahresabschluß</replaceable></userinput>.
                 </para>
               </tip>
             </para>
@@ -6418,8 +6451,8 @@ tips_appendix.xml and to adapt the text here. -->
           <glossterm>Beschreibung</glossterm>
           <glossdef>
             <para>Geben Sie die Beschreibung an, die in die Abschlussbuchung eingetragen wird, z.B.
-              <userinput>Jahresabschluß <replaceable>JJ</replaceable></userinput>
-              oder <userinput>Monatabschluß <replaceable>JJ-MM</replaceable></userinput>.
+              <userinput>Jahresabschluß <replaceable>JJ</replaceable></userinput> oder
+              <userinput>Monatabschluß <replaceable>JJ-MM</replaceable></userinput>.
             </para>
           </glossdef>
         </glossentry>
@@ -6485,22 +6518,24 @@ tips_appendix.xml and to adapt the text here. -->
       </para>
 
       <para>To open the <guilabel>Lots in Account</guilabel> window, open the security account register, then
-        select
-        &mc.ac.vw-lots;
-        .
+        select &mc.ac.vw-lots; .
       </para>
 
       <figure pgwide="1">
-        <title>Lots in Account window for Security Capital Gains</title><screenshot id="tool-lotsInAcctStk">
+        <title>Lots in Account window for Security Capital Gains</title>
+
+        <screenshot id="tool-lotsInAcctStk">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Tool_LotsStk.png"
               srccredit="Chris Good" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/Tool_LotsStk.png"
                          srccredit="Chris Good"/>
             </imageobject>
+
             <caption>
               <para>An image of the <emphasis>Lots in Account </emphasis> window for a security account.
               </para>
@@ -6753,24 +6788,24 @@ tips_appendix.xml and to adapt the text here. -->
 
         <itemizedlist>
           <listitem>
-            <para><guilabel>>>:</guilabel> Links a free split (buy or sell) to a lot. This button is not
-              enabled until both a lot and a free split are highlighted. The split moves from the
+            <para><guilabel>>>:</guilabel> Links a free split (buy or sell) to a lot. This button is not enabled
+              until both a lot and a free split are highlighted. The split moves from the
               <guilabel>Splits free</guilabel> panel to the <guilabel>Splits in lot</guilabel>
               panel.
             </para>
 
             <para>Multiple buy splits and multiple sell splits may be linked to the same lot. Refer to following
-              section about the <guilabel>Scrub Account</guilabel> button for details of the
-              capital gains transactions created in these situations.
+              section about the <guilabel>Scrub Account</guilabel> button for details of the capital
+              gains transactions created in these situations.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel><<:</guilabel> Unlinks a split from a lot. The split moves from the
-              <guilabel>Splits in lot</guilabel>panel to the <guilabel>Splits free</guilabel>
-              panel. This button is not enabled until a split in the <guilabel>Splits in
-              lot</guilabel> panel is highlighted. When the last split is unlinked from a lot, the
-              lot is automatically deleted if there is no capital gain/loss transaction.
+            <para><guilabel><<:</guilabel> Unlinks a split from a lot. The split moves from the <guilabel>Splits
+              in lot</guilabel>panel to the <guilabel>Splits free</guilabel> panel. This button is
+              not enabled until a split in the <guilabel>Splits in lot</guilabel> panel is
+              highlighted. When the last split is unlinked from a lot, the lot is automatically
+              deleted if there is no capital gain/loss transaction.
             </para>
           </listitem>
 
@@ -6869,8 +6904,8 @@ tips_appendix.xml and to adapt the text here. -->
         </itemizedlist>
 
         <para>See Tutorial and Concepts Guide,
-          <ulink url="&url-docs-C;guide/invest-sell1.html#invest-sellLots">Automatic
-          Calculation of Capital Gain or Loss Using Lots</ulink> for more details.
+          <ulink url="&url-docs-C;guide/invest-sell1.html#invest-sellLots">Automatic Calculation of
+          Capital Gain or Loss Using Lots</ulink> for more details.
         </para>
       </sect3>
     </sect2>
@@ -6893,8 +6928,8 @@ tips_appendix.xml and to adapt the text here. -->
           <listitem>
             <para>To enquire about which payments or credit notes offset particular invoices. For each invoice and
               credit note, &app; automatically creates 1 (and only 1) lot. By selecting the lot for
-              the invoice or credit note in the <guilabel>Lots in This Account</guilabel> panel,
-              all the transaction splits for that lot show in the <guilabel>Splits in Lot</guilabel>
+              the invoice or credit note in the <guilabel>Lots in This Account</guilabel> panel, all
+              the transaction splits for that lot show in the <guilabel>Splits in Lot</guilabel>
               panel.
             </para>
 
@@ -6921,21 +6956,24 @@ tips_appendix.xml and to adapt the text here. -->
         <para>To open the <guilabel>Lots in Account AAAA</guilabel> window, where AAAA is the <emphasis>Accounts
           Receivable</emphasis> (AR) or <emphasis>Accounts Payable</emphasis> (AP) account, open the
           <emphasis>AR</emphasis> or <emphasis>AP</emphasis> account register, then select
-          &mc.ac.vw-lots;
-          .
+          &mc.ac.vw-lots; .
         </para>
 
         <figure pgwide="1">
-          <title>Lots in Account window for business features</title><screenshot id="tool-lotsInAcctBus">
+          <title>Lots in Account window for business features</title>
+
+          <screenshot id="tool-lotsInAcctBus">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Tool_LotsBus.png"
                   srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/Tool_LotsBus.png"
                            srccredit="Chris Good" />
               </imageobject>
+
               <caption>
                 <para>An image of the <guilabel>Lots in Account</guilabel> window for an Accounts Receivable account.
                 </para>
diff --git a/de/manual/ch_Transactions.xml b/de/manual/ch_Transactions.xml
index d13fee16..ed387ab8 100644
--- a/de/manual/ch_Transactions.xml
+++ b/de/manual/ch_Transactions.xml
@@ -67,15 +67,13 @@ Translators:
   <sect1 id="trans-win-enter" xreflabel="Buchen Dialog">
     <title>Verwenden des Buchen Dialogs</title>
 
-    <para>Der <guilabel>Buchen</guilabel> Dialog ist im Menü und mit dem Tastenkürzel mittels
-      &mc.ac.trf;
+    <para>Der <guilabel>Buchen</guilabel> Dialog ist im Menü und mit dem Tastenkürzel mittels &mc.ac.trf;
       sowie durch Verwenden der Schaltfläche <guibutton>Buchen</guibutton> in der
       <emphasis>Werkzeugleiste</emphasis> des Kontobuchs zu erreichen und dient in &app; zwei
       Zwecken:
       <itemizedlist>
         <listitem>
-          <para>Eine Möglichkeit, eine einfache (d.h. zweiteilige) Buchung zwischen beliebigen Konten zu
-            erstellen.
+          <para>Eine Möglichkeit, eine einfache (d.h. zweiteilige) Buchung zwischen beliebigen Konten zu erstellen.
           </para>
         </listitem>
 
@@ -201,8 +199,8 @@ Translators:
       </para>
 
       <para>Wenn ein entsprechender Kurs in der Kursdatenbank vorhanden ist (siehe
-        <xref linkend="tool-price-manual"/>), wird der <guilabel>Wechselkurs</guilabel>
-        diesen als Vorgabe verwenden.
+        <xref linkend="tool-price-manual"/>), wird der <guilabel>Wechselkurs</guilabel> diesen als
+        Vorgabe verwenden.
       </para>
 
       <tip>
@@ -235,9 +233,9 @@ Translators:
       <note>
         <para>Wenn Sie einen Kurs für das aktuelle Datum in der <guilabel>Kurs-Datenbank</guilabel> eingegeben
           haben (siehe <xref
-      linkend="tool-price-manual"/>) wird der Abruf des
-          Wechselkurs den Kurs nicht aktualisieren. Sie müssen zuerst den manuell erstellten Kurs
-          in der <guilabel>Kurs-Datenbank</guilabel> entfernen bevor Sie die <guibutton>Wechselkurs
+      linkend="tool-price-manual"/>) wird der Abruf des Wechselkurs den
+          Kurs nicht aktualisieren. Sie müssen zuerst den manuell erstellten Kurs in der
+          <guilabel>Kurs-Datenbank</guilabel> entfernen bevor Sie die <guibutton>Wechselkurs
           abrufen</guibutton>-Schaltfläche betätigen.
         </para>
       </note>
@@ -283,24 +281,23 @@ Translators:
     </para>
 
     <note>
-      <para>Wenn Sie in &app; an Buchungen arbeiten, beachten Sie, dass die
-        &kc.enter; Taste und die &kc.tab;
+      <para>Wenn Sie in &app; an Buchungen arbeiten, beachten Sie, dass die &kc.enter; Taste und die &kc.tab;
         Taste sich unterschiedlich verhalten und unterschiedliche Aktionen ausführen.
       </para>
 
-      <para>Die Taste &kc.enter; wechselt in das erste Feld des nächsten
-        Buchungsteils, unabhängig davon, in welchem Feld Sie sich befinden. Wenn es keinen
-        nächsten Buchungsteil gibt, wird mit der Eingabe der nächsten Buchung begonnen. In jedem
-        Fall schließt &kc.enter; die Bearbeitung der Buchung ab, und
-        ein mögliche Ausgleichsbuchung wird auf das <emphasis>Ausgleichskonto-CUR</emphasis>
-        gebucht, wobei <emphasis>CUR</emphasis> die Währung der Buchung ist.
+      <para>Die Taste &kc.enter; wechselt in das erste Feld des nächsten Buchungsteils, unabhängig davon, in
+        welchem Feld Sie sich befinden. Wenn es keinen nächsten Buchungsteil gibt, wird mit der
+        Eingabe der nächsten Buchung begonnen. In jedem Fall schließt &kc.enter; die Bearbeitung
+        der Buchung ab, und ein mögliche Ausgleichsbuchung wird auf das
+        <emphasis>Ausgleichskonto-CUR</emphasis> gebucht, wobei <emphasis>CUR</emphasis> die
+        Währung der Buchung ist.
       </para>
 
-      <para>Mit der Taste &kc.tab; wechseln Sie zum nächsten Feld im aktuellen
-        Buchungsteil. Wenn es das letzte Feld ist, geht der Cursor zum nächsten Buchungsteil oder
-        erstellt eine neuen, wenn es keinen gibt. Wenn der Buchungsteil leer ist, schließt die
-        Taste &kc.tab; die Buchung ab und bucht eine etwaige
-        Ausgleichsbuchung, wie oben beschrieben, in das <emphasis>Ausgleichskonto-CUR</emphasis>.
+      <para>Mit der Taste &kc.tab; wechseln Sie zum nächsten Feld im aktuellen Buchungsteil. Wenn es das letzte
+        Feld ist, geht der Cursor zum nächsten Buchungsteil oder erstellt eine neuen, wenn es
+        keinen gibt. Wenn der Buchungsteil leer ist, schließt die Taste &kc.tab; die Buchung ab und
+        bucht eine etwaige Ausgleichsbuchung, wie oben beschrieben, in das
+        <emphasis>Ausgleichskonto-CUR</emphasis>.
       </para>
     </note>
 <!-- FIXME source: change orderedlist into procedure -->
@@ -336,8 +333,8 @@ Translators:
       </step>
 
       <step>
-        <para>Wenn Sie an dieser Stelle die &kc.tab;-Taste drücken, passieren zwei Dinge: Falls &app;
-          eine Übereinstimmung mit einer bereits vorhandenen Buchung findet, springt der Cursor auf
+        <para>Wenn Sie an dieser Stelle die &kc.tab;-Taste drücken, passieren zwei Dinge: Falls &app; eine
+          Übereinstimmung mit einer bereits vorhandenen Buchung findet, springt der Cursor auf
           eines der Betragsfelder, und das Feld <guilabel>Buchen</guilabel> wird automatisch
           gefüllt. Falls noch keine entsprechende Buchung existiert, bewegt &app; den Cursor in das
           Feld <guilabel>Buchen</guilabel>. Wenn Sie stattdessen das Feld
@@ -379,8 +376,8 @@ Translators:
       </step>
 
       <step>
-        <para>Bewegen Sie den Cursor mit der &kc.tab;-Taste zum ersten Betragsfeld. Die Bezeichnungen
-          der beiden Betragsspalten sind je nach Kontoart unterschiedlich. So heißen sie bei
+        <para>Bewegen Sie den Cursor mit der &kc.tab;-Taste zum ersten Betragsfeld. Die Bezeichnungen der beiden
+          Betragsspalten sind je nach Kontoart unterschiedlich. So heißen sie bei
           <emphasis>Bank</emphasis>-Konten <guilabel>Einzahlung</guilabel> und
           <guilabel>Abhebung</guilabel>, bei <emphasis>Kreditkarten</emphasis>-Konten
           <guilabel>Abnahme</guilabel> und <guilabel>Zunahme</guilabel> und bei
@@ -391,14 +388,11 @@ Translators:
 
       <step>
         <para>Geben Sie den Betrag für die Buchung in das richtige Feld ein. Ist die Buchung
-          <quote>ausgeglichen</quote> wird durch Drücken der
-          &kc.enter; Taste, Betätigung der
+          <quote>ausgeglichen</quote> wird durch Drücken der &kc.enter; Taste, Betätigung der
           <guibutton>Eingabe</guibutton>-Schaltfläche in der <emphasis> Werkzeugleiste </emphasis>
-          oder mit
-          &mc.tr.ent;
-          die Buchung abgeschlossen. Durch Anklicken der <guibutton>Abbrechen</guibutton>-Schaltfläche oder mit
-          &mc.tr.cnl;
-          wird die Buchung gelöscht.
+          oder mit &mc.tr.ent; die Buchung abgeschlossen. Durch Anklicken der
+          <guibutton>Abbrechen</guibutton>-Schaltfläche oder mit &mc.tr.cnl; wird die Buchung
+          gelöscht.
         </para>
       </step>
 
@@ -412,9 +406,7 @@ Translators:
       <step>
         <para>Um zu einer leeren Buchung am Ende des Kontobuchs zu wechseln, klicken Sie die
           <guibutton>Neu</guibutton>-Schaltfläche in der <emphasis>Werkzeugleiste</emphasis> an
-          oder wählen Sie
-          &mc.ac.blk-tr;
-          .
+          oder wählen Sie &mc.ac.blk-tr; .
         </para>
       </step>
     </procedure>
@@ -430,12 +422,14 @@ Translators:
 
     <para>Wählen Sie eine Buchung im <guilabel>Kontobuch</guilabel>, klicken Sie mit der rechten Maustaste
       darauf, um das <guimenu>Kontextmenü</guimenu> zu öffnen und wählen Sie
-      &gmi.tr.man-doc-link;. Es öffnet sich der Dialog
-      <guilabel>Buchungsverknüpfung bearbeiten</guilabel>.
+      &gmi.tr.man-doc-link;. Es öffnet sich der Dialog <guilabel>Buchungsverknüpfung
+      bearbeiten</guilabel>.
     </para>
 
     <figure pgwide="1">
-      <title>Der <quote>Buchungsverknüpfung bearbeiten</quote> Dialog</title><screenshot>
+      <title>Der <quote>Buchungsverknüpfung bearbeiten</quote> Dialog</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Trans_Assoc_Dialog.png" 
@@ -475,16 +469,18 @@ Translators:
       verlassen, ohne eine Änderung vorzunehmen.
     </para>
 
-    <para>Der Menüeintrag &gmi.tr.open-doc; ist aktiviert, wenn eine Datei oder
-      eine URL mit der ausgewählten Buchung verknüpft ist. Wenn Sie diesen auswählen, öffnet
-      sich die Datei in dem Standardprogramm für den Dateityp bzw. die URL im Standard-Browser.
+    <para>Der Menüeintrag &gmi.tr.open-doc; ist aktiviert, wenn eine Datei oder eine URL mit der
+      ausgewählten Buchung verknüpft ist. Wenn Sie diesen auswählen, öffnet sich die Datei in
+      dem Standardprogramm für den Dateityp bzw. die URL im Standard-Browser.
     </para>
 <!-- FIXME source: this menuitem is obsolet: -->
 <!--     <para><guimenuitem>Remove Association from Transaction</guimenuitem> is enabled if there is a file or URL
       associated with the selected transaction and does exactly what you'd expect.
     </para> -->
     <figure float="1">
-      <title>Kette und Büroklammer</title><screenshot>
+      <title>Kette und Büroklammer</title>
+
+      <screenshot>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/Trans_Assoc_Symbols.png" 
@@ -527,9 +523,7 @@ Translators:
 
     <para>Die weiteren Buchungszeilen werden im einzeiligen Kontobuch nicht angezeigt, es sei denn, die
       Schaltfläche <guibutton>Vollständig</guibutton> in der <emphasis>Werkzeugleiste</emphasis>
-      oder der Menüeintrag
-      &mc.ac.spt-tr;
-      sind aktiviert.
+      oder der Menüeintrag &mc.ac.spt-tr; sind aktiviert.
     </para>
 
     <procedure>
@@ -561,8 +555,8 @@ Translators:
       </step>
 
       <step>
-        <para>Wenn Sie an dieser Stelle die &kc.tab;-Taste drücken, passieren zwei Dinge: Falls &app;
-          eine Übereinstimmung mit einer bereits vorhandenen Buchung findet, springt der Cursor auf
+        <para>Wenn Sie an dieser Stelle die &kc.tab;-Taste drücken, passieren zwei Dinge: Falls &app; eine
+          Übereinstimmung mit einer bereits vorhandenen Buchung findet, springt der Cursor auf
           eines der Betragsfelder, und das Feld <guilabel>Buchen</guilabel> wird automatisch
           gefüllt. Wenn Sie stattdessen das Feld <guilabel>Buchen</guilabel> direkt mit der Maus
           anklicken (ohne Tabulatortaste), wird es nicht automatisch gefüllt. Falls noch keine
@@ -598,8 +592,8 @@ Translators:
       </step>
 
       <step>
-        <para>Bewegen Sie den Cursor mit der &kc.tab;-Taste zum ersten Betragsfeld. Die Bezeichnungen
-          der beiden Betragsspalten sind je nach Kontoart unterschiedlich. So heißen sie bei
+        <para>Bewegen Sie den Cursor mit der &kc.tab;-Taste zum ersten Betragsfeld. Die Bezeichnungen der beiden
+          Betragsspalten sind je nach Kontoart unterschiedlich. So heißen sie bei
           <emphasis>Bank</emphasis>-Konten <guilabel>Einzahlung</guilabel> und
           <guilabel>Abhebung</guilabel>, bei <emphasis>Kreditkarten</emphasis>-Konten
           <guilabel>Abnahme</guilabel> und <guilabel>Zunahme</guilabel> und bei
@@ -609,18 +603,16 @@ Translators:
       </step>
 
       <step>
-        <para>Geben Sie den Betrag für die Buchung in das richtige Feld ein. Bevor Sie &kc.tab; oder
-          &kc.enter; drücken, lesen Sie bitte den nächsten Schritt.
+        <para>Geben Sie den Betrag für die Buchung in das richtige Feld ein. Bevor Sie &kc.tab; oder &kc.enter;
+          drücken, lesen Sie bitte den nächsten Schritt.
         </para>
       </step>
 
       <step>
         <para>Um die weiteren Buchungsteile einzugeben, drücken Sie die Schaltfläche
           <guibutton>Vollständig</guibutton> in der <emphasis>Werkzeugleiste</emphasis> oder
-          wählen Sie
-          &mc.ac.spt-tr;
-          . Buchungen mit mehreren Teilen tragen den Hinweis <emphasis>-- Mehrteilige Buchung
-          --</emphasis> und zur Anzeige der Details wird die Funktion
+          wählen Sie &mc.ac.spt-tr; . Buchungen mit mehreren Teilen tragen den Hinweis <emphasis>--
+          Mehrteilige Buchung --</emphasis> und zur Anzeige der Details wird die Funktion
           <guibutton>Vollständig</guibutton> benötigt.
         </para>
       </step>
@@ -657,10 +649,9 @@ Translators:
 
       <step>
         <para>Bewegen Sie den Cursor zum noch fehlenden Betragsfeld in der dritten Zeile und ergänzen Sie den
-          Betrag. Durch Drücken der &kc.enter; Taste, Anklicken der
-          Schaltfläche <guibutton>Eingeben</guibutton> oder mit
-          &mc.tr.ent;
-          wird nunmehr der Cursor zur nächsten Zeile bewegt.
+          Betrag. Durch Drücken der &kc.enter; Taste, Anklicken der Schaltfläche
+          <guibutton>Eingeben</guibutton> oder mit &mc.tr.ent; wird nunmehr der Cursor zur nächsten
+          Zeile bewegt.
         </para>
       </step>
 
@@ -679,13 +670,10 @@ Translators:
       </step>
 
       <step>
-        <para>Wenn Sie, wie oben beschrieben, die &kc.enter; Taste drücken, bis
-          sich der Cursor hinter der Leerzeile befindet, so springt der Cursor zum nächsten
-          Buchung. Dadurch wird der mehrteilige Vorgang geschlossen; er kann jedoch auch manuell
-          geschlossen werden, indem Sie die Schaltfäche <guibutton>Vollständig</guibutton>
-          anklicken oder
-          &mc.ac.spt-tr;
-          .
+        <para>Wenn Sie, wie oben beschrieben, die &kc.enter; Taste drücken, bis sich der Cursor hinter der
+          Leerzeile befindet, so springt der Cursor zum nächsten Buchung. Dadurch wird der
+          mehrteilige Vorgang geschlossen; er kann jedoch auch manuell geschlossen werden, indem Sie
+          die Schaltfäche <guibutton>Vollständig</guibutton> anklicken oder &mc.ac.spt-tr; .
         </para>
       </step>
     </procedure>
@@ -733,18 +721,14 @@ Translators:
     <title>Buchung bearbeiten</title>
 
     <para>Zur Änderung einer Buchung müssen Sie nur den zu ändernden Buchungsteil auswählen. Sobald Sie
-      die Änderungen vorgenommen haben, drücken Sie entweder die
-      &kc.enter; Taste, betätigen die
-      <guibutton>Eingeben</guibutton>-Schaltfläche oder den Menübefehl
-      &mc.tr.ent;
-      , und der Cursor springt automatisch zur nächsten Zeile bzw. zur nächsten Buchung.
+      die Änderungen vorgenommen haben, drücken Sie entweder die &kc.enter; Taste, betätigen die
+      <guibutton>Eingeben</guibutton>-Schaltfläche oder den Menübefehl &mc.tr.ent; , und der
+      Cursor springt automatisch zur nächsten Zeile bzw. zur nächsten Buchung.
     </para>
 
     <para>Um für die Bearbeitung eine detailliertere Ansicht die Buchung zu erhalten, betätigen Sie die
       <guibutton>Vollständig</guibutton>-Schaltfläche in der <emphasis>Werkzeugleiste</emphasis>
-      oder wählen Sie
-      &mc.ac.spt-tr;
-      .
+      oder wählen Sie &mc.ac.spt-tr; .
     </para>
   </sect1>
 
@@ -753,22 +737,19 @@ Translators:
 
     <para>Soll eine Buchung aus dem Kontobuch entfernt werden, wählen Sie die Buchung aus und drücken Sie
       entweder die <guibutton>Löschen</guibutton>-Schaltfläche in der
-      <emphasis>Werkzeugleiste</emphasis> oder verwendenen Sie
-      &mc.tr.del;
-      . Es öffnet sich ein Dialogfenster, um das Löschen zu bestätigen, sofern die Einstellung
-      nicht geändert wurde. Das Fenster bietet zwei Optionen: <guilabel><accel>A</accel>ntwort
-      speichern und nicht wieder anzeigen.</guilabel> und <guilabel>Antwort speichern und in
-      <accel>d</accel>ieser Sitzung nicht wieder anzeigen</guilabel>. Die Antwort wird entsprechend
-      dem ausgewählten Kontrollkästchen gespeichert. Die Voreinstellung kann auch mittels
-      &mc.ac.res-warn;
-      . <xref linkend="reset-warning" /> rückgängig gemacht werden.
+      <emphasis>Werkzeugleiste</emphasis> oder verwendenen Sie &mc.tr.del; . Es öffnet sich ein
+      Dialogfenster, um das Löschen zu bestätigen, sofern die Einstellung nicht geändert wurde.
+      Das Fenster bietet zwei Optionen: <guilabel><accel>A</accel>ntwort speichern und nicht wieder
+      anzeigen.</guilabel> und <guilabel>Antwort speichern und in <accel>d</accel>ieser Sitzung
+      nicht wieder anzeigen</guilabel>. Die Antwort wird entsprechend dem ausgewählten
+      Kontrollkästchen gespeichert. Die Voreinstellung kann auch mittels &mc.ac.res-warn; .
+      <xref linkend="reset-warning" /> rückgängig gemacht werden.
     </para>
 
     <para>Teile einer Buchung können auch entfernt werden, indem Sie die Schaltfläche
       <guibutton>Vollständig</guibutton> auf der <emphasis>Werkzeugleiste</emphasis> oder durch
-      Auswahl von
-      &mc.ac.spt-tr;
-      . Die Teilbuchung, die entfernt werden soll, kann dann zum Löschen ausgewählt werden.
+      Auswahl von &mc.ac.spt-tr; . Die Teilbuchung, die entfernt werden soll, kann dann zum Löschen
+      ausgewählt werden.
     </para>
   </sect1>
 
@@ -783,11 +764,10 @@ Translators:
     </para>
 
     <para>Natürlich kann ein Benutzer Stornobuchungen durchaus manuell eingeben; &app; enthält dafür jedoch
-      einen Menüoption (&mc.tr.add-rev;),
-      der die Stornobuchung schnell für Sie anlegen kann. Diese Option erscheint nur, wenn Sie
-      sich in einem Kontobuch befinden. Wenn Sie eine Buchung ausgewählt haben, die storniert
-      werden soll, brauchen Sie nur diesen Menüpunkt zu wählen, und es wird sofort ein Duplikat
-      der Buchung erstellt, die die aktive Buchung storniert.
+      einen Menüoption (&mc.tr.add-rev;), der die Stornobuchung schnell für Sie anlegen kann.
+      Diese Option erscheint nur, wenn Sie sich in einem Kontobuch befinden. Wenn Sie eine Buchung
+      ausgewählt haben, die storniert werden soll, brauchen Sie nur diesen Menüpunkt zu wählen,
+      und es wird sofort ein Duplikat der Buchung erstellt, die die aktive Buchung storniert.
     </para>
 
     <note>
@@ -811,23 +791,18 @@ Translators:
       <listitem>
         <para>Wenn Sie sich in der <quote>einzeiligen</quote> Ansicht befinden, drücken Sie die Taste
           <guibutton>Vollständig</guibutton> in der <emphasis>Werkzeugleiste</emphasis> oder
-          wählen Sie
-          &mc.ac.spt-tr;
-          um die Buchung zu öffnen.
+          wählen Sie &mc.ac.spt-tr; um die Buchung zu öffnen.
         </para>
       </listitem>
 
       <listitem>
-        <para>Verwenden Sie
-          &mc.tr.rem;
-          . Es öffnet sich ein Dialogfenster, um das Löschen zu bestätigen, sofern die
-          Einstellung nicht geändert wurde. Das Fenster bietet zwei Optionen:
+        <para>Verwenden Sie &mc.tr.rem; . Es öffnet sich ein Dialogfenster, um das Löschen zu bestätigen,
+          sofern die Einstellung nicht geändert wurde. Das Fenster bietet zwei Optionen:
           <guilabel><accel>A</accel>ntwort speichern und nicht wieder anzeigen.</guilabel> und
           <guilabel>Antwort speichern und in <accel>d</accel>ieser Sitzung nicht wieder
           anzeigen</guilabel>. Die Antwort wird entsprechend dem ausgewählten Kontrollkästchen
-          gespeichert. Die Voreinstellung kann auch mittels
-          &mc.ac.res-warn;
-          . <xref linkend="reset-warning" /> rückgängig gemacht werden.
+          gespeichert. Die Voreinstellung kann auch mittels &mc.ac.res-warn; .
+          <xref linkend="reset-warning" /> rückgängig gemacht werden.
         </para>
       </listitem>
 
@@ -853,17 +828,14 @@ Translators:
   <sect1 id="trans-copy">
     <title>Buchung kopieren</title>
 
-    <para>Um Buchungen zu kopieren, können Sie das Menü &gm.trans; verwenden. In dem Menü
-      &gm.trans; gibt es die Befehle &gmi.tr.cut;,
-      &gmi.tr.copy; und &gmi.tr.paste;, mit denen ein
-      kompletter Geschäftsvorgang ausgeschnitten oder kopiert und anschließend in einer neuen
-      Zeile eingefügt werden kann. Bei dieser Methode wird als Datum das benutzt, welches in der
-      leeren Zeile für neue Buchungen steht.
+    <para>Um Buchungen zu kopieren, können Sie das Menü &gm.trans; verwenden. In dem Menü &gm.trans; gibt
+      es die Befehle &gmi.tr.cut;, &gmi.tr.copy; und &gmi.tr.paste;, mit denen ein kompletter
+      Geschäftsvorgang ausgeschnitten oder kopiert und anschließend in einer neuen Zeile
+      eingefügt werden kann. Bei dieser Methode wird als Datum das benutzt, welches in der leeren
+      Zeile für neue Buchungen steht.
     </para>
 
-    <para>Der Menüpunkt
-      &mc.tr.dup;
-      oder die Schaltfläche <guibutton>Duplizieren</guibutton> in der
+    <para>Der Menüpunkt &mc.tr.dup; oder die Schaltfläche <guibutton>Duplizieren</guibutton> in der
       <emphasis>Werkzeugleiste</emphasis> bietet, im Gegensatz zur Methode Kopieren die
       Möglichkeit, ein anderes Datum zu wählen.
     </para>
@@ -875,8 +847,7 @@ Translators:
       </listitem>
 
       <listitem>
-        <para>Wählen Sie
-          &mc.tr.dup;
+        <para>Wählen Sie &mc.tr.dup;
         </para>
       </listitem>
 
@@ -943,15 +914,12 @@ Translators:
         <term><guilabel>u</guilabel></term>
 
         <listitem>
-          <para>Ungültig. Der Status wird manuell mit dem Menüpunkt
-            &mc.tr.void;
-            (siehe auch <xref linkend="Trans-transaction-menu" />) einer Buchung zugewiesen oder
-            freigegeben und gilt für jede Zeile in der Buchung. Es verbirgt die meisten
-            Buchungsdetails, löscht sie aber nicht. Wird eine Buchung für ungültig erklärt, so
-            ist ein Grund anzugeben, der rechts neben den Buchungsnotizen erscheint. Die Notizen und
-            die Begündung sind nur sichtbar, wenn Sie Folgendes aktiviert haben
-            &mc.vw.doub;
-            .
+          <para>Ungültig. Der Status wird manuell mit dem Menüpunkt &mc.tr.void; (siehe auch
+            <xref linkend="Trans-transaction-menu" />) einer Buchung zugewiesen oder freigegeben und
+            gilt für jede Zeile in der Buchung. Es verbirgt die meisten Buchungsdetails, löscht
+            sie aber nicht. Wird eine Buchung für ungültig erklärt, so ist ein Grund anzugeben,
+            der rechts neben den Buchungsnotizen erscheint. Die Notizen und die Begündung sind nur
+            sichtbar, wenn Sie Folgendes aktiviert haben &mc.vw.doub; .
           </para>
         </listitem>
       </varlistentry>
@@ -964,17 +932,14 @@ Translators:
     <para>Bei der Arbeit im Kontobuch ist es häufig nützlich, ein Konto und gleichzeitig auch das Gegenkonto
       einsehen zu können. Dies ermöglicht &app; ihnen, indem Sie die Schaltfläche
       <guibutton>Springen</guibutton> in der <emphasis>Werkzeugleiste</emphasis> oder den
-      Menübefehl
-      &mc.ac.jump;
-      in der Anzeige für das Kontobuch verwenden.
+      Menübefehl &mc.ac.jump; in der Anzeige für das Kontobuch verwenden.
     </para>
 
     <para>Wählen Sie die gewünschte Buchung im Kontobuch betätigen entweder die
-      <guibutton>Springen</guibutton>-Schaltfläche oder wählen
-      &mc.ac.jump;
-      im Menü um zugehörigen Gegenkonto in einem neuen Fenster zu öffnen. Wenn die Buchung mehr
-      als ein Konto berührt, müssen Sie zuerst alle Buchungsteile anzeigen und das Gegenkonto, zu
-      dem gesprungen werden soll, auswählen
+      <guibutton>Springen</guibutton>-Schaltfläche oder wählen &mc.ac.jump; im Menü um
+      zugehörigen Gegenkonto in einem neuen Fenster zu öffnen. Wenn die Buchung mehr als ein Konto
+      berührt, müssen Sie zuerst alle Buchungsteile anzeigen und das Gegenkonto, zu dem gesprungen
+      werden soll, auswählen
     </para>
   </sect1>
 
@@ -994,10 +959,8 @@ Translators:
       Buchungssatzes aus dem Kontobuch als Vorlage. Wählen Sie den Buchungssatz, welchen Sie als
       Vorlage verwenden wollen, und anschließend entweder die Schaltfläche
       <guibutton>Terminiert</guibutton> in der <emphasis>Werkzeugleiste</emphasis> oder den
-      Menübefehl
-      &mc.ac.sched;
-      . Anschließend öffnet sich das Dialogfenster <guilabel>Terminierte Buchung
-      erstellen</guilabel>.
+      Menübefehl &mc.ac.sched; . Anschließend öffnet sich das Dialogfenster <guilabel>Terminierte
+      Buchung erstellen</guilabel>.
     </para>
 
     <variablelist>
@@ -1068,8 +1031,7 @@ Translators:
       <title>Übersicht der terminierten Buchungen</title>
 
       <para>Eine Übersicht über die terminierten Buchungen kann aus der <emphasis>Kontenübersicht</emphasis>
-        oder aus dem <emphasis>Kontobuch</emphasis> heraus mit dem Menübefehl
-        &mc.ac.scd.tr-ed;
+        oder aus dem <emphasis>Kontobuch</emphasis> heraus mit dem Menübefehl &mc.ac.scd.tr-ed;
         geöffnet werden.
       </para>
 
@@ -1093,9 +1055,7 @@ Translators:
         Buchungen neu zu erstellen, zu bearbeiten und zu löschen. Die <guibutton>Neu</guibutton>
         und <guibutton>Bearbeiten</guibutton>-Schaltflächen öffnen den <guilabel>Terminierte
         Buchungen bearbeiten</guilabel> Assistenten. <guibutton>Löschen</guibutton> entfernt die
-        ausgewählte Buchung. Die gleichen Möglichkeiten sind im Menü
-        &gm.sx;
-        zu finden.
+        ausgewählte Buchung. Die gleichen Möglichkeiten sind im Menü &gm.sx; zu finden.
       </para>
 
       <para>Unterhalb der Liste der geplanten Buchungen befindet sich eine Kalenderübersicht mit den
@@ -1400,17 +1360,15 @@ Translators:
     </para>
 
     <para>Um die Funktion zum Drucken eines Schecks in &app; zu benutzen, wählen Sie die Buchung aus, für
-      die Sie einen Scheck bedrucken wollen, und wählen Sie
-      &mc.fi.prin-ch;
-      . Anschließend öffnet sich das Dialogfenster <guilabel>Scheck drucken</guilabel> um die
-      ausgewählte Buchung zu drucken.
+      die Sie einen Scheck bedrucken wollen, und wählen Sie &mc.fi.prin-ch; . Anschließend öffnet
+      sich das Dialogfenster <guilabel>Scheck drucken</guilabel> um die ausgewählte Buchung zu
+      drucken.
     </para>
 
     <para>Wollen Sie mehrere Schecks in &app; drucken, führen Sie erst eine Suche aus, um die Buchungen zu
       finden, die Sie drucken möchten. Mit dem Suchergebniss im aktuellen Fenster gehen Sie zu
-      &mc.fi.prin-ch;
-      . Dadurch wird ebenfalls der Dialog <guilabel>Scheck drucken</guilabel> geöffnet, um alle
-      Buchungen des Suchergebnis zu drucken.
+      &mc.fi.prin-ch; . Dadurch wird ebenfalls der Dialog <guilabel>Scheck drucken</guilabel>
+      geöffnet, um alle Buchungen des Suchergebnis zu drucken.
     </para>
 
     <para>Das Dialogfenster <guilabel>Scheck drucken</guilabel> hat zwei Karteiseiten. Die erste Karteiseite
@@ -1689,9 +1647,8 @@ Translators:
       </note>
 
       <para>Auf die Importfunktionen der vorgenannten Dateiformate, und noch weitere Möglichkeiten zum
-        Importieren anderer Datentypen, kann über das Untermenü
-        &mc-gsm.fi.imp;
-        zugegriffen werden.
+        Importieren anderer Datentypen, kann über das Untermenü &mc-gsm.fi.imp; zugegriffen
+        werden.
       </para>
     </sect2>
 
@@ -1699,10 +1656,8 @@ Translators:
       <title>Import Einstellungen</title>
 <!-- FIXME: source: new register "import" in prefs, adjust link to "prefs-import" -->
       <para>Die Vorgaben für die <link linkend="prefs-online">Import Einstellungen</link>, die der Benutzer im
-        <guilabel>&app; Einstellungen</guilabel> Dialog
-        &mc.ed.pref;
-        festlegen kann, wirken sich auf das Importieren der Buchungen aus den unten beschriebenen
-        Dateien aus.
+        <guilabel>&app; Einstellungen</guilabel> Dialog &mc.ed.pref; festlegen kann, wirken sich auf
+        das Importieren der Buchungen aus den unten beschriebenen Dateien aus.
       </para>
     </sect2>
 
@@ -1717,14 +1672,14 @@ Translators:
         Ihres Programms, ob diese Option verfügbar ist.
       </para>
 
-      <para>Wenn Sie QIF-Dateien importieren wollen, wählen Sie
-        &mc.fi.imp.QIF;
-        aus dem Menü, um das unten abgebildete Dialogfeld <quote>QIF-Datei importieren</quote> zu
-        öffnen.
+      <para>Wenn Sie QIF-Dateien importieren wollen, wählen Sie &mc.fi.imp.QIF; aus dem Menü, um das unten
+        abgebildete Dialogfeld <quote>QIF-Datei importieren</quote> zu öffnen.
       </para>
 
       <figure pgwide="1">
-        <title>Der Assistent zum Importieren von QIF-Dateien</title><screenshot id="ImportQIFDruid">
+        <title>Der Assistent zum Importieren von QIF-Dateien</title>
+
+        <screenshot id="ImportQIFDruid">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Import_QIF_Druid.png"  srccredit="Christian Wehling" width="&img-w;" />
@@ -1874,8 +1829,9 @@ Translators:
               die erforderlichen Kontenstrukturen angelegt. Erstellte Konten werden durch Aktivieren
               des Kontrollkästchens in der Spalte <guilabel>Neu</guilabel> gekennzeichnet.
               Zugewiesene Konten können bearbeitet werden, indem Sie die entsprechende Zeile
-              auswählen und und Sie auf die <guibutton>&app;-Konten ändern…</guibutton>-Schaltfläche
-             klicken, um den Dialog zur Auswahl des Kontos aufzurufen.
+              auswählen und und Sie auf die <guibutton>&app;-Konten
+              ändern…</guibutton>-Schaltfläche klicken, um den Dialog zur Auswahl des Kontos
+              aufzurufen.
             </para>
           </listitem>
         </varlistentry>
@@ -2011,10 +1967,9 @@ Translators:
     <sect2 id="trans-import-ofx">
       <title>Importieren von OFX/QFX Dateien</title>
 
-      <para>&mc.fi.imp.OFX;
-        öffnet einen Dateiauswahldialog. Navigieren Sie zu der Datei, die Sie importieren möchten,
-        wählen Sie eine Datei mit der entsprechenden Erweiterung (.ofx oder .qfx), und drücken Sie
-        dann die <guibutton>Importieren</guibutton>-Schaltfläche.
+      <para>&mc.fi.imp.OFX; öffnet einen Dateiauswahldialog. Navigieren Sie zu der Datei, die Sie importieren
+        möchten, wählen Sie eine Datei mit der entsprechenden Erweiterung (.ofx oder .qfx), und
+        drücken Sie dann die <guibutton>Importieren</guibutton>-Schaltfläche.
       </para>
 
       <para>&app; öffnet dann das Dialogfeld <guilabel>Konto auswählen</guilabel>, um ein Konto aus Ihrer
@@ -2033,13 +1988,13 @@ Translators:
     <sect2 id="trans-import-csv">
       <title>Importieren von CSV Dateien</title>
 
-      <para>Die Auswahl von
-        &mc.fi.imp.tran-csv;
-        öffnet den unten abgebildete CSV-Buchungsimport Assistenten.
+      <para>Die Auswahl von &mc.fi.imp.tran-csv; öffnet den unten abgebildete CSV-Buchungsimport Assistenten.
       </para>
 
       <figure pgwide="1">
-        <title>Der CSV-Buchungsimport-Assistent - Einführung</title><screenshot id="CSV_Transaction_Import_Assistant">
+        <title>Der CSV-Buchungsimport-Assistent - Einführung</title>
+
+        <screenshot id="CSV_Transaction_Import_Assistant">
           <mediaobject>
             <imageobject role="html">
               <imagedata  fileref="figures/CSV_Transaction_Import_Assistant.png"  srccredit="Christian Wehling" width="&img-w;" />
@@ -2135,7 +2090,9 @@ Translators:
             </para>
 
             <figure pgwide="1">
-              <title>Der CSV Import Vorschau Bereich</title><screenshot id="CSV_Import_Preview">
+              <title>Der CSV Import Vorschau Bereich</title>
+
+              <screenshot id="CSV_Import_Preview">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata  fileref="figures/CSV_Import_transactions_Preview.png"  srccredit="Christian Wehling" width="&img-w;" />
@@ -2670,9 +2627,7 @@ Translators:
     <sect2 id="trans-import-MT940-MT942-DTAUS">
       <title>Importieren von MT940 & MT942 SWIFT sowie DTAUS Dateien</title>
 
-      <para>In dem Menü
-        &mc-gsm.fi.imp;
-        stehen die folgenden Einträge zur Verfügung:
+      <para>In dem Menü &mc-gsm.fi.imp; stehen die folgenden Einträge zur Verfügung:
       </para>
 <!--FIXME replace with link to glossary if and when extended to help -->
       <variablelist>
@@ -2714,13 +2669,12 @@ Translators:
 
       <para>Aus dem &app; Menü öffnet sich ein Dateiauswahldialog. Navigieren Sie zu der MT940-, MT942- oder
         DTAUS-Datei, die Sie importieren möchten, und klicken Sie dann auf die Schaltfläche
-        <guibutton>Importieren</guibutton>. Bei dem ersten Import von Daten eines
-        bestimmten Kontos aus der Importdatei wird &app; einen Kontoauswahldialog anzeigen, in dem
-        Sie ein geeignetes Konto auswählen müssen, in das die Transaktionen in der Datei
-        importiert werden sollen. &app; ordnet die Kontobeschreibung in der Importdatei dem
-        ausgewählte Konto zu und verwendet sie für zukünftige Importe von demselben Konto. Die
-        importierten Buchungen werden dann in der <xref linkend="trans-import-matcher" /> zur
-        Überprüfung angezeigt.
+        <guibutton>Importieren</guibutton>. Bei dem ersten Import von Daten eines bestimmten Kontos
+        aus der Importdatei wird &app; einen Kontoauswahldialog anzeigen, in dem Sie ein geeignetes
+        Konto auswählen müssen, in das die Transaktionen in der Datei importiert werden sollen.
+        &app; ordnet die Kontobeschreibung in der Importdatei dem ausgewählte Konto zu und
+        verwendet sie für zukünftige Importe von demselben Konto. Die importierten Buchungen
+        werden dann in der <xref linkend="trans-import-matcher" /> zur Überprüfung angezeigt.
       </para>
     </sect2>
 
@@ -2728,7 +2682,9 @@ Translators:
       <title>Buchungen nach dem Import zuordnen</title>
 
       <figure id="fig-fil-imp-match" pgwide="1">
-        <title>Buchungszuordnung während eines Importvorgangs</title><screenshot id="ImportMatcherScreenShot">
+        <title>Buchungszuordnung während eines Importvorgangs</title>
+
+        <screenshot id="ImportMatcherScreenShot">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Import_Transaction_matcher_1.png"  srccredit="Christian Wehling" width="&img-w;" />
@@ -3465,7 +3421,9 @@ Translators:
       </para>
 
       <figure pgwide="1">
-        <title>Der Buchungsauswähler Dialog</title><screenshot id="ImportMatcherPicker">
+        <title>Der Buchungsauswähler Dialog</title>
+
+        <screenshot id="ImportMatcherPicker">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Import_MatchPicker.png"  srccredit="Christian Wehling" width="&img-w;" />
@@ -3628,13 +3586,13 @@ Translators:
         <guilabel>Buchungszuordnungsassistent</guilabel> zuzuweisen. Damit können Sie die
         <guilabel>Automatisch (Bayesisch)</guilabel>, die <guilabel>Nicht-Bayesische</guilabel> und
         die <guilabel>Online</guilabel> gewonnen Buchungsinformationen bearbeiten. Um den Editor zu
-        öffnen wählen Sie
-        &mc.to.imp-map;
-        aus der Menüleiste.
+        öffnen wählen Sie &mc.to.imp-map; aus der Menüleiste.
       </para>
 
       <figure pgwide="1">
-        <title>Der Import-Zuordnungen Editor</title><screenshot>
+        <title>Der Import-Zuordnungen Editor</title>
+
+        <screenshot>
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Import_Map_Editor.png"  srccredit="Christian Wehling" width="&img-w;" />
@@ -3836,8 +3794,7 @@ Translators:
         </listitem>
 
         <listitem>
-          <para>&mc.fi.exp.regi-csv;
-            .
+          <para>&mc.fi.exp.regi-csv; .
           </para>
         </listitem>
       </itemizedlist>
@@ -3847,7 +3804,9 @@ Translators:
     </para>
 
     <figure pgwide="1">
-      <title>Assistent für den Export von Buchungen</title><screenshot id="export-transactions-wizard">
+      <title>Assistent für den Export von Buchungen</title>
+
+      <screenshot id="export-transactions-wizard">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Choose_Export_Settings.png"  srccredit="Christian Wehling" width="&img-w;" />
@@ -4271,11 +4230,9 @@ Translators:
         <term>Saldenabfrage…</term>
 
         <listitem>
-          <para>Mit
-            &mc.ac.onli.get-bal;
-            wird für das ausgewählte Konto eine Onlineverbindung zu dem Geldinstitut aufgebaut und
-            der aktuelle Kontosaldo abgefragt. Nach kurzer Zeit wird Ihnen, im sich öffnendem
-            Dialogfenster, der Saldo angezeigt und Sie können direkt im Anschluss das
+          <para>Mit &mc.ac.onli.get-bal; wird für das ausgewählte Konto eine Onlineverbindung zu dem Geldinstitut
+            aufgebaut und der aktuelle Kontosaldo abgefragt. Nach kurzer Zeit wird Ihnen, im sich
+            öffnendem Dialogfenster, der Saldo angezeigt und Sie können direkt im Anschluss das
             <xref linkend="acct-reconcile" />.
           </para>
         </listitem>
@@ -4285,12 +4242,11 @@ Translators:
         <term>Abfrage Kontoumsätze…</term>
 
         <listitem>
-          <para>Der Menüpunkt
-            &mc.ac.onli.get-tr;
-            bietet Ihnen die Möglichkeit, die Umsätze des in der Kontenstruktur markierten
-            Onlinekontos, oder des geöffenten Kontobuchs, abzurufen und im Anschluss in &app; zu
-            importieren. Es wird der Dialog <guilabel>Online Kontoumsätze abfragen</guilabel>
-            angezeigt, in dem Sie den Zeitraum für die Umsatzabfrage näher angeben können.
+          <para>Der Menüpunkt &mc.ac.onli.get-tr; bietet Ihnen die Möglichkeit, die Umsätze des in der
+            Kontenstruktur markierten Onlinekontos, oder des geöffenten Kontobuchs, abzurufen und
+            im Anschluss in &app; zu importieren. Es wird der Dialog <guilabel>Online Kontoumsätze
+            abfragen</guilabel> angezeigt, in dem Sie den Zeitraum für die Umsatzabfrage näher
+            angeben können.
           </para>
 
           <variablelist>
@@ -4376,9 +4332,7 @@ Translators:
         <term>SEPA Einzelüberweisung…</term>
 
         <listitem>
-          <para>Wenn Sie im Menü den Eintrag
-            &mc.ac.onli.sepa-tr;
-            wählen, öffnet sich der Dialog
+          <para>Wenn Sie im Menü den Eintrag &mc.ac.onli.sepa-tr; wählen, öffnet sich der Dialog
             <variablelist>
               <title>Online-Auftrag Einzelüberweisung</title>
 
@@ -4538,10 +4492,8 @@ Translators:
         <term>Interne Umbuchung…</term>
 <!-- FIXME: Insert a description for this item. -->
         <listitem>
-          <para>Die Funktion
-            &mc.ac.onli.sepa-int;
-            kann der Übersetzer nicht ausprobieren, weil das Geldinstitut diesen Geschäftsvorfall
-            für seine Konten nicht unterstützen.
+          <para>Die Funktion &mc.ac.onli.sepa-int; kann der Übersetzer nicht ausprobieren, weil das Geldinstitut
+            diesen Geschäftsvorfall für seine Konten nicht unterstützen.
           </para>
         </listitem>
       </varlistentry>
@@ -4562,9 +4514,7 @@ Translators:
     </para>
 
     <para>Standardmäßig werden im Journal nur die Buchungen des letzten Monats angezeigt. Sie können mit
-      dem Menüpunkt
-      &mc.vw.f-by;
-      den Datumsbereich eingrenzen.
+      dem Menüpunkt &mc.vw.f-by; den Datumsbereich eingrenzen.
     </para>
   </sect1>
 </chapter>
diff --git a/de/manual/fdl-appendix.xml b/de/manual/fdl-appendix.xml
index e3c7f015..00f564ea 100644
--- a/de/manual/fdl-appendix.xml
+++ b/de/manual/fdl-appendix.xml
@@ -555,9 +555,8 @@
     </para>
 
     <para>If your document contains nontrivial examples of program code, we recommend releasing these examples
-      in parallel under your choice of free software license, such as the
-      <ulink url="&url-gpl;">GNU General Public License</ulink>,
-      to permit their use in free software.
+      in parallel under your choice of free software license, such as the <ulink url="&url-gpl;">GNU
+      General Public License</ulink>, to permit their use in free software.
     </para>
   </sect1>
 </appendix>
diff --git a/de/manual/index.docbook b/de/manual/index.docbook
index e43c48cb..0c4385cb 100644
--- a/de/manual/index.docbook
+++ b/de/manual/index.docbook
@@ -59,362 +59,511 @@
     </authorgroup>
 
     <revhistory>
-     <revision>
+      <revision>
         <revnumber>&appname; Help Manual 5.2</revnumber>
         <date>25 June 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
-     <revision>
+
+      <revision>
         <revnumber>&appname; Help Manual 5.1</revnumber>
         <date>30 April 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
-     <revision>
+
+      <revision>
         <revnumber>&appname; Help Manual 5.0</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.14</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.903</revnumber>
         <date>12 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.900</revnumber>
         <date>8 January 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.13</revnumber>
         <date>18 December 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.12</revnumber>
         <date>25 September 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.11</revnumber>
         <date>26 June 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.10</revnumber>
         <date>27 March 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.9</revnumber>
         <date>19 December 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.8</revnumber>
         <date>28 September 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.7</revnumber>
         <date>26 September 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.6</revnumber>
         <date>27 June 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.5</revnumber>
         <date>28 March 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
-        </revdescription>
-      </revision>
-      <revision> <revnumber>&appname; Help Manual 4.4</revnumber> <date>28 December
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe 4.3</revnumber> <date>27 December
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe 4.2</revnumber> <date>27 September
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe 4.0</revnumber> <date>28 June 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe 4.2</revnumber> <date>26 September
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe 4.1</revnumber> <date>26 July 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v3.11</revnumber> <date>28 June 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v3.10</revnumber> <date>11 April 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v3.9</revnumber> <date>29 March 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v3.8</revnumber> <date>29 December
-      2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v3.7</revnumber> <date>8 September
-      2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v3.6</revnumber> <date>30 June 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v3.1</revnumber> <date>28 April 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v3.0</revnumber> <date>1 April 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v2.6.20</revnumber> <date>1 April
-      2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v2.6.16</revnumber> <date>26 March
-      2017</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v2.6.11</revnumber> <date>11 January
-      2016</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v2.6.8</revnumber> <date>27 September
-      2015</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v2.6.5</revnumber> <date>16 December
-      2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v2.6.3</revnumber> <date>30 March
-      2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v2.6.2</revnumber> <date>2 March 2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v2.6.1</revnumber> <date>26 January
-      2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v2.6.0</revnumber> <date>29 December
-      2013</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v2.4.2</revnumber> <date>17 November
-      2012</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v2.3.16</revnumber> <date>01. January
-      2011</date>
-      <revdescription>
-        <para role="author">Andreas Fahle
-        </para>
-
-        <para role="translator">Christian Stimming
-        </para>
-
-        <para role="publisher">Deutsches &appname; Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Hilfe v1.8.0</revnumber> <date>02. Februar
-      2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; User Manual</revnumber> <date>June 2002</date>
-      <revdescription>
-        <para role="author">&appname; Developers and Documentors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Help Manual 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe 4.3</revnumber>
+        <date>27 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe 4.2</revnumber>
+        <date>27 September 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe 4.0</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe 4.2</revnumber>
+        <date>26 September 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe 4.1</revnumber>
+        <date>26 July 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v3.11</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v3.10</revnumber>
+        <date>11 April 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v3.9</revnumber>
+        <date>29 March 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v3.8</revnumber>
+        <date>29 December 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v3.7</revnumber>
+        <date>8 September 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v3.1</revnumber>
+        <date>28 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v3.0</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v2.6.20</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v2.6.16</revnumber>
+        <date>26 March 2017</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v2.6.11</revnumber>
+        <date>11 January 2016</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v2.6.8</revnumber>
+        <date>27 September 2015</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v2.6.5</revnumber>
+        <date>16 December 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v2.6.3</revnumber>
+        <date>30 March 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v2.6.2</revnumber>
+        <date>2 March 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v2.6.1</revnumber>
+        <date>26 January 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v2.6.0</revnumber>
+        <date>29 December 2013</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v2.4.2</revnumber>
+        <date>17 November 2012</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v2.3.16</revnumber>
+        <date>01. January 2011</date>
+        <revdescription>
+          <para role="author">Andreas Fahle
+          </para>
+
+          <para role="translator">Christian Stimming
+          </para>
+
+          <para role="publisher">Deutsches &appname; Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Hilfe v1.8.0</revnumber>
+        <date>02. Februar 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; User Manual</revnumber>
+        <date>June 2002</date>
+        <revdescription>
+          <para role="author">&appname; Developers and Documentors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
       </revision>
     </revhistory>
 
@@ -582,7 +731,7 @@
   <xi:include href="ch_Reports.xml" />
 
   <xi:include href="ch_Customize.xml" />
-  
+
   <xi:include href="ch_Finance-Quote.xml" />
 
   <xi:include href="tips-appendix.xml" />
diff --git a/de/manual/legal.xml b/de/manual/legal.xml
index 596693f6..8c1a0faa 100644
--- a/de/manual/legal.xml
+++ b/de/manual/legal.xml
@@ -5,8 +5,8 @@
     Version 1.1 oder jeder späteren, von der Free Software Foundation veröffentlichten Version
     ohne unveränderbare Abschnitte sowie ohne Texte auf dem vorderen und hinteren Buchdeckel
     kopiert, verteilt und/oder modifiziert werden. Eine Kopie der GFDL finden Sie unter diesem
-    <ulink type="help" url="help:fdl">Link</ulink> oder in der mit diesem Handbuch gelieferten
-    Datei COPYING-DOCs.
+    <ulink type="help" url="help:fdl">Link</ulink> oder in der mit diesem Handbuch gelieferten Datei
+    COPYING-DOCs.
   </para>
 
   <para>Das vorliegende Handbuch ist Teil einer Reihe von GNOME-Handbüchern, die unter der GFDL verteilt
diff --git a/de/manual/para-assist-intro.xml b/de/manual/para-assist-intro.xml
index ee67ff8e..dc0b27fc 100644
--- a/de/manual/para-assist-intro.xml
+++ b/de/manual/para-assist-intro.xml
@@ -7,10 +7,16 @@
     und die Bedienelemente zum Durchführen des jeweiligen Schritts werden im rechten Fensterbereich
     angezeigt.
   </para>
-<note><para>Die Schaltflächen befinden sich normalerweise im <quote>Aktionsbereich</quote> an der Unterkante des Dialogs. Bei einigen Fenstermanagern werden sie in die Titelleiste integriert.</para></note>
+
+  <note>
+    <para>Die Schaltflächen befinden sich normalerweise im <quote>Aktionsbereich</quote> an der Unterkante
+      des Dialogs. Bei einigen Fenstermanagern werden sie in die Titelleiste integriert.
+    </para>
+  </note>
+
   <important>
-    <para>Die nachfolgend beschriebenen Schaltflächen werden immer erst dann aktiviert, wenn die Navigation vom
-      aktuellen Schritt zum Zielschritt gültig ist. D.h. solange nicht alle notwendigen Angaben
+    <para>Die nachfolgend beschriebenen Schaltflächen werden immer erst dann aktiviert, wenn die Navigation
+      vom aktuellen Schritt zum Zielschritt gültig ist. D.h. solange nicht alle notwendigen Angaben
       gemacht sind, sind manche Schaltflächen deaktiviert.
     </para>
   </important>
@@ -19,13 +25,15 @@
     <term><guibutton><accel>A</accel>bbrechen</guibutton> oder &kc.esc;</term>
 
     <listitem>
-      <para>Beendet den Assistenten, ohne Änderungen an Ihren Daten oder, bei Exporten, dem Dateisystem vorzunehmen.
+      <para>Beendet den Assistenten, ohne Änderungen an Ihren Daten oder, bei Exporten, dem Dateisystem
+        vorzunehmen.
       </para>
-          <warning>
-            <para>Wenn Sie auf diese Schaltfläche klicken, gehen alle Änderungen, die Sie bis zu diesem Punkt
-              in den Assistenten eingetragen haben, verloren.
-            </para>
-          </warning>
+
+      <warning>
+        <para>Wenn Sie auf diese Schaltfläche klicken, gehen alle Änderungen, die Sie bis zu diesem Punkt in den
+          Assistenten eingetragen haben, verloren.
+        </para>
+      </warning>
     </listitem>
   </varlistentry>
 
@@ -44,7 +52,11 @@
 
     <listitem>
       <para>Geht zum nächsten Schritt.
-      <note><para>Sind Sie im letzten Schritt, dann wird stattdessen die Schaltfläche <guibutton>An<accel>w</accel>enden</guibutton> eingeblendet.</para></note>
+        <note>
+          <para>Sind Sie im letzten Schritt, dann wird stattdessen die Schaltfläche
+            <guibutton>An<accel>w</accel>enden</guibutton> eingeblendet.
+          </para>
+        </note>
       </para>
     </listitem>
   </varlistentry>
@@ -54,8 +66,9 @@
 
     <listitem>
       <para>Haben Sie alle notwendigen Daten in dem Assistenten eingegeben, wird im letzten Schritt die
-        Schaltfläche <guilabel>Anwenden</guilabel> an Stelle von <guilabel>Weiter</guilabel> eingeblendet. Erst wenn Sie diese Schaltfläche
-        betätigen werden Ihre Eingaben verarbeitet und die Daten modifiziert.
+        Schaltfläche <guilabel>Anwenden</guilabel> an Stelle von <guilabel>Weiter</guilabel>
+        eingeblendet. Erst wenn Sie diese Schaltfläche betätigen werden Ihre Eingaben verarbeitet
+        und die Daten modifiziert.
       </para>
     </listitem>
   </varlistentry>
diff --git a/it/guide/index.docbook b/it/guide/index.docbook
index 124d0598..479c77e7 100644
--- a/it/guide/index.docbook
+++ b/it/guide/index.docbook
@@ -134,79 +134,110 @@
         <revnumber>&appname; Tutorial and Concepts Guide 5.2</revnumber>
         <date>25 June 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 5.1</revnumber>
         <date>30 April 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 5.0</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.14</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.903</revnumber>
         <date>12 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.900</revnumber>
         <date>8 January 2023</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.13</revnumber>
         <date>18 December 2022</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.12</revnumber>
         <date>25 September 2022</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.11</revnumber>
         <date>26 June 2022</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.10</revnumber>
         <date>27 March 2022</date>
@@ -218,6 +249,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.9</revnumber>
         <date>19 December 2021</date>
@@ -229,6 +261,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.8</revnumber>
         <date>28 September 2021</date>
@@ -240,6 +273,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.7</revnumber>
         <date>26 September 2021</date>
@@ -251,6 +285,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
         <date>27 June 2021</date>
@@ -262,6 +297,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.5</revnumber>
         <date>28 March 2021</date>
@@ -273,297 +309,389 @@
           </para>
         </revdescription>
       </revision>
-      <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
-      <date>28 December 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
 
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v4.3</revnumber>
-      <date>27 December 2020</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v4.2</revnumber>
-      <date>27 September 2020</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v4.1</revnumber>
-      <date>26 July 2020</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v4.3</revnumber>
+        <date>27 December 2020</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v4.0</revnumber>
-      <date>28 June 2020</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v3.11</revnumber>
-      <date>28 June 2020</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v4.2</revnumber>
+        <date>27 September 2020</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v3.10</revnumber>
-      <date>11 April 2020</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v3.8</revnumber>
-      <date>29 December 2019</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v4.1</revnumber>
+        <date>26 July 2020</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v3.7</revnumber> <date>8
-      September 2019</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v3.6</revnumber>
-      <date>30 June 2019</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v4.0</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v3.1</revnumber>
-      <date>28 April 2018</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v3.0</revnumber> <date>1
-      April 2018</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v3.11</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v2.6.20</revnumber>
-      <date>1 April 2018</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v2.6.15</revnumber>
-      <date>18 December 2016</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v3.10</revnumber>
+        <date>11 April 2020</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v2.6.11</revnumber>
-      <date>11 January 2016</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v2.6.8</revnumber>
-      <date>27 September 2015</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v3.8</revnumber>
+        <date>29 December 2019</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v2.6.7</revnumber>
-      <date>28 June 2015</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v2.6.3</revnumber>
-      <date>30 March 2014</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v3.7</revnumber>
+        <date>8 September 2019</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v2.6.2</revnumber>
-      <date>2 March 2014</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Tutorial and Concepts Guide v2.6.1</revnumber>
-      <date>26 January 2014</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Guida ai concetti e manuale di &appname; V2.6.0</revnumber>
-      <date>29 Dicembre 2013</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Guida ai concetti e manuale di &appname; v2.4.2</revnumber>
-      <date>17 Novembre 2012</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v3.1</revnumber>
+        <date>28 April 2018</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Guida ai concetti e manuale di &appname; v2.4.1</revnumber>
-      <date>1 Luglio 2011</date>
-      <revdescription>
-        <para role="author">Autori multipli
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Guida ai concetti e manuale di &appname; v2.3.16</revnumber>
-      <date>7 Novembre 2010</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v3.0</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="author">Bengt Thuree
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="author">Dave Herman
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v2.6.20</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Guida ai concetti e manuale di &appname; v2.0.0</revnumber>
-      <date>Luglio 2006</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="author">Bengt Thuree
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v2.6.15</revnumber>
+        <date>18 December 2016</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="author">Dave Herman
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Guida ai concetti e manuale di &appname; v1.8.3</revnumber>
-      <date>Agosto 2003</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v2.6.11</revnumber>
+        <date>11 January 2016</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Guida ai concetti e manuale di &appname; v1.8.2</revnumber>
-      <date>Agosto 2003</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Guida ai concetti e manuale di &appname; v1.8.1</revnumber>
-      <date>Maggio 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v2.6.8</revnumber>
+        <date>27 September 2015</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Guida ai concetti e manuale di &appname; v1.8.0</revnumber>
-      <date>Gennaio 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Guida dell’utente di &appname; v1.6.5</revnumber>
-      <date>Giugno 2002</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v2.6.7</revnumber>
+        <date>28 June 2015</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Guida dell’utente di &appname; v1.6.0</revnumber>
-      <date>Ottobre 2001</date>
-      <revdescription>
-        <para role="author">Carol Champagne
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v2.6.3</revnumber>
+        <date>30 March 2014</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v2.6.2</revnumber>
+        <date>2 March 2014</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Tutorial and Concepts Guide v2.6.1</revnumber>
+        <date>26 January 2014</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Guida ai concetti e manuale di &appname; V2.6.0</revnumber>
+        <date>29 Dicembre 2013</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Guida ai concetti e manuale di &appname; v2.4.2</revnumber>
+        <date>17 Novembre 2012</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Guida ai concetti e manuale di &appname; v2.4.1</revnumber>
+        <date>1 Luglio 2011</date>
+        <revdescription>
+          <para role="author">Autori multipli
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Guida ai concetti e manuale di &appname; v2.3.16</revnumber>
+        <date>7 Novembre 2010</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="author">Bengt Thuree
+          </para>
+
+          <para role="author">Dave Herman
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Guida ai concetti e manuale di &appname; v2.0.0</revnumber>
+        <date>Luglio 2006</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="author">Bengt Thuree
+          </para>
+
+          <para role="author">Dave Herman
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Guida ai concetti e manuale di &appname; v1.8.3</revnumber>
+        <date>Agosto 2003</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Guida ai concetti e manuale di &appname; v1.8.2</revnumber>
+        <date>Agosto 2003</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Guida ai concetti e manuale di &appname; v1.8.1</revnumber>
+        <date>Maggio 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Guida ai concetti e manuale di &appname; v1.8.0</revnumber>
+        <date>Gennaio 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Guida dell’utente di &appname; v1.6.5</revnumber>
+        <date>Giugno 2002</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Guida dell’utente di &appname; v1.6.0</revnumber>
+        <date>Ottobre 2001</date>
+        <revdescription>
+          <para role="author">Carol Champagne
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
       </revision>
     </revhistory>
 
@@ -830,10 +958,10 @@
             <listitem>
               <para><emphasis>Multi-platform Compatibility</emphasis>: &app; is supported on a variety of platforms and
                 operating systems. The list of fully supported operating systems (and platforms) for
-                &app; 2.6.14 is: &lin; (x86, x86_64), FreeBSD (x86, x86_64), OpenBSD (x86,
-                x86_64), and &mac; (Intel). Previous versions of &app; have been known to work
-                with, SGI IRIX (MIPS), IBM AIX 4.1.5 (RS/6000), Unixware 7 (Intel), SCO OpenServer
-                5.0.4 (Intel), and Solaris (SPARC), but their current status is unknown.
+                &app; 2.6.14 is: &lin; (x86, x86_64), FreeBSD (x86, x86_64), OpenBSD (x86, x86_64),
+                and &mac; (Intel). Previous versions of &app; have been known to work with, SGI IRIX
+                (MIPS), IBM AIX 4.1.5 (RS/6000), Unixware 7 (Intel), SCO OpenServer 5.0.4 (Intel),
+                and Solaris (SPARC), but their current status is unknown.
               </para>
             </listitem>
           </itemizedlist>
@@ -1170,10 +1298,9 @@
           <title>&app; Wiki</title>
 
           <para>An immense amount of less-formal documentation, both of &app; itself and its maintenance and
-            development may be found in the <ulink url="&url-wiki;">&appname;
-            Wiki</ulink>; the <ulink url="&url-wiki-faq;">Frequently Asked
-            Questions</ulink> page should be a first stop whenever you encounter difficulty using
-            &app;.
+            development may be found in the <ulink url="&url-wiki;">&appname; Wiki</ulink>; the
+            <ulink url="&url-wiki-faq;">Frequently Asked Questions</ulink> page should be a first
+            stop whenever you encounter difficulty using &app;.
           </para>
         </sect2>
 
@@ -1186,21 +1313,20 @@
 
           <para>The primary source of user support is the <ulink url="mailto:gnucash-user at gnucash.org">user mailing
             list</ulink>. If you prefer a web forum-like presentation, you can use it via
-            <ulink url="&url-mail-nabble;">Nabble</ulink>.
-            One must
-            <ulink url="&url-mail-li;gnucash-user">subscribe</ulink>
-            before posting, even if using Nabble.
+            <ulink url="&url-mail-nabble;">Nabble</ulink>. One must
+            <ulink url="&url-mail-li;gnucash-user">subscribe</ulink> before posting, even if using
+            Nabble.
           </para>
 
           <bridgehead>
             IRC
           </bridgehead>
 
-          <para>Several of the developers monitor the <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. They're usually doing
-            something else, too, and of course aren't always at their computers. Log in, ask your
-            question, and stay logged in; it may be several hours before your question is noticed
-            and responded to. To see if you missed anything <ulink url="&url-logs-irc;">check the
-            IRC logs</ulink>.
+          <para>Several of the developers monitor the <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>.
+            They're usually doing something else, too, and of course aren't always at their
+            computers. Log in, ask your question, and stay logged in; it may be several hours before
+            your question is noticed and responded to. To see if you missed anything
+            <ulink url="&url-logs-irc;">check the IRC logs</ulink>.
           </para>
 
           <para>The <ulink url="&url-www;">&appname; web site </ulink> has more details on these channels. You will
@@ -1349,7 +1475,9 @@
           </para>
 
           <figure pgwide="1">
-            <title>La relazione fondamentale della contabilità</title><screenshot id="basics-AccountRelationships">
+            <title>La relazione fondamentale della contabilità</title>
+
+            <screenshot id="basics-AccountRelationships">
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/basics_AccountRelationships.png" srccredit="Geert Janssens"/>
@@ -1979,7 +2107,9 @@
 
                   <figure>
                     <title>Schermata di salvataggio quando è stato selezionato il formato <acronym>XML</acronym> o
-                      <acronym>sqlite3</acronym></title><screenshot id="basics-SaveXML">
+                      <acronym>sqlite3</acronym></title>
+
+                    <screenshot id="basics-SaveXML">
                       <mediaobject>
                         <imageobject role="html">
                           <imagedata fileref="figures/basics_SaveXML.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -2037,7 +2167,9 @@
 
                   <figure>
                     <title>Schermata di salvataggio quando è selezionao <acronym>mysql</acronym> o
-                      <acronym>postgres</acronym>.</title><screenshot id="basics-SaveSQL">
+                      <acronym>postgres</acronym>.</title>
+
+                    <screenshot id="basics-SaveSQL">
                       <mediaobject>
                         <imageobject role="html">
                           <imagedata fileref="figures/basics_SaveSQL.png" srccredit="Marchi Cristian" width="&img-w;"/>
@@ -3826,9 +3958,12 @@ Translators:
             nome con quello di un conto esistente. Digitando il carattere separatore in qualsiasi
             momento, verrà completato il livello corrente del nome del conto, lasciando il cursore
             posizionato all’inizio del successivo livello di nomi di conti. Digitando, per
-            esempio, <keycombo action='seq'><keycap>A</keycap><keycap>:</keycap><keycap>C</keycap></keycombo> con il gruppo standard di conti, verrà selezionato il
-            conto <emphasis>Attività:Conto corrente</emphasis>. Si possono anche selezionare i
-            tasti <keycap>Menu</keycap> o
+            esempio,
+            <keycombo action='seq'>
+              <keycap>A</keycap><keycap>:</keycap><keycap>C</keycap>
+            </keycombo>
+            con il gruppo standard di conti, verrà selezionato il conto <emphasis>Attività:Conto
+            corrente</emphasis>. Si possono anche selezionare i tasti <keycap>Menu</keycap> o
             <keycombo>
               <keycap>Ctrl</keycap><keycap>Giù</keycap>
             </keycombo>
@@ -4163,7 +4298,9 @@ Translators:
           </para>
 
           <figure id="txns-register-multiaccount">
-            <title>Inserire una transazione suddivisa</title><mediaobject>
+            <title>Inserire una transazione suddivisa</title>
+
+            <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/txns_register_multiaccount.png" srccredit="Bengt Thuree"/>
               </imageobject>
@@ -9350,13 +9487,13 @@ Entrate
               </itemizedlist>
             </para>
 
-            <para>&mac;: è necessario avere installato XCode. XCode è un
-              elemento opzionale del DVD di installazione della distribuzione di &mac;. Eseguire
-              l’applicazione <emphasis role="strong">Aggiorna Finance Quote</emphasis> nel dmg
-              di &app;. È possibile eseguirla dal dmg o copiarla nella stessa cartella in cui è
-              stato copiato &app;. Verrà aperta una finestra del terminale ed eseguito uno script
-              che porrà diverse domande. Accettare le risposte predefinite a meno che non si
-              conoscano gli effetti di ogni risposta.
+            <para>&mac;: è necessario avere installato XCode. XCode è un elemento opzionale del DVD di installazione
+              della distribuzione di &mac;. Eseguire l’applicazione
+              <emphasis role="strong">Aggiorna Finance Quote</emphasis> nel dmg di &app;. È
+              possibile eseguirla dal dmg o copiarla nella stessa cartella in cui è stato copiato
+              &app;. Verrà aperta una finestra del terminale ed eseguito uno script che porrà
+              diverse domande. Accettare le risposte predefinite a meno che non si conoscano gli
+              effetti di ogni risposta.
             </para>
 
             <para>>&lin;:
@@ -9399,9 +9536,9 @@ Entrate
             <note>
               <para>Se non ci si sente sicuri nell’esecuzione di questi passaggi, è possibile contattare la lista
                 di discussione degli utenti di &app; (<email>gnucash-user at gnucash.org</email>) per
-                chiedere aiuto o andare nell &app; su <ulink url='&url-irc;'>#gnucash canale di &srv-irc;</ulink>. È anche
-                possibile saltare questi passaggi e aggiornare manualmente i prezzi delle proprie
-                azioni.
+                chiedere aiuto o andare nell &app; su <ulink url='&url-irc;'>#gnucash canale di
+                &srv-irc;</ulink>. È anche possibile saltare questi passaggi e aggiornare
+                manualmente i prezzi delle proprie azioni.
               </para>
             </note>
           </sect3>
@@ -10207,7 +10344,9 @@ Entrate
             </para>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots in Account window</title><screenshot id="tool-lotsInAcct">
+              <title>Selling Shares - Capital Gains - Lots in Account window</title>
+
+              <screenshot id="tool-lotsInAcct">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png" srccredit="Chris Good" width="&img-w;"/>
@@ -10230,8 +10369,8 @@ Entrate
             </figure>
 
             <para>Refer to the Help Manual, Chapter 8 Tools & Assistants,
-              <ulink url="&url-docs-it;manual/tool-lots.html">Lots in
-              Account</ulink> for details of the Lots in Account screen elements.
+              <ulink url="&url-docs-it;manual/tool-lots.html">Lots in Account</ulink> for details of
+              the Lots in Account screen elements.
             </para>
           </sect3>
 
@@ -10578,7 +10717,9 @@ Entrate
                 </para>
 
                 <figure pgwide="1">
-                  <title>Selling Shares - Capital Gains - Security register before scrubbing a single lot</title><screenshot id="invest-lots0reg">
+                  <title>Selling Shares - Capital Gains - Security register before scrubbing a single lot</title>
+
+                  <screenshot id="invest-lots0reg">
                     <mediaobject>
                       <imageobject role="html">
                         <imagedata fileref="figures/investLots0_RegB4Scrub.png" srccredit="Chris Good" width="&img-w;"/>
@@ -10618,7 +10759,9 @@ Entrate
                 </para>
 
                 <figure pgwide="1">
-                  <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot</title><screenshot id="invest-lots1B4CreateLot">
+                  <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot</title>
+
+                  <screenshot id="invest-lots1B4CreateLot">
                     <mediaobject>
                       <imageobject role="html">
                         <imagedata fileref="figures/investLots1_BeforeCreateLot.png" srccredit="Chris Good" width="&img-w;"/>
@@ -10688,7 +10831,9 @@ Entrate
                 </para>
 
                 <figure pgwide="1">
-                  <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot, after manual linking</title><screenshot id="invest-lots2B4Scrub1Lot">
+                  <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot, after manual linking</title>
+
+                  <screenshot id="invest-lots2B4Scrub1Lot">
                     <mediaobject>
                       <imageobject role="html">
                         <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png" srccredit="Chris Good" width="&img-w;"/>
@@ -10812,7 +10957,9 @@ Entrate
             </para>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Register before Scrub Account</title><screenshot id="invest2-lots0reg">
+              <title>Selling Shares - Capital Gains - Register before Scrub Account</title>
+
+              <screenshot id="invest2-lots0reg">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots0RegB4Scrub.png" srccredit="Chris Good" width="&img-w;"/>
@@ -10845,7 +10992,9 @@ Entrate
                 </para>
 
                 <figure pgwide="1">
-                  <title>Selling Shares - Capital Gains - Lots before Scrub Account</title><screenshot id="invest2-lots1B4ScrubAcct">
+                  <title>Selling Shares - Capital Gains - Lots before Scrub Account</title>
+
+                  <screenshot id="invest2-lots1B4ScrubAcct">
                     <mediaobject>
                       <imageobject role="html">
                         <imagedata fileref="figures/invest2Lots1B4Scrub.png" srccredit="Chris Good" width="&img-w;"/>
@@ -10874,7 +11023,9 @@ Entrate
                 </para>
 
                 <figure pgwide="1">
-                  <title>Selling Shares - Capital Gains - Lots after Scrub Account</title><screenshot id="invest2-lots2AftScrubAcct">
+                  <title>Selling Shares - Capital Gains - Lots after Scrub Account</title>
+
+                  <screenshot id="invest2-lots2AftScrubAcct">
                     <mediaobject>
                       <imageobject role="html">
                         <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png" srccredit="Chris Good" width="&img-w;"/>
@@ -10911,7 +11062,9 @@ Entrate
                 </para>
 
                 <figure pgwide="1">
-                  <title>Selling Shares - Capital Gains - Register after Scrub Account</title><screenshot id="invest2-lots3AftScrubAcct">
+                  <title>Selling Shares - Capital Gains - Register after Scrub Account</title>
+
+                  <screenshot id="invest2-lots3AftScrubAcct">
                     <mediaobject>
                       <imageobject role="html">
                         <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png" srccredit="Chris Good" width="&img-w;"/>
@@ -10959,7 +11112,9 @@ Entrate
             </para>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Register after Scrub Account</title><screenshot id="investLotsSplitReg">
+              <title>Selling Shares - Capital Gains - Register after Scrub Account</title>
+
+              <screenshot id="investLotsSplitReg">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLotsSplitReg.png" srccredit="Chris Good" width="&img-w;"/>
@@ -10982,7 +11137,9 @@ Entrate
             </figure>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lot 0 after Scrub Account</title><screenshot id="investLotsSplitLot0">
+              <title>Selling Shares - Capital Gains - Lot 0 after Scrub Account</title>
+
+              <screenshot id="investLotsSplitLot0">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLotsSplitLot0.png" srccredit="Chris Good" width="&img-w;"/>
@@ -11005,7 +11162,9 @@ Entrate
             </figure>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lot 1 after Scrub Account</title><screenshot id="investLotsSplitLot1">
+              <title>Selling Shares - Capital Gains - Lot 1 after Scrub Account</title>
+
+              <screenshot id="investLotsSplitLot1">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLotsSplitLot1.png" srccredit="Chris Good" width="&img-w;"/>
@@ -11066,7 +11225,9 @@ Entrate
                 </para>
 
                 <figure pgwide="1">
-                  <title>Selling Shares - Capital Gains - Register after scrubbing a single lot</title><screenshot id="invest-lots4AftScrub1LotReg">
+                  <title>Selling Shares - Capital Gains - Register after scrubbing a single lot</title>
+
+                  <screenshot id="invest-lots4AftScrub1LotReg">
                     <mediaobject>
                       <imageobject role="html">
                         <imagedata fileref="figures/investLots4_AfterScrub1LotReg.png" srccredit="Chris Good" width="&img-w;"/>
@@ -13233,8 +13394,8 @@ Entrate
             .
           </para>
 
-          <para>Per una guida completa sui conti per il <guilabel>trading</guilabel> si
-            consiglia di consultare la guida &ulink-sel-tut; di Peter Selinger (in inglese).
+          <para>Per una guida completa sui conti per il <guilabel>trading</guilabel> si consiglia di consultare la
+            guida &ulink-sel-tut; di Peter Selinger (in inglese).
           </para>
         </note>
       </sect1>
@@ -14420,7 +14581,9 @@ Basic A/R and A/P Account Hierarchy:
           </para>
 
           <figure>
-            <title>Sales Tax Tables Editor</title><screenshot id="bus-taxmain">
+            <title>Sales Tax Tables Editor</title>
+
+            <screenshot id="bus-taxmain">
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/bus_tax_main.png"
@@ -14440,7 +14603,9 @@ Basic A/R and A/P Account Hierarchy:
           </figure>
 
           <figure>
-            <title>New Sales Tax Table Entry</title><screenshot id="bus-taxnew">
+            <title>New Sales Tax Table Entry</title>
+
+            <screenshot id="bus-taxnew">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/bus_tax_new.png"
@@ -14786,7 +14951,9 @@ Basic A/R and A/P Account Hierarchy:
           </para>
 
           <figure>
-            <title>Entering Company Information</title><screenshot id="bus-co-reg">
+            <title>Entering Company Information</title>
+
+            <screenshot id="bus-co-reg">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/bus_co_reg.png"
@@ -14884,7 +15051,9 @@ Basic A/R and A/P Account Hierarchy:
           </para>
 
           <figure>
-            <title>Billing Terms Editor</title><screenshot id="bus-termsmain">
+            <title>Billing Terms Editor</title>
+
+            <screenshot id="bus-termsmain">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/bus_terms_main.png"
@@ -14899,7 +15068,9 @@ Basic A/R and A/P Account Hierarchy:
           </figure>
 
           <figure>
-            <title>New Billing Term</title><screenshot id="bus-termsnew">
+            <title>New Billing Term</title>
+
+            <screenshot id="bus-termsnew">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/bus_terms_new.png"
@@ -18073,26 +18244,27 @@ Translators:
         programmazione piuttosto che in un altro.
       </para>
 
-      <para>A partire dalla versione 2.4 di &app; è possibile utilizzare degli script di
-        &app-py; per manipolare i propri dati finanziari.
+      <para>A partire dalla versione 2.4 di &app; è possibile utilizzare degli script di &app-py; per
+        manipolare i propri dati finanziari.
       </para>
 
       <important>
-        <para>Le estensioni di &app-py; sono una caratteristica opzionale del codice
-          sorgente. Per poter utilizzare gli script di &app-py;, &app; deve essere stato
-          compilato con questa <code language="sh">cmake-DWITH_PYTHON=ON …</code> opzione abilitata. Al momento questa opzione non è
-          abilitata di default, quindi per poter utilizzare questa funzionalità, è necessario
-          compilare &app; da sorgente.
+        <para>Le estensioni di &app-py; sono una caratteristica opzionale del codice sorgente. Per poter
+          utilizzare gli script di &app-py;, &app; deve essere stato compilato con questa
+          <code language="sh">cmake-DWITH_PYTHON=ON …</code> opzione abilitata. Al momento questa
+          opzione non è abilitata di default, quindi per poter utilizzare questa funzionalità, è
+          necessario compilare &app; da sorgente.
         </para>
       </important>
 
-      <para>Le estensioni &app-py; sono fornite con un paio di script già pronti per
-        l’utilizzo. Questo capitolo illustra come <emphasis>utilizzarli</emphasis>.
+      <para>Le estensioni &app-py; sono fornite con un paio di script già pronti per l’utilizzo. Questo
+        capitolo illustra come <emphasis>utilizzarli</emphasis>.
       </para>
 
       <tip>
-        <para>Questo capitolo non spiega come scrivere il proprio script di &app-py;. Per
-          questo fare riferimento alla <ulink url="&url-doc-api-main;python_bindings_page.html">documentazione per gli sviluppatori</ulink>.
+        <para>Questo capitolo non spiega come scrivere il proprio script di &app-py;. Per questo fare riferimento
+          alla <ulink url="&url-doc-api-main;python_bindings_page.html">documentazione per gli
+          sviluppatori</ulink>.
         </para>
       </tip>
     </chapter>
@@ -18132,8 +18304,8 @@ Author:
         </para>
 
         <para>Perchè l’importatore funzioni correttamente, i dati devono essere in formato a lunghezza
-          fissa di campo, o separati da virgole. Uno script di &app-py; è
-          fornito di seguito come esempio.
+          fissa di campo, o separati da virgole. Uno script di &app-py; è fornito di seguito come
+          esempio.
         </para>
 
         <para><programlisting language="python" linenumbering="unnumbered">
@@ -18269,12 +18441,11 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
         </para>
 
         <note>
-          <para>Se non si ha dimestichezza con &app-py; (esistono altri linguaggi), è
-            possibile inviare una richiesta alla
-            <ulink url="&url-mail-li;gnucash-user"><citetitle>lista dell’utente di
-            &appname;</citetitle>, con un esempio del proprio file <acronym>CSV</acronym> scaricato,
-            e probabilmente qualcuno si preoccuperà di scrivere uno script di
-            &app-py; per la sua traduzione.</ulink>
+          <para>Se non si ha dimestichezza con &app-py; (esistono altri linguaggi), è possibile inviare una
+            richiesta alla <ulink url="&url-mail-li;gnucash-user"><citetitle>lista dell’utente
+            di &appname;</citetitle>, con un esempio del proprio file <acronym>CSV</acronym>
+            scaricato, e probabilmente qualcuno si preoccuperà di scrivere uno script di &app-py;
+            per la sua traduzione.</ulink>
           </para>
         </note>
 
@@ -19082,9 +19253,8 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
           </listitem>
 
           <listitem>
-            <para>installare un processore <acronym>XSLT</acronym> come
-              <ulink url="%url-saxon;">%app-saxon;</ulink>>) o
-              <ulink url="&url-xalan;">%app-xalan;</ulink>. Comunque qualsiasi processore simile
+            <para>installare un processore <acronym>XSLT</acronym> come <ulink url="%url-saxon;">%app-saxon;</ulink>>)
+              o <ulink url="&url-xalan;">%app-xalan;</ulink>. Comunque qualsiasi processore simile
               funzionerà…;
             </para>
           </listitem>
@@ -19115,7 +19285,6 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
         </para>
       </sect1>
     </appendix>
-
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
@@ -20711,8 +20880,8 @@ Blocking_Chars
 
       <para>Se il proprio documento contiene esempi di programmazione non immediati, se ne raccomanda il
         rilascio con una licenza di software libero a propria scelta, quale la
-        <ulink url="&url-gpl;">GNU General Public License</ulink>, per permetterne
-        l’utilizzo nel software libero.
+        <ulink url="&url-gpl;">GNU General Public License</ulink>, per permetterne l’utilizzo
+        nel software libero.
       </para>
     </sect1>
   </appendix>
diff --git a/it/manual/index.docbook b/it/manual/index.docbook
index a66295ab..ec4b875e 100644
--- a/it/manual/index.docbook
+++ b/it/manual/index.docbook
@@ -213,386 +213,531 @@
         <revnumber>&appname; Help Manual 5.2</revnumber>
         <date>25 June 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 5.1</revnumber>
         <date>30 April 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 5.0</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.14</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.903</revnumber>
         <date>12 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.900</revnumber>
         <date>8 January 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.13</revnumber>
         <date>18 December 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.12</revnumber>
         <date>25 September 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.11</revnumber>
         <date>26 June 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.10</revnumber>
         <date>27 March 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.9</revnumber>
         <date>19 December 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.8</revnumber>
         <date>28 September 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.7</revnumber>
         <date>26 September 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.6</revnumber>
         <date>27 June 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Help Manual 4.5</revnumber>
         <date>28 March 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
-      <revision> <revnumber>&appname; Help Manual 4.4</revnumber> <date>28 December
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
 
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v4.3</revnumber> <date>27 December
-      2020</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+      <revision>
+        <revnumber>&appname; Help Manual 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v4.2</revnumber> <date>27 September
-      2020</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v4.1</revnumber> <date>26 July
-      2020</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v4.3</revnumber>
+        <date>27 December 2020</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v4.0</revnumber> <date>28 June
-      2020</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v3.11</revnumber> <date>28 June
-      2020</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v4.2</revnumber>
+        <date>27 September 2020</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v3.10</revnumber> <date>11 April
-      2020</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v3.8</revnumber> <date>29 December
-      2019</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v4.1</revnumber>
+        <date>26 July 2020</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v3.7</revnumber> <date>8 September
-      2019</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v3.6</revnumber> <date>30 June
-      2019</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v4.0</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v3.1</revnumber> <date>28 April
-      2018</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v3.0</revnumber> <date>1 April
-      2018</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v3.11</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.6.11</revnumber> <date>11 January
-      2016</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.6.8</revnumber> <date>27 September
-      2015</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v3.10</revnumber>
+        <date>11 April 2020</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.6.7</revnumber> <date>28 June
-      2015</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.6.3</revnumber> <date>30 March
-      2014</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v3.8</revnumber>
+        <date>29 December 2019</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.6.2</revnumber> <date>2 March
-      2014</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.6.1</revnumber> <date>26 January
-      2014</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v3.7</revnumber>
+        <date>8 September 2019</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.6.0</revnumber> <date>29 December
-      2013</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.4.2</revnumber> <date>17 November
-      2012</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.4.1</revnumber> <date>1 luglio
-      2011</date>
-      <revdescription>
-        <para role="author">Vari autori
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.3.16</revnumber> <date>7 Novembre
-      2010</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v3.1</revnumber>
+        <date>28 April 2018</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="author">Dave Herman <email>dvherman at bigfoot.com</email>
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.0.2</revnumber> <date>Marzo
-      2007</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v3.0</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v2.0.0</revnumber> <date>Luglio
-      2006</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v1.8.3</revnumber> <date>Agosto
-      2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v2.6.11</revnumber>
+        <date>11 January 2016</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v1.8.2</revnumber> <date>Agosto
-      2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v1.8.1</revnumber> <date>Maggio
-      2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v2.6.8</revnumber>
+        <date>27 September 2015</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>GnuCash Help Manual v1.8.0</revnumber> <date>Gennaio
-      2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Manuale dell’utente di &appname;</revnumber>
-      <date>Giugno 2002</date>
-      <revdescription>
-        <para role="author">GnuCash Developers and Documentors <email>gnucash-devel at gnucash.org</email>
-        </para>
+      <revision>
+        <revnumber>GnuCash Help Manual v2.6.7</revnumber>
+        <date>28 June 2015</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
 
-        <para role="publisher">Gruppo della documentazione di &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v2.6.3</revnumber>
+        <date>30 March 2014</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v2.6.2</revnumber>
+        <date>2 March 2014</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v2.6.1</revnumber>
+        <date>26 January 2014</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v2.6.0</revnumber>
+        <date>29 December 2013</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v2.4.2</revnumber>
+        <date>17 November 2012</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v2.4.1</revnumber>
+        <date>1 luglio 2011</date>
+        <revdescription>
+          <para role="author">Vari autori
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v2.3.16</revnumber>
+        <date>7 Novembre 2010</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="author">Dave Herman <email>dvherman at bigfoot.com</email>
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v2.0.2</revnumber>
+        <date>Marzo 2007</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v2.0.0</revnumber>
+        <date>Luglio 2006</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v1.8.3</revnumber>
+        <date>Agosto 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v1.8.2</revnumber>
+        <date>Agosto 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v1.8.1</revnumber>
+        <date>Maggio 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>GnuCash Help Manual v1.8.0</revnumber>
+        <date>Gennaio 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>Manuale dell’utente di &appname;</revnumber>
+        <date>Giugno 2002</date>
+        <revdescription>
+          <para role="author">GnuCash Developers and Documentors <email>gnucash-devel at gnucash.org</email>
+          </para>
+
+          <para role="publisher">Gruppo della documentazione di &appname;
+          </para>
+        </revdescription>
       </revision>
     </revhistory>
 
@@ -630,8 +775,7 @@
   <chapter id="intro-to-gnucash">
     <title>Introduzione a &app;</title>
 
-    <subtitle>Cos’è &app;?
-    </subtitle>
+    <subtitle>Cos’è &app;?</subtitle>
 
     <para>&app; è un’applicazione per la gestione delle finanze personali e di piccole attività. È
       progettato per essere facile da usare, ma comunque potente e flessibile. &app; permette di
@@ -793,12 +937,13 @@
         </itemizedlist>
       </para>
 
-      <para>Or you can chat live with the developers on IRC. Join them on <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>.
+      <para>Or you can chat live with the developers on IRC. Join them on <ulink url='&url-irc;'>#gnucash
+        channel at &srv-irc;</ulink>.
       </para>
 
-      <para>The <ulink url="&url-www;">&appname; web site</ulink> has
-        more details on these channels. You will also find pointers there to additional useful
-        resources such as the &app; wiki and bug tracking system.
+      <para>The <ulink url="&url-www;">&appname; web site</ulink> has more details on these channels. You will
+        also find pointers there to additional useful resources such as the &app; wiki and bug
+        tracking system.
       </para>
     </sect1>
   </chapter>
@@ -861,9 +1006,8 @@
           </listitem>
 
           <listitem>
-            <para><guilabel>Open the new user tutorial:</guilabel> Opens the &app;
-              Tutorial and Concepts Guide. Select this option if you are completely new to
-              &app; and accounting concepts.
+            <para><guilabel>Open the new user tutorial:</guilabel> Opens the &app; Tutorial and Concepts Guide. Select
+              this option if you are completely new to &app; and accounting concepts.
             </para>
           </listitem>
         </itemizedlist>
@@ -1609,7 +1753,9 @@
         </para>
 
         <figure id="Main_WindowCallouts">
-          <title>La finestra principale di &app;</title><mediaobject>
+          <title>La finestra principale di &app;</title>
+
+          <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Main-window-callouts.png" srccredit="Cristian Marchi" width="&img-w;"/>
             </imageobject>
@@ -1736,7 +1882,9 @@
       <title>La scheda dei conti</title>
 
       <figure>
-        <title>Una visualizzazione della <emphasis>struttura ad albero dei conti</emphasis>.</title><screenshot id="AccTree_Screen">
+        <title>Una visualizzazione della <emphasis>struttura ad albero dei conti</emphasis>.</title>
+
+        <screenshot id="AccTree_Screen">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/AccountTree_Screen.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -2119,8 +2267,7 @@
                   </entry>
 
                   <entry namest="c3">
-                    <para>Exports your account hierarchy to a new &app;file. Does not export
-                      data.
+                    <para>Exports your account hierarchy to a new &app;file. Does not export data.
                     </para>
                   </entry>
                 </row>
@@ -4457,7 +4604,9 @@
         </para>
 
         <figure>
-          <title>La visualizzazione del <emphasis>registro del conto</emphasis>.</title><screenshot id="AccountReg_Screen">
+          <title>La visualizzazione del <emphasis>registro del conto</emphasis>.</title>
+
+          <screenshot id="AccountReg_Screen">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/AccountReg_Screen.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -4842,8 +4991,7 @@
                   </entry>
 
                   <entry namest="c3">
-                    <para>Exports your account hierarchy to a new &app;file. Does not export
-                      data.
+                    <para>Exports your account hierarchy to a new &app;file. Does not export data.
                     </para>
                   </entry>
                 </row>
@@ -6343,7 +6491,9 @@
         </note>
 
         <figure>
-          <title>La <emphasis>finestra del resoconto</emphasis></title><screenshot id="Report_Screen">
+          <title>La <emphasis>finestra del resoconto</emphasis></title>
+
+          <screenshot id="Report_Screen">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Report_Screen.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -6758,8 +6908,7 @@
                   </entry>
 
                   <entry namest="c3">
-                    <para>Exports your account hierarchy to a new &app;file. Does not export
-                      data.
+                    <para>Exports your account hierarchy to a new &app;file. Does not export data.
                     </para>
                   </entry>
                 </row>
@@ -9971,13 +10120,13 @@
 
               <itemizedlist>
                 <listitem>
-                  <para><guilabel>lin:</guilabel> la maggior parte delle distribuzioni (Fedora, openSuse, Mandriva,
-                    Ubuntu, ecc... ) forniscono un pacchetto nei propri repository per il modulo di
-                    perl <application>Finance::Quote</application>. Quindi nella maggior parte dei
-                    casi è sufficiente utilizzare il proprio gestore di pacchetti preferito (yum,
-                    apt, rpm, synaptics, yast, ecc...) per installare il modulo. Il nome del
-                    pacchetto può variare da distribuzione a distribuzione. In genere ha un nome
-                    del tipo <quote>perl-Finance-Quote</quote>.
+                  <para><guilabel>lin:</guilabel> la maggior parte delle distribuzioni (Fedora, openSuse, Mandriva, Ubuntu,
+                    ecc... ) forniscono un pacchetto nei propri repository per il modulo di perl
+                    <application>Finance::Quote</application>. Quindi nella maggior parte dei casi
+                    è sufficiente utilizzare il proprio gestore di pacchetti preferito (yum, apt,
+                    rpm, synaptics, yast, ecc...) per installare il modulo. Il nome del pacchetto
+                    può variare da distribuzione a distribuzione. In genere ha un nome del tipo
+                    <quote>perl-Finance-Quote</quote>.
                   </para>
                 </listitem>
 
@@ -9995,9 +10144,9 @@
                 </listitem>
 
                 <listitem>
-                  <para>&mac;: se &app; è stato installato dal pacchetto di installazione
-                    disponibile sulla pagina principale di &app;,
-                    <application>Finance::Quote</application> è già installato.
+                  <para>&mac;: se &app; è stato installato dal pacchetto di installazione disponibile sulla pagina
+                    principale di &app;, <application>Finance::Quote</application> è già
+                    installato.
                   </para>
                 </listitem>
 
@@ -10039,11 +10188,10 @@
               </para>
 
               <note>
-                <para>If you feel uncomfortable about performing any of these steps, please either email the
-                  &app;-user mailing list
-                  (<email>gnucash-user at gnucash.org</email>) for help or come to the
-                  <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. More information
-                  is available on the &app; Wiki FAQ for example
+                <para>If you feel uncomfortable about performing any of these steps, please either email the &app;-user
+                  mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the
+                  <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. More information is
+                  available on the &app; Wiki FAQ for example
                   <ulink url="&url-wiki-faq;#Q:_How_do_I_fix_a_.22system_error.22_or_.22unknown_error.22_when_getting_stock_quotes.3F"/>
                   You can also leave out this step and manually update your stock prices.
                 </para>
@@ -10196,10 +10344,10 @@
           <emphasis role="italic">Tutorial and Concepts Guide</emphasis> for instructions if you
           need to create an opening balance in a <guilabel>Stock</guilabel> or <guilabel>Mutual
           Fund</guilabel> account. It is used to record the beginning balance for an account. This
-          allows it to be used for two different scenarios. If using
-          &app; for the first time to record transactions, it can be
-          used as a beginning balance. If the accounts in use are closed at the end of a period and
-          new accounts are created, it is used to close and carry balances forward.
+          allows it to be used for two different scenarios. If using &app; for the first time to
+          record transactions, it can be used as a beginning balance. If the accounts in use are
+          closed at the end of a period and new accounts are created, it is used to close and carry
+          balances forward.
         </para>
 
         <para>In questa scheda sono presenti tre riquadri. Quello superiore contiene le <guilabel>Informazioni sul
@@ -10613,10 +10761,9 @@
         insolute.
       </para>
 
-      <para>The reconciling process in &app; involves two dialogs: the
-        <xref linkend="tool-reconcile"/> dialog followed by the <xref linkend="rec-win"/> window.
-        They provide access to various &app; functions to make it easy
-        to enter and update account information during the reconciliation.
+      <para>The reconciling process in &app; involves two dialogs: the <xref linkend="tool-reconcile"/> dialog
+        followed by the <xref linkend="rec-win"/> window. They provide access to various &app;
+        functions to make it easy to enter and update account information during the reconciliation.
       </para>
 
       <tip>
@@ -10750,9 +10897,9 @@
 
         <note>
           <para>If you enabled the option <guilabel>Use formal accounting labels</guilabel> in the
-            <guilabel>Accounts</guilabel> section of the &app;
-            preferences, you will see <guilabel>Debits</guilabel> and <guilabel>Credits</guilabel>
-            panes instead of <guilabel>Funds In</guilabel> and <guilabel>Funds Out</guilabel> panes.
+            <guilabel>Accounts</guilabel> section of the &app; preferences, you will see
+            <guilabel>Debits</guilabel> and <guilabel>Credits</guilabel> panes instead of
+            <guilabel>Funds In</guilabel> and <guilabel>Funds Out</guilabel> panes.
           </para>
         </note>
 
@@ -10951,8 +11098,7 @@ Translators:
 
     <para>A <emphasis>transaction</emphasis> represents the movement of money from one account to another
       account. Whenever you spend or receive money, or transfer money between accounts, that is a
-      transaction. In &app; transactions always involve at least two
-      accounts.
+      transaction. In &app; transactions always involve at least two accounts.
     </para>
 
     <para>&app; utilizza i conti come metodo per raggruppare ed organizzare la registrazione delle
@@ -11145,9 +11291,9 @@ Translators:
 
         <para>The <guilabel>Currency Transfer</guilabel> pane is used to collect the needed information to enter
           the amount of the <guilabel>Transfer To</guilabel> split. You may enter either a price or
-          an amount and &app; will compute the other. If you have
-          Online Price Retrieval installed (see <xref linkend="Online-price-setup"/>) you can use
-          the <guilabel>Fetch Rate</guilabel> button to retrieve a current quote.
+          an amount and &app; will compute the other. If you have Online Price Retrieval installed
+          (see <xref linkend="Online-price-setup"/>) you can use the <guilabel>Fetch Rate</guilabel>
+          button to retrieve a current quote.
         </para>
 
         <para>The <guilabel>Currency Transfer</guilabel> pane is enabled only if the selected accounts use
@@ -11160,9 +11306,8 @@ Translators:
           radio button and a numeric entry.
         </para>
 
-        <para>If a relevant price is available in the price database (see
-          <xref linkend="tool-price-manual"/>) the <guilabel>Exchange Rate</guilabel> will
-          have that as a default entry.
+        <para>If a relevant price is available in the price database (see <xref linkend="tool-price-manual"/>) the
+          <guilabel>Exchange Rate</guilabel> will have that as a default entry.
         </para>
 
         <itemizedlist>
@@ -11180,17 +11325,17 @@ Translators:
 
           <listitem>
             <para>Enter the price/exchange rate or the amount in the numeric entry corresponding to radio button you
-              selected. &app; will calculate the other amount for you
-              when you exit the field. If it's enabled you can use the <guilabel>Fetch
-              Rate</guilabel> button to retrieve a current quote.
+              selected. &app; will calculate the other amount for you when you exit the field. If
+              it's enabled you can use the <guilabel>Fetch Rate</guilabel> button to retrieve a
+              current quote.
             </para>
           </listitem>
         </itemizedlist>
 
         <note>
           <para>If you have created a price in the <guilabel>Price Editor</guilabel> (see
-            <xref linkend="tool-price-manual"/>) for the current date quote retrieval will
-            not update that price. You must first delete the manually-created prce in the
+            <xref linkend="tool-price-manual"/>) for the current date quote retrieval will not
+            update that price. You must first delete the manually-created prce in the
             <guilabel>Price Editor</guilabel> before clicking the <guibutton>Fetch Rate</guibutton>
             button.
           </para>
@@ -11240,9 +11385,9 @@ Translators:
         </para>
 
         <note>
-          <para>When working on transactions in &app;, be aware that the
-            <keycap function="enter">Enter</keycap> key and the <keycap function="tab">Tab</keycap>
-            key behave differently, and perform different actions.
+          <para>When working on transactions in &app;, be aware that the <keycap function="enter">Enter</keycap> key
+            and the <keycap function="tab">Tab</keycap> key behave differently, and perform
+            different actions.
           </para>
 
           <para>The <keycap function="enter">Enter</keycap> key moves to the first field of the next split,
@@ -11264,8 +11409,7 @@ Translators:
             <para>Selecting the small icon on the right of the date field drops down a date selection calendar. Use
               the arrows to select the correct month and year for the transaction then select the
               date. Selecting the icon once more will close the date selection calendar. It is also
-              possible to type in the date or part of the date and let
-              &app; fill the rest.
+              possible to type in the date or part of the date and let &app; fill the rest.
             </para>
           </listitem>
 
@@ -11306,13 +11450,12 @@ Translators:
               account also to be a placeholder account so that it doesn't display here.
             </para>
 
-            <para>When typing, &app; will fill in available accounts as you type. For
-              example, if you have <emphasis>Equity</emphasis> and <emphasis>Expenses</emphasis>
-              top-level accounts, typing <keycap>E</keycap> will fill in
-              <emphasis role="bold">Equity</emphasis> because it sorts before
-              <emphasis role="bold">Expenses</emphasis>. Continuing to type <keycap>x</keycap> will
-              present <emphasis role="bold">Expenses</emphasis> the account separator
-              (<keycap>:</keycap> by default, see <xref linkend="prefs-accounts"/>Account
+            <para>When typing, &app; will fill in available accounts as you type. For example, if you have
+              <emphasis>Equity</emphasis> and <emphasis>Expenses</emphasis> top-level accounts,
+              typing <keycap>E</keycap> will fill in <emphasis role="bold">Equity</emphasis> because
+              it sorts before <emphasis role="bold">Expenses</emphasis>. Continuing to type
+              <keycap>x</keycap> will present <emphasis role="bold">Expenses</emphasis> the account
+              separator (<keycap>:</keycap> by default, see <xref linkend="prefs-accounts"/>Account
               Preferences about changing it) will accept the currently offered account so that you
               can start typing the name of a child account.
             </para>
@@ -11566,9 +11709,8 @@ Translators:
         last two will be <guilabel>Credit</guilabel> and <guilabel>Debit</guilabel> respectively if
         you've enabled <guilabel>Use formal accounting labels</guilabel> in the
         <guilabel>Accounts</guilabel> tab of <guilabel>Preferences</guilabel>). Enter any two and
-        &app; will calculate the other for you; if you enter 3 and the
-        result doesn't balance &app; will ask which one to change to
-        make the split balance.
+        &app; will calculate the other for you; if you enter 3 and the result doesn't balance &app;
+        will ask which one to change to make the split balance.
       </para>
 
       <para>Registers of other types have only <guilabel>Credit</guilabel> and <guilabel>Debit</guilabel> (the
@@ -11746,8 +11888,8 @@ Translators:
     <sect1 id="trans-stts">
       <title>Setting the reconcile status (<guilabel>R</guilabel> field) of a transaction</title>
 
-      <para>In the &app; register there is a column named <guilabel>R</guilabel>.
-        This field indicates the status of a transaction. Possible values are:
+      <para>In the &app; register there is a column named <guilabel>R</guilabel>. This field indicates the
+        status of a transaction. Possible values are:
       </para>
 
       <variablelist>
@@ -12222,8 +12364,7 @@ Translators:
 
     <para>The accounting needs of a business are quite different from that of a person. Businesses have
       customers that owe money, vendors which are owed money, employee payroll, more complex tax
-      laws, etc. &app; offers business oriented features to facilitate
-      these needs.
+      laws, etc. &app; offers business oriented features to facilitate these needs.
     </para>
 
     <para>Accounts Receivable (A/R) are used by businesses to record sales for which they are not immediately
@@ -12246,8 +12387,8 @@ Translators:
     <sect1 id="busnss-ar-setup1">
       <title>Initial Setup</title>
 
-      <para>To set up &app; to handle accounts receivable and accounts payable for
-        a company the following preliminary steps must be done.
+      <para>To set up &app; to handle accounts receivable and accounts payable for a company the following
+        preliminary steps must be done.
       </para>
 
       <sect2 id="busnss-setupacct2">
@@ -12255,8 +12396,8 @@ Translators:
 
         <para>There are many different ways to set up a business account hierarchy. You can start with the
           Business Accounts setup which is available from the New Account Hierarchy assistant, or
-          you could build one manually. To access the prebuilt Business Accounts, start
-          &app; and click on
+          you could build one manually. To access the prebuilt Business Accounts, start &app; and
+          click on
           <menuchoice>
             <guimenu>File</guimenu><guimenuitem>New File</guimenuitem>
           </menuchoice>
@@ -12351,8 +12492,7 @@ Translators:
             </para>
 
             <para>If you set up Tax on Purchases and Tax on Sales as subaccounts of Liabilities:Tax then the net tax
-              will be rolled up and can be seen in the &app; Accounts
-              tab.
+              will be rolled up and can be seen in the &app; Accounts tab.
             </para>
 
             <para><emphasis>If unsure about tax law requirements, get professional advise. </emphasis>
@@ -12364,9 +12504,9 @@ Translators:
       <sect2 id="busnss-setupcname">
         <title>Company Registration</title>
 
-        <para>After you have built the account structure and defined your tax tables, register the
-          &app; file as belonging to your company by filling in the
-          data requested in the <xref linkend="business-book-options"/> accessible from the
+        <para>After you have built the account structure and defined your tax tables, register the &app; file as
+          belonging to your company by filling in the data requested in the
+          <xref linkend="business-book-options"/> accessible from the
           <menuchoice>
             <guimenu>File</guimenu><guimenuitem>Properties</guimenuitem>
           </menuchoice>
@@ -12385,8 +12525,7 @@ Translators:
       <sect2 id="busnss_setup_pref">
         <title>Business Preferences</title>
 
-        <para>Set options on the Business tab of the &app; preferences, which is
-          accessed via
+        <para>Set options on the Business tab of the &app; preferences, which is accessed via
           <menuchoice>
             <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
           </menuchoice>
@@ -12406,8 +12545,8 @@ Translators:
         </para>
 
         <note>
-          <para>As of &app; 2.6.7, Billing terms are only partially supported. Date due
-            is calculated but discount amount is not.
+          <para>As of &app; 2.6.7, Billing terms are only partially supported. Date due is calculated but discount
+            amount is not.
           </para>
 
           <para>Discount for early invoice payment is not implemented. There are 2 ways this may be done, although
@@ -12524,11 +12663,11 @@ Translators:
       <para>&app; has an integrated accounts receivable system.
       </para>
 
-      <para>To use &app;’s integrated accounts receivable system, you must first
-        set up <emphasis>Accounts Receivable</emphasis> accounts of type
-        <emphasis>A/Receivable</emphasis> under <emphasis>Assets</emphasis> to accrue income you're
-        owed. It is within this account that the integrated A/R system will place transactions,
-        debiting it when you post bills and crediting it when you receive payments.
+      <para>To use &app;’s integrated accounts receivable system, you must first set up <emphasis>Accounts
+        Receivable</emphasis> accounts of type <emphasis>A/Receivable</emphasis> under
+        <emphasis>Assets</emphasis> to accrue income you're owed. It is within this account that the
+        integrated A/R system will place transactions, debiting it when you post bills and crediting
+        it when you receive payments.
       </para>
 <literallayout>
         Basic A/R Account Hierarchy:
@@ -12558,8 +12697,8 @@ Translators:
 
       <para>The transactions generated by the A/R system are recorded within the <emphasis>Accounts
         Receivable</emphasis> account. You generally do not work directly with this account. You
-        generally work with the four integrated &app; A/R application
-        components available through the
+        generally work with the four integrated &app; A/R application components available through
+        the
         <menuchoice>
           <guimenu>Business</guimenu> <guisubmenu>Customer</guisubmenu>
         </menuchoice>
@@ -12662,8 +12801,8 @@ Translators:
             </para>
 
             <note>
-              <para>All invoices will be denominated in this currency and &app; will
-                require an Accounts Receivable account in this currency.
+              <para>All invoices will be denominated in this currency and &app; will require an Accounts Receivable
+                account in this currency.
               </para>
             </note>
           </listitem>
@@ -12687,8 +12826,8 @@ Translators:
 
           <listitem>
             <para><guilabel>Billing Information - Credit Limit</guilabel> - stores the maximum credit you are willing
-              to extend to the customer. This field is for your reference purposes only.
-              &app; does not use the value.
+              to extend to the customer. This field is for your reference purposes only. &app; does
+              not use the value.
             </para>
           </listitem>
 
@@ -12736,8 +12875,8 @@ Translators:
 
           <listitem>
             <para><guilabel>Shipping Address</guilabel> - records the customer’s shipping address if it is different
-              from the billing address. The shipping address is for your reference.
-              &app; does not use the value.
+              from the billing address. The shipping address is for your reference. &app; does not
+              use the value.
             </para>
           </listitem>
         </itemizedlist>
@@ -12758,9 +12897,8 @@ Translators:
 
         <para>If many customers match the search criteria you provide, the search can be refined by running an
           additional search within the current results. The current result set is searched when the
-          <guilabel>Refine Current Search</guilabel> radio button is selected. In fact,
-          &app; selects this option for you after you run the initial
-          search.
+          <guilabel>Refine Current Search</guilabel> radio button is selected. In fact, &app;
+          selects this option for you after you run the initial search.
         </para>
 
         <para>If the customer you are searching for does not match the supplied search criteria, change the search
@@ -12788,16 +12926,16 @@ Translators:
       </para>
 
       <para>A credit note is the paperwork you send to a customer to correct products or services rendered that
-        were incorrectly invoiced. &app; can generate and track credit
-        notes via the same menu entries as invoices.
+        were incorrectly invoiced. &app; can generate and track credit notes via the same menu
+        entries as invoices.
       </para>
 
       <note>
         <para>This section applies to both invoices and credit notes. In order to avoid repeating everything twice
           and to keep the text easier to read it will refer only to invoices. You can apply it
           equally to credit notes. Only where the behaviour of credit notes differs from invoices
-          this will be explicitly mentioned. Credit notes were introduced starting with
-          &app; stable release 2.6.0.
+          this will be explicitly mentioned. Credit notes were introduced starting with &app; stable
+          release 2.6.0.
         </para>
       </note>
 
@@ -12835,12 +12973,11 @@ Translators:
           <listitem>
             <para><guilabel>Billing Information - Customer</guilabel> - the customer who is to receive this invoice.
               If you remember the <emphasis>company name</emphasis> you entered in the <guilabel>New
-              Customer</guilabel> window for this customer, start to type it in this field and
-              &app; will try auto complete it for you. Else, press the
-              <guibutton>Select...</guibutton> button to access the <guilabel>Find
-              Customer</guilabel> window described in <xref linkend="busnss-ar-custfind2"/>.
-              Highlight the customer you are looking for with a click in the search results, then
-              press the <guibutton>Select</guibutton> button.
+              Customer</guilabel> window for this customer, start to type it in this field and &app;
+              will try auto complete it for you. Else, press the <guibutton>Select...</guibutton>
+              button to access the <guilabel>Find Customer</guilabel> window described in
+              <xref linkend="busnss-ar-custfind2"/>. Highlight the customer you are looking for with
+              a click in the search results, then press the <guibutton>Select</guibutton> button.
             </para>
           </listitem>
 
@@ -12848,12 +12985,11 @@ Translators:
             <para><guilabel>Billing Information - Job</guilabel> (optional) - associates the new invoice with a
               customer job (see <xref linkend="busnss-ar-jobs1"/>). If you remember the
               <emphasis>job name</emphasis> you entered in the <guilabel>New Job</guilabel> window
-              for this job, start to type it in this field and &app;
-              will try auto complete it for you. Else, press the <guibutton>Select...</guibutton>
-              button to access the <guilabel>Find Job</guilabel> window. This window is the same to
-              the one described in <xref linkend="busnss-ar-custfind2"/>. Highlight the job you are
-              looking for with a click in the search results, then press the
-              <guibutton>Select</guibutton> button.
+              for this job, start to type it in this field and &app; will try auto complete it for
+              you. Else, press the <guibutton>Select...</guibutton> button to access the
+              <guilabel>Find Job</guilabel> window. This window is the same to the one described in
+              <xref linkend="busnss-ar-custfind2"/>. Highlight the job you are looking for with a
+              click in the search results, then press the <guibutton>Select</guibutton> button.
             </para>
           </listitem>
 
@@ -13126,9 +13262,9 @@ Translators:
           </para>
         </note>
 
-        <para>One of the design goals in &app;’s Account Receivable system was to
-          allow different processes to get to the same state, so you can reach an invoice from
-          different directions based on the way you think about the problem:
+        <para>One of the design goals in &app;’s Account Receivable system was to allow different processes to
+          get to the same state, so you can reach an invoice from different directions based on the
+          way you think about the problem:
         </para>
 
         <itemizedlist>
@@ -13209,9 +13345,9 @@ Translators:
       <sect2 id="busnss-ar-invoicestarting2">
         <title>Assign Starting Invoice Number</title>
 
-        <para>By default, &app; starts with invoice number 1 and increments from
-          there. You can manually type an invoice number into the text box each time you create an
-          invoice, but this gets tiring and sooner or later leads to duplicate numbers.
+        <para>By default, &app; starts with invoice number 1 and increments from there. You can manually type an
+          invoice number into the text box each time you create an invoice, but this gets tiring and
+          sooner or later leads to duplicate numbers.
         </para>
 
         <para>You can change the starting invoice number if it is important you. Use
@@ -13258,12 +13394,11 @@ Translators:
         <listitem>
           <para><guilabel>Owner Info - Customer</guilabel> - the customer for whom the job is created. If you
             remember the <emphasis>company name</emphasis> you entered in the <guilabel>New
-            Customer</guilabel> window for this customer, start to type it in this field and
-            &app; will try auto complete it for you. Else, press the
-            <guibutton>Select...</guibutton> button to access the <guilabel>Find Customer</guilabel>
-            window described in <xref linkend="busnss-ar-custfind2"/>. Highlight the customer you
-            are looking for with a click in the search results, then press the
-            <guibutton>Select</guibutton> button.
+            Customer</guilabel> window for this customer, start to type it in this field and &app;
+            will try auto complete it for you. Else, press the <guibutton>Select...</guibutton>
+            button to access the <guilabel>Find Customer</guilabel> window described in
+            <xref linkend="busnss-ar-custfind2"/>. Highlight the customer you are looking for with a
+            click in the search results, then press the <guibutton>Select</guibutton> button.
           </para>
         </listitem>
 
@@ -13342,12 +13477,11 @@ Translators:
         <listitem>
           <para><guilabel>Payment Information - Customer</guilabel> - the customer who paid you. If you remember the
             <emphasis>company name</emphasis> you entered in the <guilabel>New Customer</guilabel>
-            window for this customer, start to type it in this field and
-            &app; will try auto complete it for you. Else, press the
-            <guibutton>Select...</guibutton> button to access the <guilabel>Find Customer</guilabel>
-            window described in <xref linkend="busnss-ar-custfind2"/>. Highlight the customer you
-            are looking for with a click in the search results, then press the
-            <guibutton>Select</guibutton> button.
+            window for this customer, start to type it in this field and &app; will try auto
+            complete it for you. Else, press the <guibutton>Select...</guibutton> button to access
+            the <guilabel>Find Customer</guilabel> window described in
+            <xref linkend="busnss-ar-custfind2"/>. Highlight the customer you are looking for with a
+            click in the search results, then press the <guibutton>Select</guibutton> button.
           </para>
         </listitem>
 
@@ -13398,18 +13532,18 @@ Translators:
         <title>Over Payments or Pre-Payments</title>
 
         <para>If a customer overpays an invoice or pays for goods or services before they have been invoiced,
-          Process Payment for the total amount received. &app; will
-          then keep track of the over-payment (or pre-payment) in the A/R account and you can use
-          the residual when paying the next invoice.
+          Process Payment for the total amount received. &app; will then keep track of the
+          over-payment (or pre-payment) in the A/R account and you can use the residual when paying
+          the next invoice.
         </para>
       </sect2>
 
       <sect2 id="busnss-ar-partpay2">
         <title>Partial Payments</title>
 
-        <para>Partial payments are possible too. Select the invoice to pay. &app;
-          will automatically suggest that invoice's remaining balance as payment amount. Simply
-          adjust that amount to what you want to pay.
+        <para>Partial payments are possible too. Select the invoice to pay. &app; will automatically suggest that
+          invoice's remaining balance as payment amount. Simply adjust that amount to what you want
+          to pay.
         </para>
       </sect2>
 
@@ -13422,9 +13556,8 @@ Translators:
         </note>
 
         <para>The usual way to do this is to process a payment for the invoice to a <emphasis>BadDebt</emphasis>
-          account. Such an account would be an expense account. However, in
-          &app;, you can't process a payment for an invoice directly to
-          an expense account, so it takes two steps:
+          account. Such an account would be an expense account. However, in &app;, you can't process
+          a payment for an invoice directly to an expense account, so it takes two steps:
         </para>
 
         <itemizedlist>
@@ -13467,8 +13600,8 @@ Translators:
 
           <listitem>
             <para>Open the account register for your A/R account. For this invoice there should now be one payment
-              transaction. If you are using &app; 2.6.0 - 2.6.4 there
-              will also be one lot link transaction <link linkend="busnss-ar-baddeb-lot">(1)</link>.
+              transaction. If you are using &app; 2.6.0 - 2.6.4 there will also be one lot link
+              transaction <link linkend="busnss-ar-baddeb-lot">(1)</link>.
             </para>
           </listitem>
 
@@ -13485,11 +13618,10 @@ Translators:
         </para>
 
         <note id="busnss-ar-baddeb-lot">
-          <para>(1): &app; versions 2.6.0 to 2.6.4 created lot link transactions which
-            show in the A/R account register. This came with its own set of subtle issues. It is
-            recommended to upgrade to the latest (or at least 2.6.6) version, which fixes a lot of
-            small problems. Version 2.6.5 had a flaw in the logic cleaning up the lot links. Once
-            upgraded, please run
+          <para>(1): &app; versions 2.6.0 to 2.6.4 created lot link transactions which show in the A/R account
+            register. This came with its own set of subtle issues. It is recommended to upgrade to
+            the latest (or at least 2.6.6) version, which fixes a lot of small problems. Version
+            2.6.5 had a flaw in the logic cleaning up the lot links. Once upgraded, please run
             <menuchoice>
               <guimenu> Actions</guimenu><guimenuitem>Check & Repair</guimenuitem>
             </menuchoice>
@@ -13587,14 +13719,13 @@ ________________________________________________________________________________
     <sect1 id="busnss-ap-components1">
       <title>Debiti correnti</title>
 
-      <para>&app; has an integrated accounts payable system. As with
-        <emphasis>Accounts Receivable</emphasis> you must have an <emphasis>Accounts
-        Payable</emphasis> account set up under <emphasis>Liabilities</emphasis> for each currency
-        in which you will issue invoices. The <emphasis>Accounts Payable</emphasis> accounts accrue
-        the amounts you owe to others, so bills credit these accounts and payments and credit memos
-        debit these accounts. Generally you do not directly work with this account but use the four
-        integrated &app; A/P application components. The A/P components
-        are available from the
+      <para>&app; has an integrated accounts payable system. As with <emphasis>Accounts Receivable</emphasis>
+        you must have an <emphasis>Accounts Payable</emphasis> account set up under
+        <emphasis>Liabilities</emphasis> for each currency in which you will issue invoices. The
+        <emphasis>Accounts Payable</emphasis> accounts accrue the amounts you owe to others, so
+        bills credit these accounts and payments and credit memos debit these accounts. Generally
+        you do not directly work with this account but use the four integrated &app; A/P application
+        components. The A/P components are available from the
         <menuchoice>
           <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu>
         </menuchoice>
@@ -13687,9 +13818,8 @@ ________________________________________________________________________________
             </para>
 
             <note>
-              <para>All Bills and Credit Notes will be denominated in this currency and
-                &app; will require an Accounts Payable account in this
-                currency.
+              <para>All Bills and Credit Notes will be denominated in this currency and &app; will require an Accounts
+                Payable account in this currency.
               </para>
             </note>
           </listitem>
@@ -13764,9 +13894,8 @@ ________________________________________________________________________________
 
         <para>If many vendors match the search criteria you provide, the search can be refined by running an
           additional search within the current results. The current result set is searched when the
-          <guilabel>Refine Current Search</guilabel> radio button is selected. In fact,
-          &app; selects this option for you after you run the initial
-          search.
+          <guilabel>Refine Current Search</guilabel> radio button is selected. In fact, &app;
+          selects this option for you after you run the initial search.
         </para>
 
         <para>If the vendor you are searching for does not match the supplied search criteria, change the search
@@ -13791,13 +13920,12 @@ ________________________________________________________________________________
     <sect1 id="busnss-ap-bills1">
       <title>Ricevute</title>
 
-      <para>A bill is a request for payment you receive from a vendor. &app; can
-        track bills.
+      <para>A bill is a request for payment you receive from a vendor. &app; can track bills.
       </para>
 
       <para>A credit note is the document you receive from a vendor to correct products or services rendered
-        that you were incorrectly charged for on a bill. &app; can
-        generate and track credit notes via the same menu entries as bills.
+        that you were incorrectly charged for on a bill. &app; can generate and track credit notes
+        via the same menu entries as bills.
       </para>
 
       <note>
@@ -13811,8 +13939,8 @@ ________________________________________________________________________________
       <sect2 id="busnss-ap-billnew2">
         <title>Nuovo</title>
 
-        <para>When you receive a bill from a vendor and want to enter it into &app;,
-          you must create a new bill. To create a new bill use the
+        <para>When you receive a bill from a vendor and want to enter it into &app;, you must create a new bill.
+          To create a new bill use the
           <menuchoice>
             <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>New
             Bill</guimenuitem>
@@ -13841,12 +13969,11 @@ ________________________________________________________________________________
           <listitem>
             <para><guilabel>Billing Info - Vendor</guilabel> - the issuing vendor. If you remember the
               <emphasis>company name</emphasis> you entered in the <guilabel>New Vendor</guilabel>
-              window for this vendor, start to type it in this field and
-              &app; will try auto complete it for you. Else, press the
-              <guibutton>Select...</guibutton> button to access the <guilabel>Find Vendor</guilabel>
-              window described in <xref linkend="busnss-ap-vendorfind2"/>. Highlight the vendor you
-              are looking for with a click in the search results, then press the
-              <guibutton>Select</guibutton> button.
+              window for this vendor, start to type it in this field and &app; will try auto
+              complete it for you. Else, press the <guibutton>Select...</guibutton> button to access
+              the <guilabel>Find Vendor</guilabel> window described in
+              <xref linkend="busnss-ap-vendorfind2"/>. Highlight the vendor you are looking for with
+              a click in the search results, then press the <guibutton>Select</guibutton> button.
             </para>
           </listitem>
 
@@ -13854,12 +13981,11 @@ ________________________________________________________________________________
             <para><guilabel>Billing Info - Job</guilabel> (optional) - associates a vendor job (see
               <xref linkend="busnss-ap-jobs1"/>) with this bill. If you remember the <emphasis>job
               name</emphasis> you entered in the <guilabel>New Job</guilabel> window for this job,
-              start to type it in this field and &app; will try auto
-              complete it for you. Else, press the <guibutton>Select...</guibutton> button to access
-              the <guilabel>Find Job</guilabel> window. This window is very similar to the one
-              described in <xref linkend="busnss-ap-vendorfind2"/>. Highlight the job you are
-              looking for with a click in the search results, then press the
-              <guibutton>Select</guibutton> button.
+              start to type it in this field and &app; will try auto complete it for you. Else,
+              press the <guibutton>Select...</guibutton> button to access the <guilabel>Find
+              Job</guilabel> window. This window is very similar to the one described in
+              <xref linkend="busnss-ap-vendorfind2"/>. Highlight the job you are looking for with a
+              click in the search results, then press the <guibutton>Select</guibutton> button.
             </para>
           </listitem>
 
@@ -14179,23 +14305,22 @@ ________________________________________________________________________________
         <listitem>
           <para><guilabel>Payment Information - Vendor</guilabel> - the vendor you wish to pay. If you remember the
             <emphasis>company name</emphasis> you entered in the <guilabel>New Vendor</guilabel>
-            window for this vendor, start to type it in this field and
-            &app; will try auto complete it for you. Else, press the
-            <guibutton>Select...</guibutton> button to access the <guilabel>Find Vendor</guilabel>
-            window described in <xref linkend="busnss-ap-vendorfind2"/>. Highlight the vendor you
-            are looking for with a click in the search results, then press the
-            <guibutton>Select</guibutton> button.
+            window for this vendor, start to type it in this field and &app; will try auto complete
+            it for you. Else, press the <guibutton>Select...</guibutton> button to access the
+            <guilabel>Find Vendor</guilabel> window described in
+            <xref linkend="busnss-ap-vendorfind2"/>. Highlight the vendor you are looking for with a
+            click in the search results, then press the <guibutton>Select</guibutton> button.
           </para>
         </listitem>
 
         <listitem>
           <para><guilabel>Payment Information - Bill</guilabel> - the bill you wish to pay. If you remember the
-            <emphasis>bill ID</emphasis>, start to type it in this field and
-            &app; will try auto complete it for you. Else, press the
-            <guibutton>Select...</guibutton> button to access the <guilabel>Find Bill</guilabel>
-            window described in <xref linkend="busnss-ap-billfind2"/>. Highlight the bill you are
-            looking for with a click in the search results, then press the
-            <guibutton>Select</guibutton> button in the search window.
+            <emphasis>bill ID</emphasis>, start to type it in this field and &app; will try auto
+            complete it for you. Else, press the <guibutton>Select...</guibutton> button to access
+            the <guilabel>Find Bill</guilabel> window described in
+            <xref linkend="busnss-ap-billfind2"/>. Highlight the bill you are looking for with a
+            click in the search results, then press the <guibutton>Select</guibutton> button in the
+            search window.
           </para>
         </listitem>
 
@@ -14236,18 +14361,17 @@ ________________________________________________________________________________
         <title>Over Payments or Pre-Payments</title>
 
         <para>If you wish to overpay an invoice or pay for goods or services before they have been invoiced,
-          Process Payment for the total amount payed. &app; will then
-          keep track of the over-payment (or pre-payment) in the A/P account and you can use the
-          residual in the future.
+          Process Payment for the total amount payed. &app; will then keep track of the over-payment
+          (or pre-payment) in the A/P account and you can use the residual in the future.
         </para>
       </sect2>
 
       <sect2 id="busnss-ap-partpay2">
         <title>Partial Payments</title>
 
-        <para>You may wish to partially pay a bill. Select the bill to pay. &app;
-          will automatically suggest that bill's remaining balance as payment amount. Simply adjust
-          that amount to what you want to pay.
+        <para>You may wish to partially pay a bill. Select the bill to pay. &app; will automatically suggest that
+          bill's remaining balance as payment amount. Simply adjust that amount to what you want to
+          pay.
         </para>
       </sect2>
     </sect1>
@@ -14358,8 +14482,7 @@ ________________________________________________________________________________
 
             <note>
               <para>All expense vouchers and credit notes for this employee will be denominated in this currency and
-                &app; will require an Accounts Payable account in this
-                currency.
+                &app; will require an Accounts Payable account in this currency.
               </para>
             </note>
           </listitem>
@@ -14395,9 +14518,8 @@ ________________________________________________________________________________
 
         <para>If many employees match the search criteria you provide, the search can be refined by running an
           additional search within the current results. The current result set is searched when the
-          <guilabel>Refine Current Search</guilabel> radio button is selected. In fact,
-          &app; selects this option for you after you run the initial
-          search.
+          <guilabel>Refine Current Search</guilabel> radio button is selected. In fact, &app;
+          selects this option for you after you run the initial search.
         </para>
 
         <note>
@@ -14458,10 +14580,10 @@ ________________________________________________________________________________
             </para>
 
             <tip>
-              <para>The field supports auto-completion so if you start typing &app; will
-                try to complete the text automatically using existing employees name. You can also
-                press the button <guibutton>Select...</guibutton> to open the
-                <link linkend="busnss-emplyedit">Find Employee</link> window.
+              <para>The field supports auto-completion so if you start typing &app; will try to complete the text
+                automatically using existing employees name. You can also press the button
+                <guibutton>Select...</guibutton> to open the <link linkend="busnss-emplyedit">Find
+                Employee</link> window.
               </para>
             </tip>
           </listitem>
@@ -14484,9 +14606,9 @@ ________________________________________________________________________________
             </para>
 
             <tip>
-              <para>The field supports auto-completion so if you start typing &app; will
-                try to complete the text automatically using existing Customer name. You can also
-                press the button <guibutton>Select...</guibutton> to open the
+              <para>The field supports auto-completion so if you start typing &app; will try to complete the text
+                automatically using existing Customer name. You can also press the button
+                <guibutton>Select...</guibutton> to open the
                 <link linkend="busnss-ar-custfind2">Find Customer</link> window.
               </para>
             </tip>
@@ -14498,15 +14620,15 @@ ________________________________________________________________________________
             </para>
 
             <note>
-              <para>you can type in this field only if there is one or more job registered in
-                &app; belonging to the selected Customer.
+              <para>you can type in this field only if there is one or more job registered in &app; belonging to the
+                selected Customer.
               </para>
             </note>
 
             <tip>
-              <para>The field supports auto-completion so if you start typing &app; will
-                try to complete the text automatically using existing Customer name. You can also
-                press the button <guibutton>Select...</guibutton> to open the
+              <para>The field supports auto-completion so if you start typing &app; will try to complete the text
+                automatically using existing Customer name. You can also press the button
+                <guibutton>Select...</guibutton> to open the
                 <link linkend="busnss-ar-custfind2">Find Customer</link> window.
               </para>
             </tip>
@@ -14534,9 +14656,8 @@ ________________________________________________________________________________
 
         <para>If many expense vouchers match the search criteria you provide, the search can be refined by running
           an additional search within the current results. The current result set is searched when
-          the <guilabel>Refine Current Search</guilabel> radio button is selected. In fact,
-          &app; selects this option for you after you run the initial
-          search.
+          the <guilabel>Refine Current Search</guilabel> radio button is selected. In fact, &app;
+          selects this option for you after you run the initial search.
         </para>
 
         <note>
@@ -14588,18 +14709,17 @@ ________________________________________________________________________________
     <sect1 id="tool-find">
       <title>Find</title>
 
-      <para>The &app; <emphasis>Find</emphasis> assistant can be used to
-        <link linkend="tool-find-txn">find transactions</link> or to perform
-        <link linkend="tool-find-bsnss">business related</link> research on your data file.
+      <para>The &app; <emphasis>Find</emphasis> assistant can be used to <link linkend="tool-find-txn">find
+        transactions</link> or to perform <link linkend="tool-find-bsnss">business related</link>
+        research on your data file.
       </para>
 
       <sect2 id="tool-find-txn">
         <title>Find Transaction</title>
 
-        <para><guilabel>Find Transaction</guilabel> is used to search for transactions in
-          &app; and display the results in a register window. To open
-          the <guilabel>Find Transaction</guilabel> dialog in <guilabel>Split Search</guilabel>
-          mode, you can type the keyboard shortcut
+        <para><guilabel>Find Transaction</guilabel> is used to search for transactions in &app; and display the
+          results in a register window. To open the <guilabel>Find Transaction</guilabel> dialog in
+          <guilabel>Split Search</guilabel> mode, you can type the keyboard shortcut
           <keycombo>
             <keycap>Ctrl</keycap><keycap>f</keycap>
           </keycombo>
@@ -14713,10 +14833,10 @@ ________________________________________________________________________________
           <menuchoice>
             <guimenu> Reports</guimenu><guimenuitem>Account Report</guimenuitem>
           </menuchoice>
-          . The Account Report has limited formatting options but, like all
-          &app; reports, being in html format, can be copied and pasted
-          into a spreadsheet for further formatting. Alternatively, the Account Report can be
-          exported to an html file, and the html file may be opened in a spreadsheet.
+          . The Account Report has limited formatting options but, like all &app; reports, being in
+          html format, can be copied and pasted into a spreadsheet for further formatting.
+          Alternatively, the Account Report can be exported to an html file, and the html file may
+          be opened in a spreadsheet.
         </para>
 
         <note>
@@ -15659,8 +15779,8 @@ ________________________________________________________________________________
             <guibutton>Add</guibutton> button, then on the new line selecting
             <guibutton>Reconcile</guibutton> <guibutton>is</guibutton>
             <guibutton>Reconciled</guibutton>, and finally selecting <guilabel>Search for items
-            where</guilabel> <guibutton>any criteria are met</guibutton>. In either case,
-            &app; will show you exactly the same set of transactions.
+            where</guilabel> <guibutton>any criteria are met</guibutton>. In either case, &app; will
+            show you exactly the same set of transactions.
           </para>
         </sect3>
       </sect2>
@@ -15782,8 +15902,7 @@ ________________________________________________________________________________
           </para>
 
           <tip>
-            <para>Aside the results, &app; gives you some buttons to manage the
-              highlighted result.
+            <para>Aside the results, &app; gives you some buttons to manage the highlighted result.
             </para>
           </tip>
 
@@ -19408,14 +19527,14 @@ ________________________________________________________________________________
       <title>Editor prezzi</title>
 
       <note>
-        <para>&app; uses the term <emphasis role="Italic">commodity</emphasis> to
-          mean anything that it counts: Currencies, securities (i.e intangible assets like stock or
-          mutual fund shares and bonds), or tangible assets like trucks and computers. When valuing
-          one commodity in terms of another it uses the term <emphasis role="Italic">Exchange
-          Rate</emphasis> between two currencies and <emphasis role="Italic">Price</emphasis>
-          between a non-currency commodity and a currency commodity. For the rest of this section
-          we'll use "price" to mean both price and exchange rate and "commodity" to mean any sort of
-          commodity except where currency behavior is different.
+        <para>&app; uses the term <emphasis role="Italic">commodity</emphasis> to mean anything that it counts:
+          Currencies, securities (i.e intangible assets like stock or mutual fund shares and bonds),
+          or tangible assets like trucks and computers. When valuing one commodity in terms of
+          another it uses the term <emphasis role="Italic">Exchange Rate</emphasis> between two
+          currencies and <emphasis role="Italic">Price</emphasis> between a non-currency commodity
+          and a currency commodity. For the rest of this section we'll use "price" to mean both
+          price and exchange rate and "commodity" to mean any sort of commodity except where
+          currency behavior is different.
         </para>
       </note>
 
@@ -19589,11 +19708,10 @@ ________________________________________________________________________________
         <para>Per avere il supporto alla ricezione delle quotazioni tramite internet per una particolare azione o
           fondo comune, occorre prima di tutto abilitare l’opzione per la ricezione delle
           quotazioni e selezionare una fonte nell’<guilabel>Editor titolo</guilabel>. Questo
-          processo è descritto in dettaglio in <xref linkend="tool-price-online3"/>. Una
-          volta abilitato il servizio e installato il modulo
-          <application>Finance::Quote</application>, sarà possibile aggiornare le quotazioni delle
-          proprie azioni e dei propri fondi comuni premendo semplicemente il pulsante
-          <guibutton>Ricevi quotazioni</guibutton>.
+          processo è descritto in dettaglio in <xref linkend="tool-price-online3"/>. Una volta
+          abilitato il servizio e installato il modulo <application>Finance::Quote</application>,
+          sarà possibile aggiornare le quotazioni delle proprie azioni e dei propri fondi comuni
+          premendo semplicemente il pulsante <guibutton>Ricevi quotazioni</guibutton>.
         </para>
       </sect2>
     </sect1>
@@ -19824,9 +19942,8 @@ ________________________________________________________________________________
       </itemizedlist>
 
       <para>Esempi di utilizzo del <guilabel>Calcolatore di prestiti</guilabel> di &app; sono forniti nella
-        «guida ai concetti e manuale».
-        <ulink url="&url-docs-it;guide/loans_calcs1.html">Capitolo sui prestiti nella «guida
-        ai concetti e manuale»</ulink>
+        «guida ai concetti e manuale». <ulink url="&url-docs-it;guide/loans_calcs1.html">Capitolo
+        sui prestiti nella «guida ai concetti e manuale»</ulink>
       </para>
     </sect1>
 
@@ -19877,20 +19994,19 @@ ________________________________________________________________________________
       <sect2 id="tool-close-book-workings">
         <title>How It Works</title>
 
-        <para>&app; closes books by creating one transaction per currency for income
-          accounts, and one transaction per currency for expense accounts. The transactions all use
-          the date selected by the user, and each transaction may contain any number of splits. Each
-          split moves the balance out of one income or expense account. The last split in each
-          closing transaction moves the total offsetting debit/credit balance into the specified
-          equity account.
+        <para>&app; closes books by creating one transaction per currency for income accounts, and one transaction
+          per currency for expense accounts. The transactions all use the date selected by the user,
+          and each transaction may contain any number of splits. Each split moves the balance out of
+          one income or expense account. The last split in each closing transaction moves the total
+          offsetting debit/credit balance into the specified equity account.
         </para>
 
         <para>Each transaction will use the description provided by the user in the
           <guilabel>Description:</guilabel> entry.
         </para>
 
-        <para>The fact that &app; just uses transactions to close the books makes it
-          very simple to undo a book closing: just delete the closing transactions.
+        <para>The fact that &app; just uses transactions to close the books makes it very simple to undo a book
+          closing: just delete the closing transactions.
         </para>
       </sect2>
 
@@ -19907,8 +20023,8 @@ ________________________________________________________________________________
 
         <para>Note that closing the books in <application>GnuCash </application> is unnecessary. You do not need
           to zero out your income and expense accounts at the end of each financial period.
-          &app;’s built-in reports automatically handle concepts like
-          retained earnings between two different financial periods.
+          &app;’s built-in reports automatically handle concepts like retained earnings between
+          two different financial periods.
         </para>
 
         <para>In fact, closing the books reduces the usefulness of the standard reports because the reports
@@ -19964,7 +20080,9 @@ ________________________________________________________________________________
         </para>
 
         <figure pgwide="1">
-          <title>Lots in Account window for Security Capital Gains</title><screenshot id="tool-lotsInAcctStk">
+          <title>Lots in Account window for Security Capital Gains</title>
+
+          <screenshot id="tool-lotsInAcctStk">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Tool_LotsStk.png" srccredit="Chris Good" width="&img-w;"/>
@@ -20229,8 +20347,8 @@ ________________________________________________________________________________
 
           <itemizedlist>
             <listitem>
-              <para><guilabel>>>:</guilabel> Links a free split (buy or sell) to a lot. This button is not
-                enabled until both a lot and a free split are highlighted. The split moves from the
+              <para><guilabel>>>:</guilabel> Links a free split (buy or sell) to a lot. This button is not enabled
+                until both a lot and a free split are highlighted. The split moves from the
                 <guilabel>Splits free</guilabel> panel to the <guilabel>Splits in lot</guilabel>
                 panel.
               </para>
@@ -20242,11 +20360,11 @@ ________________________________________________________________________________
             </listitem>
 
             <listitem>
-              <para><guilabel><<:</guilabel> Unlinks a split from a lot. The split moves from the
-                <guilabel>Splits in lot</guilabel> panel to the <guilabel>Splits free</guilabel>
-                panel. This button is not enabled until a split in the <guilabel>Splits in
-                lot</guilabel> panel is highlighted. When the last split is unlinked from a lot, the
-                lot is automatically deleted if there is no capital gain/loss transaction.
+              <para><guilabel><<:</guilabel> Unlinks a split from a lot. The split moves from the <guilabel>Splits
+                in lot</guilabel> panel to the <guilabel>Splits free</guilabel> panel. This button
+                is not enabled until a split in the <guilabel>Splits in lot</guilabel> panel is
+                highlighted. When the last split is unlinked from a lot, the lot is automatically
+                deleted if there is no capital gain/loss transaction.
               </para>
             </listitem>
 
@@ -20345,8 +20463,7 @@ ________________________________________________________________________________
             </listitem>
           </itemizedlist>
 
-          <para>See Tutorial and Concepts Guide,
-            <ulink url="&url-docs-it;guide/invest-sell1.html#invest-sellLots">
+          <para>See Tutorial and Concepts Guide, <ulink url="&url-docs-it;guide/invest-sell1.html#invest-sellLots">
             Automatic Calculation of Capital Gain or Loss Using Lots</ulink> for more details.
           </para>
         </sect3>
@@ -20370,9 +20487,9 @@ ________________________________________________________________________________
             <listitem>
               <para>To enquire about which payments or credit notes offset particular invoices. For each invoice and
                 credit note, <application>GnuCash </application> automatically creates 1 (and only
-                1) lot. By selecting the lot for the invoice or credit note in the <guilabel>Lots
-                in This Account</guilabel> panel, all the transaction splits for that lot show in
-                the <guilabel>Splits in Lot</guilabel> panel.
+                1) lot. By selecting the lot for the invoice or credit note in the <guilabel>Lots in
+                This Account</guilabel> panel, all the transaction splits for that lot show in the
+                <guilabel>Splits in Lot</guilabel> panel.
               </para>
 
               <tip>
@@ -20405,7 +20522,9 @@ ________________________________________________________________________________
           </para>
 
           <figure pgwide="1">
-            <title>Lots in Account window for business features</title><screenshot id="tool-lotsInAcctBus">
+            <title>Lots in Account window for business features</title>
+
+            <screenshot id="tool-lotsInAcctBus">
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/Tool_LotsBus.png" srccredit="Chris Good" width="&img-w;"/>
@@ -20611,9 +20730,8 @@ ________________________________________________________________________________
     <sect1 id="report-config">
       <title>Configuring Reports and Charts</title>
 
-      <para>&app; reports have many configuration options. First, run the original
-        report itself. Then, access the report options with the <guibutton>Options</guibutton>
-        button on the toolbar.
+      <para>&app; reports have many configuration options. First, run the original report itself. Then, access
+        the report options with the <guibutton>Options</guibutton> button on the toolbar.
       </para>
 
       <note>
@@ -20793,8 +20911,8 @@ ________________________________________________________________________________
     <sect1 id="report-classes">
       <title>Reports Listed By Class</title>
 
-      <para>&app; has classified the main types of reports into major classes.
-        These are all available under the Reports menu.
+      <para>&app; has classified the main types of reports into major classes. These are all available under the
+        Reports menu.
       </para>
 
       <sect2 id="report-general">
@@ -20877,7 +20995,9 @@ ________________________________________________________________________________
             <title>Opzioni del resoconto</title>
 
             <figure>
-              <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="TxRptOpt_Screen">
+              <title><emphasis>Transaction Report, Report Options</emphasis></title>
+
+              <screenshot id="TxRptOpt_Screen">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/TxRptOpt_Screen.png" srccredit="Geert Janssens" width="&img-w;"/>
@@ -22095,8 +22215,7 @@ ________________________________________________________________________________
               </listitem>
 
               <listitem>
-                <para><guilabel>Rate of Gain:</guilabel> Total Gain / Money In * 100 (from
-                  &app; 2.6.1 onwards)
+                <para><guilabel>Rate of Gain:</guilabel> Total Gain / Money In * 100 (from &app; 2.6.1 onwards)
                 </para>
               </listitem>
 
@@ -22261,13 +22380,12 @@ ________________________________________________________________________________
             <para>Istogramma delle attività:
             </para>
 
-            <para>The Asset Barchart report displays bars that present the value of all assets in a
-              &app; file over time. By default, the report shows all
-              accounts in <emphasis>Accounts Receivable</emphasis>, <emphasis>Current
-              Assets</emphasis>, <emphasis>Fixed Assets</emphasis>, <emphasis>Investments</emphasis>
-              and Special Accounts (if they exist) and it displays monthly bars for the current
-              financial period. This report provides a graphic view of the assets in the file over
-              time.
+            <para>The Asset Barchart report displays bars that present the value of all assets in a &app; file over
+              time. By default, the report shows all accounts in <emphasis>Accounts
+              Receivable</emphasis>, <emphasis>Current Assets</emphasis>, <emphasis>Fixed
+              Assets</emphasis>, <emphasis>Investments</emphasis> and Special Accounts (if they
+              exist) and it displays monthly bars for the current financial period. This report
+              provides a graphic view of the assets in the file over time.
             </para>
 
             <tip>
@@ -22298,8 +22416,8 @@ ________________________________________________________________________________
             <para>By default the report includes all <emphasis>asset</emphasis> accounts and sub-accounts, as well as
               <emphasis>Imbalance</emphasis> and <emphasis>Orphan</emphasis> Special accounts in
               whatever currencies or commodities may be present. The report's base currency is the
-              default currency of the &app; file but if the file has
-              data for multiple currencies, then it can be changed to another currency.
+              default currency of the &app; file but if the file has data for multiple currencies,
+              then it can be changed to another currency.
             </para>
 
             <para>Since each account may be individually selected, the report can be designed to focus on a small
@@ -23496,9 +23614,8 @@ make doc
     <sect1 id="set-prefs">
       <title>Impostare le preferenze</title>
 
-      <para>The <guilabel>GnuCash Preferences</guilabel> window allows you to customize your
-        &app; session by setting several options. From the
-        &app; menu select
+      <para>The <guilabel>GnuCash Preferences</guilabel> window allows you to customize your &app; session by
+        setting several options. From the &app; menu select
         <menuchoice>
           <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
         </menuchoice>
@@ -23506,8 +23623,8 @@ make doc
         <menuchoice>
           <guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem>
         </menuchoice>
-        on &mac;). The <guilabel>GnuCash Preferences</guilabel> window will open. Using the tabs
-        on the left make your desired changes. The settings in this dialog are set per user and not
+        on &mac;). The <guilabel>GnuCash Preferences</guilabel> window will open. Using the tabs on
+        the left make your desired changes. The settings in this dialog are set per user and not
         stored with the file. This is in contrast to the settings described in
         <xref linkend="book-options"/>, which are kept with, and are part of, the file (or Book),
         and as such are common to all users. So <guilabel>GnuCash Preferences</guilabel> settings
@@ -23540,7 +23657,9 @@ make doc
         <title>Periodo contabile</title>
 
         <figure id="prefs-acct-period-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounting Period</guilabel> tab</title><screenshot id="Prefer_Accounting-Period">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounting Period</guilabel> tab</title>
+
+          <screenshot id="Prefer_Accounting-Period">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_AccntPeriod.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -23609,9 +23728,8 @@ make doc
               </listitem>
 
               <listitem>
-                <para><guilabel>Include non-currency totals:</guilabel> if this option is selected,
-                  &app; will include in the
-                  <emphasis>Summarybar</emphasis> a total for non-currency items (for instance
+                <para><guilabel>Include non-currency totals:</guilabel> if this option is selected, &app; will include in
+                  the <emphasis>Summarybar</emphasis> a total for non-currency items (for instance
                   number of shares).
                 </para>
               </listitem>
@@ -23624,7 +23742,9 @@ make doc
         <title>Conti</title>
 
         <figure id="prefs-acct-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title><screenshot id="Prefer_Accounts">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title>
+
+          <screenshot id="Prefer_Accounts">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_Accnts.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -23732,7 +23852,9 @@ make doc
         <title>Impresa</title>
 
         <figure id="prefs-biz-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Business</guilabel> tab</title><screenshot id="Prefer_Business">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Business</guilabel> tab</title>
+
+          <screenshot id="Prefer_Business">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_Business.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -23815,8 +23937,8 @@ make doc
 
             <itemizedlist>
               <listitem>
-                <para><guilabel>Notify when due:</guilabel> Lets you set whether you want to be notified at
-                  &app; startup of when a bill is soon to be due.
+                <para><guilabel>Notify when due:</guilabel> Lets you set whether you want to be notified at &app; startup
+                  of when a bill is soon to be due.
                 </para>
               </listitem>
 
@@ -23855,7 +23977,9 @@ make doc
         <title>Data e ora</title>
 
         <figure id="prefs-date-time-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Date/Time</guilabel> tab</title><screenshot id="Prefer_DateTime">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Date/Time</guilabel> tab</title>
+
+          <screenshot id="Prefer_DateTime">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_DateTime.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -23946,7 +24070,9 @@ make doc
         <title>Generali</title>
 
         <figure id="prefs-general-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>General</guilabel> tab</title><screenshot id="Prefer_General">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>General</guilabel> tab</title>
+
+          <screenshot id="Prefer_General">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_General.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -23971,15 +24097,13 @@ make doc
             <itemizedlist>
               <listitem>
                 <para><guilabel>Display "Tip of the Day" dialog:</guilabel> This option displays or hides the
-                  <guilabel>Tip of the Day</guilabel> screen when &app;
-                  is started.
+                  <guilabel>Tip of the Day</guilabel> screen when &app; is started.
                 </para>
               </listitem>
 
               <listitem>
                 <para><guilabel>Show splash screen:</guilabel> With this option you can enable or disable the
-                  visualization of the startup screen while &app; is
-                  starting up.
+                  visualization of the startup screen while &app; is starting up.
                 </para>
               </listitem>
 
@@ -24029,8 +24153,8 @@ make doc
 
             <itemizedlist>
               <listitem>
-                <para><guilabel>Display negative amounts in red:</guilabel> If you turn off this option,
-                  &app; will display negative numbers in black.
+                <para><guilabel>Display negative amounts in red:</guilabel> If you turn off this option, &app; will
+                  display negative numbers in black.
                 </para>
               </listitem>
 
@@ -24059,15 +24183,14 @@ make doc
 
             <itemizedlist>
               <listitem>
-                <para><guilabel>Compress files:</guilabel> This option determines whether the
-                  &app; data file will be compressed or not.
+                <para><guilabel>Compress files:</guilabel> This option determines whether the &app; data file will be
+                  compressed or not.
                 </para>
               </listitem>
 
               <listitem>
-                <para><guilabel>Show auto-save confirmation question:</guilabel> If this option is enabled,
-                  &app; will show you a confirmation screen each time
-                  the auto-save process is started.
+                <para><guilabel>Show auto-save confirmation question:</guilabel> If this option is enabled, &app; will
+                  show you a confirmation screen each time the auto-save process is started.
                 </para>
               </listitem>
 
@@ -24130,7 +24253,9 @@ make doc
         <title>Online Banking</title>
 
         <figure id="prefs-online-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Online Banking</guilabel> tab</title><screenshot id="Prefer_OnlineBanking">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Online Banking</guilabel> tab</title>
+
+          <screenshot id="Prefer_OnlineBanking">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_OnlineBanking.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -24260,8 +24385,7 @@ make doc
             </para>
 
             <note>
-              <para>This section is shown only if &app; is compiled with Aqbanking and
-                <acronym>HBCI</acronym> support.
+              <para>This section is shown only if &app; is compiled with Aqbanking and <acronym>HBCI</acronym> support.
               </para>
             </note>
 
@@ -24273,15 +24397,14 @@ make doc
               </listitem>
 
               <listitem>
-                <para><guilabel>Remember PIN:</guilabel> Enable this option if you want &app;
-                  to remember the PIN you enter for online banking authentication.
+                <para><guilabel>Remember PIN:</guilabel> Enable this option if you want &app; to remember the PIN you
+                  enter for online banking authentication.
                 </para>
               </listitem>
 
               <listitem>
-                <para><guilabel>Verbose debug messages:</guilabel> Enable this option if you want
-                  &app; to show more information about the online
-                  banking operations.
+                <para><guilabel>Verbose debug messages:</guilabel> Enable this option if you want &app; to show more
+                  information about the online banking operations.
                 </para>
               </listitem>
             </itemizedlist>
@@ -24293,7 +24416,9 @@ make doc
         <title>Stampa</title>
 
         <figure id="prefs-printing-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Printing</guilabel> tab</title><screenshot id="Prefer_Printing">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Printing</guilabel> tab</title>
+
+          <screenshot id="Prefer_Printing">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_Printing.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -24340,7 +24465,9 @@ make doc
         <title>Registro</title>
 
         <figure id="prefs-reg-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register</guilabel> tab</title><screenshot id="Prefer_Register">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register</guilabel> tab</title>
+
+          <screenshot id="Prefer_Register">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_Register.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -24426,8 +24553,7 @@ make doc
             <itemizedlist>
               <listitem>
                 <para><guilabel>Use system theme colors:</guilabel> If selected, the system color theme will be applied to
-                  register windows. Otherwise the original &app;
-                  register color will be used.
+                  register windows. Otherwise the original &app; register color will be used.
                 </para>
               </listitem>
 
@@ -24439,15 +24565,14 @@ make doc
               </listitem>
 
               <listitem>
-                <para><guilabel>Draw horizontal lines between rows:</guilabel> If selected,
-                  &app; will draw a horizontal line between each row.
+                <para><guilabel>Draw horizontal lines between rows:</guilabel> If selected, &app; will draw a horizontal
+                  line between each row.
                 </para>
               </listitem>
 
               <listitem>
-                <para><guilabel>Draw vertical lines between columns:</guilabel> If selected,
-                  &app; will draw a vertical line between the cells in
-                  each row.
+                <para><guilabel>Draw vertical lines between columns:</guilabel> If selected, &app; will draw a vertical
+                  line between the cells in each row.
                 </para>
               </listitem>
             </itemizedlist>
@@ -24459,7 +24584,9 @@ make doc
         <title>Predefinite del registro</title>
 
         <figure id="prefs-reg-def-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register Defaults</guilabel> tab</title><screenshot id="Prefer_RegisterDefaults">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register Defaults</guilabel> tab</title>
+
+          <screenshot id="Prefer_RegisterDefaults">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_RegisterDefaults.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -24550,7 +24677,9 @@ make doc
         <title>Resoconti</title>
 
         <figure id="prefs-reports-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Reports</guilabel> tab</title><screenshot id="Prefer_Reports">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Reports</guilabel> tab</title>
+
+          <screenshot id="Prefer_Reports">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_Reports.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -24609,7 +24738,9 @@ make doc
         <title>Transazioni pianificate</title>
 
         <figure id="prefs-sched-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Scheduled Transactions</guilabel> tab</title><screenshot id="Prefer_ScheduledTransactions">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Scheduled Transactions</guilabel> tab</title>
+
+          <screenshot id="Prefer_ScheduledTransactions">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_Sched.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -24639,8 +24770,7 @@ make doc
             <itemizedlist>
               <listitem>
                 <para><guilabel>Run when data file opened:</guilabel> If selected, the <guilabel>Since Last Run</guilabel>
-                  screen will appear on &app; start-up (or rather when
-                  &app; opens the file).
+                  screen will appear on &app; start-up (or rather when &app; opens the file).
                 </para>
               </listitem>
             </itemizedlist>
@@ -24679,7 +24809,9 @@ make doc
         <title>Finestre</title>
 
         <figure id="prefs-windows-fig">
-          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Windows</guilabel> tab</title><screenshot id="Prefer_Windows">
+          <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Windows</guilabel> tab</title>
+
+          <screenshot id="Prefer_Windows">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Pref_Windows.png" srccredit="Cristian Marchi" width="&img-w;"/>
@@ -24703,9 +24835,8 @@ make doc
 
             <itemizedlist>
               <listitem>
-                <para><guilabel>Save window size and position:</guilabel> If selected, next time
-                  &app; starts will re-use the windows size and
-                  position configured in the last run.
+                <para><guilabel>Save window size and position:</guilabel> If selected, next time &app; starts will re-use
+                  the windows size and position configured in the last run.
                 </para>
               </listitem>
             </itemizedlist>
@@ -24768,13 +24899,12 @@ make doc
         <menuchoice>
           <guimenu>File</guimenu> <guimenuitem>Properties</guimenuitem>
         </menuchoice>
-        menu item is used to set or modify choices that affect how a specific
-        &app; file (also referred to as a Book) operates. Selecting
-        this menu item brings up the <guilabel>Book Options</guilabel> dialog. This dialog also
-        appears in situations where you are importing transactions into a new book, with the title
-        <guilabel>New Book Options</guilabel>. It is automatically raised in these 'new book'
-        situations because these settings can affect how imported data are converted to
-        &app; transactions and so should be considered and set before
+        menu item is used to set or modify choices that affect how a specific &app; file (also
+        referred to as a Book) operates. Selecting this menu item brings up the <guilabel>Book
+        Options</guilabel> dialog. This dialog also appears in situations where you are importing
+        transactions into a new book, with the title <guilabel>New Book Options</guilabel>. It is
+        automatically raised in these 'new book' situations because these settings can affect how
+        imported data are converted to &app; transactions and so should be considered and set before
         your first import (specifically, the <xref linkend="num-action-book-option"/> setting).
       </para>
 
@@ -24798,13 +24928,12 @@ make doc
         settings for <guilabel>Book Options</guilabel>. The <guibutton>Apply</guibutton> button is
         initially insensitive but becomes sensitive when any setting is set or changed. Selecting it
         saves the setting(s) for the book but keeps the <guilabel>Book Options</guilabel> dialog
-        open. Typically, the changes are reflected in the affected areas of
-        &app; as soon as the button is pressed, so it can be used to
-        'see' the effect of a given option without having to re-open the dialog. The
-        <guibutton>Apply</guibutton> button is not sensitive on the dialog if it appears during
-        transaction import (that is, 'new book') situations. The <guibutton>OK</guibutton> button
-        behaves like the <guibutton>Apply</guibutton> button except that it immediately
-        <emphasis>closes</emphasis> the dialog, as well.
+        open. Typically, the changes are reflected in the affected areas of &app; as soon as the
+        button is pressed, so it can be used to 'see' the effect of a given option without having to
+        re-open the dialog. The <guibutton>Apply</guibutton> button is not sensitive on the dialog
+        if it appears during transaction import (that is, 'new book') situations. The
+        <guibutton>OK</guibutton> button behaves like the <guibutton>Apply</guibutton> button except
+        that it immediately <emphasis>closes</emphasis> the dialog, as well.
       </para>
 
       <sect2 id="accounts-book-options">
@@ -24822,8 +24951,7 @@ make doc
           </para>
 
           <tip>
-            <para>To avoid several problems on multiple currency accounting read Peter Selinger's
-              &ulink-sel-tut;.
+            <para>To avoid several problems on multiple currency accounting read Peter Selinger's &ulink-sel-tut;.
             </para>
           </tip>
         </sect3>
@@ -24866,9 +24994,8 @@ make doc
           </para>
 
           <warning>
-            <para>Initial setup of &app;: It is expected that, after careful
-              consideration of the consequences, this option will be set when a new
-              &app; file is created and not changed thereafter (see
+            <para>Initial setup of &app;: It is expected that, after careful consideration of the consequences, this
+              option will be set when a new &app; file is created and not changed thereafter (see
               next warning). For this reason, a preference is provided (see
               <link linkend="prefs-general">Setting Preferences - General </link>) that can
               establish an initial default setting for new files, so that if you will have more than
@@ -24897,11 +25024,11 @@ make doc
               data display/reporting/exporting determines which field is displayed as number.
             </para>
 
-            <para>There is no reason to avoid changing this option for an existing &app;
-              file if you understand the implications. If you elect to make this change, it should
-              probably be done between accounting periods with the understanding that number data
-              prior to the date the option is changed will be displayed/reported/exported
-              differently from that after the date.
+            <para>There is no reason to avoid changing this option for an existing &app; file if you understand the
+              implications. If you elect to make this change, it should probably be done between
+              accounting periods with the understanding that number data prior to the date the
+              option is changed will be displayed/reported/exported differently from that after the
+              date.
             </para>
           </warning>
 
@@ -24917,11 +25044,10 @@ make doc
             <para>This option is only available in <application>GnuCash </application> version 2.6 or later. If a
               <application>GnuCash </application> file from an earlier version is opened in version
               2.6 or later, and this feature is not used, this feature will not prevent the file
-              from being opened in the earlier version of &app;.
-              However, if the option is set, the file will not be able to be opened by the earlier
-              version, even if the option is set back to its original setting. A warning dialog will
-              be displayed from the earlier version. Do not set this option if you want to open the
-              file with an earlier version.
+              from being opened in the earlier version of &app;. However, if the option is set, the
+              file will not be able to be opened by the earlier version, even if the option is set
+              back to its original setting. A warning dialog will be displayed from the earlier
+              version. Do not set this option if you want to open the file with an earlier version.
             </para>
           </warning>
         </sect3>
@@ -25026,8 +25152,8 @@ make doc
         </variablelist>
 
         <note>
-          <para>None of the above values is required to use &app; but, if given, will
-            be used throughout the program. (f.e. in reports, invoices etc...)
+          <para>None of the above values is required to use &app; but, if given, will be used throughout the
+            program. (f.e. in reports, invoices etc...)
           </para>
         </note>
       </sect2>
@@ -25059,8 +25185,8 @@ make doc
         </para>
 
         <note>
-          <para>For historical reasons &app; accepts multiple format specifiers
-            although they all yield the same end result. You can choose "li", "lli" or I64i".
+          <para>For historical reasons &app; accepts multiple format specifiers although they all yield the same end
+            result. You can choose "li", "lli" or I64i".
           </para>
         </note>
       </sect2>
@@ -25963,10 +26089,9 @@ make doc
         you should be cautioned that you will need to manually change each one if you do so, which
         could be quite tedious. The tax categories are unique for each Income Tax Entity Type, so
         changing the type will make all previously assigned categories invalid. It is assumed (and
-        highly recommended) that each &app; file is for only one tax
-        entity and this is where you specify its type of tax entity. You should not keep, for
-        example, personal and partnership accounts mixed in one &app;
-        file if you plan to use the Income Tax Reporting features.
+        highly recommended) that each &app; file is for only one tax entity and this is where you
+        specify its type of tax entity. You should not keep, for example, personal and partnership
+        accounts mixed in one &app; file if you plan to use the Income Tax Reporting features.
       </para>
 
       <para>A given <acronym>TXF</acronym> code can be assigned to multiple accounts. The Tax Schedule Report
@@ -26107,10 +26232,10 @@ make doc
         </itemizedlist>
 
         <para>Does not accept the dates outside of the tax year. This is a problem for the last payment that is
-          due Jan 15. &app; changes the the date of the last payment to
-          Dec 31 for the export unless the "Do not use special date processing" option is selected
-          in the report options display tab. The user will have to adjust for this after import. The
-          date only matters if you have to compute the penalty.
+          due Jan 15. &app; changes the the date of the last payment to Dec 31 for the export unless
+          the "Do not use special date processing" option is selected in the report options display
+          tab. The user will have to adjust for this after import. The date only matters if you have
+          to compute the penalty.
         </para>
 
         <para>TXF Tax eXport Format
@@ -26147,19 +26272,18 @@ make doc
           information left blank (to be separately added in the tax software). The code can be
           assigned to either a short-, long-, or mixed-term gain/loss income account and the
           security sales transaction should be entered as illustrated in Section 8.7, Selling
-          Shares, of the &app; Tutorial and Concepts Guide. The report
-          uses the transaction split of the gain/loss account to find one or more other splits in
-          the same transaction with negative share quantities. For each of these found, it generates
-          a detailed <acronym>TXF</acronym> output record with the quantity sold, the name of the
-          security, the date sold, and the sales amount. Note that if, for a given transaction, more
-          than one transaction split is to a gain/loss income account assigned to code 673,
+          Shares, of the &app; Tutorial and Concepts Guide. The report uses the transaction split of
+          the gain/loss account to find one or more other splits in the same transaction with
+          negative share quantities. For each of these found, it generates a detailed
+          <acronym>TXF</acronym> output record with the quantity sold, the name of the security, the
+          date sold, and the sales amount. Note that if, for a given transaction, more than one
+          transaction split is to a gain/loss income account assigned to code 673,
           <acronym>TXF</acronym> output data will be erroneously repeated. That is because the
           report will fetch the same data, and re-output it, for each transaction split set to a
           gain/loss income account within the same transaction. For this reason, there should be no
           more than one gain/loss account entered per transaction to use this tax reporting code
-          properly. (Note that no amounts are used from &app;’s
-          lot-tracking; a future enhancement is expected to use this data to provide capital gain
-          reporting).
+          properly. (Note that no amounts are used from &app;’s lot-tracking; a future enhancement
+          is expected to use this data to provide capital gain reporting).
         </para>
       </sect2>
 
@@ -37862,8 +37986,8 @@ bogus_symbol2,price2,date2
 
       <para>If your document contains nontrivial examples of program code, we recommend releasing these examples
         in parallel under your choice of free software license, such as the
-        <ulink url="&url-gpl;">GNU General Public License</ulink>, to
-        permit their use in free software.
+        <ulink url="&url-gpl;">GNU General Public License</ulink>, to permit their use in free
+        software.
       </para>
     </sect1>
   </appendix>
diff --git a/ja/guide/appendixa.xml b/ja/guide/appendixa.xml
index 6f198292..03cca371 100644
--- a/ja/guide/appendixa.xml
+++ b/ja/guide/appendixa.xml
@@ -83,6 +83,7 @@ class="registered">Quicken</trademark>および類似のプログラムでは、
           伝統的なので<acronym>URL</acronym>を使用しています
           (そのような若い技術と言われるかもしれないですが!)。
         </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
diff --git a/ja/guide/ch_basics.xml b/ja/guide/ch_basics.xml
index ca86c254..b9c78a0b 100644
--- a/ja/guide/ch_basics.xml
+++ b/ja/guide/ch_basics.xml
@@ -98,7 +98,9 @@
       </para>
 
       <figure pgwide="1">
-        <title>基本勘定科目の関係</title><screenshot id="basics-AccountRelationships">
+        <title>基本勘定科目の関係</title>
+
+        <screenshot id="basics-AccountRelationships">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/basics_AccountRelationships.png"
@@ -583,7 +585,9 @@ linkend="basics-open-data">開いて</link>修正するために、ファイル
               </para>
 
               <figure>
-                <title><acronym>XML</acronym>または<acronym>sqlite3</acronym>が選択されているときの保存画面。</title><screenshot id="basics-SaveXML">
+                <title><acronym>XML</acronym>または<acronym>sqlite3</acronym>が選択されているときの保存画面。</title>
+
+                <screenshot id="basics-SaveXML">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveXML.png"
@@ -635,7 +639,9 @@ Marchi"/>
               </para>
 
               <figure>
-                <title><acronym>mysql</acronym>または<acronym>postgres</acronym>が選択されているときの保存画面。</title><screenshot id="basics-SaveSQL">
+                <title><acronym>mysql</acronym>または<acronym>postgres</acronym>が選択されているときの保存画面。</title>
+
+                <screenshot id="basics-SaveSQL">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveSQL.png"
diff --git a/ja/guide/ch_currency.xml b/ja/guide/ch_currency.xml
index 7565603e..5a553c37 100644
--- a/ja/guide/ch_currency.xml
+++ b/ja/guide/ch_currency.xml
@@ -40,8 +40,8 @@
         にある<guilabel>勘定科目</guilabel>タブで有効にすることができます。
       </para>
 
-      <para><guilabel>投機</guilabel>勘定科目の完全なガイドについては &ulink-sel-tut;
-        by Peter Selinger を参照してください。
+      <para><guilabel>投機</guilabel>勘定科目の完全なガイドについては &ulink-sel-tut; by Peter
+        Selinger を参照してください。
       </para>
     </note>
   </sect1>
diff --git a/ja/guide/ch_invest.xml b/ja/guide/ch_invest.xml
index dc11761a..3477c07f 100644
--- a/ja/guide/ch_invest.xml
+++ b/ja/guide/ch_invest.xml
@@ -974,8 +974,7 @@ role="strong">オンライン相場表取得ツールをインストール</emph
           </itemizedlist>
         </para>
 
-        <para>&mac;:の場合:
-          XCodeがインストールされている必要があります。
+        <para>&mac;:の場合: XCodeがインストールされている必要があります。
           XCodeは&mac;:ディストリビューションDVDのオプション項目です。 &app;
           dmg 内にある<emphasis role="strong">Update Finance
           Quote</emphasis>を実行してください。
@@ -1017,8 +1016,8 @@ role="strong">オンライン相場表取得ツールをインストール</emph
         </para>
 
         <note>
-          <para>これらの手順のどれかを実行してうまくいかない、ヘルプを求めて&app;利用者メーリングリスト(<email>gnucash-user at gnucash.org</email>)に電子メールを出すか、<ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>の上の&app;
-            IRCチャンネルに来てください。
+          <para>これらの手順のどれかを実行してうまくいかない、ヘルプを求めて&app;利用者メーリングリスト(<email>gnucash-user at gnucash.org</email>)に電子メールを出すか、<ulink url='&url-irc;'>#gnucash
+            channel at &srv-irc;</ulink>の上の&app; IRCチャンネルに来てください。
             この手順を省いて、手動で株価を更新することもできます。
           </para>
         </note>
diff --git a/ja/guide/ch_oview.xml b/ja/guide/ch_oview.xml
index 516dc3b0..4fc50533 100644
--- a/ja/guide/ch_oview.xml
+++ b/ja/guide/ch_oview.xml
@@ -157,8 +157,8 @@ Thuree"/>
             とオペレーティングシステムでサポートされます。 &app;
             &vers-stable; が完全にサポー
             トされるオペレーティングシステム(およびプラットフォーム) の
-            リストは次の通りです。&lin; (x86、x86_64)、 FreeBSD (x86,
-            x86_64)、OpenBSD (x86, x86_64)、&mac; (x86_64) および&win;。
+            リストは次の通りです。&lin; (x86、x86_64)、 FreeBSD (x86, x86_64)、OpenBSD
+            (x86, x86_64)、&mac; (x86_64) および&win;。
             &app;の以前のバージョンは、SGI IRIX(MIPS)と、IBM
             AIX4.1.5(RS/6000)と、Unixware7(Intel)と、 SCO OpenServer5.0.4(Intel), Solaris
             (SPARC, x86_64)、で動作
diff --git a/ja/guide/ch_txns.xml b/ja/guide/ch_txns.xml
index 14aaa19d..63d05a44 100644
--- a/ja/guide/ch_txns.xml
+++ b/ja/guide/ch_txns.xml
@@ -145,7 +145,9 @@ function="enter">Enter</keycap>を押すと、スプリット画面が<quote>折
       </para>
 
       <figure id="txns-register-multiaccount">
-        <title>スプリット取引の入力</title><mediaobject>
+        <title>スプリット取引の入力</title>
+
+        <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_multiaccount.png"
 srccredit="Bengt Thuree" />
@@ -417,7 +419,11 @@ srccredit="Bengt Thuree" />
     <para><guilabel>資金移動</guilabel>欄では勘定科目名のクイック入力がサポートされます。
       勘定科目名を入力し始めると、&app;によって名前の残りの部分が補完されます。
       セパレータ文字を入力するといつでも、現在の階層の勘定科目名が補完され、次の階層の勘定科目名を入力し始められるようにカーソルが位置調整されます。
-      例えば、標準の勘定科目集を使用している時、<keycombo action='seq'><keycap>A</keycap><keycap>:</keycap><keycap>C</keycap></keycombo>を入力すると<emphasis>Assets:Checking</emphasis>勘定科目に補完されます。
+      例えば、標準の勘定科目集を使用している時、
+      <keycombo action='seq'>
+        <keycap>A</keycap><keycap>:</keycap><keycap>C</keycap>
+      </keycombo>
+      を入力すると<emphasis>Assets:Checking</emphasis>勘定科目に補完されます。
       また、この欄で<keycap>メニュー</keycap>を選択するかまたは
       <keycombo>
         <keycap>Ctrl</keycap><keycap>Down</keycap>
diff --git a/ja/guide/fdl-appendix.xml b/ja/guide/fdl-appendix.xml
index 2f4fb2bb..5687b7c5 100644
--- a/ja/guide/fdl-appendix.xml
+++ b/ja/guide/fdl-appendix.xml
@@ -557,9 +557,8 @@
     </para>
 
     <para>If your document contains nontrivial examples of program code, we recommend releasing these examples
-      in parallel under your choice of free software license, such as the
-      <ulink url="&url-gpl;">GNU General Public License</ulink>,
-      to permit their use in free software.
+      in parallel under your choice of free software license, such as the <ulink url="&url-gpl;">GNU
+      General Public License</ulink>, to permit their use in free software.
     </para>
   </sect1>
 </appendix>
diff --git a/ja/guide/index.docbook b/ja/guide/index.docbook
index 240e14dd..e76babbf 100644
--- a/ja/guide/index.docbook
+++ b/ja/guide/index.docbook
@@ -90,79 +90,110 @@
         <revnumber>&appname; Tutorial and Concepts Guide 5.2</revnumber>
         <date>25 June 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 5.1</revnumber>
         <date>30 April 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 5.0</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.14</revnumber>
         <date>26 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.903</revnumber>
         <date>12 March 2023</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.900</revnumber>
         <date>8 January 2023</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.13</revnumber>
         <date>18 December 2022</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.12</revnumber>
         <date>25 September 2022</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.11</revnumber>
         <date>26 June 2022</date>
         <revdescription>
-          <para role="author">Multiple authors </para>
+          <para role="author">Multiple authors
+          </para>
+
           <para role="publisher">&appname; Documentation Team
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.10</revnumber>
         <date>27 March 2022</date>
@@ -174,6 +205,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.9</revnumber>
         <date>19 December 2021</date>
@@ -185,6 +217,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.8</revnumber>
         <date>28 September 2021</date>
@@ -196,6 +229,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.7</revnumber>
         <date>26 September 2021</date>
@@ -207,6 +241,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
         <date>27 June 2021</date>
@@ -218,6 +253,7 @@
           </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.5</revnumber>
         <date>28 March 2021</date>
@@ -229,180 +265,233 @@
           </para>
         </revdescription>
       </revision>
-      <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
-      <date>28 December 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v4.3</revnumber>
-      <date>27 December 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v4.2</revnumber>
-      <date>27 September 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v4.1</revnumber>
-      <date>26 July 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v4.0</revnumber>
-      <date>28 June 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.11</revnumber>
-      <date>28 June 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.10</revnumber>
-      <date>11 April 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.0</revnumber>
-      <date>29 December 2013</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.4.2</revnumber>
-      <date>17 November 2012</date>
-      <revdescription>
-        <para role="author">複数の作者
-        </para>
-
-        <para role="publisher">&app;文書化チーム
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.4.1</revnumber>
-      <date>1 July 2011</date>
-      <revdescription>
-        <para role="author">複数の作者
-        </para>
-
-        <para role="publisher">&app;文書化チーム
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname;チュートリアル・コンセプトガイド
-      v2.3.16</revnumber> <date>2010年11月7日</date>
-      <revdescription>
-        <para role="author">Jon Lapham <email>lapham at extracta.com.br</email>
-        </para>
-
-        <para role="author">Bengt Thuree <email>bengt at thuree.com</email>
-        </para>
-
-        <para role="author">Dave Herman <email>dvherman at bigfoot.com</email>
-        </para>
-
-        <para role="publisher">&appname;文書化チーム
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname;チュートリアル・コンセプトガイド
-      v2.0.0</revnumber> <date>2006年7月</date>
-      <revdescription>
-        <para role="author">Jon Lapham <email>lapham at extracta.com.br</email>
-        </para>
-
-        <para role="author">Bengt Thuree <email>bengt at thuree.com</email>
-        </para>
-
-        <para role="author">Dave Herman <email>dvherman at bigfoot.com</email>
-        </para>
-
-        <para role="publisher">&appname;文書化チーム
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname;チュートリアル・コンセプトガイド
-      v1.8.3</revnumber> <date>2003年8月</date>
-      <revdescription>
-        <para role="author">Jon Lapham <email>lapham at extracta.com.br</email>
-        </para>
-
-        <para role="publisher">&appname;文書化チーム
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname;チュートリアル・コンセプトガイド
-      v1.8.2</revnumber> <date>2003年8月</date>
-      <revdescription>
-        <para role="author">Jon Lapham <email>lapham at extracta.com.br</email>
-        </para>
-
-        <para role="publisher">&appname;文書化チーム
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname;チュートリアル・コンセプトガイド
-      v1.8.1</revnumber> <date>2003年5月</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
-
-        <para role="publisher">&appname;文書化チーム
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname;チュートリアル・コンセプトガイド
-      v1.8.0</revnumber> <date>2003年1月</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
-
-        <para role="publisher">&appname;文書化チーム
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname;ユーザーガイド v1.6.5</revnumber>
-      <date>2002年6月</date>
-      <revdescription>
-        <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
-        </para>
-
-        <para role="publisher">&appname;文書化チーム
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname;ユーザーガイド v1.6.0</revnumber>
-      <date>2001年10月</date>
-      <revdescription>
-        <para role="author">Carol Champagne <email>carol at io.com</email>
-        </para>
-
-        <para role="publisher">&appname;文書化チーム
-        </para>
-      </revdescription>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.4</revnumber>
+        <date>28 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v4.3</revnumber>
+        <date>27 December 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v4.2</revnumber>
+        <date>27 September 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v4.1</revnumber>
+        <date>26 July 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v4.0</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.11</revnumber>
+        <date>28 June 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.10</revnumber>
+        <date>11 April 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.0</revnumber>
+        <date>29 December 2013</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.4.2</revnumber>
+        <date>17 November 2012</date>
+        <revdescription>
+          <para role="author">複数の作者
+          </para>
+
+          <para role="publisher">&app;文書化チーム
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.4.1</revnumber>
+        <date>1 July 2011</date>
+        <revdescription>
+          <para role="author">複数の作者
+          </para>
+
+          <para role="publisher">&app;文書化チーム
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname;チュートリアル・コンセプトガイド v2.3.16</revnumber>
+        <date>2010年11月7日</date>
+        <revdescription>
+          <para role="author">Jon Lapham <email>lapham at extracta.com.br</email>
+          </para>
+
+          <para role="author">Bengt Thuree <email>bengt at thuree.com</email>
+          </para>
+
+          <para role="author">Dave Herman <email>dvherman at bigfoot.com</email>
+          </para>
+
+          <para role="publisher">&appname;文書化チーム
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname;チュートリアル・コンセプトガイド v2.0.0</revnumber>
+        <date>2006年7月</date>
+        <revdescription>
+          <para role="author">Jon Lapham <email>lapham at extracta.com.br</email>
+          </para>
+
+          <para role="author">Bengt Thuree <email>bengt at thuree.com</email>
+          </para>
+
+          <para role="author">Dave Herman <email>dvherman at bigfoot.com</email>
+          </para>
+
+          <para role="publisher">&appname;文書化チーム
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname;チュートリアル・コンセプトガイド v1.8.3</revnumber>
+        <date>2003年8月</date>
+        <revdescription>
+          <para role="author">Jon Lapham <email>lapham at extracta.com.br</email>
+          </para>
+
+          <para role="publisher">&appname;文書化チーム
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname;チュートリアル・コンセプトガイド v1.8.2</revnumber>
+        <date>2003年8月</date>
+        <revdescription>
+          <para role="author">Jon Lapham <email>lapham at extracta.com.br</email>
+          </para>
+
+          <para role="publisher">&appname;文書化チーム
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname;チュートリアル・コンセプトガイド v1.8.1</revnumber>
+        <date>2003年5月</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">&appname;文書化チーム
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname;チュートリアル・コンセプトガイド v1.8.0</revnumber>
+        <date>2003年1月</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">&appname;文書化チーム
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname;ユーザーガイド v1.6.5</revnumber>
+        <date>2002年6月</date>
+        <revdescription>
+          <para role="author">Chris Lyttle <email>chris at wilddev.net</email>
+          </para>
+
+          <para role="publisher">&appname;文書化チーム
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname;ユーザーガイド v1.6.0</revnumber>
+        <date>2001年10月</date>
+        <revdescription>
+          <para role="author">Carol Champagne <email>carol at io.com</email>
+          </para>
+
+          <para role="publisher">&appname;文書化チーム
+          </para>
+        </revdescription>
       </revision>
     </revhistory>
 
diff --git a/pt/guide/appendixa.xml b/pt/guide/appendixa.xml
index 66048182..d04cbe43 100644
--- a/pt/guide/appendixa.xml
+++ b/pt/guide/appendixa.xml
@@ -133,10 +133,9 @@
       </listitem>
 
       <listitem>
-        <para>Instale um processador <acronym>XSLT</acronym> tal como o
-          <ulink url="&url-saxon;">Saxon</ulink> ou o
-          <ulink url="&url-xalan;">Xalan-J</ulink>. Qualquer processador normalizado
-          serve, realmente...
+        <para>Instale um processador <acronym>XSLT</acronym> tal como o <ulink url="&url-saxon;">Saxon</ulink> ou
+          o <ulink url="&url-xalan;">Xalan-J</ulink>. Qualquer processador normalizado serve,
+          realmente...
         </para>
       </listitem>
 
diff --git a/pt/guide/ch_accts.xml b/pt/guide/ch_accts.xml
index 1bea946c..e4d85dfc 100644
--- a/pt/guide/ch_accts.xml
+++ b/pt/guide/ch_accts.xml
@@ -48,17 +48,20 @@ Translators:
 
     <figure pgwide="1">
       <title>As relações básicas entre contas</title>
+
       <screenshot id="accts-AccountRelationships">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/basics_AccountRelationships.png"
                        srccredit="Pedro Albuquerque"/>
           </imageobject>
+
           <imageobject role="fo">
             <imagedata fileref="figures/basics_AccountRelationships.svg"
                        srccredit="Pedro Albuquerque"
                        contentwidth="4in"/>
           </imageobject>
+
           <caption>
             <para>Uma visão gráfica da relação entre as 5 contas básicas. O valor líquido (capital próprio)
               aumenta com a receita e diminui com a despesa. As setas representam o movimento dos
@@ -147,8 +150,8 @@ Translators:
       (<emphasis>Dinheiro</emphasis>, <emphasis>Banco</emphasis>, <emphasis>Acção</emphasis>,
       <emphasis>Fundo de investimento</emphasis>, <emphasis>A/Receber</emphasis> e
       <emphasis>Activo</emphasis>), três contas de passivos (<emphasis>Cartão de
-      crédito</emphasis>, <emphasis>A/Pagar</emphasis> e <emphasis>Passivo</emphasis>), uma
-      conta de capital próprio (<emphasis>Capital próprio</emphasis>), uma conta de receita
+      crédito</emphasis>, <emphasis>A/Pagar</emphasis> e <emphasis>Passivo</emphasis>), uma conta
+      de capital próprio (<emphasis>Capital próprio</emphasis>), uma conta de receita
       (<emphasis>Receita</emphasis>) e uma conta de despesa (<emphasis>Despesa</emphasis>).
     </para>
 
@@ -176,8 +179,8 @@ Translators:
 
         <listitem>
           <para><guilabel>Banco</guilabel> - esta conta serve para controlar o saldo do dinheiro que tem em
-            instituições bancárias, correctoras, empresas de poupanças - o que quer que seja onde
-            o seu dinheiro é guardado por outras pessoas. É o segundo tipo de conta mais
+            instituições bancárias, correctoras, empresas de poupanças - o que quer que seja
+            onde o seu dinheiro é guardado por outras pessoas. É o segundo tipo de conta mais
             <emphasis>líquido</emphasis>, porque pode ser facilmente convertido em dinheiro na
             mão.
           </para>
@@ -186,9 +189,9 @@ Translators:
         <listitem>
           <para><guilabel>Acção</guilabel> - controle as suas acções e títulos individuais usando este tipo de
             conta. O diário de contas Acção oferece colunas extra para inserir o número de
-            acções e a cotação do seu investimento. Este tipo de activos pode não ser facilmente
-            convertível em dinheiro, a não ser que encontre um comprador, mas não é garantido
-            que recupere o dinheiro investido.
+            acções e a cotação do seu investimento. Este tipo de activos pode não ser
+            facilmente convertível em dinheiro, a não ser que encontre um comprador, mas não é
+            garantido que recupere o dinheiro investido.
           </para>
         </listitem>
 
@@ -206,8 +209,8 @@ Translators:
             com a entrada destes fundos.
           </para>
 
-          <para>Transacções envolvendo uma conta A/Receber não devem ser adicionadas, alteradas ou eliminadas
-            por nenhum outro meio que não seja:
+          <para>Transacções envolvendo uma conta A/Receber não devem ser adicionadas, alteradas ou eliminadas por
+            nenhum outro meio que não seja:
           </para>
 
           <itemizedlist>
@@ -323,8 +326,8 @@ Translators:
       </tip>
 
       <note>
-        <para>A equação contabilística que liga as contas de balanço é Activo = Passivo + Capital próprio ou,
-          re-arranjada, Activo - Passivo = Capital próprio. Ou seja, em linguagem corrente,
+        <para>A equação contabilística que liga as contas de balanço é Activo = Passivo + Capital próprio
+          ou, re-arranjada, Activo - Passivo = Capital próprio. Ou seja, em linguagem corrente,
           <emphasis>aquilo que é seu</emphasis> menos <emphasis>aquilo que deve</emphasis> é igual
           ao seu <emphasis>valor líquido</emphasis>.
         </para>
@@ -377,12 +380,14 @@ Translators:
 
       <figure pgwide="1">
         <title>Contas predefinidas de receita</title>
+
         <screenshot id="accts-DefaultIncomeAccounts">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra as contas padrão de <emphasis>Receita</emphasis>
               </para>
@@ -393,12 +398,14 @@ Translators:
 
       <figure pgwide="1">
         <title>Algumas contas predefinidas de despesa</title>
+
         <screenshot id="accts-DefaultDespesaAccounts">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra algumas contas predefinidas de <emphasis>Despesa</emphasis>
               </para>
@@ -424,13 +431,13 @@ Translators:
 
       <para>Vamos assumir que tem no seu banco uma conta à ordem e uma conta poupança e que está empregado,
         recebendo um ordenado. Tem um cartão de crédito (Visa) e paga serviços mensais na forma
-        de renda, telefone e electricidade. Naturalmente também tem de comprar comida. Para já não
-        nos vamos preocupar com quanto dinheiro tem no banco, quanto deve no cartão de crédito,
-        etc. Queremos simplesmente construir a estrutura desta árvore de contas.
+        de renda, telefone e electricidade. Naturalmente também tem de comprar comida. Para já
+        não nos vamos preocupar com quanto dinheiro tem no banco, quanto deve no cartão de
+        crédito, etc. Queremos simplesmente construir a estrutura desta árvore de contas.
       </para>
 
-      <para>Os seus <guilabel>activos</guilabel> seriam a conta poupança e a conta à ordem. O seu passivo seria
-        o cartão de crédito. O seu <guilabel>capital próprio</guilabel> seriam os valores
+      <para>Os seus <guilabel>activos</guilabel> seriam a conta poupança e a conta à ordem. O seu passivo
+        seria o cartão de crédito. O seu <guilabel>capital próprio</guilabel> seriam os valores
         iniciais do cartão de crédito e das contas no banco (ainda não temos esses valores, mas
         sabemos que existem). Tem <guilabel>receitas</guilabel> na forma de ordenado e
         <guilabel>despesas</guilabel> na forma de comida, renda, electricidade, telefone e impostos
@@ -478,12 +485,14 @@ Translators:
 
           <figure pgwide="1">
             <title>Criação de uma conta de activos</title>
+
             <screenshot id="accts-CreateAssetsAccounts">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/accts_CreateAssetsAccount.png"
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o diálogo para criar uma conta de activos
                   </para>
@@ -524,12 +533,14 @@ Translators:
 
       <figure pgwide="1">
         <title>As contas de topo básicas</title>
+
         <screenshot id="accts-toplevel">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/accts_toplevel.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra as contas de topo básicas.
               </para>
@@ -651,12 +662,14 @@ Translators:
 
       <figure pgwide="1">
         <title>A árvore de contas básica</title>
+
         <screenshot id="accts-tree">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/accts_tree.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra uma árvore de contas simples.
               </para>
diff --git a/pt/guide/ch_basics.xml b/pt/guide/ch_basics.xml
index c74aa7f3..564c388b 100644
--- a/pt/guide/ch_basics.xml
+++ b/pt/guide/ch_basics.xml
@@ -126,12 +126,14 @@
 
       <figure pgwide="1">
         <title>As relações básicas entre contas</title>
+
         <screenshot id="basics-AccountRelationships">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/basics_AccountRelationships.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Uma imagem das relações entre as cinco contas básicas. O valor líquido (capital próprio)
                 aumenta através da receita e diminui através da despesa. As setas representam o
@@ -150,8 +152,8 @@
         dupla entrada</firstterm>. Para cada alteração de valor numa conta da equação
         contabilística, tem de haver uma alteração equilibrada noutra. Este conceito é conhecido
         como <firstterm>Princípio do equilíbrio</firstterm> e é de importância fundamental para
-        compreender o &app; e outros sistemas contabilísticos de dupla entrada. Quando trabalha
-        com o &app;, estará sempre preocupado com pelo menos duas contas, para manter a equação
+        compreender o &app; e outros sistemas contabilísticos de dupla entrada. Quando trabalha com
+        o &app;, estará sempre preocupado com pelo menos duas contas, para manter a equação
         contabilística equilibrada.
       </para>
 
@@ -159,9 +161,9 @@
         simultaneamente, creditando outra. <firstterm>Débitos</firstterm> e
         <firstterm>Créditos</firstterm> contabilísticos não significam <quote>decréscimo</quote>
         e <quote>acréscimo</quote>. Tanto os débitos como os créditos aumentam certas contas e
-        diminuem outras. Em contas de activos e despesas, os débitos aumentam o saldo e os créditos
-        diminuem-no. Nas contas de passivo, capital próprio e receita, os créditos aumentam o
-        saldo e os débitos diminuem-no.
+        diminuem outras. Em contas de activos e despesas, os débitos aumentam o saldo e os
+        créditos diminuem-no. Nas contas de passivo, capital próprio e receita, os créditos
+        aumentam o saldo e os débitos diminuem-no.
       </para>
 
       <para>Na contabilidade tradicional de dupla entrada, a coluna esquerda do diário é usada para débitos,
@@ -184,9 +186,10 @@
         <para>A utilização comum das palavras <emphasis>débito</emphasis> e <emphasis>crédito</emphasis> não
           corresponde à forma como os contabilistas usam estes termos. Em termos comuns,
           <emphasis>crédito</emphasis> tem uma associação positiva. Em contabilidade,
-          <emphasis>crédito</emphasis> significa <emphasis>afectar a coluna direita</emphasis> de um
-          diário de conta. Isto é associado a um <emphasis>decréscimo</emphasis> no activo e nas
-          despesas, mas a um <emphasis>acréscimo</emphasis> de receita, passivo e capital próprio.
+          <emphasis>crédito</emphasis> significa <emphasis>afectar a coluna direita</emphasis> de
+          um diário de conta. Isto é associado a um <emphasis>decréscimo</emphasis> no activo e
+          nas despesas, mas a um <emphasis>acréscimo</emphasis> de receita, passivo e capital
+          próprio.
         </para>
 
         <para>Para mais detalhes, veja <ulink url="&url-wp-pt;Débito_e_crédito">Débitos e créditos</ulink>.
@@ -251,8 +254,8 @@
       </para>
 
       <para>Exemplos de contas incluem: contas à ordem, contas poupança, contas de cartões de crédito,
-        hipotecas e empréstimos. Cada conta &app; controla a actividade da conta <quote>real</quote>
-        e pode informá-lo do seu estado.
+        hipotecas e empréstimos. Cada conta &app; controla a actividade da conta
+        <quote>real</quote> e pode informá-lo do seu estado.
       </para>
 
       <para>Além disto, as contas também são usadas para categorizar o dinheiro que recebe ou gasta. Por
@@ -279,8 +282,8 @@
 
       <para>Em <link linkend="basics-accountingdouble2">contabilidade de dupla entrada</link>, as transacções
         envolvem sempre pelo menos duas contas – uma conta origem e uma conta destino. O &app;
-        gere esta situação inserindo uma linha na transacção para cada conta afectada e registando
-        os montantes envolvidos em cada linha. Uma linha destas é chamada
+        gere esta situação inserindo uma linha na transacção para cada conta afectada e
+        registando os montantes envolvidos em cada linha. Uma linha destas é chamada
         <firstterm>parcela</firstterm>. Uma transacção pode conter qualquer número de parcelas.
       </para>
 
@@ -308,12 +311,14 @@
 
       <figure pgwide="1">
         <title>Dica do dia</title>
+
         <screenshot id="basics-TipOfDay">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/basics_TipOfDay.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra a <guilabel>Dica do dia</guilabel>.
               </para>
@@ -340,12 +345,14 @@
 
       <figure pgwide="1">
         <title>A janela da árvore de contas</title>
+
         <screenshot id="basics-Accounts">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/basics_Accounts.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra a janela <guilabel>Contas</guilabel>.
               </para>
@@ -399,13 +406,15 @@
 
       <figure pgwide="1">
         <title>O diário da conta à ordem</title>
+
         <screenshot id="basics-CheckAccount">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/basics_CheckAccount.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
-           <caption>
+
+            <caption>
               <para>Esta imagem mostra o <guilabel>diário da conta à ordem</guilabel> com várias transacções.
               </para>
             </caption>
@@ -545,10 +554,10 @@
         utilizadores.
       </para>
 
-      <para>Alguns dos itens de menu mais comummente usados também têm atalhos de teclado que activam o comando
-        directamente sem ter de passar através da estrutura dos menus. Tipicamente estes usam a
-        tecla <keycap>Ctrl</keycap>, embora possam usar qualquer combinação de teclas. Estes
-        atalhos são mostrados a seguir aos itens de menu.
+      <para>Alguns dos itens de menu mais comummente usados também têm atalhos de teclado que activam o
+        comando directamente sem ter de passar através da estrutura dos menus. Tipicamente estes
+        usam a tecla <keycap>Ctrl</keycap>, embora possam usar qualquer combinação de teclas.
+        Estes atalhos são mostrados a seguir aos itens de menu.
       </para>
     </sect2>
   </sect1>
@@ -580,8 +589,8 @@
     <sect2 id="basics-web2">
       <title>Acesso à Internet</title>
 
-      <para>A janela de <guilabel>ajuda do &appname;</guilabel> também actua como um navegador web simples, para
-        que possa abrir uma página web para obter informação adicional. Pode abrir qualquer
+      <para>A janela de <guilabel>ajuda do &appname;</guilabel> também actua como um navegador web simples,
+        para que possa abrir uma página web para obter informação adicional. Pode abrir qualquer
         página nesta janela clicando em <guibutton>Abrir</guibutton> na <emphasis>barra de
         ferramentas</emphasis> e digitando o URL. Use os botões <guibutton>Recuar</guibutton>,
         <guibutton>Avançar</guibutton>, <guibutton>Recarregar</guibutton>,
@@ -589,19 +598,19 @@
         padrão.
       </para>
 
-      <para>A <ulink url="&url-www;"><citetitle>página web do &appname;</citetitle></ulink>
-        contém informação útil sobre o programa e suas actualizações. Também contém
-        ligações às listas de correio do &app; para utilizadores e programadores e permite a
-        procura nos <ulink url="https://lists.gnucash.org/cgi-bin/namazu.cgi"><citetitle>arquivos
-        das listas de correio do &app;</citetitle></ulink> por discussões sobre um tópico
-        específico. Se não encontrar as respostas que procura, pode perguntar na
-        <ulink url="&url-mail-li;gnucash-user"> lista de utilizadores
-        do &appname;</ulink> e alguém nessa lista tentará responder-lhe.
+      <para>A <ulink url="&url-www;"><citetitle>página web do &appname;</citetitle></ulink> contém
+        informação útil sobre o programa e suas actualizações. Também contém ligações às
+        listas de correio do &app; para utilizadores e programadores e permite a procura nos
+        <ulink url="https://lists.gnucash.org/cgi-bin/namazu.cgi"><citetitle>arquivos das listas de
+        correio do &app;</citetitle></ulink> por discussões sobre um tópico específico. Se não
+        encontrar as respostas que procura, pode perguntar na
+        <ulink url="&url-mail-li;gnucash-user"> lista de utilizadores do &appname;</ulink> e alguém
+        nessa lista tentará responder-lhe.
       </para>
 
       <para>As <guilabel>FAQ do &appname;</guilabel> mais actualizadas estão localizadas em
-        <ulink url="&url-wiki-faq;">Faq do &appname;</ulink> e contêm respostas
-        às perguntas mais frequentes.
+        <ulink url="&url-wiki-faq;">Faq do &appname;</ulink> e contêm respostas às perguntas mais
+        frequentes.
       </para>
     </sect2>
 
@@ -674,9 +683,9 @@
         </listitem>
 
         <listitem>
-          <para>Seleccione o <guilabel>formato dos dados</guilabel> do ficheiro que está a gravar na lista pendente.
-            A seleção predefinida é <acronym>XML</acronym>, mas se tiver um motor de base de
-            dados configurado, pode mudar para esse formato.
+          <para>Seleccione o <guilabel>formato dos dados</guilabel> do ficheiro que está a gravar na lista
+            pendente. A seleção predefinida é <acronym>XML</acronym>, mas se tiver um motor de
+            base de dados configurado, pode mudar para esse formato.
           </para>
 
           <para>Dependendo do <guilabel>formato de dados</guilabel> seleccionado, a janela pode mudar, como descrito
@@ -693,12 +702,15 @@
               </para>
 
               <figure>
-                <title>Ecrã de gravação quando selecciona <acronym>XML</acronym> ou <acronym>sqlite3</acronym>.</title><screenshot id="basics-SaveXML">
+                <title>Ecrã de gravação quando selecciona <acronym>XML</acronym> ou <acronym>sqlite3</acronym>.</title>
+
+                <screenshot id="basics-SaveXML">
                   <mediaobject>
                     <imageobject>
                       <imagedata fileref="figures/basics_SaveXML.png"
                                  srccredit="Pedro Albuquerque"/>
                     </imageobject>
+
                     <caption>
                       <para>Esta imagem mostra o ecrã <guilabel>Gravar como...</guilabel> quando o <guilabel>formato dos dados
                         </guilabel> é <acronym>XML</acronym> ou <acronym>sqlite3</acronym>.
@@ -741,12 +753,14 @@
 
               <figure>
                 <title>Ecrã de gravação quando selecciona <acronym>mysql</acronym> ou <acronym>postgres</acronym></title>
+
                 <screenshot id="basics-SaveSQL">
                   <mediaobject>
                     <imageobject>
                       <imagedata fileref="figures/basics_SaveSQL.png"
                                  srccredit="Pedro Albuquerque"/>
                     </imageobject>
+
                     <caption>
                       <para>Esta imagem mostra o ecrã <guilabel>Gravar como...</guilabel> quando o <guilabel>formato dos
                         dados</guilabel> é <acronym>mysql</acronym> ou <acronym>postgres</acronym>.
@@ -817,8 +831,8 @@
           <guimenu>Ficheiro</guimenu> <guimenuitem>Abrir</guimenuitem>
         </menuchoice>
         na <emphasis>barra de menus</emphasis>. Na janela que surge, seleccione o <guilabel>formato
-        de dados</guilabel>. Se seleccionou <guilabel>Ficheiro</guilabel> escolha o ficheiro que quer
-        abrir, navegando pelas pastas nos painéis inferiores. Senão, insira a necessária
+        de dados</guilabel>. Se seleccionou <guilabel>Ficheiro</guilabel> escolha o ficheiro que
+        quer abrir, navegando pelas pastas nos painéis inferiores. Senão, insira a necessária
         informação para <guilabel>ligação à base de dados</guilabel>.
       </para>
 
@@ -881,18 +895,18 @@
     <sect2 id="basics-backupxac2">
       <title>Cópia de segurança (.gnucash)</title>
 
-      <para>Sempre que grava o seu ficheiro de dados, também é gravada uma salvaguarda com a
-        extensão <filename>.AAAAMMDDHHMMSS.gnucash</filename>. Este ficheiro é uma cópia completa
-        do seu ficheiro de dados anterior. E o formato do nome de ficheiro refere-se ao ano, mês,
-        dia e hora da salvaguarda. Por exemplo, o ficheiro
+      <para>Sempre que grava o seu ficheiro de dados, também é gravada uma salvaguarda com a extensão
+        <filename>.AAAAMMDDHHMMSS.gnucash</filename>. Este ficheiro é uma cópia completa do seu
+        ficheiro de dados anterior. E o formato do nome de ficheiro refere-se ao ano, mês, dia e
+        hora da salvaguarda. Por exemplo, o ficheiro
         <filename>meufich.gnucash.20160122180000.gnucash</filename> indica que esta é uma cópia de
         segurança do ficheiro <filename>meufich</filename>, gravado a 22 de Janeiro de 2016,
         exactamente às 18:00.
       </para>
 
       <para>Para restaurar uma salvaguarda, abra simplesmente o ficheiro
-        <filename>AAAAMMDDHHMMSS.gnucash</filename> com a data a que quer voltar. Certifique-se de que
-        grava esse ficheiro com um nome diferente.
+        <filename>AAAAMMDDHHMMSS.gnucash</filename> com a data a que quer voltar. Certifique-se de
+        que grava esse ficheiro com um nome diferente.
       </para>
 
       <note>
@@ -909,9 +923,9 @@
 
       <para>De cada vez que abre e edita um ficheiro no &app;, é criado um ficheiro de registo, que grava as
         alterações feitas ao seu ficheiro de dados. Este ficheiro de registo usa um formato de
-        nome semelhante ao das salvaguardas: <filename>.AAAAMMDDHHMMSS.log</filename>. Os
-        ficheiros de registo não são uma cópia completa do seu ficheiro de dados - simplesmente
-        gravam as alterações feitas ao ficheiro de dados na sessão actual do &app;.
+        nome semelhante ao das salvaguardas: <filename>.AAAAMMDDHHMMSS.log</filename>. Os ficheiros
+        de registo não são uma cópia completa do seu ficheiro de dados - simplesmente gravam as
+        alterações feitas ao ficheiro de dados na sessão actual do &app;.
       </para>
 
       <para>Caso saia do &app; inadvertidamente, possivelmente por uma falha eléctrica ou um rebentamento do
@@ -932,20 +946,20 @@
               ficheiro .log do &appname;...</guimenuitem>
             </menuchoice>
             e seleccione aquele que tiver a mesma data que o ficheiro gravado que acabou de abrir.
-            Certifique-se de que escolhe o ficheiro correcto ou corre o risco de lançar o caos nas suas
-            contas.
+            Certifique-se de que escolhe o ficheiro correcto ou corre o risco de lançar o caos nas
+            suas contas.
           </para>
         </listitem>
       </orderedlist>
 
-      <para>A reprodução do ficheiro recupera qualquer transacção que afcete o saldo inserida desde a última
-        gravação, incluindo aquelas criadas a partir de transacções agendadas e funcionalidades
-        de negócios (facturas, pagamentos, etc.).
+      <para>A reprodução do ficheiro recupera qualquer transacção que afcete o saldo inserida desde a
+        última gravação, incluindo aquelas criadas a partir de transacções agendadas e
+        funcionalidades de negócios (facturas, pagamentos, etc.).
       </para>
 
       <warning>
-        <para>Alterações às transacções agendadas, facturas ou pagamentos em si mesmos NÃO são recuperadas e
-          as suas transacções que o foram podem não estar correctamente associadas a elas. Deve
+        <para>Alterações às transacções agendadas, facturas ou pagamentos em si mesmos NÃO são recuperadas
+          e as suas transacções que o foram podem não estar correctamente associadas a elas. Deve
           portanto verificar tudo cuidadosamente. Especialmente transacções de negócios, onde
           poderá ter de eliminar e recriar algumas. Se não o fizer, embora o balanço possa estar
           correcto, alguns relatórios não estarão.
@@ -985,15 +999,15 @@
       </para>
 
       <note>
-        <para>Se actualizou o &app; da versão 2.4 ou anterior, poderá também ter salvaguardas no antigo
-          formato <filename>.xac</filename>. Para estas, pode aplicar o mesmo princípio descrito
-          acima para os ficheiros <filename>.AAAAMMDDHHMMSS.gnucash</filename>.
+        <para>Se actualizou o &app; da versão 2.4 ou anterior, poderá também ter salvaguardas no antigo formato
+          <filename>.xac</filename>. Para estas, pode aplicar o mesmo princípio descrito acima para
+          os ficheiros <filename>.AAAAMMDDHHMMSS.gnucash</filename>.
         </para>
       </note>
 
       <para>Também deve eliminar todos os ficheiros <filename>.LCK</filename> e <filename>.LNK</filename> que
-        vir após fechar o &app;. Se decidir fazer uma salvaguarda manual noutro disco,
-        basta copiar o ficheiro de dados principal - não as salvaguardas
+        vir após fechar o &app;. Se decidir fazer uma salvaguarda manual noutro disco, basta copiar
+        o ficheiro de dados principal - não as salvaguardas
         <filename>.AAAAMMDDHHMMSS.gnucash</filename>.
       </para>
 
@@ -1031,8 +1045,8 @@
         &app;.
       </para>
 
-      <para>Todos os outros ficheiros na pasta são ou salvaguardas ou ficheiros de registo. Não faz
-        mal se também os copiar, mas também não tem utilidade.
+      <para>Todos os outros ficheiros na pasta são ou salvaguardas ou ficheiros de registo. Não faz mal se
+        também os copiar, mas também não tem utilidade.
       </para>
     </sect2>
 
@@ -1041,15 +1055,15 @@
 
       <para>As preferências são armazenadas em três locais diferentes: um para as preferências do &app;, um
         para os relatórios e um para as definições dos bancos. As preferências são geridas pelo
-        <application>gsettings</application>, os relatórios são geridos pelo &app; e a banca
-        em linha é gerida pelo <application>aqbanking</application>. Se não usa a banca em linha, não
-        terá esta pasta na sua máquina.
+        <application>gsettings</application>, os relatórios são geridos pelo &app; e a banca em
+        linha é gerida pelo <application>aqbanking</application>. Se não usa a banca em linha,
+        não terá esta pasta na sua máquina.
       </para>
 
       <para>Onde as preferências do &app; estão armazenadas varia, dependendo do seu sistema operativo (veja
         <xref linkend="App-sett-loc" />, <xref linkend="Report-loc" />, e
-        <xref linkend="OB-sett-loc" />). Para fazer uma salvaguarda da instalação
-        completa, tem de incluir estas preferências todas.
+        <xref linkend="OB-sett-loc" />). Para fazer uma salvaguarda da instalação completa, tem de
+        incluir estas preferências todas.
       </para>
 
       <table id="App-sett-loc">
@@ -1254,16 +1268,19 @@
 
         <figure pgwide="1">
           <title>O assistente Nova hierarquia de contas</title>
+
           <screenshot id="basics-NewAccountHierarchySetup">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
                            srccredit="Pedro Albuquerque" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
                            srccredit="Pedro Albuquerque"/>
               </imageobject>
+
               <caption>
                 <para>Esta imagem mostra o primeiro ecrã do assistente <guilabel>Nova hierarquia de contas</guilabel>.
                 </para>
@@ -1288,18 +1305,21 @@
           </para>
         </note>
 
-      <figure pgwide="1">
-        <title>O assistente Nova hierarquia de contas - Moeda</title>
+        <figure pgwide="1">
+          <title>O assistente Nova hierarquia de contas - Moeda</title>
+
           <screenshot id="basics-NewAccountHierarchySetup-currency">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
                            srccredit="Pedro Albuquerque" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
                            srccredit="Pedro Albuquerque"/>
               </imageobject>
+
               <caption>
                 <para>Esta imagem mostra o segundo ecrã do assistente <guilabel>Nova hierarquia de contas</guilabel>,
                   onde selecciona a moeda.
@@ -1319,16 +1339,19 @@
 
         <figure pgwide="1">
           <title>O assistente Nova hierarquia de contas - Opções do livro</title>
+
           <screenshot id="basics-NewAccountHierarchySetup-book-options">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_book_options.png"
                            srccredit="Pedro Albuquerque" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_book_options.png"
                            srccredit="Pedro Albuquerque"/>
               </imageobject>
+
               <caption>
                 <para>Esta imagem mostra o terceiro ecrã do assistente <guilabel>Nova hierarquia de contas</guilabel>,
                   onde selecciona as opções do novo livro.
@@ -1350,18 +1373,21 @@
           </para>
         </note>
 
-      <figure pgwide="1">
-        <title>O assistente Nova hierarquia de contas - Contas</title>
+        <figure pgwide="1">
+          <title>O assistente Nova hierarquia de contas - Contas</title>
+
           <screenshot id="basics-NewAccountHierarchySetup-Accounts">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
                            srccredit="Pedro Albuquerque" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
                            srccredit="Pedro Albuquerque"/>
               </imageobject>
+
               <caption>
                 <para>Esta imagem mostra o quarto ecrã do assistente <guilabel>Nova hierarquia de contas</guilabel>, onde
                   escolhe as várias contas.
@@ -1382,16 +1408,19 @@
 
         <figure pgwide="1">
           <title>O assistente Nova hierarquia de contas - Configurar</title>
+
           <screenshot id="basics-NewAccountHierarchySetup-Setup.png">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
                            srccredit="Pedro Albuquerque" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
                            srccredit="Pedro Albuquerque"/>
               </imageobject>
+
               <caption>
                 <para>Esta imagem mostra o quinto ecrã do assistente <guilabel>Nova hierarquia de contas</guilabel> .
                 </para>
@@ -1408,16 +1437,19 @@
 
         <figure pgwide="1">
           <title>O assistente Nova hierarquia de contas - Final</title>
+
           <screenshot id="basics-NewAccountHierarchySetup-Finish">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
                            srccredit="Pedro Albuquerque" width="&img-w;"/>
               </imageobject>
+
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
                            srccredit="Pedro Albuquerque"/>
               </imageobject>
+
               <caption>
                 <para>Esta imagem mostra o último ecrã do assistente <guilabel>Nova hierarquia de contas</guilabel>.
                 </para>
@@ -1438,8 +1470,9 @@
         <para>A sua janela principal deverá agora parecer-se com esta:
         </para>
 
-       <figure pgwide="1">
-        <title>A janela principal mostrando o ficheiro de teste</title>
+        <figure pgwide="1">
+          <title>A janela principal mostrando o ficheiro de teste</title>
+
           <screenshot id="basics-EmptyAccounts">
             <mediaobject>
               <imageobject>
diff --git a/pt/guide/ch_budgets.xml b/pt/guide/ch_budgets.xml
index d0219c99..d50188a5 100644
--- a/pt/guide/ch_budgets.xml
+++ b/pt/guide/ch_budgets.xml
@@ -20,10 +20,16 @@
   <sect1 id="budget_concepts1">
     <title>Conceitos básicos</title>
 
-    <para>Um orçamento é um instrumento para estimar as receitas e despesas esperadas. Pode utilizá-lo para o ajudar a planear como pretende que as suas finanças mudem ao longo de um período de tempo e para examinar como é que as suas transacções financeiras reais para o dito período se comparam com as suas transacções planeadas.
+    <para>Um orçamento é um instrumento para estimar as receitas e despesas esperadas. Pode utilizá-lo para
+      o ajudar a planear como pretende que as suas finanças mudem ao longo de um período de tempo
+      e para examinar como é que as suas transacções financeiras reais para o dito período se
+      comparam com as suas transacções planeadas.
     </para>
 
-    <para>O conceito de orçamentação é bastante geral, por isso o &app; oferece um instrumento de orçamentação que é ao mesmo tempo simples e flexível. Você, o utilizador, tem de decidir quão complexo ou simples quer tornar o seu orçamento. Este guia ajudá-lo-à a tomar algumas dessas decisões.
+    <para>O conceito de orçamentação é bastante geral, por isso o &app; oferece um instrumento de
+      orçamentação que é ao mesmo tempo simples e flexível. Você, o utilizador, tem de decidir
+      quão complexo ou simples quer tornar o seu orçamento. Este guia ajudá-lo-à a tomar algumas
+      dessas decisões.
     </para>
 
     <sect2 id="budget_conceptsterms2">
@@ -34,31 +40,50 @@
 
       <itemizedlist>
         <listitem>
-          <para><emphasis>Orçamento</emphasis> - um plano financeiro que descreve as receitas e/ou despesas esperadas num dado período de tempo.
+          <para><emphasis>Orçamento</emphasis> - um plano financeiro que descreve as receitas e/ou despesas
+            esperadas num dado período de tempo.
           </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Orçamento de dinheiro</emphasis> - um plano orçamental para as receitas de caixa previstas e dinheiro gasto. Este tipo de orçamento acompanha o fluxo de caixa - de onde vem o seu dinheiro, para onde vai, e, claro, quanto vai.
+          <para><emphasis>Orçamento de dinheiro</emphasis> - um plano orçamental para as receitas de caixa
+            previstas e dinheiro gasto. Este tipo de orçamento acompanha o fluxo de caixa - de onde
+            vem o seu dinheiro, para onde vai, e, claro, quanto vai.
           </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Orçamento de despesas</emphasis> - um orçamento principalmente para planear aquilo em que se gasta o dinheiro. Este tipo de orçamento acompanha as suas despesas. Normalmente não se preocupa com coisas como avaliações ou reembolso de passivo. No entanto, contabiliza os juros e encargos. Por exemplo, se comprar mercearias no valor de 100€ com o seu cartão de crédito, incorre numa despesa de 100€ para mercearias e um passivo de 100€ com a sua empresa de cartão de crédito. Quando paga a conta do cartão de crédito por 110€, incorre num juro adicional como despesa de 10€. Um orçamento de despesas planeia a transacção de compra das mercearias e pagamento de juros, mas não a transacção de reembolso da empresa de cartões de crédito.
+          <para><emphasis>Orçamento de despesas</emphasis> - um orçamento principalmente para planear aquilo em
+            que se gasta o dinheiro. Este tipo de orçamento acompanha as suas despesas. Normalmente
+            não se preocupa com coisas como avaliações ou reembolso de passivo. No entanto,
+            contabiliza os juros e encargos. Por exemplo, se comprar mercearias no valor de 100€
+            com o seu cartão de crédito, incorre numa despesa de 100€ para mercearias e um
+            passivo de 100€ com a sua empresa de cartão de crédito. Quando paga a conta do
+            cartão de crédito por 110€, incorre num juro adicional como despesa de 10€. Um
+            orçamento de despesas planeia a transacção de compra das mercearias e pagamento de
+            juros, mas não a transacção de reembolso da empresa de cartões de crédito.
           </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Orçamento de capital</emphasis> - um orçamento que descreve um plano de pagamento para um grande futuro, frequentemente através de uma combinação de poupanças e empréstimos de dinheiro.
-	          <note>
-				  <para>Orçamentos de capital podem por vezes tornar-se bastante complexos porque podem tentar responder à pergunta "Podemos dar-nos ao luxo de fazer isto e aquilo?", explorando vários cenários hipotéticos que podem envolver contas hipotéticas.
-				  </para>
-	           </note>
+          <para><emphasis>Orçamento de capital</emphasis> - um orçamento que descreve um plano de pagamento para
+            um grande futuro, frequentemente através de uma combinação de poupanças e
+            empréstimos de dinheiro.
+            <note>
+              <para>Orçamentos de capital podem por vezes tornar-se bastante complexos porque podem tentar responder à
+                pergunta "Podemos dar-nos ao luxo de fazer isto e aquilo?", explorando vários
+                cenários hipotéticos que podem envolver contas hipotéticas.
+              </para>
+            </note>
           </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Período orçamental</emphasis> - o período de tempo durante o qual se espera que o plano se prolongue. Os períodos orçamentais mais comuns são anuais e mensais. Por vezes, pode orçamentar por vários períodos consecutivos ao mesmo tempo, por conveniência ou para um planeamento mais fino. Por exemplo, um orçamento anual pode incluir 12 períodos orçamentais mensais.
+          <para><emphasis>Período orçamental</emphasis> - o período de tempo durante o qual se espera que o plano
+            se prolongue. Os períodos orçamentais mais comuns são anuais e mensais. Por vezes,
+            pode orçamentar por vários períodos consecutivos ao mesmo tempo, por conveniência ou
+            para um planeamento mais fino. Por exemplo, um orçamento anual pode incluir 12
+            períodos orçamentais mensais.
           </para>
         </listitem>
       </itemizedlist>
@@ -68,22 +93,34 @@
   <sect1 id="budget_creation1">
     <title>Criar um orçamento</title>
 
-    <para>Mesmo antes de começar a fazer um orçamento, é importante que tenha pensado um pouco sobre a sua hierarquia de contas. Por exemplo, se quiser orçamentar um determinado montante para a sua conta de electricidade e uma certa quantia para a sua conta de água, não pode ter apenas uma conta <emphasis>Despesas:Serviços</emphasis>. As suas contas devem ser pelo menos tão específicas como o seu orçamento.
+    <para>Mesmo antes de começar a fazer um orçamento, é importante que tenha pensado um pouco sobre a sua
+      hierarquia de contas. Por exemplo, se quiser orçamentar um determinado montante para a sua
+      conta de electricidade e uma certa quantia para a sua conta de água, não pode ter apenas uma
+      conta <emphasis>Despesas:Serviços</emphasis>. As suas contas devem ser pelo menos tão
+      específicas como o seu orçamento.
     </para>
 
     <sect2 id="budget_creation2">
       <title>Escolha as contas para as quais orçamentar</title>
 
-      <para>O primeiro passo na criação de um orçamento é decidir o que se pretende planear. Esta decisão afectará as contas que inclui no seu orçamento. Por exemplo, se estiver apenas interessado em acompanhar as suas despesas, pode criar um orçamento de despesas inserindo apenas montantes para contas de despesas. Por outro lado, se quiser acompanhar todo o seu fluxo de caixa, pode criar um orçamento de fluxo de caixa através da introdução de montantes para activos, passivos, receitas e despesas.
+      <para>O primeiro passo na criação de um orçamento é decidir o que se pretende planear. Esta decisão
+        afectará as contas que inclui no seu orçamento. Por exemplo, se estiver apenas interessado
+        em acompanhar as suas despesas, pode criar um orçamento de despesas inserindo apenas
+        montantes para contas de despesas. Por outro lado, se quiser acompanhar todo o seu fluxo de
+        caixa, pode criar um orçamento de fluxo de caixa através da introdução de montantes para
+        activos, passivos, receitas e despesas.
       </para>
 
       <para>Antes de começar a criar o seu orçamento, tem de tomar duas decisões: quais as contas que quer
-        orçamentar e para quando quer que o orçamento seja. Pode sempre mudar de ideias mais tarde,
-        depois de ter criado um orçamento, mas tem de começar com algo.
+        orçamentar e para quando quer que o orçamento seja. Pode sempre mudar de ideias mais
+        tarde, depois de ter criado um orçamento, mas tem de começar com algo.
       </para>
 
       <tip>
-        <para>Como regra geral, se se preocupa maioritariamente com <emphasis>em que é que</emphasis> gasta o seu dinheiro, pode querer fazer um relatório de despesas. Mas, se também se preocupa em ter dinheiro suficiente nos lugares certos e na altura certa, pode querer utilizar um orçamento de fluxo de caixa.
+        <para>Como regra geral, se se preocupa maioritariamente com <emphasis>em que é que</emphasis> gasta o seu
+          dinheiro, pode querer fazer um relatório de despesas. Mas, se também se preocupa em ter
+          dinheiro suficiente nos lugares certos e na altura certa, pode querer utilizar um
+          orçamento de fluxo de caixa.
         </para>
       </tip>
     </sect2>
@@ -91,7 +128,13 @@
     <sect2>
       <title>Escolha um período orçamental</title>
 
-      <para>Antes de criar um orçamento, deve também decidir para que período de tempo pretende planear. Os períodos orçamentais mais comuns são os mensais e os anuais. Se quiser que o seu orçamento inclua alterações em padrões financeiros ao longo do tempo, deverá incluir vários períodos orçamentais no seu orçamento. Por exemplo, se quiser planear ter despesas de serviços públicos mais elevadas no Inverno do que no Verão, poderá dividir o seu orçamento anual em 4 trimestres ou mesmo 12 meses e orçamentar um valor mais elevado para os períodos de Inverno do que para os períodos de Verão.
+      <para>Antes de criar um orçamento, deve também decidir para que período de tempo pretende planear. Os
+        períodos orçamentais mais comuns são os mensais e os anuais. Se quiser que o seu
+        orçamento inclua alterações em padrões financeiros ao longo do tempo, deverá incluir
+        vários períodos orçamentais no seu orçamento. Por exemplo, se quiser planear ter
+        despesas de serviços públicos mais elevadas no Inverno do que no Verão, poderá dividir o
+        seu orçamento anual em 4 trimestres ou mesmo 12 meses e orçamentar um valor mais elevado
+        para os períodos de Inverno do que para os períodos de Verão.
       </para>
     </sect2>
 
@@ -100,23 +143,39 @@
 
       <para>Para criar o seu primeiro orçamento, clique em
         <menuchoice>
-          <guimenu>Acções</guimenu> <guisubmenu>Orçamento</guisubmenu><guimenuitem>Novo orçamento</guimenuitem>
+          <guimenu>Acções</guimenu> <guisubmenu>Orçamento</guisubmenu><guimenuitem>Novo
+          orçamento</guimenuitem>
         </menuchoice>
-        . Verá imediatamente um novo orçamento com as configurações predefinidas e sem entradas. Depois clique em <guibutton>Opções</guibutton>. As opções mais importantes são o período do orçamento e o número de períodos. Para o período orçamental, escolha a data de início e o menor período de tempo para o qual deseja planear. Depois, para o número de períodos, escolha quantos períodos pretende planear.
+        . Verá imediatamente um novo orçamento com as configurações predefinidas e sem entradas.
+        Depois clique em <guibutton>Opções</guibutton>. As opções mais importantes são o
+        período do orçamento e o número de períodos. Para o período orçamental, escolha a data
+        de início e o menor período de tempo para o qual deseja planear. Depois, para o número de
+        períodos, escolha quantos períodos pretende planear.
       </para>
 
-      <para>A página do orçamento mostra agora uma lista de contas com uma coluna para cada período orçamental. A data apresentada no título de cada coluna é o início desse período orçamental.
+      <para>A página do orçamento mostra agora uma lista de contas com uma coluna para cada período
+        orçamental. A data apresentada no título de cada coluna é o início desse período
+        orçamental.
       </para>
     </sect2>
 
     <sect2>
       <title>Inserir valores no orçamento</title>
 
-      <para>Agora, deve introduzir os valores no orçamento - os montantes que espera que os saldos da conta mudem durante o período orçamental. Há duas formas de introduzir valores orçamentais. A primeira forma é  clicar na célula e inserir uma quantia.
+      <para>Agora, deve introduzir os valores no orçamento - os montantes que espera que os saldos da conta
+        mudem durante o período orçamental. Há duas formas de introduzir valores orçamentais. A
+        primeira forma é clicar na célula e inserir uma quantia.
       </para>
 
-      <para>Se tem transacções passadas registadas no &app; a segunda forma é deixar o &app; estimar o orçamento
-        ao analisar essas transacções. Primeiro, seleccione as contas que pretende que o &app; analise. Depois clique em <guibutton>Estimar orçamento</guibutton> na <emphasis>barra de ferramentas</emphasis>. No diálogo <guilabel>Estimar valores do orçamento</guilabel>, seleccione a data em que o &app; deve procurar por transacções passadas. O &app; começará nessa data e procurará para a frente até à duração do seu orçamento. Por exemplo, se estiver a fazer um orçamento anual, e seleccionar 1 de Janeiro de 2005, o &app; analisará todas as transacções nessa conta a partir de 1 de Janeiro de 2005 até 31 de Dezembro de 2005.
+      <para>Se tem transacções passadas registadas no &app; a segunda forma é deixar o &app; estimar o
+        orçamento ao analisar essas transacções. Primeiro, seleccione as contas que pretende que
+        o &app; analise. Depois clique em <guibutton>Estimar orçamento</guibutton> na
+        <emphasis>barra de ferramentas</emphasis>. No diálogo <guilabel>Estimar valores do
+        orçamento</guilabel>, seleccione a data em que o &app; deve procurar por transacções
+        passadas. O &app; começará nessa data e procurará para a frente até à duração do seu
+        orçamento. Por exemplo, se estiver a fazer um orçamento anual, e seleccionar 1 de Janeiro
+        de 2005, o &app; analisará todas as transacções nessa conta a partir de 1 de Janeiro de
+        2005 até 31 de Dezembro de 2005.
       </para>
     </sect2>
   </sect1>
@@ -124,31 +183,43 @@
   <sect1 id="budget_reporting1">
     <title>Relatórios de orçamentos</title>
 
-    <para>Já fez a parte mais difícil - criar o seu orçamento. Mas agora quer saber como as suas transacções financeiras reais se comparam com o seu plano. Precisa de executar o <guisubmenu>Relatório de orçamento</guisubmenu>.
+    <para>Já fez a parte mais difícil - criar o seu orçamento. Mas agora quer saber como as suas
+      transacções financeiras reais se comparam com o seu plano. Precisa de executar o
+      <guisubmenu>Relatório de orçamento</guisubmenu>.
     </para>
 
     <para>Clique em
       <menuchoice>
-        <guimenu>Relatórios</guimenu><guisubmenu>Orçamento</guisubmenu> <guimenuitem>Relatório de orçamento</guimenuitem>
+        <guimenu>Relatórios</guimenu><guisubmenu>Orçamento</guisubmenu> <guimenuitem>Relatório de
+        orçamento</guimenuitem>
       </menuchoice>
-      . Para cada conta, o relatório de orçamento mostrará os montantes orçamentados e os montantes reais em duas colunas adjacentes para cada período do orçamento. Se tiver criado vários orçamentos, pode
-      utilizar as opções do relatório para seleccionar qual o orçamento a utilizar no relatório.
+      . Para cada conta, o relatório de orçamento mostrará os montantes orçamentados e os
+      montantes reais em duas colunas adjacentes para cada período do orçamento. Se tiver criado
+      vários orçamentos, pode utilizar as opções do relatório para seleccionar qual o
+      orçamento a utilizar no relatório.
     </para>
 
-    <para>Dois outros tipos de relatórios orçamentais são normalmente utilizados no contexto das pequenas empresas. São eles <emphasis>Extracto de receitas orçamentadas</emphasis> e <emphasis>Folha de balanço orçamentado</emphasis>.
+    <para>Dois outros tipos de relatórios orçamentais são normalmente utilizados no contexto das pequenas
+      empresas. São eles <emphasis>Extracto de receitas orçamentadas</emphasis> e <emphasis>Folha
+      de balanço orçamentado</emphasis>.
     </para>
 
     <sect2>
       <title>Extracto de receitas orçamentadas</title>
 
-      <para>O extracto de receitas orçamentadas é semelhante extracto de receitas. Ambos mostram as receitas e despesas para um determinado período, bem como o lucro, que é a diferença receitas - despesas. A declaração de rendimentos é baseada em dados históricos, mas o extracto de receitas<emphasis>orçamentadas</emphasis> é baseado nas previsões feitas no orçamento.
+      <para>O extracto de receitas orçamentadas é semelhante extracto de receitas. Ambos mostram as receitas e
+        despesas para um determinado período, bem como o lucro, que é a diferença receitas -
+        despesas. A declaração de rendimentos é baseada em dados históricos, mas o extracto de
+        receitas<emphasis>orçamentadas</emphasis> é baseado nas previsões feitas no orçamento.
       </para>
     </sect2>
 
     <sect2>
       <title>Folha de balanço orçamentado</title>
 
-      <para>O balanço orçamentado é semelhante ao balanço. Ambos mostram o activo, o passivo e o capital próprio. A diferença é que o balanço é baseado em dados históricos e o balanço <emphasis>orçamentado</emphasis> é baseado nas previsões feitas no orçamento.
+      <para>O balanço orçamentado é semelhante ao balanço. Ambos mostram o activo, o passivo e o capital
+        próprio. A diferença é que o balanço é baseado em dados históricos e o balanço
+        <emphasis>orçamentado</emphasis> é baseado nas previsões feitas no orçamento.
       </para>
     </sect2>
   </sect1>
diff --git a/pt/guide/ch_bus_ap.xml b/pt/guide/ch_bus_ap.xml
index d038fe2a..b2d8b267 100644
--- a/pt/guide/ch_bus_ap.xml
+++ b/pt/guide/ch_bus_ap.xml
@@ -16,8 +16,8 @@
 <chapter id="chapter_bus_ap">
   <title>Contas A/Pagar</title>
 
-  <para>Contas A/Pagar (ou A/P) refere-se à contabilidade de produtos ou serviços que a sua empresa comprou
-    e tem de pagar.
+  <para>Contas A/Pagar (ou A/P) refere-se à contabilidade de produtos ou serviços que a sua empresa
+    comprou e tem de pagar.
   </para>
 
   <sect1 id="bus-ap-setup1">
@@ -28,29 +28,34 @@
   </sect1>
 
   <sect1 id="bus-ap-components1">
-    <title> Componentes do sistema</title>
+    <title>Componentes do sistema</title>
 
     <para>O &app; tem um sistema integrado de contas A/Pagar. As transacções geradas pelo sistema A/P são
       colocadas dentro da conta Contas A/Pagar, como um registo do que ocorre. Geralmente não se
-      trabalha directamente com esta conta, antes utilizam-se os quatro componentes integrados das contas A/P do &app;.
-      Os componentes A/P estão disponíveis a partir do sub-menu <menuchoice>
+      trabalha directamente com esta conta, antes utilizam-se os quatro componentes integrados das
+      contas A/P do &app;. Os componentes A/P estão disponíveis a partir do sub-menu
+      <menuchoice>
         <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu>
-      </menuchoice>. Estes componentes A/P são:
+      </menuchoice>
+      . Estes componentes A/P são:
     </para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Fornecedores</guilabel> - são pessoas ou empresas às quais compra produtos ou serviços a
-          crédito;
+        <para><guilabel>Fornecedores</guilabel> - são pessoas ou empresas às quais compra produtos ou serviços
+          a crédito;
         </para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Facturas</guilabel> - representam as facturas físicas que os fornecedores lhe enviam para lhe solicitar o pagamento; a factura contém uma lista pormenorizada de coisas que comprou;
+        <para><guilabel>Facturas</guilabel> - representam as facturas físicas que os fornecedores lhe enviam para
+          lhe solicitar o pagamento; a factura contém uma lista pormenorizada de coisas que
+          comprou;
         </para>
 
         <para>Além disso, o &app; também suporta <guilabel>Notas de crédito</guilabel> que representam o
-          inverso das facturas. Uma nota de crédito é normalmente recebida de um fornecedor para corrigir itens que foram erroneamente facturados ou devolvidos.
+          inverso das facturas. Uma nota de crédito é normalmente recebida de um fornecedor para
+          corrigir itens que foram erroneamente facturados ou devolvidos.
         </para>
 
         <para>Ambos os documentos serão configurados usando os mesmos itens do menu.
@@ -58,12 +63,15 @@
       </listitem>
 
       <listitem>
-        <para><guilabel>Tarefas</guilabel> (opcional) é onde se registam as tarefas de fornecedores. As tarefas são o mecanismo pelo qual é possível agrupar várias facturas de um determinado fornecedor.
+        <para><guilabel>Tarefas</guilabel> (opcional) é onde se registam as tarefas de fornecedores. As tarefas
+          são o mecanismo pelo qual é possível agrupar várias facturas de um determinado
+          fornecedor.
         </para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Processamento de pagamentos</guilabel> é onde se registam os pagamentos a um fornecedor a quem se deve dinheiro.
+        <para><guilabel>Processamento de pagamentos</guilabel> é onde se registam os pagamentos a um fornecedor a
+          quem se deve dinheiro.
         </para>
       </listitem>
     </itemizedlist>
@@ -75,7 +83,8 @@
   <sect1 id="bus-ap-vendors1">
     <title>Fornecedores</title>
 
-    <para>Um fornecedor é uma empresa ou pessoa a quem se compra bens ou serviços. Os fornecedores devem estar registados dentro do sistema A/P.
+    <para>Um fornecedor é uma empresa ou pessoa a quem se compra bens ou serviços. Os fornecedores devem
+      estar registados dentro do sistema A/P.
     </para>
 
     <sect2 id="bus-ap-vendornew2">
@@ -95,6 +104,7 @@
 
       <figure pgwide="1">
         <title>Janela Novo fornecedor</title>
+
         <screenshot id="bus-ap-vendornew">
           <mediaobject>
             <imageobject>
@@ -111,21 +121,24 @@
 
       <para>Para procurar um fornecedor existente, utilize
         <menuchoice>
-          <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu><guimenuitem> Localizar          fornecedor</guimenuitem>
+          <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu><guimenuitem> Localizar
+          fornecedor</guimenuitem>
         </menuchoice>
         . Seleccione um fornecedor para <guibutton>Ver/Editar</guibutton> a partir dos resultados da
-        procura. Esta janela é também utilizada para procurar um fornecedor ao inserir facturas e processar
-        pagamentos.
+        procura. Esta janela é também utilizada para procurar um fornecedor ao inserir facturas e
+        processar pagamentos.
       </para>
 
       <figure pgwide="1">
         <title>Janela Novo fornecedor</title>
+
         <screenshot id="bus-ap-vendorfind">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_ap_vendorfind.png" 
                 srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/bus_ap_vendorfind.png" 
                 srccredit="Pedro Albuquerque" />
@@ -134,16 +147,26 @@
         </screenshot>
       </figure>
 
-      <para>Se muitos fornecedores corresponderem aos critérios de procura que fornecer, a procura pode ser refinada através da execução de uma procura adicional dentro dos resultados actuais. O conjunto de resultados actuais é procurado quando o botão <guilabel>Refinar procura actual</guilabel> é clicado. De facto, o &app; selecciona esta opção por si depois de ter efectuado a procura inicial.
+      <para>Se muitos fornecedores corresponderem aos critérios de procura que fornecer, a procura pode ser
+        refinada através da execução de uma procura adicional dentro dos resultados actuais. O
+        conjunto de resultados actuais é procurado quando o botão <guilabel>Refinar procura
+        actual</guilabel> é clicado. De facto, o &app; selecciona esta opção por si depois de ter
+        efectuado a procura inicial.
       </para>
 
       <para>Se o fornecedor que procura não corresponde aos critérios de procura fornecidos, altere a procura
-        clicando em <guilabel>Nova procura</guilabel> e depois em <guibutton>Localizar</guibutton>. O passo relevante é <guilabel>Nova procura</guilabel>. Se o fornecedor não estiver no resultado da procura original e procurar apenas dentro deste conjunto, o fornecedor não será encontrado, independentemente dos novos critérios.
+        clicando em <guilabel>Nova procura</guilabel> e depois em <guibutton>Localizar</guibutton>.
+        O passo relevante é <guilabel>Nova procura</guilabel>. Se o fornecedor não estiver no
+        resultado da procura original e procurar apenas dentro deste conjunto, o fornecedor não
+        será encontrado, independentemente dos novos critérios.
       </para>
 
       <note>
-        <para>Para obter uma lista de todos os fornecedores registados activos, defina o critério de procura como <guilabel>satisfaz expreg</guilabel> e ponha um único ponto <quote>.</quote> no campo de texto. Certifique-se de que marca <guilabel>Procurar apenas em dados activos</guilabel> e clique em
-          <guibutton>Localizar</guibutton>. A expressão regular <quote>.</quote> significa corresponder a tudo.
+        <para>Para obter uma lista de todos os fornecedores registados activos, defina o critério de procura como
+          <guilabel>satisfaz expreg</guilabel> e ponha um único ponto <quote>.</quote> no campo de
+          texto. Certifique-se de que marca <guilabel>Procurar apenas em dados activos</guilabel> e
+          clique em <guibutton>Localizar</guibutton>. A expressão regular <quote>.</quote>
+          significa corresponder a tudo.
         </para>
       </note>
     </sect2>
@@ -155,29 +178,34 @@
     <para>Uma factura é um pedido de pagamento que recebe de um fornecedor. O &app; pode acompanhar facturas.
     </para>
 
-    <para>Uma nota de crédito é o documento que recebe de um fornecedor para corrigir produtos ou serviços prestados incorrectamente cobrados numa conta. O &app; pode gerar e seguir notas de crédito através das mesmas entradas de menu que as facturas.
+    <para>Uma nota de crédito é o documento que recebe de um fornecedor para corrigir produtos ou serviços
+      prestados incorrectamente cobrados numa conta. O &app; pode gerar e seguir notas de crédito
+      através das mesmas entradas de menu que as facturas.
     </para>
 
     <note>
-      <para>Esta secção aplica-se tanto às facturas como às notas de crédito. A fim de evitar a repetição de tudo 
-        e para manter o texto mais fácil de ler, referir-se-á apenas a facturas. Pode aplicá-lo igualmente a
-        notas de crédito. Só quando o comportamento das notas de crédito for diferente do das facturas é que
-        será explicitamente mencionado.
+      <para>Esta secção aplica-se tanto às facturas como às notas de crédito. A fim de evitar a repetição
+        de tudo e para manter o texto mais fácil de ler, referir-se-á apenas a facturas. Pode
+        aplicá-lo igualmente a notas de crédito. Só quando o comportamento das notas de crédito
+        for diferente do das facturas é que será explicitamente mencionado.
       </para>
     </note>
 
     <sect2 id="bus-ap-billnew2">
       <title>Nova</title>
 
-      <para>Quando receber uma factura de um fornecedor e quiser introduzi-la no &app;, deve criar um novo pagamento. Para criar um novo pagamento, utilize
+      <para>Quando receber uma factura de um fornecedor e quiser introduzi-la no &app;, deve criar um novo
+        pagamento. Para criar um novo pagamento, utilize
         <menuchoice>
-          <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu><guimenuitem>Novo pagamento</guimenuitem>
+          <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu><guimenuitem>Novo
+          pagamento</guimenuitem>
         </menuchoice>
         e preencha os dados apropriadamente.
       </para>
 
       <figure pgwide="1">
         <title>Janela Novo pagamento</title>
+
         <screenshot id="bus-ap-billnew">
           <mediaobject>
             <imageobject>
@@ -187,24 +215,29 @@
         </screenshot>
       </figure>
 
-      <para>Quando clica em <guibutton>Aceitar</guibutton> abre-se a janela <guilabel>Editar pagamento</guilabel>.
+      <para>Quando clica em <guibutton>Aceitar</guibutton> abre-se a janela <guilabel>Editar
+        pagamento</guilabel>.
       </para>
     </sect2>
 
     <sect2 id="bus-ap-billedit2">
       <title>Editar</title>
 
-      <para>A partir da janela Editar pagamento pode inserir uma lista detalhada dos bens e serviços que adquiriu, de forma semelhante ao funcionamento do diário de contas. Para as notas de crédito, insere antes uma lista de bens e serviços que o vendedor reembolsou.
+      <para>A partir da janela Editar pagamento pode inserir uma lista detalhada dos bens e serviços que
+        adquiriu, de forma semelhante ao funcionamento do diário de contas. Para as notas de
+        crédito, insere antes uma lista de bens e serviços que o vendedor reembolsou.
       </para>
 
       <figure pgwide="1">
         <title>Janela Editar pagamento</title>
+
         <screenshot id="bus-ap-billedit">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_ap_billedit.png"
                srccredit="Patrick Schweiger" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/bus_ap_billedit.png" srccredit="Patrick Schweiger"/>
             </imageobject>
@@ -219,19 +252,22 @@
     <sect2 id="bus-ap-billpost2">
       <title>Emitir</title>
 
-      <para>Ao terminar a edição de um pagamento, deve <guilabel>Emitir</guilabel> o pagamento. Não é necessário
-        emitir o pagamento, pode fechá-lo e emitir mais tarde. Mas eventualmente, terá de o fazer. A emissão de um pagamento coloca as suas transacções numa conta A/Pagar. A janela Emitir pagamento aparece e pede-lhe para inserir informações:
+      <para>Ao terminar a edição de um pagamento, deve <guilabel>Emitir</guilabel> o pagamento. Não é
+        necessário emitir o pagamento, pode fechá-lo e emitir mais tarde. Mas eventualmente, terá
+        de o fazer. A emissão de um pagamento coloca as suas transacções numa conta A/Pagar. A
+        janela Emitir pagamento aparece e pede-lhe para inserir informações:
       </para>
 
       <figure pgwide="1">
         <title>Janela Emitir pagamento</title>
+
         <screenshot id="bus-ap-billpost">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ap_billpost.png" srccredit="Patrick Schweiger"/>
             </imageobject>
           </mediaobject>
-      </screenshot>
+        </screenshot>
       </figure>
     </sect2>
 
@@ -240,7 +276,8 @@
 
       <para>Para localizar um pagamento existente, utilize
         <menuchoice>
-          <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu><guimenuitem>Localizar pagamento</guimenuitem>
+          <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu><guimenuitem>Localizar
+          pagamento</guimenuitem>
         </menuchoice>
         . Nos resultados, pode seleccionar um pagamento a editar ou consultar.
       </para>
@@ -251,7 +288,9 @@
       </note>
 
       <note>
-        <para>Existem outras formas de aceder a um pagamento existente. Estas são semelhantes ao acesso a facturas dos seus clientes. Ver <xref linkend="bus-ar-invoicefind2" /> para mais informação.
+        <para>Existem outras formas de aceder a um pagamento existente. Estas são semelhantes ao acesso a
+          facturas dos seus clientes. Ver <xref linkend="bus-ar-invoicefind2" /> para mais
+          informação.
         </para>
       </note>
     </sect2>
@@ -260,18 +299,23 @@
   <sect1 id="bus-ap-jobs1">
     <title>Tarefas de fornecedores</title>
 
-    <para>As tarefas de fornecedores são utilizadas para agrupar várias facturas e notas de crédito de um único fornecedor. A utilização de tarefas de fornecedores é opcional. A funcionalidade é útil quando se tem múltiplas <guilabel>tarefas</guilabel> para o mesmo fornecedor e deseja ver todas as facturas e notas de crédito numa única tarefa.
+    <para>As tarefas de fornecedores são utilizadas para agrupar várias facturas e notas de crédito de um
+      único fornecedor. A utilização de tarefas de fornecedores é opcional. A funcionalidade é
+      útil quando se tem múltiplas <guilabel>tarefas</guilabel> para o mesmo fornecedor e deseja
+      ver todas as facturas e notas de crédito numa única tarefa.
     </para>
 
-    <para>Para utilizar tarefas de fornecedores, tem de as criar em 
+    <para>Para utilizar tarefas de fornecedores, tem de as criar em
       <menuchoice>
-        <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu><guimenuitem>Nova tarefa</guimenuitem>
+        <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu><guimenuitem>Nova
+        tarefa</guimenuitem>
       </menuchoice>
       . Verá a janela <guilabel>Nova tarefa</guilabel>.
     </para>
 
     <figure pgwide="1">
       <title>Nova tarefa de fornecedor</title>
+
       <screenshot id="bus-ap-jobnew">
         <mediaobject>
           <imageobject>
@@ -292,18 +336,24 @@
 
     <para>Para seleccionar a partir dos pagamentos associados a uma tarefa, utilize
       <menuchoice>
-        <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu> <guimenuitem>Localizar tarefa</guimenuitem>
+        <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu> <guimenuitem>Localizar
+        tarefa</guimenuitem>
       </menuchoice>
-      . Seleccione a tarefa desejada nos resultados da procura e clique em <guilabel>Ver pagamentos</guilabel> . Verá uma janela com a listagem das facturas e notas de crédito associadas à tarefa. Seleccione um documento e clique em <guilabel>Ver pagamento</guilabel> para abrir o editor de pagamentos na janela principal.
+      . Seleccione a tarefa desejada nos resultados da procura e clique em <guilabel>Ver
+      pagamentos</guilabel> . Verá uma janela com a listagem das facturas e notas de crédito
+      associadas à tarefa. Seleccione um documento e clique em <guilabel>Ver pagamento</guilabel>
+      para abrir o editor de pagamentos na janela principal.
     </para>
   </sect1>
 
   <sect1 id="bus-ap-payment1">
     <title>Processamento de pagamentos</title>
 
-    <para>Eventualmente, terá de pagar as suas contas. Para tal, utilize a aplicação Processar pagamento, em 
+    <para>Eventualmente, terá de pagar as suas contas. Para tal, utilize a aplicação Processar pagamento,
+      em
       <menuchoice>
-        <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu><guimenuitem>Processar pagamento</guimenuitem>
+        <guimenu>Negócios</guimenu><guisubmenu>Fornecedor</guisubmenu><guimenuitem>Processar
+        pagamento</guimenuitem>
       </menuchoice>
       .
     </para>
@@ -313,6 +363,7 @@
 
     <figure pgwide="1">
       <title>Processar pagamento</title>
+
       <screenshot id="bus-ap-payment">
         <mediaobject>
           <imageobject>
diff --git a/pt/guide/ch_bus_ar.xml b/pt/guide/ch_bus_ar.xml
index c42d4e72..de1d40bd 100644
--- a/pt/guide/ch_bus_ar.xml
+++ b/pt/guide/ch_bus_ar.xml
@@ -20,7 +20,8 @@ corrected to be less describing of the interface and more tutorial oriented
 <chapter id="chapter_bus_ar">
   <title>Contas A/Receber</title>
 
-  <para>Contas A/Receber (ou A/R) referem-se a produtos ou serviços oferecidos pela sua empresa pelos quais ainda não foi recebido um pagamento.
+  <para>Contas A/Receber (ou A/R) referem-se a produtos ou serviços oferecidos pela sua empresa pelos quais
+    ainda não foi recebido um pagamento.
   </para>
 
   <sect1 id="bus-ar-setup1">
@@ -34,7 +35,9 @@ corrected to be less describing of the interface and more tutorial oriented
     <title>Componentes do sistema</title>
 
     <para>O &app; tem um sistema integrado de contas a receber. As transacções geradas pelo sistema A/R são
-      registadas na conta Contas A/Receber. Geralmente, não se trabalha directamente com esta conta. Trabalha-se com os quatro componentes integrados do &app;, disponíveis através do sub-menu 
+      registadas na conta Contas A/Receber. Geralmente, não se trabalha directamente com esta
+      conta. Trabalha-se com os quatro componentes integrados do &app;, disponíveis através do
+      sub-menu
       <menuchoice>
         <guimenu>Negócios</guimenu> <guisubmenu>Cliente</guisubmenu>
       </menuchoice>
@@ -43,28 +46,35 @@ corrected to be less describing of the interface and more tutorial oriented
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Clientes</guilabel> são pessoas ou empresas a quem vende produtos ou serviços a crédito;
+        <para><guilabel>Clientes</guilabel> são pessoas ou empresas a quem vende produtos ou serviços a
+          crédito;
         </para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Facturas</guilabel> representam a factura física que envia a um cliente para solicitar o pagamento. Esta factura contém uma lista pormenorizada de coisas que vendeu;
+        <para><guilabel>Facturas</guilabel> representam a factura física que envia a um cliente para solicitar o
+          pagamento. Esta factura contém uma lista pormenorizada de coisas que vendeu;
         </para>
 
-        <para>além disso, o GnuCash também suporta <guilabel>Notas de crédito</guilabel>, que representam o inverso das facturas; uma nota de crédito é normalmente entregue a um cliente para corrigir itens que foram incorrectamente facturados ou devolvidos;
+        <para>além disso, o GnuCash também suporta <guilabel>Notas de crédito</guilabel>, que representam o
+          inverso das facturas; uma nota de crédito é normalmente entregue a um cliente para
+          corrigir itens que foram incorrectamente facturados ou devolvidos;
         </para>
 
-        <para>ambos os tipos de documentos serão configurados usando os mesmos itens do menu; as notas de crédito foram introduzidas a partir da versão estável &app; 2.6.0;
+        <para>ambos os tipos de documentos serão configurados usando os mesmos itens do menu; as notas de
+          crédito foram introduzidas a partir da versão estável &app; 2.6.0;
         </para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Tarefas</guilabel> (opcional) é onde se registam as tarefas de clientes; as tarefas são um mecanismo em que pode agrupar várias facturas a um determinado cliente;
+        <para><guilabel>Tarefas</guilabel> (opcional) é onde se registam as tarefas de clientes; as tarefas são
+          um mecanismo em que pode agrupar várias facturas a um determinado cliente;
         </para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Processamento de pagamentos</guilabel> é utilizado para registar pagamentos que recebeu de um cliente.
+        <para><guilabel>Processamento de pagamentos</guilabel> é utilizado para registar pagamentos que recebeu
+          de um cliente.
         </para>
       </listitem>
     </itemizedlist>
@@ -73,7 +83,8 @@ corrected to be less describing of the interface and more tutorial oriented
   <sect1 id="bus-ar-customers1">
     <title>Clientes</title>
 
-    <para>são pessoas ou empresas a quem vende produtos ou serviços. Têm de estar registados no sistema A/R.
+    <para>são pessoas ou empresas a quem vende produtos ou serviços. Têm de estar registados no sistema
+      A/R.
     </para>
 
     <sect2 id="bus-ar-custnew2">
@@ -81,13 +92,15 @@ corrected to be less describing of the interface and more tutorial oriented
 
       <para>Para registar um novo cliente, abra o menu
         <menuchoice>
-          <guimenu>Negócios</guimenu><guisubmenu>Cliente</guisubmenu> <guimenuitem>Novo cliente</guimenuitem>
+          <guimenu>Negócios</guimenu><guisubmenu>Cliente</guisubmenu> <guimenuitem>Novo
+          cliente</guimenuitem>
         </menuchoice>
         . Preencha a informação do cliente, tal como nome, morada, telefone, fax, etc.
       </para>
 
       <figure pgwide="1">
         <title>Janela Registo de novo cliente</title>
+
         <screenshot id="bus-ar-custnew">
           <mediaobject>
             <imageobject>
@@ -107,35 +120,49 @@ corrected to be less describing of the interface and more tutorial oriented
           <guimenu>Negócios</guimenu><guisubmenu>Cliente</guisubmenu> <guimenuitem>Localizar
           Cliente</guimenuitem>
         </menuchoice>
-        . Seleccione depois um cliente para <guilabel>Ver/Editar</guilabel> nos resultados da procura. Esta janela também é utilizada para procurar clientes ao criar facturas e processar pagamentos.
+        . Seleccione depois um cliente para <guilabel>Ver/Editar</guilabel> nos resultados da
+        procura. Esta janela também é utilizada para procurar clientes ao criar facturas e
+        processar pagamentos.
       </para>
 
       <figure pgwide="1">
         <title>Janela Localizar cliente</title>
+
         <screenshot id="bus-ar-custfind">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_ar_custfind.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/bus_ar_custfind.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
-         </mediaobject>
+          </mediaobject>
         </screenshot>
       </figure>
 
-      <para>Se muitos clientes corresponderem aos critérios de procura que forneceu, a procura pode ser refinada através da execução de uma pesquisa adicional dentro dos resultados actuais. O conjunto de resultados actuais é pprocurado quando o botão de opção <guilabel>Refinar procura actual</guilabel> é seleccionado. De facto, o &app; selecciona esta opção por si depois de ter efectuado a procura inicial.
+      <para>Se muitos clientes corresponderem aos critérios de procura que forneceu, a procura pode ser
+        refinada através da execução de uma pesquisa adicional dentro dos resultados actuais. O
+        conjunto de resultados actuais é pprocurado quando o botão de opção <guilabel>Refinar
+        procura actual</guilabel> é seleccionado. De facto, o &app; selecciona esta opção por si
+        depois de ter efectuado a procura inicial.
       </para>
 
-      <para>Se o cliente que procura não corresponde aos critérios fornecidos, altere a procura
-        clicando em <guilabel>Nova procura</guilabel> e depois em <guilabel>Localizar</guilabel>. O passo relevante é a selecção <guilabel>Nova procura</guilabel>. Se o cliente não estiver no resultado da procura original e procurar apenas dentro deste conjunto, o cliente não será encontrado, independentemente de novos critérios de procura.
+      <para>Se o cliente que procura não corresponde aos critérios fornecidos, altere a procura clicando em
+        <guilabel>Nova procura</guilabel> e depois em <guilabel>Localizar</guilabel>. O passo
+        relevante é a selecção <guilabel>Nova procura</guilabel>. Se o cliente não estiver no
+        resultado da procura original e procurar apenas dentro deste conjunto, o cliente não será
+        encontrado, independentemente de novos critérios de procura.
       </para>
 
       <note>
-        <para>Para devolver uma lista de todos os clientes activos registados, defina o critério para <guilabel>satisfaz expreg</guilabel> e coloque um único ponto "." na área do campo de texto. Certifique-se de que
-          marca <guilabel>Procurar apenas em dados activos</guilabel> e depois clique em <guibutton>Localizar</guibutton>. A expressão regular "." significa corresponder a qualquer coisa.
+        <para>Para devolver uma lista de todos os clientes activos registados, defina o critério para
+          <guilabel>satisfaz expreg</guilabel> e coloque um único ponto "." na área do campo de
+          texto. Certifique-se de que marca <guilabel>Procurar apenas em dados activos</guilabel> e
+          depois clique em <guibutton>Localizar</guibutton>. A expressão regular "." significa
+          corresponder a qualquer coisa.
         </para>
       </note>
     </sect2>
@@ -148,30 +175,34 @@ corrected to be less describing of the interface and more tutorial oriented
       processados. O &app; pode gerar e acompanhar facturas.
     </para>
 
-    <para>Uma nota de crédito é a papelada que envia a um cliente para corrigir produtos ou serviços prestados que
-      foram incorrectamente facturados. O &app; pode gerar e acompanhar notas de crédito através das mesmas entradas de menu que as facturas.
+    <para>Uma nota de crédito é a papelada que envia a um cliente para corrigir produtos ou serviços
+      prestados que foram incorrectamente facturados. O &app; pode gerar e acompanhar notas de
+      crédito através das mesmas entradas de menu que as facturas.
     </para>
 
     <note>
-      <para>Esta secção aplica-se tanto às facturas como às notas de crédito. A fim de evitar a repetição de tudo
-        e para manter o texto mais fácil de ler, referir-se-á apenas às facturas. Pode aplicá-lo igualmente
-        às notas de crédito. Só quando o comportamento das notas de crédito for diferente do das facturas é que
-        será explicitamente mencionado.
+      <para>Esta secção aplica-se tanto às facturas como às notas de crédito. A fim de evitar a repetição
+        de tudo e para manter o texto mais fácil de ler, referir-se-á apenas às facturas. Pode
+        aplicá-lo igualmente às notas de crédito. Só quando o comportamento das notas de
+        crédito for diferente do das facturas é que será explicitamente mencionado.
       </para>
     </note>
 
     <sect2 id="bus-ar-invoicenew2">
       <title>Nova</title>
 
-      <para>Para enviar uma factura a um cliente, é necessário primeiro criar o novo documento. Para criar uma factura, utilize
+      <para>Para enviar uma factura a um cliente, é necessário primeiro criar o novo documento. Para criar uma
+        factura, utilize
         <menuchoice>
-          <guimenu>Negócios</guimenu> <guisubmenu>Cliente</guisubmenu><guimenuitem>Nova factura</guimenuitem>
+          <guimenu>Negócios</guimenu> <guisubmenu>Cliente</guisubmenu><guimenuitem>Nova
+          factura</guimenuitem>
         </menuchoice>
         . A janela Nova factura deve ser preenchida de forma apropriada.
       </para>
 
       <figure pgwide="1">
         <title>Criar uma nova factura</title>
+
         <screenshot id="bus-ar-invoicenew">
           <mediaobject>
             <imageobject>
@@ -190,17 +221,20 @@ corrected to be less describing of the interface and more tutorial oriented
       <title>Editar</title>
 
       <para>A partir da janela Editar factura pode inserir uma lista detalhada dos bens e serviços que vendeu
-        nesta factura de forma semelhante à forma como funcionam os diários de conta. Para notas de crédito, insere antes uma lista discriminada de bens e serviços que reembolsou.
+        nesta factura de forma semelhante à forma como funcionam os diários de conta. Para notas
+        de crédito, insere antes uma lista discriminada de bens e serviços que reembolsou.
       </para>
 
       <figure pgwide="1">
         <title>Edit Invoice Window</title>
+
         <screenshot id="bus-ar-invoiceedit">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_ar_invoiceedit.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/bus_ar_invoiceedit.png"
                          srccredit="Pedro Albuquerque"/>
@@ -218,27 +252,31 @@ corrected to be less describing of the interface and more tutorial oriented
 
       <figure pgwide="1">
         <title>Menu Emitir factura</title>
+
         <screenshot id="bus-ar-invoicepost_menu">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/bus_ar_invoicepost_menu.png"
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/bus_ar_invoicepost_menu.png"
                            srccredit="Pedro Albuquerque"/>
-              </imageobject>
-              <caption>
-                <para>Menu Emitir factura no canto superior direito da factura
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
-        </figure>
-
-      <para>Quando terminar a edição de uma factura e estiver pronto para imprimir, deve <guilabel>Emitir</guilabel> o documento. Não tem de o fazer imediatamente. De facto, um documento só deve ser emitido
-        quando estiver pronto para imprimir. A emissão de uma factura coloca as transacções numa
-        conta A/Receber.
+            </imageobject>
+
+            <caption>
+              <para>Menu Emitir factura no canto superior direito da factura
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
+
+      <para>Quando terminar a edição de uma factura e estiver pronto para imprimir, deve
+        <guilabel>Emitir</guilabel> o documento. Não tem de o fazer imediatamente. De facto, um
+        documento só deve ser emitido quando estiver pronto para imprimir. A emissão de uma
+        factura coloca as transacções numa conta A/Receber.
       </para>
 
       <figure pgwide="1">
         <title>Janela Emitir factura</title>
+
         <screenshot id="bus-ar-invoicepost">
           <mediaobject>
             <imageobject>
@@ -266,7 +304,9 @@ corrected to be less describing of the interface and more tutorial oriented
         </para>
       </note>
 
-      <para>Um dos objectivos da concepção do sistema de contas A/Receber do &app; foi o de permitir diferentes processos para chegar ao mesmo estado, para que se possa chegar a uma factura de diferentes formas com base na forma como se pensa sobre o problema:
+      <para>Um dos objectivos da concepção do sistema de contas A/Receber do &app; foi o de permitir
+        diferentes processos para chegar ao mesmo estado, para que se possa chegar a uma factura de
+        diferentes formas com base na forma como se pensa sobre o problema:
       </para>
 
       <itemizedlist>
@@ -290,7 +330,8 @@ corrected to be less describing of the interface and more tutorial oriented
     <sect2 id="bus-ar-invoiceprint2">
       <title>Imprimir</title>
 
-      <para>Depois de publicar uma factura, deverá imprimi-la e enviá-la ao seu cliente. Para imprimir uma factura, utilize
+      <para>Depois de publicar uma factura, deverá imprimi-la e enviá-la ao seu cliente. Para imprimir uma
+        factura, utilize
         <menuchoice>
           <guimenu>Ficheiro</guimenu> <guimenuitem>Imprimir factura</guimenuitem>
         </menuchoice>
@@ -299,6 +340,7 @@ corrected to be less describing of the interface and more tutorial oriented
 
       <figure pgwide="1">
         <title>Factura imprimível</title>
+
         <screenshot id="bus-ar-invoiceprint">
           <mediaobject>
             <imageobject>
@@ -310,7 +352,7 @@ corrected to be less describing of the interface and more tutorial oriented
       </figure>
 
       <note>
-        <para>Pode modificar a aparência da factura, i.e., adicionar um logótipo, etc. Consulte 
+        <para>Pode modificar a aparência da factura, i.e., adicionar um logótipo, etc. Consulte
           <xref linkend="bus-ar-invoicechange" />.
         </para>
       </note>
@@ -320,7 +362,8 @@ corrected to be less describing of the interface and more tutorial oriented
           <guimenu>Relatórios</guimenu><guisubmenu>Negócios</guisubmenu> <guimenuitem>Factura
           imprimível</guimenuitem>
         </menuchoice>
-        a partir do menu principal. A janela de relatório resultante indica que nenhuma factura válida está seleccionada. Para seleccionar a factura a imprimir:
+        a partir do menu principal. A janela de relatório resultante indica que nenhuma factura
+        válida está seleccionada. Para seleccionar a factura a imprimir:
       </para>
 
       <orderedlist>
@@ -339,7 +382,8 @@ corrected to be less describing of the interface and more tutorial oriented
         </listitem>
 
         <listitem>
-          <para>Clique em <guibutton>Seleccionar</guibutton> ao lado direito do campo <guilabel>Nº da factura</guilabel>.
+          <para>Clique em <guibutton>Seleccionar</guibutton> ao lado direito do campo <guilabel>Nº da
+            factura</guilabel>.
           </para>
         </listitem>
 
@@ -357,70 +401,87 @@ corrected to be less describing of the interface and more tutorial oriented
     <sect2 id="bus-ar-invoicestarting2">
       <title>Atribuir numeração inicial</title>
 
-      <para>Por predefinição, o &app; começa com a factura número 1 e incrementa a partir daí. É possível escrever manualmente um número de factura na caixa de texto cada vez que cria uma factura, mas isto torna-se cansativo e mais cedo ou mais tarde leva à duplicação de números.
+      <para>Por predefinição, o &app; começa com a factura número 1 e incrementa a partir daí. É possível
+        escrever manualmente um número de factura na caixa de texto cada vez que cria uma factura,
+        mas isto torna-se cansativo e mais cedo ou mais tarde leva à duplicação de números.
       </para>
 
       <para>Pode alterar o número inicial da primeira factura, se for realmente importante. Utilize
         <menuchoice>
           <guimenu>Ficheiro</guimenu><guimenuitem>Propriedades</guimenuitem>
         </menuchoice>
-        , aceda ao separador <guilabel>Contadores</guilabel>, altere o <guilabel>Número da factura</guilabel> para que seja uma unidade abaixo do número desejado e clique em <guibutton>Aceitar</guibutton> ou <guibutton>Aplicar</guibutton>.
+        , aceda ao separador <guilabel>Contadores</guilabel>, altere o <guilabel>Número da
+        factura</guilabel> para que seja uma unidade abaixo do número desejado e clique em
+        <guibutton>Aceitar</guibutton> ou <guibutton>Aplicar</guibutton>.
       </para>
     </sect2>
   </sect1>
 
   <sect1 id="bus-ar-jobs1">
     <title>Tarefas de cliente</title>
-	<para>As tarefas de cliente são utilizadas para agrupar várias facturas e notas de crédito para o mesmo cliente. A utilização da funcionalidade Tarefas de cliente é opcional. A funcionalidade é útil quando se tem múltiplas <guilabel>tarefas</guilabel> para o mesmo cliente e se deseja ver todas as facturas e
-      notas de crédito relacionadas numa única tarefa.
+
+    <para>As tarefas de cliente são utilizadas para agrupar várias facturas e notas de crédito para o mesmo
+      cliente. A utilização da funcionalidade Tarefas de cliente é opcional. A funcionalidade é
+      útil quando se tem múltiplas <guilabel>tarefas</guilabel> para o mesmo cliente e se deseja
+      ver todas as facturas e notas de crédito relacionadas numa única tarefa.
     </para>
 
-      <figure pgwide="1">
-        <title>Nova tarefa de cliente</title>
-        <screenshot id="bus-ar-jobnew">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/bus_ar_jobnew.png"
+    <figure pgwide="1">
+      <title>Nova tarefa de cliente</title>
+
+      <screenshot id="bus-ar-jobnew">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/bus_ar_jobnew.png"
                          srccredit="Pedro Albuquerque"/>
-            </imageobject>
-          </mediaobject>
-        </screenshot>
-      </figure>
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <para>To use customer jobs, you must create them using the
       <menuchoice>
-        <guimenu>Negócios</guimenu><guisubmenu>Cliente</guisubmenu> <guimenuitem>Nova tarefa</guimenuitem>
+        <guimenu>Negócios</guimenu><guisubmenu>Cliente</guisubmenu> <guimenuitem>Nova
+        tarefa</guimenuitem>
       </menuchoice>
       . Verá a janela <guilabel>Nova tarefa</guilabel>.
     </para>
 
-    <para>Para editar uma tarefa existente, utilize 
+    <para>Para editar uma tarefa existente, utilize
       <menuchoice>
-        <guimenu>Negócios</guimenu><guisubmenu>Cliente</guisubmenu> <guimenuitem>Localizar tarefa</guimenuitem>
+        <guimenu>Negócios</guimenu><guisubmenu>Cliente</guisubmenu> <guimenuitem>Localizar
+        tarefa</guimenuitem>
       </menuchoice>
       . Seleccione a tarefa desejada e clique em <guilabel>Ver/Editar tarefa</guilabel>.
     </para>
 
     <para>Para seleccionar a partir de facturas e notas de crédito associadas a uma dada tarefa, utilize
       <menuchoice>
-        <guimenu>Negócios</guimenu><guisubmenu>Cliente</guisubmenu><guimenuitem>Localizar tarefa</guimenuitem>
+        <guimenu>Negócios</guimenu><guisubmenu>Cliente</guisubmenu><guimenuitem>Localizar
+        tarefa</guimenuitem>
       </menuchoice>
-      . Seleccione a tarefa desejada e clique em <guilabel>Ver facturas</guilabel>. Verá uma janela com a listagem das facturas e notas de crédito associadas a esta tarefa. Seleccione a factura ou nota de crédito desejada e clique em <guilabel>Ver factura</guilabel> para abrir o editor de facturas na janela principal.
+      . Seleccione a tarefa desejada e clique em <guilabel>Ver facturas</guilabel>. Verá uma janela
+      com a listagem das facturas e notas de crédito associadas a esta tarefa. Seleccione a factura
+      ou nota de crédito desejada e clique em <guilabel>Ver factura</guilabel> para abrir o editor
+      de facturas na janela principal.
     </para>
   </sect1>
 
   <sect1 id="bus-ar-payment1">
     <title>Processamento de pagamentos</title>
 
-    <para>Eventualmente, receberá pagamentos dos seus clientes por facturas pendentes. Para as registar, deverá utilizar a aplicação Processamento de pagamentos, encontrada em
+    <para>Eventualmente, receberá pagamentos dos seus clientes por facturas pendentes. Para as registar,
+      deverá utilizar a aplicação Processamento de pagamentos, encontrada em
       <menuchoice>
-        <guimenu>Negócios</guimenu> <guisubmenu>Cliente</guisubmenu><guimenuitem>Processar pagamento</guimenuitem>
+        <guimenu>Negócios</guimenu> <guisubmenu>Cliente</guisubmenu><guimenuitem>Processar
+        pagamento</guimenuitem>
       </menuchoice>
       .
     </para>
 
     <figure pgwide="1">
       <title>Janela Processar pagamento</title>
+
       <screenshot id="bus-ar-payment">
         <mediaobject>
           <imageobject>
@@ -435,9 +496,10 @@ corrected to be less describing of the interface and more tutorial oriented
   <sect1 id="bus-ar-invoicechange">
     <title>Alterar a aparência da factura</title>
 
-    <para>O estilo predefinido da factura, como mostrado na <xref linkend="bus-ar-invoiceprint2" />, é bastante
-      árido. Este estilo deixa a parte superior do formulário em branco, para que possa imprimir em
-      papel timbrado da empresa. Há algumas coisas que se podem fazer para alterar a aparência da factura.
+    <para>O estilo predefinido da factura, como mostrado na <xref linkend="bus-ar-invoiceprint2" />, é
+      bastante árido. Este estilo deixa a parte superior do formulário em branco, para que possa
+      imprimir em papel timbrado da empresa. Há algumas coisas que se podem fazer para alterar a
+      aparência da factura.
     </para>
 
     <para>Utilize
@@ -445,7 +507,8 @@ corrected to be less describing of the interface and more tutorial oriented
         <guimenu>Ficheiro</guimenu><guimenuitem>Propriedades</guimenuitem>
       </menuchoice>
       para inserir as informações da empresa no separador <guilabel>Negócios</guilabel> nas
-      <guilabel>Opções do livro</guilabel>. Alguma dessa informação será imprimida no lado direito dos documentos.
+      <guilabel>Opções do livro</guilabel>. Alguma dessa informação será imprimida no lado
+      direito dos documentos.
     </para>
 
     <para>Para adicionar um fundo, um cabeçalho ou logótipo, modifique as folhas de estilo dos documentos.
@@ -453,11 +516,13 @@ corrected to be less describing of the interface and more tutorial oriented
       <menuchoice>
         <guimenu>Editar</guimenu> <guimenuitem>Folhas de estilo</guimenuitem>
       </menuchoice>
-      e seleccione <guibutton>Nova</guibutton> na janela <guilabel>Seleccionar folha de estilo HTML</guilabel> que surge. Verá algo como isto:
+      e seleccione <guibutton>Nova</guibutton> na janela <guilabel>Seleccionar folha de estilo
+      HTML</guilabel> que surge. Verá algo como isto:
     </para>
 
     <figure pgwide="1">
       <title>Janela Nova folha de estilo</title>
+
       <screenshot id="bus-ar-invoicechange1">
         <mediaobject>
           <imageobject>
@@ -468,21 +533,25 @@ corrected to be less describing of the interface and more tutorial oriented
       </screenshot>
     </figure>
 
-    <para>Dê um <guilabel>Nome</guilabel> à nova folha de estilo (por exemplo <guilabel>Factura personalizada</guilabel>)
-      e seleccione o <guilabel>modelo</guilabel> <guilabel>Elegante</guilabel>. Ao clicar em
-      <guibutton>Aceitar</guibutton>, verá a janela <guilabel>Propriedades da folha de estilo HTML</guilabel>
-      . Esta janela mostra-lhe cinco separadores ao cimo:
-      <guilabel>Cores</guilabel>, <guilabel>Letras</guilabel>, <guilabel>Geral</guilabel>,
-      <guilabel>Imagens</guilabel>, e <guilabel>Tabelas</guilabel>. Em <guilabel>Cores</guilabel>
-      pode alterar as cores de vários artigos da factura. Em <guilabel>Letras</guilabel> pode definir o tipo e tamanho da letra do documento. Em <guilabel>Geral</guilabel> pode definir a informação do <guilabel>Preparador</guilabel> e de <guilabel>Preparado para</guilabel> e <guilabel>Activar ligações</guilabel>. Em
-      <guilabel>Imagens</guilabel> pode importar gráficos para a folha de estilo. O separador 
-      <guilabel>Tabelas</guilabel> permite ajustar o espaçamento em torno das tabelas que
-      compõem a factura.
+    <para>Dê um <guilabel>Nome</guilabel> à nova folha de estilo (por exemplo <guilabel>Factura
+      personalizada</guilabel>) e seleccione o <guilabel>modelo</guilabel>
+      <guilabel>Elegante</guilabel>. Ao clicar em <guibutton>Aceitar</guibutton>, verá a janela
+      <guilabel>Propriedades da folha de estilo HTML</guilabel> . Esta janela mostra-lhe cinco
+      separadores ao cimo: <guilabel>Cores</guilabel>, <guilabel>Letras</guilabel>,
+      <guilabel>Geral</guilabel>, <guilabel>Imagens</guilabel>, e <guilabel>Tabelas</guilabel>. Em
+      <guilabel>Cores</guilabel> pode alterar as cores de vários artigos da factura. Em
+      <guilabel>Letras</guilabel> pode definir o tipo e tamanho da letra do documento. Em
+      <guilabel>Geral</guilabel> pode definir a informação do <guilabel>Preparador</guilabel> e de
+      <guilabel>Preparado para</guilabel> e <guilabel>Activar ligações</guilabel>. Em
+      <guilabel>Imagens</guilabel> pode importar gráficos para a folha de estilo. O separador
+      <guilabel>Tabelas</guilabel> permite ajustar o espaçamento em torno das tabelas que compõem
+      a factura.
     </para>
 
-    <para>Para incluir um logótipo da empresa, cabeçalho e imagem de fundo, use o seu programa de gráficos favorito, tal como o <application>Gimp</application> ou o <application>OpenOffice
+    <para>Para incluir um logótipo da empresa, cabeçalho e imagem de fundo, use o seu programa de gráficos
+      favorito, tal como o <application>Gimp</application> ou o <application>OpenOffice
       Draw</application> para gravar as imagens em formato <acronym>GIF</acronym> ou
-      <acronym>PNG</acronym>. Em seguida, importe-as para a folha de estilo usando o separador 
+      <acronym>PNG</acronym>. Em seguida, importe-as para a folha de estilo usando o separador
       <guilabel>Imagens</guilabel> descrito acima.
     </para>
 
@@ -491,12 +560,14 @@ corrected to be less describing of the interface and more tutorial oriented
 
     <figure pgwide="1">
       <title>Exemplo de folha de estilo personalizada</title>
+
       <screenshot id="bus-ar-invoicechange2">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ar_invoicechange2.png"
                        srccredit="Pedro Albuquerque"/>
           </imageobject>
+
           <caption>
             <para>A janela de folhas de estilo <acronym>HTML</acronym> com um exemplo de logótipo.
             </para>
@@ -506,29 +577,37 @@ corrected to be less describing of the interface and more tutorial oriented
     </figure>
 
     <note>
-      <para>As imagens são colocadas na factura como se segue. O <guilabel>Mosaico de fundo</guilabel> é espalhado
-        para se tornar a imagem de fundo, o <guilabel>Cabeçalho</guilabel> fica por cima do
-        texto da factura, e o <guilabel>Logótipo</guilabel> é colocado no canto superior esquerdo da
-        factura, à esquerda do cabeçalho. Terá provavelmente de tentar alguns tamanhos de imagem até obter as ideais para imprimir bem. Eid algumas sugestões de dimensionamento, o logótipo deve ter 1 cm quadrado (~0,5 polegadas) e o cabeçalho deve ter 15 cm (~6 polegadas) de largura e 1 cm (~0,5 polegadas) de altura.
+      <para>As imagens são colocadas na factura como se segue. O <guilabel>Mosaico de fundo</guilabel> é
+        espalhado para se tornar a imagem de fundo, o <guilabel>Cabeçalho</guilabel> fica por cima
+        do texto da factura, e o <guilabel>Logótipo</guilabel> é colocado no canto superior
+        esquerdo da factura, à esquerda do cabeçalho. Terá provavelmente de tentar alguns
+        tamanhos de imagem até obter as ideais para imprimir bem. Eid algumas sugestões de
+        dimensionamento, o logótipo deve ter 1 cm quadrado (~0,5 polegadas) e o cabeçalho deve ter
+        15 cm (~6 polegadas) de largura e 1 cm (~0,5 polegadas) de altura.
       </para>
     </note>
 
-    <para>Com a folha de estilos configurada, ao imprimir a factura, selecciona a folha de estilos a utilizar no menu <guimenu>Opções</guimenu>. Abaixo está a factura resultante após a aplicação do estilo      demonstrado acima.
+    <para>Com a folha de estilos configurada, ao imprimir a factura, selecciona a folha de estilos a utilizar
+      no menu <guimenu>Opções</guimenu>. Abaixo está a factura resultante após a aplicação do
+      estilo demonstrado acima.
     </para>
 
     <figure pgwide="1">
       <title>Exemplo de folha de estilo HTML personalizada</title>
+
       <screenshot id="bus-ar-invoicechange3">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/bus_ar_invoicechange3.png"
                        srccredit="Pedro Albuquerque" width="&img-w;"/>
           </imageobject>
+
           <imageobject role="fo">
             <imagedata fileref="figures/bus_ar_invoicechange3.png"
                        srccredit="Pedro Albuquerque"/>
           </imageobject>
-           <caption>
+
+          <caption>
             <para>A factura resultante da adição de um logótipo à folha de estilo.
             </para>
           </caption>
diff --git a/pt/guide/ch_bus_intro.xml b/pt/guide/ch_bus_intro.xml
index c44fe4cb..083e86f1 100644
--- a/pt/guide/ch_bus_intro.xml
+++ b/pt/guide/ch_bus_intro.xml
@@ -18,18 +18,26 @@
   <sect1 id="bus-intro">
     <title>Introdução às funcionalidades para micro-empresas</title>
 
-    <para>As necessidades contabilísticas de uma empresa são bastante diferentes das de um indivíduo. As empresas têm clientes que devem dinheiro, vendedores a quem devem dinheiro, salários de empregados, impostos mais complexos, etc. O &app; oferece características orientadas para as empresas que facilitam estas necessidades.
+    <para>As necessidades contabilísticas de uma empresa são bastante diferentes das de um indivíduo. As
+      empresas têm clientes que devem dinheiro, vendedores a quem devem dinheiro, salários de
+      empregados, impostos mais complexos, etc. O &app; oferece características orientadas para as
+      empresas que facilitam estas necessidades.
     </para>
 
-    <para><emphasis>As contas a receber</emphasis> (A/R) são utilizadas pelas empresas para registar vendas que não são imediatamente pagas. Isto é representado no balanço como um activo, porque a expectativa é de que receba o pagamento em breve.
+    <para><emphasis>As contas a receber</emphasis> (A/R) são utilizadas pelas empresas para registar vendas
+      que não são imediatamente pagas. Isto é representado no balanço como um activo, porque a
+      expectativa é de que receba o pagamento em breve.
     </para>
 
-    <para><emphasis>Contas a pagar</emphasis> (A/P) registam as facturas que as empresas receberam, mas não podem
-      pagar até mais tarde. Isto é representado no balanço como um passivo, porque terá de pagar por elas.
+    <para><emphasis>Contas a pagar</emphasis> (A/P) registam as facturas que as empresas receberam, mas não
+      podem pagar até mais tarde. Isto é representado no balanço como um passivo, porque terá de
+      pagar por elas.
     </para>
 
-    <para>As contas A/R e A/P são utilizadas principalmente quando se tem muitas contas e recibos a fluir e
-      e não quer perdê-los de vista só porque não se pagam ou não são pagos de imediato. Para a maioria dos utilizadores domésticos, as A/R e A/P são demasiado complicadas para valerem a pena.
+    <para>As contas A/R e A/P são utilizadas principalmente quando se tem muitas contas e recibos a fluir e e
+      não quer perdê-los de vista só porque não se pagam ou não são pagos de imediato. Para a
+      maioria dos utilizadores domésticos, as A/R e A/P são demasiado complicadas para valerem a
+      pena.
     </para>
   </sect1>
 </chapter>
diff --git a/pt/guide/ch_bus_pay.xml b/pt/guide/ch_bus_pay.xml
index 8585eba0..37eb7e1a 100644
--- a/pt/guide/ch_bus_pay.xml
+++ b/pt/guide/ch_bus_pay.xml
@@ -16,20 +16,33 @@
 <chapter id="chapter_bus_pay">
   <title>Folha de salários</title>
 
-  <para>Uma folha de salários é um registo financeiro de salários, remuneração líquida, férias pagas e deduções para cada empregado. Este capítulo demonstra como acompanhar a folha de salários utilizando o &app;
+  <para>Uma folha de salários é um registo financeiro de salários, remuneração líquida, férias pagas
+    e deduções para cada empregado. Este capítulo demonstra como acompanhar a folha de salários
+    utilizando o &app;
   </para>
 
   <sect1 id="bus-pay-concepts1">
     <title>Conceitos básicos</title>
 
-    <para>Uma folha de salários é um registo financeiro de salários, remuneração líquida, férias pagas e deduções para cada empregado. Basicamente, qualquer coisa que se relacione com dar dinheiro ou benefícios a um empregado. A Folha de salários é uma das tarefas mais complexas em contabilidade, porque existem muitas contas diferentes, pessoas, e agências envolvidas no pagamento de salários.
+    <para>Uma folha de salários é um registo financeiro de salários, remuneração líquida, férias pagas
+      e deduções para cada empregado. Basicamente, qualquer coisa que se relacione com dar
+      dinheiro ou benefícios a um empregado. A Folha de salários é uma das tarefas mais complexas
+      em contabilidade, porque existem muitas contas diferentes, pessoas, e agências envolvidas no
+      pagamento de salários.
     </para>
 
-    <para>A Folha de salários é normalmente contabilizada como uma despesa. Por vezes os contabilistas <quote> armazenam</quote> algumas despesas salariais numa conta de passivo a curto prazo. Isto é útil para coisas como impostos sobre salários, que podem ser pagos num momento diferente do salário do empregado. Por exemplo, o empregado pode ser pago quinzenalmente, enquanto os impostos são pagos trimestralmente. Este capítulo apresenta uma metodologia que considera o salário como despesa imediata, mas armazena os impostos em contas de passivo.
+    <para>A Folha de salários é normalmente contabilizada como uma despesa. Por vezes os contabilistas
+      <quote> armazenam</quote> algumas despesas salariais numa conta de passivo a curto prazo. Isto
+      é útil para coisas como impostos sobre salários, que podem ser pagos num momento diferente
+      do salário do empregado. Por exemplo, o empregado pode ser pago quinzenalmente, enquanto os
+      impostos são pagos trimestralmente. Este capítulo apresenta uma metodologia que considera o
+      salário como despesa imediata, mas armazena os impostos em contas de passivo.
     </para>
 
     <note>
-      <para>O &app; não tem um sistema integrado de folhas de pagamento. Mesmo podendo acompanhar as despesas com a folha de salário no &app; o cálculo de impostos e deduções tem de ser feito fora do &app;.
+      <para>O &app; não tem um sistema integrado de folhas de pagamento. Mesmo podendo acompanhar as despesas
+        com a folha de salário no &app; o cálculo de impostos e deduções tem de ser feito fora
+        do &app;.
       </para>
     </note>
   </sect1>
@@ -37,14 +50,20 @@
   <sect1 id="bus-pay-acct1">
     <title>Hierarquia de contas</title>
 
-    <para>A legislação fiscal local deve ser considerada aquando da criação de contas. Porque existem muitas maneiras diferentes de tratar os impostos sobre os salários em todo o mundo, esta secção apresenta uma estrutura muito simples. A partir daqui, deverá ser capaz de adaptar a sua configuração específica de deduções da folha de pagamento.
+    <para>A legislação fiscal local deve ser considerada aquando da criação de contas. Porque existem
+      muitas maneiras diferentes de tratar os impostos sobre os salários em todo o mundo, esta
+      secção apresenta uma estrutura muito simples. A partir daqui, deverá ser capaz de adaptar a
+      sua configuração específica de deduções da folha de pagamento.
     </para>
 
-    <para>Assuma que deve pagar dois impostos, Imp1 e Imp2 e que cada um tem uma contribuição do empregado e uma contribuição do empregador.
+    <para>Assuma que deve pagar dois impostos, Imp1 e Imp2 e que cada um tem uma contribuição do empregado e
+      uma contribuição do empregador.
     </para>
 
     <para>O salário do empregado e estes dois impostos são contas de despesas. As componentes fiscais são
-      contas de passivo. As contas de passivo fiscal são onde se acumulam os impostos retidos para todos os seus empregados. Os impostos são posteriormente pagos à agência governamental apropriada.
+      contas de passivo. As contas de passivo fiscal são onde se acumulam os impostos retidos para
+      todos os seus empregados. Os impostos são posteriormente pagos à agência governamental
+      apropriada.
     </para>
 
     <para><screen>Estrutura simples de contas de folha de salários:
@@ -59,7 +78,12 @@
    -Imp1
    -Imp2</screen>
       <note>
-        <para>Resista à tentação de criar sub-contas por empregado para acompanhar os salários individuais. Criar uma sub-conta para cada empregado levaria a listas de contas enormes e incontroláveis. Imagine a estrutura da conta após alguns anos de entrada e saída de empregados. É muito mais simples manter todos os registos de salários dos seus empregados dentro de uma única conta (<emphasis>Despesas:Salários</emphasis> por exemplo) e utilizar relatórios para ver a informação por empregado.
+        <para>Resista à tentação de criar sub-contas por empregado para acompanhar os salários individuais.
+          Criar uma sub-conta para cada empregado levaria a listas de contas enormes e
+          incontroláveis. Imagine a estrutura da conta após alguns anos de entrada e saída de
+          empregados. É muito mais simples manter todos os registos de salários dos seus
+          empregados dentro de uma única conta (<emphasis>Despesas:Salários</emphasis> por
+          exemplo) e utilizar relatórios para ver a informação por empregado.
         </para>
       </note>
     </para>
@@ -68,13 +92,19 @@
   <sect1 id="bus-pay-protocol1">
     <title>Protocolo</title>
 
-    <para>O &app; não tem um sistema integrado de folhas de pagamento. Mesmo podendo acompanhar as despesas com a folha de salário no &app; há necessidade de desenvolver um protocolo de folha de salários e realizar os cálculos fora do &app; numa folha de cálculo, por exemplo. Nesta secção, é apresentado um protocolo deste tipo. Pode utilizar o exemplo como modelo.
+    <para>O &app; não tem um sistema integrado de folhas de pagamento. Mesmo podendo acompanhar as despesas
+      com a folha de salário no &app; há necessidade de desenvolver um protocolo de folha de
+      salários e realizar os cálculos fora do &app; numa folha de cálculo, por exemplo. Nesta
+      secção, é apresentado um protocolo deste tipo. Pode utilizar o exemplo como modelo.
     </para>
 
     <sect2 id="bus-pay-protocolone2">
       <title>Passo 1: lista de deduções</title>
 
-      <para>O primeiro passo para o protocolo da folha de pagamento é criar uma lista de todos os impostos e deduções possíveis para cada empregado. Cada entrada deve incluir definições e fórmulas de cálculo para cada valor. Uma vez estabelecido o protocolo, este só precisa de ser alterado quando as leis sobre salários ou impostos forem alteradas.
+      <para>O primeiro passo para o protocolo da folha de pagamento é criar uma lista de todos os impostos e
+        deduções possíveis para cada empregado. Cada entrada deve incluir definições e
+        fórmulas de cálculo para cada valor. Uma vez estabelecido o protocolo, este só precisa de
+        ser alterado quando as leis sobre salários ou impostos forem alteradas.
       </para>
 
       <para>No cenário proposto, tal lista seria assim:
@@ -108,25 +138,32 @@
       </itemizedlist>
 
       <note>
-        <para>O salário líquido do empregado (E_SALÁRIO_LÍQUIDO) é definido como E_SALÁRIO_BRUTO - E_IMP1 - E_IMP2 e não precisa de constar nesta lista por ser composto por itens que já lá existem.
+        <para>O salário líquido do empregado (E_SALÁRIO_LÍQUIDO) é definido como E_SALÁRIO_BRUTO - E_IMP1 -
+          E_IMP2 e não precisa de constar nesta lista por ser composto por itens que já lá
+          existem.
         </para>
       </note>
 
-      <para>Coloque as fórmulas reais para o cálculo de cada dedução nesta lista. Por vezes, estas fórmulas são
-        bastante complexas, por vezes dizem simplesmente "procurar na tabela XYZ dos códigos fiscais".
+      <para>Coloque as fórmulas reais para o cálculo de cada dedução nesta lista. Por vezes, estas fórmulas
+        são bastante complexas, por vezes dizem simplesmente "procurar na tabela XYZ dos códigos
+        fiscais".
       </para>
 
-      <para>Note que pode calcular alguns valores interessantes utilizando as definições acima. Um desses valores é o custo total para a empresa: E_SALÁRIO_BRUTO + C_IMP1 + C_IMP2.
+      <para>Note que pode calcular alguns valores interessantes utilizando as definições acima. Um desses
+        valores é o custo total para a empresa: E_SALÁRIO_BRUTO + C_IMP1 + C_IMP2.
       </para>
     </sect2>
 
     <sect2 id="bus-pay-protocoltwo2">
       <title>Passo 2: criar o mapa de transacções</title>
 
-      <para>Quando regista a folha de pagamentos no &app;, faça-o como uma única transacção com parcelas. Esta transacção fraccionada povoa as contas de despesas e passivo apropriadas. Se precisar de consultar a folha de pagamentos mais tarde, basta abrir a transacção com parcelas.
+      <para>Quando regista a folha de pagamentos no &app;, faça-o como uma única transacção com parcelas.
+        Esta transacção fraccionada povoa as contas de despesas e passivo apropriadas. Se precisar
+        de consultar a folha de pagamentos mais tarde, basta abrir a transacção com parcelas.
       </para>
 
-      <para>Com a lista de deduções acima, pode ser gerado um mapa de transacções com parcelas por empregado. Cada um dos itens da lista são mapeados para uma conta do &app;.
+      <para>Com a lista de deduções acima, pode ser gerado um mapa de transacções com parcelas por
+        empregado. Cada um dos itens da lista são mapeados para uma conta do &app;.
       </para>
 
       <para><table>
@@ -250,25 +287,36 @@
         </table>
       </para>
 
-      <para>Note-se que os componentes C_IMP1 e C_IMP2 têm entradas tanto no passivo como na despesa. A componente da companhia em cada imposto é gasta no momento da folha de salários, mas permanece
-        no passivo até que os impostos sejam devidos.
+      <para>Note-se que os componentes C_IMP1 e C_IMP2 têm entradas tanto no passivo como na despesa. A
+        componente da companhia em cada imposto é gasta no momento da folha de salários, mas
+        permanece no passivo até que os impostos sejam devidos.
       </para>
     </sect2>
 
     <sect2 id="bus-pay-protocolthree2">
       <title>Passo 3: pagar ao empregado</title>
 
-      <para>Vá à conta a partir da qual o empregado será pago, por exemplo, <emphasis>Activos:Conta à ordem</emphasis>. Abra uma transacção com parcelas e insira os valores reais, utilizando o mapa de transacções acima como guia. Repita isto para todos os funcionários.
+      <para>Vá à conta a partir da qual o empregado será pago, por exemplo, <emphasis>Activos:Conta à
+        ordem</emphasis>. Abra uma transacção com parcelas e insira os valores reais, utilizando o
+        mapa de transacções acima como guia. Repita isto para todos os funcionários.
       </para>
 
       <tip>
         <para>Este processo manual é aborrecido, especialmente se tiver um grande número de empregados.
         </para>
 
-        <para>Uma ferramenta do &app; que certamente quer utilizar ao entrar na folha de salários dos empregados é uma transacção duplicada (utilizar <guibutton>Duplicar</guibutton> na <emphasis>barra de ferramentas</emphasis>). Isto poupa o trabalho de ter de inserir todas as parcelas da transacção para cada empregado. Ainda precisa de alterar as quantias em dinheiro para corresponderem aos valores reais dos salários de cada empregado, mas não terá de construir a divisão para cada empregado.
+        <para>Uma ferramenta do &app; que certamente quer utilizar ao entrar na folha de salários dos empregados
+          é uma transacção duplicada (utilizar <guibutton>Duplicar</guibutton> na <emphasis>barra
+          de ferramentas</emphasis>). Isto poupa o trabalho de ter de inserir todas as parcelas da
+          transacção para cada empregado. Ainda precisa de alterar as quantias em dinheiro para
+          corresponderem aos valores reais dos salários de cada empregado, mas não terá de
+          construir a divisão para cada empregado.
         </para>
 
-        <para>Se as transacções da folha de salários não mudarem significativamente a cada período de pagamento, também pode utilizar a duplicação para a mais recente transacção de folha de salários para cada empregado e para o período de pagamento actual. Se o fizer a toda a hora, consulte as transacções agendadas e poupe ainda mais tempo!
+        <para>Se as transacções da folha de salários não mudarem significativamente a cada período de
+          pagamento, também pode utilizar a duplicação para a mais recente transacção de folha
+          de salários para cada empregado e para o período de pagamento actual. Se o fizer a toda
+          a hora, consulte as transacções agendadas e poupe ainda mais tempo!
         </para>
       </tip>
     </sect2>
@@ -276,7 +324,12 @@
     <sect2 id="bus-pay-protocolfour2">
       <title>Passo 4: pagar ao Estado</title>
 
-      <para>A última coisa a fazer é pagar os impostos ao Estado. As contas de passivo têm vindo a recolher os impostos de várias agências governamentais e, periodicamente, é necessário enviar um pagamento ao estado. Para o fazer, basta inserir uma transacção de duas contas, por exemplo, na conta à ordem para pagar a dívida fiscal. A transacção é entre a conta à ordem e a conta do passivo, nenhuma conta de despesas é envolvida. As contas de despesas são debitadas no momento em que a obrigação fiscal é registada.
+      <para>A última coisa a fazer é pagar os impostos ao Estado. As contas de passivo têm vindo a recolher
+        os impostos de várias agências governamentais e, periodicamente, é necessário enviar um
+        pagamento ao estado. Para o fazer, basta inserir uma transacção de duas contas, por
+        exemplo, na conta à ordem para pagar a dívida fiscal. A transacção é entre a conta à
+        ordem e a conta do passivo, nenhuma conta de despesas é envolvida. As contas de despesas
+        são debitadas no momento em que a obrigação fiscal é registada.
       </para>
     </sect2>
   </sect1>
@@ -285,21 +338,25 @@
     <title>Exemplo</title>
 
     <para>Usando a configuração de contas vista anteriormente, vamos dar um exemplo. Assumindo que tem dois
-      empregados (E1 e E2) que ganham cada um 1000 € por mês de salário bruto. A contribuição do empregado para Imposto1 e Imposto2 é de 10% e 5% respectivamente. A contribuição da empresa para Imposto1 e Imposto2 é de
-      15% e 10% além do salário bruto dos empregados.
+      empregados (E1 e E2) que ganham cada um 1000 € por mês de salário bruto. A contribuição
+      do empregado para Imposto1 e Imposto2 é de 10% e 5% respectivamente. A contribuição da
+      empresa para Imposto1 e Imposto2 é de 15% e 10% além do salário bruto dos empregados.
     </para>
 
-    <para>Começando com 50.000 € no banco e antes de fazer qualquer pagamento, a hierarquia de contas é semelhante à seguinte:
+    <para>Começando com 50.000 € no banco e antes de fazer qualquer pagamento, a hierarquia de contas é
+      semelhante à seguinte:
     </para>
 
     <figure pgwide="1">
       <title>Folha de salários exemplo 1</title>
+
       <screenshot id="bus-pay-ex1">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_pay_ex1.png" 
               srccredit="Pedro Albuquerque"/>
           </imageobject>
+
           <caption>
             <para>Configuração inicial da folha de salários
             </para>
@@ -321,22 +378,26 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>E_IMP1</emphasis> - Contribuição do empregado para Imposto1 - <emphasis>100 €</emphasis> (10% do E_SALÁRIO_BRUTO)
+          <para><emphasis>E_IMP1</emphasis> - Contribuição do empregado para Imposto1 - <emphasis>100
+            €</emphasis> (10% do E_SALÁRIO_BRUTO)
           </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>E_IMP2</emphasis> - Contribuição do empregado para Imposto2 - <emphasis>50 €</emphasis> (5% do E_SALÁRIO_BRUTO)
+          <para><emphasis>E_IMP2</emphasis> - Contribuição do empregado para Imposto2 - <emphasis>50
+            €</emphasis> (5% do E_SALÁRIO_BRUTO)
           </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>C_IMP1</emphasis> - Contribuição da companhia para Imposto1 - <emphasis>150 €</emphasis> (15% do E_SALÁRIO_BRUTO)
+          <para><emphasis>C_IMP1</emphasis> - Contribuição da companhia para Imposto1 - <emphasis>150
+            €</emphasis> (15% do E_SALÁRIO_BRUTO)
           </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>C_IMP2</emphasis> - Contribuição da companhia para Imposto2 - <emphasis>100 €</emphasis> (10% do E_SALÁRIO_BRUTO)
+          <para><emphasis>C_IMP2</emphasis> - Contribuição da companhia para Imposto2 - <emphasis>100
+            €</emphasis> (10% do E_SALÁRIO_BRUTO)
           </para>
         </listitem>
       </itemizedlist>
@@ -466,21 +527,25 @@
     <sect2 id="bus-pay-examplepay2">
       <title>Pagar a um empregado</title>
 
-      <para>Agora, insira a primeira transacção com parcelas para o empregado 1 na conta corrente. A transacção deverá ser assim:
+      <para>Agora, insira a primeira transacção com parcelas para o empregado 1 na conta corrente. A
+        transacção deverá ser assim:
       </para>
 
       <figure pgwide="1">
         <title>Folha de salários exemplo 2</title>
+
         <screenshot id="bus-pay-ex2">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_pay_ex2.png" 
                 srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/bus_pay_ex2.png" 
                 srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Transacção com parcelas do empregado 1
               </para>
@@ -490,7 +555,11 @@
       </figure>
 
       <tip>
-        <para>Ao pagar aos empregados, insira apenas o nome do empregado na área de <guilabel>Descrição</guilabel>. Se decidir utilizar as capacidades do &app;para imprimir cheques, o cheque é automaticamente emitido para o empregado correcto. Se desejar registar outras informações na transacção para além do nome do empregado, utilize a área de <guilabel>Notas</guilabel>, disponível no diário de linha dupla.
+        <para>Ao pagar aos empregados, insira apenas o nome do empregado na área de
+          <guilabel>Descrição</guilabel>. Se decidir utilizar as capacidades do &app;para imprimir
+          cheques, o cheque é automaticamente emitido para o empregado correcto. Se desejar
+          registar outras informações na transacção para além do nome do empregado, utilize a
+          área de <guilabel>Notas</guilabel>, disponível no diário de linha dupla.
         </para>
       </tip>
 
@@ -499,12 +568,14 @@
 
       <figure pgwide="1">
         <title>Folha de salários exemplo 3</title>
+
         <screenshot id="bus-pay-ex3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex3.png" 
                 srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Contas depois de pagos os salários
               </para>
@@ -517,17 +588,23 @@
     <sect2 id="bus-pay-examplegovt2">
       <title>Pagar ao Estado</title>
 
-      <para>As contas <emphasis>Impostos1</emphasis> e <emphasis>Passivos:Impostos2</emphasis>         continuam a acompanhar quanto deve pagar às agências governamentais responsáveis por cada um dos impostos. Quando chegar a altura de pagar a estas agências, faça uma transacção da conta à ordem para a conta de passivo. Não estão envolvidas contas de despesas. A conta principal aparecerá então como isto para este exemplo:
+      <para>As contas <emphasis>Impostos1</emphasis> e <emphasis>Passivos:Impostos2</emphasis> continuam a
+        acompanhar quanto deve pagar às agências governamentais responsáveis por cada um dos
+        impostos. Quando chegar a altura de pagar a estas agências, faça uma transacção da conta
+        à ordem para a conta de passivo. Não estão envolvidas contas de despesas. A conta
+        principal aparecerá então como isto para este exemplo:
       </para>
 
       <figure pgwide="1">
         <title>Folha de salários exemplo 4</title>
+
         <screenshot id="bus-pay-ex4">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex4.png" 
   	            srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Contas após pagar ao Estado
               </para>
diff --git a/pt/guide/ch_bus_setup.xml b/pt/guide/ch_bus_setup.xml
index 774cb250..c4b6dee5 100644
--- a/pt/guide/ch_bus_setup.xml
+++ b/pt/guide/ch_bus_setup.xml
@@ -14,7 +14,8 @@
 <chapter id="chapter_bus_setup">
   <title>Configuração da empresa</title>
 
-  <para>Para preparar o &app; para gerir contas a receber e/ou a pagar, deve primeiro configurar estes preliminares:
+  <para>Para preparar o &app; para gerir contas a receber e/ou a pagar, deve primeiro configurar estes
+    preliminares:
     <itemizedlist>
       <listitem>
         <para>Construir uma hierarquia de contas adequada;
@@ -46,26 +47,34 @@
   <sect1 id="bus-setupacct">
     <title>Hierarquia de contas</title>
 
-    <para>Há muitas formas diferentes de estabelecer uma hierarquia de contas empresariais. Pode começar com a
-      configuração de contas empresariais disponível a partir do assistente da nova hierarquia de contas, ou
-      pode construir uma manualmente. Para aceder às contas comerciais pré-construídas, inicie o &app; e clique em
+    <para>Há muitas formas diferentes de estabelecer uma hierarquia de contas empresariais. Pode começar com
+      a configuração de contas empresariais disponível a partir do assistente da nova hierarquia
+      de contas, ou pode construir uma manualmente. Para aceder às contas comerciais
+      pré-construídas, inicie o &app; e clique em
       <menuchoice>
-        <guimenu>Ficheiro</guimenu><guimenuitem>Novo ficheiro</guimenuitem> </menuchoice>
+        <guimenu>Ficheiro</guimenu><guimenuitem>Novo ficheiro</guimenuitem>
+      </menuchoice>
       e prossigua até ver a lista de contas disponíveis, seleccionando depois Contas empresariais.
     </para>
 
-    <para>A hierarquia de contas empresariais pré-construída não vai satisfazer exactamente as suas necessidades. Precisará de fazer ajustamentos na hierarquia de modo a satisfazer as suas necessidades particulares. Contudo, deve estar suficientemente próximo para começar.
+    <para>A hierarquia de contas empresariais pré-construída não vai satisfazer exactamente as suas
+      necessidades. Precisará de fazer ajustamentos na hierarquia de modo a satisfazer as suas
+      necessidades particulares. Contudo, deve estar suficientemente próximo para começar.
     </para>
 
-    <para>Para usar o sistema integrado de contas a receber do &app;, é necessário primeiro criar uma conta especial (geralmente uma sub-conta em Activos) para registar transacções de contas a receber. Esta conta deve
-      ser definida com o tipo de conta <emphasis>A/Receber</emphasis>. O &app; utilizará esta conta para
-      registar transacções relacionadas com o sistema integrado de contas a receber.
+    <para>Para usar o sistema integrado de contas a receber do &app;, é necessário primeiro criar uma conta
+      especial (geralmente uma sub-conta em Activos) para registar transacções de contas a
+      receber. Esta conta deve ser definida com o tipo de conta <emphasis>A/Receber</emphasis>. O
+      &app; utilizará esta conta para registar transacções relacionadas com o sistema integrado
+      de contas a receber.
     </para>
 
-    <para>Para usar o sistema integrado de contas a pagar do &app;, é necessário primeiro criar uma conta (normalmente uma sub-conta em Passivo) para realizar transacções de contas a pagar. Esta conta deve ser definida com tipo de conta <emphasis>A/Pagar</emphasis>. O &app; utilizará esta conta para colocar
-      transacções relacionadas com o sistema integrado de contas a pagar.
+    <para>Para usar o sistema integrado de contas a pagar do &app;, é necessário primeiro criar uma conta
+      (normalmente uma sub-conta em Passivo) para realizar transacções de contas a pagar. Esta
+      conta deve ser definida com tipo de conta <emphasis>A/Pagar</emphasis>. O &app; utilizará
+      esta conta para colocar transacções relacionadas com o sistema integrado de contas a pagar.
     </para>
-	<screen>Hierarquia básica de contas A/R e A/P:
+<screen>Hierarquia básica de contas A/R e A/P:
 	
 	-Activos
 	   -Contas a receber
@@ -85,20 +94,26 @@
 
     <note>
       <para>Não é necessário criar uma conta A/R individual para cada cliente. O &app; mantém um registo de
-        clientes internamente e fornece relatórios por cliente com base no rastreio interno. O mesmo se aplica a contas A/P e fornecedores.
+        clientes internamente e fornece relatórios por cliente com base no rastreio interno. O
+        mesmo se aplica a contas A/P e fornecedores.
       </para>
     </note>
 
     <note>
-      <para>Se lida com clientes em mais do que uma moeda, necessitará de uma conta <guilabel>A/Receber</guilabel> separada <emphasis>para cada moeda</emphasis>.
+      <para>Se lida com clientes em mais do que uma moeda, necessitará de uma conta
+        <guilabel>A/Receber</guilabel> separada <emphasis>para cada moeda</emphasis>.
       </para>
 
-      <para>Se lida com fornecedores em mais do que uma moeda, necessitará de uma conta <guilabel>A/Pagar</guilabel> separada <emphasis> para cada moeda</emphasis>.
+      <para>Se lida com fornecedores em mais do que uma moeda, necessitará de uma conta
+        <guilabel>A/Pagar</guilabel> separada <emphasis> para cada moeda</emphasis>.
       </para>
     </note>
 
     <note>
-      <para>Transacções envolvendo uma conta <emphasis>Contas a Receber</emphasis> ou <emphasis>Contas a Pagar</emphasis> não devem ser adicionadas, alteradas ou eliminadas de qualquer outra forma que não seja através de emissão/anulação de facturas/vales ou processamento de pagamentos!
+      <para>Transacções envolvendo uma conta <emphasis>Contas a Receber</emphasis> ou <emphasis>Contas a
+        Pagar</emphasis> não devem ser adicionadas, alteradas ou eliminadas de qualquer outra forma
+        que não seja através de emissão/anulação de facturas/vales ou processamento de
+        pagamentos!
       </para>
     </note>
   </sect1>
@@ -106,7 +121,8 @@
   <sect1 id="bus-setuptaxtables">
     <title>Configurar tabelas de imposto sobre vendas</title>
 
-    <para>As tabelas de impostos sobre vendas podem ser utilizadas para determinar o imposto para facturas de clientes (ou facturas de fornecedores).
+    <para>As tabelas de impostos sobre vendas podem ser utilizadas para determinar o imposto para facturas de
+      clientes (ou facturas de fornecedores).
     </para>
 
     <para>Uma entrada na tabela de impostos pode ser atribuída a uma linha de factura.
@@ -115,16 +131,20 @@
     <para>Defina tabelas fiscais distintas para clientes e fornecedores.
     </para>
 
-    <para>A entrada predefinida da tabela de imposto sobre facturação pode ser atribuída a cada cliente e a cada fornecedor.
+    <para>A entrada predefinida da tabela de imposto sobre facturação pode ser atribuída a cada cliente e a
+      cada fornecedor.
     </para>
 
-    <para>A entrada padrão da tabela de impostos para novos clientes ou novos fornecedores pode ser especificada nas <emphasis>opções do livro</emphasis>, janela que pode ser acedida em
+    <para>A entrada padrão da tabela de impostos para novos clientes ou novos fornecedores pode ser
+      especificada nas <emphasis>opções do livro</emphasis>, janela que pode ser acedida em
       <menuchoice>
-        <guimenu>Ficheiro</guimenu> <guisubmenu>Propriedades</guisubmenu> <guimenuitem>Negócios</guimenuitem>
+        <guimenu>Ficheiro</guimenu> <guisubmenu>Propriedades</guisubmenu>
+        <guimenuitem>Negócios</guimenuitem>
       </menuchoice>
     </para>
 
-    <para>As tabelas de impostos sobre vendas são mantidas usando o editor de <emphasis>tabelas de impostos sobre vendas</emphasis>, que é acedido através do menu
+    <para>As tabelas de impostos sobre vendas são mantidas usando o editor de <emphasis>tabelas de impostos
+      sobre vendas</emphasis>, que é acedido através do menu
       <menuchoice>
         <guimenu>Negócios</guimenu><guimenuitem>Tabela de impostos sobre vendas</guimenuitem>
       </menuchoice>
@@ -133,6 +153,7 @@
 
     <figure>
       <title>Editor de tabelas de impostos sobre vendas</title>
+
       <screenshot id="bus-taxmain">
         <mediaobject>
           <imageobject>
@@ -145,6 +166,7 @@
 
     <figure>
       <title>Nova entrada na tabela de impostos sobre vendas</title>
+
       <screenshot id="bus-taxnew">
         <mediaobject>
           <imageobject>
@@ -172,20 +194,26 @@
       </listitem>
 
       <listitem>
-        <para><guilabel>Conta</guilabel> - esta é a conta em que será lançado o imposto. Para impostos cobrados de
-          clientes, esta deve provavelmente ser uma conta de passivo, uma vez que deve ser paga ao
-          estado. Para impostos pagos a fornecedores, se as leis fiscais permitirem que os impostos pagos a fornecedores compensem o imposto cobrado aos clientes, esta deve provavelmente ser também uma conta de passivo (embora tenha normalmente um saldo devedor) para que o imposto líquido devido ao estado possa ser facilmente controlado.
+        <para><guilabel>Conta</guilabel> - esta é a conta em que será lançado o imposto. Para impostos cobrados
+          de clientes, esta deve provavelmente ser uma conta de passivo, uma vez que deve ser paga
+          ao estado. Para impostos pagos a fornecedores, se as leis fiscais permitirem que os
+          impostos pagos a fornecedores compensem o imposto cobrado aos clientes, esta deve
+          provavelmente ser também uma conta de passivo (embora tenha normalmente um saldo devedor)
+          para que o imposto líquido devido ao estado possa ser facilmente controlado.
         </para>
 
-        <para>Se criar impostos sobre compras e impostos sobre vendas como sub-contas de Passivo:Impostos, o imposto líquido será calculado e pode ser visto no separador Contas do &app;.
+        <para>Se criar impostos sobre compras e impostos sobre vendas como sub-contas de Passivo:Impostos, o
+          imposto líquido será calculado e pode ser visto no separador Contas do &app;.
         </para>
 
-        <para><emphasis>Se não tiver a certeza sobre os requisitos da lei fiscal, obtenha aconselhamento profissional.</emphasis>
+        <para><emphasis>Se não tiver a certeza sobre os requisitos da lei fiscal, obtenha aconselhamento
+          profissional.</emphasis>
         </para>
       </listitem>
     </itemizedlist>
 
-    <para>As tabelas seguintes ilustram exemplos de tabelas de impostos e podem ser utilizadas como pontos de partida para determinar a configuração apropriada para uma jurisdição em particular.
+    <para>As tabelas seguintes ilustram exemplos de tabelas de impostos e podem ser utilizadas como pontos de
+      partida para determinar a configuração apropriada para uma jurisdição em particular.
     </para>
 
     <table frame='all' id="bus-tax-tbl-eu">
@@ -222,7 +250,7 @@
               23%
             </entry>
           </row>
-          
+
           <row>
             <entry>
               IVA intermédio de vendas
@@ -302,7 +330,7 @@
               23%
             </entry>
           </row>
-          
+
           <row>
             <entry>
               IVA intermédio de compras
@@ -500,11 +528,19 @@
 
   <sect1 id="bus-setupcname">
     <title>Inserir a informação da empresa</title>
-	<para>Depois de ter construído a hierarquia de contas e definido as suas tabelas de impostos, crie a sua empresa no ficheiro do &app;. Para tal, seleccione o separador <guilabel>Negócios</guilabel> nas <guilabel>Opções do livro</guilabel>, que podem ser acedidas a partir de <menuchoice><guimenu>Ficheiro</guimenu><guimenuitem>Propriedades</guimenuitem></menuchoice>.
+
+    <para>Depois de ter construído a hierarquia de contas e definido as suas tabelas de impostos, crie a sua
+      empresa no ficheiro do &app;. Para tal, seleccione o separador <guilabel>Negócios</guilabel>
+      nas <guilabel>Opções do livro</guilabel>, que podem ser acedidas a partir de
+      <menuchoice>
+        <guimenu>Ficheiro</guimenu><guimenuitem>Propriedades</guimenuitem>
+      </menuchoice>
+      .
     </para>
 
     <figure>
       <title>Inserir a informação da empresa</title>
+
       <screenshot id="bus-co-reg">
         <mediaobject>
           <imageobject>
@@ -520,17 +556,20 @@
 
     <itemizedlist>
       <listitem>
-        <para>inserir o nome da sua empresa juntamente com informações de contacto, tais como o seu número de telefone, número de fax, endereço electrónico e URL do sítio web.
+        <para>inserir o nome da sua empresa juntamente com informações de contacto, tais como o seu número de
+          telefone, número de fax, endereço electrónico e URL do sítio web.
         </para>
       </listitem>
 
       <listitem>
-        <para>inserir o número de identificação (NIF) da sua empresa no campo <guilabel>NIF da empresa</guilabel>.
+        <para>inserir o número de identificação (NIF) da sua empresa no campo <guilabel>NIF da
+          empresa</guilabel>.
         </para>
       </listitem>
 
       <listitem>
-        <para>seleccionar tabelas de impostos predefinidas aplicáveis aos seus clientes e fornecedores mais comuns.
+        <para>seleccionar tabelas de impostos predefinidas aplicáveis aos seus clientes e fornecedores mais
+          comuns.
         </para>
       </listitem>
     </itemizedlist>
@@ -554,33 +593,45 @@
   <sect1 id="bus-setupterms">
     <title>Definir condições de facturação</title>
 
-    <para>Os termos de facturação podem ser utilizados para determinar a data de vencimento do pagamento e servir de guia para determinar o desconto para pagamento antecipado de facturas de clientes ou fornecedores.
+    <para>Os termos de facturação podem ser utilizados para determinar a data de vencimento do pagamento e
+      servir de guia para determinar o desconto para pagamento antecipado de facturas de clientes ou
+      fornecedores.
     </para>
 
     <note>
-      <para>A partir do &app; 2.6.7, os termos de facturação são apenas parcialmente suportados. A data de vencimento é calculada utilizando os termos de facturação mas o montante do desconto não é.
+      <para>A partir do &app; 2.6.7, os termos de facturação são apenas parcialmente suportados. A data de
+        vencimento é calculada utilizando os termos de facturação mas o montante do desconto não
+        é.
       </para>
 
-      <para>O desconto para pagamento antecipado de facturas não está implementado. Há 2 formas de o fazer, embora
-        nenhuma seja recomendada e o aconselhamento profissional deve ser utilizado para confirmar que os regulamentos estão a ser cumpridos:
+      <para>O desconto para pagamento antecipado de facturas não está implementado. Há 2 formas de o fazer,
+        embora nenhuma seja recomendada e o aconselhamento profissional deve ser utilizado para
+        confirmar que os regulamentos estão a ser cumpridos:
         <itemizedlist>
           <listitem>
-            <para>depois de criar e lançar um pagamento para a totalidade da factura, editar manualmente a transacção de pagamento (geralmente fortemente desencorajada) e dividir o pagamento, reduzindo o montante do desconto e criando uma parcela compensatória numa conta de receita (desconto);
+            <para>depois de criar e lançar um pagamento para a totalidade da factura, editar manualmente a
+              transacção de pagamento (geralmente fortemente desencorajada) e dividir o pagamento,
+              reduzindo o montante do desconto e criando uma parcela compensatória numa conta de
+              receita (desconto);
             </para>
           </listitem>
 
           <listitem>
-            <para>alternativamente, após criar e emitir um pagamento para o montante descontado, criar uma nota de crédito para o desconto, utilizando uma conta específica de rendimentos de vendas negativos (desconto) para a conta de transferência.
+            <para>alternativamente, após criar e emitir um pagamento para o montante descontado, criar uma nota de
+              crédito para o desconto, utilizando uma conta específica de rendimentos de vendas
+              negativos (desconto) para a conta de transferência.
             </para>
           </listitem>
         </itemizedlist>
       </para>
     </note>
 
-    <para>Pode especificar as condições de facturação em cada factura. As condições de facturação serão predefinidas a partir das condições de facturação do cliente ou do fornecedor.
+    <para>Pode especificar as condições de facturação em cada factura. As condições de facturação
+      serão predefinidas a partir das condições de facturação do cliente ou do fornecedor.
     </para>
 
-    <para>As condições de facturação são geridas utilizando o editor de condições de pagamento, que é acedido através do menu 
+    <para>As condições de facturação são geridas utilizando o editor de condições de pagamento, que é
+      acedido através do menu
       <menuchoice>
         <guimenu>Negócios</guimenu><guimenuitem>Editor de condições de pagamento</guimenuitem>
       </menuchoice>
@@ -589,6 +640,7 @@
 
     <figure>
       <title>Editor de condições de pagamento</title>
+
       <screenshot id="bus-termsmain">
         <mediaobject>
           <imageobject>
@@ -601,6 +653,7 @@
 
     <figure>
       <title>Nova condição de pagamento</title>
+
       <screenshot id="bus-termsnew">
         <mediaobject>
           <imageobject>
@@ -614,14 +667,15 @@
     <itemizedlist>
       <listitem>
         <para><guilabel>Nome</guilabel> - designação interna das condições de pagamento.
-        <!--For some examples of billing term
+<!--For some examples of billing term
           names and descriptions see <ulink url="&url-wiki-pmt-term;" />.
           Translators, add a reference to a list of terms common in your language -->
         </para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Descrição</guilabel> - a descrição das condições de pagamento, a imprimir nas facturas.
+        <para><guilabel>Descrição</guilabel> - a descrição das condições de pagamento, a imprimir nas
+          facturas.
         </para>
       </listitem>
 
@@ -641,7 +695,8 @@
               </listitem>
 
               <listitem>
-                <para><guilabel>Dias de desconto</guilabel>  - o número de dias após a data de emissão da factura durante os quais será aplicado um desconto por pagamento antecipado;
+                <para><guilabel>Dias de desconto</guilabel> - o número de dias após a data de emissão da factura
+                  durante os quais será aplicado um desconto por pagamento antecipado;
                 </para>
               </listitem>
 
@@ -673,7 +728,9 @@
               </listitem>
 
               <listitem>
-                <para><guilabel>Dia de corte</guilabel>  - o dia de corte para aplicar facturas ao mês seguinte. Após o corte, as facturas são aplicadas ao mês seguinte. Valores negativos contam a partir do fim do mês.
+                <para><guilabel>Dia de corte</guilabel> - o dia de corte para aplicar facturas ao mês seguinte. Após o
+                  corte, as facturas são aplicadas ao mês seguinte. Valores negativos contam a
+                  partir do fim do mês.
                 </para>
               </listitem>
             </itemizedlist>
diff --git a/pt/guide/ch_capgain.xml b/pt/guide/ch_capgain.xml
index edc1d07a..a31bd20d 100644
--- a/pt/guide/ch_capgain.xml
+++ b/pt/guide/ch_capgain.xml
@@ -58,8 +58,8 @@
     </para>
 
     <para>Os métodos contabilísticos para registar uma valorização são algo diferentes da
-      desvalorização, porque, tipicamente só há preocupacção com o momento da venda do activo e
-      realização do ganho de capital. Isto é o oposto à natureza contínua do controlo da
+      desvalorização, porque, tipicamente só há preocupacção com o momento da venda do activo
+      e realização do ganho de capital. Isto é o oposto à natureza contínua do controlo da
       desvalorização. Os ganhos de capital são um assunto importante no mundo fiscal, porque os
       governos tendem a ter neles muito interesse, de uma ou de outra maneira.
     </para>
@@ -68,8 +68,8 @@
       <para>Como sempre, há excepções. Se detiver uma obrigação que paga todos os juros no vencimento, as
         autoridades fiscais impõem muitas vezes a declaração de juros anuais e recusam o
         tratamento como ganho de capital. Consulte os códigos fiscais adequados para determinar o
-        tratamento apropriado para cada tipo de activo que possa ser abrangido por impostos relativos
-        a ganhos de capital.
+        tratamento apropriado para cada tipo de activo que possa ser abrangido por impostos
+        relativos a ganhos de capital.
       </para>
     </note>
 
@@ -78,20 +78,20 @@
     </para>
 
     <para>Mercadorias negociadas diariamente em mercados abertos, como as bolsas de valores, são
-      possivelmente o tipo de activo mais fácil de avaliar e vender o activo a preço de mercado pode
-      ser tão simples como contactar um corrector e emitir uma ordem de mercado. Por outro lado,
-      estimar o valor de uma casa é mais difícil. As casas vendem-se menos que as acções e as
-      vendas tendem a envolver um gasto considerável de esforço e negociações, o que significa
-      que as estimativas são menos precisas. Igualmente, a venda de um automóvel usado envolve uma
-      negociação que torna a avaliação menos previsível.
+      possivelmente o tipo de activo mais fácil de avaliar e vender o activo a preço de mercado
+      pode ser tão simples como contactar um corrector e emitir uma ordem de mercado. Por outro
+      lado, estimar o valor de uma casa é mais difícil. As casas vendem-se menos que as acções e
+      as vendas tendem a envolver um gasto considerável de esforço e negociações, o que
+      significa que as estimativas são menos precisas. Igualmente, a venda de um automóvel usado
+      envolve uma negociação que torna a avaliação menos previsível.
     </para>
 
-    <para>Valores de objectos de colecção, tais como jóias, arte, colecção de selos, etc., são ainda mais
-      difíceis de avaliar. Os mercados para este tipo de objectos são ainda mais restritos que o
-      mercado imobiliário ou automóvel. Pior ainda são os activos únicos no mundo. As fábricas
-      produzem, por vezes, um produto único e muito específico e personalizado que pode custar
-      centenas de milhares de euros. Estes produtos podem ter vários valores conflituosos, nenhum
-      dos quais pode ser correcto sem ambiguidades.
+    <para>Valores de objectos de colecção, tais como jóias, arte, colecção de selos, etc., são ainda
+      mais difíceis de avaliar. Os mercados para este tipo de objectos são ainda mais restritos
+      que o mercado imobiliário ou automóvel. Pior ainda são os activos únicos no mundo. As
+      fábricas produzem, por vezes, um produto único e muito específico e personalizado que pode
+      custar centenas de milhares de euros. Estes produtos podem ter vários valores conflituosos,
+      nenhum dos quais pode ser correcto sem ambiguidades.
     </para>
 
     <para>Em contabilidade, a regra geral para estimar ganhos (ou perdas) de capital é que só deve reavaliar
@@ -162,24 +162,26 @@
       mas substitua <quote>ITEM1</quote> por <quote>Degas</quote> e remova as contas
       <quote>ITEM2</quote>. Vamos presumir que a pintura de Degas tinha um valor inicial de cem mil
       euros. Ofereça a si mesmo os 100.000€; para a conta à ordem e depois transfira-os para a
-      conta <emphasis>Activos:Activos fixos:Degas:Custo</emphasis> (a transacção de compra do activo).
-      A sua janela pricipal deverá ser parecida a esta:
+      conta <emphasis>Activos:Activos fixos:Degas:Custo</emphasis> (a transacção de compra do
+      activo). A sua janela pricipal deverá ser parecida a esta:
     </para>
 
     <figure pgwide="1">
       <title>Contas de valorização de activos</title>
+
       <screenshot id="capgain_appmain">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/capgain_appmain.png"
                        srccredit="Pedro Albuquerque"/>
           </imageobject>
+
           <caption>
             <para>Exemplo de contas para controlo da valorização de activos
             </para>
           </caption>
         </mediaobject>
-    </screenshot>
+      </screenshot>
     </figure>
 
     <sect2 id="capgain_exampleunrealized2">
@@ -193,6 +195,7 @@
 
       <figure pgwide="1">
         <title>Plano de contas depois do ganho não realizado</title>
+
         <screenshot id="capgain_app2main">
           <mediaobject>
             <imageobject>
@@ -208,8 +211,8 @@
       <title>Vender</title>
 
       <para>Vamos supor que algum tempo depois os valores das pinturas de Degas subiram ainda mais, cerca de
-        20,000€; estimados. Diligentemente, regista a subida como anteriormente e decide vender
-        a pintura.
+        20,000€; estimados. Diligentemente, regista a subida como anteriormente e decide vender a
+        pintura.
       </para>
 
       <para>Surgem três possibilidades. Pode ter <emphasis>valorizado precisamente</emphasis> o ganho não
@@ -228,8 +231,8 @@
           </para>
 
           <para>Segundo, tem de creditar a sua conta bancária com o preço de venda da pintura. O dinheiro vem
-            directamente das sub-contas de <emphasis>Activos:Activos fixos:Degas</emphasis>. Transfira o
-            total da conta <emphasis>Activos:Activos fixos:Degas:Custo</emphasis> para
+            directamente das sub-contas de <emphasis>Activos:Activos fixos:Degas</emphasis>.
+            Transfira o total da conta <emphasis>Activos:Activos fixos:Degas:Custo</emphasis> para
             <emphasis>Activos:Activos actuais:Conta poupança</emphasis> e o total da conta
             <emphasis>Activos:Activos fixos:Degas:Ganhos não realizados</emphasis> para a conta
             <emphasis>Activos:Activos actuais:Conta poupança</emphasis>.
@@ -326,6 +329,7 @@
 
           <figure pgwide="1">
             <title>Plano de contas após um ganho realizado</title>
+
             <screenshot id="capgain_app3main">
               <mediaobject>
                 <imageobject>
@@ -459,8 +463,8 @@
           <para><emphasis>Subvalorização</emphasis> de ganhos não realizados.
           </para>
 
-          <para>Conseguiu vender a pintura por um valor acima dos seus sonhos, por 150.000€;. O valor extra é,
-            de novo, registado como ganho, i.e., receita.
+          <para>Conseguiu vender a pintura por um valor acima dos seus sonhos, por 150.000€;. O valor extra é, de
+            novo, registado como ganho, i.e., receita.
           </para>
 
           <para>As transacções serão como se segue (observe a última transacção, que salda as contas
@@ -579,7 +583,8 @@
 
       <para>Como vimos neste exemplo, para activos não financeiros é difícil estimar correctamente o
         <quote>verdadeiro</quote> valor de um activo. É bastante fácil pensar que estamos ricos,
-        baseados em estimativas questionáveis que não reflectem o <quote>dinheiro no banco</quote>.
+        baseados em estimativas questionáveis que não reflectem o <quote>dinheiro no
+        banco</quote>.
       </para>
 
       <para>Quando se lida com valorização de activos,
diff --git a/pt/guide/ch_cbook.xml b/pt/guide/ch_cbook.xml
index 72085ff1..16e6191c 100644
--- a/pt/guide/ch_cbook.xml
+++ b/pt/guide/ch_cbook.xml
@@ -24,10 +24,10 @@
   </para>
 
   <para>Para começar, tal como discutido no capítulo <xref linkend="chapter_txns"></xref>, a introdução
-    de dados de transacções comuns é praticamente feita por si no &app;, dada a sua funcionalidade
-    de auto-preenchimento. O &app; mantém um saldo corrente para cada conta e torna fácil
-    reconciliar estas contas. E o método de dupla entrada ajuda-o a contabilizar os gastos, por
-    requerer sempre uma conta de transferência para os levantamentos, pelo que pode sempre
+    de dados de transacções comuns é praticamente feita por si no &app;, dada a sua
+    funcionalidade de auto-preenchimento. O &app; mantém um saldo corrente para cada conta e torna
+    fácil reconciliar estas contas. E o método de dupla entrada ajuda-o a contabilizar os gastos,
+    por requerer sempre uma conta de transferência para os levantamentos, pelo que pode sempre
     encontrar facilmente quanto dinheiro gasta em diferentes áreas.
   </para>
 
@@ -52,8 +52,9 @@
       seja para contas configuradas por si, certifique-se que tem à mão um extracto com o saldo
       actual das contas físicas. Pode inserir este valor na janela de informação de conta, como
       parte do assistente de <guilabel>Configuração de nova hierarquia de contas</guilabel>, ou
-      pode inserir uma transacção manual directamente na conta. Para o fazer manualmente, insira uma
-      transferência a partir da conta <guilabel>Saldo inicial</guilabel> (tipo Capital próprio).
+      pode inserir uma transacção manual directamente na conta. Para o fazer manualmente, insira
+      uma transferência a partir da conta <guilabel>Saldo inicial</guilabel> (tipo Capital
+      próprio).
     </para>
 
     <para>As contas bancárias típicas que pode querer controlar incluem:
@@ -96,8 +97,8 @@
     </para>
 
     <tip>
-      <para>Certifique-se de que marca a caixa Relativa a impostos e atribui o formulário e código apropriados no
-        diálogo Informação de impostos (
+      <para>Certifique-se de que marca a caixa Relativa a impostos e atribui o formulário e código apropriados
+        no diálogo Informação de impostos (
         <menuchoice>
           <guimenu>Editar</guimenu><guimenuitem>Opções do relatório Impostos</guimenuitem>
         </menuchoice>
@@ -136,11 +137,12 @@
       mais informação obtém sobre a maneira como gasta o seu dinheiro.
     </para>
 
-    <para>Os levantamentos assumem várias formas. Os levantamentos ATM são uma das transacções mais comuns.
-      Passar cheques é outra forma de levantar dinheiro para pagar despesas, fazer compras ou doar
-      para caridade. Dependendo do seu banco, pode também ter taxas de serviço, em que o próprio
-      banco levanta dinheiro da sua conta. Transferências de dinheiro para outra conta também são
-      levantamentos. Vamos ver cada um destes tipos de levantamento e como registá-los no &app;.
+    <para>Os levantamentos assumem várias formas. Os levantamentos ATM são uma das transacções mais
+      comuns. Passar cheques é outra forma de levantar dinheiro para pagar despesas, fazer compras
+      ou doar para caridade. Dependendo do seu banco, pode também ter taxas de serviço, em que o
+      próprio banco levanta dinheiro da sua conta. Transferências de dinheiro para outra conta
+      também são levantamentos. Vamos ver cada um destes tipos de levantamento e como registá-los
+      no &app;.
     </para>
 
     <sect2 id="cbook-atm2">
@@ -182,9 +184,9 @@
     </para>
 
     <para>Mas e o que se passa com todas as outras contas que criou? Também devem ser reconciliadas? Se
-      recebe um extracto dessas contas, deve pensar em as reconciliar. Exemplos incluem o extracto da
-      conta à ordem, o extracto da conta poupança e o extracto do cartão de crédito. Este último,
-      assim como as transacções com cartões de crédito, são explicados em
+      recebe um extracto dessas contas, deve pensar em as reconciliar. Exemplos incluem o extracto
+      da conta à ordem, o extracto da conta poupança e o extracto do cartão de crédito. Este
+      último, assim como as transacções com cartões de crédito, são explicados em
       <xref linkend="chapter_cc"></xref>, portanto, se está interessado em controlar os seus
       cartões de crédito com o &app;, siga as instruções ali fornecidas.
     </para>
@@ -213,12 +215,14 @@
 
       <figure pgwide="1">
         <title>A árvore de contas</title>
+
         <screenshot id="cbook-gcashdata4">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cbook_gcashdata4.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra a árvore de contas.
               </para>
@@ -238,24 +242,27 @@
             inserir outro tipo de depósito - uma transferência da conta de poupanças para a conta
             à ordem. Numa linha em branco, insira uma transacção para transferir 500€; da
             <emphasis>Conta poupança</emphasis> para a <emphasis>Conta à ordem</emphasis> (neste
-            caso, a última data de transacção foi a 30 de Janeiro de 2016, mas esta transferência
-            ocorreu a 6 de Janeiro de 2016). A sua conta de transferência é <emphasis>Conta
-            poupança</emphasis>, uma vez que está no diário da <emphasis>Conta à
+            caso, a última data de transacção foi a 30 de Janeiro de 2016, mas esta
+            transferência ocorreu a 6 de Janeiro de 2016). A sua conta de transferência é
+            <emphasis>Conta poupança</emphasis>, uma vez que está no diário da <emphasis>Conta à
             ordem</emphasis>. A <emphasis>Conta à ordem</emphasis> deve estar parecida com isto:
           </para>
 
           <figure pgwide="1">
             <title>O diário da conta à ordem</title>
+
             <screenshot id="cbook-transferin">
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/cbook_transferin.png"
                              srccredit="Pedro Albuquerque" width="&img-w;"/>
                 </imageobject>
+
                 <imageobject role="fo">
                   <imagedata fileref="figures/cbook_transferin.png"
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o diário da conta à ordem.
                   </para>
@@ -269,24 +276,27 @@
           <para>Agora vamos passar alguns cheques sobre esta conta. Primeiro passe um cheque a Hipermercado da
             avenida, no valor de 75€; com data de 5 de Janeiro. A sua conta de transferência é
             <emphasis>Comida</emphasis>, dado que todo este dinheiro serviu para comprar mercearias.
-            A seguir, passe outro cheque, desta vez a Drogaria ABC, no valor de 100€; com data
-            de 6 de Janeiro. Divida este montante entre as contas <emphasis>Higiene</emphasis>
-            (50€;) e <emphasis>Ferramentas</emphasis> (50€;). Precisará de criar estas duas
-            contas de Despesa. A sua conta deverá agora parecer-se com a figura abaixo:
+            A seguir, passe outro cheque, desta vez a Drogaria ABC, no valor de 100€; com data de
+            6 de Janeiro. Divida este montante entre as contas <emphasis>Higiene</emphasis> (50€;)
+            e <emphasis>Ferramentas</emphasis> (50€;). Precisará de criar estas duas contas de
+            Despesa. A sua conta deverá agora parecer-se com a figura abaixo:
           </para>
 
           <figure pgwide="1">
             <title>O diário da conta à ordem após registar mais alguns cheques</title>
+
             <screenshot id="cbook-checkexamp">
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/cbook_checkexamp.png"
                              srccredit="Pedro Albuquerque" width="&img-w;"/>
                 </imageobject>
+
                 <imageobject role="fo">
                   <imagedata fileref="figures/cbook_checkexamp.png"
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o diário da conta à ordem após registar mais alguns cheques.
                   </para>
@@ -299,23 +309,26 @@
         <listitem>
           <para>Suponha que agora precisa de levantar dinheiro e não tem uma conta Dinheiro configurada na sua
             àrvore de contas. Terá de criar uma. Crie a conta <guilabel>Dinheiro</guilabel> como
-            conta de topo de tipo <guilabel>Activo</guilabel>. A partir do diário da <emphasis>Conta
-            à ordem</emphasis>, insira um levantamento ATM para transferir 100€; para a conta
-            <emphasis>Dinheiro</emphasis> a 25 de Janeiro.
+            conta de topo de tipo <guilabel>Activo</guilabel>. A partir do diário da
+            <emphasis>Conta à ordem</emphasis>, insira um levantamento ATM para transferir 100€;
+            para a conta <emphasis>Dinheiro</emphasis> a 25 de Janeiro.
           </para>
 
           <figure pgwide="1">
             <title>O diário da conta à ordem após registar um levantamento ATM</title>
+
             <screenshot id="cbook-atm">
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/cbook_atm.png"
                              srccredit="Pedro Albuquerque" width="&img-w;"/>
                 </imageobject>
+
                 <imageobject role="fo">
                   <imagedata fileref="figures/cbook_atm.png"
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o diário da conta à ordem após registar um levantamento ATM.
                   </para>
@@ -336,12 +349,14 @@
 
       <figure pgwide="1">
         <title>Exemplo de um extracto bancário</title>
+
         <screenshot id="cbook-bankstmt">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cbook_bankstmt.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra um exemplo de extracto bancário.
               </para>
@@ -364,17 +379,20 @@
 
           <figure pgwide="1">
             <title>A janela de reconciliação</title>
+
             <screenshot id="cbook-reconexamp">
               <mediaobject role="html">
                 <imageobject>
                   <imagedata fileref="figures/cbook_reconexamp.png"
                              srccredit="Pedro Albuquerque" width="&img-w;"/>
                 </imageobject>
+
                 <imageobject role="fo">
                   <imagedata fileref="figures/cbook_reconexamp.png"
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
-               <caption>
+
+                <caption>
                   <para>Esta imagem mostra a janela de reconciliação com uma diferença de 5€;.
                   </para>
                 </caption>
@@ -382,9 +400,9 @@
             </screenshot>
           </figure>
 
-          <para>Repare que há uma diferença de 5€; entre o saldo reconciliado e o seu saldo final. Se olhar
-            para o extracto bancário, verá que há uma taxa de serviço no valor de 5€; que
-            não foi adicionada à sua <emphasis>Conta à ordem</emphasis>.
+          <para>Repare que há uma diferença de 5€; entre o saldo reconciliado e o seu saldo final. Se olhar para
+            o extracto bancário, verá que há uma taxa de serviço no valor de 5€; que não foi
+            adicionada à sua <emphasis>Conta à ordem</emphasis>.
           </para>
         </listitem>
 
@@ -399,16 +417,19 @@
 
           <figure pgwide="1">
             <title>O diário da conta à ordem com a taxa de serviço adicionada</title>
+
             <screenshot id="cbook-servch">
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/cbook_servch.png"
                              srccredit="Pedro Albuquerque" width="&img-w;"/>
                 </imageobject>
+
                 <imageobject role="fo">
                   <imagedata fileref="figures/cbook_servch.png"
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o diário da conta à ordem com a taxa de serviço adicionada.
                   </para>
@@ -430,12 +451,14 @@
 
           <figure pgwide="1">
             <title>O diário da conta à ordem reconciliada</title>
+
             <screenshot id="cbook-reconciledCheckAct">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_reconciledCheckAct.png"  
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o diário da conta à ordem reconciliada.
                   </para>
@@ -457,12 +480,14 @@
 
       <figure pgwide="1">
         <title>A árvore de contas</title>
+
         <screenshot id="cbook-chartaccts5">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cbook_chartaccts5.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>A árvore de contas.
               </para>
@@ -494,12 +519,14 @@
 
           <figure pgwide="1">
             <title>Fluxo de caixa para o mês de Janeiro de 2016</title>
+
             <screenshot id="cbook-puttoget2-Cash">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_CashFlow.png"
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o fluxo de caixa para o mês de Janeiro de 2016 após o capítulo
                     <xref linkend="chapter_cbook"></xref>.
@@ -523,19 +550,21 @@
 
           <figure pgwide="1">
             <title>Relatório de transacções para as contas de activos durante o mês de Janeiro de 2016</title>
+
             <screenshot id="cbook-puttoget2-TransactionRptChecking">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_TransactionRptAssets.png" 
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o relatório de transacções para as contas de activos durante o mês de Janeiro
                     de 2016.
                   </para>
                 </caption>
               </mediaobject>
-          </screenshot>
+            </screenshot>
           </figure>
         </listitem>
 
@@ -544,17 +573,18 @@
           </para>
 
           <figure pgwide="1">
-            <title>Relatório de transacções para as contas de despesa durante o mês de
-              Janeiro de 2016</title>
+            <title>Relatório de transacções para as contas de despesa durante o mês de Janeiro de 2016</title>
+
             <screenshot id="cbook-puttoget2-TransactionRptExpenses">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cbook_TransactionRptExpenses.png" 
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
-                  <para>Esta imagem mostra o relatório de transacções para as contas de despesa durante
-                    o mês de Janeiro de 2016.
+                  <para>Esta imagem mostra o relatório de transacções para as contas de despesa durante o mês de Janeiro
+                    de 2016.
                   </para>
                 </caption>
               </mediaobject>
diff --git a/pt/guide/ch_cc.xml b/pt/guide/ch_cc.xml
index 1a61c720..218dbe39 100644
--- a/pt/guide/ch_cc.xml
+++ b/pt/guide/ch_cc.xml
@@ -21,12 +21,12 @@
   <sect1 id="cc-concepts1">
     <title>Conceitos</title>
 
-    <para>Dado que muito provavelmente passa um cheque ou faz um pagamento electrónico à companhia do cartão
-      de crédito uma vez por mês, poderá pensar no cartão de crédito como sendo uma despesa -
-      mas na realidade não o é. Porquê? Um cartão de crédito é um empréstimo a curto prazo,
-      permite comprar coisas nessa conta de empréstimo e depois terá de pagar esse dinheiro,
-      muitas vezes com juros (a sua taxa financeira). As compras que faz com o cartão de crédito
-      é que são as despesas.
+    <para>Dado que muito provavelmente passa um cheque ou faz um pagamento electrónico à companhia do
+      cartão de crédito uma vez por mês, poderá pensar no cartão de crédito como sendo uma
+      despesa - mas na realidade não o é. Porquê? Um cartão de crédito é um empréstimo a
+      curto prazo, permite comprar coisas nessa conta de empréstimo e depois terá de pagar esse
+      dinheiro, muitas vezes com juros (a sua taxa financeira). As compras que faz com o cartão de
+      crédito é que são as despesas.
     </para>
 
     <para>Tem algumas opções disponíveis quando insere transacções com cartões de crédito, portanto
@@ -59,9 +59,9 @@
     <para>As compras que faz com o cartão de crédito são despesas, logo, terá de configurar estas contas
       sob a conta de topo de tipo <guilabel>Despesa</guilabel>. Se decidir manter um registo mais
       detalhado das suas compras, terá de criar contas de despesa para cada tipo de compra que
-      faça. Uma vez que também irá reconciliar o saldo da conta com o extracto do cartão, também
-      deve inserir um saldo inicial em cada conta <guilabel>Cartão de crédito</guilabel>. A
-      maneira mais fácil de o fazer é usar o último extracto como saldo inicial.
+      faça. Uma vez que também irá reconciliar o saldo da conta com o extracto do cartão,
+      também deve inserir um saldo inicial em cada conta <guilabel>Cartão de crédito</guilabel>.
+      A maneira mais fácil de o fazer é usar o último extracto como saldo inicial.
     </para>
 
     <sect2 id="cc-accounts-simple2">
@@ -128,26 +128,26 @@
     <title>Inserir compras</title>
 
     <para>Inserir as suas compras oferece-lhe um quadro mais completo dos seus hábitos de consumo. As compras
-      com um cartão de crédito são controladas como transacções entre a conta cartão do passivo
-      e as contas.
+      com um cartão de crédito são controladas como transacções entre a conta cartão do
+      passivo e as contas.
     </para>
 
     <para>Quando paga bens ou serviços com o seu cartão de crédito, está a dizer à companhia do cartão
       de crédito que faça o pagamento por si. Esta transacção aumenta o montante de dinheiro que
       deve à companhia do cartão de crédito e o saldo do cartão de crédito aumenta. O outro
       lado destas transacção será, na maioria dos casos, uma conta de despesa. Por exemplo, se
-      comprar roupa numa loja com o cartão de crédito por 50€;, estará a transferir dinheiro
-      da conta do cartão de crédito para a conta Despesas:Roupas.
+      comprar roupa numa loja com o cartão de crédito por 50€;, estará a transferir dinheiro da
+      conta do cartão de crédito para a conta Despesas:Roupas.
     </para>
 
-    <para>Inserir estas transacções no &app; permite-lhe controlar quanto é que deve à companhia do cartão
-      de crédito, assim como lhe oferece uma melhor visão geral das suas contas. Também lhe
-      permite monitorizar a sua conta e garantir que evita fraudes.
+    <para>Inserir estas transacções no &app; permite-lhe controlar quanto é que deve à companhia do
+      cartão de crédito, assim como lhe oferece uma melhor visão geral das suas contas. Também
+      lhe permite monitorizar a sua conta e garantir que evita fraudes.
     </para>
 
-    <para>Adicionar transacções a uma conta de cartão de crédito é semelhante a fazê-lo em qualquer outra
-      conta. Pode inseri-las manualmente, ou importá-las da companhia do cartão, usando um formato
-      de importação compatível.
+    <para>Adicionar transacções a uma conta de cartão de crédito é semelhante a fazê-lo em qualquer
+      outra conta. Pode inseri-las manualmente, ou importá-las da companhia do cartão, usando um
+      formato de importação compatível.
     </para>
 
     <para>Para assistência na introdução de transacções, por favor consulte o capítulo 6 do manual de
@@ -161,16 +161,16 @@
     <para>A maioria dos pagamentos à companhia do cartão de crédito são inseridos sob a forma de
       transacções entre uma conta bancária (activo) e uma conta de cartão de crédito (passivo).
       Quando paga a quantia mensal, está a levantar dinheiro de uma conta bancária para liquidar o
-      saldo do cartão. Esta transacção diminui tanto o saldo da conta bancária como o montante da
-      dívida no cartão de crédito.
+      saldo do cartão. Esta transacção diminui tanto o saldo da conta bancária como o montante
+      da dívida no cartão de crédito.
     </para>
 
     <para>Quando devolve uma compra, recebe um reembolso no seu cartão de crédito. Este é outro tipo de
       pagamento que diminui o montante em dívida no cartão de crédito. Se registou a transacção
       de compra original como transferência do cartão de crédito para uma conta de despesa, terá
-      simplesmente de reverter a transacção: transfira o dinheiro da conta de despesa de volta para
-      a conta cartão. Esta transacção diminui tanto o saldo da conta de despesa como o do cartão
-      de crédito. Por exemplo, se gravou originalmente uma compra de roupa com o cartão de
+      simplesmente de reverter a transacção: transfira o dinheiro da conta de despesa de volta
+      para a conta cartão. Esta transacção diminui tanto o saldo da conta de despesa como o do
+      cartão de crédito. Por exemplo, se gravou originalmente uma compra de roupa com o cartão de
       crédito, a transacção é uma transferência do cartão de crédito para a conta de despesa.
       Se entretanto devolveu a roupa e recebeu um reembolso, volte a transferir o dinheiro da conta
       de despesa para a conta cartão.
@@ -222,10 +222,11 @@
           </listitem>
 
           <listitem>
-            <para>seleccione a transacção de compra que quer reembolsar (ou seja, a compra das calças, neste caso) e
-              seleccione
+            <para>seleccione a transacção de compra que quer reembolsar (ou seja, a compra das calças, neste caso)
+              e seleccione
               <menuchoice>
-                <guimenu>Transacção</guimenu><guisubmenu>Adicionar transacção reversa</guisubmenu>
+                <guimenu>Transacção</guimenu><guisubmenu>Adicionar transacção
+                reversa</guisubmenu>
               </menuchoice>
               . Modifique a data como for necessário.
             </para>
@@ -237,12 +238,14 @@
 
         <figure pgwide="1">
           <title>Compra com cartão de crédito reembolsada 1</title>
+
           <screenshot id="cc-Reversing-Transaction-1">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
                            srccredit="Pedro Albuquerque"/>
               </imageobject>
+
               <caption>
                 <para>Esta imagem mostra um diário de conta <emphasis>Passivo:Cartão de crédito</emphasis> após
                   reverter uma transacção de compra.
@@ -257,12 +260,14 @@
 
         <figure pgwide="1">
           <title>Compra com cartão de crédito reembolsada 2</title>
+
           <screenshot id="cc-Reversing-Transaction-2">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
                            srccredit="Pedro Albuquerque"/>
               </imageobject>
+
               <caption>
                 <para>Esta imagem mostra um diário de conta <emphasis>Despesas:Roupa</emphasis> após reverter uma
                   transacção de compra.
@@ -299,12 +304,14 @@
 
       <figure pgwide="1">
         <title>Árvore de contas inicial</title>
+
         <screenshot id="cc-accounts">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_accounts.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Árvore de contas inicial para controlar um cartão de crédito no exemplo Juntar as peças.
               </para>
@@ -318,10 +325,9 @@
       <title>Compras</title>
 
       <para>Vamos fazer compras com o cartão Visa. Comece por comprar comida no valor de 25€; no Café
-        Gorduroso, 100€; de roupa na Modista da moda, 25€; de gasolina na Rodinhas,
-        125€; em mercearias e detergentes no Hipermercado da avenida (divida a compra em
-        85€; em mercearias e 40€; em detergentes) e, finalmente, 60€; em ferragens na
-        Drogaria ABC.
+        Gorduroso, 100€; de roupa na Modista da moda, 25€; de gasolina na Rodinhas, 125€; em
+        mercearias e detergentes no Hipermercado da avenida (divida a compra em 85€; em mercearias
+        e 40€; em detergentes) e, finalmente, 60€; em ferragens na Drogaria ABC.
       </para>
 
       <para>Também refazemos o exercício da secção anterior, com a compra de calças por 74,99€; e
@@ -333,16 +339,19 @@
 
       <figure pgwide="1">
         <title>Compras iniciais com o cartão de crédito</title>
+
         <screenshot id="cc-purchases">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/cc_purchases.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/cc_purchases.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Compras iniciais com o cartão de crédito.
               </para>
@@ -360,23 +369,25 @@
         transacção para reembolso no cartão de crédito no valor total de 100€;. Lembre-se de
         usar a mesma conta de transferência que usou antes para a compra original e insira o
         montante na coluna pagamento. O &app; completa automaticamente o nome e a conta de
-        transferência por si, mas também insere os 100€; automaticamente na coluna de
-        crédito. Tem de reinserir este valor na coluna de pagamentos. A transacção parece-se com
-        isto:
+        transferência por si, mas também insere os 100€; automaticamente na coluna de crédito.
+        Tem de reinserir este valor na coluna de pagamentos. A transacção parece-se com isto:
       </para>
 
       <figure pgwide="1">
         <title>Transacção de devolução de item</title>
+
         <screenshot>
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/cc_refund.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/cc_refund.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Devolução de roupa à modista da moda, reembolso no cartão de crédito.
               </para>
@@ -390,22 +401,25 @@
       <title>Crédito de juros</title>
 
       <para>Após o mês de gastos, infelizmente chega a conta do cartão de crédito, por correio ou por a
-        Internet. Foram-lhe cobrados 20€; em juros no último dia de Fevereiro por causa do
-        saldo do mês anterior. Isto é inserido no diário do cartão de crédito como uma despesa.
+        Internet. Foram-lhe cobrados 20€; em juros no último dia de Fevereiro por causa do saldo
+        do mês anterior. Isto é inserido no diário do cartão de crédito como uma despesa.
       </para>
 
       <figure pgwide="1">
         <title>Cobrança de juros</title>
+
         <screenshot id="cc-interest">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/cc_interest.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/cc_interest.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Cobrança de juros.
               </para>
@@ -433,12 +447,14 @@
 
       <figure pgwide="1">
         <title>Janela inicial de reconciliação</title>
+
         <screenshot id="cc-reconcile-init">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_reconcile_init.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Janela inicial de reconciliação da conta.
               </para>
@@ -448,22 +464,26 @@
       </figure>
 
       <para>Durante o processo de reconciliação, marque cada transacção na conta para confirmar que elas
-        aparecem tanto na conta do &app;, como no extracto do cartão de crédito. Neste exemplo, há
-        uma diferença de 300€; entre a sua conta no &app; e o extracto do cartão de crédito.
+        aparecem tanto na conta do &app;, como no extracto do cartão de crédito. Neste exemplo,
+        há uma diferença de 300€; entre a sua conta no &app; e o extracto do cartão de
+        crédito.
       </para>
 
       <figure pgwide="1">
         <title>Janela principal de reconciliação</title>
+
         <screenshot id="cc-reconcile">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/cc_reconcile.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/cc_reconcile.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Janela principal de reconciliação de conta, demonstrando uma discrepância de 300€;.
               </para>
@@ -475,8 +495,7 @@
       <para>Com alguma investigacção, descobre que se esqueceu de registar um pagamento que fez a 5 de
         Fevereiro à companhia do cartão de crédito, no valor de 300€;, tem de inserir esta
         transacção de pagamento da sua conta à ordem para a conta cartão. Agora o extracto do
-        cartão de crédito e a sua conta no &app; podem ser reconciliadas com um saldo de
-        455€;.
+        cartão de crédito e a sua conta no &app; podem ser reconciliadas com um saldo de 455€;.
       </para>
     </sect2>
 
@@ -484,25 +503,27 @@
       <title>Pagamento</title>
 
       <para>Assumindo que completou a reconciliação da sua conta de cartão de crédito, tem de fazer um
-        pagamento à companhia do cartão de crédito. Neste exemplo, devemos 455€;, mas só
-        vamos fazer um pagamento parcial de 300€; este mês. Para tal, insira uma transacção da
-        sua conta à ordem para a conta cartão, no valor de 300€;, o que deverá reduzir o
-        saldo do seu cartão para 155€;. O seu diário da conta cartão deverá agora parecer-se
-        com isto:
+        pagamento à companhia do cartão de crédito. Neste exemplo, devemos 455€;, mas só vamos
+        fazer um pagamento parcial de 300€; este mês. Para tal, insira uma transacção da sua
+        conta à ordem para a conta cartão, no valor de 300€;, o que deverá reduzir o saldo do
+        seu cartão para 155€;. O seu diário da conta cartão deverá agora parecer-se com isto:
       </para>
 
       <figure pgwide="1">
         <title>Reconciliação e pagamento</title>
+
         <screenshot id="cc-payment">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/cc_payment.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/cc_payment.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Diário de conta após reconciliação e pagamento.
               </para>
@@ -517,12 +538,14 @@
 
       <figure pgwide="1">
         <title>Janela principal do &appname;</title>
+
         <screenshot id="cc-final">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_final.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Árvore de contas do &app; após reconciliação e pagamento do cartão de crédito.
               </para>
@@ -562,12 +585,14 @@
 
           <figure pgwide="1">
             <title>Fluxo de caixa para o mês de Fevereiro</title>
+
             <screenshot id="cc-puttoget2-Cash">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cc_CashFlow.png"
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o fluxo de caixa para o mês de Fevereiro após o capítulo
                     <xref linkend="chapter_cc"></xref>.
@@ -591,12 +616,14 @@
 
           <figure pgwide="1">
             <title>Relatório de transacções para a conta Visa durante Fevereiro/Março</title>
+
             <screenshot id="cc-puttoget2-TransactionRptVisa">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cc_TransactionRptVisa.png" 
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o relatório de transacções para a conta Visa durante Fevereiro/Março.
                   </para>
@@ -610,14 +637,16 @@
           <para>Vamos alterar o relatório de transacções para mostrar só as contas de despesa.
           </para>
 
-         <figure pgwide="1">
-          <title>Relatório de transacções para o mês de Fevereiro</title>
-          <screenshot id="cc-puttoget2-TransactionRptExpenses">
+          <figure pgwide="1">
+            <title>Relatório de transacções para o mês de Fevereiro</title>
+
+            <screenshot id="cc-puttoget2-TransactionRptExpenses">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/cc_TransactionRptExpenses.png" 
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o relatório de transacções para o mês de Fevereiro.
                   </para>
diff --git a/pt/guide/ch_currency.xml b/pt/guide/ch_currency.xml
index db32a61c..e7e4644d 100644
--- a/pt/guide/ch_currency.xml
+++ b/pt/guide/ch_currency.xml
@@ -42,8 +42,8 @@
         , separador <guilabel>Contas</guilabel>.
       </para>
 
-      <para>Para um guia completo sobre <guilabel>contas de bolsa</guilabel>, pode seguir este
-        &ulink-sel-tut; por Peter Selinger.
+      <para>Para um guia completo sobre <guilabel>contas de bolsa</guilabel>, pode seguir este &ulink-sel-tut;
+        por Peter Selinger.
       </para>
     </note>
   </sect1>
@@ -118,13 +118,14 @@
 
     <para>Abaixo temos o resultado deste exemplo, no qual começa com 10.000 USD, 10.000 EUR e 10.000 HKD em
       cada uma das três contas bancárias. Note que o total das contas-mãe só mostra o valor da
-      moeda de sub-contas com a mesma moeda. No futuro poderá definir taxas de câmbio entre moedas.
-      As contas-mãe vão então calcular o valor convertido de todas as sub-contas. Veja a secção
-      <xref linkend="currency_howto1" />.
+      moeda de sub-contas com a mesma moeda. No futuro poderá definir taxas de câmbio entre
+      moedas. As contas-mãe vão então calcular o valor convertido de todas as sub-contas. Veja a
+      secção <xref linkend="currency_howto1" />.
     </para>
 
     <figure pgwide="1">
       <title>Configuração inicial de contas bancárias com múltiplas moedas</title>
+
       <screenshot id="currency_main1">
         <mediaobject>
           <imageobject>
@@ -200,6 +201,7 @@
 
     <figure pgwide="1">
       <title>Configuração inicial de contas bancárias com múltiplas moedas</title>
+
       <screenshot id="currency_main1a">
         <mediaobject>
           <imageobject>
@@ -222,6 +224,7 @@
 
       <figure pgwide="1">
         <title>Janela da base de dados de cotações</title>
+
         <screenshot id="currency_peditor">
           <mediaobject>
             <imageobject>
@@ -230,7 +233,7 @@
             </imageobject>
           </mediaobject>
         </screenshot>
-        </figure>
+      </figure>
 
       <para>Clique em <guibutton>Adicionar</guibutton> para adicionar uma nova taxa de câmbio. Abre uma janela
         parecida com esta:
@@ -238,39 +241,44 @@
 
       <figure pgwide="1">
         <title>Definir a taxa de câmbio para dólares americanos</title>
+
         <screenshot id="currency_addcurr">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_addcurr.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Janela Adicionar da base de dados de cotações
               </para>
             </caption>
           </mediaobject>
         </screenshot>
-        </figure>
+      </figure>
 
       <para>Defina <guilabel>Espaço de nome</guilabel> para Moedas e <guilabel>Mercadoria</guilabel> para USD
         (Dólar EUA). Depois defina a taxa de câmbio entre a mercadoria seleccionada e a moeda
-        seleccionada. Neste exemplo, vamos definir a taxa de câmbio como 1€; para 1 (pense
-        assim, quantas unidades da moeda, neste caso €;, teria de gastar para comprar uma
-        unidade da mercadoria, neste caso a moeda 1).
+        seleccionada. Neste exemplo, vamos definir a taxa de câmbio como 1€; para 1 (pense assim,
+        quantas unidades da moeda, neste caso €;, teria de gastar para comprar uma unidade da
+        mercadoria, neste caso a moeda 1).
       </para>
 
       <figure pgwide="1">
         <title>Janela da base de dados de cotações</title>
+
         <screenshot id="currency_manualpriceadded">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Janela da base de dados de cotações após ter definido a taxa de câmbio entre euros e dólares
                 americanos
@@ -282,13 +290,15 @@
 
       <figure pgwide="1">
         <title>Árvore de contas</title>
+
         <screenshot id="currency_main2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_main2.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
-           <caption>
+
+            <caption>
               <para>Árvore de contas após ter definido a taxa de câmbio entre euros e dólares americanos.
               </para>
             </caption>
@@ -317,16 +327,19 @@
 
       <figure pgwide="1">
         <title>Janela da base de dados de cotações</title>
+
         <screenshot id="currency_BeforeGetOnline">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Janela da base de dados de cotações antes de obter as cotações online
               </para>
@@ -349,19 +362,21 @@
 
       <figure pgwide="1">
         <title>Janela da base de dados de cotações</title>
+
         <screenshot id="currency_AfterGetOnlineQuotes">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
                            srccredit="Pedro Albuquerque"/>
-              </imageobject>
-              <caption>
-                <para>Janela da base de dados de cotações após obter as cotações online.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
-        </figure>
+            </imageobject>
+
+            <caption>
+              <para>Janela da base de dados de cotações após obter as cotações online.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Pode observar que o &app; transfere taxas de câmbio para todas as moedas que está a utilizar nas
         suas várias contas. Isto vai acontecer de cada vez que clicar em <guibutton>Obter
@@ -372,11 +387,13 @@
 
       <para>E se olhar para a árvore de contas, verá que o &app; converteu automaticamente o montante em HKD
         para EUR nas contas-mãe que estão em EUR, assim como na coluna <guilabel>Total
-        (EUR)</guilabel>. Também as contas em euro foram actualizadas com a última taxa de câmbio.
+        (EUR)</guilabel>. Também as contas em euro foram actualizadas com a última taxa de
+        câmbio.
       </para>
 
       <figure pgwide="1">
         <title>Árvore de contas após ter obtido as cotações online</title>
+
         <screenshot id="currency_main3.png">
           <mediaobject>
             <imageobject>
@@ -479,18 +496,20 @@
       </note>
 
       <para>Primeiro tem de transferir o dinheiro para a Jamaica (10.000€;), usando a sua conta bancária
-        normal (com um saldo de 100.000€;). O banco indica uma taxa de câmbio de EUR 1 = JMD
-        64, mas cobra-lhe 150€; para transferir o dinheiro.
+        normal (com um saldo de 100.000€;). O banco indica uma taxa de câmbio de EUR 1 = JMD 64,
+        mas cobra-lhe 150€; para transferir o dinheiro.
       </para>
 
       <figure pgwide="1">
         <title>Transferência de dinheiro para a Jamaica</title>
+
         <screenshot id="currency_purchase_MoveMoney.png">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_purchase_MoveMoney.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/currency_purchase_MoveMoney.png"
                          srccredit="Pedro Albuquerque"/>
@@ -499,18 +518,20 @@
         </screenshot>
       </figure>
 
-      <para>Seleccione a parcela do banco da Jamaica (9,850.00), clique com o botão direito do rato e seleccione
-        <guilabel>Editar taxa de câmbio</guilabel>
+      <para>Seleccione a parcela do banco da Jamaica (9,850.00), clique com o botão direito do rato e
+        seleccione <guilabel>Editar taxa de câmbio</guilabel>
       </para>
 
       <figure pgwide="1">
         <title>Editar taxa de câmbio</title>
+
         <screenshot id="currency_purchase_SetExchangeRate.png">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_SetExchangeRate.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Um diálogo onde é especificada a taxa de câmbio de uma transacção
               </para>
@@ -525,13 +546,14 @@
 
       <figure pgwide="1">
         <title>Árvore de contas antes de comprar o barco</title>
+
         <screenshot id="currency_purchase_BeforeBoat.png">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_BeforeBoat.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
-         </mediaobject>
+          </mediaobject>
         </screenshot>
       </figure>
 
@@ -543,6 +565,7 @@
 
       <figure pgwide="1">
         <title>Árvore de contas após comprar o barco</title>
+
         <screenshot id="currency_purchase_AfterBoat.png">
           <mediaobject>
             <imageobject>
@@ -554,9 +577,9 @@
       </figure>
 
       <para>A árvore de contas agora reflecte que a sua conta bancária viu o valor reduzido em 509.000 J e os
-        seus activos fixos aumentados no mesmo valor. Se tiver cativa a coluna "Total (EUR)" verá os
-        montantes correspondentes em euro. Este valor vai usar sempre a última taxa de câmbio que
-        actualizou manual ou automaticamente no &app;.
+        seus activos fixos aumentados no mesmo valor. Se tiver cativa a coluna "Total (EUR)" verá
+        os montantes correspondentes em euro. Este valor vai usar sempre a última taxa de câmbio
+        que actualizou manual ou automaticamente no &app;.
       </para>
     </sect2>
 
@@ -581,9 +604,9 @@
         </para>
       </note>
 
-      <para>Tem de encontrar o símbolo da acção. Para isto, faça um bocadinho de investigacção na Internet,
-        em particular em <ulink url="&url-yh-fin;lookup"><citetitle>Yahoo! Finance - Ticker Symbol
-        Lookup</citetitle></ulink>. Obterá o seguinte:
+      <para>Tem de encontrar o símbolo da acção. Para isto, faça um bocadinho de investigacção na
+        Internet, em particular em <ulink url="&url-yh-fin;lookup"><citetitle>Yahoo! Finance -
+        Ticker Symbol Lookup</citetitle></ulink>. Obterá o seguinte:
       </para>
 
       <itemizedlist>
@@ -607,6 +630,7 @@ Receitas:Investimentos:Dividendos:Boom:0694.HK           (HKD)</screen>
 
       <figure pgwide="1">
         <title>Árvore de contas para acções internacionais</title>
+
         <screenshot id="currency_purchase_BeforeStocks.png">
           <mediaobject>
             <imageobject>
@@ -626,6 +650,7 @@ Receitas:Investimentos:Dividendos:Boom:0694.HK           (HKD)</screen>
 
       <figure pgwide="1">
         <title>Mercadorias internacionais</title>
+
         <screenshot id="currency_purchase_Commodities.png">
           <mediaobject>
             <imageobject>
@@ -651,18 +676,20 @@ Compra de acções
     Despesas:Investimentos:Comissão:Boom:HKD            Depósito        500
     Activos:Investimentos:Conta na correctora: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 acção e seleccione <guilabel>Editar taxa de câmbio</guilabel>. Insira o número de
-        acções (16,500) como <guilabel>Montante de destino</guilabel>.
+        linha da acção e seleccione <guilabel>Editar taxa de câmbio</guilabel>. Insira o número
+        de acções (16,500) como <guilabel>Montante de destino</guilabel>.
       </para>
 
       <figure pgwide="1">
         <title>Transferência de fundos</title>
+
         <screenshot id="currency_purchase_ToAmount.png">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_ToAmount.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Definir o número de acções no diálogo de transferência de fundos
               </para>
@@ -676,12 +703,14 @@ Compra de acções
 
       <figure pgwide="1">
         <title>Acções internacionais compradas</title>
+
         <screenshot id="currency_purchase_AfterStocks.png">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_AfterStocks.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Árvore de contas com algumas acções internacionais compradas
               </para>
@@ -700,10 +729,10 @@ Compra de acções
       </para>
 
       <note>
-        <para>Este exemplo mostra como pode comprar acções em qualquer moeda, inserindo a transacção no diário
-          da conta à ordem usada para fazer o pagamento. Também pode inserir a compra no diário
-          da conta de acções, mas tenha cautela! Ao fazê-lo dessa forma, presume-se que a acção
-          está cotada na moeda da conta-mãe da conta de acções.
+        <para>Este exemplo mostra como pode comprar acções em qualquer moeda, inserindo a transacção no
+          diário da conta à ordem usada para fazer o pagamento. Também pode inserir a compra no
+          diário da conta de acções, mas tenha cautela! Ao fazê-lo dessa forma, presume-se que a
+          acção está cotada na moeda da conta-mãe da conta de acções.
         </para>
 
         <para>Neste exemplo, a conta-mãe da conta de acções (<emphasis>Activos:Investimentos:Conta na
@@ -806,8 +835,8 @@ Receitas:Investimentos:Banco da moeda:Ganhos de capital:XXX   (XXX)</screen>
         </table>
         Deverá abrir-se um diálogo para a taxa de câmbio quando sai da última linha da
         transacção de moeda acima. Se o diálogo de taxa de câmbio não abrir automaticamente,
-        clique com o botão direito do rato na linha da acção e seleccione <guilabel>Editar taxa de
-        câmbio</guilabel>. Insira a taxa de câmbio indicada pelo banco.
+        clique com o botão direito do rato na linha da acção e seleccione <guilabel>Editar taxa
+        de câmbio</guilabel>. Insira a taxa de câmbio indicada pelo banco.
       </para>
     </sect2>
 
@@ -823,9 +852,9 @@ Receitas:Investimentos:Banco da moeda:Ganhos de capital:XXX   (XXX)</screen>
       <para>A venda correcta de moeda *tem* de ser feita usando uma transacção com parcelas. Nesta, tem de
         contabilizar o lucro (ou perda) como vindo da conta <emphasis>Receitas:Ganhos de
         capital</emphasis> (ou <emphasis>Despesas:Perdas de capital</emphasis>). Para saldar esta
-        receita, terá de inserir o activo Moeda duas vezes na transacção. Uma para registar a venda
-        real (com o montante e taxa de câmbio correctos) e outra para saldar o lucro (definindo o
-        montante como 0).
+        receita, terá de inserir o activo Moeda duas vezes na transacção. Uma para registar a
+        venda real (com o montante e taxa de câmbio correctos) e outra para saldar o lucro
+        (definindo o montante como 0).
       </para>
 
       <para>Resumindo, uma transacção de venda de moeda deve parecer-se com isto, de novo visto da conta
@@ -923,8 +952,8 @@ Receitas:Investimentos:Banco da moeda:Ganhos de capital:XXX   (XXX)</screen>
   <sect1 id="currency_reconcile1">
     <title>Como fazer - reconciliar extractos em moeda estrangeira</title>
 
-    <para>Reconciliar extractos estrangeiros é feito da mesma forma que o extracto do banco local. Se criou uma
-      estrutura de contas que lhe permite ter a mesma moeda por conta que o seu extracto, é
+    <para>Reconciliar extractos estrangeiros é feito da mesma forma que o extracto do banco local. Se criou
+      uma estrutura de contas que lhe permite ter a mesma moeda por conta que o seu extracto, é
       exactamente igual a reconciliar com o extracto local, fora o facto de que pode precisar de um
       dicionário.
     </para>
@@ -1051,8 +1080,8 @@ Activos:Activos actuais:Conta poupança         (AUD)</screen>
 <screen>
 Capital próprio:Lotaria   (AUD)
 Capital próprio:Herança   (AUD)</screen>
-      <para>As transacções que inserir na conta <emphasis>Activos:Activos actuais:Conta poupança</emphasis> devem
-        parecer-se com isto:
+      <para>As transacções que inserir na conta <emphasis>Activos:Activos actuais:Conta poupança</emphasis>
+        devem parecer-se com isto:
       </para>
 
       <table>
@@ -1106,6 +1135,7 @@ Capital próprio:Herança   (AUD)</screen>
 
       <figure pgwide="1">
         <title>Árvore de contas após receber algum dinheirinho</title>
+
         <screenshot id="currency_PutTogether_AfterMoney.png">
           <mediaobject>
             <imageobject>
@@ -1197,16 +1227,19 @@ Capital próprio:Saldo inicial             (AUD)  50.000</screen>
 
       <figure pgwide="1">
         <title>Crédito à habitação</title>
+
         <screenshot id="currency_PutTogether_AussieHouse.png">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_PutTogether_AussieHouse.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/currency_PutTogether_AussieHouse.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Diário de transacções do empréstimo da casa
               </para>
@@ -1242,12 +1275,13 @@ Despesas:Investimentos:Transferência de dinheiro          (AUD)</screen>
         cada uma das contas bancárias associadas à acção.
       </para>
 
-      <para>A transacção que insere na sua conta <emphasis>Activos:Activos actuais:Conta poupança</emphasis> fica
-        assim:
+      <para>A transacção que insere na sua conta <emphasis>Activos:Activos actuais:Conta poupança</emphasis>
+        fica assim:
       </para>
 
       <table>
-        <title>Transferência de dinheiro para outros continentes em transacção com parcelas em diferentes moedas.</title>
+        <title>Transferência de dinheiro para outros continentes em transacção com parcelas em diferentes
+          moedas.</title>
 
         <tgroup cols="5">
           <tbody>
@@ -1337,8 +1371,8 @@ Despesas:Investimentos:Transferência de dinheiro          (AUD)</screen>
       </table>
 
       <para>Agora que já tem dinheiro nas várias contas de correctoras de acções, pode pedir aos correctores
-        para comprarem acções para o montante especificado. Lembre-se de executar a transacção da
-        conta bancária associada com a acção e, se a janela da taxa de câmbio não aparecer,
+        para comprarem acções para o montante especificado. Lembre-se de executar a transacção
+        da conta bancária associada com a acção e, se a janela da taxa de câmbio não aparecer,
         clique com o botão direito do rato e seleccione-a manualmente. Insira o número de acções
         compradas no último campo (Montante de destino:).
       </para>
@@ -1424,12 +1458,14 @@ Despesas:Investimentos:Transferência de dinheiro          (AUD)</screen>
         </table>
       </para>
 
-      <para>Tal como pode ver na árvore de contas, comprou acções em três moedas diferentes (HK, USD, e SEK),
-        mas a árvore de contas (como se vê abaixo) não indica quanto valem na sua moeda, AUD.
+      <para>Tal como pode ver na árvore de contas, comprou acções em três moedas diferentes (HK, USD, e
+        SEK), mas a árvore de contas (como se vê abaixo) não indica quanto valem na sua moeda,
+        AUD.
       </para>
 
       <figure pgwide="1">
         <title>Árvore de contas após a compra de acções</title>
+
         <screenshot id="currency_PutTogether_AfterStocks.png">
           <mediaobject>
             <imageobject>
diff --git a/pt/guide/ch_dep.xml b/pt/guide/ch_dep.xml
index 9db0dacd..430c06ed 100644
--- a/pt/guide/ch_dep.xml
+++ b/pt/guide/ch_dep.xml
@@ -15,51 +15,67 @@
 <chapter id="chapter_dep">
   <title>Depreciação</title>
 
-  <para>Este capítulo introduz o conceito de depreciação na contabilidade e dá alguns exemplos reais para a sua utilização.
+  <para>Este capítulo introduz o conceito de depreciação na contabilidade e dá alguns exemplos reais
+    para a sua utilização.
   </para>
 
   <sect1 id="dep_concepts1">
     <title>Conceitos básicos</title>
 
-    <para>A depreciação é o método de contabilização das despesas de aquisição de capital ao longo do tempo. Existem duas razões pelas quais poderá querer registar a depreciação; está a fazer a contabilidade para as suas próprias finanças pessoais e gostaria de manter um registo do seu património líquido, ou está a fazer a contabilidade de uma pequena empresa e necessita de produzir um balanço financeiro a partir do qual irá preparar a sua declaração de impostos.
+    <para>A depreciação é o método de contabilização das despesas de aquisição de capital ao longo do
+      tempo. Existem duas razões pelas quais poderá querer registar a depreciação; está a fazer
+      a contabilidade para as suas próprias finanças pessoais e gostaria de manter um registo do
+      seu património líquido, ou está a fazer a contabilidade de uma pequena empresa e necessita
+      de produzir um balanço financeiro a partir do qual irá preparar a sua declaração de
+      impostos.
     </para>
 
-    <para>O método de registo da depreciação é o mesmo em qualquer dos casos, mas o objectivo final é diferente. Esta secção discutirá as diferenças entre os dois. Mas primeiro, alguma terminologia.
+    <para>O método de registo da depreciação é o mesmo em qualquer dos casos, mas o objectivo final é
+      diferente. Esta secção discutirá as diferenças entre os dois. Mas primeiro, alguma
+      terminologia.
     </para>
 
     <itemizedlist>
       <listitem>
-        <para><emphasis>Depreciação acumulada</emphasis> - o total acumulado da depreciação contábil tomada ao longo da vida do bem. Isto é acumulado na conta de depreciação do activo.
+        <para><emphasis>Depreciação acumulada</emphasis> - o total acumulado da depreciação contábil tomada
+          ao longo da vida do bem. Isto é acumulado na conta de depreciação do activo.
         </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Depreciação do livro</emphasis> - este é o montante de depreciação que regista nas suas demonstrações financeiras por período contabilístico.
+        <para><emphasis>Depreciação do livro</emphasis> - este é o montante de depreciação que regista nas
+          suas demonstrações financeiras por período contabilístico.
         </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Valor justo de mercado</emphasis> - o montante pelo qual um activo poderia ser vendido num determinado tempo.
+        <para><emphasis>Valor justo de mercado</emphasis> - o montante pelo qual um activo poderia ser vendido num
+          determinado tempo.
         </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Valor contabilístico líquido</emphasis> - esta é a diferença entre o custo original e a depreciação efectuada até à data.
+        <para><emphasis>Valor contabilístico líquido</emphasis> - esta é a diferença entre o custo original e
+          a depreciação efectuada até à data.
         </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Custo original</emphasis> - este é o montante que o activo custou na compra. Inclui qualquer custo para colocar o activo numa condição em que possa utilizá-lo. Por exemplo - transporte, custos de instalação, formação especial.
+        <para><emphasis>Custo original</emphasis> - este é o montante que o activo custou na compra. Inclui
+          qualquer custo para colocar o activo numa condição em que possa utilizá-lo. Por exemplo
+          - transporte, custos de instalação, formação especial.
         </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Valor residual</emphasis> - este é o valor pelo qual se estima que o bem pode ser vendido no final da sua vida útil (para si).
+        <para><emphasis>Valor residual</emphasis> - este é o valor pelo qual se estima que o bem pode ser vendido
+          no final da sua vida útil (para si).
         </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Depreciação para impostos</emphasis> - este é o montante de depreciação que utiliza para cálculo de impostos.
+        <para><emphasis>Depreciação para impostos</emphasis> - este é o montante de depreciação que utiliza
+          para cálculo de impostos.
         </para>
       </listitem>
     </itemizedlist>
@@ -67,36 +83,73 @@
     <sect2 id="dep_concepts_personal2">
       <title>Finanças pessoais</title>
 
-      <para>A depreciação é utilizada nas finanças pessoais para baixar periodicamente o valor de um activo para lhe dar uma estimativa precisa do seu património líquido actual. Por exemplo, se possuísse um carro, poderia manter um registo do seu valor actual, registando a depreciação todos os anos. Para o conseguir, regista a compra original como um activo e depois regista uma despesa de depreciação cada ano (ver <xref linkend="dep_example1" /> para um exemplo). Isto resultaria no valor líquido contabilístico sendo aproximadamente igual ao valor justo de mercado do activo no final do ano.
+      <para>A depreciação é utilizada nas finanças pessoais para baixar periodicamente o valor de um activo
+        para lhe dar uma estimativa precisa do seu património líquido actual. Por exemplo, se
+        possuísse um carro, poderia manter um registo do seu valor actual, registando a
+        depreciação todos os anos. Para o conseguir, regista a compra original como um activo e
+        depois regista uma despesa de depreciação cada ano (ver <xref linkend="dep_example1" />
+        para um exemplo). Isto resultaria no valor líquido contabilístico sendo aproximadamente
+        igual ao valor justo de mercado do activo no final do ano.
       </para>
 
-      <para>A depreciação para finanças pessoais não tem implicações fiscais, é simplesmente utilizada para o ajudar a estimar o seu património líquido. Devido a isto, não existem regras de como estimar a depreciação, utilize o seu melhor juízo.
+      <para>A depreciação para finanças pessoais não tem implicações fiscais, é simplesmente utilizada
+        para o ajudar a estimar o seu património líquido. Devido a isto, não existem regras de
+        como estimar a depreciação, utilize o seu melhor juízo.
       </para>
 
-      <para>Para que activos deve estimar a depreciação? Uma vez que a ideia de depreciação para finanças pessoais é dar-lhe uma estimativa do seu património líquido pessoal, só precisa de depreciar activos de valor notável que poderia potencialmente vender, tais como um carro ou um barco.
+      <para>Para que activos deve estimar a depreciação? Uma vez que a ideia de depreciação para finanças
+        pessoais é dar-lhe uma estimativa do seu património líquido pessoal, só precisa de
+        depreciar activos de valor notável que poderia potencialmente vender, tais como um carro ou
+        um barco.
       </para>
     </sect2>
 
     <sect2 id="dep_concepts_business2">
       <title>Negócios</title>
 
-      <para>Ao contrário das finanças pessoais, em que o objectivo é a procura do valor pessoal, os negócios preocupam-se com fazer corresponder as despesas de aquisição de activos com as receitas por eles geradas. Isto é feito através da depreciação contabilística. As empresas devem também preocupar-se com as leis fiscais locais que cobrem a depreciação de activos. Isto é conhecido como depreciação fiscal. A empresa é livre de escolher o esquema que quiser para registar a depreciação dos livros, mas o esquema utilizado para cálculo do imposto é fixo. Na maioria das vezes, isto resulta em diferenças entre depreciação contabilística e depreciação para imposto, mas podem ser tomadas medidas para reduzir estas diferenças.
+      <para>Ao contrário das finanças pessoais, em que o objectivo é a procura do valor pessoal, os negócios
+        preocupam-se com fazer corresponder as despesas de aquisição de activos com as receitas
+        por eles geradas. Isto é feito através da depreciação contabilística. As empresas devem
+        também preocupar-se com as leis fiscais locais que cobrem a depreciação de activos. Isto
+        é conhecido como depreciação fiscal. A empresa é livre de escolher o esquema que quiser
+        para registar a depreciação dos livros, mas o esquema utilizado para cálculo do imposto
+        é fixo. Na maioria das vezes, isto resulta em diferenças entre depreciação
+        contabilística e depreciação para imposto, mas podem ser tomadas medidas para reduzir
+        estas diferenças.
       </para>
 
-      <para>Agora, que compras devem ser contabilizadas? Se espera que alguma coisa que compre o ajude         ganhar rendimentos durante mais do que apenas o ano corrente, então deve ser contabilizado. Isto inclui coisas como terra, edifícios, equipamento, automóveis e computadores - desde que sejam utilizados para fins comerciais. Não inclui artigos que possam ser considerados inventário. Portanto, se fez uma compra com a intenção de revender o artigo, este não deve ser contabilizado.
+      <para>Agora, que compras devem ser contabilizadas? Se espera que alguma coisa que compre o ajude ganhar
+        rendimentos durante mais do que apenas o ano corrente, então deve ser contabilizado. Isto
+        inclui coisas como terra, edifícios, equipamento, automóveis e computadores - desde que
+        sejam utilizados para fins comerciais. Não inclui artigos que possam ser considerados
+        inventário. Portanto, se fez uma compra com a intenção de revender o artigo, este não
+        deve ser contabilizado.
       </para>
 
-      <para>Para além da compra do próprio bem, quaisquer custos associados à colocação do activo em         condição de ser utilizado devem ser contabilizados. Por exemplo, se comprar uma peça de equipamento que precisa de ser enviado de fora da cidade e depois necessita de algum trabalho eléctrico para que possa ligar a máquina e é necessária alguma formação especializada para saber como utilizar a máquina, todos estes custos seriam incluídos no custo do equipamento.
+      <para>Para além da compra do próprio bem, quaisquer custos associados à colocação do activo em
+        condição de ser utilizado devem ser contabilizados. Por exemplo, se comprar uma peça de
+        equipamento que precisa de ser enviado de fora da cidade e depois necessita de algum
+        trabalho eléctrico para que possa ligar a máquina e é necessária alguma formação
+        especializada para saber como utilizar a máquina, todos estes custos seriam incluídos no
+        custo do equipamento.
       </para>
 
-      <para>Também é necessário conhecer o valor residual estimado do activo. Geralmente, assume-se que se trata de zero. A ideia subjacente ao conhecimento do valor residual é que o bem será depreciado até o valor contabilístico líquido (custo menos depreciação) ser igual ao valor residual. Depois, quando o activo é retirado, não terá um ganho ou perda resultante da alienação do bem.
+      <para>Também é necessário conhecer o valor residual estimado do activo. Geralmente, assume-se que se
+        trata de zero. A ideia subjacente ao conhecimento do valor residual é que o bem será
+        depreciado até o valor contabilístico líquido (custo menos depreciação) ser igual ao
+        valor residual. Depois, quando o activo é retirado, não terá um ganho ou perda resultante
+        da alienação do bem.
       </para>
 
-      <para>O último passo é determinar o método de depreciação que se pretende utilizar. Este será discutido nas páginas seguintes.
+      <para>O último passo é determinar o método de depreciação que se pretende utilizar. Este será
+        discutido nas páginas seguintes.
       </para>
 
       <warning>
-        <para>Esteja ciente de que diferentes países podem ter políticas fiscais substancialmente diferentes para a depreciação; tudo o que este documento pode realmente fornecer são algumas das ideias subjacentes para o ajudar a aplicar a sua política de impostos/depreciação <quote>favorite</quote>.
+        <para>Esteja ciente de que diferentes países podem ter políticas fiscais substancialmente diferentes
+          para a depreciação; tudo o que este documento pode realmente fornecer são algumas das
+          ideias subjacentes para o ajudar a aplicar a sua política de impostos/depreciação
+          <quote>favorite</quote>.
         </para>
       </warning>
     </sect2>
@@ -105,17 +158,27 @@
   <sect1 id="dep_value1">
     <title>Estimativas de valor</title>
 
-    <para>Uma questão central com a depreciação é determinar como irá estimar o valor futuro do activo. Em comparação com as estimativas muitas vezes incertas a fazer no que toca à valorização dos bens, estamos aqui em terreno um pouco mais firme. A utilização de fontes listadas abaixo deve permitir de forma bastante directa estimar o valor futuro dos seus activos depreciados.
+    <para>Uma questão central com a depreciação é determinar como irá estimar o valor futuro do activo.
+      Em comparação com as estimativas muitas vezes incertas a fazer no que toca à valorização
+      dos bens, estamos aqui em terreno um pouco mais firme. A utilização de fontes listadas
+      abaixo deve permitir de forma bastante directa estimar o valor futuro dos seus activos
+      depreciados.
     </para>
 
     <itemizedlist>
       <listitem>
-        <para><emphasis>Códigos de impostos:</emphasis> para empresas que pretendam utilizar a depreciação para fins fiscais, os governos tendem a estabelecer regras precisas sobre a forma como se deve calcular a depreciação. Consulte os seus códigos fiscais locais, que devem indicar explicitamente como estimar a depreciação.
+        <para><emphasis>Códigos de impostos:</emphasis> para empresas que pretendam utilizar a depreciação para
+          fins fiscais, os governos tendem a estabelecer regras precisas sobre a forma como se deve
+          calcular a depreciação. Consulte os seus códigos fiscais locais, que devem indicar
+          explicitamente como estimar a depreciação.
         </para>
       </listitem>
 
       <listitem>
-        <para><emphasis>Livro azul do automóvel:</emphasis> para automóveis, é fácil de consultar em referências tais como estimativas <quote>Livros azuis</quote> do que um automóvel deve valer depois de alguns períodos de tempo no futuro. A partir daí, poderá desenvolver um modelo de depreciação.
+        <para><emphasis>Livro azul do automóvel:</emphasis> para automóveis, é fácil de consultar em
+          referências tais como estimativas <quote>Livros azuis</quote> do que um automóvel deve
+          valer depois de alguns períodos de tempo no futuro. A partir daí, poderá desenvolver um
+          modelo de depreciação.
         </para>
       </listitem>
     </itemizedlist>
@@ -123,18 +186,33 @@
     <sect2 id="dep_valueschemes2">
       <title>Esquemas de depreciação</title>
 
-      <para>Um <emphasis>esquema de depreciação</emphasis> é um modelo matemático de como um bem será desgastado ao longo do tempo. Para cada bem que sofre uma depreciação, terá de decidir sobre um esquema de amortização. Um ponto importante a ter em conta é que, para fins fiscais, precisará de depreciar os seus bens a uma determinada taxa. A isto chama-se depreciação fiscal. Para fins pessoais é livre de escolher o método que quiser. Esta é a depreciação contabilística. A maioria das pequenas empresas utiliza a mesma taxa para depreciação fiscal e contabilística. Isto de modo a haver menos diferença entre o seu rendimento líquido nas demonstrações financeiras e o seu rendimento tributável.
+      <para>Um <emphasis>esquema de depreciação</emphasis> é um modelo matemático de como um bem será
+        desgastado ao longo do tempo. Para cada bem que sofre uma depreciação, terá de decidir
+        sobre um esquema de amortização. Um ponto importante a ter em conta é que, para fins
+        fiscais, precisará de depreciar os seus bens a uma determinada taxa. A isto chama-se
+        depreciação fiscal. Para fins pessoais é livre de escolher o método que quiser. Esta é
+        a depreciação contabilística. A maioria das pequenas empresas utiliza a mesma taxa para
+        depreciação fiscal e contabilística. Isto de modo a haver menos diferença entre o seu
+        rendimento líquido nas demonstrações financeiras e o seu rendimento tributável.
       </para>
 
-      <para>Esta secção apresenta três dos mais populares esquemas de depreciação: <emphasis>linear</emphasis>, <emphasis>geométrica</emphasis> e <emphasis>soma de dígitos</emphasis>. Para simplificar os exemplos, assumiremos que o valor residual do activo a depreciar é zero. Se optar por utilizar um valor residual, deixaria de depreciar o activo assim que o valor contabilístico líquido fosse igual ao valor residual.
+      <para>Esta secção apresenta três dos mais populares esquemas de depreciação:
+        <emphasis>linear</emphasis>, <emphasis>geométrica</emphasis> e <emphasis>soma de
+        dígitos</emphasis>. Para simplificar os exemplos, assumiremos que o valor residual do
+        activo a depreciar é zero. Se optar por utilizar um valor residual, deixaria de depreciar o
+        activo assim que o valor contabilístico líquido fosse igual ao valor residual.
       </para>
 
       <orderedlist>
         <listitem>
-          <para><emphasis>Depreciação linear</emphasis> - diminui o valor de um activo por um montante fixo cada período até que o valor líquido seja zero. Este é o cálculo mais simples, uma vez que se estima uma vida útil e simplesmente divide-se o custo igualmente ao longo dessa vida útil.
+          <para><emphasis>Depreciação linear</emphasis> - diminui o valor de um activo por um montante fixo cada
+            período até que o valor líquido seja zero. Este é o cálculo mais simples, uma vez
+            que se estima uma vida útil e simplesmente divide-se o custo igualmente ao longo dessa
+            vida útil.
           </para>
 
-          <para>Exemplo: comprou um computador por 1500€ e deseja amortizá-lo durante um período de 5 anos. Cada ano, o montante da depreciação é de 300€, levando aos seguintes cálculos:
+          <para>Exemplo: comprou um computador por 1500€ e deseja amortizá-lo durante um período de 5 anos. Cada
+            ano, o montante da depreciação é de 300€, levando aos seguintes cálculos:
           </para>
 
           <para><table>
@@ -246,7 +324,11 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>Depreciação geométrica</emphasis> depreciação por uma percentagem fixa do valor do activo no período anterior. Este é um esquema de depreciação ponderada, mais depreciação a aplicar no início do período. Neste esquema, o valor de um activo diminui deixando exponencialmente no final um valor superior a zero (ou seja, um valor de revenda).
+          <para><emphasis>Depreciação geométrica</emphasis> depreciação por uma percentagem fixa do valor do
+            activo no período anterior. Este é um esquema de depreciação ponderada, mais
+            depreciação a aplicar no início do período. Neste esquema, o valor de um activo
+            diminui deixando exponencialmente no final um valor superior a zero (ou seja, um valor
+            de revenda).
           </para>
 
           <para>Exemplo: com o exemplo acima, com uma depreciação anual de 30%.
@@ -360,16 +442,28 @@
           </para>
 
           <note>
-            <para>Cuidado: as autoridades fiscais podem exigir (ou permitir) uma percentagem maior no primeiro período. Por outro lado, no Canadá isto é invertido, uma vez que permitem apenas meia quota de <quote>custo de capital</quote> no primeiro ano. O resultado desta abordagem é que o activo diminui mais rapidamente no início do que no final, o que é provavelmente mais realista para a maioria dos bens do que um esquema linear. Isto é certamente verdade para automóveis.
+            <para>Cuidado: as autoridades fiscais podem exigir (ou permitir) uma percentagem maior no primeiro
+              período. Por outro lado, no Canadá isto é invertido, uma vez que permitem apenas
+              meia quota de <quote>custo de capital</quote> no primeiro ano. O resultado desta
+              abordagem é que o activo diminui mais rapidamente no início do que no final, o que
+              é provavelmente mais realista para a maioria dos bens do que um esquema linear. Isto
+              é certamente verdade para automóveis.
             </para>
           </note>
         </listitem>
 
         <listitem>
-          <para><emphasis>Soma de dígitos</emphasis> - é um esquema de desvalorização com ponderação frontal semelhante à depreciação geométrica, excepto que o valor do activo atinge zero no final do período. Trata-se de um esquema de amortização ponderada, sendo aplicada mais depreciação no início do período. Este método é mais frequentemente utilizado nos países anglo-saxónicos.
+          <para><emphasis>Soma de dígitos</emphasis> - é um esquema de desvalorização com ponderação frontal
+            semelhante à depreciação geométrica, excepto que o valor do activo atinge zero no
+            final do período. Trata-se de um esquema de amortização ponderada, sendo aplicada
+            mais depreciação no início do período. Este método é mais frequentemente utilizado
+            nos países anglo-saxónicos.
           </para>
 
-          <para>Exemplo: primeiro divide-se o valor do activo pela soma dos anos de utilização, por exemplo, para o nosso exemplo acima, com um activo no valor de 1500€ que é utilizado durante um período de cinco anos, obtém 1500/(1+2+3+4+5)=100. A depreciação e o valor do activo são então calculados da seguinte forma:
+          <para>Exemplo: primeiro divide-se o valor do activo pela soma dos anos de utilização, por exemplo, para
+            o nosso exemplo acima, com um activo no valor de 1500€ que é utilizado durante um
+            período de cinco anos, obtém 1500/(1+2+3+4+5)=100. A depreciação e o valor do activo
+            são então calculados da seguinte forma:
           </para>
 
           <para><table>
@@ -486,14 +580,29 @@
   <sect1 id="dep_accounts1">
     <title>Hierarquia de contas</title>
 
-    <para>Tal como na maioria das práticas contabilísticas, existem várias formas diferentes de configurar as contas de depreciação. Apresentaremos aqui um método geral que deverá ser suficientemente flexível para lidar com a maioria das situações. A primeira conta de que necessitará é uma <emphasis>Custo do activo</emphasis> (no &app; tipo de conta <guilabel>Activo</guilabel>), que é simplesmente o sítio onde se grava a compra original do activo. Normalmente esta compra é realizada através de uma transacção a partir da sua conta bancária.
+    <para>Tal como na maioria das práticas contabilísticas, existem várias formas diferentes de configurar
+      as contas de depreciação. Apresentaremos aqui um método geral que deverá ser
+      suficientemente flexível para lidar com a maioria das situações. A primeira conta de que
+      necessitará é uma <emphasis>Custo do activo</emphasis> (no &app; tipo de conta
+      <guilabel>Activo</guilabel>), que é simplesmente o sítio onde se grava a compra original do
+      activo. Normalmente esta compra é realizada através de uma transacção a partir da sua
+      conta bancária.
     </para>
 
-    <para>A fim de acompanhar a depreciação do bem, serão necessárias duas contas de depreciação. A primeira é <emphasis>Depreciação acumulada</emphasis>, conta na qual se pode recolher a soma de todos os montantes da depreciação e conterá valores negativos. No &app; isto é um tipo de conta <emphasis>Activo</emphasis>. A <emphasis>Depreciação acumulada</emphasis> é saldada por uma conta <emphasis>Despesa de depreciação</emphasis>, na qual todas as despesas de depreciação periódica são registadas. No &app; este é um tipo de conta <emphasis>Despesa</emphasis>.
+    <para>A fim de acompanhar a depreciação do bem, serão necessárias duas contas de depreciação. A
+      primeira é <emphasis>Depreciação acumulada</emphasis>, conta na qual se pode recolher a
+      soma de todos os montantes da depreciação e conterá valores negativos. No &app; isto é um
+      tipo de conta <emphasis>Activo</emphasis>. A <emphasis>Depreciação acumulada</emphasis> é
+      saldada por uma conta <emphasis>Despesa de depreciação</emphasis>, na qual todas as despesas
+      de depreciação periódica são registadas. No &app; este é um tipo de conta
+      <emphasis>Despesa</emphasis>.
     </para>
 
-    <para>Abaixo encontra-se uma hierarquia de contas genérica para acompanhar a depreciação de dois activos, <emphasis>ITEM1</emphasis> e <emphasis>ITEM2</emphasis>. As contas <emphasis>>Custo do activo</emphasis>
-      contas são saldadas pela conta <emphasis>Banco</emphasis>, a <emphasis>Depreciação acumulada</emphasis> é saldada pela conta <emphasis>Despesas:Depreciação</emphasis>.
+    <para>Abaixo encontra-se uma hierarquia de contas genérica para acompanhar a depreciação de dois
+      activos, <emphasis>ITEM1</emphasis> e <emphasis>ITEM2</emphasis>. As contas <emphasis>>Custo
+      do activo</emphasis> contas são saldadas pela conta <emphasis>Banco</emphasis>, a
+      <emphasis>Depreciação acumulada</emphasis> é saldada pela conta
+      <emphasis>Despesas:Depreciação</emphasis>.
     </para>
 <screen>
 -Activos
@@ -509,33 +618,60 @@
 -Despesa
    -Depreciação (conta Despesas de depreciação)
 </screen>
-    <para>Uma das características da hierarquia de contas mostradas acima é que pode ver facilmente alguns importantes valores sumários sobre o seu activo depreciado. O total da conta <emphasis>Activo:Activos fixos:ITEM1</emphasis> mostra-lhe o valor estimado actual para o ITEM1, a conta <emphasis>AActivos:Activos fixos:ITEM1:Custo</emphasis> mostra-lhe aquilo que pagou inicialmente pelo ITEM1, <emphasis>ACtivos:Activos fixos:ITEM1:Depreciação</emphasis> mostra-lhe a depreciação acumulada do ITEM1 e, finalmente, <emphasis>Despesas:Depreciação</emphasis> demonstra a depreciação total acumulada de todos os seus activos.
+    <para>Uma das características da hierarquia de contas mostradas acima é que pode ver facilmente alguns
+      importantes valores sumários sobre o seu activo depreciado. O total da conta
+      <emphasis>Activo:Activos fixos:ITEM1</emphasis> mostra-lhe o valor estimado actual para o
+      ITEM1, a conta <emphasis>AActivos:Activos fixos:ITEM1:Custo</emphasis> mostra-lhe aquilo que
+      pagou inicialmente pelo ITEM1, <emphasis>ACtivos:Activos fixos:ITEM1:Depreciação</emphasis>
+      mostra-lhe a depreciação acumulada do ITEM1 e, finalmente,
+      <emphasis>Despesas:Depreciação</emphasis> demonstra a depreciação total acumulada de todos
+      os seus activos.
     </para>
 
-    <para>É certamente possível utilizar uma hierarquia de contas diferente. Uma configuração de conta popular é a de combinar <emphasis>Custo do activo</emphasis> e <emphasis>Depreciação imputada</emphasis>. Isto tem a vantagem de ter menos contas a sobre-carregar a sua hierarquia de contas, mas com a desvantagem de que para determinar alguns dos detalhes sumários mencionados no parágrafo acima, terá de abrir as janelas dos diários de conta. Como acontece com a maioria das coisas, há muitas maneiras de o fazer, terá de encontrar a maneira que funcione melhor para si.
+    <para>É certamente possível utilizar uma hierarquia de contas diferente. Uma configuração de conta
+      popular é a de combinar <emphasis>Custo do activo</emphasis> e <emphasis>Depreciação
+      imputada</emphasis>. Isto tem a vantagem de ter menos contas a sobre-carregar a sua hierarquia
+      de contas, mas com a desvantagem de que para determinar alguns dos detalhes sumários
+      mencionados no parágrafo acima, terá de abrir as janelas dos diários de conta. Como
+      acontece com a maioria das coisas, há muitas maneiras de o fazer, terá de encontrar a
+      maneira que funcione melhor para si.
     </para>
 
-    <para>A entrada efectiva dos montantes da depreciação é feita manualmente em cada período contabilístico. Não há (até agora) forma para executar automaticamente os cálculos do esquema de depreciação no &app;, ou para inserir os valores automaticamente nas contas apropriadas. No entanto, uma vez que um período contabilístico é tipicamente de um ano, não é realmente muito trabalho à mão.
+    <para>A entrada efectiva dos montantes da depreciação é feita manualmente em cada período
+      contabilístico. Não há (até agora) forma para executar automaticamente os cálculos do
+      esquema de depreciação no &app;, ou para inserir os valores automaticamente nas contas
+      apropriadas. No entanto, uma vez que um período contabilístico é tipicamente de um ano,
+      não é realmente muito trabalho à mão.
     </para>
   </sect1>
 
   <sect1 id="dep_example1">
     <title>Exemplo</title>
 
-    <para>Vejamos um exemplo. Imagine que é fotógrafo e que utiliza um carro e uma máquina fotográfica cara para o seu negócio pessoal. Quererá acompanhar a depreciação destes artigos, porque provavelmente poderá deduzi-la dos seus impostos comerciais.
+    <para>Vejamos um exemplo. Imagine que é fotógrafo e que utiliza um carro e uma máquina fotográfica
+      cara para o seu negócio pessoal. Quererá acompanhar a depreciação destes artigos, porque
+      provavelmente poderá deduzi-la dos seus impostos comerciais.
     </para>
 
-    <para>O primeiro passo é construir a hierarquia de contas (como mostrado na secção anterior, substitua <emphasis>ITEM1</emphasis> e <emphasis>ITEM2</emphasis> por <quote>car</quote> e <quote>câmara</quote>). Agora, registe a compra dos seus bens, transferindo o dinheiro da sua conta bancária para a conta <emphasis>Custo</emphasis> de cada item (por exemplo: <emphasis>Activos:Activos fixos:Automóvel:Custo</emphasis> para o carro). Neste exemplo, começa com 30.000€ no banco, o carro custou 20.000€, a câmara fotográfica custou 10.000€ e foram ambos adquiridos em 1 de Janeiro de 2000.
+    <para>O primeiro passo é construir a hierarquia de contas (como mostrado na secção anterior, substitua
+      <emphasis>ITEM1</emphasis> e <emphasis>ITEM2</emphasis> por <quote>car</quote> e
+      <quote>câmara</quote>). Agora, registe a compra dos seus bens, transferindo o dinheiro da sua
+      conta bancária para a conta <emphasis>Custo</emphasis> de cada item (por exemplo:
+      <emphasis>Activos:Activos fixos:Automóvel:Custo</emphasis> para o carro). Neste exemplo,
+      começa com 30.000€ no banco, o carro custou 20.000€, a câmara fotográfica custou
+      10.000€ e foram ambos adquiridos em 1 de Janeiro de 2000.
     </para>
 
     <figure pgwide="1">
       <title>Exemplo de depreciação de activos</title>
+
       <screenshot id="dep_example">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/dep_example.png"
                        srccredit="Pedro Albuquerque"/>
           </imageobject>
+
           <caption>
             <para>A hierarquia de contas de depreciação
             </para>
@@ -544,20 +680,31 @@
       </screenshot>
     </figure>
 
-    <para>Olhando para os códigos fiscais, percebemos que devemos relatar a depreciação destes itens usando a <quote>soma de dígitos</quote>, ao longo de um período de 5 anos. Assim, os montantes da depreciação anual para o carro são 6667€, 5333€, 4000€, 2667€ e 1333€ para os anos 1 a 5 respectivamente, arredondados ao euro mais próximo. Os montantes anuais de depreciação da câmara são de 3333€, 2667€, 2000€, 1333€ e 667€. Consulte a secção anterior sobre esquemas de depreciação para a fórmula de cálculo destes valores.
+    <para>Olhando para os códigos fiscais, percebemos que devemos relatar a depreciação destes itens usando
+      a <quote>soma de dígitos</quote>, ao longo de um período de 5 anos. Assim, os montantes da
+      depreciação anual para o carro são 6667€, 5333€, 4000€, 2667€ e 1333€ para os
+      anos 1 a 5 respectivamente, arredondados ao euro mais próximo. Os montantes anuais de
+      depreciação da câmara são de 3333€, 2667€, 2000€, 1333€ e 667€. Consulte a
+      secção anterior sobre esquemas de depreciação para a fórmula de cálculo destes valores.
     </para>
 
-    <para>Para cada período contabilístico (i.e., ano fiscal) regista a depreciação como uma despesa na conta apropriada <emphasis>Depreciação imputada</emphasis> (ex: <emphasis>Activos:Activos fixos:Automóvel:Depreciação</emphasis> para o carro). As duas janelas abaixo mostram a sua conta de depreciação acumulada e a janela principal após o terceiro ano (i.e. três períodos) de depreciação utilizando este esquema de <guilabel>soma de dígitos</guilabel>.
+    <para>Para cada período contabilístico (i.e., ano fiscal) regista a depreciação como uma despesa na
+      conta apropriada <emphasis>Depreciação imputada</emphasis> (ex: <emphasis>Activos:Activos
+      fixos:Automóvel:Depreciação</emphasis> para o carro). As duas janelas abaixo mostram a sua
+      conta de depreciação acumulada e a janela principal após o terceiro ano (i.e. três
+      períodos) de depreciação utilizando este esquema de <guilabel>soma de dígitos</guilabel>.
     </para>
 
     <figure pgwide="1">
       <title>Diário da conta de depreciação do activo</title>
+
       <screenshot id="dep_assetreg">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/dep_assetreg.png"
                        srccredit="Pedro Albuquerque" width="&img-w;"/>
           </imageobject>
+
           <imageobject role="fo">
             <imagedata fileref="figures/dep_assetreg.png"
                        srccredit="Pedro Albuquerque"/>
@@ -568,6 +715,7 @@
 
     <figure pgwide="1">
       <title>Hierarquia de contas após depreciação</title>
+
       <screenshot id="dep_assetmain">
         <mediaobject>
           <imageobject>
@@ -579,7 +727,11 @@
     </figure>
 
     <note>
-      <para>Uma palavra de cautela: uma vez que a depreciação e as questões fiscais estão intimamente relacionadas, pode nem sempre ser livre a escolha do seu método preferido. A correcção de cálculos errados vai custar muito mais tempo e problemas do que acertar os cálculos à primeira, portanto, se planeia depreciar activos, é sensato certificar-se dos esquemas que lhe serão permitidos ou que seja obrigatório a utilizar.
+      <para>Uma palavra de cautela: uma vez que a depreciação e as questões fiscais estão intimamente
+        relacionadas, pode nem sempre ser livre a escolha do seu método preferido. A correcção de
+        cálculos errados vai custar muito mais tempo e problemas do que acertar os cálculos à
+        primeira, portanto, se planeia depreciar activos, é sensato certificar-se dos esquemas que
+        lhe serão permitidos ou que seja obrigatório a utilizar.
       </para>
     </note>
   </sect1>
diff --git a/pt/guide/ch_import_business_data.xml b/pt/guide/ch_import_business_data.xml
index ebd925f5..fb993958 100644
--- a/pt/guide/ch_import_business_data.xml
+++ b/pt/guide/ch_import_business_data.xml
@@ -22,16 +22,25 @@ Author:
     <para>Esta funcionalidade só está disponível para versões posteriores à 2.6
     </para>
 
-    <para>Para a 2.4.13 o importador de clientes e fornecedores é um módulo opcional e tem de ser activado editando o ficheiro <filename>$HOME/.gnucash/config.user</filename>, adicionando a linha:
+    <para>Para a 2.4.13 o importador de clientes e fornecedores é um módulo opcional e tem de ser activado
+      editando o ficheiro <filename>$HOME/.gnucash/config.user</filename>, adicionando a linha:
     </para>
 
     <para><code>(gnc:module-load "gnucash/plugins/bi_import" 0)</code>
     </para>
 
-    <para>Em sistemas &lin;, este ficheiro encontra-se em <filename>$HOME/.gnucash/config.user</filename> e em&mac; em <filename>~/Library/Application Support/Gnucash/config.user</filename>. Se o ficheiro ainda não existir, terá de o criar. Após reiniciar o &app;, o item aparecerá ao fundo do menu <guimenu>Negócios</guimenu>.
+    <para>Em sistemas &lin;, este ficheiro encontra-se em <filename>$HOME/.gnucash/config.user</filename> e
+      em&mac; em <filename>~/Library/Application Support/Gnucash/config.user</filename>. Se o
+      ficheiro ainda não existir, terá de o criar. Após reiniciar o &app;, o item aparecerá ao
+      fundo do menu <guimenu>Negócios</guimenu>.
     </para>
 
-    <para>Para que o importador funcione, os dados devem estar numa linha com um comprimento de campo fixo separados por vírgulas. Abaixo é mostrado um exemplo de programa <aplication>Python</aplication> para converter uma ordem transferida.
+    <para>Para que o importador funcione, os dados devem estar numa linha com um comprimento de campo fixo
+      separados por vírgulas. Abaixo é mostrado um exemplo de programa
+      <aplication>
+        Python
+      </aplication>
+      para converter uma ordem transferida.
     </para>
 
     <para><programlisting language="python" linenumbering="unnumbered">
@@ -94,12 +103,24 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
         </programlisting>
     </para>
 
-    <para>Como se pode ver, há campos ausentes e alguns que não são necessários à importação. A primeira linha não é necessária e a última é supérflua, o &app; totaliza a ordem. Só é necessário obter o que desejamos e produzir um ficheiro em formato correcto para importar para o &app;. Caso em que juntamos o número da peça e a descrição, convertendo-os em descrição da factura para o &app;. Precisamos da quantidade e preço. Contrariamente à linha de cabeçalho, em que o <acronym>IVA</acronym> não está incluído por linha e é sempre zero, o <acronym>IVA</acronym> é calculado na última linha como <acronym>IVA</acronym> do total da encomenda.
+    <para>Como se pode ver, há campos ausentes e alguns que não são necessários à importação. A
+      primeira linha não é necessária e a última é supérflua, o &app; totaliza a ordem. Só é
+      necessário obter o que desejamos e produzir um ficheiro em formato correcto para importar
+      para o &app;. Caso em que juntamos o número da peça e a descrição, convertendo-os em
+      descrição da factura para o &app;. Precisamos da quantidade e preço. Contrariamente à
+      linha de cabeçalho, em que o <acronym>IVA</acronym> não está incluído por linha e é
+      sempre zero, o <acronym>IVA</acronym> é calculado na última linha como
+      <acronym>IVA</acronym> do total da encomenda.
       <note>
         <para>Isto causará problemas mais tarde.
         </para>
       </note>
-      Neste exemplo atribuiu-se a conta <emphasis>Despesas:Materiais Gerais</emphasis> como conta-alvo. Esta pode ser alterada após a importação, da forma habitual, juntamente com qualquer outra conta de dados. Se não existir tal conta <emphasis>Despesas:Materiais Gerais</emphasis>, esse campo será deixado em branco na importação e terá de ser definido manualmente. As linhas que começam com um <quote>#</quote> são consideradas como linhas de comentário e ignoradas.
+      Neste exemplo atribuiu-se a conta <emphasis>Despesas:Materiais Gerais</emphasis> como
+      conta-alvo. Esta pode ser alterada após a importação, da forma habitual, juntamente com
+      qualquer outra conta de dados. Se não existir tal conta <emphasis>Despesas:Materiais
+      Gerais</emphasis>, esse campo será deixado em branco na importação e terá de ser definido
+      manualmente. As linhas que começam com um <quote>#</quote> são consideradas como linhas de
+      comentário e ignoradas.
     </para>
 
     <para>O programa inicia-se com o seguinte comando:
@@ -110,15 +131,24 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
       <replaceable>ficheiro_a_gravar.csv</replaceable></command>
     </para>
 
-    <para>Este pequeno programa pode ser facilmente alterado para se adequar a qualquer formato transferido. A única restrição é que o número final do campo é fixo, pelo menos de momento. O importador ignora as linhas com o número errado de campos. Isto será corrigido na versão futura. A ID do fornecedor é simplesmente a identificação atribuída ao fornecedor, ou cliente específico. Os itens da linha[N] referem-se à posição na linha onde se encontram os dados correctos. Note-se que o primeiro campo é a linha[0] NÃO a linha[1].
+    <para>Este pequeno programa pode ser facilmente alterado para se adequar a qualquer formato transferido. A
+      única restrição é que o número final do campo é fixo, pelo menos de momento. O
+      importador ignora as linhas com o número errado de campos. Isto será corrigido na versão
+      futura. A ID do fornecedor é simplesmente a identificação atribuída ao fornecedor, ou
+      cliente específico. Os itens da linha[N] referem-se à posição na linha onde se encontram
+      os dados correctos. Note-se que o primeiro campo é a linha[0] NÃO a linha[1].
     </para>
 
     <para>Uma vez convertido o ficheiro, navegue até
       <menuchoice>
         <guimenu>Negócios</guimenu> <guimenuitem>Importação de facturas</guimenuitem>
       </menuchoice>
-      para abrir uma nova janela de importação. Seleccione o ficheiro que acabou de criar, seleccione
-      <guilabel>Pagamento</guilabel> ou <guilabel>Factura</guilabel> e formato <guilabel>Separado por vírgulas</guilabel>. Nesta altura, os dados devem aparecer na janela de antevisão. Verifique se os dados do campo estão nas colunas correctas antes de clicar em <guibutton>Aceitar</guibutton>. Uma vez importada, a factura pode ser aberta para edição e emissão da forma habitual.
+      para abrir uma nova janela de importação. Seleccione o ficheiro que acabou de criar,
+      seleccione <guilabel>Pagamento</guilabel> ou <guilabel>Factura</guilabel> e formato
+      <guilabel>Separado por vírgulas</guilabel>. Nesta altura, os dados devem aparecer na janela
+      de antevisão. Verifique se os dados do campo estão nas colunas correctas antes de clicar em
+      <guibutton>Aceitar</guibutton>. Uma vez importada, a factura pode ser aberta para edição e
+      emissão da forma habitual.
     </para>
 
     <para>A note on <acronym>VAT</acronym>, or any purchase tax. As previously mentioned <emphasis>Rapid
@@ -142,10 +172,10 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
     </para>
 
     <note>
-      <para>Se o <application>Python</application> não lhe agrada(other languages are avaialble) is not your thing then post a
-        request to <ulink url="&url-mail-li;gnucash-user"><citetitle>&appname; user
-        list</citetitle></ulink>, with an example of your downloaded <acronym>CSV</acronym>, and
-        someone may write you a <application>Python</application> script to do the translation.
+      <para>Se o <application>Python</application> não lhe agrada(other languages are avaialble) is not your
+        thing then post a request to <ulink url="&url-mail-li;gnucash-user"><citetitle>&appname;
+        user list</citetitle></ulink>, with an example of your downloaded <acronym>CSV</acronym>,
+        and someone may write you a <application>Python</application> script to do the translation.
       </para>
     </note>
 
@@ -309,8 +339,8 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
     <para><code>(gnc:module-load "gnucash/plugins/customer_import" 0) </code>
     </para>
 
-    <para>On &lin; systems this file is found at <filename>$HOME/.gnucash/config.user</filename> and on
-      &mac; it is <filename>~/Library/Application Support/Gnucash/config.user</filename>. If the file
+    <para>On &lin; systems this file is found at <filename>$HOME/.gnucash/config.user</filename> and on &mac;
+      it is <filename>~/Library/Application Support/Gnucash/config.user</filename>. If the file
       doesn’t already exist you will have to create it. After restarting &app; the item will
       appear at the bottom of the business menu.
     </para>
@@ -330,7 +360,8 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
       line for each customer/vendor.
     </para>
 
-    <para>O importador não importa actualmente informações de facturação para clientes ou vendedores, estes terão de ser editados individualmente após a importação.
+    <para>O importador não importa actualmente informações de facturação para clientes ou vendedores,
+      estes terão de ser editados individualmente após a importação.
     </para>
   </sect1>
 </chapter>
diff --git a/pt/guide/ch_invest.xml b/pt/guide/ch_invest.xml
index b31e188b..c5dd06c0 100644
--- a/pt/guide/ch_invest.xml
+++ b/pt/guide/ch_invest.xml
@@ -20,9 +20,10 @@
 
   <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
-    poupança reforma, seja a compra e venda de acções numa correctora. O &app; dá-lhe ferramentas
-    para gerir estes investimentos, tais como o <emphasis>Editor de mercadorias</emphasis>, que lhe
-    permite registar alteracções nas cotações das acções que possui.
+    poupança reforma, seja a compra e venda de acções numa correctora. O &app; dá-lhe
+    ferramentas para gerir estes investimentos, tais como o <emphasis>Editor de
+    mercadorias</emphasis>, que lhe permite registar alteracções nas cotações das acções que
+    possui.
   </para>
 
   <sect1 id="invest_concepts1">
@@ -189,8 +190,8 @@
             <para>Ocorre quando uma empresa se oferece para emitir múltiplos adicionais de acções existentes. Por
               exemplo, um desdobramento <quote>2 para 1</quote> significa que, se detiver 100
               acções, receberá outras 100 adicionais sem qualquer custo para si. A cotação
-              unitária das acções será ajustada para que não haja alteracção do valor líquido.
-              Neste exemplo, a cotação por acção passaria a metade.
+              unitária das acções será ajustada para que não haja alteracção do valor
+              líquido. Neste exemplo, a cotação por acção passaria a metade.
             </para>
           </listitem>
         </varlistentry>
@@ -212,8 +213,8 @@
             <para>É a medida do montante de dinheiro que ganha com um investimento (ou seja, a receita do
               investimento). Tipicamente é reportado como percentagem do capital. O rendimento não
               inclui ganhos ou perdas de capital (veja <emphasis>Retorno</emphasis>). Por exemplo,
-              uma acção que se vende a 100€; e dá 2€; por ano em dividendos tem um
-              rendimento de 2%.
+              uma acção que se vende a 100€; e dá 2€; por ano em dividendos tem um rendimento
+              de 2%.
             </para>
           </listitem>
         </varlistentry>
@@ -233,9 +234,9 @@
 
           <para>Este tipo de investimento normalmente permite acesso imediato ao seu dinheiro e costuma pagar juros
             ao mês, baseados na quantia que tiver depositada. Exemplos disto são as contas
-            poupança (e algumas contas à ordem remuneradas) e contas em dinheiro na sua correctora.
-            É um investimento de muito baixo risco, nos EUA estas contas estão normalmente seguras
-            contra perdas até um certo limite.
+            poupança (e algumas contas à ordem remuneradas) e contas em dinheiro na sua
+            correctora. É um investimento de muito baixo risco, nos EUA estas contas estão
+            normalmente seguras contra perdas até um certo limite.
           </para>
 
           <para>Por vezes, um investimento remunerado tem um <emphasis>prazo bloqueado</emphasis>. Este tipo de
@@ -254,19 +255,20 @@
           </para>
 
           <para>Este é um investimento que faz numa empresa, da qual se torna efectivamente proprietário parcial.
-            Normalmente não há prazos bloqueados em acções negociadas publicamente, contudo, pode
-            haver alteracções nas taxas de impostos que paga por ganhos de capital, dependendo do
-            tempo que mantém as acções. Assim, as acções têm geralmente muita liquidez, pode
-            aceder ao seu dinheiro muito rapidamente. Este é um investimento de mais alto risco,
-            uma vez que não tem qualquer mercadoria da cotação futura de uma acção.
+            Normalmente não há prazos bloqueados em acções negociadas publicamente, contudo,
+            pode haver alteracções nas taxas de impostos que paga por ganhos de capital,
+            dependendo do tempo que mantém as acções. Assim, as acções têm geralmente muita
+            liquidez, pode aceder ao seu dinheiro muito rapidamente. Este é um investimento de mais
+            alto risco, uma vez que não tem qualquer mercadoria da cotação futura de uma acção.
           </para>
 
           <para>Um fundo de investimento é um mecanismo de investimento em grupo no qual pode comprar várias
             acções diferentes em simultâneo. Por exemplo, um fundo "S&P 500 index fund" é um
             fundo que compra todas as 500 acções listadas no índice Standard and Poor’s.
             Quando compra uma acção deste fundo, está realmente a comprar uma pequena parte de
-            cada uma das acções contidas no fundo. Fundos de investimento são tratados exactamente
-            como uma acção única, tanto em termos contabilísticos como em termos de impostos.
+            cada uma das acções contidas no fundo. Fundos de investimento são tratados
+            exactamente como uma acção única, tanto em termos contabilísticos como em termos de
+            impostos.
           </para>
         </listitem>
 
@@ -336,12 +338,14 @@
 
       <figure pgwide="1">
         <title>Plano de contas de investimento</title>
+
         <screenshot id="invest_accountspredef">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_AccountsPredef.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra o separador <guilabel>Contas</guilabel> após criar um novo ficheiro e
                 seleccionando só as contas de investimento predefinidas.
@@ -362,9 +366,9 @@
       <title>Criar contas de imvestimento manualmente</title>
 
       <para>Se quer criar as suas próprias contas de investimento, é claro que o pode fazer. Os investimentos
-        normalmente têm associado um número de contas que têm de ser criadas: uma conta de activos
-        para o investimeto em si mesmo, uma conta de receita para as transacções de dividendos e
-        contas de despesa para taxas de investimento e comissões.
+        normalmente têm associado um número de contas que têm de ser criadas: uma conta de
+        activos para o investimeto em si mesmo, uma conta de receita para as transacções de
+        dividendos e contas de despesa para taxas de investimento e comissões.
       </para>
     </sect2>
 
@@ -373,8 +377,8 @@
 
       <para>A seguir vemos um exemplo algo mais complicado de um plano de contas personalizado no &app; para
         controlar os seus investimentos, que tem a vantagem de agrupar cada diferente investimento
-        sob a correctora que os negoceia. Assim é mais fácil comparar os extractos que recebe com as
-        suas contas no &app; e detetar onde o &app; difere dos extractos.
+        sob a correctora que os negoceia. Assim é mais fácil comparar os extractos que recebe com
+        as suas contas no &app; e detetar onde o &app; difere dos extractos.
 <screen>
  Activos
     Investimentos
@@ -446,10 +450,10 @@
     <sect2 id="invest_intacct2">
       <title>Configuração das contas</title>
 
-      <para>Quando compra o investimento remunerado, tem de criar uma conta de activos para registar essa compra,
-        uma conta de receita para registar os ganhos em juros e uma conta de despesa para registar
-        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>Quando compra o investimento remunerado, tem de criar uma conta de activos para registar essa
+        compra, uma conta de receita para registar os ganhos em juros e uma conta de despesa para
+        registar 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>
 <screen>
 Activos
@@ -472,20 +476,22 @@ Receita
       <title>Exemplo</title>
 
       <para>Vamos povoar estas contas com números reais. Assumindo que começa com 5.000€; na sua conta
-        poupança, que paga 1% de juros e que compra um certificado de depósito por 5.000€;,
-        com vencimento a seis meses e rendimento de 2%, é claramente melhor manter o seu dinheiro
-        no certificado de depósito do que na conta poupança. Após a compra inicial, as suas
-        contas deverão parecer-se com isto:
+        poupança, que paga 1% de juros e que compra um certificado de depósito por 5.000€;, com
+        vencimento a seis meses e rendimento de 2%, é claramente melhor manter o seu dinheiro no
+        certificado de depósito do que na conta poupança. Após a compra inicial, as suas contas
+        deverão parecer-se com isto:
       </para>
 
       <figure pgwide="1">
         <title>Configurar investimentos remunerados</title>
+
         <screenshot id="invest-int">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_int1.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra as suas contas após a compra de um certificado de depósito.
               </para>
@@ -496,18 +502,20 @@ Receita
 
       <para>Agora, durante os próximos 6 meses, receberá extractos bancários que descrevem a atividade da sua
         conta. No nosso exemplo, não fazemos nada com o dinheiro neste banco, portanto, a única
-        atividade é a receita de juros e as taxas bancárias. As taxas mensais são de 2€;.
-        Após 6 meses, os diários das contas devem ser parecidos com estes:
+        atividade é a receita de juros e as taxas bancárias. As taxas mensais são de 2€;. Após
+        6 meses, os diários das contas devem ser parecidos com estes:
       </para>
 
       <figure pgwide="1">
         <title>Configurar investimentos remunerados</title>
+
         <screenshot id="invest-int2">
           <mediaobject>
-           <imageobject>
+            <imageobject>
               <imagedata fileref="figures/invest_int2.png"
                           srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra o diário de conta do certificado de depósito após 6 meses.
               </para>
@@ -518,16 +526,19 @@ Receita
 
       <figure pgwide="1">
         <title>Configurar investimentos remunerados</title>
+
         <screenshot id="invest-int2-1">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_int2-1.png"
                           srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_int2-1.png"
                           srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra o diário da conta poupança após 6 meses.
               </para>
@@ -541,12 +552,14 @@ Receita
 
       <figure pgwide="1">
         <title>Configurar investimentos remunerados</title>
+
         <screenshot id="invest-int3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_int3.png"
                           srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra o separador Contas após 6 meses.
               </para>
@@ -613,8 +626,8 @@ Receita
              IBM
              NST</screen>
       <note>
-        <para>Se quer controlar receitas (dividendos/juro/ganhos de capital) por acção ou fundo, tem de criar uma
-          conta <emphasis>Receitas:Dividendos:SÍMBOLO</emphasis>, <emphasis>Receitas:Ganhos de
+        <para>Se quer controlar receitas (dividendos/juro/ganhos de capital) por acção ou fundo, tem de criar
+          uma conta <emphasis>Receitas:Dividendos:SÍMBOLO</emphasis>, <emphasis>Receitas:Ganhos de
           capital(longo):SÍMBOLO</emphasis>, <emphasis>Receitas:Ganhos de
           capital(curto):SÍMBOLO</emphasis> e <emphasis>Receitas:Juros:SÍMBOLO</emphasis> para
           cada acção/fundo que pague dividendos ou juros.
@@ -636,13 +649,14 @@ Receita
 
       <figure pgwide="1">
         <title>Janela de nova conta</title>
+
         <screenshot id="invest-newaccount">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_newaccount.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
-        </mediaobject>
+          </mediaobject>
         </screenshot>
       </figure>
 
@@ -685,9 +699,9 @@ Receita
 
           <itemizedlist>
             <listitem>
-              <para><emphasis>Seleccione Garantia/Moeda</emphasis> - clique em <guibutton>Seleccione...</guibutton>, junto
-                à linha <guilabel>Garantia/Moeda</guilabel>. Tem de alterar a predefinição (a sua
-                moeda predefinida) para esta acção específica. Isto abre o diálogo
+              <para><emphasis>Seleccione Garantia/Moeda</emphasis> - clique em <guibutton>Seleccione...</guibutton>,
+                junto à linha <guilabel>Garantia/Moeda</guilabel>. Tem de alterar a predefinição
+                (a sua moeda predefinida) para esta acção específica. Isto abre o diálogo
                 <guilabel>Seleccione a mercadoria</guilabel>.
               </para>
             </listitem>
@@ -702,6 +716,7 @@ Receita
 
               <figure pgwide="1">
                 <title>Diálogo Seleccione a mercadoria</title>
+
                 <screenshot id="invest-selectsecurity">
                   <mediaobject>
                     <imageobject>
@@ -773,6 +788,7 @@ Receita
                   <para>Eis como a janela se deve parecer após terminar:
                     <figure pgwide="1">
                       <title>Janela de nova mercadoria</title>
+
                       <screenshot id="invest-newsecurity">
                         <mediaobject>
                           <imageobject>
@@ -782,7 +798,6 @@ Receita
                         </mediaobject>
                       </screenshot>
                     </figure>
-                    
                   </para>
                 </listitem>
 
@@ -803,8 +818,8 @@ Receita
 
         <listitem>
           <para><emphasis>Seleccione a mercadoria</emphasis> - deve agora ver a recém criada mercadoria disponível
-            na lista pendente em <guilabel>Garantia/Moeda</guilabel>. Seleccione-a (provavelmente já
-            está) e clique em <guibutton>Aceitar</guibutton>.
+            na lista pendente em <guilabel>Garantia/Moeda</guilabel>. Seleccione-a (provavelmente
+            já está) e clique em <guibutton>Aceitar</guibutton>.
           </para>
         </listitem>
 
@@ -854,12 +869,14 @@ Receita
 
       <figure pgwide="1">
         <title>Configurar o portefólio actual</title>
+
         <screenshot id="invest-setup-current">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_setup_current.png"
                           srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Separador <guilabel>Contas</guilabel> após a criação da primeira conta de acções (AMZN)
               </para>
@@ -889,22 +906,25 @@ Receita
         Compra inicial), transferência de <emphasis>Capital próprio:Saldos iniciais</emphasis>,
         Acções (ex.: 100) e cotação (ex.: 20€;). Não precisa de preencher a coluna
         <guilabel>Compra</guilabel>, o &app; fá-lo por si. Este exemplo presumiu que não houve
-        nenhuma comissão nesta transacção, para simplificar as coisas. O seu diário da mercadoria
-        AMZN deve estar parecido com isto:
+        nenhuma comissão nesta transacção, para simplificar as coisas. O seu diário da
+        mercadoria AMZN deve estar parecido com isto:
       </para>
 
       <figure pgwide="1">
         <title>Configurar o portefólio actual</title>
+
         <screenshot id="invest-setup-portfolio1">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_setup_portfolio1.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_setup_portfolio1.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra o diário da conta AMZN após a primeira <quote>compra</quote> de acções.
               </para>
@@ -926,10 +946,10 @@ Receita
         iniciais</emphasis>, transfere-o da conta <emphasis>Activos:Banco ABC</emphasis>.
       </para>
 
-      <para>Agora vamos comprar 5.000€; de acções IBM, com uma comissão de 100€;. O primeiro passo
-        será criar a conta de acções IBM. A conta existente
-        <emphasis>Despesas:Comissões</emphasis> será usada. Se quiser controlar comissões de
-        acções individualmente, precisará de sub-contas para cada mercadoria.
+      <para>Agora vamos comprar 5.000€; de acções IBM, com uma comissão de 100€;. O primeiro passo será
+        criar a conta de acções IBM. A conta existente <emphasis>Despesas:Comissões</emphasis>
+        será usada. Se quiser controlar comissões de acções individualmente, precisará de
+        sub-contas para cada mercadoria.
       </para>
 
       <para>Agora, para a transacção, na primeira linha insira a data de compra (ex.: 3-1-2005), uma
@@ -944,19 +964,22 @@ Receita
 
       <figure pgwide="1">
         <title>Configurar o portefólio actual</title>
+
         <screenshot id="invest-setup-portfolio2">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_SetupPortfolio2.png"
                           srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_SetupPortfolio2.png"
                           srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
-              <para>Esta imagem mostra o diário da mercadoria IBM após a primeira <quote>compra</quote> de acções com
-                uma comissão paga.
+              <para>Esta imagem mostra o diário da mercadoria IBM após a primeira <quote>compra</quote> de acções
+                com uma comissão paga.
               </para>
             </caption>
           </mediaobject>
@@ -969,23 +992,25 @@ Receita
     <title>Definir a cotação de acções</title>
 
     <para>O valor de uma mercadoria, tal como uma acção, tem de ser explicitamente definido. As contas de
-      acções controlam a quantidade de acções que possui, mas o valor das acções é armazenado no
-      <emphasis>Editor de mercadorias</emphasis>. Os valores definidos ao <guilabel>Base de dados de
-      cotações</guilabel> podem ser actualizados manual ou automaticamente.
+      acções controlam a quantidade de acções que possui, mas o valor das acções é armazenado
+      no <emphasis>Editor de mercadorias</emphasis>. Os valores definidos ao <guilabel>Base de dados
+      de cotações</guilabel> podem ser actualizados manual ou automaticamente.
     </para>
 
     <sect2 id="invest-stockprice-initial2">
       <title>Configuração inicial da base de dados de cotações</title>
 
-      <para>Para usar a <guilabel>Base de dados de cotações</guilabel> para controlar o valor de uma acção, tem de
-        inserir primeiro a acção. Para tal, abra a <guilabel>Base de dados de cotações</guilabel> (
+      <para>Para usar a <guilabel>Base de dados de cotações</guilabel> para controlar o valor de uma acção,
+        tem de inserir primeiro a acção. Para tal, abra a <guilabel>Base de dados de
+        cotações</guilabel> (
         <menuchoice>
           <guimenu>Ferramentas</guimenu><guimenuitem>Base de dados de cotações</guimenuitem>
         </menuchoice>
-        ) e clique em <guibutton>Adicionar</guibutton>. Na primeira vez que uma mercadoria/acção é
-        inserida, esta janela estará em branco, só com os botões ao fundo. Seleccione a mercadoria
-        apropriada que deseja inserir no <guilabel>Editor de mercadorias</guilabel>. Neste ponto,
-        pode inserir a cotação manualmente. Há seis campos na janela do editor de cotações:
+        ) e clique em <guibutton>Adicionar</guibutton>. Na primeira vez que uma mercadoria/acção
+        é inserida, esta janela estará em branco, só com os botões ao fundo. Seleccione a
+        mercadoria apropriada que deseja inserir no <guilabel>Editor de mercadorias</guilabel>.
+        Neste ponto, pode inserir a cotação manualmente. Há seis campos na janela do editor de
+        cotações:
       </para>
 
       <variablelist>
@@ -1057,12 +1082,14 @@ Receita
 
       <figure pgwide="1">
         <title>Editor de mercadorias</title>
+
         <screenshot id="invest-peditor">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_peditor.png"
                           srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Adicione a mercadoria AMZN ao editor de cotações, com um valor inicial de 40.5€; por acção.
               </para>
@@ -1098,12 +1125,14 @@ Receita
 
       <figure pgwide="1">
         <title>Editor de mercadorias</title>
+
         <screenshot id="invest-peditor2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_peditor2.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>A janela do editor de cotações, mostrando a lista de todas as mercadorias conhecidas.
               </para>
@@ -1147,12 +1176,11 @@ Receita
           </itemizedlist>
         </para>
 
-        <para>&mac;: tem de ter o XCode instalado. O XCode é um item opcional
-          do DVD da sua distribuição do &mac;. Execute <emphasis role="strong">Update Finance
-          Quote</emphasis> no dmg do &app;. Pode executá-lo a partir do dmg ou copiá-lo para a
-          mesma pasta para onde copiou o &app;. Vai abrir um terminal e executar um script que lhe
-          fará muitas perguntas. Aceite as predefinições a não ser que saiba o que está a
-          fazer..
+        <para>&mac;: tem de ter o XCode instalado. O XCode é um item opcional do DVD da sua distribuição do
+          &mac;. Execute <emphasis role="strong">Update Finance Quote</emphasis> no dmg do &app;.
+          Pode executá-lo a partir do dmg ou copiá-lo para a mesma pasta para onde copiou o &app;.
+          Vai abrir um terminal e executar um script que lhe fará muitas perguntas. Aceite as
+          predefinições a não ser que saiba o que está a fazer..
         </para>
 
         <para>&lin;:
@@ -1178,11 +1206,12 @@ Receita
               </para>
             </listitem>
           </itemizedlist>
-          Isto vai iniciar uma sessão <application>Perl</application> CPAN de actualizacção que vai
-          à Internet e instala o módulo <application>Finance::Quote</application> no seu sistema.
-          O programa gnc-fq-update é interactivo, no entanto, na maioria dos sistemas poderá
-          responder <quote>não</quote> à primeira questão: <quote>Are you ready for manual
-          configuration? [yes]</quote> e a actualizacção continua automaticamente a partir daí.
+          Isto vai iniciar uma sessão <application>Perl</application> CPAN de actualizacção que
+          vai à Internet e instala o módulo <application>Finance::Quote</application> no seu
+          sistema. O programa gnc-fq-update é interactivo, no entanto, na maioria dos sistemas
+          poderá responder <quote>não</quote> à primeira questão: <quote>Are you ready for
+          manual configuration? [yes]</quote> e a actualizacção continua automaticamente a partir
+          daí.
         </para>
 
         <para>Após terminar a instalação, deve executar o programa de teste <quote>gnc-fq-dump</quote>, na
@@ -1193,8 +1222,9 @@ Receita
         <note>
           <para>Se não se sente confortável a executar estes passos, por favor envie uma mensagem à lista de
             correio dos utilizadores do &app; - <email>gnucash-user at gnucash.org</email> para ajuda,
-            ou venha ao &app; em <ulink url='&url-irc;'>#gnucash canal IRC do &srv-irc;</ulink>. Também pode saltar estes passos e
-            actualizar manualmente as cotações das suas acções.
+            ou venha ao &app; em <ulink url='&url-irc;'>#gnucash canal IRC do &srv-irc;</ulink>.
+            Também pode saltar estes passos e actualizar manualmente as cotações das suas
+            acções.
           </para>
         </note>
       </sect3>
@@ -1250,9 +1280,9 @@ Receita
 
       <para>A janela principal de contas, por predefinição, só mostra a quantidade de cada mercadoria que
         possui, sob a coluna <guilabel>Total</guilabel>. No caso de acções, esta mercadoria é o
-        número de acções. Contudo, frequentemente quererá ver o valor das suas acções, expresso
-        em termos de uma qualquer unidade monetária. Isto é facilmente conseguido na janela
-        principal, seleccionando o separador <guilabel>Contas</guilabel>, clicando em
+        número de acções. Contudo, frequentemente quererá ver o valor das suas acções,
+        expresso em termos de uma qualquer unidade monetária. Isto é facilmente conseguido na
+        janela principal, seleccionando o separador <guilabel>Contas</guilabel>, clicando em
         <guibutton>Opções</guibutton> (a seta a apontar para baixo no extremo direito da barra de
         cabeçalhos) e marcando a opção para mostrar <quote>Total (EUR)</quote>. Verá uma nova
         coluna com este cabeçalho, <guilabel>Total (EUR)</guilabel> que vai expressar o valor de
@@ -1266,12 +1296,14 @@ Receita
 
       <figure pgwide="1">
         <title>Mostrar o valor das acções</title>
+
         <screenshot id="invest-stockvalue">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockvalue.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Mostrar o valor das acções/mercadorias na janela principal, usando a coluna Total com a moeda dos
                 relatórios.
@@ -1306,16 +1338,19 @@ Receita
 
       <figure pgwide="1">
         <title>Determinar a cotação de acções em relatórios</title>
+
         <screenshot id="invest-stockvalue-report-options">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_stockvalue_report_options.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_stockvalue_report_options.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Determinar a cotação de uma mercadoria num relatório, definindo a opção Fonte da cotação.
               </para>
@@ -1349,18 +1384,20 @@ Receita
       </itemizedlist>
 
       <figure pgwide="1">
-        <title>Gráfico de barras dos activos baseado na fonte de cotação <quote>Mais
-              próxima no tempo</quote></title>
+        <title>Gráfico de barras dos activos baseado na fonte de cotação <quote>Mais próxima no tempo</quote></title>
+
         <screenshot id="invest-stockvalue-report">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_stockvalue_report.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_stockvalue_report.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Controlar o valor que as suas acções teriam na bolsa de valores.
               </para>
@@ -1377,8 +1414,8 @@ Receita
     <para>Inserir uma venda de investimentos é feito da mesma forma que inserir uma compra (veja
       <xref linkend="invest-buy-new2" />), excepto que o custo total da transacção é inserido na
       coluna <emphasis>Venda</emphasis> e na coluna <emphasis>Acções</emphasis> é inserido um
-      valor negactivo. As receitas líquidas da venda devem ser transferidas da conta de acções para
-      a conta bancária ou conta na correctora.
+      valor negactivo. As receitas líquidas da venda devem ser transferidas da conta de acções
+      para a conta bancária ou conta na correctora.
     </para>
 
     <para>O registo apropriado da venda de acções *tem* de ser feito usando uma transacção com parcelas.
@@ -1386,8 +1423,8 @@ Receita
       <emphasis>Receitas:Ganhos de capital</emphasis> (ou <emphasis>Despesas:Perdas de
       capital</emphasis>). Para saldar esta receita, tem de inserir o activo em acções duas vezes.
       Uma para registar a venda real (usando o número correcto de acções e cotação correcta por
-      acção) e outra para saldar o lucro recebido (definindo o número de acções para 0 e o preço
-      por acção para 0).
+      acção) e outra para saldar o lucro recebido (definindo o número de acções para 0 e o
+      preço por acção para 0).
     </para>
 
     <note>
@@ -1399,10 +1436,10 @@ Receita
     </note>
 
     <para>No esquema de transacção com parcelas mostrado abaixo, o símbolo NUM_AÇÕES é o número de
-      acções que está a vender, PREÇO_VENDA é o preço por que as vendeu, BRUTO é o valor total
-      da venda, igual a NUM_AÇÕES*PREÇO_VENDA. LUCRO é o montante de dinheiro que realizou na
-      venda. COMISSÕES são as comissões pagas pela venda. VENDA_LÍQUIDA é o montante limpo que
-      recebeu pela venda, igual a BRUTO - COMISSÕES.
+      acções que está a vender, PREÇO_VENDA é o preço por que as vendeu, BRUTO é o valor
+      total da venda, igual a NUM_AÇÕES*PREÇO_VENDA. LUCRO é o montante de dinheiro que realizou
+      na venda. COMISSÕES são as comissões pagas pela venda. VENDA_LÍQUIDA é o montante limpo
+      que recebeu pela venda, igual a BRUTO - COMISSÕES.
     </para>
 
     <table>
@@ -1546,9 +1583,9 @@ Receita
 
       <para>A título de exemplo, vamos usar a conta AMZN criada na secção anterior. Assim, comprou 100
         acções da AMZN por 20€; cada e mais tarde vendeu-as todas por 36€; cada, com uma
-        comissão de 75€;. No esquema de transacção com parcelas acima, PREÇO_COMPRA é
-        20€; (o preço original), NUM_AÇÕES é 100, TOTAL_COMPRA é 2.000€; (o custo
-        original de compra), BRUTO é 3.600€; e, finalmente, o LUCRO é 1.525€;
+        comissão de 75€;. No esquema de transacção com parcelas acima, PREÇO_COMPRA é 20€;
+        (o preço original), NUM_AÇÕES é 100, TOTAL_COMPRA é 2.000€; (o custo original de
+        compra), BRUTO é 3.600€; e, finalmente, o LUCRO é 1.525€;
         (BRUTO-TOTAL_COMPRA-COMISSÃO).
       </para>
 
@@ -1682,19 +1719,22 @@ Receita
 
       <figure pgwide="1">
         <title>Exemplo de venda de acções</title>
+
         <screenshot id="invest-sellstock">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_sellstock.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_sellstock.png"
                           srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
-              <para>Um exemplo de venda de acções para obter lucro. Comprou 100 acções da AMZN por 20€; por acção
-                e vendeu por 36€;.
+              <para>Um exemplo de venda de acções para obter lucro. Comprou 100 acções da AMZN por 20€; por
+                acção e vendeu por 36€;.
               </para>
             </caption>
           </mediaobject>
@@ -1703,12 +1743,14 @@ Receita
 
       <figure pgwide="1">
         <title>Exemplo de venda de acções</title>
+
         <screenshot id="invest-sellstock2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_sellstock2.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Uma imagem da árvore de contas após vender acções para obter lucro.
               </para>
@@ -1722,11 +1764,10 @@ Receita
       <title>Exemplo - venda de acções com prejuízo</title>
 
       <para>Como exemplo, vamos usar a conta IBM criada na secção anterior. Tinha comprado 51,7598 acções da
-        IBM por 96,6001€; cada. Mais tarde vendeu-as por 90€; cada. No esquema da
-        transacção com parcelas abaixo, PREÇO_COMPRA é 96,001€; (o preço original de
-        compra), NUM_AÇÕES é 51,7598, TOTAL_COMPRA é 5.000€; (o valor original da compra),
-        (prejuízo) é 341,62€; e BRUTO é 4.658,38€;. Presumimos uma comissão de
-        100€;.
+        IBM por 96,6001€; cada. Mais tarde vendeu-as por 90€; cada. No esquema da transacção
+        com parcelas abaixo, PREÇO_COMPRA é 96,001€; (o preço original de compra), NUM_AÇÕES
+        é 51,7598, TOTAL_COMPRA é 5.000€; (o valor original da compra), (prejuízo) é
+        341,62€; e BRUTO é 4.658,38€;. Presumimos uma comissão de 100€;.
       </para>
 
       <table>
@@ -1861,26 +1902,29 @@ Receita
 
       <note>
         <para>Pode inserir o prejuízo como número positivo na coluna <quote>Compra</quote> ou como número
-          negactivo na coluna <quote>Venda</quote>, o &app; move o <quote>lucro negactivo</quote> para
-          a outra coluna.
+          negactivo na coluna <quote>Venda</quote>, o &app; move o <quote>lucro negactivo</quote>
+          para a outra coluna.
         </para>
       </note>
 
       <figure pgwide="1">
         <title>Exemplo de venda de acções com prejuízo</title>
+
         <screenshot id="invest-sellstockLoss">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_sellstockLoss.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_sellstockLoss.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <caption>
-              <para>Acima está uma imagem de uma venda de acções. Comprou 5.000€; em acções da IBM por
-                96,001€; cada e vendeu por 90€; cada.
+              <para>Acima está uma imagem de uma venda de acções. Comprou 5.000€; em acções da IBM por 96,001€;
+                cada e vendeu por 90€; cada.
               </para>
             </caption>
           </mediaobject>
@@ -1889,12 +1933,14 @@ Receita
 
       <figure pgwide="1">
         <title>Exemplo de venda de acções com prejuízo</title>
+
         <screenshot id="invest-sellstockLoss2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_sellstockLoss2.png"
                           srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Uma imagem da árvore de contas após vender acções com prejuízo.
               </para>
@@ -1911,8 +1957,8 @@ Receita
     <para>Algumas companhias e/ou fundos de investimento pagam dividendos periódicos aos acionistas. Os
       dividendos são tipicamente dados de uma de duas formas, ou são automaticamente reinvestidos
       na mercadoria ou são pagos em dinheiro. Os fundos de investimento são muitas vezes
-      configurados para reinvestir automaticamente os dividendos, enquanto os dividendos das acções
-      comuns são normalmente pagos em dinheiro.
+      configurados para reinvestir automaticamente os dividendos, enquanto os dividendos das
+      acções comuns são normalmente pagos em dinheiro.
     </para>
 
     <sect2 id="invest-dividendcash">
@@ -1920,8 +1966,8 @@ Receita
 
       <para>Se o dividendo for pago em dinheiro, deve registar a transacção na conta do activo que recebeu o
         dinheiro, como receita de <emphasis>Receitas:Dividendos</emphasis>. Adicionalmente, se
-        quiser ligar o dividendo em dinheiro a uma acção em particular, junte uma parcela fictícia
-        à conta da acção com quantidade 0, preço 1 e valor 0.
+        quiser ligar o dividendo em dinheiro a uma acção em particular, junte uma parcela
+        fictícia à conta da acção com quantidade 0, preço 1 e valor 0.
       </para>
 
       <para>A título de exemplo, considere o seguinte: os dividendos depositados em dinheiro na conta
@@ -1930,16 +1976,19 @@ Receita
 
       <figure pgwide="1">
         <title>Exemplo de transacção com dividendos em dinheiro</title>
+
         <screenshot id="invest-dividendcash1">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_dividendcash.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_dividendcash.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Uma imagem do diário da <emphasis>Conta na correctora</emphasis> após uma série de dividendos ser
                 recebida em dinheiro.
@@ -1960,18 +2009,18 @@ Receita
     <sect2 id="invest-dividendreinvest">
       <title>Dividendos reinvestidos</title>
 
-      <para>Se recebe os dividendos na forma de reinvestimento automático, a transacção deve ser gerida dentro
-        da conta de acção/fundo de investimento como <quote>Receitas:Dividendos</quote> para o
-        número apropriado de acções reinvestidas. Este tipo de conta de reinvestimento é muitas
-        vezes referida como DRIP (Dividend Re-Investment Program).
+      <para>Se recebe os dividendos na forma de reinvestimento automático, a transacção deve ser gerida
+        dentro da conta de acção/fundo de investimento como <quote>Receitas:Dividendos</quote>
+        para o número apropriado de acções reinvestidas. Este tipo de conta de reinvestimento é
+        muitas vezes referida como DRIP (Dividend Re-Investment Program).
       </para>
 
       <para>Como exemplo, vejamos a seguinte compra de acções NSTAR (NST) com os dividendos reinvestidos numa
         conta DRIP. As transacções de reinvestimentos de fundos devem ser feitas de igual forma.
       </para>
 
-      <para>Comece com a compra de 100 acções a 3 de Janeiro de 2005, todos os dividendos serão reinvestidos e
-        crie uma conta para controlar os dividendos desta acção específica. Se o primeiro
+      <para>Comece com a compra de 100 acções a 3 de Janeiro de 2005, todos os dividendos serão reinvestidos
+        e crie uma conta para controlar os dividendos desta acção específica. Se o primeiro
         dividendo for de 0,29€; por acção, insira 53,28 (preço de compra + dividendo) no
         <guilabel>Preço</guilabel> da acção e 100*0,29 na <guilabel>Compra</guilabel>. O &app;
         calcula o correspondente número de <guilabel>acções</guilabel>
@@ -1979,16 +2028,19 @@ Receita
 
       <figure pgwide="1">
         <title>Exemplo de transacções de reinvestimento</title>
+
         <screenshot id="invest-dividendreinvest1">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_dividendreinvest1.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_dividendreinvest1.png"
                           srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Imagem do diário da conta de acções da NST após o reinvestimento de dividendos
               </para>
@@ -2005,15 +2057,15 @@ Receita
     <para>As empresas podem desdobrar as suas acções por muitos motivos, mas o mais comum é o preço ter
       subido mais do que aquilo que é razoável para a maioria dos investidores. Alguns destes
       desdobramentos são simples trocas (2 por 1 ou 3 por 2) e outros são trocas complexas com
-      distribuição de capital. Os desdobramentos também podem resultar em menos acções se a taxa
-      de câmbio for inversa (1 por 3 ou 0,75 por 1).
+      distribuição de capital. Os desdobramentos também podem resultar em menos acções se a
+      taxa de câmbio for inversa (1 por 3 ou 0,75 por 1).
     </para>
 
     <sect2 id="invest-simplesplit">
       <title>Desdobramento simples de acções</title>
 
-      <para>Como exemplo, a detentora de acções NST declarou um desdobramento de 2 por 1, efectivo a 6 de Junho
-        de 2005. O processo para inserir esta transacção é o seguinte:
+      <para>Como exemplo, a detentora de acções NST declarou um desdobramento de 2 por 1, efectivo a 6 de
+        Junho de 2005. O processo para inserir esta transacção é o seguinte:
         <menuchoice>
           <guimenu>Acções</guimenu><guimenuitem>Desdobramento de acções</guimenuitem>
         </menuchoice>
@@ -2022,16 +2074,19 @@ Receita
 
       <figure pgwide="1">
         <title>Menu de início do assistente</title>
+
         <screenshot id="invest-split1">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_split1.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_split1.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Seleção do assistente de desdobramento de acções.
               </para>
@@ -2047,12 +2102,14 @@ Receita
 
       <figure pgwide="1">
         <title>Passo 2 do assistente de desdobramento de acções - seleção de conta/acção</title>
+
         <screenshot id="invest-split2">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_split2.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_split2.png"
                          srccredit="Pedro Albuquerque"/>
@@ -2078,13 +2135,14 @@ Receita
           <para><guilabel>Acções</guilabel> - o número de acções (a mais ou a menos) na transacção.
           </para>
 
-          <para>No nosso exemplo, é um desdobramento 2 por 1, pelo que o número de acções é o número actualmente
-            no diário.
+          <para>No nosso exemplo, é um desdobramento 2 por 1, pelo que o número de acções é o número
+            actualmente no diário.
           </para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Descrição</guilabel> - a descrição deve conter uma breve explicacção da transacção.
+          <para><guilabel>Descrição</guilabel> - a descrição deve conter uma breve explicacção da
+            transacção.
           </para>
         </listitem>
 
@@ -2105,12 +2163,14 @@ Receita
 
       <figure pgwide="1">
         <title>Passo 3 do assistente de desdobramento de acções - detalhes do desdobramento</title>
+
         <screenshot id="invest-split3">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_split3.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_split3.png"
                          srccredit="Pedro Albuquerque"/>
@@ -2125,12 +2185,14 @@ Receita
 
       <figure pgwide="1">
         <title>Passo 4 do assistente de desdobramento de acções - montante auferido</title>
+
         <screenshot id="invest-split4">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_split4.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_split4.png"
                          srccredit="Pedro Albuquerque"/>
@@ -2149,16 +2211,19 @@ Receita
 
       <figure pgwide="1">
         <title>Exemplo de desdobramento simples de acções no diário de conta da acção</title>
+
         <screenshot id="invest-simplesplit1">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_simplesplit1.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
-             <imageobject role="fo">
+
+            <imageobject role="fo">
               <imagedata fileref="figures/invest_simplesplit1.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Diário da conta <emphasis>Activos:Investimentos:DRIPs:NST</emphasis> após uma transacção de
                 desdobramento simples de acções.
@@ -2174,8 +2239,8 @@ Receita
 
       <para>Vamos presumir que detinha acções da AT&T durante a fusão de 18 de Novembro de 2005 entre a
         SBC e a AT&T. Neste exemplo, teria comprado acções da AT&T a 1 de Abril de 2005 e
-        todos os dividendos teriam sido pagos em dinheiro, logo, não constam do diário das acções
-        da AT&T.
+        todos os dividendos teriam sido pagos em dinheiro, logo, não constam do diário das
+        acções da AT&T.
       </para>
 
       <para>As condições da fusão foram a troca de 0,77942 acções da SBC por cada acção da AT&T. A
@@ -2193,16 +2258,19 @@ Receita
 
       <figure pgwide="1">
         <title>Passo 2 do assistente de desdobramento de acções - seleção de conta/acção</title>
+
         <screenshot id="invest-merge2">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_merge2.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_merge2.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Passo 2 do assistente de desdobramento de acções - seleção de conta/acção (<emphasis>Conta de
                 investimento:T</emphasis>).
@@ -2230,15 +2298,16 @@ Receita
           <para><guilabel>Acções</guilabel> - o número de acções (a mais ou a menos) na transacção.
           </para>
 
-          <para>Neste exemplo é uma fusão de 0,77942 por 1, pelo que o número de acções diminui em relacção ao
-            número de acções actualmente no diário. Pode usar a capacidade do &app; para realizar
-            cálculos, inserindo dados directamente (<quote>(0,77942*100)-100</quote>) para calcular
-            a diminuição das acções na fusão.
+          <para>Neste exemplo é uma fusão de 0,77942 por 1, pelo que o número de acções diminui em relacção
+            ao número de acções actualmente no diário. Pode usar a capacidade do &app; para
+            realizar cálculos, inserindo dados directamente (<quote>(0,77942*100)-100</quote>) para
+            calcular a diminuição das acções na fusão.
           </para>
         </listitem>
 
         <listitem>
-          <para><guilabel>Descrição</guilabel> - a descrição deve conter uma breve explicacção da transacção.
+          <para><guilabel>Descrição</guilabel> - a descrição deve conter uma breve explicacção da
+            transacção.
           </para>
         </listitem>
 
@@ -2259,6 +2328,7 @@ Receita
 
       <figure pgwide="1">
         <title>Passo 3 do assistente de desdobramento de acções - detalhes da fusão</title>
+
         <screenshot id="invest-merge3">
           <mediaobject>
             <imageobject>
@@ -2283,16 +2353,19 @@ Receita
 
       <figure pgwide="1">
         <title>Exemplo de transacção de fusão moderadamente complexa</title>
+
         <screenshot id="invest-stockmerge1">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_stockmerge1.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/invest_stockmerge1.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Exemplo de transacção de fusão moderadamente complexa na <emphasis>Conta de
                 investimento:T</emphasis> em que as acções diminuem.
diff --git a/pt/guide/ch_loans.xml b/pt/guide/ch_loans.xml
index d0869e28..942064bd 100644
--- a/pt/guide/ch_loans.xml
+++ b/pt/guide/ch_loans.xml
@@ -21,8 +21,8 @@
   <sect1 id="loans_concepts1">
     <title>Conceitos básicos</title>
 
-    <para>Um empréstimo é definido como uma transacção financeira na qual alguém paga pela utilização do
-      dinheiro de outrém. Há muitos exemplos familiares de empréstimos: cartões de crédito,
+    <para>Um empréstimo é definido como uma transacção financeira na qual alguém paga pela utilização
+      do dinheiro de outrém. Há muitos exemplos familiares de empréstimos: cartões de crédito,
       crédito à habitação, crédito automóvel ou uma linha de crédito empresarial.
     </para>
 
@@ -168,12 +168,14 @@
 
     <figure pgwide="1">
       <title>Calculadora de amortização de empréstimos</title>
+
       <screenshot id="loans_fcalc">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_fcalc.png"
                        srccredit="Pedro Albuquerque" width="&img-w;"/>
           </imageobject>
+
           <caption>
             <para>A <guilabel>calculadora de amortização de empréstimos</guilabel> do &app;.
             </para>
@@ -264,9 +266,9 @@
 
       <para>Para realizar este cálculo, deixe <guilabel>Períodos de pagamento</guilabel> vazio, defina
         <guilabel>Taxa de juro</guilabel> para <emphasis>10</emphasis>, <guilabel>Valor
-        actual</guilabel> para <emphasis>20.000</emphasis>, <guilabel>Pagamento periódico</guilabel>
-        para <emphasis>-500</emphasis>, e <guilabel>Valor futuro</guilabel> para
-        <emphasis>0</emphasis> (não quer ficar a dever nada no final do empréstimo). A
+        actual</guilabel> para <emphasis>20.000</emphasis>, <guilabel>Pagamento
+        periódico</guilabel> para <emphasis>-500</emphasis>, e <guilabel>Valor futuro</guilabel>
+        para <emphasis>0</emphasis> (não quer ficar a dever nada no final do empréstimo). A
         <guilabel>Composição</guilabel> é <emphasis>Mensalmente</emphasis>, os
         <guilabel>Pagamentos</guilabel> são <emphasis>Mensalmente</emphasis>, assuma pagamentos no
         <guilabel>Fim</guilabel> do <guilabel>Período</guilabel> e
@@ -312,9 +314,9 @@ Valores normais para FC e FP são:
         <title>Converter entre taxa de juro nominal e efectiva</title>
 
         <para>Quando é requerida uma solução para n, VA, PGT ou VF, a taxa de juro nominal (i) tem primeiro de
-          ser convertida em taxa de juro efectiva por período de pagamento (ief). Esta taxa, ief, é
-          então usada para calcular a variável seleccionada. Quando é requerida uma solução para
-          i, o cálculo produz a taxa de juro efectiva, ief. Logo, precisamos de funções para
+          ser convertida em taxa de juro efectiva por período de pagamento (ief). Esta taxa, ief,
+          é então usada para calcular a variável seleccionada. Quando é requerida uma solução
+          para i, o cálculo produz a taxa de juro efectiva, ief. Logo, precisamos de funções para
           converter i em ief e ief em i.
         </para>
 <screen>Para converter de i em ieff,são usadas as seguintes expressões:
@@ -364,8 +366,8 @@ O caso mais simples para quando PGT == 0 dá a solução:
 </screen>
         <para>O caso em que PGT != 0 é razoavelmente complexo e não será discutido aqui. Em vez de envolver uma
           função exactamente resolúvel, determinar a taxa de juro quando PMT !=0 envolve um
-          processo interactivo. Por favor, veja o ficheiro src/calculation/fin.para uma explicacção
-          detalhada.
+          processo interactivo. Por favor, veja o ficheiro src/calculation/fin.para uma
+          explicacção detalhada.
         </para>
       </sect3>
 
@@ -374,17 +376,17 @@ O caso mais simples para quando PGT == 0 dá a solução:
 
         <para>Vamos recalcular o <xref linkend="loans_calcsexample1_2"/>, desta vez usando as fórmulas
           matemáticas em vez da <guilabel>calculadora de amortização de empréstimos</guilabel>.
-          Qual é o seu pagamento mensal num empréstimo de 100.000€; a 30 anos, com uma taxa
-          fixa de 4%, composta mensalmente?
+          Qual é o seu pagamento mensal num empréstimo de 100.000€; a 30 anos, com uma taxa fixa
+          de 4%, composta mensalmente?
         </para>
 
         <para>Primeiro vamos definir as variáveis: n = (30*12) = 360, VA =100000, PGT =desconhecido, VF = 0, i =
           4%=4/100=0.04, FC = FP = 12, X = 0 (pagamentos no final do período).
         </para>
 
-        <para>O segundo passo é converter a taxa de juro nominal (i) para taxa de juro efectiva (ief). Uma vez que
-          a taxa é composta mensalmente, discreta, usamos: ief = (1 + i/FC)^(FC/FP) - 1, que dá
-          ief = (1 + 0.04/12)^(12/12) - 1, igual a ief = 1/300 = 0.0033333.
+        <para>O segundo passo é converter a taxa de juro nominal (i) para taxa de juro efectiva (ief). Uma vez
+          que a taxa é composta mensalmente, discreta, usamos: ief = (1 + i/FC)^(FC/FP) - 1, que
+          dá ief = (1 + 0.04/12)^(12/12) - 1, igual a ief = 1/300 = 0.0033333.
         </para>
 
         <para>Agora podemos calcular A e B. A = (1 + ief)^n - 1 = (1 + 1/300)^360 - 1 = 2.313498. B = (1 +
@@ -408,11 +410,10 @@ O caso mais simples para quando PGT == 0 dá a solução:
       <xref linkend="loans_accounts1" />.
     </para>
 
-    <para>Como exemplo, assuma que tem 60.000€; na sua conta poupança e que compra uma casa de
-      150.000€;. A hipoteca cobra-lhe uma taxa anual (TAN) de 6% e tem taxas administrativas
-      (custos de fecho, etc.) de 3%. Decide avançar com 50.000€;. Logo, tem de pedir
-      103.000€; emprestados, que lhe deixa 100.000€; limpos após pagar as taxas
-      administrativas (3% dos 100.000€;).
+    <para>Como exemplo, assuma que tem 60.000€; na sua conta poupança e que compra uma casa de 150.000€;.
+      A hipoteca cobra-lhe uma taxa anual (TAN) de 6% e tem taxas administrativas (custos de fecho,
+      etc.) de 3%. Decide avançar com 50.000€;. Logo, tem de pedir 103.000€; emprestados, que
+      lhe deixa 100.000€; limpos após pagar as taxas administrativas (3% dos 100.000€;).
     </para>
 
     <para>As suas contas antes de receber o empréstimo:
@@ -420,12 +421,14 @@ O caso mais simples para quando PGT == 0 dá a solução:
 
     <figure pgwide="1">
       <title>Contas antes do empréstimo</title>
+
       <screenshot id="loans_mortgage">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_mortgage1.png"
                        srccredit="Pedro Albuquerque"/>
           </imageobject>
+
           <caption>
             <para>Contas antes de receber o empréstimo
             </para>
@@ -516,12 +519,14 @@ O caso mais simples para quando PGT == 0 dá a solução:
 
     <figure pgwide="1">
       <title>Parcelas da transacção de compra</title>
+
       <screenshot id="loans_mortgage2.png">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_mortgage2.png"
                        srccredit="Pedro Albuquerque"/>
           </imageobject>
+
           <caption>
             <para>Parcelas da transacção de compra de habitação
             </para>
@@ -535,6 +540,7 @@ O caso mais simples para quando PGT == 0 dá a solução:
 
     <figure pgwide="1">
       <title>Contas com hipoteca</title>
+
       <screenshot id="loans_mortgage3">
         <mediaobject>
           <imageobject>
@@ -611,13 +617,15 @@ O caso mais simples para quando PGT == 0 dá a solução:
       </para>
 
       <para>Mas precisa de saber quando deste valor é juro e quanto é capital, para poder fazer uma
-        contabilizacção adequada. Para tal, precisa de uma ferramenta mais poderosa, como o módulo
-        <application>Calc</application> do <application>Apache OpenOffice</application>, e em
-        particular, da função <acronym>PGTO</acronym>.
+        contabilizacção adequada. Para tal, precisa de uma ferramenta mais poderosa, como o
+        módulo <application>Calc</application> do <application>Apache OpenOffice</application>, e
+        em particular, da função <acronym>PGTO</acronym>.
       </para>
 
       <figure id="loans_OpenOfficePrivateLoanDetails">
-        <title>Vista detalhada do empréstimo ao José da Esquina (no Apache Open Office)</title><mediaobject>
+        <title>Vista detalhada do empréstimo ao José da Esquina (no Apache Open Office)</title>
+
+        <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanCalculation.png"
                        srccredit="Pedro Albuquerque"/>
@@ -696,12 +704,14 @@ Capital próprio:Saldos iniciais:Euro</screen>
 
       <figure pgwide="1">
         <title>Dinheiro emprestado</title>
+
         <screenshot id="loans_PrivateLoanInitial">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/loans_PrivateLoanInitial.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Árvore de contas após ter emprestado dinheiro
               </para>
@@ -750,16 +760,19 @@ Capital próprio:Saldos iniciais:Euro</screen>
 
       <figure pgwide="1">
         <title>Primeiro pagamento</title>
+
         <screenshot id="loans_PrivateLoanFirstPayment">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Vista detalhada do primeiro pagamento
               </para>
@@ -775,8 +788,8 @@ Capital próprio:Saldos iniciais:Euro</screen>
     <sect2 id="loans_personalLoanToSomeOne_SecondPayment">
       <title>Receber o segundo pagamento</title>
 
-      <para>Quando o segundo pagamento (115,56€;) for recebido, terá novamente de determinar quanto é juro
-        e quanto é capital.
+      <para>Quando o segundo pagamento (115,56€;) for recebido, terá novamente de determinar quanto é juro e
+        quanto é capital.
       </para>
 
       <itemizedlist>
@@ -811,23 +824,26 @@ Capital próprio:Saldos iniciais:Euro</screen>
 
       <figure pgwide="1">
         <title>Segundo pagamento</title>
+
         <screenshot id="loans_PrivateLoanSecondPayment">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Vista detalhada do segundo pagamento
               </para>
             </caption>
           </mediaobject>
         </screenshot>
-        </figure>
+      </figure>
 
       <para>O saldo do empréstimo do José é agora de 1.892,77€; - 107,67€; =1.785,10€;
       </para>
@@ -837,6 +853,7 @@ Capital próprio:Saldos iniciais:Euro</screen>
 
       <figure pgwide="1">
         <title>Árvore de contas após o segundo pagamento</title>
+
         <screenshot id="loans_PrivateLoanSecondPaymentAccounts">
           <mediaobject>
             <imageobject>
@@ -889,8 +906,8 @@ Capital próprio:Saldos iniciais:Euro</screen>
   <sect1 id="loans_Reconciling">
     <title>Como fazer - reconciliação com extractos de empréstimos</title>
 
-    <para>Reconciliar um extracto de empréstimo não é diferente da reconciliação com um extracto bancário
-      ou de cartão de crédito.
+    <para>Reconciliar um extracto de empréstimo não é diferente da reconciliação com um extracto
+      bancário ou de cartão de crédito.
     </para>
 
     <para>Durante o período, deve ter registado todas as transacções relacionadas com o empréstimo e cada
@@ -946,8 +963,8 @@ Capital próprio:Saldos iniciais:Euro</screen>
 
       <itemizedlist>
         <listitem>
-          <para>Comprou uma casa por 300.000€; há anos atrás e agora conseguiu vendê-la por 600.000€;.
-            Como é que regista isto?
+          <para>Comprou uma casa por 300.000€; há anos atrás e agora conseguiu vendê-la por 600.000€;. Como
+            é que regista isto?
           </para>
 
           <para>Para registar isto precisa de aumentar a sua conta bancária em 600.000€; e diminuir outra conta
@@ -955,8 +972,8 @@ Capital próprio:Saldos iniciais:Euro</screen>
             que é aquilo porque a comprou, portanto vai mover este montante para a conta bancária.
             Mas ainda lhe faltam 300.000€;. Este montante, vai buscá-lo à conta
             <emphasis>Receita:Ganhos de capital a longo prazo:Casa</emphasis>. A transacção com
-            parcelas a inserir na <emphasis>Activos:Activos actuais:Conta poupança</emphasis> deve ser
-            parecida com isto:
+            parcelas a inserir na <emphasis>Activos:Activos actuais:Conta poupança</emphasis> deve
+            ser parecida com isto:
           </para>
 
           <para><table>
@@ -1103,8 +1120,8 @@ Capital próprio:Saldos iniciais:Euro</screen>
         detalhes sobre este assunto, por favor veja <xref linkend="chapter_capgain"></xref>
       </para>
 
-      <para>Aqui só veremos o caso em estimou precisamente o valor actual da sua casa. Para outros casos, (sobre
-        e subestimada), por favor veja <xref linkend="chapter_capgain"></xref>.
+      <para>Aqui só veremos o caso em estimou precisamente o valor actual da sua casa. Para outros casos,
+        (sobre e subestimada), por favor veja <xref linkend="chapter_capgain"></xref>.
       </para>
 
       <para><screen>
@@ -1127,8 +1144,8 @@ Capital próprio:Saldos iniciais:Euro</screen>
         que o valor actual de mercado é 600.000€;.
       </para>
 
-      <para>A diferença entre os 600.000€; (valor de mercado estimado) e os 300.000€; (valor de compra)
-        é o valor de Ganhos não realizados. Logo, tem um valor de 300.000€; na sua conta
+      <para>A diferença entre os 600.000€; (valor de mercado estimado) e os 300.000€; (valor de compra) é
+        o valor de Ganhos não realizados. Logo, tem um valor de 300.000€; na sua conta
         <emphasis>Activos:Activos fixos:Casa:Ganhos não realizados</emphasis>
       </para>
 
@@ -1192,8 +1209,8 @@ Capital próprio:Saldos iniciais:Euro</screen>
         </table>
       </para>
 
-      <para>A transacção a inserir na sua conta <emphasis>Activos:Activos actuais:Conta poupança</emphasis> deve
-        parecer-se com isto:
+      <para>A transacção a inserir na sua conta <emphasis>Activos:Activos actuais:Conta poupança</emphasis>
+        deve parecer-se com isto:
       </para>
 
       <para><table>
@@ -1255,9 +1272,9 @@ Capital próprio:Saldos iniciais:Euro</screen>
         </table>
       </para>
 
-      <para>Após registar estas transacções, verá que o seu activo Casa tem um valor 0, a sua conta poupança
-        aumentou em 600.000€; e que a conta <emphasis>Receitas: Ganhos realizados</emphasis>
-        aumentou em 300.000€;.
+      <para>Após registar estas transacções, verá que o seu activo Casa tem um valor 0, a sua conta
+        poupança aumentou em 600.000€; e que a conta <emphasis>Receitas: Ganhos
+        realizados</emphasis> aumentou em 300.000€;.
       </para>
     </sect2>
   </sect1>
diff --git a/pt/guide/ch_oth_assets.xml b/pt/guide/ch_oth_assets.xml
index de1c3e27..01c9d2b2 100644
--- a/pt/guide/ch_oth_assets.xml
+++ b/pt/guide/ch_oth_assets.xml
@@ -20,17 +20,32 @@ Translators:
   <sect1 id="accts-oa1">
     <title>Conceitos gerais</title>
 
-    <para>Este capítulo apresenta muitos tratamentos contabilísticos adicionais frequentemente encontrados em empresas e menos frequentemente encontrados em actividades pessoais, que necessitam de registo em livros de contabilidade. As explicações abaixo abrangem tanto a descrição como a finalidade da actividade, e incluem também os tratamentos contabilísticos habituais (registos) para estas transacções.
+    <para>Este capítulo apresenta muitos tratamentos contabilísticos adicionais frequentemente encontrados
+      em empresas e menos frequentemente encontrados em actividades pessoais, que necessitam de
+      registo em livros de contabilidade. As explicações abaixo abrangem tanto a descrição como
+      a finalidade da actividade, e incluem também os tratamentos contabilísticos habituais
+      (registos) para estas transacções.
     </para>
 
-    <para>Estes conceitos evoluíram ao longo de séculos de experiência de quem mantém registos contabilísticos e
-      vão ajudar a maximizar a utilidade e o significado da manutenção de registos.
+    <para>Estes conceitos evoluíram ao longo de séculos de experiência de quem mantém registos
+      contabilísticos e vão ajudar a maximizar a utilidade e o significado da manutenção de
+      registos.
     </para>
 
-    <para>Esta secção introduz a categorização dos activos no balanço com base no tempo ou na vida útil do activo (actual e fixo). Por vezes, os activos são também considerados do ponto de vista da sua <emphasis>liquidez </emphasis>, que é considerada como o quão próximo ou distante que o bem está de ser transformado em dinheiro. Os bens quase em dinheiro são relativamente rapidamente convertidos em dinheiro (por exemplo, contas A/Receber), enquanto os activos que requerem bastante tempo para converter em dinheiro são considerados como relativamente <emphasis>fixos</emphasis> no seu estado não-dinheiro (por exemplo, equipamento pesado, edifícios, terrenos). Fixo não significa que tenham sido reparados!
+    <para>Esta secção introduz a categorização dos activos no balanço com base no tempo ou na vida útil
+      do activo (actual e fixo). Por vezes, os activos são também considerados do ponto de vista
+      da sua <emphasis>liquidez </emphasis>, que é considerada como o quão próximo ou distante
+      que o bem está de ser transformado em dinheiro. Os bens quase em dinheiro são relativamente
+      rapidamente convertidos em dinheiro (por exemplo, contas A/Receber), enquanto os activos que
+      requerem bastante tempo para converter em dinheiro são considerados como relativamente
+      <emphasis>fixos</emphasis> no seu estado não-dinheiro (por exemplo, equipamento pesado,
+      edifícios, terrenos). Fixo não significa que tenham sido reparados!
     </para>
 
-    <para>Deverá saber que os activos actuais são paralelos aos que têm mais liquidez, enquanto que os de longo prazo e fixos são aqueles com muito menos liquidez. Finalmente, abaixo encontrará alguns activos que podem ser actuais ou fixos, com base na natureza dos factos que os constituem.
+    <para>Deverá saber que os activos actuais são paralelos aos que têm mais liquidez, enquanto que os de
+      longo prazo e fixos são aqueles com muito menos liquidez. Finalmente, abaixo encontrará
+      alguns activos que podem ser actuais ou fixos, com base na natureza dos factos que os
+      constituem.
     </para>
   </sect1>
 
@@ -40,14 +55,27 @@ Translators:
     <sect2 id="accts-oa3">
       <title>Activos actuais</title>
 
-      <para>Activos actuais são as actividades cuja vida normal esperada seria de um ano ou menos. Tais actividades poderiam ser o acompanhamento de despesas reembolsáveis, adiantamentos de viagem, empréstimos a curto prazo a um amigo ou familiar, despesas pré-pagas, amortização anual do prémio do seguro, etc. A entidade individual poderia ter muitos outros tipos de actividades de curto prazo que reflectissem o que está a fazer. Estes tipos de bens são explicados individualmente abaixo.
+      <para>Activos actuais são as actividades cuja vida normal esperada seria de um ano ou menos. Tais
+        actividades poderiam ser o acompanhamento de despesas reembolsáveis, adiantamentos de
+        viagem, empréstimos a curto prazo a um amigo ou familiar, despesas pré-pagas,
+        amortização anual do prémio do seguro, etc. A entidade individual poderia ter muitos
+        outros tipos de actividades de curto prazo que reflectissem o que está a fazer. Estes tipos
+        de bens são explicados individualmente abaixo.
       </para>
     </sect2>
 
     <sect2 id="accts-oa4">
       <title>Activos fixos (de longo prazo)</title>
 
-      <para>Os activos fixos (de longo prazo) são aquelas actividades cuja vida normal esperada excede um ou mais anos. Este agrupamento abrange tanto os activos corpóreos como incorpóreos. Exemplos de activos corpóreos são terrenos, edifícios e veículos (carros, camiões, equipamento de construção, prensas de fábrica, etc.) Os activos incorpóreos incluem coisas tais como patentes, direitos de autor, boa vontade, etc. Porque a vida de alguns destes activos mostra desgaste e deterioração do valor ao longo do tempo, empresas e indivíduos podem permitir essa diminuição de valor através de cálculos de depreciação de tais activos. Por exemplo, os terrenos normalmente não se depreciam, mas os edifícios sim, tal como o equipamento e os veículos. Este tipo de activos são explicados individualmente a seguir.
+      <para>Os activos fixos (de longo prazo) são aquelas actividades cuja vida normal esperada excede um ou
+        mais anos. Este agrupamento abrange tanto os activos corpóreos como incorpóreos. Exemplos
+        de activos corpóreos são terrenos, edifícios e veículos (carros, camiões, equipamento
+        de construção, prensas de fábrica, etc.) Os activos incorpóreos incluem coisas tais como
+        patentes, direitos de autor, boa vontade, etc. Porque a vida de alguns destes activos mostra
+        desgaste e deterioração do valor ao longo do tempo, empresas e indivíduos podem permitir
+        essa diminuição de valor através de cálculos de depreciação de tais activos. Por
+        exemplo, os terrenos normalmente não se depreciam, mas os edifícios sim, tal como o
+        equipamento e os veículos. Este tipo de activos são explicados individualmente a seguir.
       </para>
     </sect2>
   </sect1>
@@ -55,18 +83,30 @@ Translators:
   <sect1 id="accts-oa5">
     <title>Activos actuais</title>
 
-    <para>Esta secção explica os créditos de curto prazo, despesas reembolsáveis, adiantamentos de viagem, prémios pré-pagos, aluguer pré-pago, etc.
+    <para>Esta secção explica os créditos de curto prazo, despesas reembolsáveis, adiantamentos de viagem,
+      prémios pré-pagos, aluguer pré-pago, etc.
     </para>
 
     <sect2 id="accts-oa6">
       <title>Cobráveis a curto prazo</title>
 
-      <para>Este tipo de conta é útil para reflectir um acordo feito com alguém em quem se confia. Suponhamos que tenha emprestado a alguém 500€ e que concordou em pagar-lhe 50€ por mês. Se pagou a tempo, o empréstimo que fez seria pago no prazo de um ano, razão pela qual é classificado como um crédito a curto prazo. Assim, poderia registar esse empréstimo inicialmente nesta árvore de contas: <emphasis>Outros activos:Activos actuais:Empréstimo ao Zé</emphasis>. No momento em que lhe dá o dinheiro, a sua entrada é débito (aumentar) Empréstimo ao Zé 500€ e crédito (diminuir) Banco 500€. Cada vez que recebe um pagamento do Zé regista 50€ de débito (aumento) ao Banco e 50€ de crédito (diminuição) Empréstimo ao Zé.
+      <para>Este tipo de conta é útil para reflectir um acordo feito com alguém em quem se confia. Suponhamos
+        que tenha emprestado a alguém 500€ e que concordou em pagar-lhe 50€ por mês. Se pagou
+        a tempo, o empréstimo que fez seria pago no prazo de um ano, razão pela qual é
+        classificado como um crédito a curto prazo. Assim, poderia registar esse empréstimo
+        inicialmente nesta árvore de contas: <emphasis>Outros activos:Activos actuais:Empréstimo
+        ao Zé</emphasis>. No momento em que lhe dá o dinheiro, a sua entrada é débito (aumentar)
+        Empréstimo ao Zé 500€ e crédito (diminuir) Banco 500€. Cada vez que recebe um
+        pagamento do Zé regista 50€ de débito (aumento) ao Banco e 50€ de crédito
+        (diminuição) Empréstimo ao Zé.
       </para>
 
       <tip>
-        <para>Não se confunda com o uso da palavra <quote>Empréstimo</quote>. <quote>Empréstimo a</quote> é
-          o tipo de crédito que realmente tem a receber, ou seja, receberá do Zé, o dinheiro que emprestou anteriormente. Até que ele lhe pague efectivamente o dinheiro que lhe é devido, reflecte a dívida nos seus livros por uma conta descrevendo a sua expectativa de que receberá o dinheiro que lhe é devido, daí a palavra <quote>cobrável</quote>.
+        <para>Não se confunda com o uso da palavra <quote>Empréstimo</quote>. <quote>Empréstimo a</quote> é o
+          tipo de crédito que realmente tem a receber, ou seja, receberá do Zé, o dinheiro que
+          emprestou anteriormente. Até que ele lhe pague efectivamente o dinheiro que lhe é
+          devido, reflecte a dívida nos seus livros por uma conta descrevendo a sua expectativa de
+          que receberá o dinheiro que lhe é devido, daí a palavra <quote>cobrável</quote>.
         </para>
       </tip>
     </sect2>
@@ -74,26 +114,68 @@ Translators:
     <sect2 id="accts-oa7">
       <title>Despesas reembolsáveis</title>
 
-      <para>Este tipo de actividade é aquela em que se gasta o próprio dinheiro em nome de outra pessoa (o seu empregador, talvez) e mais tarde recebe o reembolso do que gastou. O caso pode ser uma viagem de negócios. O empregador tem uma política de cobertura (pagamento de) todas as despesas autorizadas. Após o fim da viagem, o funcionário apresenta um relatório com as datas e os montantes gastos com recibos para todas as despesas. O empregador revê o relatório e paga por todos os itens que considera como tendo uma razão comercial válida. Normalmente, os empregados sabem de antemão o que o empregador irá reembolsar, pelo que apenas esses itens são registados como despesa reembolsável sob os livros do empregado.
+      <para>Este tipo de actividade é aquela em que se gasta o próprio dinheiro em nome de outra pessoa (o seu
+        empregador, talvez) e mais tarde recebe o reembolso do que gastou. O caso pode ser uma
+        viagem de negócios. O empregador tem uma política de cobertura (pagamento de) todas as
+        despesas autorizadas. Após o fim da viagem, o funcionário apresenta um relatório com as
+        datas e os montantes gastos com recibos para todas as despesas. O empregador revê o
+        relatório e paga por todos os itens que considera como tendo uma razão comercial válida.
+        Normalmente, os empregados sabem de antemão o que o empregador irá reembolsar, pelo que
+        apenas esses itens são registados como despesa reembolsável sob os livros do empregado.
       </para>
 
-      <para>Porque uma viagem de negócios pode envolver diferentes tipos de despesas (viagem de avião, alojamento, transporte no destino, etc.), seriam registados diferentes tipos de despesas na mesma conta desde que as despesas estejam todas relacionadas com a mesma viagem. Por outras palavras, se for feita uma segunda viagem antes da primeira estar totalmente liquidada, poderia ser criada uma segunda conta para um evento diferente. Faria sentido fazer isto, se isso ajudasse a manter separados todos os detalhes de uma viagem em relação aos de outra. Depende da pessoa que faz a viagem para decidir o problema que seria colocar viagens separadas em contas separadas ou colocar todas elas na mesma conta. O viajante deve lembrar-se que a conta deve ser reconciliada para saber com certeza que todas as despesas foram reembolsadas.
+      <para>Porque uma viagem de negócios pode envolver diferentes tipos de despesas (viagem de avião,
+        alojamento, transporte no destino, etc.), seriam registados diferentes tipos de despesas na
+        mesma conta desde que as despesas estejam todas relacionadas com a mesma viagem. Por outras
+        palavras, se for feita uma segunda viagem antes da primeira estar totalmente liquidada,
+        poderia ser criada uma segunda conta para um evento diferente. Faria sentido fazer isto, se
+        isso ajudasse a manter separados todos os detalhes de uma viagem em relação aos de outra.
+        Depende da pessoa que faz a viagem para decidir o problema que seria colocar viagens
+        separadas em contas separadas ou colocar todas elas na mesma conta. O viajante deve
+        lembrar-se que a conta deve ser reconciliada para saber com certeza que todas as despesas
+        foram reembolsadas.
       </para>
 
-      <para>O registo das despesas da viagem seria muito semelhante. Ou seja, se pagasse as despesas da viagem em dinheiro, debitaria (aumentar) a conta de despesas reembolsáveis para o dinheiro pago, porque é uma conta a receber até ser reembolsada a si. O crédito compensando as suas despesas diminuiria a conta que mostra o dinheiro no seu bolso ou a conta da qual retirou o dinheiro para o pagamento efectuado. Se tiver pago com cartão de crédito, o lado do débito seria o mesmo que o descrito anteriormente, mas o crédito seria um aumento para a conta da empresa de cartões de crédito nos seus livros.
+      <para>O registo das despesas da viagem seria muito semelhante. Ou seja, se pagasse as despesas da viagem
+        em dinheiro, debitaria (aumentar) a conta de despesas reembolsáveis para o dinheiro pago,
+        porque é uma conta a receber até ser reembolsada a si. O crédito compensando as suas
+        despesas diminuiria a conta que mostra o dinheiro no seu bolso ou a conta da qual retirou o
+        dinheiro para o pagamento efectuado. Se tiver pago com cartão de crédito, o lado do
+        débito seria o mesmo que o descrito anteriormente, mas o crédito seria um aumento para a
+        conta da empresa de cartões de crédito nos seus livros.
       </para>
 
-      <para>Quando recebeu o seu reembolso, a entrada no diário (ou transacção) para registar a recepção dos fundos do empregador seriam: débito (aumento) Banco para o montante do cheque e crédito (diminuição) da conta de despesas reembolsável para o montante do cheque.
+      <para>Quando recebeu o seu reembolso, a entrada no diário (ou transacção) para registar a recepção
+        dos fundos do empregador seriam: débito (aumento) Banco para o montante do cheque e
+        crédito (diminuição) da conta de despesas reembolsável para o montante do cheque.
       </para>
 
-      <para>Se se verificar que a conta de despesas reembolsáveis não é saldo zero após o processamento do pagamento do empregador, isto significa que há uma diferença entre si e o empregador no tratamento da despesa, que precisa de ser investigada. Se o saldo for um débito (um saldo positivo), a sua conta tem algum dinheiro que não foi reembolsado. Se o saldo for um crédito (um saldo negativo), foi-lhe pago por mais do que aquilo que registou como devido. Em ambas as situações deve reconciliar a diferença entre o que registou e o que foi pago. Esse esforço deve revelar exactamente o que está a causar a discrepância. Terá de contactar o contabilista do empregador para saber o que foi pago, se o reembolso não foi acompanhado por uma lista detalhada dos itens que lhe foram pagos.
+      <para>Se se verificar que a conta de despesas reembolsáveis não é saldo zero após o processamento do
+        pagamento do empregador, isto significa que há uma diferença entre si e o empregador no
+        tratamento da despesa, que precisa de ser investigada. Se o saldo for um débito (um saldo
+        positivo), a sua conta tem algum dinheiro que não foi reembolsado. Se o saldo for um
+        crédito (um saldo negativo), foi-lhe pago por mais do que aquilo que registou como devido.
+        Em ambas as situações deve reconciliar a diferença entre o que registou e o que foi pago.
+        Esse esforço deve revelar exactamente o que está a causar a discrepância. Terá de
+        contactar o contabilista do empregador para saber o que foi pago, se o reembolso não foi
+        acompanhado por uma lista detalhada dos itens que lhe foram pagos.
       </para>
 
-      <para>No caso de o empregador se recusar a reembolsá-lo por uma despesa, torna efectivamente sua a despesa. Nesse caso, faria esta entrada: debitar (aumentar) as suas próprias despesas (devidamente designada) e creditar (diminuir) a conta de despesas reembolsáveis. Essa entrada deve resultar num saldo zero na conta de despesas reembolsáveis. Caso contrário, é reconciliar até identificar a diferença.
+      <para>No caso de o empregador se recusar a reembolsá-lo por uma despesa, torna efectivamente sua a
+        despesa. Nesse caso, faria esta entrada: debitar (aumentar) as suas próprias despesas
+        (devidamente designada) e creditar (diminuir) a conta de despesas reembolsáveis. Essa
+        entrada deve resultar num saldo zero na conta de despesas reembolsáveis. Caso contrário,
+        é reconciliar até identificar a diferença.
       </para>
 
       <tip>
-        <para>Por vezes existem pequenas diferenças que não correspondem a uma entrada individual. Nesses casos divida o montante por 2 ou por 9. Se o montante não resolvido for divisível por dois, sugere que tanto você como o empregador introduziram o artigo da mesma forma: ambos como débitos ou ambos como créditos. Se for divisível por 9, então é provável que um de vós tenha transposto números adjacentes; por exemplo, um inseriu 69 e o outro 96. Se a diferença não for divisível nem por 2 nem por 9, então pode ser que esteja presente mais do que um erro.
+        <para>Por vezes existem pequenas diferenças que não correspondem a uma entrada individual. Nesses casos
+          divida o montante por 2 ou por 9. Se o montante não resolvido for divisível por dois,
+          sugere que tanto você como o empregador introduziram o artigo da mesma forma: ambos como
+          débitos ou ambos como créditos. Se for divisível por 9, então é provável que um de
+          vós tenha transposto números adjacentes; por exemplo, um inseriu 69 e o outro 96. Se a
+          diferença não for divisível nem por 2 nem por 9, então pode ser que esteja presente
+          mais do que um erro.
         </para>
       </tip>
     </sect2>
@@ -101,40 +183,81 @@ Translators:
     <sect2 id="accts-oa8">
       <title>Avanços a viagens</title>
 
-      <para>Estas são muito semelhantes às despesas reembolsáveis. A diferença é que alguém lhe dá dinheiro primeiro; gastamo-lo e depois fazemos um relatório que contabiliza aquilo em que o gastámos, apoiado por facturas que estabelecem quem, o quê, onde, quando e quanto para cada despesa. No caso das despesas reembolsáveis, gastou o seu dinheiro primeiro e depois recuperou-o.
+      <para>Estas são muito semelhantes às despesas reembolsáveis. A diferença é que alguém lhe dá
+        dinheiro primeiro; gastamo-lo e depois fazemos um relatório que contabiliza aquilo em que o
+        gastámos, apoiado por facturas que estabelecem quem, o quê, onde, quando e quanto para
+        cada despesa. No caso das despesas reembolsáveis, gastou o seu dinheiro primeiro e depois
+        recuperou-o.
       </para>
 
-      <para>No caso dos avanços a viagens, quando recebe o adiantamento, faz este registo nos seus livros: débito (aumento) Banco para o montante do adiantamento de viagem recebido (digamos, 500€); crédito (aumento) a Adiantamento de viagem como passivo a curto prazo ($500). Isto é um passivo, porque não é dotado com o dinheiro, mas só o recebeu com o objectivo de ter fundos para gastar ao fazer o seu trabalho.
+      <para>No caso dos avanços a viagens, quando recebe o adiantamento, faz este registo nos seus livros:
+        débito (aumento) Banco para o montante do adiantamento de viagem recebido (digamos,
+        500€); crédito (aumento) a Adiantamento de viagem como passivo a curto prazo ($500). Isto
+        é um passivo, porque não é dotado com o dinheiro, mas só o recebeu com o objectivo de
+        ter fundos para gastar ao fazer o seu trabalho.
       </para>
 
-      <para>Frequentemente, a forma como estes acordos monetários funcionam é que no início, por exemplo, de um emprego como vendedor, recebe o adiantamento e mensalmente (ou mais frequentemente) entrega um relatório sobre quem, o quê, onde, quando, e quanto gastou. O dinheiro no relatório é reembolsado se aprovado.
+      <para>Frequentemente, a forma como estes acordos monetários funcionam é que no início, por exemplo, de
+        um emprego como vendedor, recebe o adiantamento e mensalmente (ou mais frequentemente)
+        entrega um relatório sobre quem, o quê, onde, quando, e quanto gastou. O dinheiro no
+        relatório é reembolsado se aprovado.
       </para>
 
-      <para>Durante o período após a recepção do adiantamento e antes da apresentação de um pedido de relatório de reembolso, o vendedor pode registar as suas despesas na conta de responsabilidade adiantada. Nesse caso, o saldo da conta mostrará quanto do adiantamento ainda não foi gasto (assumindo que o saldo de Adiantamento a viagens é um crédito). Se não tiverem sido cometidos erros e todas as despesas são aprovadas, a soma do saldo da conta não gasto e o montante do cheque de reembolso será igual ao montante original do adiantamento de viagem.
+      <para>Durante o período após a recepção do adiantamento e antes da apresentação de um pedido de
+        relatório de reembolso, o vendedor pode registar as suas despesas na conta de
+        responsabilidade adiantada. Nesse caso, o saldo da conta mostrará quanto do adiantamento
+        ainda não foi gasto (assumindo que o saldo de Adiantamento a viagens é um crédito). Se
+        não tiverem sido cometidos erros e todas as despesas são aprovadas, a soma do saldo da
+        conta não gasto e o montante do cheque de reembolso será igual ao montante original do
+        adiantamento de viagem.
       </para>
 
-      <para>Faz sentido para o vendedor registar as despesas de viagem nesta conta de adiantamento (e não para as suas próprias contas de despesas), porque o dinheiro está a ser gasto em nome do empregador, para as despesas autorizadas pelo empregador. Não é o dinheiro do próprio empregado e portanto não são as suas próprias despesas.
+      <para>Faz sentido para o vendedor registar as despesas de viagem nesta conta de adiantamento (e não para
+        as suas próprias contas de despesas), porque o dinheiro está a ser gasto em nome do
+        empregador, para as despesas autorizadas pelo empregador. Não é o dinheiro do próprio
+        empregado e portanto não são as suas próprias despesas.
       </para>
 
-      <para>Quando o vendedor recebe o reembolso do relatório (digamos, 350€), debita (aumenta) Banco, e credita (aumenta) novamente a conta de responsabilidade de Adiantamento a viagem, assumindo que anteriormente tinha estado a registar as despesas na conta de adiantamento de viagem. Acompanhar a actividade desta forma faz com que a conta mostre sempre o montante que é devido ao empregador.
+      <para>Quando o vendedor recebe o reembolso do relatório (digamos, 350€), debita (aumenta) Banco, e
+        credita (aumenta) novamente a conta de responsabilidade de Adiantamento a viagem, assumindo
+        que anteriormente tinha estado a registar as despesas na conta de adiantamento de viagem.
+        Acompanhar a actividade desta forma faz com que a conta mostre sempre o montante que é
+        devido ao empregador.
       </para>
 
-      <para>Consulte <xref linkend="accts-oa7"/> acima para o que fazer se o empregador não aceitar um item que o empregado inscreveu no relatório de pedido de reembolso antecipado de viagem. O esforço de resolução da diferença é essencialmente o mesmo para ambos os tipos de contas.
+      <para>Consulte <xref linkend="accts-oa7"/> acima para o que fazer se o empregador não aceitar um item que
+        o empregado inscreveu no relatório de pedido de reembolso antecipado de viagem. O esforço
+        de resolução da diferença é essencialmente o mesmo para ambos os tipos de contas.
       </para>
     </sect2>
 
     <sect2 id="accts-oa9">
       <title>Prémios ou rendas pré-pagos</title>
 
-      <para>Alguns tipos de despesas são geralmente facturadas como montantes semestrais ou anuais. Por exemplo, a indústria de seguros facturará anualmente o seguro residencial, enquanto os prémios de seguro automóvel podem ser anual ou semestral. Para aqueles que pagam um montante que cobre vários meses ou um montante total por ano, o tratamento contabilístico adequado é reflectir em cada período contabilístico o montante que exprime o benefício aplicável a esse período.
+      <para>Alguns tipos de despesas são geralmente facturadas como montantes semestrais ou anuais. Por
+        exemplo, a indústria de seguros facturará anualmente o seguro residencial, enquanto os
+        prémios de seguro automóvel podem ser anual ou semestral. Para aqueles que pagam um
+        montante que cobre vários meses ou um montante total por ano, o tratamento contabilístico
+        adequado é reflectir em cada período contabilístico o montante que exprime o benefício
+        aplicável a esse período.
       </para>
 
-      <para>No caso de alguém que paga um prémio de seguro de um ano inteiro no início do
-        período de seguro, a entrada para registar isto é débito (aumento) Prémio de seguro pré-pago para
-        digamos, 1.200€, e crédito (diminuição) Banco por 1.200€.
+      <para>No caso de alguém que paga um prémio de seguro de um ano inteiro no início do período de seguro,
+        a entrada para registar isto é débito (aumento) Prémio de seguro pré-pago para digamos,
+        1.200€, e crédito (diminuição) Banco por 1.200€.
       </para>
 
-      <para>Depois é criado um lançamento diário periódico mensal (transacção programada) que debita (aumenta) Despesas de seguro 100€ e créditos (diminui) Prémio de seguro pré-pago 100€. Isto distribui o custo ao longo dos períodos que recebem o benefício da cobertura do seguro. As empresas que seguem as práticas contabilísticas geralmente aceites, normalmente utilizariam esta técnica, especialmente se tivessem de apresentar demonstrações financeiras a bancos ou outros financiadores. Se os indivíduos têm de o fazer, depende da pessoa e de quão preocupada está com o custo vs. benefício ao longo dos períodos de tempo. Outro factor que influenciaria a utilização desta técnica seria o número de tais situações que a pessoa encontra. É relativamente fácil recordar uma ou duas, mas mais difícil se tiver de gerir 10 a 20. Crie tantos ou tão poucos como veja serem úteis e importantes para si.
+      <para>Depois é criado um lançamento diário periódico mensal (transacção programada) que debita
+        (aumenta) Despesas de seguro 100€ e créditos (diminui) Prémio de seguro pré-pago
+        100€. Isto distribui o custo ao longo dos períodos que recebem o benefício da cobertura
+        do seguro. As empresas que seguem as práticas contabilísticas geralmente aceites,
+        normalmente utilizariam esta técnica, especialmente se tivessem de apresentar
+        demonstrações financeiras a bancos ou outros financiadores. Se os indivíduos têm de o
+        fazer, depende da pessoa e de quão preocupada está com o custo vs. benefício ao longo dos
+        períodos de tempo. Outro factor que influenciaria a utilização desta técnica seria o
+        número de tais situações que a pessoa encontra. É relativamente fácil recordar uma ou
+        duas, mas mais difícil se tiver de gerir 10 a 20. Crie tantos ou tão poucos como veja
+        serem úteis e importantes para si.
       </para>
     </sect2>
 <!--
@@ -207,77 +330,135 @@ Translators:
   <sect1 id="accts-oa11">
     <title>Activos actuais ou fixos</title>
 
-    <para>Esta secção explica porque alguns tipos de activos podem ser de curto ou longo prazo e apresenta um exemplo.
+    <para>Esta secção explica porque alguns tipos de activos podem ser de curto ou longo prazo e apresenta
+      um exemplo.
     </para>
 
-    <para>Um exemplo são os depósitos (por exemplo, utilidade, aluguer, segurança). Se o contrato de depósito contiver uma caução para recuperar no final de um ano, o tratamento poderia ser o de um activo a curto prazo. Contudo, quando o acordo é que o detentor do depósito devolva os fundos apenas após uma inspecção bem sucedida no final da relação, depois no início da relação ou acordo, a pessoa que paga o depósito tem de decidir se o inscreve como uma despesa corrente ou se a acompanha para eventual recuperação no final do acordo (não pouco frequentemente, mudando-se para um novo local).
+    <para>Um exemplo são os depósitos (por exemplo, utilidade, aluguer, segurança). Se o contrato de
+      depósito contiver uma caução para recuperar no final de um ano, o tratamento poderia ser o
+      de um activo a curto prazo. Contudo, quando o acordo é que o detentor do depósito devolva os
+      fundos apenas após uma inspecção bem sucedida no final da relação, depois no início da
+      relação ou acordo, a pessoa que paga o depósito tem de decidir se o inscreve como uma
+      despesa corrente ou se a acompanha para eventual recuperação no final do acordo (não pouco
+      frequentemente, mudando-se para um novo local).
     </para>
 
-    <para>Seja qual for a decisão tomada, o tratamento contabilístico é o de debitar (aumentar) a despesa (assumindo a decisão de anulação) ou debitar (aumentar) Depósitos a receber (assumindo que a intenção é de recuperar o depósito no futuro) e creditar (diminuir) Banco pelo montante do depósito (se pago em dinheiro) ou cartão de crédito (aumento) se pago através desse método de pagamento.
+    <para>Seja qual for a decisão tomada, o tratamento contabilístico é o de debitar (aumentar) a despesa
+      (assumindo a decisão de anulação) ou debitar (aumentar) Depósitos a receber (assumindo que
+      a intenção é de recuperar o depósito no futuro) e creditar (diminuir) Banco pelo montante
+      do depósito (se pago em dinheiro) ou cartão de crédito (aumento) se pago através desse
+      método de pagamento.
     </para>
   </sect1>
 
   <sect1 id="accts-oa12">
     <title>Activos fixos (de longo prazo)</title>
 
-    <para>Esta secção ilustra os activos fixos (aqueles cuja vida útil excede um ano) e discute estes tipos: terrenos, edifícios, melhoramentos arrendados, incorpóreos, veículos e outro equipamento.
+    <para>Esta secção ilustra os activos fixos (aqueles cuja vida útil excede um ano) e discute estes
+      tipos: terrenos, edifícios, melhoramentos arrendados, incorpóreos, veículos e outro
+      equipamento.
     </para>
 
     <sect2 id="accts-oa13">
       <title>Terra</title>
 
-      <para>A terra não é um bem perecível. Ou seja, não se esgota com o tempo e raramente sofre danos de tal forma que perca valor. Por esse motivo, é normalmente registada pelo custo no momento de compra. A apreciação no seu valor ao longo de décadas não é registada e não é reconhecida de qualquer forma nos livros do proprietário. Só depois de o terreno ter sido vendido é que o preço de venda e o custo de compra são comparados para calcular o ganho ou perda na venda.
+      <para>A terra não é um bem perecível. Ou seja, não se esgota com o tempo e raramente sofre danos de
+        tal forma que perca valor. Por esse motivo, é normalmente registada pelo custo no momento
+        de compra. A apreciação no seu valor ao longo de décadas não é registada e não é
+        reconhecida de qualquer forma nos livros do proprietário. Só depois de o terreno ter sido
+        vendido é que o preço de venda e o custo de compra são comparados para calcular o ganho
+        ou perda na venda.
       </para>
 
-      <para>O terreno é frequentemente vendido/comprado em combinação com estruturas sobre ele. Isso significa que o custo tem de ser separado do custo das estruturas nele existentes. A avaliação do terreno faz normalmente parte do processo de transferência de propriedade e o seu valor é indicado nos documentos de compra separadamente do valor de quaisquer estruturas que suporte.
+      <para>O terreno é frequentemente vendido/comprado em combinação com estruturas sobre ele. Isso
+        significa que o custo tem de ser separado do custo das estruturas nele existentes. A
+        avaliação do terreno faz normalmente parte do processo de transferência de propriedade e
+        o seu valor é indicado nos documentos de compra separadamente do valor de quaisquer
+        estruturas que suporte.
       </para>
 
-      <para>Os valores do terreno apresentados nos documentos de compra surgem frequentemente do processo de determinação do valor geridos por assessores cuja função é atribuir valores a terrenos para fins fiscais. Zonas locais e regionais de um distrito ou província utilizam os valores determinados pelos assessores nas suas fórmulas de impostos, que proporcionam receitas às autoridades governantes locais e regionais para financiar os seus serviços comunitários necessários.
+      <para>Os valores do terreno apresentados nos documentos de compra surgem frequentemente do processo de
+        determinação do valor geridos por assessores cuja função é atribuir valores a terrenos
+        para fins fiscais. Zonas locais e regionais de um distrito ou província utilizam os valores
+        determinados pelos assessores nas suas fórmulas de impostos, que proporcionam receitas às
+        autoridades governantes locais e regionais para financiar os seus serviços comunitários
+        necessários.
       </para>
 
-      <para>Se o terreno for adquirido numa situação não sujeita a um historial de avaliação de terrenos por um sistema formal de avaliação, o comprador pode recorrer a agentes imobiliários e um exame de transacções de venda recentes para informações que permitam calcular um montante razoável para expressar o valor da terra.
+      <para>Se o terreno for adquirido numa situação não sujeita a um historial de avaliação de terrenos
+        por um sistema formal de avaliação, o comprador pode recorrer a agentes imobiliários e um
+        exame de transacções de venda recentes para informações que permitam calcular um
+        montante razoável para expressar o valor da terra.
       </para>
     </sect2>
 
     <sect2 id="accts-oa14">
       <title>Edíficios</title>
 
-      <para>Os edifícios são as <quote>caves</quote> artificiais em que grande parte da vida humana ocorre. Estas estruturas são desperdício de activos, porque na sua utilização, eles ou os seus componentes desgastam-se gradualmente. Com o tempo, começam a perder alguma da sua função e podem sofrer danos devidos a elementos naturais ou à acção humana.
+      <para>Os edifícios são as <quote>caves</quote> artificiais em que grande parte da vida humana ocorre.
+        Estas estruturas são desperdício de activos, porque na sua utilização, eles ou os seus
+        componentes desgastam-se gradualmente. Com o tempo, começam a perder alguma da sua função
+        e podem sofrer danos devidos a elementos naturais ou à acção humana.
       </para>
 
-      <para>A prática contabilística aceite é a de registar o custo do edifício determinado no momento da transferência de propriedade (compra) ou na conclusão de todos os custos de construção. Porque os edifícios são frequentemente utilizados durante décadas e devido à necessidade de poder calcular ganhos ou perdas em vendas, a prática contabilística preserva o custo original ao não registar declínios de valor na conta que contém a compra original ou o custo de construção.
+      <para>A prática contabilística aceite é a de registar o custo do edifício determinado no momento da
+        transferência de propriedade (compra) ou na conclusão de todos os custos de construção.
+        Porque os edifícios são frequentemente utilizados durante décadas e devido à necessidade
+        de poder calcular ganhos ou perdas em vendas, a prática contabilística preserva o custo
+        original ao não registar declínios de valor na conta que contém a compra original ou o
+        custo de construção.
       </para>
 
-      <para>Em vez disso, a técnica de depreciação é utilizada para mostrar (no balanço) o valor líquido da estrutura (custo original menos a depreciação acumulada). A depreciação é um tópico tratado noutro local deste guia.
+      <para>Em vez disso, a técnica de depreciação é utilizada para mostrar (no balanço) o valor líquido
+        da estrutura (custo original menos a depreciação acumulada). A depreciação é um tópico
+        tratado noutro local deste guia.
       </para>
     </sect2>
 
     <sect2 id="accts-oa15">
       <title>Melhorias em arrendamentos</title>
 
-      <para>Quando uma empresa não é proprietária do edifício onde opera e, em vez disso tem um arrendamento a longo prazo, não é raro que o arrendatário empresarial faça melhorias nas instalações de modo a obter tanto a funcionalidade como a aparência que melhora a condução dos seus negócios e actividades.
+      <para>Quando uma empresa não é proprietária do edifício onde opera e, em vez disso tem um arrendamento
+        a longo prazo, não é raro que o arrendatário empresarial faça melhorias nas
+        instalações de modo a obter tanto a funcionalidade como a aparência que melhora a
+        condução dos seus negócios e actividades.
       </para>
 
-      <para>Nestes casos, as despesas em que a empresa incorre são registadas numa conta Melhorias em arrendamentos: aumentar (débito) Melhorias em arrendamentos, diminuir (crédito) Banco ou aumentar
-        (crédito) uma conta de passivo adequada (que poderia ser um passivo para um contratante, um banco
-        ou um cartão de crédito, etc.).
+      <para>Nestes casos, as despesas em que a empresa incorre são registadas numa conta Melhorias em
+        arrendamentos: aumentar (débito) Melhorias em arrendamentos, diminuir (crédito) Banco ou
+        aumentar (crédito) uma conta de passivo adequada (que poderia ser um passivo para um
+        contratante, um banco ou um cartão de crédito, etc.).
       </para>
     </sect2>
 
     <sect2 id="accts-oa16">
       <title>Veículos ou equipamento</title>
 
-      <para>Os veículos ou equipamentos de todos os tipos duram geralmente vários anos, mas as suas vidas úteis são muito mais curtas do que o dos activos que têm pouco movimento no seu funcionamento. Porque eles se desgatam ao longo do tempo, a prática contabilística comum nos negócios é registar a depreciação usando duração e métodos de depreciação adequados à natureza e à utilização do bem. Frequentemente, a vida útil e os métodos de depreciação escolhidos são influenciados pelo que é permitido por regulamentos fiscais nacionais para o tipo de bens que estão a ser depreciados.
+      <para>Os veículos ou equipamentos de todos os tipos duram geralmente vários anos, mas as suas vidas
+        úteis são muito mais curtas do que o dos activos que têm pouco movimento no seu
+        funcionamento. Porque eles se desgatam ao longo do tempo, a prática contabilística comum
+        nos negócios é registar a depreciação usando duração e métodos de depreciação
+        adequados à natureza e à utilização do bem. Frequentemente, a vida útil e os métodos
+        de depreciação escolhidos são influenciados pelo que é permitido por regulamentos
+        fiscais nacionais para o tipo de bens que estão a ser depreciados.
       </para>
 
-      <para>Normalmente, as empresas depreciam os seus activos. Os indivíduos também o podem fazer, na medida em que a tributação e as autoridades o autorizam. Pessoas muito abastadas empregam contabilistas e advogados para acompanhar e gerir os seus investimentos e participações patrimoniais para tirar partido de todos os benefícios fiscais permitidos por lei.
+      <para>Normalmente, as empresas depreciam os seus activos. Os indivíduos também o podem fazer, na medida
+        em que a tributação e as autoridades o autorizam. Pessoas muito abastadas empregam
+        contabilistas e advogados para acompanhar e gerir os seus investimentos e participações
+        patrimoniais para tirar partido de todos os benefícios fiscais permitidos por lei.
       </para>
     </sect2>
 
     <sect2 id="accts-oa17">
       <title>Incorpóreos</title>
 
-      <para>Os mecanismos de contabilidade (débito e crédito de contas apropriadas) para estes activos são relativamente simples, muito parecidos com qualquer dos activos acima referidos. Onde reside a dificuldade é na sua avaliação, que é um tema avançado e não algo que as pessoas individualmente e as pequenas empresas provavelmente encontrariam. Por essa razão, a discussão de itens tais como patentes, direitos de autor, boa vontade, etc., são deixados de fora deste guia.
+      <para>Os mecanismos de contabilidade (débito e crédito de contas apropriadas) para estes activos são
+        relativamente simples, muito parecidos com qualquer dos activos acima referidos. Onde reside
+        a dificuldade é na sua avaliação, que é um tema avançado e não algo que as pessoas
+        individualmente e as pequenas empresas provavelmente encontrariam. Por essa razão, a
+        discussão de itens tais como patentes, direitos de autor, boa vontade, etc., são deixados
+        de fora deste guia.
       </para>
     </sect2>
   </sect1>
diff --git a/pt/guide/ch_oview.xml b/pt/guide/ch_oview.xml
index a45f08af..19097ea7 100644
--- a/pt/guide/ch_oview.xml
+++ b/pt/guide/ch_oview.xml
@@ -38,12 +38,14 @@
 
     <figure pgwide="1">
       <title>Árvore de contas do &app; - exemplo</title>
+
       <screenshot id="oview-intro">
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/oview_intro.png" 
                srccredit="Pedro Albuquerque"/>
           </imageobject>
+
           <caption>
             <para>Esta imagem mostra uma árvore de contas com múltiplas moedas e investimentos.
             </para>
@@ -67,8 +69,8 @@
 
       <para>Dentro de alguns minutos estará capaz de inserir as informações sobre as suas finanças pessoais
         e gerar gráficos coloridos que representam o seu estado financeiro. Se consegue usar o
-        papel do seu livro de cheques, consegue usar o &app;! Digite directamente nos diários, salte
-        entre campos e aproveite o preenchimento rápido para completar automaticamente as
+        papel do seu livro de cheques, consegue usar o &app;! Digite directamente nos diários,
+        salte entre campos e aproveite o preenchimento rápido para completar automaticamente as
         transacções. O ambiente é personalizável de dentro da aplicação.
       </para>
 
@@ -88,10 +90,10 @@
 
         <listitem>
           <para><emphasis>Métodos de importação</emphasis>: o &app; suporta muitas formas de introduzir
-            transacções, além da manual. Se pode aceder ao seu banco online, isto é especialmente
-            útil, dado que a maioria dos bancos e companhias de cartões de crédito suportam um
-            dos seguintes métodos de importação. Perderá menos tempo a inserir dados e terá
-            mais tempo para analizar resultados.
+            transacções, além da manual. Se pode aceder ao seu banco online, isto é
+            especialmente útil, dado que a maioria dos bancos e companhias de cartões de crédito
+            suportam um dos seguintes métodos de importação. Perderá menos tempo a inserir dados
+            e terá mais tempo para analizar resultados.
           </para>
 
           <itemizedlist>
@@ -151,10 +153,10 @@
           <para><emphasis>Compatibilidade multi-plataforma</emphasis>: o &app; é suportado numa variedade de
             plataformas e sistemas operativos. A lista de sistemas operativos (e plataformas) para o
             &app; &vers-stable; é: &lin; (x86, x86_64), FreeBSD (x86, x86_64), OpenBSD (x86,
-            x86_64), &mac; (Intel) e &win;. Sabe-se que versões prévias do &app; trabalharam com SGI
-            IRIX (MIPS), IBM AIX 4.1.5, (RS/6000), Unixware 7 (Intel), SCO OpenServer 5.0.4 (Intel),
-            e Solaris (SPARC), mas actualmente desconhece-se o seu estado. E claro que inclui o
-            Windows.
+            x86_64), &mac; (Intel) e &win;. Sabe-se que versões prévias do &app; trabalharam com
+            SGI IRIX (MIPS), IBM AIX 4.1.5, (RS/6000), Unixware 7 (Intel), SCO OpenServer 5.0.4
+            (Intel), e Solaris (SPARC), mas actualmente desconhece-se o seu estado. E claro que
+            inclui o Windows.
           </para>
         </listitem>
       </itemizedlist>
@@ -222,8 +224,8 @@
       <itemizedlist>
         <listitem>
           <para><emphasis>Contas cobráveis/pagáveis</emphasis>: o &app; tem um sistema integrado de contas
-            cobráveis e pagáveis. Pode controlar Clientes, Fornecedores, Facturação, Pagamentos e
-            usar diferentes impostos e condições de pagamento num pequeno negócio.
+            cobráveis e pagáveis. Pode controlar Clientes, Fornecedores, Facturação, Pagamentos
+            e usar diferentes impostos e condições de pagamento num pequeno negócio.
           </para>
         </listitem>
 
@@ -257,8 +259,8 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>Transacções com parcelas</emphasis>: uma única transacção pode ser dividida em várias
-            partes, para registar impostos, taxas e outras entradas compostas.
+          <para><emphasis>Transacções com parcelas</emphasis>: uma única transacção pode ser dividida em
+            várias partes, para registar impostos, taxas e outras entradas compostas.
           </para>
         </listitem>
 
@@ -443,7 +445,6 @@
           <para><xref linkend="ch_python_bindings"></xref>
           </para>
         </listitem>
-
 <!--        <listitem>
           <para><xref linkend="ch_import_bus_data"></xref>
           </para>
@@ -458,7 +459,8 @@
     <itemizedlist>
       <listitem>
         <para><xref linkend="appendixa"></xref> - guia para antigos utilizadores de
-          <trademark class="registered">Quicken</trademark>, MS Money ou outros utilizadores <acronym>QIF</acronym>
+          <trademark class="registered">Quicken</trademark>, MS Money ou outros utilizadores
+          <acronym>QIF</acronym>
         </para>
       </listitem>
 
diff --git a/pt/guide/ch_python_bindings.xml b/pt/guide/ch_python_bindings.xml
index 4db3e081..e8023a41 100644
--- a/pt/guide/ch_python_bindings.xml
+++ b/pt/guide/ch_python_bindings.xml
@@ -15,19 +15,32 @@ Translators:
 <chapter id="ch_python_bindings">
   <title>Associações Python</title>
 
-  <para>O &app; historicamente foi sempre uma aplicação tradicional, no sentido em que a abre, a utiliza para manipular os seus dados financeiros através das janelas disponíveis, guarda os seus dados e fecha as janelas novamente. Isto tem a limitação inerente de só se poder fazer o que quer que seja que as janelas, menus e barras de ferramentas lhe permitem fazer.
+  <para>O &app; historicamente foi sempre uma aplicação tradicional, no sentido em que a abre, a utiliza
+    para manipular os seus dados financeiros através das janelas disponíveis, guarda os seus dados
+    e fecha as janelas novamente. Isto tem a limitação inerente de só se poder fazer o que quer
+    que seja que as janelas, menus e barras de ferramentas lhe permitem fazer.
   </para>
 
-  <para>Por vezes pode ser necessária um pouco mais de flexibilidade. Por exemplo, precisa de um relatório com apenas um pouco mais de informação do que os relatórios incorporados fornecem, ou pretende automatizar uma acção frequentemente recorrente. Tais manipulações personalizadas são candidatos ideais para escrever numa ou
-    noutra linguagem de scripting.
+  <para>Por vezes pode ser necessária um pouco mais de flexibilidade. Por exemplo, precisa de um relatório
+    com apenas um pouco mais de informação do que os relatórios incorporados fornecem, ou
+    pretende automatizar uma acção frequentemente recorrente. Tais manipulações personalizadas
+    são candidatos ideais para escrever numa ou noutra linguagem de scripting.
   </para>
 
-  <para>A partir do &app; versão 2.4 pode escrever micro-programas em 
-    <ulink url="&url-wp-en;Python_(programming_language)">&app-py;</ulink> para manipular os seus dados financeiros.
+  <para>A partir do &app; versão 2.4 pode escrever micro-programas em
+    <ulink url="&url-wp-en;Python_(programming_language)">&app-py;</ulink> para manipular os seus
+    dados financeiros.
   </para>
 
   <important>
-    <para>As extensões &app-py; são uma característica opcional que cria dependências adicionais. Para poder usar programas em &app-py;, o &app; tem de ter sido compilado com a opção <code language="sh">cmake -DWITH_PYTHON=ON …</code> activa, caso contrário tudo o que se segue não funciona. Actualmente, esta opção não está activada por predefinição, por isso, se precisar disto, poderá ter de compilar o &app; da própria fonte. Mas algumas distribuições oferecem-na também como um pacote separado com um nome como<package>python[<replaceable>versão</replaceable>]-&appname;
+    <para>As extensões &app-py; são uma característica opcional que cria dependências adicionais. Para
+      poder usar programas em &app-py;, o &app; tem de ter sido compilado com a opção
+      <code language="sh">cmake -DWITH_PYTHON=ON …</code> activa, caso contrário tudo o que se
+      segue não funciona. Actualmente, esta opção não está activada por predefinição, por
+      isso, se precisar disto, poderá ter de compilar o &app; da própria fonte. Mas algumas
+      distribuições oferecem-na também como um pacote separado com um nome como
+      <package>
+        python[<replaceable>versão</replaceable>]-&appname;
       </package>
     </para>
   </important>
diff --git a/pt/guide/ch_txns.xml b/pt/guide/ch_txns.xml
index 3bb90052..946f5a5e 100644
--- a/pt/guide/ch_txns.xml
+++ b/pt/guide/ch_txns.xml
@@ -57,10 +57,10 @@
   <sect1 id="txns-register-oview">
     <title>O diário de conta</title>
 
-    <para>O <emphasis>diário de conta</emphasis> é a janela do &app;, que lhe permite ver e editar transacções
-      pré-existentes, ou adicionar novas transacções numa conta em particular. Para abrir um
-      diário de conta a partir da árvore de contas, faça um duplo clique no nome da conta, clique
-      com o botão direito no nome e seleccione
+    <para>O <emphasis>diário de conta</emphasis> é a janela do &app;, que lhe permite ver e editar
+      transacções pré-existentes, ou adicionar novas transacções numa conta em particular. Para
+      abrir um diário de conta a partir da árvore de contas, faça um duplo clique no nome da
+      conta, clique com o botão direito no nome e seleccione
       <menuchoice>
         <guimenu>Abrir conta</guimenu>
       </menuchoice>
@@ -87,9 +87,9 @@
       <title>Escolher um estilo de diário</title>
 
       <para>O &app; oferece várias opções para ver os diários. O estilo predefinido é <guilabel>Livro
-        razão básico</guilabel>, que mostra só o sumário das parcelas que afectam a conta actual.
-        Este é o estilo que mais se parece com outros pacotes de gestão populares. Pode escolher
-        um estilo de diário diferente indo a
+        razão básico</guilabel>, que mostra só o sumário das parcelas que afectam a conta
+        actual. Este é o estilo que mais se parece com outros pacotes de gestão populares. Pode
+        escolher um estilo de diário diferente indo a
         <menuchoice>
           <guimenu>Ver</guimenu>
         </menuchoice>
@@ -131,8 +131,8 @@
         transacções.
       </para>
 
-      <para>Para este exemplo, imaginemos que comprou três pares de calças de ganga por 1,000 €; e
-        registou a compra como uma transacção com parcelas, com cada par numa parcela.
+      <para>Para este exemplo, imaginemos que comprou três pares de calças de ganga por 1,000 €; e registou
+        a compra como uma transacção com parcelas, com cada par numa parcela.
       </para>
 
       <para>Estas imagens ilustram as diferenças entre os modos.
@@ -143,16 +143,19 @@
 
       <figure pgwide="1">
         <title>Compra de 3 pares de calças</title>
+
         <screenshot id="txns-registersplit4">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_registersplit4.png"
                   srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_registersplit4.png"
                   srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra uma transacção com parcelas de compra de calças
               </para>
@@ -166,16 +169,19 @@
 
       <figure pgwide="1">
         <title>Um salto até à conta <emphasis>Despesas:Roupa</emphasis></title>
+
         <screenshot id="txns-registersplit5">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_registersplit5.png"
                   srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_registersplit5.png"
                   srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra a conta <emphasis>Despesas:Roupa</emphasis> em modo Livro razão básico.
               </para>
@@ -195,16 +201,19 @@
 
       <figure pgwide="1">
         <title>Um salto até à conta <emphasis>Despesas:Roupa</emphasis></title>
+
         <screenshot id="txns-registersplit6">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_registersplit6.png"
                   srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_registersplit6.png"
                   srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra a conta <emphasis>Despesas:Roupa</emphasis> em modo Diário de transacções.
               </para>
@@ -226,12 +235,13 @@
         partir da sua lista de contas. Também o ajuda a inserir sub-contas nestes campos: digite os
         primeiros caracteres da conta-mãe, seguidos de <keycap>:</keycap> (dois pontos) [ou o
         carácter que escolheu como separador de contas] e os primeiros caracteres do nome da
-        sub-conta. Por exemplo, para inserir <emphasis>Activo:Conta à ordem</emphasis>, pode digitar
-        <userinput>A:C</userinput> e deixar o &app; fazer o resto.
+        sub-conta. Por exemplo, para inserir <emphasis>Activo:Conta à ordem</emphasis>, pode
+        digitar <userinput>A:C</userinput> e deixar o &app; fazer o resto.
       </para>
 
       <warning>
-        <para>Por <keycap>:</keycap> ser o símbolo de separacção de contas, não o pode usar nos nomes de conta.
+        <para>Por <keycap>:</keycap> ser o símbolo de separacção de contas, não o pode usar nos nomes de
+          conta.
         </para>
       </warning>
 
@@ -293,16 +303,19 @@
         <keycap>-</keycap> decrementa-o. Isto também funciona no campo <guilabel>Acção</guilabel>
         da linha da parcela, se escolher inserir números de parcela aí. O campo
         <guilabel>Acção</guilabel> também suporta preenchimento rápido - se digitar os primeiros
-        caracteres de uma acção comum (tal como <guilabel>Depósito</guilabel>), o &app; preenche o
-        resto.
+        caracteres de uma acção comum (tal como <guilabel>Depósito</guilabel>), o &app; preenche
+        o resto.
       </para>
 
       <para>O campo <guilabel>Transferência</guilabel> suporta o preenchimento rápido dos nomes de conta. Pode
         começar a escrever o nome da conta e o &app; preenche o que falta. Digitar o carácter
         separador a qualquer altura completa o nome de conta no nível actual, deixando o cursor
         posicionado no início do nome da próxima sub-conta. Por exemplo, se escrever
-        <keycombo action='seq'><keycap>A</keycap><keycap>:</keycap><keycap>C</keycap></keycombo>, será completado para <emphasis>Activos:Conta à ordem</emphasis>.
-        Também pode usar as combinações <keycap>Menu</keycap> ou
+        <keycombo action='seq'>
+          <keycap>A</keycap><keycap>:</keycap><keycap>C</keycap>
+        </keycombo>
+        , será completado para <emphasis>Activos:Conta à ordem</emphasis>. Também pode usar as
+        combinações <keycap>Menu</keycap> ou
         <keycombo>
           <keycap>Ctrl</keycap><keycap>Seta abaixo</keycap>
         </keycombo>
@@ -322,8 +335,8 @@
         <keycombo>
           <keycap>Alt</keycap><keycap>A</keycap>
         </keycombo>
-        abre o menu Acções, seguido de <keycap>P</keycap> divide a transacção. Alguns dos itens de
-        menu têm ainda atalhos que chamam o comando directamente (tipicamente usando
+        abre o menu Acções, seguido de <keycap>P</keycap> divide a transacção. Alguns dos itens
+        de menu têm ainda atalhos que chamam o comando directamente (tipicamente usando
         <keycap>Ctrl</keycap>). Estes atalhos estão listados a seguir ao item.
       </para>
 
@@ -420,30 +433,33 @@
       transacção</emphasis>. Contém uma <guilabel>data</guilabel>, um <guilabel>nº</guilabel>
       opcional (tal como um número de cheque), uma <guilabel>descrição</guilabel>, o montante
       total que afecta a conta actual (<guilabel>Tot Crédito</guilabel> aqui) e
-      <guilabel>saldo</guilabel> actualizado após a transacção actual. Note que na vista expandida,
-      o cabeçalho da coluna <guilabel>Transferência</guilabel> desaparece e não há nome de conta
-      nesse campo. Esta linha mostra-lhe só um sumário do efeito da transacção na conta actual.
-      Para obter informação mais detalhada, tem de ver as parcelas individuais que constituem a
-      transacção.
+      <guilabel>saldo</guilabel> actualizado após a transacção actual. Note que na vista
+      expandida, o cabeçalho da coluna <guilabel>Transferência</guilabel> desaparece e não há
+      nome de conta nesse campo. Esta linha mostra-lhe só um sumário do efeito da transacção na
+      conta actual. Para obter informação mais detalhada, tem de ver as parcelas individuais que
+      constituem a transacção.
     </para>
 
-    <para>As linhas parciais abaixo da linha de transacção são as <emphasis>linhas de parcelas</emphasis>, e
-      são separadas por linhas cinzentas. Quando puser em foco uma dessas linhas de parcelas, os
+    <para>As linhas parciais abaixo da linha de transacção são as <emphasis>linhas de parcelas</emphasis>,
+      e são separadas por linhas cinzentas. Quando puser em foco uma dessas linhas de parcelas, os
       cabeçalhos de colunas alteram-se para mostrar os campos relacionados com as parcelas:
     </para>
 
     <figure pgwide="1">
       <title>Como se alteram os cabeçalhos das parcelas</title>
+
       <screenshot id="txns-registersplit2">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_registersplit2.png"
               srccredit="Pedro Albuquerque" width="&img-w;"/>
           </imageobject>
-           <imageobject role="fo">
+
+          <imageobject role="fo">
             <imagedata fileref="figures/txns_registersplit2.png"
               srccredit="Pedro Albuquerque"/>
           </imageobject>
+
           <caption>
             <para>Esta imagem mostra como se alteram os cabeçalhos das colunas.
             </para>
@@ -478,16 +494,19 @@
 
     <figure pgwide="1">
       <title>Um salto até à conta <emphasis>Receitas:Ordenado</emphasis></title>
+
       <screenshot id="txns-registersplit3">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_registersplit3.png"
               srccredit="Pedro Albuquerque" width="&img-w;"/>
           </imageobject>
+
           <imageobject role="fo">
             <imagedata fileref="figures/txns_registersplit3.png"
               srccredit="Pedro Albuquerque"/>
           </imageobject>
+
           <caption>
             <para>Esta imagem mostra um salto até à conta <emphasis>Receitas:Ordenado</emphasis>.
             </para>
@@ -508,8 +527,8 @@
 
       <para>Começando com a árvore de contas que criámos no capítulo anterior,
         <filename>gcashdata_3</filename>, faça duplo clique em <guilabel>Conta à ordem</guilabel>.
-        Vamos adicionar uma transacção simples a esta conta. Quando primeiro cria as suas contas no
-        &app;, é habitual começar com um saldo inicial.
+        Vamos adicionar uma transacção simples a esta conta. Quando primeiro cria as suas contas
+        no &app;, é habitual começar com um saldo inicial.
       </para>
 
       <para>Na primeira linha da transacção, insira uma data (ex: 1 de Janeiro de 2006), uma descrição (ex:
@@ -521,16 +540,19 @@
 
       <figure pgwide="1">
         <title>O diário da conta à ordem</title>
+
         <screenshot id="txns-register-2account">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_register_2account.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_register_2account.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra o diário de <emphasis>Activos:Conta à ordem</emphasis> após inserir uma
                 transacção de valor inicial.
@@ -545,24 +567,27 @@
         <emphasis>Capital próprio:Saldo inicial</emphasis>.
       </para>
 
-      <para>Como outro exemplo de uma transacção simples afectando só duas contas, adicione outra transacção
-        para descrever a compra de mercearias no valor de 45.21€;. Dentro da conta
+      <para>Como outro exemplo de uma transacção simples afectando só duas contas, adicione outra
+        transacção para descrever a compra de mercearias no valor de 45.21€;. Dentro da conta
         <emphasis>Activos:Conta à ordem</emphasis>, defina <guilabel>Transferência</guilabel> para
         <emphasis>Despesas:Comida</emphasis>. O diário de conta deve agora parecer-se com:
       </para>
 
       <figure pgwide="1">
         <title>O diário da conta à ordem</title>
+
         <screenshot id="txns-register-2account2">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_register_2account2.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_register_2account2.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra o diário de <emphasis>Activos:Conta à ordem</emphasis> após adicionar uma
                 transacção para compra de mercearias.
@@ -613,29 +638,33 @@
         montante a depositar (ex: 670€;). Continue a inserir os vários montantes para impostos:
         conta <emphasis>Despesas:Impostos:IRS</emphasis>, 180€;; conta
         <emphasis>Despesas:Impostos:Segurança Social</emphasis>, $90€;; e conta
-        <emphasis>Despesas:Impostos:Seguro</emphasis>, $60€;. Finalmente, insira o valor bruto
-        do cheque ($1,000€; neste exemplo) como levantamento da conta
+        <emphasis>Despesas:Impostos:Seguro</emphasis>, $60€;. Finalmente, insira o valor bruto do
+        cheque ($1,000€; neste exemplo) como levantamento da conta
         <emphasis>Receitas:Ordenado</emphasis>.
       </para>
 
       <para>A divisão final deverá parecer-se com <xref linkend="txns-register-multiaccount"/>. Lembre-se de
         premir <keycap function="enter">Enter</keycap> quando terminar a introdução. Mas também
         deve saber que quando prime <keycap function="enter">Enter</keycap>, as parcelas serão
-        <quote>dobradas</quote> numa vista de transacção simples. As parcelas ainda lá estão, só
-        tem de clicar em <guilabel>Parcelas</guilabel> para as ver. Veja
+        <quote>dobradas</quote> numa vista de transacção simples. As parcelas ainda lá estão,
+        só tem de clicar em <guilabel>Parcelas</guilabel> para as ver. Veja
         <xref linkend="txns-registers-features2"/> para mais detalhes.
       </para>
 
       <figure id="txns-register-multiaccount">
-        <title>Inserir uma transacção com parcelas</title><mediaobject>
+        <title>Inserir uma transacção com parcelas</title>
+
+        <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_register_multiaccount.png"
                        srccredit="Pedro Albuquerque" width="&img-w;"/>
           </imageobject>
+
           <imageobject role="fo">
             <imagedata fileref="figures/txns_register_multiaccount.png"
                        srccredit="Pedro Albuquerque"/>
           </imageobject>
+
           <textobject>
             <phrase>Diário de conta - transacção com parcelas</phrase>
           </textobject>
@@ -671,24 +700,24 @@
       tem na conta, enquanto o último inclui transacções pendentes.
     </para>
 
-    <para>Por exemplo, quando passa um cheque, deve inserir a transacção no &app;. O campo de reconciliação
-      <guilabel>R</guilabel> da transacção conterá inicialmente <guilabel>nc</guilabel> (não
-      confirmada).A sua nova entrada vai contribuir para o saldo <guilabel>Futuro</guilabel>, mas
-      não para os saldos <guilabel>Confirmado</guilabel> e <guilabel>Reconciliado</guilabel>. Mais
-      tarde, se obteve confirmação que o cheque foi cobrado, pode clicar no campo
-      <guilabel>R</guilabel> para o alterar para <emphasis>c</emphasis> (confirmado). Ao fazer isto,
-      o saldo <guilabel>Confirmado</guilabel> altera-se para incluir esse montante. Quando chegar o
-      extracto do banco, poderá compará-lo com o que registou no &app;, abrindo a janela de
-      reconciliação. Aí, poderá alterar o campo <guilabel>R</guilabel> para
-      <emphasis>r</emphasis> (reconciliada).
+    <para>Por exemplo, quando passa um cheque, deve inserir a transacção no &app;. O campo de
+      reconciliação <guilabel>R</guilabel> da transacção conterá inicialmente
+      <guilabel>nc</guilabel> (não confirmada).A sua nova entrada vai contribuir para o saldo
+      <guilabel>Futuro</guilabel>, mas não para os saldos <guilabel>Confirmado</guilabel> e
+      <guilabel>Reconciliado</guilabel>. Mais tarde, se obteve confirmação que o cheque foi
+      cobrado, pode clicar no campo <guilabel>R</guilabel> para o alterar para
+      <emphasis>c</emphasis> (confirmado). Ao fazer isto, o saldo <guilabel>Confirmado</guilabel>
+      altera-se para incluir esse montante. Quando chegar o extracto do banco, poderá compará-lo
+      com o que registou no &app;, abrindo a janela de reconciliação. Aí, poderá alterar o campo
+      <guilabel>R</guilabel> para <emphasis>r</emphasis> (reconciliada).
     </para>
 
     <note>
       <para>Não pode reconciliar directamente numa janela de diário simplesmente clicando no campo
-        <emphasis>R</emphasis>. Tem de usar a janela de reconciliação. Uma vez que uma transacção
-        esteja marcada como <emphasis>reconciliada</emphasis>, já não pode ser facilmente alterada
-        sem quebrar o <link linkend="rec-start-blnc"><guilabel>Saldo inicial</guilabel></link> da
-        próxima reconciliação.
+        <emphasis>R</emphasis>. Tem de usar a janela de reconciliação. Uma vez que uma
+        transacção esteja marcada como <emphasis>reconciliada</emphasis>, já não pode ser
+        facilmente alterada sem quebrar o <link linkend="rec-start-blnc"><guilabel>Saldo
+        inicial</guilabel></link> da próxima reconciliação.
       </para>
     </note>
 
@@ -705,9 +734,9 @@
       <title>Janelas de reconciliação</title>
 
       <para>As janelas de reconciliação são usadas para reconciliar uma conta do &app; com um extracto que um
-        banco ou outra instituição financeira lhe enviou. A reconciliação é útil, não só para
-        verificar duplamente os seus registos com os do banco, mas também para ter uma melhor ideia
-        do que ainda tem pendente, por exemplo, cheques não cobrados.
+        banco ou outra instituição financeira lhe enviou. A reconciliação é útil, não só
+        para verificar duplamente os seus registos com os do banco, mas também para ter uma melhor
+        ideia do que ainda tem pendente, por exemplo, cheques não cobrados.
       </para>
 
       <para>Para usar as janelas de reconciliação, seleccione uma conta da árvore de contas e clique em
@@ -720,12 +749,14 @@
 
       <figure pgwide="1">
         <title>Janela Reconciliar</title>
+
         <screenshot id="txns-reconcile-window-1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_reconcile_window1.png"
                            srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>A janela inicial de reconciliação.
               </para>
@@ -807,8 +838,8 @@
             </para>
 
             <note>
-              <para>O &app; preenche automaticamente este campo com o saldo <guilabel>Actual</guilabel> mostrado na parte
-                inferior do diário da conta.
+              <para>O &app; preenche automaticamente este campo com o saldo <guilabel>Actual</guilabel> mostrado na
+                parte inferior do diário da conta.
               </para>
             </note>
           </listitem>
@@ -829,8 +860,8 @@
           <term><guibutton>Inserir pagamento de juros</guibutton></term>
 
           <listitem>
-            <para>Clicar neste botão abre uma nova janela que lhe permite inserir uma transacção de juros na conta a
-              ser reconciliada.
+            <para>Clicar neste botão abre uma nova janela que lhe permite inserir uma transacção de juros na conta
+              a ser reconciliada.
             </para>
 
             <tip>
@@ -842,9 +873,9 @@
                 este comportamento, para qualquer uma das contas mencionadas, vá ao separador
                 <guilabel>Diário</guilabel> nas <guilabel>Preferências do &appname;</guilabel> e
                 desmarque a caixa <guilabel>Transferência automática de juros</guilabel>. Em
-                alternativa, para desactivar este comportamento só para a conta seleccionada, clique
-                em <guibutton>Sem pagamento automático de juros nesta conta</guibutton> na janela
-                <guilabel>Inserir pagamento de juros</guilabel>.
+                alternativa, para desactivar este comportamento só para a conta seleccionada,
+                clique em <guibutton>Sem pagamento automático de juros nesta conta</guibutton> na
+                janela <guilabel>Inserir pagamento de juros</guilabel>.
               </para>
             </tip>
           </listitem>
@@ -857,6 +888,7 @@
 
       <figure pgwide="1">
         <title>A lista de transacções na janela de reconciliação</title>
+
         <screenshot id="txns-reconcile-window-2">
           <mediaobject>
             <imageobject>
@@ -899,8 +931,8 @@
       </para>
 
       <para>Se os montantes concordam, clique no item na janela <guilabel>Reconciliar</guilabel>. Surge uma
-        marca na coluna <guilabel>R</guilabel> ao lado da transacção seleccionada. O &app; actualiza
-        automaticamente os montantes no painel de sumário inferior direito.
+        marca na coluna <guilabel>R</guilabel> ao lado da transacção seleccionada. O &app;
+        actualiza automaticamente os montantes no painel de sumário inferior direito.
       </para>
 
       <tip>
@@ -917,8 +949,8 @@
 
       <para>Ao fundo da janela <guilabel>Reconciliar</guilabel> há um campo <guilabel>Diferença</guilabel>,
         que deverá mostrar <guilabel>0.00</guilabel> quando terminar a reconciliação. Se mostrar
-        qualquer outro valor, ou falhou transacções ou alguns montantes estão incorrectos no &app;
-        (ou, menos provável, o banco pode ter cometido um erro).
+        qualquer outro valor, ou falhou transacções ou alguns montantes estão incorrectos no
+        &app; (ou, menos provável, o banco pode ter cometido um erro).
       </para>
 
       <note>
@@ -944,7 +976,8 @@
           <guimenu>Reconciliar</guimenu> <guimenuitem>Terminar</guimenuitem>
         </menuchoice>
         no menu. A janela <guilabel>Reconciliar</guilabel> fecha-se. No diário de conta, o campo
-        <guilabel>R</guilabel> das transacções reconciliadas altera-se para <emphasis>r</emphasis>.
+        <guilabel>R</guilabel> das transacções reconciliadas altera-se para
+        <emphasis>r</emphasis>.
       </para>
 
       <para>Neste caso, ainda não recebemos toda a informação, portanto clicamos em
@@ -958,12 +991,14 @@
 
       <figure pgwide="1">
         <title>A conta à ordem após ter adiado a reconciliação</title>
+
         <screenshot id="txns-reconcile-window-3">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_reconcile_window3.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_reconcile_window3.png"
                          srccredit="Pedro Albuquerque"/>
@@ -984,8 +1019,8 @@
       ser criada e cria-a por si.
     </para>
 
-    <para>Neste Como fazer, vamos exemplificar com uma subscrição na Internet com o valor de 20€;, paga
-      a 29 de cada mês.
+    <para>Neste Como fazer, vamos exemplificar com uma subscrição na Internet com o valor de 20€;, paga a
+      29 de cada mês.
     </para>
 
     <para>No &app;, há duas maneiras de criar transacções agendadas, <link linkend="txns-sxn-ledger2">a
@@ -1003,13 +1038,15 @@
 
       <figure pgwide="1">
         <title>Primeiro passo para criar a transacção agendada a partir do diário</title>
+
         <screenshot id="txns-sxn-ledger-1">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_sxn_ledger1.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
-             <imageobject role="fo">
+
+            <imageobject role="fo">
               <imagedata fileref="figures/txns_sxn_ledger1.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
@@ -1028,12 +1065,14 @@
 
       <figure pgwide="1">
         <title>Segundo passo para criar a transacção agendada a partir do diário</title>
+
         <screenshot id="txns-sxn-ledger-2">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_sxn_ledger2.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_sxn_ledger2.png"
                          srccredit="Pedro Albuquerque"/>
@@ -1047,6 +1086,7 @@
 
       <figure pgwide="1">
         <title>Terceiro passo para criar a transacção agendada a partir do diário</title>
+
         <screenshot id="txns-sxn-ledger-3">
           <mediaobject>
             <imageobject>
@@ -1063,6 +1103,7 @@
 
       <figure pgwide="1">
         <title>Dados preenchidos numa transacção agendada</title>
+
         <screenshot id="txns-sxn-ledger-4">
           <mediaobject>
             <imageobject>
@@ -1098,6 +1139,7 @@
 
       <figure pgwide="1">
         <title>Separador <guilabel>Transacções agendadas</guilabel> vazio</title>
+
         <screenshot id="txns-sxn-editor-2">
           <mediaobject>
             <imageobject>
@@ -1115,7 +1157,8 @@
 
       <figure pgwide="1">
         <title>Separador <guilabel>Visão geral</guilabel> da janela <guilabel>Editar transacção
-                agendada</guilabel></title>
+          agendada</guilabel></title>
+
         <screenshot id="txns-sxn-editor-3-overview">
           <mediaobject>
             <imageobject>
@@ -1185,12 +1228,14 @@
         fim do empréstimo ou o número de ocorrências restantes.
       </para>
 
-      <para>Seleccione agora o separador <guilabel>Frequência</guilabel> na janela <guilabel>Editar transacção
-        agendada</guilabel>. Aqui pode definir as opções temporais da transacção.
+      <para>Seleccione agora o separador <guilabel>Frequência</guilabel> na janela <guilabel>Editar
+        transacção agendada</guilabel>. Aqui pode definir as opções temporais da transacção.
       </para>
 
       <figure pgwide="1">
-        <title>Separador <guilabel>Frequência</guilabel> da janela <guilabel>Editar transacção agendada</guilabel></title>
+        <title>Separador <guilabel>Frequência</guilabel> da janela <guilabel>Editar transacção
+          agendada</guilabel></title>
+
         <screenshot id="txns-sxn-editor-3-frequency">
           <mediaobject>
             <imageobject>
@@ -1236,8 +1281,8 @@
 
           <listitem>
             <para>Esta opção permite-lhe agendar transacções em múltiplos do valor no campo
-              <guilabel>Frequência</guilabel>. Por exemplo, para criar uma transacção que ocorre a
-              cada três semanas, defina <guilabel>Frequência</guilabel> para
+              <guilabel>Frequência</guilabel>. Por exemplo, para criar uma transacção que ocorre
+              a cada três semanas, defina <guilabel>Frequência</guilabel> para
               <guilabel>Semanalmente</guilabel> e <guilabel>Cada</guilabel> para
               <guilabel>3</guilabel>.
             </para>
@@ -1269,23 +1314,25 @@
         para indicar quando é que vão ocorrer as futuras transacções.
       </para>
 
-      <para>Finalmente, seleccione o separador <guilabel>Transacção modelo</guilabel> e insira a sua transacção
-        na parte inferior, tal como faria no diário de conta, com a única diferença de não ter
-        data.
+      <para>Finalmente, seleccione o separador <guilabel>Transacção modelo</guilabel> e insira a sua
+        transacção na parte inferior, tal como faria no diário de conta, com a única diferença
+        de não ter data.
       </para>
 
       <para>Deverá agora ter uma janela como esta:
       </para>
 
       <figure pgwide="1">
-        <title>Separador <guilabel>Transacção modelo</guilabel> da janela <guilabel>Editar
-              transacção agendada</guilabel></title>
+        <title>Separador <guilabel>Transacção modelo</guilabel> da janela <guilabel>Editar transacção
+          agendada</guilabel></title>
+
         <screenshot id="txns-sxn-editor-3-template">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_sxn_editor-3-template.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_sxn_editor-3-template.png"
                          srccredit="Pedro Albuquerque"/>
@@ -1294,7 +1341,8 @@
         </screenshot>
       </figure>
 
-      <para>Lembre-se de clicar no ícone <guibutton>Registar</guibutton>, para validar e inserir a transacção.
+      <para>Lembre-se de clicar no ícone <guibutton>Registar</guibutton>, para validar e inserir a
+        transacção.
       </para>
 
       <para>Clique em <guibutton>Aceitar</guibutton>, e voltará ao separador <guilabel>Transacções
@@ -1303,18 +1351,19 @@
 
       <figure pgwide="1">
         <title>Transacção agendada inserida</title>
+
         <screenshot id="txns-sxn-editor-4">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/txns_sxn_editor-4.png"
                          srccredit="Pedro Albuquerque" width="&img-w;"/>
             </imageobject>
-  
+
             <imageobject role="fo">
               <imagedata fileref="figures/txns_sxn_editor-4.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
-        </mediaobject>
+          </mediaobject>
         </screenshot>
       </figure>
 
@@ -1344,6 +1393,7 @@
 
       <figure pgwide="1">
         <title>Janela de lembretes de transacções agendadas</title>
+
         <screenshot id="txns-sxn-editor-slr">
           <mediaobject>
             <imageobject>
@@ -1404,12 +1454,14 @@
 
       <figure pgwide="1">
         <title>Ponto de partida para juntar as peças</title>
+
         <screenshot id="txns-puttoget1-Charts">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_puttoget_Charts.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra o ponto de partida desta secção.
               </para>
@@ -1425,14 +1477,14 @@
       <para>Tal como mostrado antes com a conta <emphasis>Activos:Conta à ordem</emphasis>, os saldos iniciais
         numa conta são tipicamente atribuídos a uma conta especial, chamada <emphasis>Capital
         próprio:Saldo inicial</emphasis>. Para começar a preencher esta árvore de contas, comece
-        por definir os saldos iniciais das contas. Assuma que tem 1000€; na conta de poupanças
-        e 500€; em dívida no cartão de crédito.
+        por definir os saldos iniciais das contas. Assuma que tem 1000€; na conta de poupanças e
+        500€; em dívida no cartão de crédito.
       </para>
 
       <orderedlist>
         <listitem>
-          <para>Abra o diário <emphasis>Activos:Conta poupança</emphasis>. Seleccione <guimenu>Ver</guimenu> no menu
-            e certifique-se que está no modo Livro razão básico. Terá de ver as suas
+          <para>Abra o diário <emphasis>Activos:Conta poupança</emphasis>. Seleccione <guimenu>Ver</guimenu> no
+            menu e certifique-se que está no modo Livro razão básico. Terá de ver as suas
             transacções noutros modos mais tarde, por agora vamos inserir uma transacção básica
             no modo básico predefinido.
           </para>
@@ -1475,12 +1527,14 @@
 
       <figure pgwide="1">
         <title>Árvore de contas após definir os saldos iniciais</title>
+
         <screenshot id="txns-puttoget1-Charts1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_puttoget_Charts1.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra os saldos iniciais.
               </para>
@@ -1494,10 +1548,10 @@
       <title>Exemplos adicionais de transacções</title>
 
       <para>Vamos agora adicionar mais algumas transacções para simular as despesas do mês. Durante o mês
-        gastou 78€; em electricidade, 45€; em telefone e 350€; em renda. Tudo pago com
-        cheque. Gastou ainda 45,21€; em mercearias, recebeu 670€; de ordenado e pagou a sua
-        subscrição mensal na Internet. Finalmente, tem de mover 100€; da conta poupança para
-        a conta à ordem.
+        gastou 78€; em electricidade, 45€; em telefone e 350€; em renda. Tudo pago com cheque.
+        Gastou ainda 45,21€; em mercearias, recebeu 670€; de ordenado e pagou a sua subscrição
+        mensal na Internet. Finalmente, tem de mover 100€; da conta poupança para a conta à
+        ordem.
       </para>
 
       <orderedlist>
@@ -1512,8 +1566,8 @@
 
         <listitem>
           <para>Abra o diário <emphasis>Activos:Conta à ordem</emphasis> e insira uma transacção simples entre
-            duas contas para pagar os 45€; da factura de telefone, com a data do final do mês
-            (no exemplo, 30-01-2016) e o número do cheque (ex: 103). Insira uma descrição (ex:
+            duas contas para pagar os 45€; da factura de telefone, com a data do final do mês (no
+            exemplo, 30-01-2016) e o número do cheque (ex: 103). Insira uma descrição (ex:
             Telefone fixo). A conta de <guilabel>Transferência</guilabel> deve ser
             <emphasis>Despesas:Telefone</emphasis>. Note que pode inserir transacções de despesa
             tanto do lado do crédito (as contas de despesa) como do lado do débito (as contas de
@@ -1523,19 +1577,19 @@
 
         <listitem>
           <para>Abra o diário <emphasis>Despesas:Renda</emphasis> e insira uma transacção simples entre duas
-            contas para pagar os 350€; da renda de casa, com a data do final do mês (no
-            exemplo, 30-01-2016) e o número do cheque (ex: 104). Insira uma descrição (ex: Renda
-            de Janeiro). A conta de <guilabel>Transferência</guilabel> deve ser
+            contas para pagar os 350€; da renda de casa, com a data do final do mês (no exemplo,
+            30-01-2016) e o número do cheque (ex: 104). Insira uma descrição (ex: Renda de
+            Janeiro). A conta de <guilabel>Transferência</guilabel> deve ser
             <emphasis>Activos:Conta à ordem</emphasis>.
           </para>
         </listitem>
 
         <listitem>
           <para>Duplique esta transacção, usando o botão <guibutton>Duplicar</guibutton> na <emphasis>barra de
-            ferramentas</emphasis>. Comece por seleccionar a transacção de renda actual e clique em
-            <guilabel>Duplicar</guilabel>. Insira a data da transacção algures no futuro (ex: 29 de
-            Março) e repare na linha azul que o &app; usa para separar transacções futuras de
-            transacções actuais. Assim pode inserir transacções antes de elas ocorrerem.
+            ferramentas</emphasis>. Comece por seleccionar a transacção de renda actual e clique
+            em <guilabel>Duplicar</guilabel>. Insira a data da transacção algures no futuro (ex:
+            29 de Março) e repare na linha azul que o &app; usa para separar transacções futuras
+            de transacções actuais. Assim pode inserir transacções antes de elas ocorrerem.
           </para>
 
           <para>Também pode configurar uma transacção agendada para pagar a renda de casa, uma vez que não se
@@ -1558,8 +1612,8 @@
         <listitem>
           <para>Para transferir dinheiro da sua conta de poupança para a conta à ordem, abra o diário
             <emphasis>Activos:Conta poupança</emphasis> e adicione uma nova transacção, definindo
-            <guilabel>Transferência</guilabel> para <emphasis>Activos:Conta à ordem</emphasis>, com
-            um montante de 100€; (com data de 1 de Janeiro de 2016).
+            <guilabel>Transferência</guilabel> para <emphasis>Activos:Conta à ordem</emphasis>,
+            com um montante de 100€; (com data de 1 de Janeiro de 2016).
           </para>
         </listitem>
 
@@ -1572,15 +1626,15 @@
         </listitem>
 
         <listitem>
-          <para>Para adicionar uma transacção de recebimento de ordenado, abra o diário <emphasis>Activos:Conta à
-            ordem</emphasis> clique numa linha em branco e clique em <guilabel>Parcelas</guilabel>.
-            Insira a descrição da transacção na primeira linha (ex: <quote>Ordenado</quote>),
-            assim como a data. Na linha de <quote>parcela</quote> abaixo desta, insira o depósito
-            nas contas <emphasis>Activos:Conta à ordem</emphasis> 670€;,
-            <emphasis>Despesas:Impostos:IRS</emphasis> 180€;,
+          <para>Para adicionar uma transacção de recebimento de ordenado, abra o diário <emphasis>Activos:Conta
+            à ordem</emphasis> clique numa linha em branco e clique em
+            <guilabel>Parcelas</guilabel>. Insira a descrição da transacção na primeira linha
+            (ex: <quote>Ordenado</quote>), assim como a data. Na linha de <quote>parcela</quote>
+            abaixo desta, insira o depósito nas contas <emphasis>Activos:Conta à ordem</emphasis>
+            670€;, <emphasis>Despesas:Impostos:IRS</emphasis> 180€;,
             <emphasis>Despesas:Impostos:Seguro</emphasis> 90€;,
-            <emphasis>Despesas:Impostos:Segurança social</emphasis> 60€; e por fim, o total
-            bruto do recebimento, 1000€; como levantamento transferido da conta
+            <emphasis>Despesas:Impostos:Segurança social</emphasis> 60€; e por fim, o total bruto
+            do recebimento, 1000€; como levantamento transferido da conta
             <emphasis>Receitas:Ordenado</emphasis>.
           </para>
         </listitem>
@@ -1593,12 +1647,14 @@
 
       <figure pgwide="1">
         <title>Árvore de contas após definir todas as transacções</title>
+
         <screenshot id="txns-puttoget2-Charts1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/txns_puttoget_Charts2.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
+
             <caption>
               <para>Esta imagem mostra os saldos finais após definir todas as <xref linkend="chapter_txns" /> do mês
                 de Janeiro de 2016.
@@ -1645,14 +1701,16 @@
             .
           </para>
 
-      <figure pgwide="1">
-        <title>Fluxo de caixa para o mês de Janeiro de 2016</title>
+          <figure pgwide="1">
+            <title>Fluxo de caixa para o mês de Janeiro de 2016</title>
+
             <screenshot id="txns-puttoget2-Cash">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/txns_CashFlow.png"
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o fluxo de caixa para as <xref linkend="chapter_txns" /> do mês de Janeiro de
                     2016.
@@ -1680,16 +1738,19 @@
             .
           </para>
 
-      <figure pgwide="1">
-        <title>Relatório de transacções da conta à ordem durante o mês de Janeiro de 2016</title>
+          <figure pgwide="1">
+            <title>Relatório de transacções da conta à ordem durante o mês de Janeiro de 2016</title>
+
             <screenshot id="txns-puttoget2-TransactionRptChecking">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/txns_TransactionRptChecking.png"
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
-                  <para>Esta imagem mostra o relatório de transacções da conta à ordem durante o mês de Janeiro de 2016.
+                  <para>Esta imagem mostra o relatório de transacções da conta à ordem durante o mês de Janeiro de
+                    2016.
                   </para>
                 </caption>
               </mediaobject>
@@ -1703,12 +1764,14 @@
 
           <figure pgwide="1">
             <title>Relatório de transacções das contas de despesas durante o mês de Janeiro de 2016</title>
+
             <screenshot id="txns-puttoget2-TransactionRptExpenses">
               <mediaobject>
                 <imageobject>
                   <imagedata fileref="figures/txns_TransactionRptExpenses.png"
                              srccredit="Pedro Albuquerque"/>
                 </imageobject>
+
                 <caption>
                   <para>Esta imagem mostra o relatório de transacções das contas de despesas durante o mês de Janeiro de
                     2016.
diff --git a/pt/guide/fdl-appendix.xml b/pt/guide/fdl-appendix.xml
index 99c69ea3..d3f93f71 100644
--- a/pt/guide/fdl-appendix.xml
+++ b/pt/guide/fdl-appendix.xml
@@ -573,9 +573,8 @@
     </para>
 
     <para>If your document contains nontrivial examples of program code, we recommend releasing these examples
-      in parallel under your choice of free software license, such as the
-      <ulink url="&url-gpl;">GNU General Public License</ulink>,
-      to permit their use in free software.
+      in parallel under your choice of free software license, such as the <ulink url="&url-gpl;">GNU
+      General Public License</ulink>, to permit their use in free software.
     </para>
   </sect1>
 </appendix>
diff --git a/pt/guide/index.docbook b/pt/guide/index.docbook
index e1c1d004..9b7785fc 100644
--- a/pt/guide/index.docbook
+++ b/pt/guide/index.docbook
@@ -82,451 +82,552 @@
         <revnumber>&appname; Tutorial e guia de conceitos 5.2</revnumber>
         <date>25 de junho 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 5.1</revnumber>
         <date>30 de abril de 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 5.0</revnumber>
         <date>29 de março de 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.14</revnumber>
         <date>29 de março de 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
-         <revnumber>&appname; Tutorial e guia de conceitos 4.903</revnumber>
+        <revnumber>&appname; Tutorial e guia de conceitos 4.903</revnumber>
         <date>12 de março de 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.900</revnumber>
         <date>8 de janiero de 2023</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.13</revnumber>
         <date>18 de dezembro de 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.12</revnumber>
         <date>25 de setembro de 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.11</revnumber>
         <date>26 de junho de 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.10</revnumber>
         <date>27 de março de 2022</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.9</revnumber>
         <date>19 de dezembro de 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.7</revnumber>
         <date>26 de setembro de 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.6</revnumber>
         <date>27 de junho de 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.5</revnumber>
         <date>28 de março de 2021</date>
         <revdescription>
-          <para role="author">Multiple authors</para>
-          <para role="publisher">&appname; Documentation Team</para>
-        </revdescription>
-      </revision>
-      <revision> <revnumber>&appname; Tutorial e guia de conceitos 4.4</revnumber>
-      <date>28 de dezembro de 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos 4.3</revnumber>
-      <date>27 de dezembro de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
-
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos 4.2</revnumber>
-      <date>27 de setembro de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
-
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos 4.1</revnumber>
-      <date>26 de julho de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
-
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos 4.0</revnumber>
-      <date>28 de junho de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
-
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v3.11</revnumber>
-      <date>28 de junho de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
-
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v3.10</revnumber>
-      <date>11 de abril de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
-
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v3.9</revnumber>
-      <date>29 de março de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
-
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos 4.4</revnumber>
+        <date>28 de dezembro de 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos 4.3</revnumber>
+        <date>27 de dezembro de 2020</date>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos 4.2</revnumber>
+        <date>27 de setembro de 2020</date>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos 4.1</revnumber>
+        <date>26 de julho de 2020</date>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos 4.0</revnumber>
+        <date>28 de junho de 2020</date>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v3.11</revnumber>
+        <date>28 de junho de 2020</date>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v3.10</revnumber>
+        <date>11 de abril de 2020</date>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v3.9</revnumber>
+        <date>29 de março de 2020</date>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v3.8</revnumber>
         <date>29 de dezembro de 2019</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v3.7</revnumber>
         <date>8 de setembro de 2019</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v3.6</revnumber>
         <date>30 de junho de 2019</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v3.1</revnumber>
         <date>28 de abril de 2018</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v3.0</revnumber>
         <date>1 de abril de 2018</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.6.20</revnumber>
         <date>1 de abril de 2018</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.6.16</revnumber>
         <date>26 de março de 2017</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.6.8</revnumber>
         <date>27 de setembro de 2015</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.6.7</revnumber>
         <date>28 de junho de 2015</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.6.3</revnumber>
         <date>30 de março de 2014</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.6.2</revnumber>
         <date>2 de março de 2014</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.6.1</revnumber>
         <date>26 de janeiro de 2014</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.6.0</revnumber>
         <date>29 de dezembro de 2013</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.4.2</revnumber>
         <date>17 de novembro de 2012</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.4.1</revnumber>
         <date>1 de julho de 2011</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.3.16</revnumber>
         <date>de novembro de 7, 2010</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
 
-        <para role="author">Bengt Thuree
-        </para>
+          <para role="author">Bengt Thuree
+          </para>
 
-        <para role="author">Dave Herman
-        </para>
+          <para role="author">Dave Herman
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v2.0.0</revnumber>
         <date>julho de 2006</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
 
-        <para role="author">Bengt Thuree
-        </para>
+          <para role="author">Bengt Thuree
+          </para>
 
-        <para role="author">Dave Herman
-        </para>
+          <para role="author">Dave Herman
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v1.8.3</revnumber>
         <date>agosto de 2003</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v1.8.2</revnumber>
         <date>agosto de 2003</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v1.8.1</revnumber>
         <date>maio de 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos v1.8.0</revnumber>
         <date>janeiro de 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; User Guide v1.6.5</revnumber>
         <date>junho de 2002</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>&appname; User Guide v1.6.0</revnumber>
         <date>outubro de 2001</date>
-      <revdescription>
-        <para role="author">Carol Champagne
-        </para>
+        <revdescription>
+          <para role="author">Carol Champagne
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
     </revhistory>
 
@@ -549,11 +650,14 @@
   <preface>
     <title>Sobre os autores</title>
 
-    <para>A equipa de documentação do GnuCash é um grupo auto-designado de utilizadores e programadores do GnuCash que se voluntariou para escrever esta documentação em benefício de uma base de utilizadores mais ampla. Pessoas que estejam interessadas em juntar-se a este grupo são encorajadas a manifestar o seu interesse nas listas de correio do GnuCash (gnucash-users e gnucash-devel) para uma melhor orientação.
+    <para>A equipa de documentação do GnuCash é um grupo auto-designado de utilizadores e programadores do
+      GnuCash que se voluntariou para escrever esta documentação em benefício de uma base de
+      utilizadores mais ampla. Pessoas que estejam interessadas em juntar-se a este grupo são
+      encorajadas a manifestar o seu interesse nas listas de correio do GnuCash (gnucash-users e
+      gnucash-devel) para uma melhor orientação.
     </para>
 
     <para>Os colaboradores da equipa até agora têm sido:
-      
       <author>
         <firstname>Yawar</firstname> <surname>Amin</surname>
       </author>
@@ -675,11 +779,9 @@
   <part>
     <title>Gerir as finanças da empresa</title>
 
-    <subtitle>Se tiver interesse em colaborar na
-      tradução, consulte
+    <subtitle>Se tiver interesse em colaborar na tradução, consulte
       <ulink url="&url-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>
-    </subtitle>
+      wiki: How to translate the GnuCash guide and/or help files</ulink></subtitle>
 
     <xi:include href="ch_bus_intro.xml" />
 
@@ -698,8 +800,7 @@
     <xi:include href="ch_dep.xml" />
 
     <xi:include href="ch_python_bindings.xml" />
-
-    <!--<xi:include href="ch_import_business_data.xml" />-->
+<!--<xi:include href="ch_import_business_data.xml" />-->
   </part>
 
   <part>
diff --git a/pt/manual/ch_Account-Actions.xml b/pt/manual/ch_Account-Actions.xml
index 4b3a8de5..d5bb4721 100644
--- a/pt/manual/ch_Account-Actions.xml
+++ b/pt/manual/ch_Account-Actions.xml
@@ -595,18 +595,18 @@
 
             <itemizedlist>
               <listitem>
-                <para>&lin;: a maioria das distribuições &lin; (tais como Fedora, openSuse,
-                  Mandriva, Ubuntu, etc.) têm um pacote nos seus repositórios de programas para o
-                  módulo Perl <application>Finance::Quote</application>. Assim, na maioria dos
-                  casos pode usar o seu gestor de pacotes preferido (yum, apt, rpm, synaptics,
-                  yast,...) para instalar o módulo. O nome do pacote pode variar entre
-                  distribuições. É qualquer coisa como <quote>perl-Finance-Quote</quote>.
+                <para>&lin;: a maioria das distribuições &lin; (tais como Fedora, openSuse, Mandriva, Ubuntu, etc.) têm
+                  um pacote nos seus repositórios de programas para o módulo Perl
+                  <application>Finance::Quote</application>. Assim, na maioria dos casos pode usar o
+                  seu gestor de pacotes preferido (yum, apt, rpm, synaptics, yast,...) para instalar
+                  o módulo. O nome do pacote pode variar entre distribuições. É qualquer coisa
+                  como <quote>perl-Finance-Quote</quote>.
                 </para>
               </listitem>
 
               <listitem>
-                <para>&win;: o <application>Finance::Quote</application> em Windows requer que o
-                  perl já esteja instalado. Se ainda não o fez, por favor instale o ActivePerl.
+                <para>&win;: o <application>Finance::Quote</application> em Windows requer que o perl já esteja
+                  instalado. Se ainda não o fez, por favor instale o ActivePerl.
                 </para>
 
                 <para>O instalador Windows na página do &app; vem com um pequeno programa de ajuda para instalar o
@@ -660,8 +660,8 @@
             <note>
               <para>Se não se sente confortável a realizar estes passos, por favor, envie um email para a lista de
                 correio &app;-user (<email>gnucash-user at gnucash.org</email>) para assistência ou
-                visite o <ulink url='&url-irc;'>canal IRC do &app; em &srv-irc;</ulink>. Também pode ignorar este passo e
-                actualizar manualmente as cotações.
+                visite o <ulink url='&url-irc;'>canal IRC do &app; em &srv-irc;</ulink>. Também
+                pode ignorar este passo e actualizar manualmente as cotações.
               </para>
             </note>
           </listitem>
diff --git a/pt/manual/ch_Customize.xml b/pt/manual/ch_Customize.xml
index ecc321b1..aa0fa2bd 100644
--- a/pt/manual/ch_Customize.xml
+++ b/pt/manual/ch_Customize.xml
@@ -97,7 +97,9 @@
       <title>Contas</title>
 
       <figure id="prefs-acct-fig">
-        <title>O separador <guilabel>Preferências — Contas</guilabel></title><screenshot id="Prefer_Accounts">
+        <title>O separador <guilabel>Preferências — Contas</guilabel></title>
+
+        <screenshot id="Prefer_Accounts">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Accnts.png"
@@ -208,7 +210,9 @@
       <title>Data/Hora</title>
 
       <figure id="prefs-date-time-fig">
-        <title>O separador <guilabel>Preferências — Data/Hora</guilabel></title><screenshot id="Prefer_DateTime">
+        <title>O separador <guilabel>Preferências — Data/Hora</guilabel></title>
+
+        <screenshot id="Prefer_DateTime">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_DateTime.png"
@@ -301,7 +305,9 @@
       <title>Diário</title>
 
       <figure id="prefs-reg-fig">
-        <title>O separador <guilabel>Preferências — Diário</guilabel></title><screenshot id="Prefer_Register">
+        <title>O separador <guilabel>Preferências — Diário</guilabel></title>
+
+        <screenshot id="Prefer_Register">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Register.png"
@@ -424,7 +430,9 @@
       <title>Geral</title>
 
       <figure id="prefs-general-fig">
-        <title>O separador <guilabel>Preferências — Geral</guilabel></title><screenshot id="Prefer_General">
+        <title>O separador <guilabel>Preferências — Geral</guilabel></title>
+
+        <screenshot id="Prefer_General">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_General.png"
@@ -613,7 +621,9 @@
       <title>Impressão</title>
 
       <figure id="prefs-printing-fig">
-        <title>O separador <guilabel>Preferências — Impressão</guilabel></title><screenshot id="Prefer_Printing">
+        <title>O separador <guilabel>Preferências — Impressão</guilabel></title>
+
+        <screenshot id="Prefer_Printing">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Printing.png"
@@ -662,7 +672,9 @@
       <title>Janelas</title>
 
       <figure id="prefs-windows-fig">
-        <title>O separador <guilabel>Preferências — Janelas</guilabel></title><screenshot id="Prefer_Windows">
+        <title>O separador <guilabel>Preferências — Janelas</guilabel></title>
+
+        <screenshot id="Prefer_Windows">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Windows.png"
@@ -750,7 +762,9 @@
       <title>Negócios</title>
 
       <figure id="prefs-biz-fig">
-        <title>O separador <guilabel>Preferências — Negócios</guilabel></title><screenshot id="Prefer_Business">
+        <title>O separador <guilabel>Preferências — Negócios</guilabel></title>
+
+        <screenshot id="Prefer_Business">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Business.png"
@@ -879,7 +893,9 @@
       <title>Online Banking</title>
 
       <figure id="prefs-online-fig">
-        <title>The <guilabel>Preferências — Online Banking</guilabel> tab</title><screenshot id="Prefer_OnlineBanking">
+        <title>The <guilabel>Preferências — Online Banking</guilabel> tab</title>
+
+        <screenshot id="Prefer_OnlineBanking">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_OnlineBanking.png"
@@ -1045,7 +1061,9 @@
       <title>Período contabilístico</title>
 
       <figure id="prefs-acct-period-fig">
-        <title>O separador <guilabel>Preferências — Período contabilístico</guilabel></title><screenshot id="Prefer_Accounting-Period">
+        <title>O separador <guilabel>Preferências — Período contabilístico</guilabel></title>
+
+        <screenshot id="Prefer_Accounting-Period">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_AccntPeriod.png"
@@ -1131,7 +1149,9 @@
       <title>Predefinições do diário</title>
 
       <figure id="prefs-reg-def-fig">
-        <title>O separador <guilabel>Preferências — Predefinições do diário</guilabel></title><screenshot id="Prefer_RegisterDefaults">
+        <title>O separador <guilabel>Preferências — Predefinições do diário</guilabel></title>
+
+        <screenshot id="Prefer_RegisterDefaults">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_RegisterDefaults.png"
@@ -1227,7 +1247,9 @@
       <title>Relatórios</title>
 
       <figure id="prefs-reports-fig">
-        <title>O separador <guilabel>Preferências — Relatórios</guilabel></title><screenshot id="Prefer_Reports">
+        <title>O separador <guilabel>Preferências — Relatórios</guilabel></title>
+
+        <screenshot id="Prefer_Reports">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Reports.png"
@@ -1290,7 +1312,9 @@
       <title>Transacções agendadas</title>
 
       <figure id="prefs-sched-fig">
-        <title>O separador <guilabel>Preferências — Transacções agendadas</guilabel> tab</title><screenshot id="Prefer_ScheduledTransactions">
+        <title>O separador <guilabel>Preferências — Transacções agendadas</guilabel> tab</title>
+
+        <screenshot id="Prefer_ScheduledTransactions">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Sched.png"
diff --git a/pt/manual/ch_GUIMenus.xml b/pt/manual/ch_GUIMenus.xml
index 5aa960f8..1c6d3fbe 100644
--- a/pt/manual/ch_GUIMenus.xml
+++ b/pt/manual/ch_GUIMenus.xml
@@ -42,7 +42,9 @@
       </para>
 
       <figure id="Main_WindowCallouts">
-        <title>A janela principal do &app;</title><mediaobject>
+        <title>A janela principal do &app;</title>
+
+        <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Main-window-callouts.png"
                        srccredit="Pedro Albuquerque" width="&img-w;"/>
@@ -176,7 +178,9 @@
     <title>Separador Árvore de contas</title>
 
     <figure>
-      <title>O separador <emphasis>Árvore de contas</emphasis>.</title><screenshot id="AccTree_Screen">
+      <title>O separador <emphasis>Árvore de contas</emphasis>.</title>
+
+      <screenshot id="AccTree_Screen">
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/AccountTree_Screen.png"
@@ -2895,7 +2899,9 @@
       </para>
 
       <figure>
-        <title>O ecrã <emphasis>Diário de conta</emphasis>.</title><screenshot id="AccountReg_Screen">
+        <title>O ecrã <emphasis>Diário de conta</emphasis>.</title>
+
+        <screenshot id="AccountReg_Screen">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/AccountReg_Screen.png"
@@ -4754,7 +4760,9 @@
       </note>
 
       <figure>
-        <title>A <emphasis>janela de relatórios</emphasis></title><screenshot id="Report_Screen">
+        <title>A <emphasis>janela de relatórios</emphasis></title>
+
+        <screenshot id="Report_Screen">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Report_Screen.png"
diff --git a/pt/manual/ch_GettingHelp.xml b/pt/manual/ch_GettingHelp.xml
index 239b43c0..0977ac24 100644
--- a/pt/manual/ch_GettingHelp.xml
+++ b/pt/manual/ch_GettingHelp.xml
@@ -155,7 +155,8 @@
       </itemizedlist>
     </para>
 
-    <para>Ou pode conversar ao vivo com os programadores no IRC. Junte-se a eles em <ulink url='&url-irc;'>#gnucash no &srv-irc;</ulink>.
+    <para>Ou pode conversar ao vivo com os programadores no IRC. Junte-se a eles em
+      <ulink url='&url-irc;'>#gnucash no &srv-irc;</ulink>.
     </para>
 
     <para>A <ulink url="url-www">página web do &app;</ulink> tem mais detalhes sobre estes canais. Também
diff --git a/pt/manual/ch_Intro.xml b/pt/manual/ch_Intro.xml
index de653f0f..cab024b8 100644
--- a/pt/manual/ch_Intro.xml
+++ b/pt/manual/ch_Intro.xml
@@ -18,8 +18,7 @@
 <chapter id="intro-to-gnucash">
   <title>Introdução ao &app;</title>
 
-  <subtitle>O que é o &app;?
-  </subtitle>
+  <subtitle>O que é o &app;?</subtitle>
 
   <para>O &app; é um gestor de finanças pessoais e de pequenos negócios. Foi desenhado para ser fácil de
     usar mas poderoso e flexível. O &app; permite-lhe controlar as suas receitas e despesas,
diff --git a/pt/manual/ch_Reports.xml b/pt/manual/ch_Reports.xml
index e82c78a5..46248eea 100644
--- a/pt/manual/ch_Reports.xml
+++ b/pt/manual/ch_Reports.xml
@@ -104,7 +104,9 @@
         <title>Opções do relatório</title>
 
         <figure>
-          <title><emphasis>Relatório de transacções — opções</emphasis></title><screenshot id="TxRptOpt_Screen">
+          <title><emphasis>Relatório de transacções — opções</emphasis></title>
+
+          <screenshot id="TxRptOpt_Screen">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/TxRptOpt_Screen.png"
@@ -1361,7 +1363,7 @@
 Receita (tipo RECEITA)
   Dividendos (tipo RECEITA)
     Acção widget (tipo RECEITA)</screen>
-                </para>
+              </para>
 
               <para>Uma transacção que debita a conta "Activos:Corrector" e credita a conta
                 "Receita:Dividendos:Acção widget" conta como receita mesmo que não tenha uma
diff --git a/pt/manual/ch_Tools_Assistants.xml b/pt/manual/ch_Tools_Assistants.xml
index cd1bae30..ae496bcb 100644
--- a/pt/manual/ch_Tools_Assistants.xml
+++ b/pt/manual/ch_Tools_Assistants.xml
@@ -5005,10 +5005,9 @@
 
       <para>Para suportar cotações online duma dada conta de acção ou fundo, primeiro tem de activar as
         cotações online e seleccionar uma origem de cotações na garantia. Isto é descrito em
-        detalhe em <xref linkend="tool-price-online3"></xref>. Uma vez activadas as
-        cotações online e o <application>Finance::Quote</application> instalado, pode actualizar
-        cotações das suas acções e fundos manualmente, clicando em <guibutton>Obter
-        cotações</guibutton>.
+        detalhe em <xref linkend="tool-price-online3"></xref>. Uma vez activadas as cotações
+        online e o <application>Finance::Quote</application> instalado, pode actualizar cotações
+        das suas acções e fundos manualmente, clicando em <guibutton>Obter cotações</guibutton>.
       </para>
     </sect2>
   </sect1>
diff --git a/pt/manual/ch_Transactions.xml b/pt/manual/ch_Transactions.xml
index d8bbec88..87e8637b 100644
--- a/pt/manual/ch_Transactions.xml
+++ b/pt/manual/ch_Transactions.xml
@@ -243,8 +243,8 @@ Translators:
       </para>
 
       <para>Se estiver disponível uma cotação relevante na base de dados (veja
-        <xref linkend="tool-price-manual"/>), a <guilabel>Taxa de câmbio</guilabel> terá um
-        valor predefinido.
+        <xref linkend="tool-price-manual"/>), a <guilabel>Taxa de câmbio</guilabel> terá um valor
+        predefinido.
       </para>
 
       <itemizedlist>
@@ -270,10 +270,9 @@ Translators:
 
       <note>
         <para>Se criou uma cotação no <guilabel>Editor de cotações</guilabel> (veja
-          <xref linkend="tool-price-manual"/>) para a data actual, este botão não actualiza
-          essa cotação. Terá primeiro de eliminar a cotação criada manualmente no
-          <guilabel>Editor de cotações</guilabel> antes de clicar no botão <guibutton>Obter
-          taxa</guibutton>.
+          <xref linkend="tool-price-manual"/>) para a data actual, este botão não actualiza essa
+          cotação. Terá primeiro de eliminar a cotação criada manualmente no <guilabel>Editor
+          de cotações</guilabel> antes de clicar no botão <guibutton>Obter taxa</guibutton>.
         </para>
       </note>
 
diff --git a/pt/manual/fdl-appendix.xml b/pt/manual/fdl-appendix.xml
index f7bec1ef..dbdc4c7b 100644
--- a/pt/manual/fdl-appendix.xml
+++ b/pt/manual/fdl-appendix.xml
@@ -571,9 +571,8 @@
     </para>
 
     <para>If your document contains nontrivial examples of program code, we recommend releasing these examples
-      in parallel under your choice of free software license, such as the
-      <ulink url="&url-gpl;">GNU General Public License</ulink>,
-      to permit their use in free software.
+      in parallel under your choice of free software license, such as the <ulink url="&url-gpl;">GNU
+      General Public License</ulink>, to permit their use in free software.
     </para>
   </sect1>
 </appendix>
diff --git a/pt/manual/index.docbook b/pt/manual/index.docbook
index 71d957fb..eebbd29b 100644
--- a/pt/manual/index.docbook
+++ b/pt/manual/index.docbook
@@ -50,452 +50,543 @@
         <revnumber>Manual de ajuda do &appname; 5.2</revnumber>
         <date>25 de junho 2023</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; 5.1</revnumber>
         <date>30 de abril de 2023</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; 5.0</revnumber>
         <date>29 de março de 2023</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.14</revnumber>
         <date>29 de março de 2023</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.903</revnumber>
         <date>12 de março de 2023</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.900</revnumber>
         <date>8 de janiero de 2023</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.13</revnumber>
         <date>18 de dezembro de 2022</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.12</revnumber>
         <date>25 de setembro de 2022</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.11</revnumber>
         <date>26 de junho de 2022</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.10</revnumber>
         <date>27 de março de 2022</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.9</revnumber>
         <date>19 de dezembro de 2021</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.8</revnumber>
         <date>28 de setembro de 2021</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.7</revnumber>
         <date>26 de setembro de 2021</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.6</revnumber>
         <date>27 de junho de 2021</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.5</revnumber>
         <date>28 de março marcha de 2021</date>
         <revdescription>
-          <para role="author">Múltiplos autores</para>
-          <para role="publisher">Equipa de documentação do &appname;</para>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
         </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.4</revnumber>
         <date>28 de dezembro de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.3</revnumber>
         <date>27 de dezembro de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.2</revnumber>
         <date>27 de setembro de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.1</revnumber>
         <date>26 de julio de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
+
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
+      </revision>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v4.0</revnumber> <date>28 de
-      junho de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v4.0</revnumber>
+        <date>28 de junho de 2020</date>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v3.11</revnumber>
         <date>28 de junho de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v3.10</revnumber>
         <date>11 de abril de 2020</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v3.8</revnumber>
         <date>29 de dezembro de 2019</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v3.7</revnumber>
         <date>8 de setembro de 2019</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v3.6</revnumber>
         <date>31 de junho de 2019</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v3.5</revnumber>
         <date>31 de março de 2019</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v3.1</revnumber>
         <date>24 de abril de 2018</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v3.0</revnumber>
         <date>1 de abril de 2018</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.6.20</revnumber>
         <date>1 de abril de 2018</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.6.8</revnumber>
         <date>27 de setembro de 2015</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.6.7</revnumber>
         <date>28 de junho de 2015</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.6.3</revnumber>
         <date>30 de março de 2014</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.6.2</revnumber>
         <date>2 de março de 2014</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.6.1</revnumber>
         <date>26 de janeiro de 2014</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.6.0</revnumber>
         <date>29 de dezembro de 2013</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.4.2</revnumber>
         <date>17 de novembro de 2012</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.4.1</revnumber>
         <date>1 de julho de 2011</date>
-      <revdescription>
-        <para role="author">Múltiplos autores
-        </para>
+        <revdescription>
+          <para role="author">Múltiplos autores
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.3.16</revnumber>
         <date>de novembro de 7, 2010</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
 
-        <para role="author">Dave Herman
-        </para>
+          <para role="author">Dave Herman
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.0.2</revnumber>
         <date>de março de 2007</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v2.0.0</revnumber>
         <date>de julho de 2006</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v1.8.3</revnumber>
         <date>Agosto de 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v1.8.2</revnumber>
         <date>Agosto de 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v1.8.1</revnumber>
         <date>Maio de 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual de ajuda do &appname; v1.8.0</revnumber>
         <date>Janeiro de 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
+
       <revision>
         <revnumber>Manual do utilizador do &appname;</revnumber>
         <date>de junho de 2002</date>
-      <revdescription>
-        <para role="author">Programadores e documentadores do &appname;
-        </para>
+        <revdescription>
+          <para role="author">Programadores e documentadores do &appname;
+          </para>
 
-        <para role="publisher">Equipa de documentação do &appname;
-        </para>
-      </revdescription>
+          <para role="publisher">Equipa de documentação do &appname;
+          </para>
+        </revdescription>
       </revision>
     </revhistory>
 
diff --git a/ru/guide/appendixa.xml b/ru/guide/appendixa.xml
index e562d27e..1c86c8a4 100644
--- a/ru/guide/appendixa.xml
+++ b/ru/guide/appendixa.xml
@@ -68,8 +68,7 @@
       <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;"/>.
+      <para>Some &app; users collected their knowledge about the best use in our <ulink url="&url-wiki-qif;"/>.
       </para>
 <!-- ToDo: Uncomment this after adding the chapter
       <para>For other formats and more details see <xref linkend="chapter_importing"/>.
diff --git a/ru/guide/ch_basics.xml b/ru/guide/ch_basics.xml
index d6deeab2..c1aa6671 100644
--- a/ru/guide/ch_basics.xml
+++ b/ru/guide/ch_basics.xml
@@ -146,7 +146,9 @@
       </para>
 
       <figure pgwide="1">
-        <title>Взаимосвязь основных типов счетов</title><screenshot id="basics-AccountRelationships">
+        <title>Взаимосвязь основных типов счетов</title>
+
+        <screenshot id="basics-AccountRelationships">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_AccountRelationships.png"
@@ -953,7 +955,9 @@
 
               <figure>
                 <title>Диалог сохранения данных при выборе <acronym>XML</acronym> или
-                  <acronym>sqlite3</acronym>.</title><screenshot id="basics-SaveXML">
+                  <acronym>sqlite3</acronym>.</title>
+
+                <screenshot id="basics-SaveXML">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveXML.png"
@@ -1019,7 +1023,9 @@
 
               <figure>
                 <title>Диалог сохранения данных при выборе <acronym>mysql</acronym> или
-                  <acronym>postgres</acronym>.</title><screenshot id="basics-SaveSQL">
+                  <acronym>postgres</acronym>.</title>
+
+                <screenshot id="basics-SaveSQL">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveSQL.png"
diff --git a/ru/guide/ch_bus_features.xml b/ru/guide/ch_bus_features.xml
index 7ab8f9cc..51c3ebd0 100644
--- a/ru/guide/ch_bus_features.xml
+++ b/ru/guide/ch_bus_features.xml
@@ -175,7 +175,9 @@
       </para>
 
       <figure>
-        <title>Sales Tax Tables Editor</title><screenshot id="bus-taxmain">
+        <title>Sales Tax Tables Editor</title>
+
+        <screenshot id="bus-taxmain">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_tax_main.png"
@@ -195,7 +197,9 @@
       </figure>
 
       <figure>
-        <title>New Sales Tax Table Entry</title><screenshot id="bus-taxnew">
+        <title>New Sales Tax Table Entry</title>
+
+        <screenshot id="bus-taxnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_tax_new.png"
@@ -541,7 +545,9 @@
       </para>
 
       <figure>
-        <title>Entering Company Information</title><screenshot id="bus-co-reg">
+        <title>Entering Company Information</title>
+
+        <screenshot id="bus-co-reg">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_co_reg.png"
@@ -638,7 +644,9 @@
       </para>
 
       <figure>
-        <title>Billing Terms Editor</title><screenshot id="bus-termsmain">
+        <title>Billing Terms Editor</title>
+
+        <screenshot id="bus-termsmain">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_terms_main.png"
@@ -653,7 +661,9 @@
       </figure>
 
       <figure>
-        <title>New Billing Term</title><screenshot id="bus-termsnew">
+        <title>New Billing Term</title>
+
+        <screenshot id="bus-termsnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_terms_new.png"
@@ -816,7 +826,9 @@
         </para>
 
         <figure>
-          <title>New Customer Registration Window</title><screenshot id="bus-ar-custnew">
+          <title>New Customer Registration Window</title>
+
+          <screenshot id="bus-ar-custnew">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_custnew.png"
@@ -845,7 +857,9 @@
         </para>
 
         <figure>
-          <title>Find Customer Window</title><screenshot id="bus-ar-custfind">
+          <title>Find Customer Window</title>
+
+          <screenshot id="bus-ar-custfind">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_custfind.png"
@@ -914,7 +928,9 @@
         </para>
 
         <figure>
-          <title>Creating a New Invoice</title><screenshot id="bus-ar-invoicenew">
+          <title>Creating a New Invoice</title>
+
+          <screenshot id="bus-ar-invoicenew">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoicenew.png"
@@ -942,7 +958,9 @@
         </para>
 
         <figure>
-          <title>Edit Invoice Window</title><screenshot id="bus-ar-invoiceedit">
+          <title>Edit Invoice Window</title>
+
+          <screenshot id="bus-ar-invoiceedit">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoiceedit.png"
@@ -971,7 +989,9 @@
         </para>
 
         <figure>
-          <title>Post Invoice Window</title><screenshot id="bus-ar-invoicepost">
+          <title>Post Invoice Window</title>
+
+          <screenshot id="bus-ar-invoicepost">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoicepost.png"
@@ -1036,7 +1056,9 @@
         </para>
 
         <figure>
-          <title>Invoice Print Output</title><screenshot id="bus-ar-invoiceprint">
+          <title>Invoice Print Output</title>
+
+          <screenshot id="bus-ar-invoiceprint">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoiceprint.png"
@@ -1127,7 +1149,9 @@
       </para>
 
       <figure>
-        <title>New Customer Job</title><screenshot id="bus-ar-jobnew">
+        <title>New Customer Job</title>
+
+        <screenshot id="bus-ar-jobnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ar_jobnew.png"
@@ -1183,7 +1207,9 @@
       </para>
 
       <figure>
-        <title>Process Customer Payment</title><screenshot id="bus-ar-payment">
+        <title>Process Customer Payment</title>
+
+        <screenshot id="bus-ar-payment">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_ar_payment.png"
@@ -1237,7 +1263,9 @@
       </para>
 
       <figure>
-        <title>The New Style Sheet Window</title><screenshot id="bus-ar-invoicechange1">
+        <title>The New Style Sheet Window</title>
+
+        <screenshot id="bus-ar-invoicechange1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ar_invoicechange1.png"
@@ -1277,7 +1305,9 @@
       </para>
 
       <figure>
-        <title>HTML Style Sheets Example Window</title><screenshot id="bus-ar-invoicechange2">
+        <title>HTML Style Sheets Example Window</title>
+
+        <screenshot id="bus-ar-invoicechange2">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_ar_invoicechange2.png"
@@ -1319,7 +1349,9 @@
       </para>
 
       <figure>
-        <title>HTML Style Sheets Example Output</title><screenshot id="bus-ar-invoicechange3">
+        <title>HTML Style Sheets Example Output</title>
+
+        <screenshot id="bus-ar-invoicechange3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ar_invoicechange3.png"
@@ -1421,7 +1453,9 @@
         </para>
 
         <figure>
-          <title>New Vendor Registration Window</title><screenshot id="bus-ap-vendornew">
+          <title>New Vendor Registration Window</title>
+
+          <screenshot id="bus-ap-vendornew">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ap_vendornew.png" srccredit="Patrick Schweiger"/>
@@ -1449,7 +1483,9 @@
         </para>
 
         <figure>
-          <title>Find Vendor Window</title><screenshot id="bus-ar-vendorfind">
+          <title>Find Vendor Window</title>
+
+          <screenshot id="bus-ar-vendorfind">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ap_vendorfind.png" srccredit="Patrick Schweiger"/>
@@ -1519,7 +1555,9 @@
         </para>
 
         <figure>
-          <title>New Bill Registration Window</title><screenshot id="bus-ap-billnew">
+          <title>New Bill Registration Window</title>
+
+          <screenshot id="bus-ap-billnew">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ap_billnew.png" srccredit="Patrick Schweiger"/>
@@ -1545,7 +1583,9 @@
         </para>
 
         <figure>
-          <title>Edit Bill Window</title><screenshot id="bus-ap-billedit">
+          <title>Edit Bill Window</title>
+
+          <screenshot id="bus-ap-billedit">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ap_billedit.png" srccredit="Patrick Schweiger"/>
@@ -1572,7 +1612,9 @@
         </para>
 
         <figure>
-          <title>Post Bill Window</title><screenshot id="bus-ap-billpost">
+          <title>Post Bill Window</title>
+
+          <screenshot id="bus-ap-billpost">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ap_billpost.png" srccredit="Patrick Schweiger"/>
@@ -1628,7 +1670,9 @@
       </para>
 
       <figure>
-        <title>New Vendor Job</title><screenshot id="bus-ap-jobnew">
+        <title>New Vendor Job</title>
+
+        <screenshot id="bus-ap-jobnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ap_jobnew.png" srccredit="Jon Lapham"/>
@@ -1677,7 +1721,9 @@
       </para>
 
       <figure>
-        <title>Process Vendor Payment</title><screenshot id="bus-ap-payment">
+        <title>Process Vendor Payment</title>
+
+        <screenshot id="bus-ap-payment">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" width="510"/>
@@ -2045,7 +2091,9 @@
       </para>
 
       <figure>
-        <title>Payroll Example: Initial Setup</title><screenshot id="bus-pay-ex1">
+        <title>Payroll Example: Initial Setup</title>
+
+        <screenshot id="bus-pay-ex1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex1.png"
@@ -2218,7 +2266,9 @@
       </para>
 
       <figure>
-        <title>Payroll Example: Employee Split Transaction</title><screenshot id="bus-pay-ex2">
+        <title>Payroll Example: Employee Split Transaction</title>
+
+        <screenshot id="bus-pay-ex2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex2.png"
@@ -2250,7 +2300,9 @@
       </para>
 
       <figure>
-        <title>Payroll Example: Accounts After Salaries Paid</title><screenshot id="bus-pay-ex3">
+        <title>Payroll Example: Accounts After Salaries Paid</title>
+
+        <screenshot id="bus-pay-ex3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex3.png"
@@ -2272,7 +2324,9 @@
       </para>
 
       <figure>
-        <title>Payroll Example: Accounts After Paying Government</title><screenshot id="bus-pay-ex4">
+        <title>Payroll Example: Accounts After Paying Government</title>
+
+        <screenshot id="bus-pay-ex4">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex4.png"
diff --git a/ru/guide/ch_currency.xml b/ru/guide/ch_currency.xml
index b6e2bcfd..e63a6310 100644
--- a/ru/guide/ch_currency.xml
+++ b/ru/guide/ch_currency.xml
@@ -1063,8 +1063,8 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
 
     <para>Trading accounts were introduced as a feature from &app; version 2.3.14. The conceptual basis for
       trading accounts is described in &ulink-sel-tut; by Peter Selinger. A second tutorial
-      &ulink-sel-gnc; by Peter Selinger
-      describes the manual creation and use of trading accounts in &app; prior to version 2.3.14.
+      &ulink-sel-gnc; by Peter Selinger describes the manual creation and use of trading accounts in
+      &app; prior to version 2.3.14.
     </para>
 
     <para>Trading accounts are not enabled by default in &app;. To enable them go to
diff --git a/ru/guide/ch_invest.xml b/ru/guide/ch_invest.xml
index b79b1cb5..f1e56ed4 100644
--- a/ru/guide/ch_invest.xml
+++ b/ru/guide/ch_invest.xml
@@ -1388,12 +1388,11 @@ Income
           </itemizedlist>
         </para>
 
-        <para>&mac;: You need to have XCode installed. XCode is an optional
-          item from your &mac; distribution DVD. Run the <emphasis role="strong">Update Finance
-          Quote</emphasis> app in the &app; dmg. You can run it from the dmg or copy it to the same
-          folder to which you copied &app;. It will open a Terminal window and run a script for you
-          which will ask lots of questions. Accept the default for each unless you know what
-          you’re doing.
+        <para>&mac;: You need to have XCode installed. XCode is an optional item from your &mac; distribution DVD.
+          Run the <emphasis role="strong">Update Finance Quote</emphasis> app in the &app; dmg. You
+          can run it from the dmg or copy it to the same folder to which you copied &app;. It will
+          open a Terminal window and run a script for you which will ask lots of questions. Accept
+          the default for each unless you know what you’re doing.
         </para>
 
         <para>&lin;:
@@ -1432,9 +1431,9 @@ Income
 
         <note>
           <para>If you feel uncomfortable about performing any of these steps, please either email the &app;-user
-            mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the 
-            <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. You can also leave out this step and manually update your
-            stock prices.
+            mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the
+            <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. You can also leave out
+            this step and manually update your stock prices.
           </para>
         </note>
       </sect3>
@@ -3207,7 +3206,9 @@ Income
         </para>
 
         <figure pgwide="1">
-          <title>Selling Shares - Capital Gains - Lots in Account window</title><screenshot id="tool-lotsInAcct">
+          <title>Selling Shares - Capital Gains - Lots in Account window</title>
+
+          <screenshot id="tool-lotsInAcct">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
@@ -3232,8 +3233,8 @@ Income
         </figure>
 
         <para>Refer to the Help Manual, Chapter 8 Tools & Assistants,
-          <ulink url="&url-docs-C;help/tool-lots.html">Lots in Account</ulink>
-          for details of the Lots in Account screen elements.
+          <ulink url="&url-docs-C;help/tool-lots.html">Lots in Account</ulink> for details of the
+          Lots in Account screen elements.
         </para>
       </sect3>
 
@@ -3574,7 +3575,9 @@ Income
             </para>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Security register before scrubbing a single lot</title><screenshot id="invest-lots0reg">
+              <title>Selling Shares - Capital Gains - Security register before scrubbing a single lot</title>
+
+              <screenshot id="invest-lots0reg">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
@@ -3616,7 +3619,9 @@ Income
             </para>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot</title><screenshot id="invest-lots1B4CreateLot">
+              <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot</title>
+
+              <screenshot id="invest-lots1B4CreateLot">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
@@ -3688,7 +3693,9 @@ Income
             </para>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot, after manual linking</title><screenshot id="invest-lots2B4Scrub1Lot">
+              <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot, after manual linking</title>
+
+              <screenshot id="invest-lots2B4Scrub1Lot">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
@@ -3730,7 +3737,9 @@ Income
             </para>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Register after manual linking and scrubbing a single lot</title><screenshot id="invest-lots2RegAftScrub1Lot">
+              <title>Selling Shares - Capital Gains - Register after manual linking and scrubbing a single lot</title>
+
+              <screenshot id="invest-lots2RegAftScrub1Lot">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
@@ -3837,7 +3846,9 @@ Income
         </para>
 
         <figure pgwide="1">
-          <title>Selling Shares - Capital Gains - Register before Scrub Account</title><screenshot id="invest2-lots0reg">
+          <title>Selling Shares - Capital Gains - Register before Scrub Account</title>
+
+          <screenshot id="invest2-lots0reg">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
@@ -3872,7 +3883,9 @@ Income
             </para>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots before Scrub Account</title><screenshot id="invest2-lots1B4ScrubAcct">
+              <title>Selling Shares - Capital Gains - Lots before Scrub Account</title>
+
+              <screenshot id="invest2-lots1B4ScrubAcct">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
@@ -3903,7 +3916,9 @@ Income
             </para>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots after Scrub Account</title><screenshot id="invest2-lots2AftScrubAcct">
+              <title>Selling Shares - Capital Gains - Lots after Scrub Account</title>
+
+              <screenshot id="invest2-lots2AftScrubAcct">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
@@ -3941,7 +3956,9 @@ Income
             </para>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Register after Scrub Account</title><screenshot id="invest2-lots3AftScrubAcct">
+              <title>Selling Shares - Capital Gains - Register after Scrub Account</title>
+
+              <screenshot id="invest2-lots3AftScrubAcct">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
@@ -3991,7 +4008,9 @@ Income
         </para>
 
         <figure pgwide="1">
-          <title>Selling Shares - Capital Gains - Register after Scrub Account</title><screenshot id="investLotsSplitReg">
+          <title>Selling Shares - Capital Gains - Register after Scrub Account</title>
+
+          <screenshot id="investLotsSplitReg">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitReg.png"
@@ -4016,7 +4035,9 @@ Income
         </figure>
 
         <figure pgwide="1">
-          <title>Selling Shares - Capital Gains - Lot 0 after Scrub Account</title><screenshot id="investLotsSplitLot0">
+          <title>Selling Shares - Capital Gains - Lot 0 after Scrub Account</title>
+
+          <screenshot id="investLotsSplitLot0">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
@@ -4041,7 +4062,9 @@ Income
         </figure>
 
         <figure pgwide="1">
-          <title>Selling Shares - Capital Gains - Lot 1 after Scrub Account</title><screenshot id="investLotsSplitLot1">
+          <title>Selling Shares - Capital Gains - Lot 1 after Scrub Account</title>
+
+          <screenshot id="investLotsSplitLot1">
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
@@ -4104,7 +4127,9 @@ Income
             </para>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Register after scrubbing a single lot</title><screenshot id="invest-lots4AftScrub1LotReg">
+              <title>Selling Shares - Capital Gains - Register after scrubbing a single lot</title>
+
+              <screenshot id="invest-lots4AftScrub1LotReg">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
diff --git a/ru/guide/ch_oview.xml b/ru/guide/ch_oview.xml
index 3116eca1..67046d9b 100644
--- a/ru/guide/ch_oview.xml
+++ b/ru/guide/ch_oview.xml
@@ -210,8 +210,8 @@
             поддерживает множество платформ и операционных
             систем. Список полностью поддерживаемых
             операционных систем (и платформ) для &app; &vers-stable;
-            следующий: &lin; (x86, x86_64), FreeBSD (x86, x86_64), OpenBSD (x86,
-            x86_64), &mac; (Intel) и &win;. Предыдущие версии &app;, насколько
+            следующий: &lin; (x86, x86_64), FreeBSD (x86, x86_64), OpenBSD (x86, x86_64),
+            &mac; (Intel) и &win;. Предыдущие версии &app;, насколько
             известно, работали с SGI IRIX (MIPS), IBM AIX 4.1.5 (RS/6000), Unixware
             7 (Intel) SCO OpenServer 5.0.4 (Intel), и Solaris (SPARC) но сейчас их
             текущее состояние не известно.
@@ -624,8 +624,8 @@
         в <ulink url="&url-wiki;">&appname; Wiki (english)</ulink>; Если вы
         сталкнетесь с трудностями при использовании &app;,
         то посетите пожалуйста одной из первых страницу
-        <ulink url="&url-wiki-faq;">Часто задаваемые
-        вопросы (english)</ulink>.
+        <ulink url="&url-wiki-faq;">Часто задаваемые вопросы
+        (english)</ulink>.
       </para>
     </sect2>
 
@@ -640,12 +640,10 @@
         <ulink url="mailto:gnucash-user at gnucash.org"> пользовательский список
         рассылки (english)</ulink>. Если вы предпочитаете читать
         список рассылки в виде веб-форума, вы можете
-        сделать это при помощи
-        <ulink url="&url-mail-nabble;">Nabble</ulink>.
+        сделать это при помощи <ulink url="&url-mail-nabble;">Nabble</ulink>.
         Для того чтобы участвовать в списке рассылки и
         задавать вопросы, вам необходимо сначала
-        <ulink url="%url-mail-li;gnucash-user">подписаться</ulink>
-        на него.
+        <ulink url="%url-mail-li;gnucash-user">подписаться</ulink> на него.
       </para>
 
       <bridgehead>
@@ -653,20 +651,20 @@
       </bridgehead>
 
       <para>Некоторые из разработчиков мониторят
-       <ulink url='&url-irc;'>канал #gnucash на &srv-irc;</ulink>. Они обычно заняты чем-то еще в это время, и
-        конечно, не всегда находятся у компьютеров.
-        Войдите в систему, задайте свой вопрос и
-        оставайтесь в системе; Иногда может пройти
-        несколько часов, пока ваш вопрос будет замечен и
-        кто-нибудь ответит на него. Чтобы увидеть,
-        пропустили ли вы что-нибудь, вы можете проверить
-        <ulink url="&url-logs-irc;">IRC протоколы</ulink>.
+        <ulink url='&url-irc;'>канал #gnucash на &srv-irc;</ulink>. Они обычно
+        заняты чем-то еще в это время, и конечно, не всегда
+        находятся у компьютеров. Войдите в систему,
+        задайте свой вопрос и оставайтесь в системе;
+        Иногда может пройти несколько часов, пока ваш
+        вопрос будет замечен и кто-нибудь ответит на него.
+        Чтобы увидеть, пропустили ли вы что-нибудь, вы
+        можете проверить <ulink url="&url-logs-irc;">IRC протоколы</ulink>.
       </para>
 
-      <para>На <ulink url="&url-www;">&app; странице</ulink> вы найдете
-        более подробную информацию об этих каналах. Вы
-        также найдете там ссылки на другие полезные
-        ресурсы, например на такие как &app; wiki и система
+      <para>На <ulink url="&url-www;">&app; странице</ulink> вы найдете более
+        подробную информацию об этих каналах. Вы также
+        найдете там ссылки на другие полезные ресурсы,
+        например на такие как &app; wiki и система
         отслеживания ошибок.
       </para>
     </sect2>
diff --git a/ru/guide/ch_python_bindings.xml b/ru/guide/ch_python_bindings.xml
index 0afb1e50..b84e1266 100644
--- a/ru/guide/ch_python_bindings.xml
+++ b/ru/guide/ch_python_bindings.xml
@@ -38,7 +38,8 @@ Translators:
       -DWITH_PYTHON=ON …</code> option enabled, otherwise all what follows won’t work. At
       present this option is not enabled by default, so if you need this, you may have to compile
       &app; from source yourself. But some distributions offer it also as a separate package with a
-      name like<package>
+      name like
+      <package>
         python[<replaceable>version</replaceable>]-&appname;
       </package>
     </para>
diff --git a/ru/guide/ch_txns.xml b/ru/guide/ch_txns.xml
index c7dab00e..78979a5d 100644
--- a/ru/guide/ch_txns.xml
+++ b/ru/guide/ch_txns.xml
@@ -305,8 +305,11 @@
         account name and &app; will fill in the remaining part of the name. Typing the separator
         character at any time will complete the current level of the account name, leaving the
         cursor positioned to start the next level of account name. For example, typing
-        <keycombo action='seq'><keycap>A</keycap><keycap>:</keycap><keycap>C</keycap></keycombo> the standard set of account names will complete to the
-        <emphasis>Assets:Checking</emphasis> account. You can also type the <keycap>Menu</keycap> or
+        <keycombo action='seq'>
+          <keycap>A</keycap><keycap>:</keycap><keycap>C</keycap>
+        </keycombo>
+        the standard set of account names will complete to the <emphasis>Assets:Checking</emphasis>
+        account. You can also type the <keycap>Menu</keycap> or
         <keycombo>
           <keycap>Ctrl</keycap><keycap>Down</keycap>
         </keycombo>
@@ -630,7 +633,9 @@
       </para>
 
       <figure id="txns-register-multiaccount">
-        <title>Entering a split transaction</title><mediaobject>
+        <title>Entering a split transaction</title>
+
+        <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_multiaccount.png"
                        srccredit="Bengt Thuree" />
diff --git a/ru/guide/fdl-appendix.xml b/ru/guide/fdl-appendix.xml
index 9d79b5aa..0c25231f 100644
--- a/ru/guide/fdl-appendix.xml
+++ b/ru/guide/fdl-appendix.xml
@@ -557,9 +557,8 @@
     </para>
 
     <para>If your document contains nontrivial examples of program code, we recommend releasing these examples
-      in parallel under your choice of free software license, such as the
-      <ulink url="&url-gpl;">GNU General Public License</ulink>,
-      to permit their use in free software.
+      in parallel under your choice of free software license, such as the <ulink url="&url-gpl;">GNU
+      General Public License</ulink>, to permit their use in free software.
     </para>
   </sect1>
 </appendix>
diff --git a/ru/guide/index.docbook b/ru/guide/index.docbook
index a774443a..2b0c15ff 100644
--- a/ru/guide/index.docbook
+++ b/ru/guide/index.docbook
@@ -84,261 +84,340 @@
     </authorgroup>
 
     <revhistory>
-      <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.10</revnumber> <date>11 April
-      2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.9</revnumber>
-      <date>29 March 2020</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.8</revnumber>
-      <date>29 December 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.7</revnumber>
-      <date>8 September 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.6</revnumber>
-      <date>30 June 2019</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.1</revnumber>
-      <date>28 April 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v3.0</revnumber>
-      <date>1 April 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.20</revnumber>
-      <date>1 April 2018</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.15</revnumber>
-      <date>26 March 2017</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.15</revnumber>
-      <date>18 December 2016</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.11</revnumber>
-      <date>11 January 2016</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.8</revnumber>
-      <date>27 September 2015</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.7</revnumber>
-      <date>28 June 2015</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.3</revnumber>
-      <date>30 March 2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.2</revnumber>
-      <date>2 March 2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.1</revnumber>
-      <date>26 January 2014</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.6.0</revnumber>
-      <date>29 December 2013</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.4.2</revnumber>
-      <date>17 November 2012</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.4.1</revnumber>
-      <date>1 July 2011</date>
-      <revdescription>
-        <para role="author">Multiple authors
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.3.16</revnumber>
-      <date>November 7, 2010</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="author">Bengt Thuree
-        </para>
-
-        <para role="author">Dave Herman
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v2.0.0</revnumber>
-      <date>July 2006</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="author">Bengt Thuree
-        </para>
-
-        <para role="author">Dave Herman
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.3</revnumber>
-      <date>Aug 2003</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.2</revnumber>
-      <date>Aug 2003</date>
-      <revdescription>
-        <para role="author">Jon Lapham
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.1</revnumber>
-      <date>May 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial and Concepts Guide v1.8.0</revnumber>
-      <date>Jan 2003</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; User Guide v1.6.5</revnumber> <date>June
-      2002</date>
-      <revdescription>
-        <para role="author">Chris Lyttle
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
-      </revision> <revision> <revnumber>&appname; User Guide v1.6.0</revnumber> <date>October
-      2001</date>
-      <revdescription>
-        <para role="author">Carol Champagne
-        </para>
-
-        <para role="publisher">&appname; Documentation Team
-        </para>
-      </revdescription>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.10</revnumber>
+        <date>11 April 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.9</revnumber>
+        <date>29 March 2020</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.8</revnumber>
+        <date>29 December 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.7</revnumber>
+        <date>8 September 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.6</revnumber>
+        <date>30 June 2019</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.1</revnumber>
+        <date>28 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v3.0</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.20</revnumber>
+        <date>1 April 2018</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.15</revnumber>
+        <date>26 March 2017</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.15</revnumber>
+        <date>18 December 2016</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.11</revnumber>
+        <date>11 January 2016</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.8</revnumber>
+        <date>27 September 2015</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.7</revnumber>
+        <date>28 June 2015</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.3</revnumber>
+        <date>30 March 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.2</revnumber>
+        <date>2 March 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.1</revnumber>
+        <date>26 January 2014</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.6.0</revnumber>
+        <date>29 December 2013</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.4.2</revnumber>
+        <date>17 November 2012</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.4.1</revnumber>
+        <date>1 July 2011</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.3.16</revnumber>
+        <date>November 7, 2010</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="author">Bengt Thuree
+          </para>
+
+          <para role="author">Dave Herman
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v2.0.0</revnumber>
+        <date>July 2006</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="author">Bengt Thuree
+          </para>
+
+          <para role="author">Dave Herman
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.3</revnumber>
+        <date>Aug 2003</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.2</revnumber>
+        <date>Aug 2003</date>
+        <revdescription>
+          <para role="author">Jon Lapham
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.1</revnumber>
+        <date>May 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide v1.8.0</revnumber>
+        <date>Jan 2003</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; User Guide v1.6.5</revnumber>
+        <date>June 2002</date>
+        <revdescription>
+          <para role="author">Chris Lyttle
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
+
+      <revision>
+        <revnumber>&appname; User Guide v1.6.0</revnumber>
+        <date>October 2001</date>
+        <revdescription>
+          <para role="author">Carol Champagne
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
       </revision>
     </revhistory>
 

commit 15d5db1c9da67ac2f12eb1c77213bb9b9cb5cd0b
Author: Christian Wehling <christian.wehling at web.de>
Date:   Thu Jul 13 22:08:40 2023 +0200

    xmlformat.conf: further improvements
    
    - set 'element-break' active for 'para', 'figure' and 'mediaobject'
    - insert 'titleabbrev'

diff --git a/util/xmlformat/xmlformat.conf b/util/xmlformat/xmlformat.conf
index fe56ad17..3d21550b 100644
--- a/util/xmlformat/xmlformat.conf
+++ b/util/xmlformat/xmlformat.conf
@@ -2,7 +2,7 @@
 # created in 2019-11 by Frank H. Ellenberger
 #
 # Normal xml tags are in block format, but many docbook elements are inline easier to read.
-# They have ususally only one child element.
+# They have usually only one child element.
 # They have to be added at the end.
 #
 # The block elements are added so that 
@@ -37,7 +37,7 @@ bookinfo appendixinfo \
 glossary glossaryinfo glossdiv glossdef glossentry \
 itemizedlist orderedlist listitem variablelist varlistentry \
 table informaltable tgroup thead tbody row entry \
-example screenshot mediaobject inlinemediaobject imageobject textobject caption \
+example screenshot inlinemediaobject imageobject textobject caption \
 qandaset qandadiv qandaentry question answer \
 blockquote caution important note tip warning \
 formalpara equation footnote \
@@ -46,16 +46,22 @@ menuchoice keycombo  # because they are more complex
   format = block
 
 # contain only blocks:
-figure revnumber  # Fixme: move revnumber into inline after fixing wrong content
-  element-break = 0
+revnumber  # Fixme: move revnumber into inline after fixing wrong content
+  entry-break = 0
+  exit-break = 0
+  element-break = 1
+
+# each sub-element begin a new line:
+figure mediaobject
+  element-break = 1
 
 # no entry break:
-para simpara subtitle
+para simpara
   entry-break = 0
-  element-break = 0
+  element-break = 1
 
 # Meta: usually 1 line blocks:
-title publishername colspec revremark term xi:include
+title titleabbrev subtitle publishername colspec revremark term xi:include
   entry-break = 0
   exit-break = 0
   element-break = 1
@@ -73,6 +79,6 @@ literal msgtext property replaceable returnvalue structfield structname symbol t
 application code command envar filename medialabel msgtext option parameter prompt systemitem \
 database email hardware inlinegraphic optional \
 affiliation firstname honorific lineage othername surname \
-date edition holder pubdate revision year revnumber \
+date edition holder pubdate year  \
 imagedata 
   format = inline

commit 491a29a5645a112cc4bc989e22d96933a7ee5b64
Author: Christian Wehling <christian.wehling at web.de>
Date:   Mon May 1 17:34:25 2023 +0200

    fix malformed xml

diff --git a/pt/manual/txf-categories.xml b/pt/manual/txf-categories.xml
index ce724d8a..c36d61d6 100644
--- a/pt/manual/txf-categories.xml
+++ b/pt/manual/txf-categories.xml
@@ -10,7 +10,7 @@
      Translators: You will probably have your own codes.
      Look for similar files as the source at the end of this file,
      but in the directory with your country code.
-     Your tax authorities might also use a format different from TXF. REMOVE THIS CAPITALIZED TEXT AFTER TRANSLATING --
+     Your tax authorities might also use a format different from TXF. REMOVE THIS CAPITALIZED TEXT AFTER TRANSLATING
 <para><table>
     <title>Detailed <acronym>TXF</acronym> Category Descriptions</title>
 
@@ -4981,6 +4981,6 @@
     </tgroup>
   </table>
 </para>
--- UNCOMMENT HERE FOR TRANSLATION -->
+UNCOMMENT HERE FOR TRANSLATION -->
 <para>Fonte: <ulink url="&url-gh-gc-maint-txf-hlp;us/txf-help.scm"/>
 </para>

commit 57207af1f68e73c734bed3587706dbe7d74c24ce
Author: Christian Wehling <christian.wehling at web.de>
Date:   Mon May 1 17:29:04 2023 +0200

    Adaptation of the xml-formatting example to the changed doc structure
    
    and insert the processing of *.docbook- files to the for-loop.

diff --git a/util/xmlformat/README b/util/xmlformat/README
index d04562a6..7fb5475e 100644
--- a/util/xmlformat/README
+++ b/util/xmlformat/README
@@ -14,13 +14,13 @@ If you installed the package xmlformat you can shorten it to:
 xmlformat -f util/xmlformat/xmlformat.conf -i xml-file
 
 To reformat all files of the english guide:
-for i in guide/C/*.xml; do util/xmlformat/xmlformat.pl -f util/xmlformat/xmlformat.conf -i $i ; done
+for i in C/guide/*.xml; do util/xmlformat/xmlformat.pl -f util/xmlformat/xmlformat.conf -i $i ; done
 
-To reformat all files in both parts:
-for i in guide help; do
+To reformat all files in all languages:
+for i in C de it ja pt ru; do
   for j in $i/*; do
     echo "enter $j";
-    for k in $j/*.xml; do
+    for k in $j/*.xml $j/*.docbook; do
       echo $k;
       util/xmlformat/xmlformat.pl -f util/xmlformat/xmlformat.conf -i $k;
     done;



Summary of changes:
 C/guide/appendixa.xml                |    3 +-
 C/guide/appendixd.xml                |   13 +-
 C/guide/ch_accts.xml                 |   54 +-
 C/guide/ch_basics.xml                |  236 +++-
 C/guide/ch_bus_features.xml          |   52 +-
 C/guide/ch_capgain.xml               |   67 +-
 C/guide/ch_cbook.xml                 |   61 +-
 C/guide/ch_cc.xml                    |   27 +-
 C/guide/ch_currency.xml              |  454 +++---
 C/guide/ch_dep.xml                   |   20 +-
 C/guide/ch_importing.xml             |   26 +-
 C/guide/ch_invest.xml                | 2540 ++++++++++++++++++++--------------
 C/guide/ch_loans.xml                 |   55 +-
 C/guide/ch_oview.xml                 |   98 +-
 C/guide/ch_python_bindings.xml       |    3 +-
 C/guide/ch_reports.xml               |  105 +-
 C/guide/ch_txns.xml                  |  271 ++--
 C/guide/fdl-appendix.xml             |    5 +-
 C/guide/index.docbook                | 1068 ++++++++------
 C/manual/ch_Account-Actions.xml      |   81 +-
 C/manual/ch_Business.xml             |   57 +-
 C/manual/ch_Customize.xml            | 1059 ++++++++------
 C/manual/ch_Finance-Quote.xml        |  330 +++--
 C/manual/ch_GUIMenus.xml             |   40 +-
 C/manual/ch_GettingHelp.xml          |   35 +-
 C/manual/ch_GettingStarted.xml       |  245 ++--
 C/manual/ch_Intro.xml                |    3 +-
 C/manual/ch_Reports.xml              |  504 ++++---
 C/manual/ch_Tools_Assistants.xml     |  397 ++++--
 C/manual/ch_Transactions.xml         |  520 ++++---
 C/manual/fdl-appendix.xml            |    5 +-
 C/manual/index.docbook               |  888 +++++++-----
 C/manual/txf-categories.xml          |    3 +-
 de/guide/appendixa.xml               |    2 +-
 de/guide/ch_basics.xml               |   70 +-
 de/guide/ch_budgets.xml              |  179 +--
 de/guide/ch_bus_features.xml         |  255 ++--
 de/guide/ch_cbook.xml                |   12 +-
 de/guide/ch_currency.xml             |   12 +-
 de/guide/ch_dep.xml                  |  344 +++--
 de/guide/ch_expenses.xml             |   12 +-
 de/guide/ch_invest.xml               |   29 +-
 de/guide/ch_loans.xml                |    4 +-
 de/guide/ch_oview.xml                |   54 +-
 de/guide/ch_reports.xml              |   21 +-
 de/guide/ch_txns.xml                 |  111 +-
 de/guide/fdl-appendix.xml            |    5 +-
 de/guide/glossary.xml                |    7 +-
 de/guide/index.docbook               |  908 +++++++-----
 de/manual/ch_Account-Actions.xml     |  294 ++--
 de/manual/ch_Business.xml            |  244 ++--
 de/manual/ch_Customize.xml           |  152 +-
 de/manual/ch_Finance-Quote.xml       |  244 ++--
 de/manual/ch_GUIMenus.xml            |  225 +--
 de/manual/ch_GettingHelp.xml         |    4 +-
 de/manual/ch_GettingStarted.xml      |   86 +-
 de/manual/ch_Intro.xml               |    3 +-
 de/manual/ch_Reports.xml             |   68 +-
 de/manual/ch_Tools_Assistants.xml    | 1512 ++++++++++----------
 de/manual/ch_Transactions.xml        |  368 +++--
 de/manual/fdl-appendix.xml           |    5 +-
 de/manual/index.docbook              |  693 ++++++----
 de/manual/legal.xml                  |    4 +-
 de/manual/para-assist-intro.xml      |   37 +-
 it/guide/index.docbook               |  867 +++++++-----
 it/manual/index.docbook              | 1456 ++++++++++---------
 ja/guide/appendixa.xml               |    1 +
 ja/guide/ch_basics.xml               |   12 +-
 ja/guide/ch_currency.xml             |    4 +-
 ja/guide/ch_invest.xml               |    7 +-
 ja/guide/ch_oview.xml                |    4 +-
 ja/guide/ch_txns.xml                 |   10 +-
 ja/guide/fdl-appendix.xml            |    5 +-
 ja/guide/index.docbook               |  463 ++++---
 pt/guide/appendixa.xml               |    7 +-
 pt/guide/ch_accts.xml                |   45 +-
 pt/guide/ch_basics.xml               |  171 ++-
 pt/guide/ch_budgets.xml              |  131 +-
 pt/guide/ch_bus_ap.xml               |  133 +-
 pt/guide/ch_bus_ar.xml               |  259 ++--
 pt/guide/ch_bus_intro.xml            |   20 +-
 pt/guide/ch_bus_pay.xml              |  141 +-
 pt/guide/ch_bus_setup.xml            |  147 +-
 pt/guide/ch_capgain.xml              |   57 +-
 pt/guide/ch_cbook.xml                |  100 +-
 pt/guide/ch_cc.xml                   |  125 +-
 pt/guide/ch_currency.xml             |  148 +-
 pt/guide/ch_dep.xml                  |  236 +++-
 pt/guide/ch_import_business_data.xml |   61 +-
 pt/guide/ch_invest.xml               |  321 +++--
 pt/guide/ch_loans.xml                |  101 +-
 pt/guide/ch_oth_assets.xml           |  277 +++-
 pt/guide/ch_oview.xml                |   34 +-
 pt/guide/ch_python_bindings.xml      |   25 +-
 pt/guide/ch_txns.xml                 |  289 ++--
 pt/guide/fdl-appendix.xml            |    5 +-
 pt/guide/index.docbook               |  615 ++++----
 pt/manual/ch_Account-Actions.xml     |   20 +-
 pt/manual/ch_Customize.xml           |   48 +-
 pt/manual/ch_GUIMenus.xml            |   16 +-
 pt/manual/ch_GettingHelp.xml         |    3 +-
 pt/manual/ch_Intro.xml               |    3 +-
 pt/manual/ch_Reports.xml             |    6 +-
 pt/manual/ch_Tools_Assistants.xml    |    7 +-
 pt/manual/ch_Transactions.xml        |   11 +-
 pt/manual/fdl-appendix.xml           |    5 +-
 pt/manual/index.docbook              |  519 ++++---
 pt/manual/txf-categories.xml         |    4 +-
 ru/guide/appendixa.xml               |    3 +-
 ru/guide/ch_basics.xml               |   12 +-
 ru/guide/ch_bus_features.xml         |  108 +-
 ru/guide/ch_currency.xml             |    4 +-
 ru/guide/ch_invest.xml               |   73 +-
 ru/guide/ch_oview.xml                |   38 +-
 ru/guide/ch_python_bindings.xml      |    3 +-
 ru/guide/ch_txns.xml                 |   11 +-
 ru/guide/fdl-appendix.xml            |    5 +-
 ru/guide/index.docbook               |  589 ++++----
 util/xmlformat/README                |    8 +-
 util/xmlformat/xmlformat.conf        |   22 +-
 120 files changed, 13750 insertions(+), 9334 deletions(-)



More information about the gnucash-changes mailing list