gnucash-docs maint: Multiple changes pushed

Frank H.Ellenberger fell at code.gnucash.org
Mon May 31 13:56:58 EDT 2021


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/3398d85f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5edcc027 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/b881a9a3 (commit)



commit 3398d85fa8c7dea2e16f471fe483fb532b28eb2a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon May 31 18:54:39 2021 +0200

    Help: Replace most <literallayout> by <screen>

diff --git a/help/C/Help_ch_Account-Actions.xml b/help/C/Help_ch_Account-Actions.xml
index faabf0b..f57ee4a 100644
--- a/help/C/Help_ch_Account-Actions.xml
+++ b/help/C/Help_ch_Account-Actions.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.x
   Last modified: December 7th 2009
        modified: March 28th 2007
        modified: August 12th 2006
 	   modified: February 28th 2005
-
   Maintainers:
-               Alex Aycinena <alex.aycinena at gmail.com>
-               Chris Lyttle <chris at wilddev.net>
-               Neil Williams <linux at codehelp.co.uk>
-
+    Alex Aycinena <alex.aycinena at gmail.com>
+    Chris Lyttle <chris at wilddev.net>
+    Neil Williams <linux at codehelp.co.uk>
   Author:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="setup-accounts"
          xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -343,10 +340,9 @@
       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="Help_chtacctseg.xml"/>
     </para>
 
-    <xi:include href="Help_chtacctseg.xml" />
-
     <note id="accts-code">
       <title>Accounts codes</title>
 
diff --git a/help/C/Help_ch_Business.xml b/help/C/Help_ch_Business.xml
index 2c285d5..84b8b4c 100644
--- a/help/C/Help_ch_Business.xml
+++ b/help/C/Help_ch_Business.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-	updated Patrick Schweiger <pks at spiffykitty.com>
+    Jon Lapham <lapham at extracta.com.br>
+  updated Patrick Schweiger <pks at spiffykitty.com>
   Originally designed by Carol Champagne.
   Translators:
-               (translators put your name and email here)
+    (translators put your name and email here)
 -->
 <chapter id="chapter_busnss">
   <title>Business Features</title>
@@ -69,18 +68,16 @@
       payable system, you must first setup an account of the <emphasis>A/Payable</emphasis>
       type. The <emphasis>A/Payable</emphasis> account is usually a sub-account
       under Liabilities. It is within this account that the integrated A/P system
-      places transactions.</para>
-
-      <literallayout>
-        Basic A/P Account Hierarchy:
+      places transactions.
+      <screen>Basic A/P Account Hierarchy:
 
-        -Assets
-          -Bank
-        -Liabilities
-          -Accounts Payable
-        -Expenses
-          -AP Expenses
-      </literallayout>
+-Assets
+  -Bank
+-Liabilities
+  -Accounts Payable
+-Expenses
+  -AP Expenses</screen>
+</para>
 
      <para>You need to add additional asset accounts and real expense accounts to make
      this hierarchy useful.  The important aspects of this hierarchy are that you need
@@ -321,31 +318,36 @@
       <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.
+<screen>Basic A/R Account Hierarchy:
+
+-Assets
+  -Accounts Receivable
+  -Checking
+-Income
+  -Sales
+-Liabilities
+  -Tax
+    -Tax on Purchases
+    -Tax on Sales</screen>
     </para>
-<literallayout>
-        Basic A/R Account Hierarchy:
-
-        -Assets
-          -Accounts Receivable
-          -Checking
-        -Income
-          -Sales
-        -Liabilities
-          -Tax
-            -Tax on Purchases
-            -Tax on Sales
-
-      </literallayout>
+
+    <important>
+      <para>If you deal with customers in more than one currency you will need a separate <emphasis>Accounts
+        Receivable</emphasis> account for each currency:
+<screen>-Assets
+  -Accounts Receivable
+    -CHF
+    -EUR
+    :</screen>
+      </para>
+    </important>
+
     <note>
       <para>You need to add additional asset, expense, and income accounts to this hierarchy for it to be
         useful. The important aspects of this hierarchy are the use of an income account and the
         <emphasis>Accounts Receivable</emphasis> asset account, with account type set to
         <emphasis>A/Receivable</emphasis>.
       </para>
-
-      <para>If you deal with customers in more than one currency you will need a separate <emphasis>Accounts
-        Receivable</emphasis> account for each currency.
-      </para>
     </note>
 
     <para>The transactions generated by the A/R system are recorded within the <emphasis>Accounts
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 5e2c864..f201eff 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -1852,15 +1852,14 @@
                 </para>
 
                 <para>For example given an account structure like
-                </para>
-<literallayout>
-Assets (type ASSET)
+<screen>Assets (type ASSET)
   Broker (type ASSET)
     Widget Stock (type STOCK)
 Income (type INCOME)
   Dividends (type INCOME)
-    Widget Stock (type INCOME)
-</literallayout>
+    Widget Stock (type INCOME)</screen>
+                </para>
+
                 <para>A transaction that debits the "Assets:Broker" account and credits the "Income:Dividends:Widget
                   Stock" account will count as income even though it doesn't have a split with
                   account "Assets:Broker:Widget Stock".
diff --git a/help/C/Help_chtacctseg.xml b/help/C/Help_chtacctseg.xml
index 96b3c88..d3bb4de 100644
--- a/help/C/Help_chtacctseg.xml
+++ b/help/C/Help_chtacctseg.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE literallayout SYSTEM "gnc-docbookx.dtd">
-<literallayout>
-<literal>        300             Expenses
-         |
-         +--310         Living Expenses
-         |   |
-         |   +--311     Beer
-         |   |
-         |   +--312     Cable
-         |
-         +--320         Business Expenses
-         |   |
-         |   +--321     8-inch Floppies
-         |   |
-         |   +--322     Blue Ray RW DVDs
-         |   |
-         :   :</literal>
-</literallayout>
+<!DOCTYPE screen SYSTEM "gnc-docbookx.dtd">
+<screen>300             Expenses
+ |
+ +--310         Living Expenses
+ |   |
+ |   +--311     Beer
+ |   |
+ |   +--312     Cable
+ |
+ +--320         Business Expenses
+ |   |
+ |   +--321     8-inch Floppies
+ |   |
+ |   +--322     Blue Ray RW DVDs
+ |   |
+ :   :</screen>
diff --git a/help/C/Help_tips-appendix.xml b/help/C/Help_tips-appendix.xml
index d46c058..37700ce 100644
--- a/help/C/Help_tips-appendix.xml
+++ b/help/C/Help_tips-appendix.xml
@@ -135,7 +135,7 @@
                 <para>You need to
                   <orderedlist spacing="compact">
                     <listitem>
-                      <para>register at <ulink url="&url-av;" /> and
+                      <para>register at <ulink url="&url-av;"/> and
                       </para>
                     </listitem>
 
@@ -178,7 +178,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.aex.nl" />
+                <para><ulink url="https://www.aex.nl"/>
                 </para>
 
                 <para>includes former sources AEX-<quote>Futures</quote> and -<quote>Options</quote>
@@ -198,7 +198,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.aia.com.hk" />
+                <para><ulink url="https://www.aia.com.hk"/>
                 </para>
               </entry>
             </row>
@@ -215,7 +215,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.amfiindia.com" />
+                <para><ulink url="https://www.amfiindia.com"/>
                 </para>
               </entry>
             </row>
@@ -232,7 +232,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.ase.gr" />
+                <para><ulink url="https://www.ase.gr"/>
                 </para>
               </entry>
             </row>
@@ -249,7 +249,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.asx.com.au" />
+                <para><ulink url="https://www.asx.com.au"/>
                 </para>
 
                 <para>Requires at least F::Q 1.41 to get quotes for stocks starting with 'X', like <quote>XRO</quote>,
@@ -270,7 +270,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.bamosz.hu" />
+                <para><ulink url="https://www.bamosz.hu"/>
                 </para>
               </entry>
             </row>
@@ -287,7 +287,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://bmonesbittburns.com" />
+                <para><ulink url="https://bmonesbittburns.com"/>
                 </para>
               </entry>
             </row>
@@ -304,7 +304,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.bvb.ro" />
+                <para><ulink url="https://www.bvb.ro"/>
                 </para>
               </entry>
             </row>
@@ -321,7 +321,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.bet.hu" />
+                <para><ulink url="https://www.bet.hu"/>
                 </para>
               </entry>
             </row>
@@ -338,7 +338,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://citywire.co.uk" />
+                <para><ulink url="https://citywire.co.uk"/>
                 </para>
               </entry>
             </row>
@@ -355,7 +355,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.cse.lk" />
+                <para><ulink url="https://www.cse.lk"/>
                 </para>
               </entry>
             </row>
@@ -372,10 +372,10 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.cominvest-am.de" />
+                <para><ulink url="https://www.cominvest-am.de"/>
                 </para>
 
-                <para>Obsolete, update: <ulink url="https://eggert.org/software/Comdirect.pm" />
+                <para>Obsolete, update: <ulink url="https://eggert.org/software/Comdirect.pm"/>
                 </para>
               </entry>
             </row>
@@ -392,7 +392,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.deka.de" />
+                <para><ulink url="https://www.deka.de"/>
                 </para>
               </entry>
             </row>
@@ -409,7 +409,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.dws.de" />
+                <para><ulink url="https://www.dws.de"/>
                 </para>
               </entry>
             </row>
@@ -426,7 +426,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.equinox.co.za" />
+                <para><ulink url="https://www.equinox.co.za"/>
                 </para>
               </entry>
             </row>
@@ -443,7 +443,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fidelity.com" />
+                <para><ulink url="https://www.fidelity.com"/>
                 </para>
               </entry>
             </row>
@@ -460,7 +460,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fidelity.com/fixed-income-bonds/overview" />
+                <para><ulink url="https://www.fidelity.com/fixed-income-bonds/overview"/>
                 </para>
               </entry>
             </row>
@@ -477,7 +477,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://finance.canada.com" />
+                <para><ulink url="https://finance.canada.com"/>
                 </para>
               </entry>
             </row>
@@ -494,7 +494,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://funds.ft.com" />
+                <para><ulink url="https://funds.ft.com"/>
                 </para>
               </entry>
             </row>
@@ -511,7 +511,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.finanzpartner.de" />
+                <para><ulink url="https://www.finanzpartner.de"/>
                 </para>
               </entry>
             </row>
@@ -528,7 +528,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.ftportfolios.com" />
+                <para><ulink url="https://www.ftportfolios.com"/>
                 </para>
               </entry>
             </row>
@@ -545,12 +545,13 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fundlibrary.com" />
+                <para><ulink url="https://www.fundlibrary.com"/>
                 </para>
 
-                <para>This module uses an id that represents the mutual fund on www.fundlibrary.com. There is no easy way
-                  of fetching the id except to jump onto the fundlibrary website, look up the fund
-                  and view the url for clues to its id number.
+                <para>This module uses an id that represents the mutual fund on
+                  <ulink url="https://www.fundlibrary.com"/>. There is no easy way of fetching the
+                  id except to jump onto the fundlibrary website, look up the fund and view the url
+                  for clues to its id number.
                 </para>
               </entry>
             </row>
@@ -567,7 +568,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.goldmoney.com" />
+                <para><ulink url="https://www.goldmoney.com"/>
                 </para>
               </entry>
             </row>
@@ -584,7 +585,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.hex.com" />
+                <para><ulink url="https://www.hex.com"/>
                 </para>
               </entry>
             </row>
@@ -601,7 +602,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.maninvestments.com.au" />
+                <para><ulink url="https://www.maninvestments.com.au"/>
                 </para>
               </entry>
             </row>
@@ -618,7 +619,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://morningstar.co.uk" />
+                <para><ulink url="https://morningstar.co.uk"/>
                 </para>
               </entry>
             </row>
@@ -635,7 +636,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.morningstar.co.jp" />
+                <para><ulink url="https://www.morningstar.co.jp"/>
                 </para>
               </entry>
             </row>
@@ -652,7 +653,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.morningstar.se" />
+                <para><ulink url="https://www.morningstar.se"/>
                 </para>
               </entry>
             </row>
@@ -669,7 +670,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fool.com" />
+                <para><ulink url="https://www.fool.com"/>
                 </para>
               </entry>
             </row>
@@ -686,7 +687,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.nzx.com" />
+                <para><ulink url="https://www.nzx.com"/>
                 </para>
               </entry>
             </row>
@@ -703,7 +704,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.boursorama.com" />
+                <para><ulink url="https://www.boursorama.com"/>
                 </para>
               </entry>
             </row>
@@ -720,7 +721,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://bourse.lerevenu.com" />
+                <para><ulink url="https://bourse.lerevenu.com"/>
                 </para>
               </entry>
             </row>
@@ -737,7 +738,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.platinum.com.au" />
+                <para><ulink url="https://www.platinum.com.au"/>
                 </para>
               </entry>
             </row>
@@ -754,7 +755,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.six-swiss-exchange.com" />
+                <para><ulink url="https://www.six-swiss-exchange.com"/>
                 </para>
               </entry>
             </row>
@@ -771,7 +772,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.six-swiss-exchange.com" />
+                <para><ulink url="https://www.six-swiss-exchange.com"/>
                 </para>
               </entry>
             </row>
@@ -788,10 +789,10 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.seb.se" />
+                <para><ulink url="https://www.seb.se"/>
                 </para>
 
-                <para>Consult <ulink url="https://taz.vv.sebank.se/cgi-bin/pts3/pow/Fonder/kurser/kurslista_body.asp" />
+                <para>Consult <ulink url="https://taz.vv.sebank.se/cgi-bin/pts3/pow/Fonder/kurser/kurslista_body.asp"/>
                   for all available funds.
                 </para>
               </entry>
@@ -809,7 +810,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.sharenet.co.za" />
+                <para><ulink url="https://www.sharenet.co.za"/>
                 </para>
               </entry>
             </row>
@@ -826,7 +827,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.stockhouse.ca" />
+                <para><ulink url="https://www.stockhouse.ca"/>
                 </para>
               </entry>
             </row>
@@ -843,7 +844,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tdassetmanagement.com" />
+                <para><ulink url="https://www.tdassetmanagement.com"/>
                 </para>
               </entry>
             </row>
@@ -860,7 +861,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tdwaterhouse.ca" />
+                <para><ulink url="https://www.tdwaterhouse.ca"/>
                 </para>
               </entry>
             </row>
@@ -877,7 +878,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tiaa-cref.org" />
+                <para><ulink url="https://www.tiaa-cref.org"/>
                 </para>
               </entry>
             </row>
@@ -894,7 +895,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.TMXmoney.com" />
+                <para><ulink url="https://www.TMXmoney.com"/>
                 </para>
               </entry>
             </row>
@@ -911,7 +912,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.troweprice.com" />
+                <para><ulink url="https://www.troweprice.com"/>
                 </para>
               </entry>
             </row>
@@ -928,7 +929,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.trustnet.com" />
+                <para><ulink url="https://www.trustnet.com"/>
                 </para>
               </entry>
             </row>
@@ -945,7 +946,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.trustnet.com" />
+                <para><ulink url="https://www.trustnet.com"/>
                 </para>
               </entry>
             </row>
@@ -962,7 +963,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.union-invest.de" />
+                <para><ulink url="https://www.union-invest.de"/>
                 </para>
               </entry>
             </row>
@@ -979,7 +980,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.publicdebt.treas.gov" />
+                <para><ulink url="https://www.publicdebt.treas.gov"/>
                 </para>
               </entry>
             </row>
@@ -996,7 +997,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tsp.gov" />
+                <para><ulink url="https://www.tsp.gov"/>
                 </para>
               </entry>
             </row>
@@ -1030,7 +1031,7 @@
               </entry>
 
               <entry>
-                <para>See <ulink url="&url-mail-ar;gnucash-user/2008-February/023686.html" />
+                <para>See <ulink url="&url-mail-ar;gnucash-user/2008-February/023686.html"/>
                 </para>
               </entry>
             </row>
@@ -1094,7 +1095,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="&url-yh-fin;" /> through "JavaScript Object Notation"
+                <para><ulink url="&url-yh-fin;"/> through "JavaScript Object Notation"
                 </para>
               </entry>
             </row>
@@ -1111,7 +1112,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="&url-yh-fin;" /> through "Yahoo Query Language"
+                <para><ulink url="&url-yh-fin;"/> through "Yahoo Query Language"
                 </para>
               </entry>
             </row>
@@ -3105,14 +3106,11 @@
     <abstract>
       <para>TIAA-CREF Annuities are not listed on any exchange, unlike their mutual funds TIAA-CREF provides
         unit values via a cgi on their website. The cgi returns a csv file in the format
-<literallayout>
-          <computeroutput>
-bogus_symbol1,price1,date1
+<programlisting language="csv">bogus_symbol1,price1,date1
 bogus_symbol2,price2,date2
-..etc.
-          </computeroutput>
-        </literallayout>
-        where bogus_symbol takes on the following values for the various annuities:
+…</programlisting>
+        where <replaceable>bogus_symbol</replaceable> takes on the following values for the various
+        annuities:
       </para>
     </abstract>
 
diff --git a/help/de/Help_ch_Account-Actions.xml b/help/de/Help_ch_Account-Actions.xml
index 20ec4e2..fb7a82e 100644
--- a/help/de/Help_ch_Account-Actions.xml
+++ b/help/de/Help_ch_Account-Actions.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!-- (Do not remove this comment block.)
-  Version: 2.0.x
+<!-- (Do not remove this comm  Version: 2.0.x
   Last modified: December 7th 2009
        modified: March 28th 2007
        modified: August 12th 2006
 	   modified: February 28th 2005
-
   Maintainers:
     Alex Aycinena <alex.aycinena at gmail.com>
     Chris Lyttle <chris at wilddev.net>
     Neil Williams <linux at codehelp.co.uk>
-
   Author:
     Chris Lyttle <chris at wilddev.net>
   Translators:
@@ -403,10 +400,9 @@
       zusammenfassenden Bericht aufrufen, werden typischerweise nur die Hauptäste im Bericht
       dargestellt und nicht die Einzelkonten. Eine Kontenhierarchie könnte beispielsweise wie folgt
       aussehen:
+      <xi:include href="Help_chtacctseg.xml"/>
     </para>
 
-    <xi:include href="Help_chtacctseg.xml" />
-
     <tip id="accts-code">
       <title>Kontennummer</title>
 <!-- FIXME source: Since it is difficult to visualise factual relationships with alphabetical sorting by account name, it is recommended to use and sort by alphanumeric account numbers. -->
diff --git a/help/de/Help_ch_Business.xml b/help/de/Help_ch_Business.xml
index d7adb1f..8cae943 100644
--- a/help/de/Help_ch_Business.xml
+++ b/help/de/Help_ch_Business.xml
@@ -72,18 +72,16 @@
       payable system, you must first setup an account of the <emphasis>A/Payable</emphasis>
       type. The <emphasis>A/Payable</emphasis> account is usually a sub-account
       under Liabilities. It is within this account that the integrated A/P system
-      places transactions.</para>
+      places transactions.
+      <screen>Basic A/P Account Hierarchy:
 
-      <literallayout>
-        Basic A/P Account Hierarchy:
-
-        -Assets
-          -Bank
-        -Liabilities
-          -Accounts Payable
-        -Expenses
-          -AP Expenses
-      </literallayout>
+-Assets
+  -Bank
+-Liabilities
+  -Accounts Payable
+-Expenses
+  -AP Expenses</screen>
+</para>
 
      <para>You need to add additional asset accounts and real expense accounts to make
      this hierarchy useful.  The important aspects of this hierarchy are that you need
@@ -324,31 +322,36 @@
       <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.
+<screen>Basic A/R Account Hierarchy:
+
+-Assets
+  -Accounts Receivable
+  -Checking
+-Income
+  -Sales
+-Liabilities
+  -Tax
+    -Tax on Purchases
+    -Tax on Sales</screen>
     </para>
-<literallayout>
-        Basic A/R Account Hierarchy:
-
-        -Assets
-          -Accounts Receivable
-          -Checking
-        -Income
-          -Sales
-        -Liabilities
-          -Tax
-            -Tax on Purchases
-            -Tax on Sales
-
-      </literallayout>
+
+    <important>
+      <para>If you deal with customers in more than one currency you will need a separate <emphasis>Accounts
+        Receivable</emphasis> account for each currency:
+<screen>-Assets
+  -Accounts Receivable
+    -CHF
+    -EUR
+    :</screen>
+      </para>
+    </important>
+
     <note>
       <para>You need to add additional asset, expense, and income accounts to this hierarchy for it to be
         useful. The important aspects of this hierarchy are the use of an income account and the
         <emphasis>Accounts Receivable</emphasis> asset account, with account type set to
         <emphasis>A/Receivable</emphasis>.
       </para>
-
-      <para>If you deal with customers in more than one currency you will need a separate <emphasis>Accounts
-        Receivable</emphasis> account for each currency.
-      </para>
     </note>
 
     <para>The transactions generated by the A/R system are recorded within the <emphasis>Accounts
diff --git a/help/de/Help_ch_Reports.xml b/help/de/Help_ch_Reports.xml
index b955f73..92a6ae9 100644
--- a/help/de/Help_ch_Reports.xml
+++ b/help/de/Help_ch_Reports.xml
@@ -426,7 +426,7 @@
 
                 <imageobject role="fo">
                   <imagedata fileref="figures/Help_TxRptOpt_Screen.png" format="PNG"
-                     srccredit="Geert Janssens" ></imagedata>
+                     srccredit="Geert Janssens"></imagedata>
                 </imageobject>
 
                 <textobject>
@@ -461,6 +461,7 @@
                           <entry>
                             Select All
                           </entry>
+
                           <entry>
                             Select all accounts
                           </entry>
@@ -480,6 +481,7 @@
                           <entry>
                             Select Children
                           </entry>
+
                           <entry>
                             Select all descendants of selected account
                           </entry>
@@ -489,6 +491,7 @@
                           <entry>
                             Select Default
                           </entry>
+
                           <entry>
                             Select the default account selection
                           </entry>
@@ -526,6 +529,7 @@
                           <entry>
                             None
                           </entry>
+
                           <entry>
                             Do not do any filtering
                           </entry>
@@ -631,6 +635,7 @@
                           <entry>
                             Single
                           </entry>
+
                           <entry>
                             Display 1 line per transaction,
                           </entry>
@@ -640,6 +645,7 @@
                           <entry>
                             Multi-Line
                           </entry>
+
                           <entry>
                             Display a transaction header and 1 line per split.
                           </entry>
@@ -693,6 +699,7 @@
                           <entry>
                             None
                           </entry>
+
                           <entry>
                             Do not display Amount
                           </entry>
@@ -702,6 +709,7 @@
                           <entry>
                             Single
                           </entry>
+
                           <entry>
                             Single column display
                           </entry>
@@ -711,6 +719,7 @@
                           <entry>
                             Double
                           </entry>
+
                           <entry>
                             Two column display
                           </entry>
@@ -748,6 +757,7 @@
                           <entry>
                             Global Preference
                           </entry>
+
                           <entry>
                             Use reversing option specified in global preference.
                           </entry>
@@ -757,6 +767,7 @@
                           <entry>
                             None
                           </entry>
+
                           <entry>
                             Do not display signs reversed
                           </entry>
@@ -766,6 +777,7 @@
                           <entry>
                             Credit Accounts
                           </entry>
+
                           <entry>
                             Reverse amount display for Liability, Payable, Equity, Credit Card and
                             Income accounts
@@ -776,6 +788,7 @@
                           <entry>
                             Income and Expense
                           </entry>
+
                           <entry>
                             Reverse amount display for Income and Expense accounts
                           </entry>
@@ -834,6 +847,7 @@
                           <entry>
                             All
                           </entry>
+
                           <entry>
                             Show all transactions
                           </entry>
@@ -843,6 +857,7 @@
                           <entry>
                             Unreconciled
                           </entry>
+
                           <entry>
                             Unreconciled only
                           </entry>
@@ -852,6 +867,7 @@
                           <entry>
                             Cleared
                           </entry>
+
                           <entry>
                             Cleared only
                           </entry>
@@ -861,6 +877,7 @@
                           <entry>
                             Reconciled
                           </entry>
+
                           <entry>
                             Reconciled only
                           </entry>
@@ -881,6 +898,7 @@
                           <entry>
                             Non-void only
                           </entry>
+
                           <entry>
                             Show only non-voided transactions
                           </entry>
@@ -890,6 +908,7 @@
                           <entry>
                             Void only
                           </entry>
+
                           <entry>
                             Show only voided transactions
                           </entry>
@@ -899,6 +918,7 @@
                           <entry>
                             Both
                           </entry>
+
                           <entry>
                             Show both and include voided transactions in totals
                           </entry>
@@ -919,6 +939,7 @@
                           <entry>
                             Excluding closing transactions
                           </entry>
+
                           <entry>
                             Show only regular transactions
                           </entry>
@@ -928,6 +949,7 @@
                           <entry>
                             Show both closing and regular transactions
                           </entry>
+
                           <entry>
                             Show both regular and closing transactions
                           </entry>
@@ -937,6 +959,7 @@
                           <entry>
                             Show closing transactions only
                           </entry>
+
                           <entry>
                             Show closing transactions only
                           </entry>
@@ -983,6 +1006,7 @@
                           <entry>
                             Today
                           </entry>
+
                           <entry>
                             The current date
                           </entry>
@@ -992,6 +1016,7 @@
                           <entry>
                             Start of this month
                           </entry>
+
                           <entry>
                             First day of the current month
                           </entry>
@@ -1001,6 +1026,7 @@
                           <entry>
                             Start of previous month
                           </entry>
+
                           <entry>
                             First day of the previous month
                           </entry>
@@ -1010,6 +1036,7 @@
                           <entry>
                             Start of current quarter
                           </entry>
+
                           <entry>
                             First day of the current quarterly accounting period
                           </entry>
@@ -1019,6 +1046,7 @@
                           <entry>
                             Start of previous quarter
                           </entry>
+
                           <entry>
                             First day of the previous quarterly accounting period
                           </entry>
@@ -1028,6 +1056,7 @@
                           <entry>
                             Start of this year
                           </entry>
+
                           <entry>
                             First day of the current calendar year
                           </entry>
@@ -1037,6 +1066,7 @@
                           <entry>
                             Start of previous year
                           </entry>
+
                           <entry>
                             First day of the previous calendar year
                           </entry>
@@ -1046,6 +1076,7 @@
                           <entry>
                             Start of accounting period
                           </entry>
+
                           <entry>
                             First day of the accounting period as defined in the global preferences
                           </entry>
@@ -1070,6 +1101,7 @@
                           <entry>
                             Today
                           </entry>
+
                           <entry>
                             The current date
                           </entry>
@@ -1079,6 +1111,7 @@
                           <entry>
                             End of this month
                           </entry>
+
                           <entry>
                             Last day of the current month
                           </entry>
@@ -1088,6 +1121,7 @@
                           <entry>
                             End of previous month
                           </entry>
+
                           <entry>
                             Last day of the previous month
                           </entry>
@@ -1097,6 +1131,7 @@
                           <entry>
                             End of current quarter
                           </entry>
+
                           <entry>
                             Last day of the current quarterly accounting period
                           </entry>
@@ -1106,6 +1141,7 @@
                           <entry>
                             End of previous quarter
                           </entry>
+
                           <entry>
                             Last day of the previous quarterly accounting period
                           </entry>
@@ -1115,6 +1151,7 @@
                           <entry>
                             End of this year
                           </entry>
+
                           <entry>
                             Last day of the current calendar year
                           </entry>
@@ -1124,6 +1161,7 @@
                           <entry>
                             End of previous year
                           </entry>
+
                           <entry>
                             Last day of the previous calendar year
                           </entry>
@@ -1133,6 +1171,7 @@
                           <entry>
                             End of accounting period
                           </entry>
+
                           <entry>
                             Last day of the accounting period as defined in the global preferences
                           </entry>
@@ -1153,6 +1192,7 @@
                           <entry>
                             Single
                           </entry>
+
                           <entry>
                             Display 1 line
                           </entry>
@@ -1162,6 +1202,7 @@
                           <entry>
                             Multi-Line
                           </entry>
+
                           <entry>
                             Display N lines
                           </entry>
@@ -1221,6 +1262,7 @@
                           <entry>
                             None
                           </entry>
+
                           <entry>
                             Do not sort
                           </entry>
@@ -1230,6 +1272,7 @@
                           <entry>
                             Account Name
                           </entry>
+
                           <entry>
                             Sort and subtotal by account name
                           </entry>
@@ -1239,6 +1282,7 @@
                           <entry>
                             Account Code
                           </entry>
+
                           <entry>
                             Sort and subtotal by account code
                           </entry>
@@ -1248,6 +1292,7 @@
                           <entry>
                             Date
                           </entry>
+
                           <entry>
                             Sort by date
                           </entry>
@@ -1257,6 +1302,7 @@
                           <entry>
                             Reconciled Date
                           </entry>
+
                           <entry>
                             Sort by the reconciled date
                           </entry>
@@ -1266,6 +1312,7 @@
                           <entry>
                             Reconciled Status
                           </entry>
+
                           <entry>
                             Sort by the reconciled status
                           </entry>
@@ -1275,6 +1322,7 @@
                           <entry>
                             Register Order
                           </entry>
+
                           <entry>
                             Sort as within the register
                           </entry>
@@ -1284,6 +1332,7 @@
                           <entry>
                             Other Account Name
                           </entry>
+
                           <entry>
                             Sort by account transferred from/to's name
                           </entry>
@@ -1293,6 +1342,7 @@
                           <entry>
                             Other Account Code
                           </entry>
+
                           <entry>
                             Sort by account transferred from/to's code
                           </entry>
@@ -1302,6 +1352,7 @@
                           <entry>
                             Amount
                           </entry>
+
                           <entry>
                             Sort by amount
                           </entry>
@@ -1311,6 +1362,7 @@
                           <entry>
                             Description
                           </entry>
+
                           <entry>
                             Sort by description
                           </entry>
@@ -1320,6 +1372,7 @@
                           <entry>
                             Number
                           </entry>
+
                           <entry>
                             Sort by check/transaction number
                           </entry>
@@ -1329,6 +1382,7 @@
                           <entry>
                             Memo
                           </entry>
+
                           <entry>
                             Sort by memo
                           </entry>
@@ -1361,6 +1415,7 @@
                           <entry>
                             Ascending
                           </entry>
+
                           <entry>
                             Smallest to largest, earliest to latest
                           </entry>
@@ -1370,6 +1425,7 @@
                           <entry>
                             Descending
                           </entry>
+
                           <entry>
                             Largest to smallest, latest to earliest
                           </entry>
@@ -1407,6 +1463,7 @@
                           <entry>
                             Ascending
                           </entry>
+
                           <entry>
                             Smallest to largest, earliest to latest
                           </entry>
@@ -1416,6 +1473,7 @@
                           <entry>
                             Descending
                           </entry>
+
                           <entry>
                             Largest to smallest, latest to earliest
                           </entry>
@@ -1530,8 +1588,11 @@
                   <entry>
                     Cheques Received
                   </entry>
+
                   <entry></entry>
+
                   <entry></entry>
+
                   <entry></entry>
                 </row>
 
@@ -1539,10 +1600,13 @@
                   <entry>
                     Multiple Payers
                   </entry>
+
                   <entry>
                     Income Account
                   </entry>
+
                   <entry></entry>
+
                   <entry>
                     £30.00
                   </entry>
@@ -1550,12 +1614,15 @@
 
                 <row>
                   <entry></entry>
+
                   <entry>
                     Bank Account
                   </entry>
+
                   <entry>
                     £30.00
                   </entry>
+
                   <entry></entry>
                 </row>
               </tbody>
@@ -1594,8 +1661,11 @@
                   <entry>
                     Cheques Received
                   </entry>
+
                   <entry></entry>
+
                   <entry></entry>
+
                   <entry></entry>
                 </row>
 
@@ -1603,10 +1673,13 @@
                   <entry>
                     First Payer
                   </entry>
+
                   <entry>
                     Income Account
                   </entry>
+
                   <entry></entry>
+
                   <entry>
                     £10.00
                   </entry>
@@ -1616,10 +1689,13 @@
                   <entry>
                     Second Payer
                   </entry>
+
                   <entry>
                     Income Account
                   </entry>
+
                   <entry></entry>
+
                   <entry>
                     £20.00
                   </entry>
@@ -1627,12 +1703,15 @@
 
                 <row>
                   <entry></entry>
+
                   <entry>
                     Bank Account
                   </entry>
+
                   <entry>
                     £30.00
                   </entry>
+
                   <entry></entry>
                 </row>
               </tbody>
@@ -1776,15 +1855,14 @@
                 </para>
 
                 <para>For example given an account structure like
-                </para>
-<literallayout>
-Assets (type ASSET)
+<screen>Assets (type ASSET)
   Broker (type ASSET)
     Widget Stock (type STOCK)
 Income (type INCOME)
   Dividends (type INCOME)
-    Widget Stock (type INCOME)
-</literallayout>
+    Widget Stock (type INCOME)</screen>
+                </para>
+
                 <para>A transaction that debits the "Assets:Broker" account and credits the "Income:Dividends:Widget
                   Stock" account will count as income even though it doesn't have a split with
                   account "Assets:Broker:Widget Stock".
@@ -2166,6 +2244,7 @@ Income (type INCOME)
                           <entry>
                             Average Cost
                           </entry>
+
                           <entry>
                             The volume-weighted net average price of all exchanges.
                           </entry>
@@ -2175,6 +2254,7 @@ Income (type INCOME)
                           <entry>
                             Weighted Average (default)
                           </entry>
+
                           <entry>
                             The volume-weighted gross average price of all exchanges up to the date
                             of the report
@@ -2185,6 +2265,7 @@ Income (type INCOME)
                           <entry>
                             Most recent
                           </entry>
+
                           <entry>
                             The most recent recorded price
                           </entry>
@@ -2194,6 +2275,7 @@ Income (type INCOME)
                           <entry>
                             Nearest in time
                           </entry>
+
                           <entry>
                             The price recorded nearest in time to the report date
                           </entry>
@@ -2220,6 +2302,7 @@ Income (type INCOME)
                           <entry>
                             Name (default)
                           </entry>
+
                           <entry>
                             Company name
                           </entry>
@@ -2229,6 +2312,7 @@ Income (type INCOME)
                           <entry>
                             Total Owed
                           </entry>
+
                           <entry>
                             Total amount owed to company
                           </entry>
@@ -2238,6 +2322,7 @@ Income (type INCOME)
                           <entry>
                             Bracket Total Owed
                           </entry>
+
                           <entry>
                             Amount owed in oldest bracket. If same, use next oldest
                           </entry>
@@ -2258,6 +2343,7 @@ Income (type INCOME)
                           <entry>
                             Ascending (default)
                           </entry>
+
                           <entry>
                             0 … 999,999.99, A … Z
                           </entry>
@@ -2267,6 +2353,7 @@ Income (type INCOME)
                           <entry>
                             Descending
                           </entry>
+
                           <entry>
                             999,999.99 … 0, Z … A
                           </entry>
@@ -2452,6 +2539,7 @@ Income (type INCOME)
                           <entry>
                             Average Cost
                           </entry>
+
                           <entry>
                             The volume-weighted net average price of all exchanges
                           </entry>
@@ -2461,6 +2549,7 @@ Income (type INCOME)
                           <entry>
                             Weighted Average (default)
                           </entry>
+
                           <entry>
                             The volume-weighted gross average price of all exchanges
                           </entry>
@@ -2470,6 +2559,7 @@ Income (type INCOME)
                           <entry>
                             Most recent
                           </entry>
+
                           <entry>
                             The most recent recorded price
                           </entry>
@@ -2479,6 +2569,7 @@ Income (type INCOME)
                           <entry>
                             Nearest in time
                           </entry>
+
                           <entry>
                             The price recorded nearest in time to the report date
                           </entry>
@@ -2505,6 +2596,7 @@ Income (type INCOME)
                           <entry>
                             Name (default)
                           </entry>
+
                           <entry>
                             Company name
                           </entry>
@@ -2514,6 +2606,7 @@ Income (type INCOME)
                           <entry>
                             Total Owed
                           </entry>
+
                           <entry>
                             Total amount owed by company
                           </entry>
@@ -2523,6 +2616,7 @@ Income (type INCOME)
                           <entry>
                             Bracket Total Owed
                           </entry>
+
                           <entry>
                             Amount owed in oldest bracket. If same, use next oldest
                           </entry>
@@ -2543,6 +2637,7 @@ Income (type INCOME)
                           <entry>
                             Ascending (default)
                           </entry>
+
                           <entry>
                             0 … 999,999.99, A … Z
                           </entry>
@@ -2552,6 +2647,7 @@ Income (type INCOME)
                           <entry>
                             Descending
                           </entry>
+
                           <entry>
                             999,999.99 … 0, Z … A
                           </entry>
@@ -2616,6 +2712,7 @@ Income (type INCOME)
                           <entry>
                             Billing (default)
                           </entry>
+
                           <entry>
                             Address fields from billing address.
                           </entry>
@@ -2625,6 +2722,7 @@ Income (type INCOME)
                           <entry>
                             Shipping
                           </entry>
+
                           <entry>
                             Address fields from shipping address.
                           </entry>
diff --git a/help/de/Help_chtacctseg.xml b/help/de/Help_chtacctseg.xml
index ca12588..bd11916 100644
--- a/help/de/Help_chtacctseg.xml
+++ b/help/de/Help_chtacctseg.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE literallayout SYSTEM "gnc-docbookx.dtd">
-<literallayout>
-<literal>300             Aufwendungen
-          |
-          +--310         Lebenshaltungskosten
-          |   |
-          |   +--311     Getränke
-          |   |
-          |   +--312     Kommunikationsdienste
-          |
-          +--320         Betriebsausgaben
-          |   |
-          |   +--321     Datenspeicher
-          |   |
-          :   :</literal>
-</literallayout>
+<!DOCTYPE screen SYSTEM "gnc-docbookx.dtd">
+<screen>300             Aufwendungen
+ |
+ +--310         Lebenshaltungskosten
+ |   |
+ |   +--311     Getränke
+ |   |
+ |   +--312     Kommunikationsdienste
+ |
+ +--320         Betriebsausgaben
+ |   |
+ |   +--321     Datenspeicher
+ |   |
+ :   :</screen>
diff --git a/help/de/Help_tips-appendix.xml b/help/de/Help_tips-appendix.xml
index 4ac68e8..f8def79 100644
--- a/help/de/Help_tips-appendix.xml
+++ b/help/de/Help_tips-appendix.xml
@@ -136,7 +136,7 @@
                 <para>Sie müssen
                   <orderedlist spacing="compact">
                     <listitem>
-                      <para>sich auf<ulink url="&url-av;" />registrieren und
+                      <para>sich auf<ulink url="&url-av;"/>registrieren und
                       </para>
                     </listitem>
 
@@ -181,10 +181,10 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.aex.nl" />
+                <para><ulink url="https://www.aex.nl"/>
                 </para>
 
-                <para>inclusive der früheren Quellen AEX- <quote>Futures</quote> und - <quote>Options</quote>
+                <para>includes former sources AEX-<quote>Futures</quote> and -<quote>Options</quote>
                 </para>
               </entry>
             </row>
@@ -201,7 +201,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.aia.com.hk" />
+                <para><ulink url="https://www.aia.com.hk"/>
                 </para>
               </entry>
             </row>
@@ -218,7 +218,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.amfiindia.com" />
+                <para><ulink url="https://www.amfiindia.com"/>
                 </para>
               </entry>
             </row>
@@ -235,7 +235,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.ase.gr" />
+                <para><ulink url="https://www.ase.gr"/>
                 </para>
               </entry>
             </row>
@@ -252,7 +252,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.asx.com.au" />
+                <para><ulink url="https://www.asx.com.au"/>
                 </para>
 
                 <para>Benötigt mindestens F::Q 1.41, um Kurse zu holen, die mit 'X' beginnen wie <quote>XRO</quote>, aber
@@ -273,7 +273,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.bamosz.hu" />
+                <para><ulink url="https://www.bamosz.hu"/>
                 </para>
               </entry>
             </row>
@@ -290,7 +290,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://bmonesbittburns.com" />
+                <para><ulink url="https://bmonesbittburns.com"/>
                 </para>
               </entry>
             </row>
@@ -307,7 +307,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.bvb.ro" />
+                <para><ulink url="https://www.bvb.ro"/>
                 </para>
               </entry>
             </row>
@@ -324,7 +324,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.bet.hu" />
+                <para><ulink url="https://www.bet.hu"/>
                 </para>
               </entry>
             </row>
@@ -341,7 +341,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://citywire.co.uk" />
+                <para><ulink url="https://citywire.co.uk"/>
                 </para>
               </entry>
             </row>
@@ -358,7 +358,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.cse.lk" />
+                <para><ulink url="https://www.cse.lk"/>
                 </para>
               </entry>
             </row>
@@ -375,10 +375,10 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.cominvest-am.de" />
+                <para><ulink url="https://www.cominvest-am.de"/>
                 </para>
 
-                <para>Veraltet, aktuelles Modul: <ulink url="https://eggert.org/software/Comdirect.pm" />
+                <para>Veraltet, aktuelles Modul: <ulink url="https://eggert.org/software/Comdirect.pm"/>
                 </para>
               </entry>
             </row>
@@ -395,7 +395,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.deka.de" />
+                <para><ulink url="https://www.deka.de"/>
                 </para>
               </entry>
             </row>
@@ -412,7 +412,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.dws.de" />
+                <para><ulink url="https://www.dws.de"/>
                 </para>
               </entry>
             </row>
@@ -429,7 +429,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.equinox.co.za" />
+                <para><ulink url="https://www.equinox.co.za"/>
                 </para>
               </entry>
             </row>
@@ -446,7 +446,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fidelity.com" />
+                <para><ulink url="https://www.fidelity.com"/>
                 </para>
               </entry>
             </row>
@@ -463,7 +463,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fidelity.com/fixed-income-bonds/overview" />
+                <para><ulink url="https://www.fidelity.com/fixed-income-bonds/overview"/>
                 </para>
               </entry>
             </row>
@@ -480,7 +480,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://finance.canada.com" />
+                <para><ulink url="https://finance.canada.com"/>
                 </para>
               </entry>
             </row>
@@ -497,7 +497,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://funds.ft.com" />
+                <para><ulink url="https://funds.ft.com"/>
                 </para>
               </entry>
             </row>
@@ -514,7 +514,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.finanzpartner.de" />
+                <para><ulink url="https://www.finanzpartner.de"/>
                 </para>
               </entry>
             </row>
@@ -531,7 +531,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.ftportfolios.com" />
+                <para><ulink url="https://www.ftportfolios.com"/>
                 </para>
               </entry>
             </row>
@@ -548,7 +548,11 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fundlibrary.com" />
+                <para><ulink url="https://www.fundlibrary.com"/>
+                </para>
+
+                <para>Dieses Modul verwwndet Symbole, die Sie auf <ulink url="https://www.fundlibrary.com"/> nachschlagen
+                  müssen.
                 </para>
               </entry>
             </row>
@@ -565,7 +569,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.goldmoney.com" />
+                <para><ulink url="https://www.goldmoney.com"/>
                 </para>
               </entry>
             </row>
@@ -582,7 +586,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.hex.com" />
+                <para><ulink url="https://www.hex.com"/>
                 </para>
               </entry>
             </row>
@@ -599,7 +603,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.maninvestments.com.au" />
+                <para><ulink url="https://www.maninvestments.com.au"/>
                 </para>
               </entry>
             </row>
@@ -616,7 +620,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://morningstar.co.uk" />
+                <para><ulink url="https://morningstar.co.uk"/>
                 </para>
               </entry>
             </row>
@@ -633,7 +637,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.morningstar.co.jp" />
+                <para><ulink url="https://www.morningstar.co.jp"/>
                 </para>
               </entry>
             </row>
@@ -650,7 +654,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.morningstar.se" />
+                <para><ulink url="https://www.morningstar.se"/>
                 </para>
               </entry>
             </row>
@@ -667,7 +671,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fool.com" />
+                <para><ulink url="https://www.fool.com"/>
                 </para>
               </entry>
             </row>
@@ -684,7 +688,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.nzx.com" />
+                <para><ulink url="https://www.nzx.com"/>
                 </para>
               </entry>
             </row>
@@ -701,7 +705,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.boursorama.com" />
+                <para><ulink url="https://www.boursorama.com"/>
                 </para>
               </entry>
             </row>
@@ -718,7 +722,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://bourse.lerevenu.com" />
+                <para><ulink url="https://bourse.lerevenu.com"/>
                 </para>
               </entry>
             </row>
@@ -735,7 +739,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.platinum.com.au" />
+                <para><ulink url="https://www.platinum.com.au"/>
                 </para>
               </entry>
             </row>
@@ -752,7 +756,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.six-swiss-exchange.com" />
+                <para><ulink url="https://www.six-swiss-exchange.com"/>
                 </para>
               </entry>
             </row>
@@ -769,7 +773,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.six-swiss-exchange.com" />
+                <para><ulink url="https://www.six-swiss-exchange.com"/>
                 </para>
               </entry>
             </row>
@@ -786,12 +790,12 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.seb.se" />
+                <para><ulink url="https://www.seb.se"/>
                 </para>
 
                 <para>Siehe
                   <ulink
-                    url="https://taz.vv.sebank.se/cgi-bin/pts3/pow/Fonder/kurser/kurslista_body.asp" />
+                    url="https://taz.vv.sebank.se/cgi-bin/pts3/pow/Fonder/kurser/kurslista_body.asp"/>
                   für alle verfügbaren Fonds.
                 </para>
               </entry>
@@ -809,7 +813,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.sharenet.co.za" />
+                <para><ulink url="https://www.sharenet.co.za"/>
                 </para>
               </entry>
             </row>
@@ -826,7 +830,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.stockhouse.ca" />
+                <para><ulink url="https://www.stockhouse.ca"/>
                 </para>
               </entry>
             </row>
@@ -843,7 +847,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tdassetmanagement.com" />
+                <para><ulink url="https://www.tdassetmanagement.com"/>
                 </para>
               </entry>
             </row>
@@ -860,7 +864,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tdwaterhouse.ca" />
+                <para><ulink url="https://www.tdwaterhouse.ca"/>
                 </para>
               </entry>
             </row>
@@ -877,7 +881,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tiaa-cref.org" />
+                <para><ulink url="https://www.tiaa-cref.org"/>
                 </para>
               </entry>
             </row>
@@ -894,7 +898,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.TMXmoney.com" />
+                <para><ulink url="https://www.TMXmoney.com"/>
                 </para>
               </entry>
             </row>
@@ -911,7 +915,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.troweprice.com" />
+                <para><ulink url="https://www.troweprice.com"/>
                 </para>
               </entry>
             </row>
@@ -928,7 +932,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.trustnet.com" />
+                <para><ulink url="https://www.trustnet.com"/>
                 </para>
               </entry>
             </row>
@@ -945,7 +949,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.trustnet.com" />
+                <para><ulink url="https://www.trustnet.com"/>
                 </para>
               </entry>
             </row>
@@ -962,7 +966,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.union-invest.de" />
+                <para><ulink url="https://www.union-invest.de"/>
                 </para>
               </entry>
             </row>
@@ -979,7 +983,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.publicdebt.treas.gov" />
+                <para><ulink url="https://www.publicdebt.treas.gov"/>
                 </para>
               </entry>
             </row>
@@ -996,7 +1000,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tsp.gov" />
+                <para><ulink url="https://www.tsp.gov"/>
                 </para>
               </entry>
             </row>
@@ -1030,7 +1034,7 @@
               </entry>
 
               <entry>
-                <para>Siehe <ulink url="&url-mail-ar;gnucash-user/2008-February/023686.html" />
+                <para>Siehe <ulink url="&url-mail-ar;gnucash-user/2008-February/023686.html"/>
                 </para>
               </entry>
             </row>
@@ -1094,7 +1098,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="&url-yh-fin;" /> through "JavaScript Object Notation"
+                <para><ulink url="&url-yh-fin;"/> through "JavaScript Object Notation"
                 </para>
               </entry>
             </row>
@@ -1111,7 +1115,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="&url-yh-fin;" /> through "Yahoo Query Language"
+                <para><ulink url="&url-yh-fin;"/> through "Yahoo Query Language"
                 </para>
               </entry>
             </row>
@@ -1196,7 +1200,7 @@
 
             <row>
               <entry>
-                Europe (asegr,.bsero, hex ...)
+                Europe (asegr, bsero, hex ...)
               </entry>
             </row>
 
@@ -3099,7 +3103,7 @@
     </table>
 
     <para>Quelle: <ulink
-        url="&url-yh-hlp;kb/SLN2310.html?redirect=true" /> abgefragt am 2020-04-14.
+        url="&url-yh-hlp;kb/SLN2310.html?redirect=true"/> abgefragt am 2020-04-14.
     </para>
   </sect1>
 
@@ -3110,14 +3114,11 @@
       <para>TIAA-CREF Annuities (Renten) werden im Gegensatz zu ihren Fonds an keiner Börse gelistet. TIAA-CREF
         bietet die Kurse mittels einer CGI-Shnittstelle auf ihrer Website, welche eine CSV-Datei im
         folgenden Format zurückliefert:
-<literallayout>
-          <computeroutput>
-bogus_symbol1,price1,date1
+<programlisting language="csv">bogus_symbol1,price1,date1
 bogus_symbol2,price2,date2
-..etc.
-          </computeroutput>
-        </literallayout>
-        Dabei hat bogus_symbol einen der folgenden Werte für die verschiedenen Annuitäten:
+…</programlisting>
+        Dabei hat <replaceable>bogus_symbol</replaceable> einen der folgenden Werte für die
+        verschiedenen Annuitäten:
       </para>
     </abstract>
 
@@ -6476,7 +6477,7 @@ bogus_symbol2,price2,date2
 
     <para>Quelle: Kommentare in
       <ulink
-        url="https://rt.cpan.org/Ticket/Attachment/1121440/589997/Tiaacref.pm.zip" />
+        url="https://rt.cpan.org/Ticket/Attachment/1121440/589997/Tiaacref.pm.zip"/>
     </para>
   </sect1>
 </appendix>
diff --git a/help/pt/Help_ch_Account-Actions.xml b/help/pt/Help_ch_Account-Actions.xml
index cc9c3b3..0544d2c 100644
--- a/help/pt/Help_ch_Account-Actions.xml
+++ b/help/pt/Help_ch_Account-Actions.xml
@@ -6,15 +6,14 @@
        modified: March 28th 2007
        modified: August 12th 2006
 	   modified: February 28th 2005
-
-  Maintai    Alex Aycinena <alex.aycinena at gmail.com>
+  Maintainers:
+    Alex Aycinena <alex.aycinena at gmail.com>
     Chris Lyttle <chris at wilddev.net>
     Neil Williams <linux at codehelp.co.uk>
-.uk>
-
   Author:
-               Chris Lyttle     Chris Lyttle <chris at wilddev.net>
-  (Pedro Albuquerque <palb    Pedro Albuquerque <palbuquerque73 at gmail.com>
+    Chris Lyttle <chris at wilddev.net>
+  Translators:
+    Pedro Albuquerque <palbuquerque73 at gmail.com>
 -->
 <chapter id="setup-accounts"
          xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/help/pt/Help_ch_Business.xml b/help/pt/Help_ch_Business.xml
index ea4b17c..a229a4d 100644
--- a/help/pt/Help_ch_Business.xml
+++ b/help/pt/Help_ch_Business.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Author:
-  		Jon Lapham <lapham at extracta.com.br>
-	updated Patrick Schweiger <pks at spiffykitty.com>
+    Jon Lapham <lapham at extracta.com.br>
+  updated Patrick Schweiger <pks at spiffykitty.com>
   Originally designed by Carol Champagne.
   Translators:
-               (Pedro Albuquerque <palbuquerque73 at gmail.com>)
+    Pedro Albuquerque <palbuquerque73 at gmail.com>
 -->
 <chapter id="chapter_busnss">
   <title>Funcionalidades para pequenos negócios</title>
@@ -75,18 +74,16 @@
       payable system, you must first setup an account of the <emphasis>A/Payable</emphasis>
       type. The <emphasis>A/Payable</emphasis> account is usually a sub-account
       under Liabilities. It is within this account that the integrated A/P system
-      places transactions.</para>
+      places transactions.
+      <screen>Basic A/P Account Hierarchy:
 
-      <literallayout>
-        Basic A/P Account Hierarchy:
-
-        -Assets
-          -Bank
-        -Liabilities
-          -Accounts Payable
-        -Expenses
-          -AP Expenses
-      </literallayout>
+-Assets
+  -Bank
+-Liabilities
+  -Accounts Payable
+-Expenses
+  -AP Expenses</screen>
+</para>
 
      <para>You need to add additional asset accounts and real expense accounts to make
      this hierarchy useful.  The important aspects of this hierarchy are that you need
@@ -283,35 +280,37 @@
       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.
+<screen>Basic A/R Account Hierarchy:
+
+-Assets
+  -Accounts Receivable
+  -Checking
+-Income
+  -Sales
+-Liabilities
+  -Tax
+    -Tax on Purchases
+    -Tax on Sales</screen>
     </para>
 
-      <literallayout>
-        Basic A/R Account Hierarchy:
-
-        -Assets
-          -Accounts Receivable
-          -Checking
-        -Income
-          -Sales
-        -Liabilities
-          -Tax
-            -Tax on Purchases
-            -Tax on Sales
-
-      </literallayout>
+    <important>
+      <para>If you deal with customers in more than one currency you will need a separate <emphasis>Accounts
+        Receivable</emphasis> account for each currency:
+<screen>-Assets
+  -Accounts Receivable
+    -CHF
+    -EUR
+    :</screen>
+      </para>
+    </important>
 
-      <note>
-        <para>You need to add additional asset, expense, and income accounts to
-          this hierarchy for it to be useful. The important aspects of this
-          hierarchy are the use of an income account and the <emphasis>Accounts Receivable</emphasis>
-          asset account, with account type set to <emphasis>A/Receivable</emphasis>.
-        </para>
-        <para>
-          If you deal with customers in more than one currency you will
-          need a separate <emphasis>Accounts Receivable</emphasis>
-          account for each currency.
-        </para>
-      </note>
+    <note>
+      <para>You need to add additional asset, expense, and income accounts to this hierarchy for it to be
+        useful. The important aspects of this hierarchy are the use of an income account and the
+        <emphasis>Accounts Receivable</emphasis> asset account, with account type set to
+        <emphasis>A/Receivable</emphasis>.
+      </para>
+    </note>
 
     <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.
diff --git a/help/pt/Help_ch_Reports.xml b/help/pt/Help_ch_Reports.xml
index 594d02b..bde0b47 100644
--- a/help/pt/Help_ch_Reports.xml
+++ b/help/pt/Help_ch_Reports.xml
@@ -1355,15 +1355,14 @@
               </para>
 
               <para>Por exemplo, dada uma estrutura como a seguinte:
-              </para>
-<literallayout>
-                Activos (tipo ACTIVO)
-                  Corrector (tipo ACTIVO)
-                    Acção widget (tipo ACÇÃO)
-                Receita (tipo RECEITA)
-                  Dividendos (tipo RECEITA)
-                    Acção widget (tipo RECEITA)
-                </literallayout>
+<screen>Activos (tipo ACTIVO)
+  Corrector (tipo ACTIVO)
+    Acção widget (tipo ACÇÃO)
+Receita (tipo RECEITA)
+  Dividendos (tipo RECEITA)
+    Acção widget (tipo RECEITA)</screen>
+                </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
                 parcela na conta "Activos:Corrector:Acção widget".
diff --git a/help/pt/Help_chtacctseg.xml b/help/pt/Help_chtacctseg.xml
index 36862e7..bc7cc33 100644
--- a/help/pt/Help_chtacctseg.xml
+++ b/help/pt/Help_chtacctseg.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE literallayout SYSTEM "gnc-docbookx.dtd">
-<literallayout>
-<literal>        300             Despesas
-         |
-         +--310         Despesas pessoais
-         |   |
-         |   +--311     Cerveja
-         |   |
-         |   +--312     Cabo
-         |
-         +--320         Despesas empresariais
-         |   |
-         |   +--321     Disquetes 8"
-         |   |
-         |   +--322     DVDs Blue Ray RW
-         |   |
-         :   :</literal>
-</literallayout>
+<!DOCTYPE screen SYSTEM "gnc-docbookx.dtd">
+<screen>300             Despesas
+ |
+ +--310         Despesas pessoais
+ |   |
+ |   +--311     Cerveja
+ |   |
+ |   +--312     Cabo
+ |
+ +--320         Despesas empresariais
+ |   |
+ |   +--321     Disquetes 8"
+ |   |
+ |   +--322     DVDs Blue Ray RW
+ |   |
+ :   : </screen>
diff --git a/help/pt/Help_tips-appendix.xml b/help/pt/Help_tips-appendix.xml
index 5c8455c..ca75835 100644
--- a/help/pt/Help_tips-appendix.xml
+++ b/help/pt/Help_tips-appendix.xml
@@ -10,15 +10,15 @@
         modified: February 28th 2005
 
    Maintainers:
-                Frank H. Ellenberger <frank.h.ellenberger at gmail.com> 
-    Previous: Chris Lyttle <chris at wilddev.net> 
-          Neil Williams <linux at codehelp.co.uk> 
+       Frank H. Ellenberger <frank.h.ellenberger at gmail.com> 2013-18
+     Previous: Chris Lyttle <chris at wilddev.net>
+       Neil Williams <linux at codehelp.co.uk>
 
    Author:
-                Chris Lyttle <chris at wilddev.net>
+       Chris Lyttle <chris at wilddev.net>
 
    Translators:
-                (translators put your name and email here) 
+       (translators put your name and email here)
 -->
 <appendix id="tips">
   <appendixinfo>
@@ -132,7 +132,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.aex.nl" />
+                <para><ulink url="https://www.aex.nl"/>
                 </para>
 
                 <para>inclui Futuras e Opções
@@ -152,7 +152,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.aia.com.hk" />
+                <para><ulink url="https://www.aia.com.hk"/>
                 </para>
               </entry>
             </row>
@@ -169,7 +169,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.amfiindia.com" />
+                <para><ulink url="https://www.amfiindia.com"/>
                 </para>
               </entry>
             </row>
@@ -186,7 +186,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.ase.gr" />
+                <para><ulink url="https://www.ase.gr"/>
                 </para>
               </entry>
             </row>
@@ -203,7 +203,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.asx.com.au" />
+                <para><ulink url="https://www.asx.com.au"/>
                 </para>
 
                 <para>Requires at least F::Q 1.41 to get quotes for stocks starting with 'X', like <quote>XRO</quote>,
@@ -224,7 +224,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.bamosz.hu" />
+                <para><ulink url="https://www.bamosz.hu"/>
                 </para>
               </entry>
             </row>
@@ -241,7 +241,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://bmonesbittburns.com" />
+                <para><ulink url="https://bmonesbittburns.com"/>
                 </para>
               </entry>
             </row>
@@ -258,7 +258,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.bvb.ro" />
+                <para><ulink url="https://www.bvb.ro"/>
                 </para>
               </entry>
             </row>
@@ -275,7 +275,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.bet.hu" />
+                <para><ulink url="https://www.bet.hu"/>
                 </para>
               </entry>
             </row>
@@ -292,7 +292,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://citywire.co.uk" />
+                <para><ulink url="https://citywire.co.uk"/>
                 </para>
               </entry>
             </row>
@@ -309,7 +309,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.cse.lk" />
+                <para><ulink url="https://www.cse.lk"/>
                 </para>
               </entry>
             </row>
@@ -326,7 +326,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.cominvest-am.de" />
+                <para><ulink url="https://www.cominvest-am.de"/>
                 </para>
 
                 <para>Obsoleto, actualização: http://eggert.org/software/Comdirect.pm
@@ -346,7 +346,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.deka.de" />
+                <para><ulink url="https://www.deka.de"/>
                 </para>
               </entry>
             </row>
@@ -363,7 +363,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.dws.de" />
+                <para><ulink url="https://www.dws.de"/>
                 </para>
               </entry>
             </row>
@@ -380,7 +380,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.equinox.co.za" />
+                <para><ulink url="https://www.equinox.co.za"/>
                 </para>
               </entry>
             </row>
@@ -397,7 +397,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fidelity.com" />
+                <para><ulink url="https://www.fidelity.com"/>
                 </para>
               </entry>
             </row>
@@ -414,7 +414,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fidelity.com/fixed-income-bonds/overview" />
+                <para><ulink url="https://www.fidelity.com/fixed-income-bonds/overview"/>
                 </para>
               </entry>
             </row>
@@ -431,7 +431,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://finance.canada.com" />
+                <para><ulink url="https://finance.canada.com"/>
                 </para>
               </entry>
             </row>
@@ -448,7 +448,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://funds.ft.com" />
+                <para><ulink url="https://funds.ft.com"/>
                 </para>
               </entry>
             </row>
@@ -465,7 +465,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.finanzpartner.de" />
+                <para><ulink url="https://www.finanzpartner.de"/>
                 </para>
               </entry>
             </row>
@@ -482,7 +482,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.ftportfolios.com" />
+                <para><ulink url="https://www.ftportfolios.com"/>
                 </para>
               </entry>
             </row>
@@ -499,12 +499,13 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fundlibrary.com" />
+                <para><ulink url="https://www.fundlibrary.com"/>
                 </para>
 
-                <para>This module uses an id that represents the mutual fund on www.fundlibrary.com. There is no easy way
-                  of fetching the id except to jump onto the fundlibrary website, look up the fund
-                  and view the url for clues to its id number.
+                <para>This module uses an id that represents the mutual fund on
+                  <ulink url="https://www.fundlibrary.com"/>. There is no easy way of fetching the
+                  id except to jump onto the fundlibrary website, look up the fund and view the url
+                  for clues to its id number.
                 </para>
               </entry>
             </row>
@@ -521,7 +522,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.goldmoney.com" />
+                <para><ulink url="https://www.goldmoney.com"/>
                 </para>
               </entry>
             </row>
@@ -538,7 +539,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.hex.com" />
+                <para><ulink url="https://www.hex.com"/>
                 </para>
               </entry>
             </row>
@@ -555,7 +556,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.maninvestments.com.au" />
+                <para><ulink url="https://www.maninvestments.com.au"/>
                 </para>
               </entry>
             </row>
@@ -572,7 +573,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://morningstar.co.uk" />
+                <para><ulink url="https://morningstar.co.uk"/>
                 </para>
               </entry>
             </row>
@@ -589,7 +590,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.morningstar.co.jp" />
+                <para><ulink url="https://www.morningstar.co.jp"/>
                 </para>
               </entry>
             </row>
@@ -606,7 +607,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.morningstar.se" />
+                <para><ulink url="https://www.morningstar.se"/>
                 </para>
               </entry>
             </row>
@@ -623,7 +624,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.fool.com" />
+                <para><ulink url="https://www.fool.com"/>
                 </para>
               </entry>
             </row>
@@ -640,7 +641,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.nzx.com" />
+                <para><ulink url="https://www.nzx.com"/>
                 </para>
               </entry>
             </row>
@@ -657,7 +658,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.boursorama.com" />
+                <para><ulink url="https://www.boursorama.com"/>
                 </para>
               </entry>
             </row>
@@ -674,7 +675,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://bourse.lerevenu.com" />
+                <para><ulink url="https://bourse.lerevenu.com"/>
                 </para>
               </entry>
             </row>
@@ -691,7 +692,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.platinum.com.au" />
+                <para><ulink url="https://www.platinum.com.au"/>
                 </para>
               </entry>
             </row>
@@ -708,7 +709,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.six-swiss-exchange.com" />
+                <para><ulink url="https://www.six-swiss-exchange.com"/>
                 </para>
               </entry>
             </row>
@@ -725,7 +726,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.six-swiss-exchange.com" />
+                <para><ulink url="https://www.six-swiss-exchange.com"/>
                 </para>
               </entry>
             </row>
@@ -742,10 +743,10 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.seb.se" />
+                <para><ulink url="https://www.seb.se"/>
                 </para>
 
-                <para>Consult <ulink url="https://taz.vv.sebank.se/cgi-bin/pts3/pow/Fonder/kurser/kurslista_body.asp" />
+                <para>Consult <ulink url="https://taz.vv.sebank.se/cgi-bin/pts3/pow/Fonder/kurser/kurslista_body.asp"/>
                   for all available funds.
                 </para>
               </entry>
@@ -763,7 +764,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.sharenet.co.za" />
+                <para><ulink url="https://www.sharenet.co.za"/>
                 </para>
               </entry>
             </row>
@@ -780,7 +781,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.stockhouse.ca" />
+                <para><ulink url="https://www.stockhouse.ca"/>
                 </para>
               </entry>
             </row>
@@ -797,7 +798,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tdassetmanagement.com" />
+                <para><ulink url="https://www.tdassetmanagement.com"/>
                 </para>
               </entry>
             </row>
@@ -814,7 +815,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tdwaterhouse.ca" />
+                <para><ulink url="https://www.tdwaterhouse.ca"/>
                 </para>
               </entry>
             </row>
@@ -831,7 +832,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tiaa-cref.org" />
+                <para><ulink url="https://www.tiaa-cref.org"/>
                 </para>
               </entry>
             </row>
@@ -848,7 +849,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.TMXmoney.com" />
+                <para><ulink url="https://www.TMXmoney.com"/>
                 </para>
               </entry>
             </row>
@@ -865,7 +866,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.troweprice.com" />
+                <para><ulink url="https://www.troweprice.com"/>
                 </para>
               </entry>
             </row>
@@ -882,7 +883,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.trustnet.com" />
+                <para><ulink url="https://www.trustnet.com"/>
                 </para>
               </entry>
             </row>
@@ -899,7 +900,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.trustnet.com" />
+                <para><ulink url="https://www.trustnet.com"/>
                 </para>
               </entry>
             </row>
@@ -916,7 +917,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.union-invest.de" />
+                <para><ulink url="https://www.union-invest.de"/>
                 </para>
               </entry>
             </row>
@@ -933,7 +934,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.publicdebt.treas.gov" />
+                <para><ulink url="https://www.publicdebt.treas.gov"/>
                 </para>
               </entry>
             </row>
@@ -950,7 +951,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="https://www.tsp.gov" />
+                <para><ulink url="https://www.tsp.gov"/>
                 </para>
               </entry>
             </row>
@@ -984,7 +985,7 @@
               </entry>
 
               <entry>
-                <para>See <ulink url="&url-mail-ar;gnucash-user/2008-February/023686.html" />
+                <para>See <ulink url="&url-mail-ar;gnucash-user/2008-February/023686.html"/>
                 </para>
               </entry>
             </row>
@@ -1048,7 +1049,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="&url-yh-fin;" /> through "JavaScript Object Notation"
+                <para><ulink url="&url-yh-fin;"/> through "JavaScript Object Notation"
                 </para>
               </entry>
             </row>
@@ -1065,7 +1066,7 @@
               </entry>
 
               <entry>
-                <para><ulink url="&url-yh-fin;" /> through "Yahoo Query Language"
+                <para><ulink url="&url-yh-fin;"/> through "Yahoo Query Language"
                 </para>
               </entry>
             </row>
@@ -3057,13 +3058,9 @@
       <para>TIAA-CREF Annuities não estão listadas em nenhuma bolsa, ao contrário dos seus fundos mutualistas
         TIAA-CREF fornece valores unitários via cgi na página web respectiva. A cgi devolve um
         ficheiro csvno formato
-<literallayout>
-          <computeroutput>
-símbolo_falso1,cotação1,data1
+<programlisting language="csv">símbolo_falso1,cotação1,data1
 símbolo_falso2,cotação2,data2
-..etc.
-          </computeroutput>
-        </literallayout>
+…</programlisting>
         onde símbolo_falso toma um dos seguintes valores para as várias anuidades:
       </para>
     </abstract>

commit 5edcc027bd31cf3b7ec886a90b8b76f2d5ecdcf6
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon May 31 19:20:12 2021 +0200

    Help pt: Add missing xmlns:xi parameters

diff --git a/help/pt/Help_ch_Account-Actions.xml b/help/pt/Help_ch_Account-Actions.xml
index 7fdc9e3..cc9c3b3 100644
--- a/help/pt/Help_ch_Account-Actions.xml
+++ b/help/pt/Help_ch_Account-Actions.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.0.x
   Last modified: December 7th 2009
        modified: March 28th 2007
        modified: August 12th 2006
 	   modified: February 28th 2005
 
-  Maintainers:
-               Alex Aycinena <alex.aycinena at gmail.com>
-               Chris Lyttle <chris at wilddev.net>
-               Neil Williams <linux at codehelp.co.uk>
+  Maintai    Alex Aycinena <alex.aycinena at gmail.com>
+    Chris Lyttle <chris at wilddev.net>
+    Neil Williams <linux at codehelp.co.uk>
+.uk>
 
   Author:
-               Chris Lyttle <chris at wilddev.net>
-  Translators:
-               (Pedro Albuquerque <palbuquerque73 at gmail.com)
+               Chris Lyttle     Chris Lyttle <chris at wilddev.net>
+  (Pedro Albuquerque <palb    Pedro Albuquerque <palbuquerque73 at gmail.com>
 -->
-<chapter id="setup-accounts">
+<chapter id="setup-accounts"
+         xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>Configurar, editar e trabalhar com contas</title>
 
   <para>Esta secção descreve o processo de configurar, editar e trabalhar com contas do &app;. No &app;
@@ -343,24 +342,9 @@
       representam contas bancárias individuais, ou categorias de despesa. Quando é pedido um
       relatório de sumário, tipicamente só os ramos principais são mostrados no relatório, não
       as contas individuais. Por exemplo, um plano de contas poderia ser parecido com o seguinte:
+      <xi:include href="Help_chtacctseg.xml"/>
     </para>
-<literallayout>
-			<literal>                              300             Despesas
-					 |
-					 +--310         Despesas pessoais
-					 |   |
-					 |   +--311     Cerveja
-					 |   |
-					 |   +--312     TV por cabo
-					 |
-					 +--320         Despesas empresariais
-					 |   |
-					 |   +--321     Disquetes 8"
-					 |   |
-					 |   +--322     DVDs Blue Ray RW
-					 |   |
-					 :   :</literal>
-</literallayout>
+
     <note id="accts-code">
       <title>Códigos de contas</title>
 
diff --git a/help/pt/Help_ch_Customize.xml b/help/pt/Help_ch_Customize.xml
index a985ce1..c75efd9 100644
--- a/help/pt/Help_ch_Customize.xml
+++ b/help/pt/Help_ch_Customize.xml
@@ -21,7 +21,8 @@
   Translators:
                (Pedro Albuquerque <palbuquerque73 at gmail.com)
 -->
-<chapter id="custom-gnucash">
+<chapter id="custom-gnucash"
+         xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>Personalizar o &app;</title>
 
   <sect1 id="account-options">
@@ -2665,42 +2666,41 @@
          TurboTax.</para>
 
 
-        <itemizedlist>
-          <listitem>
-            <para>Code: N673 "Short/Long gain or loss"</para>
-          </listitem>
-        </itemizedlist>
+      <itemizedlist>
+        <listitem>
+          <para>Code: N673 "Short/Long gain or loss"
+          </para>
+        </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>
+    </sect2>
+
+    <sect2 id="txf-defs">
+      <title>Detailed <acronym>TXF</acronym> Category Descriptions</title>
+
+      <para>Table 32. Detailed <acronym>TXF</acronym> Category Descriptions
+      </para>
 
-        <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>
-
-	&txf-categories;
-      </sect2>-->
+      <xi:include href="Help_txf-categories.xml" />
+    </sect2>-->
   </sect1>
 
   <sect1  id="reset-warning">



Summary of changes:
 help/C/Help_ch_Account-Actions.xml  |  18 ++---
 help/C/Help_ch_Business.xml         |  72 ++++++++++----------
 help/C/Help_ch_Reports.xml          |   9 ++-
 help/C/Help_chtacctseg.xml          |  34 +++++-----
 help/C/Help_tips-appendix.xml       | 126 +++++++++++++++++-----------------
 help/de/Help_ch_Account-Actions.xml |   8 +--
 help/de/Help_ch_Business.xml        |  61 +++++++++--------
 help/de/Help_ch_Reports.xml         | 110 ++++++++++++++++++++++++++++--
 help/de/Help_chtacctseg.xml         |  30 ++++-----
 help/de/Help_tips-appendix.xml      | 131 ++++++++++++++++++------------------
 help/pt/Help_ch_Account-Actions.xml |  37 +++-------
 help/pt/Help_ch_Business.xml        |  85 ++++++++++++-----------
 help/pt/Help_ch_Customize.xml       |  72 ++++++++++----------
 help/pt/Help_ch_Reports.xml         |  17 +++--
 help/pt/Help_chtacctseg.xml         |  34 +++++-----
 help/pt/Help_tips-appendix.xml      | 129 +++++++++++++++++------------------
 16 files changed, 519 insertions(+), 454 deletions(-)



More information about the gnucash-changes mailing list