gnucash-docs master: Multiple changes pushed

Frank H.Ellenberger fell at code.gnucash.org
Mon Feb 17 22:51:59 EST 2020


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/4e91a851 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/2e426e4f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/93566dc4 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/5be3f550 (commit)



commit 4e91a851f90e0dbb8e010d516a45ad0e47be97da
Merge: 5be3f55 2e426e4
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Feb 18 04:51:38 2020 +0100

    Merge branch 'maint'


commit 2e426e4fdea7568e233b33cab3d9ae2740308251
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Feb 18 04:40:19 2020 +0100

    In Business Account Setup of A/R and A/P emphase 'for each currency'
    
    * Additionally the wiki link and some whitespace was fixed,
    * the german translation got a few corrections,
    * untranslated sections in other languages got a few updates from the
    english version

diff --git a/guide/C/ch_bus_features.xml b/guide/C/ch_bus_features.xml
index abd671f..40e3b09 100644
--- a/guide/C/ch_bus_features.xml
+++ b/guide/C/ch_bus_features.xml
@@ -51,7 +51,7 @@
         <listitem><para>Set up Billing Terms.</para></listitem>
       </itemizedlist>
     </para>
-  
+
     <sect2 id="bus-setupacct">
       <title>Account Setup</title>
 
@@ -112,12 +112,12 @@ Basic A/R and A/P Account Hierarchy:
       <note>
         <para>
           If you deal with customers in more than one currency you will need a separate
-          <emphasis>Accounts Receivable</emphasis> account for each currency.
+          <guilabel>Accounts Receivable</guilabel> account <emphasis>for each currency</emphasis>.
         </para>
 
         <para>
           If you deal with vendors in more than one currency you will need a separate
-          <emphasis>Accounts Payable</emphasis> account for each currency.
+          <guilabel>Accounts Payable</guilabel> account <emphasis>for each currency</emphasis>.
         </para>
       </note>
       <note>
@@ -138,11 +138,11 @@ Basic A/R and A/P Account Hierarchy:
 
       <para>Set up distinct tax tables for customers and vendors.</para>
 
-      <para> The default invoice tax table entry can be assigned to each customer and the default bill
+      <para>The default invoice tax table entry can be assigned to each customer and the default bill
         tax table entry can be assigned to each vendor.
       </para>
 
-      <para>The default tax table entry for new customers or new vendors can be specified in the <emphasis>Book Options </emphasis>
+      <para>The default tax table entry for new customers or new vendors can be specified in the <emphasis>Book Options</emphasis>
         window which can be accessed by
         <menuchoice><guimenu>File</guimenu>
           <guisubmenu>Properties</guisubmenu>
@@ -404,7 +404,7 @@ Basic A/R and A/P Account Hierarchy:
     <sect2 id="bus-setupterms">
       <title>Setting Billing Terms</title>
 
-      <para>Billing Terms can be used to determine the payment due date  and be a
+      <para>Billing Terms can be used to determine the payment due date and be a
         guide for determining discount for early payment of invoices (or vendor bills).
       </para>
 
@@ -476,7 +476,8 @@ Basic A/R and A/P Account Hierarchy:
       <itemizedlist>
         <listitem>
           <para><guilabel>Name</guilabel> The internal name of the billing term. For some examples of billing term names and descriptions see
-             <ulink url="http://wiki.gnucash.org/wiki/Terms" />.
+             <ulink url="&url-wiki-pmt-term;" />.
+             <!-- Translators, add a reference to a list of terms common in your language -->
           </para>
         </listitem>
         <listitem>
@@ -1587,7 +1588,7 @@ Basic A/R and A/P Account Hierarchy:
               </mediaobject>
             </screenshot>
           </figure>
-            
+
            <tip>
               <para>When paying employees, enter only the employee name in the Description area. If you decide to use &app;’s check printing capabilities, the check is automatically made out to the correct employee. If you want to record other information in the transaction besides the employee name, use the Notes area, available when viewing the Register in double-line mode.</para>
            </tip>
diff --git a/guide/de/ch_bus_setup.xml b/guide/de/ch_bus_setup.xml
index 31c51a6..45d47c0 100644
--- a/guide/de/ch_bus_setup.xml
+++ b/guide/de/ch_bus_setup.xml
@@ -93,14 +93,14 @@ Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
         
         <para>
           Wenn Sie mit den Kunden in mehr als einer Währung zu tun haben, 
-          benötigen Sie für jede Währung ein eigenes Konto  
-          <emphasis>Offene Forderung</emphasis>.
+          benötigen Sie <emphasis>für jede Währung</emphasis> ein eigenes Konto  
+          <guilabel>Offene Forderung</guilabel>.
         </para>
 
         <para>
           Wenn Sie mit den Lieferanten in mehr als einer Währung zu tun haben, 
-          benötigen Sie für jede Währung ein eigenes Konto 
-          <emphasis>Verbindlichkeiten aus Lieferungen und Leistungen</emphasis>.
+          benötigen Sie <emphasis>für jede Währung</emphasis> ein eigenes Konto 
+          <guilabel>Verbindlichkeiten aus Lieferungen und Leistungen</guilabel>.
         </para>
         
         <para>Buchungen, an denen die Konten Offene Forderungen oder Verbindlichkeiten 
@@ -300,8 +300,8 @@ Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
       </para>
 
         <note>
-        <para>Seit &app; Version 2.6.7, werden 
-        Zahlungsbedingungen nur teilweise unterstützt. Das Fälligkeitsdatum 
+        <para>Seit mindestens &app; Version 2.6.7 werden 
+        Zahlungsbedingungen teilweise unterstützt. Das Fälligkeitsdatum 
         wird mit Hilfe der Zahlungsbedingungen berechnet, aber nicht der 
         Skontobetrag.
         </para>
@@ -321,10 +321,10 @@ Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
             </listitem>
             
             <listitem>
-              <para>Alternative erstellen Sie nach der Eingabe und der Buchung 
+              <para>Alternativ erstellen Sie nach der Eingabe und der Buchung 
               der Zahlung für den Skontobetrag eine Gutschrift und nutzen ein 
               spezielles negatives Ertragskonto aus Verkäufen (Skonto) als 
-              Transfer  konto.
+              Transferkonto.
               </para>
             </listitem>
             </itemizedlist>
@@ -389,8 +389,12 @@ Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
       <itemizedlist>
         <listitem>
           <para><guilabel>Name:</guilabel> Der interne Name der Zahlungsbedingung.
-          Für einige Beispiele der Benennungen und Beschreibungen der 
-          Zahlungsbedingungen schauen Sie unter <ulink url="http://wiki.gnucash.org/wiki/Terms" />.
+          Für einige (englische) Beispiele der Benennungen und Beschreibungen der 
+          Zahlungsbedingungen schauen Sie unter <ulink url="&url-wiki-pmt-term;" />.
+          Einige deutsche Beispiele finden sich in
+          <ulink url="https://de.wikipedia.org/wiki/Zahlungsbedingung#H%C3%A4ufige_Zahlungsbedingungen"></ulink>
+          und internationale Abkürzungen in
+          <ulink url="https://de.wikipedia.org/wiki/Zahlungsbedingung#International"></ulink>.
           </para>
         </listitem>
         <listitem>
@@ -405,8 +409,8 @@ Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
               <para>Art: Tage</para>
               <itemizedlist>
                 <listitem>
-                  <para><guilabel>Fälligkeitsdatum:</guilabel> Die Ausgangs- 
-                  oder Eingangsrechnung ist zur Zahlung innerhalb der Anzahl 
+                  <para><guilabel>Fälligkeitstage:</guilabel> Die Ausgangs- 
+                  oder Eingangsrechnung ist zu bezahlen innerhalb der Anzahl 
                   dieser Tage nach dem Zugangsdatum.</para>
                 </listitem>
                 <listitem>
@@ -417,7 +421,7 @@ Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
                 </listitem>
                 <listitem>
                   <para><guilabel>Skonto %:</guilabel> Der Skonto-Pozentsatz, 
-                  der für die vorzeitige Zahlung angewendet wird. </para>
+                  der für die vorzeitige Zahlung angewendet wird.</para>
                 </listitem>
               </itemizedlist>
             </listitem>
@@ -425,7 +429,7 @@ Basis Kontenhierarchie für Debitoren- und Kreditorenbuchhaltung:
               <para>Type: Im nächsten Monat</para>
               <itemizedlist>
                 <listitem>
-                  <para><guilabel>Fälligkeitsdatum </guilabel> Tag des Monats, an dem die Rechnung fällig wird.</para>
+                  <para><guilabel>Fälligkeitstag</guilabel> Tag des Monats, an dem die Rechnung fällig wird.</para>
                 </listitem>
                 <listitem>
                   <para><guilabel>Stichtag Skonto:</guilabel> Der letzte Tag des Monats für den Skonto für die vorzeitige Zahlung</para>
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index 6e9fe63..c467cc0 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -420,7 +420,7 @@
         </imageobject>
 
        <textobject>
-          <phrase><application>GnuCash</application> struttura dei conti - anteprima</phrase>
+          <phrase>&app; struttura dei conti - anteprima</phrase>
        </textobject>
 
         <caption>
@@ -485,13 +485,13 @@
 
         <listitem>
           <para><emphasis>Multi-platform Compatibility</emphasis>:
-          <application>GnuCash</application> is supported on a variety
+          &app; is supported on a variety
           of platforms and operating systems. The list of fully
           supported operating systems (and platforms) for
-          <application>GnuCash</application> 2.6.14 is: GNU/Linux
+          &app; 2.6.14 is: GNU/Linux
           (x86, x86_64), FreeBSD (x86, x86_64), OpenBSD (x86, x86_64),
           and MacOS X (Intel). Previous versions of
-          <application>GnuCash</application> have been known to work
+          &app; have been known to work
           with, SGI IRIX (MIPS), IBM AIX 4.1.5 (RS/6000), Unixware 7
           (Intel), SCO OpenServer 5.0.4 (Intel), and Solaris (Sparc),
           but their current status is unknown.</para>
@@ -502,8 +502,8 @@
     <sect2 id="oview-featuresinvest2">
       <title>Registrare gli investimenti</title>
 
-      <para><application>GnuCash</application> includes a number of investment features that allow you to track all your investments. With <application>GnuCash</application> you can track stocks individually (one per account) or in a portfolio of accounts (a group of accounts that can be displayed together).</para>
-      <para><application>GnuCash</application> supports online stock and mutual fund quotes. This means you no longer need to look up stock prices one at a
+      <para>&app; includes a number of investment features that allow you to track all your investments. With &app; you can track stocks individually (one per account) or in a portfolio of accounts (a group of accounts that can be displayed together).</para>
+      <para>&app; supports online stock and mutual fund quotes. This means you no longer need to look up stock prices one at a
           time. The process can be automated, and you can see the latest value of your stocks.</para>
     </sect2>
 
@@ -514,7 +514,7 @@
 
       <itemizedlist>
         <listitem>
-          <para><emphasis>Native Languages</emphasis>: <application>GnuCash</application> has been fully
+          <para><emphasis>Native Languages</emphasis>: &app; has been fully
           translated into 12 languages: Chinese, Czech, Dutch, English,
           French, German, Italian, Portuguese, Russian, Slovak, Spanish and
           Swedish. More than 25 other languages are partially
@@ -522,7 +522,7 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>International Format Handling</emphasis>: <application>GnuCash</application>
+          <para><emphasis>International Format Handling</emphasis>: &app;
           understands that different countries display the date and numbers differently.
           You are able to work with the date and number formats you are accustomed
           to.</para>
@@ -615,13 +615,13 @@
       </itemizedlist></para>
 
     <para><emphasis>Getting Started</emphasis> provides you with the most
-        basic information needed to begin using <application>GnuCash</application>. The chapters in this section explain concepts that are fundamental to using <application>GnuCash</application>. New users of <application>GnuCash</application> should familiarize themselves with the information in these chapters to get you up and running: <itemizedlist>
+        basic information needed to begin using &app;. The chapters in this section explain concepts that are fundamental to using &app;. New users of &app; should familiarize themselves with the information in these chapters to get you up and running: <itemizedlist>
         <listitem>
-           <para><xref linkend="chapter_oview"/> - (this chapter) gives a general overview of <application>GnuCash</application></para>
+           <para><xref linkend="chapter_oview"/> - (this chapter) gives a general overview of &app;</para>
        </listitem>
 
         <listitem>
-          <para><xref linkend="chapter_basics"/> - gives users a very brief introduction to accounting principles, and then provides information about how <application>GnuCash</application> structures its data. There is also information on basic interface elements in <application>GnuCash</application>. Finally, this chapter explains how <application>GnuCash</application> stores and manages your data.</para>
+          <para><xref linkend="chapter_basics"/> - gives users a very brief introduction to accounting principles, and then provides information about how &app; structures its data. There is also information on basic interface elements in &app;. Finally, this chapter explains how &app; stores and manages your data.</para>
         </listitem>
 
         <listitem>
@@ -634,9 +634,9 @@
       </itemizedlist></para>
 
     <para><emphasis>Managing Personal Finances</emphasis> addresses
-    common applications and features of <application>GnuCash</application> in greater detail. You will
+    common applications and features of &app; in greater detail. You will
     see more specific cases, based on frequently asked questions about
-    applying <application>GnuCash</application> to everyday situations. Here are the applications and
+    applying &app; to everyday situations. Here are the applications and
     features covered in this part: <itemizedlist>
         <listitem>
           <para><xref linkend="chapter_cbook"/></para>
@@ -664,7 +664,7 @@
       </itemizedlist></para>
 
     <para><emphasis>Managing Business Finances</emphasis> discusses the
-    use of <application>GnuCash</application> in business accounting: <itemizedlist>
+    use of &app; in business accounting: <itemizedlist>
 
         <listitem>
           <para><xref linkend="chapter_bus_features"/></para>
@@ -697,7 +697,7 @@
 
     <itemizedlist>
        <listitem>
-          <para><xref linkend="gnc-gloss"/> - Glossary of terms used in <application>GnuCash</application></para>
+          <para><xref linkend="gnc-gloss"/> - Glossary of terms used in &app;</para>
        </listitem>
        
        <listitem>
@@ -736,18 +736,18 @@
 
    </sect2>
    <sect2 id="wiki">
-     <title><application>GnuCash</application> Wiki</title>
+     <title>&app; Wiki</title>
      <para>An immense amount of less-formal documenation, both of
-     <application>GnuCash</application> itself and its maintenance and
-     development may be found in the <ulink url="https://wiki.gnucash.org/wiki"><application>GnuCash</application>
+     &app; itself and its maintenance and
+     development may be found in the <ulink url="https://wiki.gnucash.org/wiki">&app;
      Wiki</ulink>; the <ulink url="https://wiki.gnucash.org/wiki/FAQ">Frequently Asked
      Questions</ulink> page should be a first stop whenever you
      encounter difficulty using
-     <application>GnuCash</application>.</para>
+     &app;.</para>
    </sect2>
 
    <sect2 id="on-line-assistance">
-    <title><application>GnuCash</application> On-line Assistance</title>
+    <title>&app; On-line Assistance</title>
 
     <bridgehead>Mailing List</bridgehead><para>The primary source of user support is the <ulink url="mailto:gnucash-user at gnucash.org">user mailing list</ulink>. If
     you prefer a web forum-like presentation, you can use it via <ulink url="http://gnucash.1415818.n4.nabble.com/GnuCash-User-f1415819.html">Nabble</ulink>. One must <ulink url="https://lists.gnucash.org/mailman/listinfo/gnucash-user">subscribe</ulink>
@@ -762,7 +762,7 @@
 
       <para>The <ulink url="&url-www;">&appname; web site </ulink>
         has more details on these channels. You will also find pointers there
-        to additional useful resources such as the <application>GnuCash</application> wiki
+        to additional useful resources such as the &app; wiki
         and bug tracking system.</para>
     </sect2>
   </sect1>
@@ -770,10 +770,10 @@
   <sect1 id="oview-install1">
     <title>Installazione</title>
 
-    <para>Installation of <application>GnuCash</application> is usually simple.</para>
+    <para>Installation of &app; is usually simple.</para>
 
-    <para>The <ulink url="&url-www;download.phtml"><citetitle><application>GnuCash</application> download page</citetitle></ulink> contains detailed instructions on how to install
-    <application>GnuCash</application> for each operating system supported.</para>
+    <para>The <ulink url="&url-www;download.phtml"><citetitle>&app; download page</citetitle></ulink> contains detailed instructions on how to install
+    &app; for each operating system supported.</para>
   </sect1>
 </chapter>
 
@@ -897,18 +897,18 @@
       register is used for debits, while the right column is used for credits.
       Accountants record increases in asset and expense accounts on the
       debit (left) side, and they record increases in liability, revenue, and equity
-      accounts on the credit (right) side. <application>GnuCash</application>
+      accounts on the credit (right) side. &app;
       follows this convention in the register.</para>
 
       <note>
         <para>This accounting terminology can be confusing to new users,
-        which is why <application>GnuCash</application> allows you to use the
+        which is why &app; allows you to use the
         common terms <guilabel>Deposit</guilabel> and
         <guilabel>Withdrawal</guilabel>. If you prefer the formal accounting
         terms, you can change the account register column headings to use
         them in the <guilabel>Accounts</guilabel> tab under
         <guilabel>Preferences</guilabel> (see the
-        <application>GnuCash</application> Help Manual for more information on
+        &app; Help Manual for more information on
         setting preferences).</para>
       </note>
 
@@ -973,7 +973,7 @@
       <para>In <link linkend="basics-accountingdouble2">double entry accounting</link>,
       transactions always involve at least two accounts–a source
       account and a destination account.
-      <application>GnuCash</application> manages this by inserting a line
+      &app; manages this by inserting a line
       into the transaction for every account that is affected, and
       recording the amounts involved in each line. A line within a
       transaction that records the account and amount of money involved is
@@ -1040,7 +1040,7 @@
       current balances.</para>
       <para>From this window, you can open the register of any
       account either by double-clicking the account name, right clicking the account name and selecting <guilabel>Open Account</guilabel> from the
-      menu, or by using the <guibutton>Open</guibutton> button on the toolbar. <application>GnuCash</application> allows you to have as many account registers open as you wish. For more information on using account registers, see <xref linkend="basics-register2"/>.</para>
+      menu, or by using the <guibutton>Open</guibutton> button on the toolbar. &app; allows you to have as many account registers open as you wish. For more information on using account registers, see <xref linkend="basics-register2"/>.</para>
 
       <tip>
         <para>Clicking the small triangle to the left of an account that has children will expand the tree view showing child accounts.</para>
@@ -1091,7 +1091,7 @@
 
       <note>
       <para>In the register windows, you can resize the various columns that
-        <application>GnuCash</application> displays, <emphasis>but keep in mind that
+        &app; displays, <emphasis>but keep in mind that
         the Description and Balance columns behave differently from other columns</emphasis>.</para>
       <para>The <guilabel>Description</guilabel> column is designed to expand
           automatically to fill all unused horizontal screen space.
@@ -1141,7 +1141,7 @@
     <sect2 id="basics-tabbar">
       <title>Tab Bar</title>
 
-      <para><application>GnuCash</application> uses a tabbed model that allows you to open multiple account registers and reports simultaneously. Each open window (which can include account registers, reports, or Scheduled Transactions windows) is given a tab on this bar that you can click to view that window. Tabs can be configured in Preferences to appear along any side of the <application>GnuCash</application> window.</para>
+      <para>&app; uses a tabbed model that allows you to open multiple account registers and reports simultaneously. Each open window (which can include account registers, reports, or Scheduled Transactions windows) is given a tab on this bar that you can click to view that window. Tabs can be configured in Preferences to appear along any side of the &app; window.</para>
 
     <para>To see the full name for a tab, hover the mouse pointer over an account window tab.</para>
 
@@ -1179,7 +1179,7 @@
     <sect2 id="basics-manual2">
       <title>Manuale di aiuto</title>
 
-      <para>Once you have opened <application>GnuCash</application>, you will see the <guilabel>Account
+      <para>Once you have opened &app;, you will see the <guilabel>Account
       Tree</guilabel> window <guilabel>Help</guilabel> menu heading, which
       opens the Help manual. The Help manual is organized by topic, and
       you can expand each topic into its subtopics.</para>
@@ -1217,9 +1217,9 @@
       <listitem>
         <para>Dalla <emphasis>barra del menu</emphasis> di &app;, selezionare <menuchoice><guimenu>File</guimenu><guimenuitem>Nuovo File</guimenuitem></menuchoice>. L’assistente per la <guilabel>Creazione di una nuova struttura dei conti</guilabel> verrà avviato.</para>
         <note>
-          <para>If you are running <application>GnuCash</application> for the first time, you will be presented
+          <para>If you are running &app; for the first time, you will be presented
           with the <guilabel>Welcome to GnuCash!</guilabel> screen. This screen is described in detail in the
-          <application>GnuCash</application> manual.</para>
+          &app; manual.</para>
         </note>
       </listitem>
 
@@ -1344,11 +1344,11 @@
     accounting data, or you might need to follow accounting guidelines that require you to close your books at the end
     of the year and begin each year with a fresh set of books.</para>
 
-    <para><application>GnuCash</application> allows you to create an empty copy of your Chart of Accounts simply by selecting
+    <para>&app; allows you to create an empty copy of your Chart of Accounts simply by selecting
     <menuchoice><guimenu>File</guimenu><guisubmenu>Export</guisubmenu><guimenuitem>Export Accounts</guimenuitem></menuchoice>.
-    When you select this command, you are asked to provide the name for the new empty file, and <application>GnuCash</application>
+    When you select this command, you are asked to provide the name for the new empty file, and &app;
     creates a new data file that contains only your account hierarchy (that is, there is no transaction data).
-    Once saved, the new file can be opened like any other <application>GnuCash</application> data file as described above.</para>
+    Once saved, the new file can be opened like any other &app; data file as described above.</para>
     </sect2>
 
   </sect1>
@@ -1453,12 +1453,12 @@
 
    <sect2 id="migrate-prefs">
      <title>Migrare le preferenze</title>
-     <para>Preferences are stored in three different locations: one for <application>GnuCash</application> preferences,
+     <para>Preferences are stored in three different locations: one for &app; preferences,
      one for reports, and one for online banking settings. Preferences are managed by
-     <application>gsettings</application>, reports are managed by <application>GnuCash</application>
+     <application>gsettings</application>, reports are managed by &app;
      itself, and online banking is managed by <application>aqbanking</application>. If you do not use online banking,
      then you will not have this folder on your machine.</para>
-     <para>Where the <application>GnuCash</application> preferences are stored varies
+     <para>Where the &app; preferences are stored varies
      depending on your operating system (see <xref linkend="App-sett-loc"/>, <xref linkend="Report-loc"/>, and
      <xref linkend="OB-sett-loc"/>). To back up and transfer your entire installation, you must copy
      these preferences as well.</para>
@@ -1475,7 +1475,7 @@
 	  <tbody>
             <row>
      	      <entry>Unix</entry>
-     	      <entry><application>GnuCash</application> preferences are stored in <application>dconf</application>.
+     	      <entry>&app; preferences are stored in <application>dconf</application>.
                   You can use the commands <command>dconf dump /org/gnucash/</command> on the old machine
                   and <command>dconf load /org/gnucash/</command> on the new machine to migrate your preferences.</entry>
             </row>
@@ -1626,7 +1626,7 @@
         then press the <guibutton>Forward</guibutton> button.
         You can also update these options later using <menuchoice><guimenu>File
         </guimenu><guimenuitem>Properties</guimenuitem></menuchoice>.
-        For details of these options, see the <application>GnuCash</application>
+        For details of these options, see the &app;
         Help manual, chapter Customizing GnuCash, Book Options.
       </para>
 
@@ -1688,7 +1688,7 @@
       <para>In the fifth screen you will be able to set an <guilabel>Opening
       Balance</guilabel> on each of the accounts, as well as indicate if
       the account should be a <guilabel>Placeholder</guilabel>. As these features will be
-      described in next chapters, leave all as configured by <application>GnuCash</application>
+      described in next chapters, leave all as configured by &app;
       and click <guibutton>Forward</guibutton> to open the last screen of the assistant.</para>
 
       <screenshot id="basics-NewAccountHierarchySetup-Setup.png">
@@ -1793,7 +1793,7 @@ Translators:
     <guilabel>Liabilities</guilabel>, <guilabel>Equity</guilabel>,
     <guilabel>Income</guilabel> and <guilabel>Expenses</guilabel>. We will now
     expand on our understanding of these account types, and show how they are
-    represented in <application>GnuCash</application>. But first, let’s divide them into 2 groups, the
+    represented in &app;. But first, let’s divide them into 2 groups, the
     balance sheet accounts and the income and expense accounts.
     As the name says the balance sheet accounts can be summarized in the
     balance of what you own and owe <emphasis>at a point in the time</emphasis>,
@@ -1865,11 +1865,11 @@ Translators:
     <para>Questa sezione ha l’intento di mostrare come le definizioni di conti che &app; propone, rientrino nei 5 tipi fondamentali.</para>
 
     <para>But first, let’s begin with a definition of an
-    <guilabel>account</guilabel> in <application>GnuCash</application>. A <application>GnuCash</application>
+    <guilabel>account</guilabel> in &app;. A &app;
     <guilabel>account</guilabel> is an entity which contains other
     sub-accounts, or that contains <guilabel>transactions</guilabel>. Since an
     account can contain other accounts, you often see <guilabel>account
-    trees</guilabel> in <application>GnuCash</application>, in which logically associated accounts are grouped
+    trees</guilabel> in &app;, in which logically associated accounts are grouped
     together within a common parent account.</para>
 
     <para>Un conto in &app; deve avere un nome unico (che è possibile assegnare) e una tipologie a scelta fra quelle che il programma prevede. Sono presenti, in totale, 12 tipi di conti in &app; basati sui 5 tipi fondamentali descritti in precedenza. La ragione per cui esistono in </para>
@@ -1899,7 +1899,7 @@ Translators:
         <listitem>
           <para><guilabel>fondi comuni</guilabel>: questo tipo di conto è simile al precedente, tranne per il fatto che deve essere utilizzato per registrare i fondi. Il registro di immissione dati prevede due colonne per l’inserimento delle quote e dei prezzi. I fondi rappresentano delle proprietà comuni di investimenti e, come le azioni, non garantiscono un valore minimo del capitale;</para>
 
-          <para><application>GnuCash</application> treats account types Stock and
+          <para>&app; treats account types Stock and
             Mutual Fund the same.
           </para>
 
@@ -1920,11 +1920,11 @@ Translators:
 
         <listitem>
           <para><guilabel>Asset</guilabel> No matter how diverse they
-          are, <application>GnuCash</application> handles many other situations
+          are, &app; handles many other situations
           easily. The account type <quote>Asset</quote>, covers all assets not
           listed above.</para>
 
-          <para><application>GnuCash</application> treats account types Cash,
+          <para>&app; treats account types Cash,
             Bank and Asset the same.
           </para>
 
@@ -1964,7 +1964,7 @@ Translators:
         <listitem>
           <para><guilabel>passività</guilabel>: utilizzare questo conto per tutti gli altri prestiti, generalmente di entità maggiore e di durata superiore come un mutuo o le rate dell’auto. Questo conto aiuta anche a conoscere quanto denaro si deve ancora e quanto è stato già restituito.</para>
 
-          <para><application>GnuCash</application> treats account types Credit
+          <para>&app; treats account types Credit
             Card and Liability the same.
           </para>
 
@@ -1977,7 +1977,7 @@ Translators:
 
       <para>Il conto finale del bilancio patrimoniale è quello del <emphasis>capitale</emphasis>, che è sinonimo di valore netto o capitale netto. Rappresenta ciò che rimane dopo aver sottratto le passività dalle attività, ed è quindi la porzione di patrimonio che si possiede e sulla quale non grava alcun debito. In &app; si consiglia di utilizzare questa tipologia di conto come fonte per i bilanci di apertura dei conti bancari, dato che questo saldo rappresenta il valore netto iniziale.</para>
 
-      <para>There is usually only a single <application>GnuCash</application> equity account, called naturally
+      <para>There is usually only a single &app; equity account, called naturally
       enough, <guilabel>Equity</guilabel>.
       For companies, cooperatives etc. you can create a subaccount for each partner.</para>
 
@@ -2256,17 +2256,17 @@ Translators:
     <title>Concetti base</title>
 
     <para>A <emphasis>transaction</emphasis> in a double entry accounting
-    system such as <application>GnuCash</application> is an exchange between at least 2 accounts. Thus, a
+    system such as &app; is an exchange between at least 2 accounts. Thus, a
     single transaction must always consist of at least two parts, a <emphasis>from</emphasis> and
     a <emphasis>to</emphasis> account. The <emphasis>from</emphasis> account is transferring value to the <emphasis>to</emphasis> account.
     Accountants call these parts of a transaction <emphasis>Ledger
-    Entries</emphasis>. In <application>GnuCash</application>, they are called
+    Entries</emphasis>. In &app;, they are called
     <emphasis>Splits</emphasis>.</para>
 
     <para>A split identifies the account to which it refers, the
     amount of money specifically moved to or from that account, and
     can contain a few other specific pieces of information if needed.
-    <application>GnuCash</application> supports multiple splits in a
+    &app; supports multiple splits in a
     single transaction, and the splits can move money into or out of
     the involved accounts arbitrarily.</para>
 
@@ -2281,7 +2281,7 @@ Translators:
   <sect1 id="txns-register-oview">
     <title>Il registro contabile</title>
 
-    <para>The <emphasis>account register</emphasis> is the <application>GnuCash</application> window, which allows you to view or edit preexisting transactions, or add new transactions for a particular account. To open an account register from the Account Tree, double-click the account name, right click the account name and select Open Account from the menu, or use the Open button on the toolbar. <application>GnuCash</application> will display the account register window.</para>
+    <para>The <emphasis>account register</emphasis> is the &app; window, which allows you to view or edit preexisting transactions, or add new transactions for a particular account. To open an account register from the Account Tree, double-click the account name, right click the account name and select Open Account from the menu, or use the Open button on the toolbar. &app; will display the account register window.</para>
         <sect2 id="txns-registers-features2">
             <title>Caratteristiche del registro del conto</title>
 
@@ -2292,7 +2292,7 @@ Translators:
 <sect2 id="txns-regstyle1">
     <title>Scegliere uno stile per il registro</title>
 
-    <para><application>GnuCash</application> offers several options for viewing your registers. The
+    <para>&app; offers several options for viewing your registers. The
         default style is <guilabel>Basic Ledger</guilabel> mode, which displays
         only the summary of splits affecting the current account. This is the
         style that most closely resembles other popular personal financial
@@ -2370,7 +2370,7 @@ Translators:
 <sect2 id="txns-shortcuts1">
     <title>Utilizzare le scorciatoie per l’immissione dei dati</title>
 
-    <para><application>GnuCash</application> provides several time-saving shortcuts for entering your
+    <para>&app; provides several time-saving shortcuts for entering your
         data. When you type the first few characters of a description that you
         have used before, the QuickFill feature automatically fills in the rest of
         the transaction as you last entered it. When you type in the first
@@ -2381,7 +2381,7 @@ Translators:
         fields: simply type the first characters of the parent account name
         followed by a <keycap>:</keycap> (colon) and the first characters of the sub-account name. For
         example, to enter <emphasis>Assets:Checking</emphasis>, you might type
-        <userinput>A:C</userinput> and let <application>GnuCash</application> fill in the rest.</para>
+        <userinput>A:C</userinput> and let &app; fill in the rest.</para>
     <warning><para>Because <keycap>:</keycap> is the account separator symbol,
         you can not use it in your account names.</para></warning>
     <tip><para>If you really need the colon in your account names, you can select another symbol by
@@ -2423,9 +2423,9 @@ Translators:
             you can enter a date.</para></tip>
 
     <tip><para>Specifically for dates there's another way you can save time: you can enter
-            partial dates. For example if you only enter one number, <application>GnuCash</application>
+            partial dates. For example if you only enter one number, &app;
             will interpret it as the day in the current month of the current year. If you only enter
-            a day and month, <application>GnuCash</application> will automatically append the year. The
+            a day and month, &app; will automatically append the year. The
             default this to take such a date in a sliding window starting 11 months before the current
             month. This means that if you enter 1/5 (January 5th) as date while the current date is
             in December 2015, the date will be completed as 1/5/16. This default can be changed via
@@ -2485,7 +2485,7 @@ Translators:
     <sect1 id="txns-registers-txntypes">
     <title>Simple vs. Split Transactions</title>
 
-    <para>Every transaction in <application>GnuCash</application> has at least two splits, but a transaction can have more than two splits. A transaction with only two splits is called a <emphasis>simple transaction</emphasis>, since it only involves the current account and a single remote account. A transaction with three or more accounts is called a <emphasis>split transaction</emphasis>.</para>
+    <para>Every transaction in &app; has at least two splits, but a transaction can have more than two splits. A transaction with only two splits is called a <emphasis>simple transaction</emphasis>, since it only involves the current account and a single remote account. A transaction with three or more accounts is called a <emphasis>split transaction</emphasis>.</para>
     <para>When the register is in Basic view, you will see a summary of the splits affecting the current account. For a simple transaction, the <guilabel>Transfer</guilabel> column will display the other account from which money is <emphasis>transferred</emphasis>. For a split transaction, the <guilabel>Transfer</guilabel> column will display <guilabel>-- Split Transaction --</guilabel>. You can see the individual splits of each
         transaction by clicking the <guibutton>Split</guibutton> button in the
         <emphasis>Toolbar</emphasis> while selecting the appropriate transaction.</para>
@@ -2545,7 +2545,7 @@ Translators:
       previous chapter <filename>gcashdata_3</filename>, double click on the
       <guilabel>Checking</guilabel> asset account. Let’s add a simple
       transaction to the checking account. When you first create your accounts
-      in <application>GnuCash</application>, it is common to start them off with an initial
+      in &app;, it is common to start them off with an initial
       balance.</para>
 
       <para>Nella prima riga delle transazioni, inserire una data (es: 1 Marzo 2006), una descrizione (es: <quote>Bilancio di apertura</quote>), selezionare il menu a tendina del trasferimento e selezionare <emphasis>Capitali:Bilanci d’apertura</emphasis>, aggiungere un deposito del valore di €1.000, e premere <keycap function="enter">Invio</keycap>. Il registro contabile dovrebbe apparire simile a quello in figura:</para>
@@ -2589,7 +2589,7 @@ Translators:
       <para>Il bisogno di una transazione che coinvolge 3 o più conti sorge quando è necessario suddividere o il conto <quote>da</quote> o il conto <quote>a</quote> in una transazione in più conti. L’esempio classico di questa situazione si verifica quando si riceve lo stipendio. Il compenso che si riceve è sicuramente inferiore allo stipendio lordo a causa delle imposte, del fondo pensione e altre voci. Perciò la singola transazione relativa alla ricezione dello stipendio coinvolge altri conti oltre a quelli di <emphasis>Attività:Conto corrente</emphasis> e <emphasis>Entrate:Stipendio</emphasis>.</para>
       <para>To add the paycheck split transaction from the<emphasis role="italic"> Assets:Checking</emphasis> account register window, click on a new transaction line and click <guilabel>Split</guilabel>. Note that if you have set your register view to Auto-Split or Transaction Journal, the splits will be opened for you. Enter the description of this transaction on the first line(e.g. “Employers R Us”). In the split lines below this, enter the various splits that make up this transaction, one by one. To enter the splits, first choose the account, then enter the amount by which to change the account. Keep in mind that when in an asset account register, amounts entered in the left column increase the account balance, while amounts entered in the right column decrease the balance (for more about this, see <xref linkend="basics-transactions2"/>). Tab or click the next split line and repeat the process. Note that if you are using the keyboard to navigate the transaction, use<keycap> Tab</keycap> to move from field to field, as using <keycap>Enter</keycap> will commit the transaction and create splits to an Imbalance account.</para>
       <note>
-        <para>When creating a transaction in <application>GnuCash</application>, splits can be entered in any order.
+        <para>When creating a transaction in &app;, splits can be entered in any order.
         However, when the transaction is closed (either when leaving the transaction, or when
         pressing the <keycap function="enter">Enter</keycap> key), all debit splits will jump ahead of all credit splits.</para>
       </note>
@@ -2615,14 +2615,14 @@ Translators:
   <sect1 id="txns-reconcile1">
     <title>Riconciliazione</title>
 
-      <para>Once transactions have been entered into <application>GnuCash</application>, it is important to verify
+      <para>Once transactions have been entered into &app;, it is important to verify
       that they agree with the records of your financial institution. This
       verification process is known as <emphasis role="strong">reconciliation</emphasis>, and it is key to determine
       whether your records are accurate. Most commonly, you will check transactions
       against bank statements, although you can use this process to verify any
       transaction.</para>
 
-      <para><application>GnuCash</application> keeps track of the reconciliation status of each
+      <para>&app; keeps track of the reconciliation status of each
         transaction. The reconciliation status of a transaction is shown by the
         reconciliation <guilabel>R</guilabel> field in a register:
         <emphasis>y</emphasis> indicates that a transaction has been
@@ -2639,14 +2639,14 @@ Translators:
       the bank thinks you have in your account, while the latter includes outstanding transactions.</para>
 
       <para>For example, when you write a check for something, you should
-      enter the transaction into <application>GnuCash</application>. The reconciliation <guilabel>R</guilabel> field of the
+      enter the transaction into &app;. The reconciliation <guilabel>R</guilabel> field of the
       transaction will initially contain <guilabel>n</guilabel> (new). Your new entry will
       contribute to the <guilabel>total</guilabel> balance, but not to the <guilabel>cleared</guilabel> and
       <guilabel>reconciled</guilabel> balance. Later, if you got some confirmation that the check has been cashed,
       you might click on the transaction’s <guilabel>R</guilabel> field to change it to <emphasis>c</emphasis>
       (cleared). When you do this, the <guilabel>cleared</guilabel> balance will
       change to include this amount. When the bank statement arrives, you can
-      then compare it to what you’ve recorded in <application>GnuCash</application> by opening the reconciliation
+      then compare it to what you’ve recorded in &app; by opening the reconciliation
       window. There, you will be able to change the <guilabel>R</guilabel> field to <emphasis>y</emphasis> (reconciled).</para>
 
       <note>
@@ -2798,8 +2798,8 @@ Translators:
 
      <para>In basso nella finestra di riconciliazione viene riportata la <guilabel>Differenza</guilabel>, che dovrebbe visualizzare €0,00 quando la riconciliazione è terminata. Se riporta qualche altro valore, o si è dimenticata una o più transazioni oppure alcuni importi potrebbero essere errati in &app; (o, più difficilmente, la banca ha fatto un errore).</para>
 
-      <note><para>Under some circumstances, it may be difficult or impossible to determine why an account will not reconcile. If you are unable to correct the discrepancy between your books and a statement, <application>GnuCash</application> includes a <guibutton>Balance</guibutton> button on the <emphasis>Toolbar</emphasis> that will automatically create a balancing entry for you in the amount that cannot be reconciled.</para>
-          <para>To use this, carry out the full reconciliation (marking all transactions that you can identify) and then click this button. <application>GnuCash</application> will create a balancing entry for the remaining discrepancy that uses the <emphasis>Special Accounts:Orphan-XXX</emphasis> account (where "XXX" represents your currency). The Reconcile window will close; re-opening it will allow you to check the newly-created balancing entry and finish the process.</para></note>
+      <note><para>Under some circumstances, it may be difficult or impossible to determine why an account will not reconcile. If you are unable to correct the discrepancy between your books and a statement, &app; includes a <guibutton>Balance</guibutton> button on the <emphasis>Toolbar</emphasis> that will automatically create a balancing entry for you in the amount that cannot be reconciled.</para>
+          <para>To use this, carry out the full reconciliation (marking all transactions that you can identify) and then click this button. &app; will create a balancing entry for the remaining discrepancy that uses the <emphasis>Special Accounts:Orphan-XXX</emphasis> account (where "XXX" represents your currency). The Reconcile window will close; re-opening it will allow you to check the newly-created balancing entry and finish the process.</para></note>
 
       <para>When you have marked off all the items on the bank statement and the difference is 0.00, press the <guibutton>Finish</guibutton> button on the <emphasis>Toolbar</emphasis> or
       select <menuchoice><guimenu>Reconcile</guimenu><guimenuitem>Finish</guimenuitem></menuchoice> from the menu.
@@ -3746,7 +3746,7 @@ Translators:
 
   <para>If managing your checkbook is the first step in tracking your finances, then using expense accounts
   to see where you are expending money is a close second step. This chapter will give you an understanding of
-  how <application>GnuCash</application> uses expense accounts to help you keep track of many different
+  how &app; uses expense accounts to help you keep track of many different
   categories of transactions.</para>
 
   <sect1 id="expenses-concepts">
@@ -3755,12 +3755,12 @@ Translators:
     expenses. Technically, expense accounts are not a part of traditional accounting,
     but have become common with the increased capabilities of computer-based accounting systems.
     Many people's first experience with tracking expenses comes from Quicken(tm), where
-    transactions can be assigned to one or more categories. In <application>GnuCash</application>, these categories
+    transactions can be assigned to one or more categories. In &app;, these categories
     are set up as separate accounts, which are designated as Expense type accounts.
-    This allows <application>GnuCash</application> to apply the rules of double-entry accounting consistently.
+    This allows &app; to apply the rules of double-entry accounting consistently.
     Expense accounts can be as detailed or as general as you need. Some users need only a few accounts for
-    personal expense tracking. Others use <application>GnuCash</application> expense accounts to manage their expenses
-    in great detail. The level of detail you choose is up to you. Keep in mind that with <application>GnuCash</application>,
+    personal expense tracking. Others use &app; expense accounts to manage their expenses
+    in great detail. The level of detail you choose is up to you. Keep in mind that with &app;,
     you can change accounts for transactions, so if your needs change later on, it is possible to move
     transactions around.</para>
     </sect1>
@@ -3792,7 +3792,7 @@ Translators:
     you will typically add a transaction to the expense account by assigning a check in your
     checking account register to the Charity account.</para>
     <para>If you open an expense account, you will see a register similar to most others you find
-    in <application>GnuCash</application>. The informal column headings for the transaction amounts
+    in &app;. The informal column headings for the transaction amounts
     are slightly different, however. The left (debit) column will read <emphasis>Tot Expense</emphasis>, while
     the right (credit) column will read <emphasis>Tot Rebate</emphasis>.</para>
   </sect1>
@@ -3802,11 +3802,11 @@ Translators:
     which you would reconcile your data. Therefore, there is technically nothing to reconcile. You
     can, of course use the reconcile process for expense accounts, which will lock the transactions
     for future editing.</para>
-    <para>One point to consider is that as your use of <application>GnuCash</application> continues, the
+    <para>One point to consider is that as your use of &app; continues, the
     balances in these accounts will grow, since there are usually very few credit transactions that
     reduce the balances. There is nothing wrong with this situation, but some users may wish to clear
     the balances in their expense accounts periodically. Zeroing transactions can be entered that
-    transfer the balance of the account to an Equity account. <application>GnuCash</application> includes
+    transfer the balance of the account to an Equity account. &app; includes
     a Closing Books procedure that includes zeroing out expense accounts. Keep in mind that this is
     not necessary, and that if you need to gather information on a given expense account, you can
     use various reports to extract that data without zeroing the account out.</para>
@@ -3898,7 +3898,7 @@ Translators:
 
     <para>When you pay for goods or services with your credit card, you are telling the credit card company to pay the merchant for you. This transaction will increase the amount of money you owe the credit card company, and the credit card balance will increase. The other side of these transactions will in most cases be an expense account. For example, if you buy clothing from a store with your credit card for $50, you would be transferring that money from the credit account into Expenses:Clothing.</para>
 
-    <para>Entering these transactions into <application>GnuCash</application> allows you to track how much you owe the credit card company, as well as provides you a better picture of your overall accounts. It also allows you to monitor your account and ensure that fraud is avoided.</para>
+    <para>Entering these transactions into &app; allows you to track how much you owe the credit card company, as well as provides you a better picture of your overall accounts. It also allows you to monitor your account and ensure that fraud is avoided.</para>
 
     <para>Adding transactions to a credit card account is similar to entering transactions in other accounts. You can enter them manually, or import them from your credit card company using a compatible import format.</para>
 
@@ -4154,7 +4154,7 @@ Translators:
           </imageobject>
 
           <textobject>
-            <phrase><application>GnuCash</application> finestra principale</phrase>
+            <phrase>&app; finestra principale</phrase>
           </textobject>
 
           <caption>
@@ -5399,7 +5399,7 @@ Capitale:Bilanci di apertura:EUR
       <guilabel>New Account Hierarchy Setup</guilabel> assistant will
       automatically create a basic investment account hierarchy for you. To
       access the predefined investment accounts hierarchy, you must make
-      sure your <application>GnuCash</application> file is open, switch to the
+      sure your &app; file is open, switch to the
       <guilabel>Accounts</guilabel> tab, and choose
       <menuchoice><guimenu>Actions</guimenu><guimenuitem>New Account
       Hierarchy</guimenuitem></menuchoice>. This will run the <guilabel>New
@@ -5646,7 +5646,7 @@ Entrate
     <para>Now that you have built an account hierarchy in the previous
     section, this section will show you how to create and populate the accounts with your
     investment portfolio. After this initial setup of your portfolio, you may have
-    shares of stock purchased from before you started using <application>GnuCash</application>. For these stocks,
+    shares of stock purchased from before you started using &app;. For these stocks,
     follow the instructions in the <link linkend="invest-buy-stock2"><emphasis>Entering
     Preexisting Shares</emphasis></link> section below. If you have just purchased your stocks,
     then use the <link linkend="invest-buy-new2"><emphasis>Buying New Shares</emphasis>
@@ -5993,7 +5993,7 @@ Entrate
               usually give their quotes as one of bid, ask or last. Mutual funds
               are often given as net asset value. For other commodities, simply
               choose <guilabel>Unknown</guilabel>. This option is for informational purposes only, it
-              is not used by <application>GnuCash</application>.</para>
+              is not used by &app;.</para>
             </listitem>
 	  </varlistentry>
 
@@ -6207,10 +6207,10 @@ Entrate
     <para>La registrazione corretta della vendita delle azioni <emphasis>DEVE</emphasis> avvenire utilizzando una transazione suddivisa. In essa occorre contabilizzare il profitto (o la perdita) come entrata derivante da un conto <emphasis>Entrate:Guadagni in capitale</emphasis> (o <emphasis>Uscite:Perdita in capitale</emphasis>). Per bilanciare questa entrata, è necessario inserire nella suddivisione, per due volte, l’attività derivante dalle azioni: una per registrare la vendita (utilizzando il numero corretto di azioni e del prezzo unitario) e una volta per bilanciare il profitto ottenuto (impostando il numero di azioni a 0 e il prezzo unitario anch’esso a 0).</para>
 
     <note>
-      <para>In order to get <application>GnuCash</application> to commit this
+      <para>In order to get &app; to commit this
       zero-share, zero-price split to the transaction, you *must*
       <keycap>Tab</keycap> out of the split. If you use the
-      <keycap function="enter">Enter</keycap> key, <application>GnuCash</application>
+      <keycap function="enter">Enter</keycap> key, &app;
       will convert the split into shares of the commodity.</para>
     </note>
 
@@ -6591,7 +6591,7 @@ Entrate
         </para>
 
         <para>
-          <application>GnuCash</application> has a built-in lot management
+          &app; has a built-in lot management
           facility that can be used to keep track of capital gains or losses
           resulting from security sales. Buy and sell transactions are put into
           lots for the purpose of calculating the cost of the sale. More
@@ -6599,7 +6599,7 @@ Entrate
           transaction splits. Lots can be automatically or manually created and
           linked. Capital gain or loss can be automatically calculated and
           transaction(s) created for the difference between the sale value and
-          the cost of the securities sold. <application>GnuCash</application>
+          the cost of the securities sold. &app;
           refers to this process as <emphasis>scrubbing</emphasis>.
         </para>
 
@@ -6634,7 +6634,7 @@ Entrate
         </para>
 
         <para>
-          The <application>GnuCash</application> lot management facility can be a
+          The &app; lot management facility can be a
           useful feature, reducing manual calculation, especially if dividends
           have been reinvested over years and there are many different costs
           involved. It can automatically link buy transactions to sell
@@ -6758,11 +6758,11 @@ Entrate
           <xref linkend="invest-sellConsiderations"/></para>
         </note>
 
-        <para><application>GnuCash</application> can automatically calculate and
+        <para>&app; can automatically calculate and
           create security sale capital gain/loss transactions. Lots are used to
           link buy transaction splits with sell transaction splits so the
           correct cost of the securities sold can be determined.
-          <application>GnuCash</application> will use any existing lots, and
+          &app; will use any existing lots, and
           create new lots for any buy transaction splits not already linked to a
           lot. Buy and sell transaction splits are linked to lots using FIFO
           method.
@@ -6844,7 +6844,7 @@ Entrate
 
         <orderedlist>
           <listitem>
-            <para><application>GnuCash</application> implements only the First In/
+            <para>&app; implements only the First In/
               First Out (FIFO) cost method when automatically linking buy
               transactions to sell transactions. I.e. The oldest securities are
               always sold first. The Last In First Out (LIFO) cost method may be
@@ -6958,7 +6958,7 @@ Entrate
         <para>Here is an example of selling part of a security holding using
           the LIFO method. In this example, the most recent buy transaction
           (dated 01/07/2016, a reinvested dividend), is linked to a lot, along
-          with the sell transaction, and the <application>GnuCash</application>
+          with the sell transaction, and the &app;
           scrub function is used to calculate capital gain or loss and create
           the capital gain/loss transaction.
         </para>
@@ -7170,7 +7170,7 @@ Entrate
 
                 <note><para>
 		  If there are already gain/loss splits as part of a sell
-                  transaction, <application>GnuCash</application> scrubbing does
+                  transaction, &app; scrubbing does
                   not recognize them. So if manually adding gain/loss,
                   separate gain/loss transaction splits from the transaction
                   that reduces the <guilabel>No of Shares</guilabel>) by putting
@@ -7562,10 +7562,10 @@ Entrate
       </para>
 
       <para>Starting with the purchase of 100 shares on Jan. 3, 2005, all dividends will be
-      reinvested and an account is created to track the dividend to the specific stock. <application>GnuCash</application>
+      reinvested and an account is created to track the dividend to the specific stock. &app;
       simplifies the entry by allowing calculations within the cells of the transaction. If the
       first dividend is $.29/share, enter $53.28 (purchase price + dividend) in the share <guilabel>Price</guilabel>
-      cell and 100*.29 in the <guilabel>Buy</guilabel> cell. <application>GnuCash</application> will calculate for you the
+      cell and 100*.29 in the <guilabel>Buy</guilabel> cell. &app; will calculate for you the
       corresponding numer of <guilabel>Shares</guilabel></para>
 
       <screenshot id="invest-dividendreinvest1">
@@ -7647,7 +7647,7 @@ Entrate
   </note>
 
   <tip><para>If you accidentally entered a non-zero price in the stock split,
-    <application>GnuCash</application> may have created an unwanted price database
+    &app; may have created an unwanted price database
     entry which could cause reports to be wrong. Check for and remove such an
     unwanted entry from the price database using <menuchoice><guimenu>Tools
     </guimenu><guimenuitem>Price Editor</guimenuitem></menuchoice>.</para>
@@ -7927,23 +7927,23 @@ Entrate
 -->
  <chapter id="ch_reports">
  <title>Resoconti</title>
- <para><application>GnuCash</application> is a powerful double entry accounting software package that allows
+ <para>&app; is a powerful double entry accounting software package that allows
 users to enter and track their money in a reliable manner. However, putting
-this information into <application>GnuCash</application> is only a part of the process. To be truly
+this information into &app; is only a part of the process. To be truly
 helpful, you need to be able to extract this information in meaningful ways.
-<application>GnuCash</application>'s reporting features allow you to just that.</para>
-<para><application>GnuCash</application>'s reporting features allow you to display nearly any group of
+&app;'s reporting features allow you to just that.</para>
+<para>&app;'s reporting features allow you to display nearly any group of
 transactions in a wide variety of formats. This makes it easy to answer
 questions about your finances, such as "How much did I spend on groceries
 last month?" or "How much did I earn in the previous six months?"</para>
-<para><application>GnuCash</application> includes a number of common report types, which can be modified to
+<para>&app; includes a number of common report types, which can be modified to
 meet your specific needs. If these common reports are insufficient, it is
 possible to modify or even write your own custom reports (although this is
 not recommended for beginners).</para>
 
  <sect1 id="rpt_concepts">
  <title>In generale</title>
- <para>There are many standard reports pre-built in <application>GnuCash</application>,
+ <para>There are many standard reports pre-built in &app;,
  all available from the <guimenu>Reports</guimenu> pulldown menu in the main account window.</para>
  <para>When you select a report from the list of reports, that report is first run
  with its default settings. Once you have opened the report, you can modify its parameters by clicking on
@@ -7955,7 +7955,7 @@ the options will be different. </para>
 <sect1 id="rpt_savedconfigsinfo">
   <title>Saved Reports Configurations Concepts</title>
   <para>Once you have modified a report to meet your needs, you may wish to save
-  that report for reuse at a later point. <application>GnuCash</application> allows custom
+  that report for reuse at a later point. &app; allows custom
   reports to be saved, using the Save Report Configuration command.</para>
   <para>To save a report configuration:</para>
 <itemizedlist>
@@ -7985,7 +7985,7 @@ Configuration.</para>
 
 <sect1 id="rpt_standardrpts">
   <title>Standard Reports Overview</title>
- <para>The standard reports that are included in <application>GnuCash</application> are presented here
+ <para>The standard reports that are included in &app; are presented here
  in the order that they appear in the <guimenu>Reports</guimenu> menu. In each section, a short
  description for each report is given, which explains what the report is
  intended to show, and its primary purpose.</para>
@@ -7998,8 +7998,8 @@ Configuration.</para>
 <title>Advanced Portfolio</title>
 <para>The Advanced Portfolio produces a report on commodity accounts
 (stock and mutual fund type accounts) using price information stored in the
-<application>GnuCash</application> price database and within the
-<application>GnuCash</application> transaction data. If you do not have stock
+&app; price database and within the
+&app; transaction data. If you do not have stock
 price information in your file, the report will indicate an error. This report
 includes extended information about commodity holdings, including information
 about the basis, gain, and return of individual commodities.</para>
@@ -8165,7 +8165,7 @@ commodity.</para>
 
 <sect2 id="rpt_grp_budget">
 <title>Budget Group</title>
-<para> Budget reports in <application>GnuCash</application> allow you to gather
+<para> Budget reports in &app; allow you to gather
 summary information related to budgets you may have created. In order for
 these reports to work, you must first create a budget. The reports in this
 group are specifically based on budget information. To use these reports, you
@@ -8216,7 +8216,7 @@ to a business.</para>
 <title>Customer Summary</title>
 <para>Customer Summary is a customer profit report that can help with job analysis by
 comparing the income and expenses for a specific customer.</para>
-<para>All invoices have an Owner in <application>GnuCash</application>, so invoices that are
+<para>All invoices have an Owner in &app;, so invoices that are
 made will show a customer and show in the report. When creating a Bill, the Default
 Chargeback Customer is blank. To use the profit report, this field needs an entry,
 since this is the tag that decides the line to which
@@ -8235,7 +8235,7 @@ may be inaccurate, as the results are not all properly labeled.</para>
 <para>Each of these scenarios assumes that the account structure includes breakdowns
 for individual tracked categories. Changing settings on the Income and Expense
 tabs under Options can hone the information displayed. By default all income and
-expense accounts are included; however, since <application>GnuCash</application> can't really predict
+expense accounts are included; however, since &app; can't really predict
 the names and classification of income and expense accounts, it must group them all
 into the "No Customer" entry.</para>
 <para>Note that inventory-based businesses won't benefit from this report because of its nature.</para>
@@ -8408,7 +8408,7 @@ affect the reported value of various commodities included in the report.</para><
 default, it shows all Expense and Income accounts down to 3 levels of
 sub-accounts for the current financial period.</para>
 <para>An Income Statement is also called a "Profit and Loss" report or "Revenue Statement."</para>
-<para>In earlier versions of <application>GnuCash</application>, this report was called
+<para>In earlier versions of &app;, this report was called
 "Profit & Loss," but with version 2, the report was renamed "Income Statement"
 to use more common accounting terminology.</para>
 <para>The Income Statement helps show where money is coming from and where it is
@@ -8908,13 +8908,13 @@ an empty report will be generated.</para>
 <chapter id="chapter_currency">
   <title>Valute multiple</title>
 
-  <para>This chapter will show how to set up <application>GnuCash</application> accounts to use
+  <para>This chapter will show how to set up &app; accounts to use
   multiple currencies.</para>
 
   <sect1 id="currency_concepts1">
     <title>Concetti base</title>
 
-    <para><application>GnuCash</application> supports over a hundred currencies, from the Andorran Franc
+    <para>&app; supports over a hundred currencies, from the Andorran Franc
     to the Zimbabwe Dollar. For example, you can have a bank account set up in Euros, and
     another using Hong Kong Dollars.</para>
 
@@ -8923,8 +8923,8 @@ an empty report will be generated.</para>
     <note>
       <para>An alternative way to manage multiple currency accounts from the one
       presented in the next sections, is to use the <guilabel>trading</guilabel> accounts
-      capabilities of <application>GnuCash</application>. This feature, which was
-      introduced with <application>GnuCash</application> version 2.3.14, can be enabled by
+      capabilities of &app;. This feature, which was
+      introduced with &app; version 2.3.14, can be enabled by
       going to the <guilabel>Accounts</guilabel> tab under <menuchoice><guimenu>File</guimenu><guimenuitem>
       Properties</guimenuitem></menuchoice>.</para>
       <para>For a complete guide on <guilabel>trading</guilabel> accounts, see
@@ -8940,13 +8940,13 @@ an empty report will be generated.</para>
     under <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
     (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).</para>
 
-    <para>Similarly, <application>GnuCash</application> offers an option to
+    <para>Similarly, &app; offers an option to
     set your preferred currency for displaying reports (like the balance
     sheet and income statement). The option is called <guilabel>Default
     Report Currency</guilabel>, and is in the <guilabel>Reports</guilabel>
     tab of the <guilabel>GnuCash Preferences</guilabel> screen.
     You’ll want to set both options when you start using
-    <application>GnuCash</application> because if (for example) your accounts
+    &app; because if (for example) your accounts
     are all in Canadian Dollars but the generated reports are all in US
     Dollars, the reports will just say that there are <quote>no
     data/transactions (or only zeroes) for the selected time
@@ -8954,7 +8954,7 @@ an empty report will be generated.</para>
 
     <para>When you create a new account, you have the option to define the
     commodity in which that account is denominated. For accounts denominated 
-    in a currency, you can specify any of the currencies supported by <application>GnuCash</application> 
+    in a currency, you can specify any of the currencies supported by &app; 
     by simply selecting it from the currency commodity list. You will notice 
     that the default currency is the currency that is defined for the parent 
     account of the new account.</para>
@@ -8998,7 +8998,7 @@ an empty report will be generated.</para>
     USD 10,000, EUR 10,000 as well as HKD 10,000 in the three bank accounts.
     Notice that the total of the parent accounts only shows the value of the
     currency of sub-accounts with matching currencies. In other words, the 
-    Total Assets and Total Equity values only reflect USD amounts, because <application>GnuCash</application>
+    Total Assets and Total Equity values only reflect USD amounts, because &app;
     has no way of evaluating the value of EUR or HKD yet. Once you set up 
     exchange rates between the currencies, the parent accounts
     will calculate the converted value of all sub-accounts. See the later
@@ -9026,7 +9026,7 @@ an empty report will be generated.</para>
       <para>Usually when we talk about currencies, we mean
       government-backed currencies (or more precisely, currencies defined
       in <ulink url="&url-wp-en;ISO_4217">ISO 4217</ulink>).
-      <application>GnuCash</application> does not allow you to create your
+      &app; does not allow you to create your
       own currencies. If you want to track non-<acronym>ISO</acronym>
       currencies, you can use either of two workarounds, depending on which
       fits your needs better.</para>
@@ -9050,10 +9050,10 @@ an empty report will be generated.</para>
       <guilabel>FUND</guilabel>.</para>
 
       <para>This is not really what the stock and mutual fund account types
-      are meant for, but <application>GnuCash</application> will allow it. The downside is
+      are meant for, but &app; will allow it. The downside is
       that you’ll have to enter a <quote>price</quote> for every
       transaction involving this account, because
-      <application>GnuCash</application> needs the prices to figure out the
+      &app; needs the prices to figure out the
       monetary value of the points and treat them as one of your
       assets.</para>
 
@@ -9078,7 +9078,7 @@ an empty report will be generated.</para>
   <sect1 id="currency_howto1">
     <title>Recording and Updating Currency Exchange Rates</title>
 
-    <para><application>GnuCash</application> allows you to update the Currency Exchange Rates 
+    <para>&app; allows you to update the Currency Exchange Rates 
     both manually and automatically. This process is essentially the
     same as setting share prices for investments (see <xref linkend="invest-stockprice1"/>). 
     In the following two sections we will work through both methods.</para>
@@ -9182,7 +9182,7 @@ an empty report will be generated.</para>
       <title>Aggiornare automaticamente i tassi di cambio</title>
 
       <para>In the previous section you saw how to manually define a
-      new currency exchange rate, but <application>GnuCash</application> includes an
+      new currency exchange rate, but &app; includes an
       automatic price update feature, which will now be described.</para>
 
       <para>Aprire l’<guilabel>editor prezzi</guilabel> andando in <menuchoice><guimenu>Strumenti</guimenu><guimenuitem>Editor prezzi</guimenuitem></menuchoice>.</para>
@@ -9219,13 +9219,13 @@ an empty report will be generated.</para>
           </mediaobject>
         </screenshot></para>
 
-      <para><application>GnuCash</application> downloads exchange rates for all
+      <para>&app; downloads exchange rates for all
       currencies that are in use in your various accounts. This will happen
-      every time you click on <guibutton>Get Quotes</guibutton> or request <application>GnuCash</application>
+      every time you click on <guibutton>Get Quotes</guibutton> or request &app;
       to download quotes as per <xref linkend="invest-stockprice-auto2"/></para>
 
       <para>Now when you check the main Chart of Accounts you will see that
-      <application>GnuCash</application> has automatically converted the HKD amount to USD amount on the
+      &app; has automatically converted the HKD amount to USD amount on the
       parent accounts that are in USD, as well as on the Total (USD) column.
       Also the Euro accounts have been been updated with the latest exchange
       rate.</para>
@@ -9274,7 +9274,7 @@ an empty report will be generated.</para>
 
     <para>Purchases in a foreign currency can be managed in two different ways.</para>
 
-    <para>1) Use <application>GnuCash</application>'s built-in currency exchange functions when you
+    <para>1) Use &app;'s built-in currency exchange functions when you
     do your transactions. This is mainly used for one-time transactions, and
     nothing which happens regularly.</para>
 
@@ -9293,7 +9293,7 @@ an empty report will be generated.</para>
       boat in Jamaica. To do this, you opened a bank account in Jamaica, moved some
       money from the US, and then purchased your boat.</para>
 
-      <para>To record this in <application>GnuCash</application> we use the following basic account
+      <para>To record this in &app; we use the following basic account
       structure:</para>
 
       <literallayout>
@@ -9364,7 +9364,7 @@ an empty report will be generated.</para>
       </screenshot>
 
       <para>You choose to buy a boat for JMD 509,000. To record this transaction 
-      in <application>GnuCash</application>, you will need to enter a simple 
+      in &app;, you will need to enter a simple 
       transaction in <emphasis>Assets:Current Assets:Jamaican Bank</emphasis>
       withdrawing JMD 509,000 and transferring it to <emphasis>Assets:Fixed Assets:Boat</emphasis></para>
 
@@ -9529,7 +9529,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)
     country's currency, and hope that it will rise in value
     relative your own currency.</para>
 
-    <para>When you enter these transactions into <application>GnuCash</application>, you will have to
+    <para>When you enter these transactions into &app;, you will have to
     decide on how much detail you would like to have.</para>
 
     <para>If you are not interested in detail at all, a very simple account
@@ -9679,12 +9679,12 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)
   <sect1 id="bus_setup">
     <title>Business Setup</title>
 
-    <para>To set up <application>GnuCash</application> to handle accounts receivable or accounts payable
+    <para>To set up &app; to handle accounts receivable or accounts payable
       for a company, these preliminary steps must be done.
       <itemizedlist>
         <listitem><para>Build an appropriate Account Hierarchy.</para></listitem>
-        <listitem><para>Set up Tax Tables.</para></listitem>
-        <listitem><para>Enter the company information in <application>GnuCash</application>.</para></listitem>
+        <listitem><para>Set up Sales Tax Tables.</para></listitem>
+        <listitem><para>Enter the company information in &app;.</para></listitem>
         <listitem><para>Set Business Preferences.</para></listitem>
         <listitem><para>Set up Billing Terms.</para></listitem>
       </itemizedlist>
@@ -9700,19 +9700,19 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)
       meet your particular needs. It should be close enough, however, that it
       is recommended you begin with it.</para>
 
-      <para>To use <application>GnuCash</application>’s integrated accounts
+      <para>To use &app;’s integrated accounts
         receivable system, you must first set up a special account (usually a
         sub-account under Assets) to hold transactions for receivables. This account
         must be defined with account type <emphasis>A/Receivable</emphasis>.
-        <application>GnuCash</application> will use this account to place transactions
+        &app; will use this account to place transactions
         related to the integrated accounts receivable system.
       </para>
 
-      <para>To use <application>GnuCash</application>’s integrated accounts
+      <para>To use &app;’s integrated accounts
         payable system, you must first set up an account (usually a
         sub-account under Liabilities) to hold transactions for payables.
         This account must be defined with account type <emphasis>A/Payable</emphasis>.
-        <application>GnuCash</application> will use this account to place transactions
+        &app; will use this account to place transactions
         related to the integrated accounts payable system.
       </para>
 
@@ -9737,19 +9737,19 @@ Basic A/R and A/P Account Hierarchy:
 
       <note>
         <para>You do not need to create an individual A/R account for each
-          customer. <application>GnuCash</application> keeps track of customers internally and provides
+          customer. &app; keeps track of customers internally and provides
           per-customer reports based on the internal tracking. The same applies to A/P and vendors.
         </para>
       </note>
       <note>
         <para>
           If you deal with customers in more than one currency you will need a separate
-          <emphasis>Accounts Receivable</emphasis> account for each currency.
+          <guilabel>Accounts Receivable</guilabel> account <emphasis>for each currency</emphasis>.
         </para>
 
         <para>
           If you deal with vendors in more than one currency you will need a separate
-          <emphasis>Accounts Payable</emphasis> account for each currency.
+          <guilabel>Accounts Payable</guilabel> account <emphasis>for each currency</emphasis>.
         </para>
       </note>
       <note>
@@ -9761,20 +9761,20 @@ Basic A/R and A/P Account Hierarchy:
     </sect2>
 
     <sect2 id="bus-setuptaxtables">
-      <title>Setting up Tax Tables</title>
+      <title>Setting up Sales Tax Tables</title>
 
-      <para>Tax Tables can used to determine the tax for customer invoices (or vendor bills).
+      <para>Sales Tax Tables can used to determine the tax for customer invoices (or vendor bills).
       </para>
 
-      <para> A tax table can be assigned to an invoice line or bill line.</para>
+      <para> A tax table entry can be assigned to an invoice line or bill line.</para>
 
       <para>Set up distinct tax tables for customers and vendors.</para>
 
-      <para> The default invoice line tax table can be assigned to each customer and the default bill
-        line tax table can be assigned to each vendor.
+      <para>The default invoice tax table entry can be assigned to each customer and the default bill
+        tax table entry can be assigned to each vendor.
       </para>
 
-      <para>The default tax table for new customers or new vendors can  be specified in the <emphasis>Book Options </emphasis>
+      <para>The default tax table entry for new customers or new vendors can be specified in the <emphasis>Book Options</emphasis>
         window which can be accessed by
         <menuchoice><guimenu>File</guimenu>
           <guisubmenu>Properties</guisubmenu>
@@ -9782,44 +9782,42 @@ Basic A/R and A/P Account Hierarchy:
         </menuchoice>
       </para>
 
-      <para>Tax Tables are maintained using the <emphasis>Sales Tax Table</emphasis> editor which is accessed via menu
+      <para>Sales Tax Tables are maintained using the <emphasis>Sales Tax Table</emphasis> editor which is accessed via menu
         <menuchoice><guimenu>Business</guimenu><guimenuitem>Sales Tax Table</guimenuitem></menuchoice>.
       </para>
 
-      <figure pgwide="1">
-        <title>Tax Tables</title>
+      <figure>
+        <title>Sales Tax Tables Editor</title>
         <screenshot id="bus-taxmain">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/bus_tax_main.png" format="PNG" srccredit="Chris Good" width="510px"/>
+              <imagedata fileref="figures/bus_tax_main.png" format="PNG"
+                         srccredit="Chris Good" width="510px" />
             </imageobject>
             <imageobject role="fo">
-              <imagedata fileref="figures/bus_tax_main.png" format="PNG" srccredit="Chris Good"/>
+              <imagedata fileref="figures/bus_tax_main.png" format="PNG"
+                        srccredit="Chris Good" />
             </imageobject>
 
             <textobject>
               <phrase>Sales Tax Tables Editor</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
 
-      <figure pgwide="1">
-        <title>New Sales Tax Table</title>
+      <figure>
+        <title>New Sales Tax Table Entry</title>
         <screenshot id="bus-taxnew">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_tax_new.png" format="PNG" srccredit="Chris Good"/>
-            </imageobject>
-            <imageobject role="fo">
-              <imagedata fileref="figures/bus_tax_new.png" format="PNG" srccredit="Chris Good"/>
+            <imageobject>
+              <imagedata fileref="figures/bus_tax_new.png" format="PNG"
+                         srccredit="Chris Good" />
             </imageobject>
 
             <textobject>
-              <phrase>New Sales Tax Table</phrase>
+              <phrase>New Sales Tax Table Entry</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
@@ -9842,38 +9840,163 @@ Basic A/R and A/P Account Hierarchy:
             so that the net tax owed to the government can be easily observed.
           </para>
           <para>If you set up Tax on Purchases and Tax on Sales as subaccounts of Liabilities:Tax then the net tax will be rolled up
-            and can be seen in the  <application>GnuCash</application> Accounts tab.
+            and can be seen in the  &app; Accounts tab.
           </para>
-          <para><emphasis>If unsure about tax law requirements, get professional advise. </emphasis></para>
+          <para><emphasis>If unsure about tax law requirements, get professional advice. </emphasis></para>
         </listitem>
       </itemizedlist>
+
+      <para>The following charts illustrate sample tax tables and
+      may be used as starting points to determine the setup
+      appropriate for a particular jurisdiction.</para>
+
+      <table frame='all' id="bus-tax-tbl-eu">
+        <title>Sample Tax Table Entries for EU country (e.g. 21% / 6%
+        / 0% Belgium, 20% / 5% / 0% UK etc.)  (2017)</title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+          <thead>
+            <row>
+              <entry>Tax Table</entry>
+              <entry>Tax Table Entries [Asset/Liability]</entry>
+              <entry>Percentage or Amount</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>Standard VAT Sales</entry>
+              <entry>VAT:Sales:Standard [L]</entry>
+              <entry>21%</entry>
+            </row>
+            <row>
+              <entry>Reduced VAT Sales</entry>
+              <entry>VAT:Sales:Reduced [L]</entry>
+              <entry>6%</entry>
+            </row>
+            <row>
+              <entry>Zero-Rated VAT Sales</entry>
+              <entry>VAT:Sales:Zero [L]</entry>
+              <entry>0%</entry>
+            </row>
+            <row>
+              <entry morerows='1'>EC Sales</entry>
+              <entry>VAT:Sales:EC [L]</entry>
+              <entry>21%</entry>
+            </row>
+            <row>
+              <entry>VAT:Sales:Reverse EC [L]</entry>
+              <entry>-21%</entry>
+            </row>
+            <row>
+              <entry>Standard VAT Purchases</entry>
+              <entry>VAT:Purchases:Standard [A]</entry>
+              <entry>21%</entry>
+            </row>
+            <row>
+              <entry>Reduced VAT Purchases</entry>
+              <entry>VAT:Purchases:Reduced [A]</entry>
+              <entry>6%</entry>
+            </row>
+            <row>
+              <entry>Zero-Rated VAT Purchases</entry>
+              <entry>VAT:Purchases:Zero [A]</entry>
+              <entry>0%</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <table frame='all' id="bus-tax-tbl-au">
+        <title>Sample Tax Table Entries for Australia (2017)
+        </title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+          <thead>
+            <row>
+              <entry>Tax Table</entry>
+              <entry>Tax Table Entries [Asset/Liability]</entry>
+              <entry>Percentage or Amount</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>Standard GST Sales</entry>
+              <entry>GST:Sales:Standard [L]</entry>
+              <entry>10%</entry>
+            </row>
+            <row>
+              <entry>GST-free Sales</entry>
+              <entry>GST:Sales:Zero [L]</entry>
+              <entry>0%</entry>
+            </row>
+            <row>
+              <entry>Standard GST Purchases</entry>
+              <entry>GST:Purchases:Standard [A]</entry>
+              <entry>10%</entry>
+            </row>
+            <row>
+              <entry>GST-free Purchases</entry>
+              <entry>GST:Purchases:Zero [A]</entry>
+              <entry>0%</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <table frame='all' id="bus-tax-tbl-us">
+        <title>Sample Tax Table Entries for Cook County, Illinois (2017)</title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+          <thead>
+            <row>
+              <entry>Tax Table</entry>
+              <entry>Tax Table Entries [Asset/Liability]</entry>
+              <entry>Percentage or Amount</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry morerows='3'>Chicago Sales Taxes</entry>
+              <entry>Taxes:Sales:State [L]</entry>
+              <entry>6.25%</entry>
+            </row>
+            <row>
+              <entry>Taxes:Sales:City [L]</entry>
+              <entry>1.25%</entry>
+            </row>
+            <row>
+              <entry>Taxes:Sales:County [L]</entry>
+              <entry>1.75%</entry>
+            </row>
+            <row>
+              <entry>Taxes:Sales:Region [L]</entry>
+              <entry>1%</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
     </sect2>
 
     <sect2 id="bus-setupcname">
       <title>Enter Company Information</title>
 
       <para>After you have built the account structure and defined your tax tables, designate your
-      company in the <application>GnuCash</application> file. To do this, select the <guilabel>Business</guilabel> tab
+      company in the &app; file. To do this, select the <guilabel>Business</guilabel> tab
       in the <guilabel>Book Options</guilabel> window, which can be accessed from 
       <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem>
       </menuchoice>.
       </para>
 
-      <figure pgwide="1">
+      <figure>
         <title>Entering Company Information</title>
         <screenshot id="bus-co-reg">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_co_reg.png" format="PNG" srccredit="Chris Good" width="510px"/>
-            </imageobject>
-            <imageobject role="fo">
-              <imagedata fileref="figures/bus_co_reg.png" format="PNG" srccredit="Chris Good"/>
+           <imageobject>
+              <imagedata fileref="figures/bus_co_reg.png" format="PNG"
+                        srccredit="Chris Good" />
             </imageobject>
 
             <textobject>
               <phrase>Company Information</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
@@ -9898,9 +10021,9 @@ Basic A/R and A/P Account Hierarchy:
 
     <sect2 id="bus_setup_pref">
       <title>Setting Business Preferences</title>
-      <para>Set options on the Business tab of the <application>GnuCash</application> preferences, which is
+      <para>Set options on the Business tab of the &app; preferences, which is
         accessed via <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
-    (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on Mac OS X).
+    (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).
         See Help manual chapter 10.3.3 Business Book Options Tab.
       </para>
 
@@ -9909,12 +10032,12 @@ Basic A/R and A/P Account Hierarchy:
     <sect2 id="bus-setupterms">
       <title>Setting Billing Terms</title>
 
-      <para>Billing Terms can be used to determine the payment due date  and be a
+      <para>Billing Terms can be used to determine the payment due date and be a
         guide for determining discount for early payment of invoices (or vendor bills).
       </para>
 
         <note>
-        <para>As of <application>GnuCash</application> 2.6.7, Billing Terms are only
+        <para>As of &app; 2.6.7, Billing Terms are only
           partially supported. Date due is calculated using the Billing Terms
           but discount amount is not.
         </para>
@@ -9924,7 +10047,7 @@ Basic A/R and A/P Account Hierarchy:
           <itemizedlist>
             <listitem>
               <para>After creating and posting a payment which pays the invoice in full, manually edit the payment transaction (usually strongly discouraged)
-                and split the payment to reduce it by the amount of the discount and a create a compensating split in an income (discount) account.
+                and split the payment to reduce it by the amount of the discount and create a compensating split in an income (discount) account.
               </para>
             </listitem>
 
@@ -9946,40 +10069,34 @@ Basic A/R and A/P Account Hierarchy:
         <menuchoice><guimenu>Business</guimenu><guimenuitem>Billing Terms Editor</guimenuitem></menuchoice>.
       </para>
 
-      <figure pgwide="1">
+      <figure>
         <title>Billing Terms Editor</title>
         <screenshot id="bus-termsmain">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_terms_main.png" format="PNG" srccredit="Chris Good" width="510px"/>
-            </imageobject>
-            <imageobject role="fo">
-              <imagedata fileref="figures/bus_terms_main.png" format="PNG" srccredit="Chris Good"/>
+            <imageobject>
+              <imagedata fileref="figures/bus_terms_main.png" format="PNG"
+                        srccredit="Chris Good" />
             </imageobject>
 
             <textobject>
               <phrase>Billing Terms Editor</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
 
-      <figure pgwide="1">
+      <figure>
         <title>New Billing Term</title>
         <screenshot id="bus-termsnew">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_terms_new.png" format="PNG" srccredit="Chris Good"/>
-            </imageobject>
-            <imageobject role="fo">
-              <imagedata fileref="figures/bus_terms_new.png" format="PNG" srccredit="Chris Good"/>
+            <imageobject>
+              <imagedata fileref="figures/bus_terms_new.png" format="PNG"
+                         srccredit="Chris Good" />
             </imageobject>
 
             <textobject>
               <phrase>New Billing Term</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
@@ -9987,7 +10104,8 @@ Basic A/R and A/P Account Hierarchy:
       <itemizedlist>
         <listitem>
           <para><guilabel>Name</guilabel> The internal name of the billing term. For some examples of billing term names and descriptions see
-             <ulink url="&url-wiki;Terms"/>.
+             <ulink url="&url-wiki-pmt-term;" />.
+             <!-- Translators, add a reference to a list of terms common in your language -->
           </para>
         </listitem>
         <listitem>
@@ -10046,7 +10164,7 @@ Basic A/R and A/P Account Hierarchy:
             
             <para>Transactions generated by the A/R system are recorded within the Accounts
                 Receivable account. <emphasis>You should not work directly with this account.</emphasis>
-                Instead, you will work with the four integrated <application>GnuCash</application> A/R application
+                Instead, you will work with the four integrated &app; A/R application
                 components available through the <menuchoice><guimenu>Business</guimenu>
                     <guisubmenu>Customer</guisubmenu></menuchoice> sub-menu. These four components are:</para>
             
@@ -10061,7 +10179,7 @@ Basic A/R and A/P Account Hierarchy:
                         which represent the inverse of Invoices. A credit note is usually handed to
                         a customer to correct items that were incorrectly invoiced or returned.</para>
                     <para>Both document types will be set up using the same menu items. Credit notes were introduced starting with
-                        <application>GnuCash</application> stable release 2.6.0.
+                        &app; stable release 2.6.0.
                     </para>
                 </listitem>
                 
@@ -10139,7 +10257,7 @@ Basic A/R and A/P Account Hierarchy:
             <para>Una fattura è il documento cartaceo che si invia a un cliente per richiedere il pagamento di prodotti o servizi prestati. &app; è in grado di creare e di registrare le fatture.</para>
             
             <para>A credit note is the paperwork you send to a customer to correct
-                products or services rendered that were incorrectly invoiced. <application>GnuCash</application> can generate and track
+                products or services rendered that were incorrectly invoiced. &app; can generate and track
                 credit notes via the same menu entries as invoices.</para>
             
             <note>
@@ -10535,7 +10653,7 @@ Basic A/R and A/P Account Hierarchy:
         <para>Una ricevuta è la richiesta di pagamento che si riceve da un venditore. &app; è in gradi di gestire le ricevute.</para>
         
         <para>A credit note is the document you receive from a vendor to correct
-           products or services rendered that you were incorrectly charged for on a bill. <application>GnuCash</application> can generate and track
+           products or services rendered that you were incorrectly charged for on a bill. &app; can generate and track
            credit notes via the same menu entries as bills.</para>
         
         <note>
@@ -10684,7 +10802,7 @@ Basic A/R and A/P Account Hierarchy:
   </sect1>
   <sect1 id="bus_payroll">
      <title>Libro paga</title>
-     <para>Payroll is a financial record of wages, net pay, paid vacations, and deductions for an employee. This section demonstrates how to track payroll using <application>GnuCash</application>.</para>
+     <para>Payroll is a financial record of wages, net pay, paid vacations, and deductions for an employee. This section demonstrates how to track payroll using &app;.</para>
      <sect2 id="bus-payroll-concepts">
         <title>Concetti base</title>
         <para>Il libro paga consiste nella registrazione finanziaria di salario, retribuzione netta, ferie e trattenute per un dipendente: fondamentalmente tutto ciò che è relativo al conferimento di denaro e benefici a un dipendente. La tenuta del libro paga è una delle pratiche più complesse della contabilità poiché nel pagamento degli stipendi sono coinvolti molti conti, persone e agenzie.</para>
@@ -10731,7 +10849,7 @@ Basic A/R and A/P Account Hierarchy:
                  </guimenuitem></menuchoice>. Further formatting or analysis may be done
                  by copying and pasting the report into a spreadsheet. See
                  <ulink type="help" url="ghelp:gnucash-help?tool-find-txn">Find
-                    Transaction</ulink> in the <application>GnuCash</application> Help Manual.</para>
+                    Transaction</ulink> in the &app; Help Manual.</para>
            </note>
         </para>
      </sect2>
@@ -12208,8 +12326,8 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
                (translators put your name and email here)
 -->
 <glossary id="gnc-gloss">
-  <title><application>GnuCash</application> Glossary</title>
-  <para>This is a glossary of common terms used in <application>GnuCash</application>.
+  <title>&app; Glossary</title>
+  <para>This is a glossary of common terms used in &app;.
   Some entries here are taken from Wikipedia (<ulink url="&url-wp-en;"/>).</para>
 
 <!-- ... -->
@@ -12261,7 +12379,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
   <glossterm>Book</glossterm>
   <glossdef>
     <para>A book is a record of all transactions for an individual or organization. In
-    <application>GnuCash</application>, each file contains a book.</para>
+    &app;, each file contains a book.</para>
   </glossdef>
 </glossentry> 
 
@@ -12338,7 +12456,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
     <para>Stands for Comma Separated Values. CSV files are used to store data 
     in plain text. Each line of the file is a record and each record can be 
     comprised of multiple fields separated by commas. CSV is one import format
-    that <application>GnuCash</application> supports.</para>
+    that &app; supports.</para>
   </glossdef>
 </glossentry> 
 
@@ -12365,7 +12483,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
     <para>A banking protocol used by German banks. Developed by the German Central 
     Banking Committee ZKA (Zentraler Kredit-Ausschuss). The standard is used 
     only by German banks. Prior 2002, it was called Home Banking Computer
-    Interface (HBCI). FinTS is one import format that <application>GnuCash</application> supports.</para> 
+    Interface (HBCI). FinTS is one import format that &app; supports.</para> 
     <glossseealso otherterm="gnc-gl_hbci">Home Computer Banking Interface (HBCI)</glossseealso>
   </glossdef>
 </glossentry>
@@ -12400,7 +12518,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
     Banking Computer Interface (HBCI) was developed by the German Central 
     Banking Committee ZKA (Zentraler Kredit-Ausschuss). Since 2002, it has 
     been called Financial Transaction Services (FinTS). HBCI is one import 
-    format that <application>GnuCash</application> supports.</para>
+    format that &app; supports.</para>
     <glossseealso otherterm="gnc-gl_fints">Financial Transaction Services (FinTS)</glossseealso>
   </glossdef>
 </glossentry>
@@ -12427,8 +12545,8 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
   <glossterm>LibOFX</glossterm>
   <glossdef>
     <para>An open source library for <emphasis>OFX</emphasis>. It was created by one 
-    of the <application>GnuCash</application> developers, originally to be the 
-    OFX interface for <application>GnuCash</application>.</para>
+    of the &app; developers, originally to be the 
+    OFX interface for &app;.</para>
     <glossseealso otherterm="gnc-gl_ofx">OFX</glossseealso>
   </glossdef>
 </glossentry> 
@@ -12458,7 +12576,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
     <para>A financial information standard defined by SWIFT and used by several 
     European banks. It is also used internally in HBCI. Unfortunately, you can't 
     download the MT940 standard, but some banks publish it on their web sites. 
-    MT940 is one import format that <application>GnuCash</application> supports.</para>
+    MT940 is one import format that &app; supports.</para>
   </glossdef>
 </glossentry> 
 
@@ -12467,7 +12585,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
   <glossdef>
     <para>The Open Financial eXchange format. This is a financial information 
     exchange standard used by many institutions. OFX is one import format
-    that <application>GnuCash</application> supports.</para>
+    that &app; supports.</para>
   </glossdef>
 </glossentry>
 
@@ -12491,7 +12609,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
   <glossdef>
     <para>The Quicken Financial eXchange format is a proprietary financial 
     information exchange standard promoted by Quicken and used by many institutions. 
-    QFX is one import format that <application>GnuCash</application> supports.</para>
+    QFX is one import format that &app; supports.</para>
   </glossdef>
 </glossentry>
 
@@ -12501,7 +12619,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
     <para>The Quicken Interchange Format (QIF) is an open specification for 
     reading and writing financial data to files. This is an older format that 
     is still used by many institutions. QIF is one import format
-    that <application>GnuCash</application> supports.</para>
+    that &app; supports.</para>
   </glossdef>
 </glossentry>
 
@@ -12551,7 +12669,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
   <glossterm>Scheme</glossterm>
   <glossdef>
     <para>Scheme is a functional programming language based on a dialect of LISP.
-    Reports in <application>GnuCash</application> use the Scheme programming language;
+    Reports in &app; use the Scheme programming language;
     thus, users wishing to customize reports must write Scheme.</para>
   </glossdef>
 </glossentry>
@@ -12630,7 +12748,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
   <glossterm>XML</glossterm>
   <glossdef>
     <para>The eXtensible Markup Language is an international markup standard.
-    <application>GnuCash</application> stores its data by default in an XML data 
+    &app; stores its data by default in an XML data 
     structure.</para>
   </glossdef>
 </glossentry>
@@ -13108,7 +13226,7 @@ Coords_5 = 50.0;212.0
                   <entry>Guid</entry>
                   <entry>stringa</entry>
                   <entry>obbligatorio</entry>
-                  <entry>Il codice <emphasis>guid</emphasis> permette di identificare univocamente un formato di assegni utilizzato da <application>GnuCash</application>. Deve essere unico tra tutti quelli delle applicazioni fornite e quelli forniti dall’utente. Se si copia un file di formato esistente da utilizzare come base per le proprie modifiche, questo valore deve essere cambiato. Il programma <emphasis>uuidgen</emphasis> può essere usato per generare questo identificativo.</entry>
+                  <entry>Il codice <emphasis>guid</emphasis> permette di identificare univocamente un formato di assegni utilizzato da &app;. Deve essere unico tra tutti quelli delle applicazioni fornite e quelli forniti dall’utente. Se si copia un file di formato esistente da utilizzare come base per le proprie modifiche, questo valore deve essere cambiato. Il programma <emphasis>uuidgen</emphasis> può essere usato per generare questo identificativo.</entry>
                 </row>
                 <row>
                   <entry>Titolo</entry>
@@ -13120,7 +13238,7 @@ Coords_5 = 50.0;212.0
                   <entry>Carattere</entry>
                   <entry>stringa</entry>
                   <entry>opzionale</entry>
-                  <entry>Se fornita, rappresenta il carattere predefinito utilizzato per stampare tutti campi di testo nell’assegno. Questo campo può contenere qualsiasi stringa accettata da GTK come carattere. Se questo campo è lasciato vuoto, verrà utilizzato il carattere predefinito indicato nelle preferenze di <application>GnuCash</application>. Un valore tipico può essere <quote>sans 12</quote>.</entry>
+                  <entry>Se fornita, rappresenta il carattere predefinito utilizzato per stampare tutti campi di testo nell’assegno. Questo campo può contenere qualsiasi stringa accettata da GTK come carattere. Se questo campo è lasciato vuoto, verrà utilizzato il carattere predefinito indicato nelle preferenze di &app;. Un valore tipico può essere <quote>sans 12</quote>.</entry>
                 </row>
                 <row>
                   <entry>Blocking_Chars</entry>
@@ -13150,13 +13268,13 @@ Coords_5 = 50.0;212.0
                   <entry>Show_Grid</entry>
                   <entry>Booleano</entry>
                   <entry>opzionale</entry>
-                  <entry>Se questo valore è impostato a <emphasis>true</emphasis> allora <application>GnuCash</application> disegnerà una griglia nella pagina, partendo dal punto di origine con delle linee intervallate di 50 punti. Questa opzione è utile quando si desidera creare un nuovo file di formato per la stampa degli assegni.</entry>
+                  <entry>Se questo valore è impostato a <emphasis>true</emphasis> allora &app; disegnerà una griglia nella pagina, partendo dal punto di origine con delle linee intervallate di 50 punti. Questa opzione è utile quando si desidera creare un nuovo file di formato per la stampa degli assegni.</entry>
                 </row>
                 <row>
                   <entry>Show_Boxes</entry>
                   <entry>Booleano</entry>
                   <entry>opzionale</entry>
-                  <entry>Se questo valore è impostato a <emphasis>true</emphasis> allora per ogni elemento di cui sono state specificate larghezza e altezza, <application>GnuCash</application> disegnerà un riquadro che mostra la posizione e l’ingombro massimo dell’elemento stesso. Questa opzione è utile quando si desidera creare un nuovo file di formato per la stampa degli assegni.</entry>
+                  <entry>Se questo valore è impostato a <emphasis>true</emphasis> allora per ogni elemento di cui sono state specificate larghezza e altezza, &app; disegnerà un riquadro che mostra la posizione e l’ingombro massimo dell’elemento stesso. Questa opzione è utile quando si desidera creare un nuovo file di formato per la stampa degli assegni.</entry>
                 </row>
               </tbody>
             </tgroup>
@@ -13227,7 +13345,7 @@ Coords_5 = 50.0;212.0
                   <entry>Font_<emphasis>n</emphasis></entry>
                   <entry>stringa</entry>
                   <entry>opzionale</entry>
-                  <entry>Se fornita, rappresenta il carattere utilizzato per stampare la specifica voce di testo. Questo campo può contenere una stringa qualsiasi purché sia accettata da GTK. Se questo campo è lasciato vuoto, verrà utilizzato il carattere predefinito specificato nella sezione <emphasis>Iniziale</emphasis> del file di descrizione degli assegni o, se anche questo è stato tralasciato, il carattere specificato nelle preferenze di <application>GnuCash</application>. Questo campo viene riconosciuto solamente se si utilizza GTK 2.10 o successivo.</entry>
+                  <entry>Se fornita, rappresenta il carattere utilizzato per stampare la specifica voce di testo. Questo campo può contenere una stringa qualsiasi purché sia accettata da GTK. Se questo campo è lasciato vuoto, verrà utilizzato il carattere predefinito specificato nella sezione <emphasis>Iniziale</emphasis> del file di descrizione degli assegni o, se anche questo è stato tralasciato, il carattere specificato nelle preferenze di &app;. Questo campo viene riconosciuto solamente se si utilizza GTK 2.10 o successivo.</entry>
                 </row>
                 <row>
                   <entry>Align_<emphasis>n</emphasis></entry>
@@ -13245,7 +13363,7 @@ Coords_5 = 50.0;212.0
                   <entry>Filename_<emphasis>n</emphasis></entry>
                   <entry>stringa</entry>
                   <entry>opzionale</entry>
-                  <entry>Questo campo è utilizzato solamente quando il tipo di elemento è impostato a <emphasis>PICTURE</emphasis>. Specifica il nome del file dell’immagine da stampare sull’assegno. La stringa può specificare un percorso assoluto o relativo. In quest’ultimo caso, <application>GnuCash</application> controlla prima nella cartella dei formati di assegno forniti dal programma (generalmente <filename class="directory">/usr/share/gnucash/checks</filename>) e, se non lo dovesse trovare, cercherà nella cartella personale <filename class="directory">~/.gnucash/checks</filename>. Questo campo viene riconosciuto solamente se si utilizza GTK 2.10 o successivo.</entry>
+                  <entry>Questo campo è utilizzato solamente quando il tipo di elemento è impostato a <emphasis>PICTURE</emphasis>. Specifica il nome del file dell’immagine da stampare sull’assegno. La stringa può specificare un percorso assoluto o relativo. In quest’ultimo caso, &app; controlla prima nella cartella dei formati di assegno forniti dal programma (generalmente <filename class="directory">/usr/share/gnucash/checks</filename>) e, se non lo dovesse trovare, cercherà nella cartella personale <filename class="directory">~/.gnucash/checks</filename>. Questo campo viene riconosciuto solamente se si utilizza GTK 2.10 o successivo.</entry>
                 </row>
                 <row>
                   <entry>Blocking_Chars_<emphasis>n</emphasis></entry>
@@ -13284,7 +13402,7 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare il nome del beneficiario partendo dalle coordinate specificate.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare il nome del beneficiario partendo dalle coordinate specificate.</entry>
                 </row>
                 <row>
                   <entry>DATE</entry>
@@ -13296,7 +13414,7 @@ Blocking_Chars
 DateFormat
                     </literallayout>
                   </entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare la data partendo dalle coordinate specificate.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare la data partendo dalle coordinate specificate.</entry>
                 </row>
                 <row>
                   <entry>NOTES</entry>
@@ -13307,7 +13425,7 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare il campo delle note della transazione partendo dalle coordinate specificate.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare il campo delle note della transazione partendo dalle coordinate specificate.</entry>
                 </row>
                 <row>
                   <entry>CHECK_NUMBER</entry>
@@ -13318,13 +13436,13 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>This type value tells <application>GnuCash</application>
+                  <entry>This type value tells &app;
                     to print the check number at the specified coordinates. The
                     check number reflects the book option selection under
                     <menuchoice><guimenu>File</guimenu><guimenuitem>Proprietà</guimenuitem></menuchoice> for number source (transaction
                     number or anchor-split action - see <ulink type="help" url="ghelp:gnucash-help?num-action-book-option">Use Split
                     Action Field for Number</ulink> in the Book Options section
-                    of the <application>GnuCash</application> Help Manual).
+                    of the &app; Help Manual).
                   </entry>
                 </row>
                 <row>
@@ -13336,7 +13454,7 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare il il campo promemoria della suddivisione partendo dalle coordinate specificate.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare il il campo promemoria della suddivisione partendo dalle coordinate specificate.</entry>
                 </row>
                 <row>
                   <entry>ACTION</entry>
@@ -13347,13 +13465,13 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>This type value tells <application>GnuCash</application>
+                  <entry>This type value tells &app;
                     to print the split action field at the specified coordinates.
                     However, the printed field reflects the book option selection
                     under <menuchoice><guimenu>File</guimenu><guimenuitem>Proprietà</guimenuitem></menuchoice> for number source
                     (transaction number or anchor-split action - see <ulink type="help" url="ghelp:gnucash-help?num-action-book-option">
                     Use Split Action Field for Number</ulink> in the Book
-                    Options section of the <application>GnuCash</application> Help
+                    Options section of the &app; Help
                     Manual). If number source for the book is specified as
                     anchor-split action, this field will instead print the
                     transaction number field.
@@ -13368,7 +13486,7 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare l’importo in lettere dell’assegno partendo dalle coordinate specificate. L’importo apparirà nella forma <emphasis>Un milione, due cento trenta quattro e 56/100</emphasis>.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare l’importo in lettere dell’assegno partendo dalle coordinate specificate. L’importo apparirà nella forma <emphasis>Un milione, due cento trenta quattro e 56/100</emphasis>.</entry>
                 </row>
                 <row>
                   <entry>AMOUNT_NUMBER</entry>
@@ -13379,7 +13497,7 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare l’importo in cifre dell’assegno partendo dalle coordinate specificate. L’importo apparirà nella forma <emphasis>€1.234,56</emphasis>.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare l’importo in cifre dell’assegno partendo dalle coordinate specificate. L’importo apparirà nella forma <emphasis>€1.234,56</emphasis>.</entry>
                 </row>
                 <row>
                   <entry>ADDRESS</entry>
@@ -13390,7 +13508,7 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare l’indirizzo alle coordinate specificate.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare l’indirizzo alle coordinate specificate.</entry>
                 </row>
                 <row>
                   <entry>SPLITS_ACCOUNT</entry>
@@ -13401,7 +13519,7 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare i nomi dei conti per ogni suddivisione partendo dalle coordinate specificate. Vedere la nota sulla stampa delle suddivisioni.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare i nomi dei conti per ogni suddivisione partendo dalle coordinate specificate. Vedere la nota sulla stampa delle suddivisioni.</entry>
                 </row>
                 <row>
                   <entry>SPLITS_AMOUNT</entry>
@@ -13412,7 +13530,7 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare l’importo per ogni suddivisione partendo dalle coordinate specificate. Gli importi sono stampati con il simbolo della valuta. Vedere la nota sulla stampa delle suddivisioni.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare l’importo per ogni suddivisione partendo dalle coordinate specificate. Gli importi sono stampati con il simbolo della valuta. Vedere la nota sulla stampa delle suddivisioni.</entry>
                 </row>
                 <row>
                   <entry>SPLITS_MEMO</entry>
@@ -13423,7 +13541,7 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare il campo del promemoria partendo dalle coordinate specificate. Vedere la nota sulla stampa delle suddivisioni.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare il campo del promemoria partendo dalle coordinate specificate. Vedere la nota sulla stampa delle suddivisioni.</entry>
                 </row>
                 <row>
                   <entry>TEXT</entry>
@@ -13434,13 +13552,13 @@ Align
 Blocking_Chars
                     </literallayout>
                   </entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare una stringa arbitraria partendo dalle coordinate specificate. La stringa da stampare è specificata dalla chiave <emphasis>Text_n</emphasis>.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare una stringa arbitraria partendo dalle coordinate specificate. La stringa da stampare è specificata dalla chiave <emphasis>Text_n</emphasis>.</entry>
                 </row>
                 <row>
                   <entry>PICTURE</entry>
                   <entry>Coordinate, nome del file</entry>
                   <entry>(nessuno)</entry>
-                  <entry>Questo valore del tipo indica a <application>GnuCash</application> di stampare un’immagine partendo dalle coordinate specificate. L’immagine da stampare è specificata attraverso la chiave <emphasis>Filename_n</emphasis>. Questo tipo è riconosciuto solamente quando si utilizza GTK 2.10 o successiva.</entry>
+                  <entry>Questo valore del tipo indica a &app; di stampare un’immagine partendo dalle coordinate specificate. L’immagine da stampare è specificata attraverso la chiave <emphasis>Filename_n</emphasis>. Questo tipo è riconosciuto solamente quando si utilizza GTK 2.10 o successiva.</entry>
                 </row>
               </tbody>
             </tgroup>
diff --git a/guide/pt/ch_bus_setup.xml b/guide/pt/ch_bus_setup.xml
index ccdaaee..ace8f90 100644
--- a/guide/pt/ch_bus_setup.xml
+++ b/guide/pt/ch_bus_setup.xml
@@ -5,7 +5,7 @@
       (Do not remove this comment block.)
   Version: 1.0.0
   Last modified: Sep 19th 2015
-  Maintainers: 
+  Maintainers:
                Chris Good <chris.good at ozemail.com.au>
   Author:
   		Chris Good <chris.good at ozemail.com.au>
@@ -15,14 +15,14 @@
 -->
 
 <chapter id="chapter_bus_setup">
-    <title>Business  Setup</title>
-  
+    <title>Business Setup</title>
+
     <para>To set up &app; to handle accounts receivable or accounts payable
       for a company, these preliminary steps must be done.
       <itemizedlist>
         <listitem><para>Build an appropriate Account Hierarchy.</para></listitem>
-        <listitem><para>Set up Tax Tables.</para></listitem>
-        <listitem><para>Register the company in &app;.</para></listitem>
+        <listitem><para>Set up Sales Tax Tables.</para></listitem>
+        <listitem><para>Enter the company information in &app;.</para></listitem>
         <listitem><para>Set Business Preferences.</para></listitem>
         <listitem><para>Set up Billing Terms.</para></listitem>
       </itemizedlist>
@@ -40,22 +40,24 @@
       Accounts.</para>
 
       <para>The prebuilt Business Account hierarchy will not meet your needs
-      exactly. You will need make adjustments for the hierarchy to function
-      well with your particular situation. It should be close enough that it
+      exactly. You will need make adjustments to the hierarchy so that it will
+      meet your particular needs. It should be close enough, however, that it
       is recommended you begin with it.</para>
 
       <para>To use &app;’s integrated accounts
-        receivable system, you must first set up an account (usually a
-        sub-account under Assets) defined with account type
-        <emphasis>A/Receivable</emphasis>. It is within this account that the
-        integrated A/R system will place transactions.
+        receivable system, you must first set up a special account (usually a
+        sub-account under Assets) to hold transactions for receivables. This account
+        must be defined with account type <emphasis>A/Receivable</emphasis>.
+        &app; will use this account to place transactions
+        related to the integrated accounts receivable system.
       </para>
 
       <para>To use &app;’s integrated accounts
         payable system, you must first set up an account (usually a
-        sub-account under Liabilities) defined with account type
-        <emphasis>A/Payable</emphasis>. It is within this account that the
-        integrated A/P system will place transactions.
+        sub-account under Liabilities) to hold transactions for payables.
+        This account must be defined with account type <emphasis>A/Payable</emphasis>.
+        &app; will use this account to place transactions
+        related to the integrated accounts payable system.
       </para>
 
       <literallayout>
@@ -82,43 +84,41 @@ Basic A/R and A/P Account Hierarchy:
           customer. &app; keeps track of customers internally and provides
           per-customer reports based on the internal tracking. The same applies to A/P and vendors.
         </para>
-        
+      </note>
+      <note>
         <para>
-          If you deal with customers in more than one currency you will need a separate 
-          <emphasis>Accounts Receivable</emphasis> account for each currency.
+          If you deal with customers in more than one currency you will need a separate
+          <guilabel>Accounts Receivable</guilabel> account <emphasis>for each currency</emphasis>.
         </para>
 
         <para>
-          If you deal with vendors in more than one currency you will need a separate 
-          <emphasis>Accounts Payable</emphasis> account for each currency.
+          If you deal with vendors in more than one currency you will need a separate
+          <guilabel>Accounts Payable</guilabel> account <emphasis>for each currency</emphasis>.
         </para>
-        
+      </note>
+      <note>
         <para>Transactions involving an Accounts Receivable or Accounts Payable account should not be
-          added, changed or deleted in any way other than by using
-          <itemizedlist>
-            <listitem><para>post/unpost bill/invoice/voucher or</para></listitem>
-	    <listitem><para>process payment</para></listitem>
-	  </itemizedlist>
-	</para>
-        
+          added, changed or deleted in any way other than by using Post/Unpost 
+          Bill/Invoice/Voucher or Process Payment!
+        </para>
       </note>
     </sect1>
-     
+
     <sect1 id="bus-setuptaxtables">
-      <title>Tax Tables</title>
+      <title>Setting up Sales Tax Tables</title>
 
-      <para>Tax Tables can used to determine the tax for customer invoices (or vendor bills).
+      <para>Sales Tax Tables can used to determine the tax for customer invoices (or vendor bills).
       </para>
-        
-      <para> A tax table can be assigned to an invoice line or bill line.</para>
-      
+
+      <para> A tax table entry can be assigned to an invoice line or bill line.</para>
+
       <para>Set up distinct tax tables for customers and vendors.</para>
 
-      <para> The default invoice line tax table can be assigned to each customer and the default bill 
-        line tax table can be assigned to each vendor.
+      <para>The default invoice tax table entry can be assigned to each customer and the default bill
+        tax table entry can be assigned to each vendor.
       </para>
 
-      <para>The default tax table for new customers or new vendors can  be specified in the <emphasis>Book Options </emphasis>
+      <para>The default tax table entry for new customers or new vendors can be specified in the <emphasis>Book Options</emphasis>
         window which can be accessed by
         <menuchoice><guimenu>File</guimenu>
           <guisubmenu>Properties</guisubmenu>
@@ -126,12 +126,12 @@ Basic A/R and A/P Account Hierarchy:
         </menuchoice>
       </para>
 
-      <para>Tax Tables are maintained using the <emphasis>Sales Tax Table</emphasis> editor which is accessed via menu 
+      <para>Sales Tax Tables are maintained using the <emphasis>Sales Tax Table</emphasis> editor which is accessed via menu
         <menuchoice><guimenu>Business</guimenu><guimenuitem>Sales Tax Table</guimenuitem></menuchoice>.
       </para>
-      
-      <figure pgwide="1">
-        <title>Tax Tables</title>
+
+      <figure>
+        <title>Sales Tax Tables Editor</title>
         <screenshot id="bus-taxmain">
           <mediaobject>
             <imageobject role="html">
@@ -146,44 +146,35 @@ Basic A/R and A/P Account Hierarchy:
             <textobject>
               <phrase>Sales Tax Tables Editor</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
-      
-      <figure pgwide="1">
-        <title>New Sales Tax Table</title>
+
+      <figure>
+        <title>New Sales Tax Table Entry</title>
         <screenshot id="bus-taxnew">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_tax_new.png" format="PNG"
-                         srccredit="Chris Good" />
-            </imageobject>
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_tax_new.png" format="PNG"
                          srccredit="Chris Good" />
             </imageobject>
 
             <textobject>
-              <phrase>New Sales Tax Table</phrase>
+              <phrase>New Sales Tax Table Entry</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
-      
+
       <itemizedlist>
         <listitem>
           <para><guilabel>Name</guilabel> This is the tax table name.</para>
         </listitem>
         <listitem>
-          <para><guilabel>Type</guilabel> Either <guilabel>Percent %</guilabel>
- or <guilabel>Value $
-</guilabel>.</para>
+          <para><guilabel>Type</guilabel> Either <guilabel>Percent %</guilabel> or <guilabel>Value $</guilabel>.</para>
         </listitem>
         <listitem>
-          <para><guilabel>Value
-</guilabel>This is the percentage or value depending on <guilabel>Type</guilabel>.</para>
+          <para><guilabel>Value</guilabel> This is the percentage or value depending on <guilabel>Type</guilabel>.</para>
         </listitem>
         <listitem>
           <para><guilabel>Account</guilabel> This is the account to which tax will be posted.
@@ -195,42 +186,165 @@ Basic A/R and A/P Account Hierarchy:
           <para>If you set up Tax on Purchases and Tax on Sales as subaccounts of Liabilities:Tax then the net tax will be rolled up
             and can be seen in the  &app; Accounts tab.
           </para>
-          <para><emphasis>If unsure about tax law requirements, get professional advise. </emphasis></para>
+          <para><emphasis>If unsure about tax law requirements, get professional advice. </emphasis></para>
         </listitem>
       </itemizedlist>
+
+      <para>The following charts illustrate sample tax tables and
+      may be used as starting points to determine the setup
+      appropriate for a particular jurisdiction.</para>
+
+      <table frame='all' id="bus-tax-tbl-eu">
+        <title>Sample Tax Table Entries for EU country (e.g. 21% / 6%
+        / 0% Belgium, 20% / 5% / 0% UK etc.)  (2017)</title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+          <thead>
+            <row>
+              <entry>Tax Table</entry>
+              <entry>Tax Table Entries [Asset/Liability]</entry>
+              <entry>Percentage or Amount</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>Standard VAT Sales</entry>
+              <entry>VAT:Sales:Standard [L]</entry>
+              <entry>21%</entry>
+            </row>
+            <row>
+              <entry>Reduced VAT Sales</entry>
+              <entry>VAT:Sales:Reduced [L]</entry>
+              <entry>6%</entry>
+            </row>
+            <row>
+              <entry>Zero-Rated VAT Sales</entry>
+              <entry>VAT:Sales:Zero [L]</entry>
+              <entry>0%</entry>
+            </row>
+            <row>
+              <entry morerows='1'>EC Sales</entry>
+              <entry>VAT:Sales:EC [L]</entry>
+              <entry>21%</entry>
+            </row>
+            <row>
+              <entry>VAT:Sales:Reverse EC [L]</entry>
+              <entry>-21%</entry>
+            </row>
+            <row>
+              <entry>Standard VAT Purchases</entry>
+              <entry>VAT:Purchases:Standard [A]</entry>
+              <entry>21%</entry>
+            </row>
+            <row>
+              <entry>Reduced VAT Purchases</entry>
+              <entry>VAT:Purchases:Reduced [A]</entry>
+              <entry>6%</entry>
+            </row>
+            <row>
+              <entry>Zero-Rated VAT Purchases</entry>
+              <entry>VAT:Purchases:Zero [A]</entry>
+              <entry>0%</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <table frame='all' id="bus-tax-tbl-au">
+        <title>Sample Tax Table Entries for Australia (2017)
+        </title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+          <thead>
+            <row>
+              <entry>Tax Table</entry>
+              <entry>Tax Table Entries [Asset/Liability]</entry>
+              <entry>Percentage or Amount</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>Standard GST Sales</entry>
+              <entry>GST:Sales:Standard [L]</entry>
+              <entry>10%</entry>
+            </row>
+            <row>
+              <entry>GST-free Sales</entry>
+              <entry>GST:Sales:Zero [L]</entry>
+              <entry>0%</entry>
+            </row>
+            <row>
+              <entry>Standard GST Purchases</entry>
+              <entry>GST:Purchases:Standard [A]</entry>
+              <entry>10%</entry>
+            </row>
+            <row>
+              <entry>GST-free Purchases</entry>
+              <entry>GST:Purchases:Zero [A]</entry>
+              <entry>0%</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <table frame='all' id="bus-tax-tbl-us">
+        <title>Sample Tax Table Entries for Cook County, Illinois (2017)</title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+          <thead>
+            <row>
+              <entry>Tax Table</entry>
+              <entry>Tax Table Entries [Asset/Liability]</entry>
+              <entry>Percentage or Amount</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry morerows='3'>Chicago Sales Taxes</entry>
+              <entry>Taxes:Sales:State [L]</entry>
+              <entry>6.25%</entry>
+            </row>
+            <row>
+              <entry>Taxes:Sales:City [L]</entry>
+              <entry>1.25%</entry>
+            </row>
+            <row>
+              <entry>Taxes:Sales:County [L]</entry>
+              <entry>1.75%</entry>
+            </row>
+            <row>
+              <entry>Taxes:Sales:Region [L]</entry>
+              <entry>1%</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
     </sect1>
-    
+
     <sect1 id="bus-setupcname">
-      <title>Company Registration</title>
+      <title>Enter Company Information</title>
 
-      <para>After you have built the account structure and defined your tax tables, register the &app;
-      file as belonging to your company. To register your company, select the <guilabel>Business</guilabel> tab
-      in the <guilabel>Book Options</guilabel> window accessible by selecting 
+      <para>After you have built the account structure and defined your tax tables, designate your
+      company in the &app; file. To do this, select the <guilabel>Business</guilabel> tab
+      in the <guilabel>Book Options</guilabel> window, which can be accessed from 
       <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem>
       </menuchoice>.
       </para>
-      
-      <figure pgwide="1">
-        <title>Company Registration</title>
+
+      <figure>
+        <title>Entering Company Information</title>
         <screenshot id="bus-co-reg">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_co_reg.png" format="PNG"
-                         srccredit="Chris Good" width="510px" />
-            </imageobject>
-            <imageobject role="fo">
+           <imageobject>
               <imagedata fileref="figures/bus_co_reg.png" format="PNG"
                         srccredit="Chris Good" />
             </imageobject>
 
             <textobject>
-              <phrase>Company Registration</phrase>
+              <phrase>Company Information</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
-      
+
       <para>Here you can:</para>
 
       <itemizedlist>
@@ -250,44 +364,44 @@ Basic A/R and A/P Account Hierarchy:
           customers and vendors.</para>
         </listitem>
       </itemizedlist>
-      
+
     </sect1>
-    
+
     <sect1 id="bus_setup_pref">
-      <title>Business Preferences</title>
+      <title>Setting Business Preferences</title>
       <para>Set options on the Business tab of the &app; preferences, which is
         accessed via <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>
     (<menuchoice><guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> on MacOS).
         See Help manual chapter 10.3.3 Business Book Options Tab.
       </para>
-          
+
     </sect1>
-    
+
     <sect1 id="bus-setupterms">
-      <title>Billing Terms</title>
+      <title>Setting Billing Terms</title>
 
-      <para>Billing Terms can be used to determine the payment due date  and be a
+      <para>Billing Terms can be used to determine the payment due date and be a
         guide for determining discount for early payment of invoices (or vendor bills).
       </para>
 
         <note>
-        <para>As of &app; 2.6.7, Billing Terms are only 
+        <para>As of &app; 2.6.7, Billing Terms are only
           partially supported. Date due is calculated using the Billing Terms
           but discount amount is not.
         </para>
         <para>
-          Discount for early invoice payment is not implemented. There are 2 ways this may be done, although neither is recommended, and 
-          professional advise should be used to confirm that regulations are being complied with:
+          Discount for early invoice payment is not implemented. There are 2 ways this may be done, although neither is recommended, and
+          professional advice should be used to confirm that regulations are being complied with:
           <itemizedlist>
             <listitem>
               <para>After creating and posting a payment which pays the invoice in full, manually edit the payment transaction (usually strongly discouraged)
-                and split the payment to reduce it by the amount of the discount and a create a compensating split in an income (discount) account.
+                and split the payment to reduce it by the amount of the discount and create a compensating split in an income (discount) account.
               </para>
             </listitem>
-            
+
             <listitem>
-              <para>Alternatively, after creating and posting a payment for the discounted amount, create a credit note for the discount using a specific negative 
-                sales income (discount) account for the transfer account. 
+              <para>Alternatively, after creating and posting a payment for the discounted amount, create a credit note for the discount using a specific negative
+                sales income (discount) account for the transfer account.
               </para>
             </listitem>
             </itemizedlist>
@@ -298,20 +412,16 @@ Basic A/R and A/P Account Hierarchy:
         Invoice billing terms will default from the customer billing terms.
         Bill billing terms will default from the vendor billing terms.
       </para>
-  
-      <para>Billing Terms are maintained using the Billing Terms Editor which is accessed via menu 
+
+      <para>Billing Terms are maintained using the Billing Terms Editor which is accessed via menu
         <menuchoice><guimenu>Business</guimenu><guimenuitem>Billing Terms Editor</guimenuitem></menuchoice>.
       </para>
-      
-      <figure pgwide="1">
+
+      <figure>
         <title>Billing Terms Editor</title>
         <screenshot id="bus-termsmain">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_terms_main.png" format="PNG"
-                         srccredit="Chris Good" width="510px" />
-            </imageobject>
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_terms_main.png" format="PNG"
                         srccredit="Chris Good" />
             </imageobject>
@@ -319,20 +429,15 @@ Basic A/R and A/P Account Hierarchy:
             <textobject>
               <phrase>Billing Terms Editor</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
-      
-      <figure pgwide="1">
+
+      <figure>
         <title>New Billing Term</title>
         <screenshot id="bus-termsnew">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_terms_new.png" format="PNG"
-                         srccredit="Chris Good" />
-            </imageobject>
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_terms_new.png" format="PNG"
                          srccredit="Chris Good" />
             </imageobject>
@@ -340,15 +445,15 @@ Basic A/R and A/P Account Hierarchy:
             <textobject>
               <phrase>New Billing Term</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
-      
+
       <itemizedlist>
         <listitem>
           <para><guilabel>Name</guilabel> The internal name of the billing term. For some examples of billing term names and descriptions see
-             <ulink url="http://wiki.gnucash.org/wiki/Terms" />.
+             <ulink url="&url-wiki-pmt-term;" />.
+             <!-- Translators, add a reference to a list of terms common in your language -->
           </para>
         </listitem>
         <listitem>
@@ -394,8 +499,8 @@ Basic A/R and A/P Account Hierarchy:
               </itemizedlist>
             </listitem>
           </itemizedlist>
-        </listitem>  
+        </listitem>
       </itemizedlist>
     </sect1>
-  
+
 </chapter>
diff --git a/guide/ru/ch_bus_features.xml b/guide/ru/ch_bus_features.xml
index 2280876..40e3b09 100644
--- a/guide/ru/ch_bus_features.xml
+++ b/guide/ru/ch_bus_features.xml
@@ -45,13 +45,13 @@
       for a company, these preliminary steps must be done.
       <itemizedlist>
         <listitem><para>Build an appropriate Account Hierarchy.</para></listitem>
-        <listitem><para>Set up Tax Tables.</para></listitem>
+        <listitem><para>Set up Sales Tax Tables.</para></listitem>
         <listitem><para>Enter the company information in &app;.</para></listitem>
         <listitem><para>Set Business Preferences.</para></listitem>
         <listitem><para>Set up Billing Terms.</para></listitem>
       </itemizedlist>
     </para>
-  
+
     <sect2 id="bus-setupacct">
       <title>Account Setup</title>
 
@@ -112,12 +112,12 @@ Basic A/R and A/P Account Hierarchy:
       <note>
         <para>
           If you deal with customers in more than one currency you will need a separate
-          <emphasis>Accounts Receivable</emphasis> account for each currency.
+          <guilabel>Accounts Receivable</guilabel> account <emphasis>for each currency</emphasis>.
         </para>
 
         <para>
           If you deal with vendors in more than one currency you will need a separate
-          <emphasis>Accounts Payable</emphasis> account for each currency.
+          <guilabel>Accounts Payable</guilabel> account <emphasis>for each currency</emphasis>.
         </para>
       </note>
       <note>
@@ -129,20 +129,20 @@ Basic A/R and A/P Account Hierarchy:
     </sect2>
 
     <sect2 id="bus-setuptaxtables">
-      <title>Setting up Tax Tables</title>
+      <title>Setting up Sales Tax Tables</title>
 
-      <para>Tax Tables can used to determine the tax for customer invoices (or vendor bills).
+      <para>Sales Tax Tables can used to determine the tax for customer invoices (or vendor bills).
       </para>
 
-      <para> A tax table can be assigned to an invoice line or bill line.</para>
+      <para> A tax table entry can be assigned to an invoice line or bill line.</para>
 
       <para>Set up distinct tax tables for customers and vendors.</para>
 
-      <para> The default invoice line tax table can be assigned to each customer and the default bill
-        line tax table can be assigned to each vendor.
+      <para>The default invoice tax table entry can be assigned to each customer and the default bill
+        tax table entry can be assigned to each vendor.
       </para>
 
-      <para>The default tax table for new customers or new vendors can  be specified in the <emphasis>Book Options </emphasis>
+      <para>The default tax table entry for new customers or new vendors can be specified in the <emphasis>Book Options</emphasis>
         window which can be accessed by
         <menuchoice><guimenu>File</guimenu>
           <guisubmenu>Properties</guisubmenu>
@@ -150,12 +150,12 @@ Basic A/R and A/P Account Hierarchy:
         </menuchoice>
       </para>
 
-      <para>Tax Tables are maintained using the <emphasis>Sales Tax Table</emphasis> editor which is accessed via menu
+      <para>Sales Tax Tables are maintained using the <emphasis>Sales Tax Table</emphasis> editor which is accessed via menu
         <menuchoice><guimenu>Business</guimenu><guimenuitem>Sales Tax Table</guimenuitem></menuchoice>.
       </para>
 
-      <figure pgwide="1">
-        <title>Tax Tables</title>
+      <figure>
+        <title>Sales Tax Tables Editor</title>
         <screenshot id="bus-taxmain">
           <mediaobject>
             <imageobject role="html">
@@ -170,28 +170,22 @@ Basic A/R and A/P Account Hierarchy:
             <textobject>
               <phrase>Sales Tax Tables Editor</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
 
-      <figure pgwide="1">
-        <title>New Sales Tax Table</title>
+      <figure>
+        <title>New Sales Tax Table Entry</title>
         <screenshot id="bus-taxnew">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_tax_new.png" format="PNG"
-                         srccredit="Chris Good" />
-            </imageobject>
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_tax_new.png" format="PNG"
                          srccredit="Chris Good" />
             </imageobject>
 
             <textobject>
-              <phrase>New Sales Tax Table</phrase>
+              <phrase>New Sales Tax Table Entry</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
@@ -219,6 +213,134 @@ Basic A/R and A/P Account Hierarchy:
           <para><emphasis>If unsure about tax law requirements, get professional advice. </emphasis></para>
         </listitem>
       </itemizedlist>
+
+      <para>The following charts illustrate sample tax tables and
+      may be used as starting points to determine the setup
+      appropriate for a particular jurisdiction.</para>
+
+      <table frame='all' id="bus-tax-tbl-eu">
+        <title>Sample Tax Table Entries for EU country (e.g. 21% / 6%
+        / 0% Belgium, 20% / 5% / 0% UK etc.)  (2017)</title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+          <thead>
+            <row>
+              <entry>Tax Table</entry>
+              <entry>Tax Table Entries [Asset/Liability]</entry>
+              <entry>Percentage or Amount</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>Standard VAT Sales</entry>
+              <entry>VAT:Sales:Standard [L]</entry>
+              <entry>21%</entry>
+            </row>
+            <row>
+              <entry>Reduced VAT Sales</entry>
+              <entry>VAT:Sales:Reduced [L]</entry>
+              <entry>6%</entry>
+            </row>
+            <row>
+              <entry>Zero-Rated VAT Sales</entry>
+              <entry>VAT:Sales:Zero [L]</entry>
+              <entry>0%</entry>
+            </row>
+            <row>
+              <entry morerows='1'>EC Sales</entry>
+              <entry>VAT:Sales:EC [L]</entry>
+              <entry>21%</entry>
+            </row>
+            <row>
+              <entry>VAT:Sales:Reverse EC [L]</entry>
+              <entry>-21%</entry>
+            </row>
+            <row>
+              <entry>Standard VAT Purchases</entry>
+              <entry>VAT:Purchases:Standard [A]</entry>
+              <entry>21%</entry>
+            </row>
+            <row>
+              <entry>Reduced VAT Purchases</entry>
+              <entry>VAT:Purchases:Reduced [A]</entry>
+              <entry>6%</entry>
+            </row>
+            <row>
+              <entry>Zero-Rated VAT Purchases</entry>
+              <entry>VAT:Purchases:Zero [A]</entry>
+              <entry>0%</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <table frame='all' id="bus-tax-tbl-au">
+        <title>Sample Tax Table Entries for Australia (2017)
+        </title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+          <thead>
+            <row>
+              <entry>Tax Table</entry>
+              <entry>Tax Table Entries [Asset/Liability]</entry>
+              <entry>Percentage or Amount</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>Standard GST Sales</entry>
+              <entry>GST:Sales:Standard [L]</entry>
+              <entry>10%</entry>
+            </row>
+            <row>
+              <entry>GST-free Sales</entry>
+              <entry>GST:Sales:Zero [L]</entry>
+              <entry>0%</entry>
+            </row>
+            <row>
+              <entry>Standard GST Purchases</entry>
+              <entry>GST:Purchases:Standard [A]</entry>
+              <entry>10%</entry>
+            </row>
+            <row>
+              <entry>GST-free Purchases</entry>
+              <entry>GST:Purchases:Zero [A]</entry>
+              <entry>0%</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <table frame='all' id="bus-tax-tbl-us">
+        <title>Sample Tax Table Entries for Cook County, Illinois (2017)</title>
+        <tgroup cols='3' align='left' colsep='1' rowsep='1'>
+          <thead>
+            <row>
+              <entry>Tax Table</entry>
+              <entry>Tax Table Entries [Asset/Liability]</entry>
+              <entry>Percentage or Amount</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry morerows='3'>Chicago Sales Taxes</entry>
+              <entry>Taxes:Sales:State [L]</entry>
+              <entry>6.25%</entry>
+            </row>
+            <row>
+              <entry>Taxes:Sales:City [L]</entry>
+              <entry>1.25%</entry>
+            </row>
+            <row>
+              <entry>Taxes:Sales:County [L]</entry>
+              <entry>1.75%</entry>
+            </row>
+            <row>
+              <entry>Taxes:Sales:Region [L]</entry>
+              <entry>1%</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
     </sect2>
 
     <sect2 id="bus-setupcname">
@@ -231,15 +353,11 @@ Basic A/R and A/P Account Hierarchy:
       </menuchoice>.
       </para>
 
-      <figure pgwide="1">
+      <figure>
         <title>Entering Company Information</title>
         <screenshot id="bus-co-reg">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_co_reg.png" format="PNG"
-                         srccredit="Chris Good" width="510px" />
-            </imageobject>
-            <imageobject role="fo">
+           <imageobject>
               <imagedata fileref="figures/bus_co_reg.png" format="PNG"
                         srccredit="Chris Good" />
             </imageobject>
@@ -247,7 +365,6 @@ Basic A/R and A/P Account Hierarchy:
             <textobject>
               <phrase>Company Information</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
@@ -287,7 +404,7 @@ Basic A/R and A/P Account Hierarchy:
     <sect2 id="bus-setupterms">
       <title>Setting Billing Terms</title>
 
-      <para>Billing Terms can be used to determine the payment due date  and be a
+      <para>Billing Terms can be used to determine the payment due date and be a
         guide for determining discount for early payment of invoices (or vendor bills).
       </para>
 
@@ -324,15 +441,11 @@ Basic A/R and A/P Account Hierarchy:
         <menuchoice><guimenu>Business</guimenu><guimenuitem>Billing Terms Editor</guimenuitem></menuchoice>.
       </para>
 
-      <figure pgwide="1">
+      <figure>
         <title>Billing Terms Editor</title>
         <screenshot id="bus-termsmain">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_terms_main.png" format="PNG"
-                         srccredit="Chris Good" width="510px" />
-            </imageobject>
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_terms_main.png" format="PNG"
                         srccredit="Chris Good" />
             </imageobject>
@@ -340,20 +453,15 @@ Basic A/R and A/P Account Hierarchy:
             <textobject>
               <phrase>Billing Terms Editor</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
 
-      <figure pgwide="1">
+      <figure>
         <title>New Billing Term</title>
         <screenshot id="bus-termsnew">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_terms_new.png" format="PNG"
-                         srccredit="Chris Good" />
-            </imageobject>
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_terms_new.png" format="PNG"
                          srccredit="Chris Good" />
             </imageobject>
@@ -361,7 +469,6 @@ Basic A/R and A/P Account Hierarchy:
             <textobject>
               <phrase>New Billing Term</phrase>
             </textobject>
-
           </mediaobject>
         </screenshot>
       </figure>
@@ -369,7 +476,8 @@ Basic A/R and A/P Account Hierarchy:
       <itemizedlist>
         <listitem>
           <para><guilabel>Name</guilabel> The internal name of the billing term. For some examples of billing term names and descriptions see
-             <ulink url="http://wiki.gnucash.org/wiki/Terms" />.
+             <ulink url="&url-wiki-pmt-term;" />.
+             <!-- Translators, add a reference to a list of terms common in your language -->
           </para>
         </listitem>
         <listitem>
@@ -478,7 +586,9 @@ Basic A/R and A/P Account Hierarchy:
                     <guimenuitem>New Customer</guimenuitem></menuchoice>. Fill in customer information, such as
                 Company Name, Address, Phone, Fax, etc.</para>
                 
-                <screenshot id="bus-ar-custnew">
+                <figure>
+                  <title>New Customer Registration Window</title>
+                  <screenshot id="bus-ar-custnew">
                     <mediaobject>
                         <imageobject>
                             <imagedata fileref="figures/bus_ar_custnew.png" format="PNG"
@@ -488,11 +598,9 @@ Basic A/R and A/P Account Hierarchy:
                         <textobject>
                             <phrase>New Customer Registration Window</phrase>
                         </textobject>
-                        
-                        <caption><para>New Customer Registration Window</para></caption>
                     </mediaobject>
-                </screenshot>
-                
+                  </screenshot>
+                </figure>
             </sect3>
             
             <sect3 id="bus-ar-custfind2">
@@ -505,7 +613,9 @@ Basic A/R and A/P Account Hierarchy:
                 window is also used to look up customers when creating invoices and
                     processing payments.</para>
                 
-                <screenshot id="bus-ar-custfind">
+                <figure>
+                  <title>Find Customer Window</title>
+                  <screenshot id="bus-ar-custfind">
                     <mediaobject>
                         <imageobject>
                             <imagedata fileref="figures/bus_ar_custfind.png" format="PNG"
@@ -515,10 +625,9 @@ Basic A/R and A/P Account Hierarchy:
                         <textobject>
                             <phrase>Find Customer Window</phrase>
                         </textobject>
-                        
-                        <caption><para>Find Customer Window </para></caption>
-                    </mediaobject>
-                </screenshot>
+                   </mediaobject>
+                  </screenshot>
+                </figure>
                 
                 <para>If many customers match the search criteria you provide, the
                     search can be refined by running an additional search within the current
@@ -572,7 +681,9 @@ Basic A/R and A/P Account Hierarchy:
                         <guisubmenu>Customer</guisubmenu><guimenuitem>New Invoice</guimenuitem></menuchoice>. The
                     New Invoice window must be filled in appropriately.</para>
                 
-                <screenshot id="bus-ar-invoicenew">
+                <figure>
+                  <title>Creating a New Invoice</title>
+                  <screenshot id="bus-ar-invoicenew">
                     <mediaobject>
                         <imageobject>
                             <imagedata fileref="figures/bus_ar_invoicenew.png" format="PNG"
@@ -582,10 +693,9 @@ Basic A/R and A/P Account Hierarchy:
                         <textobject>
                             <phrase>Creating a New Invoice</phrase>
                         </textobject>
-                        
-                        <caption><para>Creating a New Invoice</para></caption>
                     </mediaobject>
-                </screenshot>
+                  </screenshot>
+                </figure>
                 
                 <para>When you click the <guibutton>OK</guibutton> button, the
                     <guilabel>Edit Invoice</guilabel> window opens.</para>
@@ -599,7 +709,9 @@ Basic A/R and A/P Account Hierarchy:
                     register works. For credit notes you enter an itemized list of goods and
                     services you refunded instead.</para>
                 
-                <screenshot id="bus-ar-invoiceedit">
+                <figure>
+                  <title>Edit Invoice Window</title>
+                  <screenshot id="bus-ar-invoiceedit">
                     <mediaobject>
                         <imageobject>
                             <imagedata fileref="figures/bus_ar_invoiceedit.png" format="PNG"
@@ -609,10 +721,9 @@ Basic A/R and A/P Account Hierarchy:
                         <textobject>
                             <phrase>Edit Invoice Window</phrase>
                         </textobject>
-                        
-                        <caption><para>Edit Invoice Window </para></caption>
                     </mediaobject>
-                </screenshot>
+                  </screenshot>
+                </figure>
                 
                 <para>When you have finished entering all the items, you can
                     <guilabel>Post</guilabel> and print the invoice.</para>
@@ -627,7 +738,9 @@ Basic A/R and A/P Account Hierarchy:
                     are ready to print it. Posting an invoice places the transactions in an
                     accounts receivable account.</para>
                 
-                <screenshot id="bus-ar-invoicepost">
+                <figure>
+                  <title>Post Invoice Window</title>
+                  <screenshot id="bus-ar-invoicepost">
                     <mediaobject>
                         <imageobject>
                             <imagedata fileref="figures/bus_ar_invoicepost.png" format="PNG"
@@ -637,10 +750,9 @@ Basic A/R and A/P Account Hierarchy:
                         <textobject>
                             <phrase>Post Invoice Window</phrase>
                         </textobject>
-                        
-                        <caption><para>Post Invoice Window </para></caption>
                     </mediaobject>
-                </screenshot>
+                  </screenshot>
+                </figure>
                 
             </sect3>
             
@@ -686,7 +798,9 @@ Basic A/R and A/P Account Hierarchy:
                     customer. To print an invoice use <menuchoice><guimenu>File</guimenu>
                         <guimenuitem>Print Invoice</guimenuitem></menuchoice> menu item.</para>
                 
-                <screenshot id="bus-ar-invoiceprint">
+                <figure>
+                  <title>Invoice Print Output</title>
+                  <screenshot id="bus-ar-invoiceprint">
                     <mediaobject>
                         <imageobject>
                             <imagedata fileref="figures/bus_ar_invoiceprint.png" format="PNG"
@@ -696,10 +810,9 @@ Basic A/R and A/P Account Hierarchy:
                         <textobject>
                             <phrase>Invoice Print Output</phrase>
                         </textobject>
-                        
-                        <caption><para>Invoice Print Output </para></caption>
                     </mediaobject>
-                </screenshot>
+                  </screenshot>
+                </figure>
                 
                 <note>
                     <para>You can modify the appearance of the invoice, IE: add a company
@@ -764,7 +877,9 @@ Basic A/R and A/P Account Hierarchy:
                 useful when you have multiple <guilabel>jobs</guilabel> for the same customer, and would like
                 to view all the invoices and credit notes related to a single job.</para>
             
-            <screenshot id="bus-ar-jobnew">
+            <figure>
+              <title>New Customer Job</title>
+              <screenshot id="bus-ar-jobnew">
                 <mediaobject>
                     <imageobject>
                         <imagedata fileref="figures/bus_ar_jobnew.png" format="PNG"
@@ -774,10 +889,9 @@ Basic A/R and A/P Account Hierarchy:
                     <textobject>
                         <phrase>New Customer Job</phrase>
                     </textobject>
-                    
-                    <caption><para>New Customer Job </para></caption>
                 </mediaobject>
-            </screenshot>
+              </screenshot>
+            </figure>
             
             <para>To use customer jobs, you must create them using the <menuchoice>
                 <guimenu>Business</guimenu><guisubmenu>Customer</guisubmenu>
@@ -808,20 +922,28 @@ Basic A/R and A/P Account Hierarchy:
                     <guisubmenu>Customer</guisubmenu><guimenuitem>Process
                         Payment</guimenuitem></menuchoice>.</para>
             
-            <screenshot id="bus-ar-payment">
+            <figure>
+              <title>Process Customer Payment</title>
+              <screenshot id="bus-ar-payment">
                 <mediaobject>
-                    <imageobject>
+                    <imageobject role="html">
+                        <imagedata fileref="figures/bus_ar_payment.png" format="PNG"
+                        srccredit="Patrick Schweiger" width="510px" scalefit="0" />
+                    </imageobject>
+                    
+                    <imageobject role="fo">
                         <imagedata fileref="figures/bus_ar_payment.png" format="PNG"
                         srccredit="Patrick Schweiger" />
                     </imageobject>
                     
                     <textobject>
-                        <phrase>Process Payment</phrase>
+                        <phrase>Process Payment from Customer</phrase>
                     </textobject>
                     
-                    <caption><para>Process Payment Window </para></caption>
+                    <caption><para>Process Payment from Customer</para></caption>
                 </mediaobject>
-            </screenshot>
+              </screenshot>
+            </figure>
             
         </sect2>
         
@@ -844,9 +966,11 @@ Basic A/R and A/P Account Hierarchy:
                 button in the <guilabel>Select HTML Style Sheet</guilabel> window that will appear.
                 You will then see a window like this:</para>
             
-            <screenshot id="bus-ar-invoicechange1">
+            <figure>
+              <title>The New Style Sheet Window</title>
+              <screenshot id="bus-ar-invoicechange1">
                 <mediaobject>
-                    <imageobject>
+                     <imageobject>
                         <imagedata fileref="figures/bus_ar_invoicechange1.png" format="PNG"
                         srccredit="Cristian Marchi" />
                     </imageobject>
@@ -854,10 +978,9 @@ Basic A/R and A/P Account Hierarchy:
                     <textobject>
                         <phrase>New Style Sheet Window</phrase>
                     </textobject>
-                    
-                    <caption><para>The New Style Sheet window.</para></caption>
                 </mediaobject>
-            </screenshot>
+              </screenshot>
+            </figure>
             
             <para>Give a <guilabel>Name</guilabel> to the new style sheet (e.g. <guilabel>Custom Invoice</guilabel>) and select the
                 <guilabel>Fancy</guilabel> <guilabel>Template</guilabel>. When you click the
@@ -877,7 +1000,9 @@ Basic A/R and A/P Account Hierarchy:
             
             <para>Below is an example that imports all three types of images.</para>
             
-            <screenshot id="bus-ar-invoicechange2">
+            <figure>
+              <title>HTML Style Sheets Example Window</title>
+              <screenshot id="bus-ar-invoicechange2">
                 <mediaobject>
                     <imageobject role="html">
                         <imagedata fileref="figures/bus_ar_invoicechange2.png" format="PNG"
@@ -890,13 +1015,14 @@ Basic A/R and A/P Account Hierarchy:
                     </imageobject>
                     
                     <textobject>
-                        <phrase>HTML Style Sheets example</phrase>
+                        <phrase>HTML Style Sheets Example Window</phrase>
                     </textobject>
                     
                     <caption><para>The <acronym>HTML</acronym> Style Sheets window with an example Background
                         Tile, Heading Banner, and Logo.</para></caption>
                 </mediaobject>
-            </screenshot>
+              </screenshot>
+            </figure>
             
             <note>
                 <para>The images are placed in the invoice as follows. The
@@ -915,21 +1041,24 @@ Basic A/R and A/P Account Hierarchy:
                 Below is the resultant invoice after applying the style sheet demonstrated
                 above.</para>
             
-            <screenshot id="bus-ar-invoicechange3">
+            <figure>
+              <title>HTML Style Sheets Example Output</title>
+              <screenshot id="bus-ar-invoicechange3">
                 <mediaobject>
-                    <imageobject>
+                   <imageobject>
                         <imagedata fileref="figures/bus_ar_invoicechange3.png" format="PNG"
                         srccredit="Patrick Schweiger" />
                     </imageobject>
                     
                     <textobject>
-                        <phrase>HTML Style Sheets example</phrase>
+                        <phrase>HTML Style Sheets Example Output</phrase>
                     </textobject>
                     
                     <caption><para>The hideous invoice which results from the graphics
                         selected in the style sheet.</para></caption>
                 </mediaobject>
-            </screenshot>
+              </screenshot>
+            </figure>
         </sect2>
     </sect1>
   <sect1 id="bus_ap">
@@ -981,42 +1110,42 @@ Basic A/R and A/P Account Hierarchy:
               New Vendor</guimenuitem></menuchoice> menu item. Fill in general information about the vendor, such as Company Name, Address, Phone,
            Fax, etc. Below is a list of the other options: </para>   <para>This is what the New Vendor registration window looks like:
            </para>
-           <screenshot id="bus-ap-vendornew">
-              <mediaobject>
-                 <imageobject>
-                    <imagedata fileref="figures/bus_ap_vendornew.png" srccredit="Patrick Schweiger" format="PNG"/>
-                 </imageobject>
-                 <textobject>
-                    <phrase>New Vendor Registration Window</phrase>
-                 </textobject>
-                 <caption>
-                    <para>New Vendor Registration Window</para>
-                 </caption>
-              </mediaobject>
-           </screenshot>
+           <figure>
+             <title>New Vendor Registration Window</title>
+             <screenshot id="bus-ap-vendornew">
+                <mediaobject>
+                  <imageobject>
+                      <imagedata fileref="figures/bus_ap_vendornew.png" srccredit="Patrick Schweiger" format="PNG"/>
+                   </imageobject>
+                   <textobject>
+                      <phrase>New Vendor Registration Window</phrase>
+                   </textobject>
+                </mediaobject>
+             </screenshot>
+           </figure>
         </sect3>
         
         <sect3 id="bus-ap-vendorfind2">
-           <title>Find and Edit</title>
+            <title>Find and Edit</title>
            
-           <para>To search for an existing vendor, use the <menuchoice><guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>
+            <para>To search for an existing vendor, use the <menuchoice><guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>
               Find Vendor</guimenuitem></menuchoice> window. You select a vendor to <guibutton>View/Edit</guibutton> from the results of the search.
-           This window is also used to look up a vendor when entering bills and processing payments.
-           </para>
-           <screenshot id="bus-ar-vendorfind">
-              <mediaobject>
-                 <imageobject>
-                    <imagedata fileref="figures/bus_ap_vendorfind.png" srccredit="Patrick Schweiger" format="PNG"/>
-                 </imageobject>
-                 <textobject>
-                    <phrase>Find Vendor Window</phrase>
-                 </textobject>
-                 <caption>
-                    <para>Find Vendor Window</para>
-                 </caption>
-              </mediaobject>
-           </screenshot>
-           
+              This window is also used to look up a vendor when entering bills and processing payments.
+            </para>
+            <figure>
+              <title>Find Vendor Window</title>
+              <screenshot id="bus-ar-vendorfind">
+                <mediaobject>
+                  <imageobject>
+                     <imagedata fileref="figures/bus_ap_vendorfind.png" srccredit="Patrick Schweiger" format="PNG"/>
+                  </imageobject>
+                  <textobject>
+                     <phrase>Find Vendor Window</phrase>
+                  </textobject>
+                </mediaobject>
+              </screenshot>
+            </figure>
+            
            <para>If many vendors match the search criteria you provide, the
               search can be refined by running an additional search within the current
               results. The current result set is searched when the <guilabel>Refine
@@ -1058,20 +1187,19 @@ Basic A/R and A/P Account Hierarchy:
         <sect3 id="bus-ap-billnew2">
            <title>New</title>
            <para>When you receive a bill from a vendor and want to enter it into &app;, you must create a new bill. To create a new bill use the <menuchoice><guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>New Bill</guimenuitem></menuchoice> menu item, and fill in the resulting window appropriately.</para>
-           <screenshot id="bus-ap-billnew">
-              <mediaobject>
+           <figure>
+             <title>New Bill Registration Window</title>
+             <screenshot id="bus-ap-billnew">
+               <mediaobject>
                  <imageobject>
                     <imagedata fileref="figures/bus_ap_billnew.png" srccredit="Patrick Schweiger" format="PNG"/>
                  </imageobject>
                  <textobject>
                     <phrase>New Bill Registration Window</phrase>
                  </textobject>
-                 <caption>
-                    <para>New Bill Registration Window
-                    </para>
-                 </caption>
-              </mediaobject>
-           </screenshot>
+               </mediaobject>
+             </screenshot>
+           </figure>
            
            <para>When you click the <guibutton>OK</guibutton> button the <guilabel>Edit Bill</guilabel> window opens.</para>
         </sect3>
@@ -1083,19 +1211,19 @@ Basic A/R and A/P Account Hierarchy:
               register works. For credit notes you enter an itemized list of goods and
               services the vendor refunded instead.
            </para>
-           <screenshot id="bus-ap-billedit">
-              <mediaobject>
+           <figure>
+             <title>Edit Bill Window</title>
+             <screenshot id="bus-ap-billedit">
+               <mediaobject>
                  <imageobject>
                     <imagedata fileref="figures/bus_ap_billedit.png" srccredit="Patrick Schweiger" format="PNG"/>
                  </imageobject>
                  <textobject>
                     <phrase>Edit Bill Window</phrase>
                  </textobject>
-                 <caption>
-                    <para>Edit Bill Window</para>
-                 </caption>
-              </mediaobject>
-           </screenshot>
+               </mediaobject>
+             </screenshot>
+           </figure>
            
            <para>When you have finished entering all the items, <guilabel>Post</guilabel> the bill. </para>
         </sect3>
@@ -1107,19 +1235,19 @@ Basic A/R and A/P Account Hierarchy:
               The Post Bill window appears and asks you to enter information:
            </para>
            
-           <screenshot id="bus-ap-billpost">
-              <mediaobject>
+           <figure>
+             <title>Post Bill Window</title>
+             <screenshot id="bus-ap-billpost">
+               <mediaobject>
                  <imageobject>
                     <imagedata fileref="figures/bus_ap_billpost.png" srccredit="Patrick Schweiger" format="PNG"/>
                  </imageobject>
                  <textobject>
                     <phrase>Post Bill Window</phrase>
                  </textobject>
-                 <caption>
-                    <para>Post Bill Window</para>
-                 </caption>
-              </mediaobject>
-           </screenshot>
+               </mediaobject>
+             </screenshot>
+           </figure>
         </sect3>
         
         <sect3 id="bus-ap-billfind2">
@@ -1146,19 +1274,19 @@ Basic A/R and A/P Account Hierarchy:
            </menuchoice> menu item. You will see the <guilabel>New Job</guilabel> window.
         </para>
         
-        <screenshot id="bus-ap-jobnew">
-           <mediaobject>
+        <figure>
+          <title>New Vendor Job</title>
+          <screenshot id="bus-ap-jobnew">
+            <mediaobject>
               <imageobject>
                  <imagedata fileref="figures/bus_ap_jobnew.png" srccredit="Jon Lapham" format="PNG"/>
               </imageobject>
               <textobject>
                  <phrase>New Vendor Job</phrase>
               </textobject>
-              <caption>
-                 <para>New Vendor Job</para>
-              </caption>
-           </mediaobject>
-        </screenshot>
+            </mediaobject>
+          </screenshot>
+        </figure>
         
         <para>To edit an existing vendor job, use the <menuchoice>
            <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu>
@@ -1182,21 +1310,27 @@ Basic A/R and A/P Account Hierarchy:
            </menuchoice>.
         </para>
         
-        <para>Below is the &app; Accounts Receivable payment window.</para>
-        <screenshot id="bus-ap-payment">
-           <mediaobject>
-              <imageobject>
+        <para>Below is the &app; Accounts Payable payment window.</para>
+        <figure>
+          <title>Process Vendor Payment</title>
+          <screenshot id="bus-ap-payment">
+            <mediaobject>
+              <imageobject role="html">
+                 <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" format="PNG" width="510"/>
+              </imageobject>
+              <imageobject role="fo">
                  <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" format="PNG"/>
               </imageobject>
               <textobject>
-                 <phrase>Process Payment</phrase>
+                 <phrase>Process Payment to Vendor</phrase>
               </textobject>
               <caption>
-                 <para>Process Payment Window
+                 <para>Process Payment to Vendor
                  </para>
               </caption>
-           </mediaobject>
-        </screenshot>
+            </mediaobject>
+          </screenshot>
+        </figure>
      </sect2>
   </sect1>
   <sect1 id="bus_payroll">
@@ -1299,8 +1433,8 @@ Basic A/R and A/P Account Hierarchy:
            <para>With the deductions list from above, an employee split transaction map can be generated. Each of the items in the list is mapped to a &app; account.</para>
            
            <para>
-              <table>
-                 <title>Transaction Map</title>
+              <table id="bus-payroll-txn-tbl">
+                 <title>Payroll Transaction Map</title>
                  <tgroup cols="3">
                     <thead>
                        <row>
@@ -1361,8 +1495,10 @@ Basic A/R and A/P Account Hierarchy:
         <title>Business Payroll Example</title>
         <para>Using the account setup seen previously, let’s go through an example. Assume that there are 2 employees (E1 and E2) who each earn $1000 per month gross salary. The employee contribution to Tax1 and Tax2 are 10% and 5% respectively. The company contribution to Tax1 and Tax2 are 15% and 10% each on top of the employee’s gross salary.</para>
         <para>Starting with $50k in the bank, and before doing any payroll, the account hierarchy looks like this:</para>
-        <screenshot id="bus-pay-ex1">
-           <mediaobject>
+        <figure>
+          <title>Payroll Example: Initial Setup</title>
+          <screenshot id="bus-pay-ex1">
+            <mediaobject>
               <imageobject>
                  <imagedata fileref="figures/bus_pay_ex1.png"
                  srccredit="Patrick Schweiger" format="PNG"/>
@@ -1370,13 +1506,10 @@ Basic A/R and A/P Account Hierarchy:
               <textobject>
                  <phrase>Payroll Example 1</phrase>
               </textobject>
-              <caption>
-                 <para>Payroll Initial Setup
-                 </para>
-              </caption>
-           </mediaobject>
-        </screenshot>
-        
+            </mediaobject>
+          </screenshot>
+        </figure>
+         
         <para>The deductions list for employee 1 are:</para>
            <itemizedlist>
               <listitem>
@@ -1397,8 +1530,8 @@ Basic A/R and A/P Account Hierarchy:
            </itemizedlist>
            
            <para>
-              <table>
-                 <title>Transaction Map for Employee 1</title>
+              <table id="bus-payroll-txn-empl-tbl">
+                 <title>Payroll Transaction Map for Employee 1</title>
                  <tgroup cols="3">
                     <thead>
                        <row>
@@ -1437,7 +1570,9 @@ Basic A/R and A/P Account Hierarchy:
            
            <para>From the checking account, enter the split transaction for employee 1. It should look like this:</para>
            
-           <screenshot id="bus-pay-ex2">
+          <figure>
+            <title>Payroll Example: Employee Split Transaction</title>
+            <screenshot id="bus-pay-ex2">
               <mediaobject>
                  <imageobject>
                     <imagedata fileref="figures/bus_pay_ex2.png"
@@ -1447,18 +1582,21 @@ Basic A/R and A/P Account Hierarchy:
                     <phrase>Payroll Example 2</phrase>
                  </textobject>
                  <caption>
-                    <para>Employee 1 Split Transaction
+                    <para>The Split Transaction for Employee 1
                     </para>
                  </caption>
               </mediaobject>
-           </screenshot>
-           
+            </screenshot>
+          </figure>
+
            <tip>
               <para>When paying employees, enter only the employee name in the Description area. If you decide to use &app;’s check printing capabilities, the check is automatically made out to the correct employee. If you want to record other information in the transaction besides the employee name, use the Notes area, available when viewing the Register in double-line mode.</para>
            </tip>
            <para>Repeat this for the second employee, which leaves the account hierarchy looking like this:</para>
            
-           <screenshot id="bus-pay-ex3">
+          <figure>
+            <title>Payroll Example: Accounts After Salaries Paid</title>
+            <screenshot id="bus-pay-ex3">
               <mediaobject>
                  <imageobject>
                     <imagedata fileref="figures/bus_pay_ex3.png"
@@ -1467,12 +1605,9 @@ Basic A/R and A/P Account Hierarchy:
                  <textobject>
                     <phrase>Payroll Example 3</phrase>
                  </textobject>
-                 <caption>
-                    <para>Account Tree After Salaries Paid
-                    </para>
-                 </caption>
               </mediaobject>
-           </screenshot>
+            </screenshot>
+          </figure>
         
           <para>Now, you will enter the company contributions. The <emphasis>Liabilities:Tax1</emphasis> and
             <emphasis>Liabilities:Tax2</emphasis> accounts track how much you must pay to the
@@ -1480,7 +1615,9 @@ Basic A/R and A/P Account Hierarchy:
             make a transaction from the checking account to these liability accounts.
             No expense accounts are involved. The main account will then appear like this:</para>
            
-           <screenshot id="bus-pay-ex4">
+           <figure>
+             <title>Payroll Example: Accounts After Paying Government</title>
+             <screenshot id="bus-pay-ex4">
               <mediaobject>
                  <imageobject>
                     <imagedata fileref="figures/bus_pay_ex4.png"
@@ -1489,12 +1626,9 @@ Basic A/R and A/P Account Hierarchy:
                  <textobject>
                     <phrase>Payroll Example 4</phrase>
                  </textobject>
-                 <caption>
-                    <para>Accounts After Paying Government
-                    </para>
-                 </caption>
-              </mediaobject>
-           </screenshot>
-        </sect2>
+               </mediaobject>
+             </screenshot>
+           </figure>
+         </sect2>
      </sect1>
 </chapter>

commit 93566dc4d2d42d3975ca5260c692faf98236a8ef
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Feb 14 20:41:55 2020 +0100

    L12N:de: 1 Tippfehler in Hilfe berichtigt

diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index 1da03c7..61dbda1 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -6558,7 +6558,7 @@
       </sect3>
     </sect2>
     <sect2 id="change-style">
-      <title>HTMl-Stilvorlagen ändern</title>
+      <title>HTML-Stilvorlagen ändern</title>
       <para />
       <para>GnuCash has two default stylesheets for webpage reports. These stylesheets can be altered by using the HTML Style Sheets editor. To access the editor go to Edit -> Style Sheets...</para>
       <para />



Summary of changes:
 guide/C/ch_bus_features.xml  |  17 +-
 guide/de/ch_bus_setup.xml    |  32 +--
 guide/it/gnucash-guide.xml   | 582 ++++++++++++++++++++++++++-----------------
 guide/pt/ch_bus_setup.xml    | 325 ++++++++++++++++--------
 guide/ru/ch_bus_features.xml | 518 ++++++++++++++++++++++++--------------
 help/de/gnucash-help.xml     |   2 +-
 6 files changed, 919 insertions(+), 557 deletions(-)



More information about the gnucash-changes mailing list