gnucash-docs maint: Guide:C: Fix image declarations

Frank H.Ellenberger fell at code.gnucash.org
Thu Oct 20 13:32:46 EDT 2022


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/540f0cef (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/51374741 (commit)



commit 540f0cef70b96bb025f4096e73828e158e05d209
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Oct 9 22:40:54 2022 +0200

    Guide:C: Fix image declarations
    
    Some were not proper scaled.
    Now all appear in the List of Figures.

diff --git a/guide/C/ch_accts.xml b/guide/C/ch_accts.xml
index 7f45e20e..bece4198 100644
--- a/guide/C/ch_accts.xml
+++ b/guide/C/ch_accts.xml
@@ -43,31 +43,28 @@ Translators:
       type.
     </para>
 
-    <screenshot id="accts-AccountRelationships">
-      <mediaobject>
-        <imageobject role="html">
-          <imagedata fileref="figures/basics_AccountRelationships.png"
-                     srccredit="Geert Janssens"/>
-        </imageobject>
-
-        <imageobject role="fo">
-          <imagedata fileref="figures/basics_AccountRelationships.svg"
-                     format="SVG" srccredit="Geert Janssens"
-                     contentwidth="4in"/>
-        </imageobject>
-
-        <textobject>
-          <phrase>The basic accounts relationships</phrase>
-        </textobject>
-
-        <caption>
-          <para>A graphical view of the relationship between the 5 basic accounts. Net worth (equity) increases
-            through income and decreases through expenses. The arrows represent the movement of
-            value.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure pgwide="1">
+      <title>The basic accounts relationships</title>
+      <screenshot id="accts-AccountRelationships">
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/basics_AccountRelationships.png"
+                       srccredit="Geert Janssens"/>
+          </imageobject>
+          <imageobject role="fo">
+            <imagedata fileref="figures/basics_AccountRelationships.svg"
+                       srccredit="Geert Janssens"
+                       contentwidth="4in"/>
+          </imageobject>
+          <caption>
+            <para>A graphical view of the relationship between the 5 basic accounts. Net worth (equity) increases
+              through income and decreases through expenses. The arrows represent the movement of
+              value.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <sect3 id="accts-bsa2">
       <title>Balance Sheet Accounts</title>
@@ -377,41 +374,37 @@ Translators:
         </menuchoice>).
       </para>
 
-      <screenshot id="accts-DefaultIncomeAccounts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
-                         srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Default income accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the standard <emphasis>Income</emphasis> accounts
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
-
-      <screenshot id="accts-DefaultExpenseAccounts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
+      <figure pgwide="1">
+        <title>Default Income Accounts</title>
+        <screenshot id="accts-DefaultIncomeAccounts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
                          srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Some default expense accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows some standard <emphasis>Expenses</emphasis> accounts
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+            </imageobject>
+            <caption>
+              <para>This image shows the standard <emphasis>Income</emphasis> accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
+
+      <figure pgwide="1">
+        <title>Default Expense Accounts</title>
+        <screenshot id="accts-DefaultExpenseAccounts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
+                           srccredit="Cristian Marchi"/>
+            </imageobject>
+           <caption>
+              <para>This image shows some standard <emphasis>Expense</emphasis> accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="accts-other-types">
@@ -493,23 +486,21 @@ Translators:
             <guilabel>New top level account</guilabel>)
           </para>
 
-          <screenshot id="accts-CreateAssetsAccounts">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/accts_CreateAssetsAccount.png"
+          <figure pgwide="1">
+            <title>Creating an Assets account</title>
+            <screenshot id="accts-CreateAssetsAccounts">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/accts_CreateAssetsAccount.png"
                              srccredit="Cristian Marchi"/>
-              </imageobject>
-
-              <textobject>
-                <phrase>Creating an Assets account</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the dialog to create an assets account
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+                </imageobject>
+                <caption>
+                  <para>This image shows the dialog to create an asset account.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -540,23 +531,21 @@ Translators:
       <para>When you have created the top-level accounts, the main Account page in &app; should look like below.
       </para>
 
-      <screenshot id="accts-toplevel">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/accts_toplevel.png"
-                       srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>The Basic Top-level Accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the basic top-level accounts.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Basic Top-level Accounts</title>
+        <screenshot id="accts-toplevel">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/accts_toplevel.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image shows the basic top-level accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="accts-examples-organization2">
@@ -668,23 +657,21 @@ Translators:
       <para>After you have created these additional sub-accounts, the end result should look like below
       </para>
 
-      <screenshot id="accts-tree">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/accts_tree.png"
-                       srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>The Basic Chart of Accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows a simple chart of accounts.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Basic Chart of Accounts</title>
+        <screenshot id="accts-tree">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/accts_tree.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image shows a simple chart of accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Save this chart of accounts with the name <filename>gcashdata_3</filename>, as well as
         <filename>gcashdata_3emptyAccts</filename>, as we will continue to use them in the later
diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index c38fe244..b93152c7 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -129,7 +129,8 @@ Translators:
       </para>
 
       <figure pgwide="1">
-        <title>The basic accounts relationships</title><screenshot id="basics-AccountRelationships">
+        <title>The basic accounts relationships</title>
+        <screenshot id="basics-AccountRelationships">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_AccountRelationships.png"
@@ -141,11 +142,6 @@ Translators:
                          format="SVG" srccredit="Geert Janssens"
                          contentwidth="4in"/>
             </imageobject>
-
-            <textobject>
-              <phrase>The basic accounts relationships</phrase>
-            </textobject>
-
             <caption>
               <para>A graphical view of the relationship between the 5 basic accounts. Net worth (equity) increases
                 through income and decreases through expenses. The arrows represent the movement of
@@ -622,23 +618,21 @@ Translators:
         program:
       </para>
 
-      <screenshot id="basics-TipOfDay">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/basics_TipOfDay.png"
-                       srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>The Tip of the Day</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the <guilabel>Tip of the Day</guilabel>.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Tip of the Day</title>
+        <screenshot id="basics-TipOfDay">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/basics_TipOfDay.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image shows the <guilabel>Tip of the Day</guilabel>.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>These tips provide useful information for beginning users. To view more of the tips, click
         <guibutton>Forward</guibutton> to continue. If you do not wish to see this screen box on
@@ -657,23 +651,21 @@ Translators:
         Accounts</guilabel> are shown.
       </para>
 
-      <screenshot id="basics-Accounts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/basics_Accounts.png"
-                       srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>The Account Tree Window</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the <guilabel>Accounts</guilabel> window.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The basic accounts relationships</title>
+        <screenshot id="basics-Accounts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/basics_Accounts.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image shows the <guilabel>Accounts</guilabel> window.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The Account Tree window (also known as a Chart of Accounts, or CoA) provides an overview of the data
         contained in the current file. It contains a list of account names and their current
@@ -719,28 +711,21 @@ Translators:
         look similar to a checkbook register.
       </para>
 
-      <screenshot id="basics-CheckAccount">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/basics_CheckAccount.png"
-                       srccredit="Bengt Thuree" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/basics_CheckAccount.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>The Checking Account Register</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the <guilabel>Checking Account - Register </guilabel> with several transactions.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Checking Account Register</title>
+        <screenshot id="basics-CheckAccount">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/basics_CheckAccount.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>This image shows the <guilabel>Checking Account - Register</guilabel> with several transactions.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para><xref linkend="chapter_txns"></xref> explains more about account register windows and how to enter
         data into them. For now, note that the parts of an account register window are similar to
@@ -1174,20 +1159,10 @@ Translators:
                 <title>Save screen when <guilabel>xml</guilabel> or <guilabel>sqlite3</guilabel> is selected.</title>
                 <screenshot id="basics-SaveXML">
                   <mediaobject>
-                    <imageobject role="html">
-                      <imagedata fileref="figures/basics_SaveXML.png"
-                         srccredit="Cristian Marchi" width="&img-w;"/>
-                    </imageobject>
-
-                    <imageobject role="fo">
+                    <imageobject>
                       <imagedata fileref="figures/basics_SaveXML.png"
-                         srccredit="Cristian Marchi"/>
+                                 srccredit="Cristian Marchi"/>
                     </imageobject>
-
-                    <textobject>
-                      <phrase>The Save screen</phrase>
-                    </textobject>
-
                     <caption>
                       <para>This image shows the <guilabel>Save</guilabel> screen when the selected <guilabel>Data
                         Format</guilabel> is <guilabel>xml</guilabel> or <guilabel>sqlite3</guilabel>.
@@ -1231,20 +1206,10 @@ Translators:
                 <title>Save screen when <guilabel>mysql</guilabel> or <guilabel>postgres</guilabel> is selected.</title>
                 <screenshot id="basics-SaveSQL">
                   <mediaobject>
-                    <imageobject role="html">
-                      <imagedata fileref="figures/basics_SaveSQL.png"
-                             srccredit="Marchi Cristian" width="&img-w;"/>
-                    </imageobject>
-
                     <imageobject role="fo">
                       <imagedata fileref="figures/basics_SaveSQL.png"
-                             srccredit="Cristian Marchi"/>
+                                 srccredit="Cristian Marchi"/>
                     </imageobject>
-
-                    <textobject>
-                      <phrase>The Save screen</phrase>
-                    </textobject>
-
                     <caption>
                       <para>This image shows the <guilabel>Save</guilabel> screen when the selected <guilabel>Data
                         Format</guilabel> is <guilabel>mysql</guilabel> or
@@ -1738,14 +1703,13 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         srccredit="John Ralls" width="&img-w;"/>
+                           srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         srccredit="John Ralls"/>
+                           srccredit="John Ralls"/>
               </imageobject>
-
               <caption>
                 <para>This image shows the first screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant.
                 </para>
@@ -1771,16 +1735,10 @@ Translators:
         <figure pgwide="1">
           <title>New Account Hierarchy Setup: Book Options</title><screenshot id="basics-NewBookOptions">
             <mediaobject>
-              <imageobject role="html">
-                <imagedata fileref="figures/basics_NewBookOpts.png"
-                         srccredit="Frank H. Ellenberger" width="&img-w;"/>
-              </imageobject>
-
-              <imageobject role="fo">
+              <imageobject>
                 <imagedata fileref="figures/basics_NewBookOpts.png"
-                         srccredit="Frank H. Ellenberger"/>
+                           srccredit="Frank H. Ellenberger"/>
               </imageobject>
-
               <caption>
                 <para>This image shows the second screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you select the <guilabel>Book Options</guilabel>.
@@ -1807,14 +1765,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         srccredit="John Ralls" width="&img-w;"/>
+                           srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         srccredit="John Ralls"/>
+                           srccredit="John Ralls"/>
               </imageobject>
-
               <caption>
                 <para>This image shows the third screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you select the <guilabel>Currency</guilabel>.
@@ -1842,14 +1798,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         srccredit="John Ralls" width="&img-w;"/>
+                           srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         srccredit="John Ralls"/>
+                           srccredit="John Ralls"/>
               </imageobject>
-
               <caption>
                 <para>This image shows the fourth screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you choose the various <guilabel>Accounts</guilabel>.
@@ -1872,14 +1826,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         srccredit="John Ralls" width="&img-w;"/>
+                           srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         srccredit="John Ralls"/>
+                           srccredit="John Ralls"/>
               </imageobject>
-
               <caption>
                 <para>This image shows the fifth screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you can set <guilabel>Opening Balance</guilabel>.
@@ -1900,12 +1852,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         srccredit="John Ralls" width="&img-w;"/>
+                           srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         srccredit="John Ralls"/>
+                           srccredit="John Ralls"/>
               </imageobject>
 
               <caption>
@@ -1931,12 +1883,7 @@ Translators:
         <figure pgwide="1">
           <title>Tutorial: Starting Account View of the Test File</title><screenshot id="basics-EmptyAccounts">
             <mediaobject>
-              <imageobject role="html">
-                <imagedata fileref="figures/basics_EmptyAccounts.png"
-                           srccredit="Frank H. Ellenberger" width="&img-w;"/>
-              </imageobject>
-
-              <imageobject role="fo">
+              <imageobject>
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
                            srccredit="Frank H. Ellenberger"/>
               </imageobject>
diff --git a/guide/C/ch_bus_features.xml b/guide/C/ch_bus_features.xml
index 7643be8e..612afb8b 100644
--- a/guide/C/ch_bus_features.xml
+++ b/guide/C/ch_bus_features.xml
@@ -175,36 +175,25 @@
       </para>
 
       <figure>
-        <title>Sales Tax Tables Editor</title><screenshot id="bus-taxmain">
+        <title>Sales Tax Tables Editor</title>
+        <screenshot id="bus-taxmain">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_tax_main.png"
-                         srccredit="Chris Good" width="&img-w;" />
-            </imageobject>
-
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_tax_main.png"
-                        srccredit="Chris Good" />
+                         srccredit="Chris Good" />
             </imageobject>
-
-            <textobject>
-              <phrase>Sales Tax Tables Editor</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
 
       <figure>
-        <title>New Sales Tax Table Entry</title><screenshot id="bus-taxnew">
+        <title>New Sales Tax Table Entry</title>
+        <screenshot id="bus-taxnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_tax_new.png"
                          srccredit="Chris Good" />
             </imageobject>
-
-            <textobject>
-              <phrase>New Sales Tax Table Entry</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -541,40 +530,37 @@
       </para>
 
       <figure>
-        <title>Entering Company Information</title><screenshot id="bus-co-reg">
+        <title>Entering Company Information</title>
+        <screenshot id="bus-co-reg">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_co_reg.png"
                         srccredit="Chris Good" />
             </imageobject>
-
-            <textobject>
-              <phrase>Company Information</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
 
       <para>Here you can:
+        <itemizedlist>
+          <listitem>
+            <para>Enter the name of your company along with contact information such as your phone number, fax number,
+              e-mail address and website URL.
+            </para>
+          </listitem>
+  
+          <listitem>
+            <para>Enter your company’s tax payer id number in the <guilabel>Company ID</guilabel> field.
+            </para>
+          </listitem>
+  
+          <listitem>
+            <para>Select default tax tables applicable to your most common customers and vendors.
+            </para>
+          </listitem>
+        </itemizedlist>
       </para>
 
-      <itemizedlist>
-        <listitem>
-          <para>Enter the name of your company along with contact information such as your phone number, fax number,
-            e-mail address and website URL.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>Enter your company’s tax payer id number in the <guilabel>Company ID</guilabel> field.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>Select default tax tables applicable to your most common customers and vendors.
-          </para>
-        </listitem>
-      </itemizedlist>
     </sect2>
 
     <sect2 id="bus_setup_pref">
@@ -638,31 +624,25 @@
       </para>
 
       <figure>
-        <title>Billing Terms Editor</title><screenshot id="bus-termsmain">
+        <title>Billing Terms Editor</title>
+        <screenshot id="bus-termsmain">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_terms_main.png"
-                        srccredit="Chris Good" />
+                         srccredit="Chris Good" />
             </imageobject>
-
-            <textobject>
-              <phrase>Billing Terms Editor</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
 
       <figure>
-        <title>New Billing Term</title><screenshot id="bus-termsnew">
+        <title>New Billing Term</title>
+<screenshot id="bus-termsnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_terms_new.png"
                          srccredit="Chris Good" />
             </imageobject>
-
-            <textobject>
-              <phrase>New Billing Term</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -816,16 +796,13 @@
         </para>
 
         <figure>
-          <title>New Customer Registration Window</title><screenshot id="bus-ar-custnew">
+          <title>New Customer Registration Window</title>
+          <screenshot id="bus-ar-custnew">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_custnew.png"
-                            srccredit="Patrick Schweiger" />
+                           srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>New Customer Registration Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -845,16 +822,13 @@
         </para>
 
         <figure>
-          <title>Find Customer Window</title><screenshot id="bus-ar-custfind">
+          <title>Find Customer Window</title>
+          <screenshot id="bus-ar-custfind">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_custfind.png"
-                            srccredit="Patrick Schweiger" />
+                           srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>Find Customer Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -914,16 +888,13 @@
         </para>
 
         <figure>
-          <title>Creating a New Invoice</title><screenshot id="bus-ar-invoicenew">
+          <title>Creating a New Invoice</title>
+          <screenshot id="bus-ar-invoicenew">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoicenew.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>Creating a New Invoice</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -941,17 +912,15 @@
           an itemized list of goods and services you refunded instead.
         </para>
 
+<!-- ToDo: unshrink -->
         <figure>
-          <title>Edit Invoice Window</title><screenshot id="bus-ar-invoiceedit">
+          <title>Edit Invoice Window</title>
+          <screenshot id="bus-ar-invoiceedit">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoiceedit.png"
-                            srccredit="Patrick Schweiger" />
+                           srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>Edit Invoice Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -971,16 +940,13 @@
         </para>
 
         <figure>
-          <title>Post Invoice Window</title><screenshot id="bus-ar-invoicepost">
+          <title>Post Invoice Window</title>
+          <screenshot id="bus-ar-invoicepost">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoicepost.png"
-                            srccredit="Patrick Schweiger" />
+                           srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>Post Invoice Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1035,17 +1001,15 @@
           menu item.
         </para>
 
+<!-- ToDo: unshrink -->
         <figure>
-          <title>Invoice Print Output</title><screenshot id="bus-ar-invoiceprint">
+          <title>Invoice Print Output</title>
+          <screenshot id="bus-ar-invoiceprint">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoiceprint.png"
-                            srccredit="Patrick Schweiger" />
+                           srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>Invoice Print Output</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1127,11 +1091,12 @@
       </para>
 
       <figure>
-        <title>New Customer Job</title><screenshot id="bus-ar-jobnew">
+        <title>New Customer Job</title>
+        <screenshot id="bus-ar-jobnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ar_jobnew.png"
-                        srccredit="Patrick Schweiger" />
+                         srccredit="Patrick Schweiger" />
             </imageobject>
 
             <textobject>
@@ -1183,26 +1148,13 @@
       </para>
 
       <figure>
-        <title>Process Customer Payment</title><screenshot id="bus-ar-payment">
+        <title>Process Payment From Customer</title>
+        <screenshot id="bus-ar-payment">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_ar_payment.png"
-                        srccredit="Patrick Schweiger" width="&img-w;" scalefit="0" />
-            </imageobject>
-
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_ar_payment.png"
-                        srccredit="Patrick Schweiger" />
+                         srccredit="Patrick Schweiger" />
             </imageobject>
-
-            <textobject>
-              <phrase>Process Payment from Customer</phrase>
-            </textobject>
-
-            <caption>
-              <para>Process Payment from Customer
-              </para>
-            </caption>
           </mediaobject>
         </screenshot>
       </figure>
@@ -1237,16 +1189,13 @@
       </para>
 
       <figure>
-        <title>The New Style Sheet Window</title><screenshot id="bus-ar-invoicechange1">
+        <title>New Style Sheet Window</title>
+        <screenshot id="bus-ar-invoicechange1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ar_invoicechange1.png"
-                        srccredit="Cristian Marchi" />
+                         srccredit="Cristian Marchi" />
             </imageobject>
-
-            <textobject>
-              <phrase>New Style Sheet Window</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -1277,22 +1226,13 @@
       </para>
 
       <figure>
-        <title>HTML Style Sheets Example Window</title><screenshot id="bus-ar-invoicechange2">
+        <title>HTML Style Sheet Example Window</title>
+        <screenshot id="bus-ar-invoicechange2">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_ar_invoicechange2.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_ar_invoicechange2.png"
-                        srccredit="Cristian Marchi"/>
+                         srccredit="Cristian Marchi"/>
             </imageobject>
-
-            <textobject>
-              <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.
@@ -1318,18 +1258,15 @@
         sheet demonstrated above.
       </para>
 
+<!-- ToDo: unshrink -->
       <figure>
-        <title>HTML Style Sheets Example Output</title><screenshot id="bus-ar-invoicechange3">
+        <title>HTML Style Sheets Example Output</title>
+        <screenshot id="bus-ar-invoicechange3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ar_invoicechange3.png"
-                        srccredit="Patrick Schweiger" />
+                         srccredit="Patrick Schweiger" />
             </imageobject>
-
-            <textobject>
-              <phrase>HTML Style Sheets Example Output</phrase>
-            </textobject>
-
             <caption>
               <para>The hideous invoice which results from the graphics selected in the style sheet.
               </para>
@@ -1421,15 +1358,13 @@
         </para>
 
         <figure>
-          <title>New Vendor Registration Window</title><screenshot id="bus-ap-vendornew">
+          <title>New Vendor Registration Window</title>
+          <screenshot id="bus-ap-vendornew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_vendornew.png" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ap_vendornew.png"
+                           srccredit="Patrick Schweiger"/>
               </imageobject>
-
-              <textobject>
-                <phrase>New Vendor Registration Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1448,16 +1383,15 @@
           payments.
         </para>
 
+<!-- ToDo: unshrink -->
         <figure>
-          <title>Find Vendor Window</title><screenshot id="bus-ar-vendorfind">
+          <title>Find Vendor Window</title>
+          <screenshot id="bus-ar-vendorfind">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_vendorfind.png" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ap_vendorfind.png"
+                           srccredit="Patrick Schweiger"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Find Vendor Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1519,15 +1453,13 @@
         </para>
 
         <figure>
-          <title>New Bill Registration Window</title><screenshot id="bus-ap-billnew">
+          <title>New Bill Registration Window</title>
+          <screenshot id="bus-ap-billnew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billnew.png" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ap_billnew.png"
+                           srccredit="Patrick Schweiger"/>
               </imageobject>
-
-              <textobject>
-                <phrase>New Bill Registration Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1544,16 +1476,15 @@
           list of goods and services the vendor refunded instead.
         </para>
 
+<!-- ToDo: unshrink -->
         <figure>
-          <title>Edit Bill Window</title><screenshot id="bus-ap-billedit">
+          <title>Edit Bill Window</title>
+          <screenshot id="bus-ap-billedit">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billedit.png" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ap_billedit.png"
+                           srccredit="Patrick Schweiger"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Edit Bill Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1572,15 +1503,13 @@
         </para>
 
         <figure>
-          <title>Post Bill Window</title><screenshot id="bus-ap-billpost">
+          <title>Post Bill Window</title>
+          <screenshot id="bus-ap-billpost">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billpost.png" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ap_billpost.png"
+                           srccredit="Patrick Schweiger"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Post Bill Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1628,15 +1557,12 @@
       </para>
 
       <figure>
-        <title>New Vendor Job</title><screenshot id="bus-ap-jobnew">
+        <title>New Vendor Job</title>
+        <screenshot id="bus-ap-jobnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ap_jobnew.png" srccredit="Jon Lapham"/>
             </imageobject>
-
-            <textobject>
-              <phrase>New Vendor Job</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -1677,24 +1603,13 @@
       </para>
 
       <figure>
-        <title>Process Vendor Payment</title><screenshot id="bus-ap-payment">
+        <title>Process Payment To Vendor</title>
+        <screenshot id="bus-ap-payment">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger"/>
+            <imageobject>
+              <imagedata fileref="figures/bus_ap_payment.png"
+                         srccredit="Patrick Schweiger"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Process Payment to Vendor</phrase>
-            </textobject>
-
-            <caption>
-              <para>Process Payment to Vendor
-              </para>
-            </caption>
           </mediaobject>
         </screenshot>
       </figure>
@@ -2045,16 +1960,13 @@
       </para>
 
       <figure>
-        <title>Payroll Example: Initial Setup</title><screenshot id="bus-pay-ex1">
+        <title>Payroll Example: Initial Setup</title>
+        <screenshot id="bus-pay-ex1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex1.png"
-                 srccredit="Patrick Schweiger"/>
+                         srccredit="Patrick Schweiger"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Payroll Example 1</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -2217,18 +2129,15 @@
       <para>From the checking account, enter the split transaction for employee 1. It should look like this:
       </para>
 
+<!-- ToDo: unshrink -->
       <figure>
-        <title>Payroll Example: Employee Split Transaction</title><screenshot id="bus-pay-ex2">
+        <title>Payroll Example: Employee Split Transaction</title>
+        <screenshot id="bus-pay-ex2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex2.png"
-                    srccredit="Patrick Schweiger"/>
+                         srccredit="Patrick Schweiger"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Payroll Example 2</phrase>
-            </textobject>
-
             <caption>
               <para>The Split Transaction for Employee 1
               </para>
@@ -2250,16 +2159,13 @@
       </para>
 
       <figure>
-        <title>Payroll Example: Accounts After Salaries Paid</title><screenshot id="bus-pay-ex3">
+        <title>Payroll Example: Accounts After Salaries Paid</title>
+<screenshot id="bus-pay-ex3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex3.png"
-                    srccredit="Patrick Schweiger"/>
+                         srccredit="Patrick Schweiger"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Payroll Example 3</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -2272,16 +2178,13 @@
       </para>
 
       <figure>
-        <title>Payroll Example: Accounts After Paying Government</title><screenshot id="bus-pay-ex4">
+        <title>Payroll Example: Accounts After Paying Government</title>
+        <screenshot id="bus-pay-ex4">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex4.png"
-                    srccredit="Patrick Schweiger"/>
+                         srccredit="Patrick Schweiger"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Payroll Example 4</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
diff --git a/guide/C/ch_capgain.xml b/guide/C/ch_capgain.xml
index 0806c95e..2cce94e6 100644
--- a/guide/C/ch_capgain.xml
+++ b/guide/C/ch_capgain.xml
@@ -176,23 +176,22 @@
       main account window which appears like this:
     </para>
 
-    <screenshot id="capgain_appmain">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/capgain_appmain.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Asset Appreciation Main Window</phrase>
-        </textobject>
-
-        <caption>
-          <para>The asset appreciation example main window
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure pgwide="1">
+      <title>Asset Appreciation Main Window</title>
+      <screenshot id="capgain_appmain">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/capgain_appmain.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>The asset appreciation example main window
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
+
 
     <sect2 id="capgain_exampleunrealized2">
       <title>Unrealized Gains</title>
@@ -203,23 +202,21 @@
          Your main window will resemble this:
       </para>
 
-      <screenshot id="capgain_app2main">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/capgain_app2main.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Asset Appreciation Main Window</phrase>
-          </textobject>
-
-          <caption>
-            <para>Chart of Accounts after unrealized gain
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Asset Appreciation Main Window</title>
+        <screenshot id="capgain_app2main">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/capgain_app2main.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>Chart of Accounts after unrealized gain
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="capgain_examplesell2">
@@ -342,23 +339,21 @@
             $130,000 and <emphasis>Income:Realized Gains</emphasis> with a total of $30,000.
           </para>
 
-          <screenshot id="capgain_app3main">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/capgain_app3main.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Asset Appreciation Main Window</phrase>
-              </textobject>
-
-              <caption>
-                <para>Chart of Accounts after realized gains
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure pgwide="1">
+            <title>Asset Appreciation Main Window</title>
+            <screenshot id="capgain_app3main">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/capgain_app3main.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>Chart of Accounts after realized gains
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+           </figure>
         </listitem>
 
         <listitem>
diff --git a/guide/C/ch_cbook.xml b/guide/C/ch_cbook.xml
index 2abdffdf..de77c6d1 100644
--- a/guide/C/ch_cbook.xml
+++ b/guide/C/ch_cbook.xml
@@ -200,23 +200,21 @@
         (<filename>gcashdata_4</filename>). Your chart of accounts should look like this:
       </para>
 
-      <screenshot id="cbook-gcashdata4">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cbook_gcashdata4.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>The Chart of Accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the Chart of Accounts.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Chart Of Accounts</title>
+        <screenshot id="cbook-gcashdata4">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cbook_gcashdata4.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the Chart of Accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cbook-puttoget-transactions">
@@ -234,23 +232,22 @@
             account. Your <emphasis>Checking</emphasis> account should now look like this:
           </para>
 
-          <screenshot id="cbook-transferin">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_transferin.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The Checking Account Register</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Checking Account Register.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+          <figure>
+            <title>The Checking Account Register</title>
+            <screenshot id="cbook-transferin">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_transferin.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Checking Account Register.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -263,23 +260,22 @@
             Your checking account should now look like this;
           </para>
 
-          <screenshot id="cbook-checkexamp">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_checkexamp.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The Checking Account Register</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Checking Account Register after registering some more checks.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+          <figure>
+            <title>The Checking Account Register After Registering Some More Checks</title>
+            <screenshot id="cbook-checkexamp">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_checkexamp.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Checking Account Register after registering some more checks.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -291,23 +287,22 @@
             25 of March.
           </para>
 
-          <screenshot id="cbook-atm">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_atm.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The Checking Account Register</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Checking Account Register with an ATM withdrawal.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+          <figure>
+            <title>The Checking Account Register With An ATM Withdrawal</title>
+            <screenshot id="cbook-atm">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_atm.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Checking Account Register with an ATM withdrawal.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
       </orderedlist>
     </sect2>
@@ -319,23 +314,21 @@
         statement:
       </para>
 
-      <screenshot id="cbook-bankstmt">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cbook_bankstmt.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>A sample Bank Statement</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows a sample Bank Statement.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>A sample Bank Statement</title>
+        <screenshot id="cbook-bankstmt">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cbook_bankstmt.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows a sample Bank Statement.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <orderedlist>
         <listitem>
@@ -349,23 +342,22 @@
             reconcile window should look like this:
           </para>
 
-          <screenshot id="cbook-reconexamp">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_reconexamp.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The reconcile window</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the reconcile window with a $5 difference.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+          <figure>
+            <title>The Reconcile Window</title>
+            <screenshot id="cbook-reconexamp">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_reconexamp.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the reconcile window with a $5 difference.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
 
           <para>Notice that your reconciled balance differs from your ending balance by $5.00. If you look at the
             sample bank statement, you will see there is a $5.00 service charge that has not been
@@ -384,23 +376,22 @@
             should now look like this:
           </para>
 
-          <screenshot id="cbook-servch">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_servch.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The Checking Account Register</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Checking Account Register with service charge added.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+            <figure>
+              <title>The Checking Account With Service Charge</title>
+              <screenshot id="cbook-servch">
+                <mediaobject>
+                  <imageobject>
+                    <imagedata fileref="figures/cbook_servch.png"
+                               srccredit="Bengt Thuree" />
+                  </imageobject>
+                  <caption>
+                    <para>This image shows the Checking Account Register with service charge added.
+                    </para>
+                  </caption>
+                </mediaobject>
+              </screenshot>
+            </figure>
         </listitem>
 
         <listitem>
@@ -413,23 +404,22 @@
             indicates <guilabel>Reconciled: USD 1451.79</guilabel>
           </para>
 
-          <screenshot id="cbook-reconciledCheckAct">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_reconciledCheckAct.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The Checking Account Register</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the reconciled Checking Account Register.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+          <figure>
+            <title>The Reconciled Checking Account</title>
+            <screenshot id="cbook-reconciledCheckAct">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_reconciledCheckAct.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the reconciled Checking Account Register.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+            </figure>
         </listitem>
       </orderedlist>
     </sect2>
@@ -441,23 +431,22 @@
         Your chart of accounts is steadily growing, and it should now look like this:
       </para>
 
-      <screenshot id="cbook-chartaccts5">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cbook_chartaccts5.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>The Chart of Accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the Chart of Accounts.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>The Chart of Accounts</title>
+        <screenshot id="cbook-chartaccts5">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cbook_chartaccts5.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the Chart of Accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cbook-puttoget-reports">
@@ -480,23 +469,21 @@
             .
           </para>
 
-          <screenshot id="cbook-puttoget2-Cash">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_CashFlow.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Cash Flow report for the month of March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Cash Flow report after <xref linkend="chapter_cbook"></xref>.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure>
+            <title>Cash Flow report for the month of March</title>
+            <screenshot id="cbook-puttoget2-Cash">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_CashFlow.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Cash Flow report after <xref linkend="chapter_cbook"></xref>.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -510,23 +497,21 @@
             .
           </para>
 
-          <screenshot id="cbook-puttoget2-TransactionRptChecking">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_TransactionRptAssets.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Assets accounts during March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the Assets accounts during March.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure>
+            <title>Transaction Report For The Assets During March</title>
+            <screenshot id="cbook-puttoget2-TransactionRptChecking">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_TransactionRptAssets.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the Assets accounts during March.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -534,23 +519,21 @@
             account.
           </para>
 
-          <screenshot id="cbook-puttoget2-TransactionRptExpenses">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_TransactionRptExpenses.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Expenses accounts during March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the various Expense accounts during March.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure>
+            <title>Transaction Report For The Expenses During March</title>
+            <screenshot id="cbook-puttoget2-TransactionRptExpenses">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_TransactionRptExpenses.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the various Expense accounts during March.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
       </orderedlist>
 
diff --git a/guide/C/ch_cc.xml b/guide/C/ch_cc.xml
index 5fa893f5..8c941134 100644
--- a/guide/C/ch_cc.xml
+++ b/guide/C/ch_cc.xml
@@ -232,46 +232,42 @@
         <para>After reversing the transaction, your credit card account should look something like this:
         </para>
 
-        <screenshot id="cc-Reversing-Transaction-1">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
-                           srccredit="Bengt Thuree"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Refunded a credit card purchase</phrase>
-            </textobject>
-
-            <caption>
-              <para>This image shows <emphasis>Liability:Credit Card</emphasis> - Register after reversing a purchase
-                transaction.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Credit Card account after reversing a purchase</title>
+          <screenshot id="cc-Reversing-Transaction-1">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
+                             srccredit="Bengt Thuree"/>
+              </imageobject>
+              <caption>
+                <para>This image shows <emphasis>Liability:Credit Card</emphasis> - Register after reversing a purchase
+                  transaction.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>And the <emphasis>Expenses:Clothes</emphasis> register should look something like this:
         </para>
 
-        <screenshot id="cc-Reversing-Transaction-2">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
-                           srccredit="Bengt Thuree"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Refunded a credit card purchase</phrase>
-            </textobject>
-
-            <caption>
-              <para>This image shows <emphasis>Expenses:Clothes</emphasis> register after reversing a purchase
-                transaction.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Expenses account after reversing a purchase</title>
+          <screenshot id="cc-Reversing-Transaction-2">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
+                             srccredit="Bengt Thuree"/>
+              </imageobject>
+              <caption>
+                <para>This image shows <emphasis>Expenses:Clothes</emphasis> register after reversing a purchase
+                  transaction.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </listitem>
 
       <listitem>
@@ -299,23 +295,21 @@
         this:
       </para>
 
-      <screenshot id="cc-accounts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_accounts.png"
-                     srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Starting account structure</phrase>
-          </textobject>
-
-          <caption>
-            <para>Starting account structure for tracking a credit card in the putting it all together example.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Starting account structure for tracking a credit card</title>
+        <screenshot id="cc-accounts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_accounts.png"
+                       srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Starting account structure for tracking a credit card in the putting it all together example.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cc-together-purchases2">
@@ -335,23 +329,21 @@
       <para>The register window for the credit card liability should look like this:
       </para>
 
-      <screenshot id="cc-purchases">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_purchases.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Initial credit card purchases</phrase>
-          </textobject>
-
-          <caption>
-            <para>Initial credit card purchases.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Initial credit card purchases</title>
+        <screenshot id="cc-purchases">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_purchases.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Initial credit card purchases.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cc-together-refund2">
@@ -366,23 +358,21 @@
         column. The transaction looks like this:
       </para>
 
-      <screenshot id="cc-refund">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_refund.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Item return transaction</phrase>
-          </textobject>
-
-          <caption>
-            <para>Returning clothes to Faux Pas Fashions, refund to credit card.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Item return transaction refunded to credit card</title>
+        <screenshot id="cc-refund">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_refund.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Returning clothes to Faux Pas Fashions, refund to credit card.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cc-together-interest2">
@@ -394,23 +384,21 @@
         credit card account as an expense.
       </para>
 
-      <screenshot id="cc-interest">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_interest.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Interest charge</phrase>
-          </textobject>
-
-          <caption>
-            <para>Interest charge.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Interest charge on the Credit Card</title>
+        <screenshot id="cc-interest">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_interest.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Interest charge.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cc-together-reconcile2">
@@ -428,23 +416,17 @@
         final balance of $455. Enter these values in to the initial Reconcile window as shown here.
       </para>
 
-      <screenshot id="cc-reconcile-init">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_reconcile_init.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Initial reconcile window</phrase>
-          </textobject>
-
-          <caption>
-            <para>Initial account reconciliation window.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Initial Reconciliation Window For The Credit Card</title>
+        <screenshot id="cc-reconcile-init">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_reconcile_init.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>During the reconciliation process, you check off each transaction in the account as you confirm that
         the transaction appears in both your &app; account and the credit card statement. For this
@@ -452,23 +434,21 @@
         accounts and the credit card statement.
       </para>
 
-      <screenshot id="cc-reconcile">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_reconcile.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Main reconcile window</phrase>
-          </textobject>
-
-          <caption>
-            <para>Main account reconciliation window, demonstrating a discrepancy of $300.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Main Reconciliation Window With A Discrepancy</title>
+        <screenshot id="cc-reconcile">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_reconcile.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Main account reconciliation window, demonstrating a discrepancy of $300.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Some investigation uncovers that you forgot to record a payment you made on March 5th to the credit
         card company for $300, you must enter this payment transaction from your bank account to the
@@ -487,45 +467,37 @@
         card account register should now appear like this:
       </para>
 
-      <screenshot id="cc-payment">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_payment.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Reconciliation and payment</phrase>
-          </textobject>
-
-          <caption>
-            <para>Account register after account reconciliation and payment.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Credit Card Account After Reconciliation And Payment</title>
+        <screenshot id="cc-payment">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_payment.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Account register after reconciliation and payment.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Go back to the main window and save your file (<filename>gcashdata_6</filename>). Your chart of
         accounts is steadily growing, and it should now look like this:
       </para>
 
-      <screenshot id="cc-final">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_final.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>&app; main window</phrase>
-          </textobject>
-
-          <caption>
-            <para>&app; Chart of Accounts after account reconciliation and payment.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Chart of Accounts After Account Reconciliation And Payment</title>
+        <screenshot id="cc-final">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_final.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cc-puttoget-save">
@@ -556,23 +528,21 @@
             .
           </para>
 
-          <screenshot id="cc-puttoget2-Cash">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cc_CashFlow.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Cash Flow report for the month of March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Cash Flow report after <xref linkend="chapter_cc"></xref>.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure pgwide="1">
+            <title>The Cash Flow report for the month of March</title>
+            <screenshot id="cc-puttoget2-Cash">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cc_CashFlow.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Cash Flow report after <xref linkend="chapter_cc"></xref>.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -581,51 +551,46 @@
 
           <para>Select the transaction report from
             <menuchoice>
-              <guimenu>Reports</guimenu> <guimenuitem>Transaction Report</guimenuitem>
-            </menuchoice>
-            .
+              <guimenu>Reports</guimenu><guimenuitem>Transaction Report</guimenuitem>
+            </menuchoice>.
           </para>
 
-          <screenshot id="cc-puttoget2-TransactionRptVisa">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cc_TransactionRptVisa.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Visa account during March/April</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the Visa account during March/April.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure pgwide="1">
+            <title>The Transaction Report for the Visa account during March/April</title>
+            <screenshot id="cc-puttoget2-TransactionRptVisa">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cc_TransactionRptVisa.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the Visa account during March/April.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
           <para>Now let’s change the transaction report to only show the various Expenses accounts.
           </para>
 
-          <screenshot id="cc-puttoget2-TransactionRptExpenses">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cc_TransactionRptExpenses.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Expenses accounts during April</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the various Expense accounts during April.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure pgwide="1">
+            <title>The Transaction Report for the Expenses accounts during April</title>
+            <screenshot id="cc-puttoget2-TransactionRptExpenses">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cc_TransactionRptExpenses.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the various Expense accounts during April.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
       </orderedlist>
     </sect2>
diff --git a/guide/C/ch_currency.xml b/guide/C/ch_currency.xml
index a66e1aca..3bff45ab 100644
--- a/guide/C/ch_currency.xml
+++ b/guide/C/ch_currency.xml
@@ -128,23 +128,21 @@ TODO -->
         the later section (<xref linkend="currency_howto1" />) on ways to do this.
       </para>
 
-      <screenshot id="currency_main1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_main1.png"
-                       srccredit="Frank H. Ellenberger" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Initial multi currency Account Bank Setup</phrase>
-          </textobject>
-
-          <caption>
-            <para>Initial setup of 3 bank accounts with different currencies.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Initial multi currency Account Bank Setup</title>
+        <screenshot id="currency_main1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_main1.png"
+                         srccredit="Frank H. Ellenberger" />
+            </imageobject>
+            <caption>
+              <para>Initial setup of 3 bank accounts with different currencies.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Notice that the <guilabel>Total (Report)</guilabel> column is being displayed. This is configured in the column header
         row, select <guibutton>Arrow down</guibutton> and select <guilabel>Total(USD)</guilabel>.
@@ -220,23 +218,21 @@ TODO -->
       <para>Before we start, let’s have a quick look at the Chart of Accounts.
       </para>
 
-      <screenshot id="currency_main1a">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_main1.png"
-                       srccredit="Frank H. Ellenberger" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Initial multi currency Account Bank Setup</phrase>
-          </textobject>
-
-          <caption>
-            <para>Initial set up of 3 bank accounts with different currencies.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Initial multi currency Account Bank Setup</title>
+        <screenshot id="currency_main1a">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_main1.png"
+                         srccredit="Frank H. Ellenberger" />
+            </imageobject>
+            <caption>
+              <para>Initial set up of 3 bank accounts with different currencies.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>As you see, the overall balances do not yet reflect any value for EUR or HKD holdings. Adding
         currency exchange rates will fix this.
@@ -251,41 +247,37 @@ TODO -->
           </menuchoice>.
         </para>
 
-        <screenshot id="currency_peditor">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_peditor.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
-
-            <caption>
-              <para>Price Database Window—still empty
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Price Database Window—Still Empty</title>
+          <screenshot id="currency_peditor">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_peditor.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+          </figure>
 
         <para>Click on the <guibutton>Add</guibutton> button to add a new currency exchange rate. A window will
           appear in which you can set up a new exchange rate. This window should appear like this:
         </para>
 
-        <screenshot id="currency_addcurr">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_addcurr.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Set up Euro Exchange Rate</phrase>
-            </textobject>
-
-            <caption>
-              <para>Add Price Database Window
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Setup Of Euro Exchange Rate</title>
+          <screenshot id="currency_addcurr">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_addcurr.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+              <caption>
+                <para>Add Price Database Window
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>Set the <guilabel>Namespace</guilabel> to <guilabel>CURRENCY</guilabel> and the <guilabel>Security</guilabel> to <guilabel>EUR
           (Euro)</guilabel>. Then set the exchange rate between the selected security and the selected
@@ -294,33 +286,33 @@ TODO -->
           this example, you will set the exchange rate to 1 EUR for 1 USD.
         </para>
 
-        <screenshot id="currency_manualpriceadded">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
-
-            <caption>
-              <para>The Price Database window after setting the exchange rate between Euros and US Dollars
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
-
-        <screenshot id="currency_main2">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_main2.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
+        <figure pgwide="1">
+          <title>The Price Database window after setting the exchange rate between Euros and US Dollars</title>
+          <screenshot id="currency_manualpriceadded">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
+                           srccredit="Frank H. Ellenberger" width="&img-w;" />
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
-            <caption>
-              <para>Chart of Accounts after setting the exchange rate between Euro and US Dollar
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Chart of Accounts After Setting The Exchange Rate Between Euro And US Dollar</title>
+          <screenshot id="currency_main2">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_main2.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>Observe that since you have no exchange rate for HKD, &app; doesn’t convert the HKD accounts
           to USD. This will be added in the next section.
@@ -340,19 +332,21 @@ TODO -->
           </menuchoice>.
         </para>
 
-        <screenshot id="currency_BeforeGetOnline">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
-
-            <caption>
-              <para>Price Database Window before you obtain online quotes
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Price Database Before Obtaining Online Quotes</title>
+          <screenshot id="currency_BeforeGetOnline">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
+                           srccredit="Frank H. Ellenberger" width="&img-w;" />
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>Click on the <guibutton>Get Quotes</guibutton> button to automatically load the various exchange
           rates you need.
@@ -366,20 +360,21 @@ TODO -->
           </para>
         </note>
 
-        <para><screenshot id="currency_AfterGetOnlineQuotes">
+        <figure pgwide="1">
+          <title>The Price Database After Obtaining Online Quotes</title>
+          <screenshot id="currency_AfterGetOnlineQuotes">
             <mediaobject>
-              <imageobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
+                           srccredit="Frank H. Ellenberger" width="&img-w;" />
+              </imageobject>
+              <imageobject role="fo">
                 <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
                            srccredit="Frank H. Ellenberger" />
               </imageobject>
-
-              <caption>
-                <para>Price Database Window after we obtained online quotes
-                </para>
-              </caption>
             </mediaobject>
           </screenshot>
-        </para>
+        </figure>
 
         <para>&app; downloads exchange rates for all currencies that are in use in your various accounts. This
           will happen every time you click on <guibutton>Get Quotes</guibutton> or request &app; to
@@ -392,19 +387,17 @@ TODO -->
           rate.
         </para>
 
-        <screenshot id="currency_main3.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_main3.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
-
-            <caption>
-              <para>Chart of Accounts after we obtain online quotes
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Chart of Accounts After Obtaining Online Quotes</title>
+          <screenshot id="currency_main3.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_main3.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </sect3>
 
       <sect3 id="currency_howto_disable">
@@ -489,68 +482,54 @@ TODO -->
           charges you 150 USD to transfer the money.
         </para>
 
-        <screenshot id="currency_purchase_MoveMoney.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_MoveMoney.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Currency transfer</phrase>
-            </textobject>
-
-            <caption>
-              <para>Transfer money to Jamaica
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Transaction <quote>Currency Transfer To Jamaica</quote></title>
+          <screenshot id="currency_purchase_MoveMoney.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_MoveMoney.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>Select the Jamaica transaction line (9,850.00 USD), right click and select <guilabel>Edit Exchange
           Rate</guilabel>
         </para>
 
-        <screenshot id="currency_purchase_SetExchangeRate.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_SetExchangeRate.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Edit Exchange rate</phrase>
-            </textobject>
-
-            <caption>
-              <para>A dialog window where the exchange rate in a currency transaction is specified.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Edit Exchange Rate</title>
+          <screenshot id="currency_purchase_SetExchangeRate.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_SetExchangeRate.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+              <caption>
+                <para>In this dialog the exchange rate of a currency transaction is specified.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>As Exchange Rate, you enter 1 USD = 64 JMD, since this is the rate your bank gave. Press ok in the
           Transfer Funds (Edit Exchange Rate) window, and then save this split transaction. Below is
           how it now looks in the main Chart of Accounts.
         </para>
 
-        <screenshot id="currency_purchase_BeforeBoat.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_BeforeBoat.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Chart of Accounts before purchasing the boat</phrase>
-            </textobject>
-
-            <caption>
-              <para>Chart of Accounts before purchasing the boat
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Chart of Accounts before purchasing the boat</title>
+          <screenshot id="currency_purchase_BeforeBoat.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_BeforeBoat.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>You choose to buy a boat for 509,000 JMD. To record this transaction in &app;, you will need to
           enter a simple transaction in <emphasis>Assets:Current Assets:Jamaican Bank</emphasis>
@@ -558,23 +537,17 @@ TODO -->
           Assets:Boat</emphasis>.
         </para>
 
-        <screenshot id="currency_purchase_AfterBoat.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_AfterBoat.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Chart of Accounts after purchasing the boat</phrase>
-            </textobject>
-
-            <caption>
-              <para>Chart of Accounts after purchasing the boat
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Chart Of Accounts After Purchasing The Boat</title>
+          <screenshot id="currency_purchase_AfterBoat.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_AfterBoat.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The Chart of Accounts now reflects that your bank account has been reduced by 509,000 JMD, and that
           your Fixed Assets boat account has been increased by the same amount. If you also have
@@ -616,23 +589,17 @@ TODO -->
         <para>The Chart of Accounts looks like this after creating all the needed accounts:
         </para>
 
-        <screenshot id="currency_purchase_BeforeStocks.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_BeforeStocks.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Chart of Accounts for international stocks</phrase>
-            </textobject>
-
-            <caption>
-              <para>Chart of Accounts for international stocks
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Chart of Accounts For International Stocks</title>
+          <screenshot id="currency_purchase_BeforeStocks.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_BeforeStocks.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The stock definition can be seen in the Security Editor (
           <menuchoice>
@@ -640,23 +607,17 @@ TODO -->
           </menuchoice>.)
         </para>
 
-        <screenshot id="currency_purchase_Commodities.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_Commodities.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>International securities</phrase>
-            </textobject>
-
-            <caption>
-              <para>International securities
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>International Securities</title>
+          <screenshot id="currency_purchase_Commodities.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_Commodities.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>If you have not moved money (50,000 HKD) into the brokerage cash account
           (<emphasis>Assets:Investments:Brokerage Accounts:Boom:Bank</emphasis>), do so now, either
@@ -735,45 +696,41 @@ TODO -->
           <guilabel>To Amount</guilabel>.
         </para>
 
-        <screenshot id="currency_purchase_ToAmount.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_ToAmount.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Transfer Funds</phrase>
-            </textobject>
-
-            <caption>
-              <para>Setting the number of shares in the Transfer Funds dialog
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Transfer Funds</title>
+          <screenshot id="currency_purchase_ToAmount.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_ToAmount.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+              <caption>
+                <para>Setting the number of shares in the Transfer Funds dialog
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>When you return to the Chart of Accounts, you will see the purchased shares reflected in the stock
           account’s total.
         </para>
 
-        <screenshot id="currency_purchase_AfterStocks.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_AfterStocks.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Purchased international stocks</phrase>
-            </textobject>
-
-            <caption>
-              <para>Chart of Accounts with some international stocks
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Purchased international stocks</title>
+          <screenshot id="currency_purchase_AfterStocks.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_AfterStocks.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+              <caption>
+                <para>Chart of Accounts is now containing the international stocks
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>However, as you can see, the USD totals may be zero if &app; doesn’t have an exchange rate
           between USD and HKD. To fix this, go to
@@ -1101,28 +1058,21 @@ Trading
           as follows:
         </para>
 
-        <screenshot id="currency__trading_acct_setup">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_acct_setup.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_acct_setup.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Initial multi currency Account Bank Setup</phrase>
-            </textobject>
-
-            <caption>
-              <para>Initial setup of bank accounts in multiple currencies.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Initial Multicurrency Bank Accounts Setup</title>
+          <screenshot id="currency__trading_acct_setup">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_acct_setup.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Initial setup of bank accounts in multiple currencies.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The following prices were entered in the Price Database (
           <menuchoice>
@@ -1132,56 +1082,42 @@ Trading
           USD:
         </para>
 
-        <screenshot id="currency__trading_price_database">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_Price_Database_initial.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_Price_Database_initial.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>The Price Database initial entries</phrase>
-            </textobject>
-
-            <caption>
-              <para>Price Database window after setting initial exchange rates between USD, HKD and EUR.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Initial Price Database Entries</title>
+          <screenshot id="currency__trading_price_database">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_Price_Database_initial.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Price Database window after setting initial exchange rates between USD, HKD and EUR.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>With the currency prices set as shown, the Accounts tab will now display the values of the foreign
           accounts in USD in the <guilabel>Total(USD)</guilabel> column:
         </para>
 
-        <screenshot id="currency_trading_acct_setup_2">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_acct_setup_2.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_acct_setup_2.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Initial multi currency setup after entering exchange rates between USD, HKD
-              and EUR</phrase>
-            </textobject>
-
-            <caption>
-              <para><guilabel>Accounts</guilabel> tab after setting exchange rates to USD.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Initial Multicurrency Setup After Entering Exchange Rates Between USD, HKD
+                and EUR</title>
+          <screenshot id="currency_trading_acct_setup_2">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_acct_setup_2.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para><guilabel>Accounts</guilabel> tab after setting exchange rates to USD.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </sect3>
 
       <sect3 id="currency_trading_transfer">
@@ -1195,28 +1131,21 @@ Trading
           with the <guilabel>Transfer Funds</guilabel> dialog as shown below:
         </para>
 
-        <screenshot id="currency__trading_tfr_dialog">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_transfer_funds.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_transfer_funds.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Transfer dialog to create transactionfor transfer from USD to HKD</phrase>
-            </textobject>
-
-            <caption>
-              <para>Transfer of 10,200 HKD from US Bank account to Hong Kong bank account.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Transfer Dialog To Create Transaction For Transfer From USD To HKD</title>
+          <screenshot id="currency__trading_tfr_dialog">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_transfer_funds.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Transfer of 10,200 HKD from US Bank account to Hong Kong bank account.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The <guilabel>Debit Amount</guilabel> has been specified in HKD and the transaction <guilabel>Amount</guilabel> being transferred in USD.
           There is no provision to enter the transfer fee in the dialog. On closing the dialog the
@@ -1231,84 +1160,71 @@ Trading
           </para>
         </note>
 
-        <screenshot id="currency_trading_transfer_trans1">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_transfer_trans1.png"
-                srccredit="David Cousens"  width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_transfer_trans1.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Transaction after transfer displayed in US Bank account register</phrase>
-            </textobject>
-
-            <caption>
-              <para>Transaction to transfer from US bank account to Hong Kong Bank account after closing transfer
-                dialog.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Transaction After Transfer Displayed in The US Bank Account Register</title>
+          <screenshot id="currency_trading_transfer_trans1">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_trading_transfer_trans1.png"
+                           srccredit="David Cousens"  width="&img-w;"/>
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/currency_trading_transfer_trans1.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Transaction to transfer from US bank account to Hong Kong Bank account after closing transfer
+                  dialog.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The transaction can be opened in the US Bank Account register and may then be edited to add splits
           for the transfer fee as follows:
         </para>
 
-        <screenshot id="currency_trading_transfer_trans2">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_transfer_trans2.png"
-                srccredit="David Cousens"  width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_transfer_trans2.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Transaction after adding the splits for the transfer fee</phrase>
-            </textobject>
-
-            <caption>
-              <para>Transaction to transfer from US bank account to Hong Kong Bank account after adding the splits for
-                the transaction fee.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Transaction After Adding The Splits For The Transfer Fee</title>
+          <screenshot id="currency_trading_transfer_trans2">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_trading_transfer_trans2.png"
+                           srccredit="David Cousens"  width="&img-w;"/>
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/currency_trading_transfer_trans2.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Transaction to transfer from US bank account to Hong Kong Bank account after adding the splits for
+                  the transaction fee.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>Returning to the Accounts tab we can see the result of the transfer transaction on the accounts:
         </para>
 
-        <screenshot id="currency_trading_accts_after_tfr">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_accts_after_tfr.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_accts_after_tfr.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Account tab balances after completion of USD to HKD transfer</phrase>
-            </textobject>
-
-            <caption>
-              <para>Account balances in the Accounts tab after the transfer of funds from the US Bank account to the
-                Hong Kong bank account.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Account Tab Balances After Completion Of USD To HKD Transfer</title>
+          <screenshot id="currency_trading_accts_after_tfr">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_accts_after_tfr.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Account balances in the Accounts tab after the transfer of funds from the US Bank account to the
+                  Hong Kong bank account.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The balances of the Asset and Equity accounts are presented with values set by the exchange rate
           entered in the transaction to transfer funds on Feb. 1, 2020.
@@ -1334,81 +1250,64 @@ Trading
           The transaction to effect the transfer is as follows:
         </para>
 
-        <screenshot id="currency_trading_tfr_back">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_trf_back.png"
-                         srccredit="David Cousens"  width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_trf_back.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Transaction to transfer funds from Hong Kong to US Bank account.</phrase>
-            </textobject>
-
-            <caption>
-              <para>The transaction transfers 10,200.00 HKD from the Hong Kong Bank account to the US Bank account.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Transaction To Transfer Funds From Hong Kong To US Bank Account</title>
+          <screenshot id="currency_trading_tfr_back">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_trading_trf_back.png"
+                           srccredit="David Cousens"  width="&img-w;"/>
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/currency_trading_trf_back.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>The transaction transfers 10,200.00 HKD from the Hong Kong Bank account to the US Bank account.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>After transferring the funds back to the US Bank account, the prices database entries are as
           follows:
         </para>
 
-        <screenshot id="currency_trading_prices_after_trf_back">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_prices_after_trf_back.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_prices_after_trf_back.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Price database after transfer of funds back to US account</phrase>
-            </textobject>
-
-            <caption>
-              <para>The price database showing prices for the transfer of funds to HKD and back to USD.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Price database after transfer of funds back to US account</title>
+          <screenshot id="currency_trading_prices_after_trf_back">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_prices_after_trf_back.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>The price database showing prices for the transfer of funds to HKD and back to USD.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The Accounts tab balances after transferring the funds back are as follows:
         </para>
 
-        <screenshot id="currency_trading_accts_after_trf_back">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_accts_after_trf_back.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_accts_after_trf_back.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Accounts tab after transfer back</phrase>
-            </textobject>
-
-            <caption>
-              <para>State of the accounts after the funds have been transferred back.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Accounts tab after transfer back</title>
+          <screenshot id="currency_trading_accts_after_trf_back">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_accts_after_trf_back.png"
+                           srccredit="David Cousens" />
+              </imageobject>
+              <caption>
+                <para>State of the accounts after the funds have been transferred back.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The Assets and Equity balances now reflect the the values of the accounts at the exchange rate for
           the transfer of funds back to the US Bank account. The Trading and CURRENCY placeholder accounts now indicate a
@@ -1425,28 +1324,21 @@ Trading
           Loss incurred:
         </para>
 
-        <screenshot id="currency_trading_balance_sheet">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_balance_sheet.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_balance_sheet.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Balance sheet after above transactions</phrase>
-            </textobject>
-
-            <caption>
-              <para>Balance Sheet after these transactions reflecting the trading loss incurred.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Balance Sheet After Above Transactions</title>
+          <screenshot id="currency_trading_balance_sheet">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_balance_sheet.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Balance Sheet after these transactions reflecting the trading loss incurred.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </sect3>
     </sect2>
   </sect1>
diff --git a/guide/C/ch_dep.xml b/guide/C/ch_dep.xml
index 30617a1a..136e66b7 100644
--- a/guide/C/ch_dep.xml
+++ b/guide/C/ch_dep.xml
@@ -648,23 +648,21 @@
       both purchased on January 1, 2000.
     </para>
 
-    <screenshot id="dep_example">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/dep_example.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Asset Depreciation Example1</phrase>
-        </textobject>
-
-        <caption>
-          <para>The asset depreciation example main window, before depreciation
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure pgwide="1">
+      <title>Asset Accounts Before Depreciation</title>
+      <screenshot id="dep_example">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/dep_example.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>The asset accounts still only have the investments stored.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <para>Looking at the tax codes, we realize that we must report depreciation on these items using the
       <quote>sum of digits</quote> scheme, over a 5 year period. So, the yearly depreciation amounts
@@ -681,41 +679,37 @@
       periods) of depreciation using this <guilabel>sum of digits</guilabel> scheme.
     </para>
 
-    <screenshot id="dep_assetreg">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/dep_assetreg.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Asset Depreciation Register Window</phrase>
-        </textobject>
-
-        <caption>
-          <para>The asset depreciation register window
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure pgwide="1">
+      <title>Asset Depreciation In The Register</title>
+      <screenshot id="dep_assetreg">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/dep_assetreg.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>This account shows a list of depreciation transactions.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
+    <figure pgwide="1">
+      <title>Accounts Tab After Asset Depreciation</title>
     <screenshot id="dep_assetmain">
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/dep_assetmain.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
-
-        <textobject>
-          <phrase>Asset Depreciation Main Window</phrase>
-        </textobject>
-
-        <caption>
-          <para>The asset depreciation main window
-          </para>
-        </caption>
+          <caption>
+            <para>The asset accounts got decreased by the depreciation.
+            </para>
+          </caption>
       </mediaobject>
     </screenshot>
+    </figure>
 
     <note>
       <para>A Word of Caution: Since depreciation and tax issues are closely related, you may not always be free
diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index 6d3d445b..e2ebd417 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -327,29 +327,22 @@
         </para>
       </tip>
 
-      <screenshot id="invest_accountspredef">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_AccountsPredef.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_AccountsPredef.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Interest Investment</phrase>
-          </textobject>
-
-          <caption>
-            <para>This is a screen image of the <guilabel>Accounts</guilabel> tab after creating a new file and
-              selecting only the default investment accounts.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>A New File Containinng Only The Default Investment Accounts</title>
+        <screenshot id="invest_accountspredef">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_AccountsPredef.png"
+                          srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This is a screen image of the <guilabel>Accounts</guilabel> tab after creating a new file and
+                selecting only the default investment accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>You will probably at least want to add a <emphasis>Bank</emphasis> account to the <emphasis>Assets</emphasis> account and
         probably an <emphasis>Equity:Opening Balances</emphasis> account, as we have done in
@@ -500,28 +493,21 @@ Income
         should look something like this:
       </para>
 
-      <screenshot id="invest-int">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_int1.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_int1.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Interest Investment</phrase>
-          </textobject>
-
-          <caption>
-            <para>This is an image of the account register after creating and investing in a certificate of deposit investment.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Chart Of Accounts After Investing In A Certificate Of Deposit</title>
+        <screenshot id="invest-int">
+          <mediaobject>
+           <imageobject>
+              <imagedata fileref="figures/invest_int1.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This is an image of the account register after creating and investing in a certificate of deposit investment.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Now, during the course of the next 6 months, you receive monthly bank statements which describe the
         activity of your account. In our fictional example, we do nothing with the money at this
@@ -530,77 +516,64 @@ Income
         should look like these:
       </para>
 
-      <screenshot id="invest-int2">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_int2.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_int2.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Interest Investment</phrase>
-          </textobject>
-
-          <caption>
-            <para>This is an image of the register of the certificate of deposit account after 6 months.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
-
-      <screenshot id="invest-int2-1">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_int2-1.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_int2-1.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Interest Investment</phrase>
-          </textobject>
+      <figure>
+        <title>The CD Account After 6 Months</title>
+        <screenshot id="invest-int2">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/invest_int2.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/invest_int2.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This is an image of the register of the certificate of deposit account after 6 months.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
-          <caption>
-            <para>This is an image of the register of the Savings account after 6 months.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Savings Account After 6 Months</title>
+        <screenshot id="invest-int2-1">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/invest_int2-1.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/invest_int2-1.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This is an image of the register of the Savings account after 6 months.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>And this is the main &app; account window:
       </para>
 
-      <screenshot id="invest-int3">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_int3.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_int3.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Interest Investment</phrase>
-          </textobject>
-
-          <caption>
-            <para>This a screen capture of the accounts after 6 months.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Chart Of Accounts After 6 months</title>
+        <screenshot id="invest-int3">
+          <mediaobject>
+           <imageobject>
+              <imagedata fileref="figures/invest_int3.png"
+                          srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This a screen capture of the accounts after 6 months.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>From the above image of the main &app; account window you see a nice summary of what happened to
         these investments over the 6 months. While the yield on the certificate of deposit is double that of the savings
@@ -682,28 +655,17 @@ Income
         new stock account.
       </para>
 
-      <screenshot id="invest-newaccount">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_newaccount.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_newaccount.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>New Account Window</phrase>
-          </textobject>
-
-          <caption>
-            <para>New Account Window
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The <quote>New Account</quote> Window For AMZN</title>
+        <screenshot id="invest-newaccount">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_newaccount.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <orderedlist>
         <listitem>
@@ -765,28 +727,17 @@ Income
               <para>Select the <guibutton>New</guibutton> button to open the <guilabel>New Security</guilabel> window.
               </para>
 
-              <screenshot id="invest-selectsecurity">
-                <mediaobject>
-                  <imageobject role="html">
-                    <imagedata fileref="figures/invest_selectsecurity.png"
-                                srccredit="Cristian Marchi"/>
-                  </imageobject>
-
-                  <imageobject role="fo">
-                    <imagedata fileref="figures/invest_selectsecurity.png"
-                                srccredit="Cristian Marchi"/>
-                  </imageobject>
-
-                  <textobject>
-                    <phrase>Select Security Window</phrase>
-                  </textobject>
-
-                  <caption>
-                    <para>Select Security Window
-                    </para>
-                  </caption>
-                </mediaobject>
-              </screenshot>
+              <figure>
+                <title>The <quote>Select Security</quote> Window</title>
+                <screenshot id="invest-selectsecurity">
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/invest_selectsecurity.png"
+                                  srccredit="Cristian Marchi"/>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
             </listitem>
 
             <listitem>
@@ -804,8 +755,7 @@ Income
 
                 <listitem>
                   <para>The <guilabel>Symbol/abbreviation:</guilabel> is <userinput>AMZN</userinput>. The symbol is the stock ticker
-                    used in your quote source several lines down on the form. 
-                    <note><para>
+                    used in your quote source several lines down on the form.                    <note><para>
                     Different symbols will be used on different price sources for the same stock, an
                     example is Ericsson on the Stockholm Exchange is ERIC-B while on Yahoo it is
                     ERRICB.ST.</para>
@@ -847,29 +797,18 @@ Income
                   </note>
 
                   <para>Below is what this window should look like when finished:
-                    <screenshot id="invest-newsecurity">
-                      <mediaobject>
-                        <imageobject role="html">
-                          <imagedata fileref="figures/invest_newsecurity.png"
-                                     srccredit="Cristian Marchi" width="&img-w;"/>
-                        </imageobject>
-
-                        <imageobject role="fo">
-                          <imagedata fileref="figures/invest_newsecurity.png"
-                                     srccredit="Cristian Marchi"/>
-                        </imageobject>
-
-                        <textobject>
-                          <phrase>New Security Window</phrase>
-                        </textobject>
-
-                        <caption>
-                          <para>New Security Window
-                          </para>
-                        </caption>
-                      </mediaobject>
-                    </screenshot>
                   </para>
+                  <figure>
+                    <title>The <quote>New Security</quote> Window</title>
+                      <screenshot id="invest-newsecurity">
+                        <mediaobject>
+                          <imageobject>
+                            <imagedata fileref="figures/invest_newsecurity.png"
+                                       srccredit="Cristian Marchi"/>
+                          </imageobject>
+                        </mediaobject>
+                      </screenshot>
+                    </figure>
                 </listitem>
 
                 <listitem>
@@ -935,28 +874,21 @@ Income
         (notice that there are a few extra accounts here, a bank account, and an equity account):
       </para>
 
-      <screenshot id="invest-setup-current">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_setup_current.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_setup_current.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Current Portfolio</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image is after the creation of the first stock account (AMZN).
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Chart of Accounts After The Creation Of The First Stock Account</title>
+        <screenshot id="invest-setup-current">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_setup_current.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image is after the creation of the first stock account (AMZN).
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Open the account register window for this AMZN stock account (double click on it). Here you see the
         <emphasis
@@ -997,29 +929,26 @@ Income
         transaction. Your AMZN Commodity view should now appear like this:
       </para>
 
-      <screenshot id="invest-setup-portfolio1">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_setup_portfolio1.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_setup_portfolio1.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Current Portfolio</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image is the transaction register of the AMZN account after the first stock
-              <quote>purchase</quote>.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Transaction Register Of The AMZN Account After The First Purchase</title>
+        <screenshot id="invest-setup-portfolio1">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/invest_setup_portfolio1.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/invest_setup_portfolio1.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image is the transaction register of the AMZN account after the first stock
+                <quote>purchase</quote>.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Notice that the <guilabel>Balance</guilabel> (last column) is in the units of the commodity (AMZN
         shares) not in currency units. Thus, the balance is 100 (AMZN units) rather than $2,000. This
@@ -1100,29 +1029,26 @@ Income
           Commodity view should now appear like this:
         </para>
 
-        <screenshot id="invest-setup-portfolio2">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/invest_SetupPortfolio2.png"
-                          srccredit="Chris Good" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/invest_SetupPortfolio2.png"
-                          srccredit="Chris Good"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Setup Current Portfolio</phrase>
-            </textobject>
-
-            <caption>
-              <para>This image is of the transaction register of the IBM account after the first stock
-                <quote>purchase</quote> with a commission.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure>
+          <title>The Transaction Register Of The IBM Account After The First Stock Purchase</title>
+          <screenshot id="invest-setup-portfolio2">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/invest_SetupPortfolio2.png"
+                            srccredit="Chris Good" width="&img-w;"/>
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/invest_SetupPortfolio2.png"
+                            srccredit="Chris Good"/>
+              </imageobject>
+              <caption>
+                <para>This image is of the transaction register of the IBM account after the first stock
+                  <quote>purchase</quote> with a commission.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </sect3>
 
       <sect3 id="invest-buy-net">
@@ -1156,29 +1082,26 @@ Income
           transaction. Your IBM Commodity view should now appear like this:
         </para>
 
-        <screenshot id="invest-setup-portfolio3">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/invest_SetupPortfolio3.png"
-                          srccredit="Chris Good" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/invest_SetupPortfolio3.png"
-                          srccredit="Chris Good"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Setup Current Portfolio</phrase>
-            </textobject>
-
-            <caption>
-              <para>This image is of the transaction register of the IBM account after the first stock
-                <quote>purchase</quote> with a commission.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure>
+          <title>The IBM Account After The First Stock Purchase With A Commission</title>
+          <screenshot id="invest-setup-portfolio3">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/invest_SetupPortfolio3.png"
+                           srccredit="Chris Good" width="&img-w;"/>
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/invest_SetupPortfolio3.png"
+                           srccredit="Chris Good"/>
+              </imageobject>
+              <caption>
+                <para>This image is of the transaction register of the IBM account after the first stock
+                  <quote>purchase</quote> with a commission.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </sect3>
     </sect2>
   </sect1>
@@ -1196,8 +1119,7 @@ Income
       <title>Initial Price Database Setup</title>
 
       <para>To use the <guilabel>Price Database</guilabel> to track a stock value, you must initially insert the
-        stock. To do so, open the <guilabel>Price Database</guilabel> 
-        (<menuchoice>
+        stock. To do so, open the <guilabel>Price Database</guilabel> (<menuchoice>
           <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
         </menuchoice>)
         and click on <guibutton>Add</guibutton> button. The first time a Commodity/Stock is
@@ -1273,28 +1195,21 @@ Income
         share.
       </para>
 
-      <screenshot id="invest-peditor">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_peditor.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_peditor.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Price Database</phrase>
-          </textobject>
-
-          <caption>
-            <para>Adding the AMZN commodity to the price database, with an initial value of $40.50 per share.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Entering A Price Into The Database</title>
+        <screenshot id="invest-peditor">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_peditor.png"
+                          srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>Adding the AMZN commodity to the price database, with an initial value of $40.50 per share.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Click <guibutton>OK</guibutton> when finished. Once you have performed this initial placement of the
         commodity into the <guilabel>Price Database</guilabel>, you will not have to do it again, even
@@ -1321,28 +1236,25 @@ Income
         <guibutton>Edit</guibutton> and entering the new price.
       </para>
 
-      <screenshot id="invest-peditor2">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_peditor2.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_peditor2.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Price Database</phrase>
-          </textobject>
-
-          <caption>
-            <para>The main price database window, showing the list of all known commodities.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Price Database With The List Of All Known Commodities</title>
+        <screenshot id="invest-peditor2">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/invest_peditor2.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/invest_peditor2.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>The main price database window, showing the list of all known commodities.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="invest-stockprice-auto2">
@@ -1373,8 +1285,7 @@ Income
             variable.<footnote><simpara>If you’ve installed &app; packages provided by your distribution, <filename>gnc-fq-update</filename> must be on your PATH.</simpara></footnote>
           </simpara>
             <substeps><step id="gnc-fq-update-not-found">
-                <simpara>If <filename>gnc-fq-update</filename> is not in your PATH, search the folder where &app; is 
-                installed.</simpara>
+                <simpara>If <filename>gnc-fq-update</filename> is not in your PATH, search the folder where &app; is                installed.</simpara>
                 </step>
             </substeps>
           </step>
@@ -1387,10 +1298,9 @@ Income
                 <simpara>See <ulink url="https://www.cpan.org/misc/cpan-faq.html">CPAN Frequently Asked Questions</ulink> for details.</simpara></footnote>
               module internally. When you launch the CPAN module for the first time, you must setup and configure it. However, on the most systems if you accept the default settings
               or answer the first question <computeroutput>Are you ready for manual
-              configuration? [yes]</computeroutput> with <userinput>no</userinput>, you will be able to install &app-fq; successfully. 
-              </para>
+              configuration? [yes]</computeroutput> with <userinput>no</userinput>, you will be able to install &app-fq; successfully.              </para>
           </step>
-          
+
           <step><simpara>Run <command>gnc-fq-dump</command> to check &app-fq; works properly.</simpara></step>
         </procedure>
 
@@ -1401,8 +1311,7 @@ Income
           <step><simpara>Install Xcode if it is not installed.</simpara>
               <simpara>XCode is an optional item from your &mac; distribution DVD.</simpara>
           </step>
-          <step><simpara>Run the <emphasis>Update Finance Quote</emphasis> app in the &app; dmg.</simpara> 
-              <para>You can run it from the dmg or copy it to the same
+          <step><simpara>Run the <emphasis>Update Finance Quote</emphasis> app in the &app; dmg.</simpara>              <para>You can run it from the dmg or copy it to the same
                 folder to which you copied &app;.
                 It will open a Terminal window and run a script for you
                 which will ask lots of questions. Accept the default for each unless you know what
@@ -1451,10 +1360,8 @@ Income
 
         <para>The command <command>gnucash-cli --quotes get <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename></command><footnote>
           <simpara>The Online Quotes Retrieval command has been changed from &app; 4.0. The old command
-            <command>gnucash --add-price-quotes <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename></command> is 
-            still available, but it is deprecated and will be removed in the future release.
-            If you've upgraded from &app; 3.11 or previous version, 
-            it is recommended to use the new command <command>gnucash-cli</command>.</simpara>
+            <command>gnucash --add-price-quotes <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename></command> is            still available, but it is deprecated and will be removed in the future release.
+            If you've upgraded from &app; 3.11 or previous version,            it is recommended to use the new command <command>gnucash-cli</command>.</simpara>
           </footnote> can be used to
           fetch the current prices of your stocks. The file specified
           <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename> will depend on the name and
@@ -1464,12 +1371,12 @@ Income
           the name of the currently open file.
         </para>
 
-        
+
       </sect3>
 
       <sect3 id="invest-stockprice-auto-scheduler">
         <title>Configuring for Getting Online Quotes Periodically</title>
-        
+
         <para>You have to register the <command>gnucash-cli</command> with a scheduler in order to get Online Quotes automatically and periodically.
           The method depends on your OS. For example, suppose you want to update
           your file on 16:00 on every Friday.
@@ -1492,8 +1399,7 @@ Income
           <step><simpara>Enter the appropirate items on <guilabel>Create Task</guilabel> Window.</simpara></step>
         </procedure>
 
-        <para>See <ulink url="&url-docs-C;help/acct-create.html#Online-price-setup">GnuCash Help Manual</ulink> 
-          and <ulink url="&url-wiki-OQ;#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page on GnuCash Wiki</ulink> for more details.
+        <para>See <ulink url="&url-docs-C;help/acct-create.html#Online-price-setup">GnuCash Help Manual</ulink>          and <ulink url="&url-wiki-OQ;#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page on GnuCash Wiki</ulink> for more details.
         </para>
 
         <para>Remember that Mutual Fund <quote>prices</quote> are really <quote>Net Asset Value</quote> and
@@ -1519,28 +1425,21 @@ Income
         commodities in the report currency.
       </para>
 
-      <screenshot id="invest-stockvalue">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_stockvalue.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_stockvalue.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Viewing Stock Value</phrase>
-          </textobject>
-
-          <caption>
-            <para>Viewing the value of a stock commodity in the main window using the Total in Report Currency option.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Displaying Stock Values in the Chart of Accounts</title>
+        <screenshot id="invest-stockvalue">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_stockvalue.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>Viewing the value of a stock commodity in the main window using the Total in Report Currency option.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="invest-stockprice-report">
@@ -1557,24 +1456,22 @@ Income
         report the selector may appear in either the <guilabel>General</guilabel>, the
         <guilabel>Commodities</guilabel>, or the <guilabel>Display</guilabel> tab of the
         <guilabel>Report Options</guilabel> dialog box.
+      </para>
+      <note>
+        <simpara>In the example the report can be customized using the
+          <menuchoice><guimenu>Reports</guimenu><guisubmenu>Assets & Liabilities</guisubmenu><guimenuitem>Average Balance</guimenuitem></menuchoice> menu.
+        </simpara>
+      </note>
 
-        <note>
-          <simpara>In the example the report can be customized using the  
-            <menuchoice><guimenu>Reports</guimenu><guisubmenu>Assets & Liabilities</guisubmenu><guimenuitem>Average Balance</guimenuitem></menuchoice> menu.
-          </simpara>
-        </note>
-      </para> 
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Determining The Source Of The Stock Price/Currency Exchange Rate in Reports</title>
         <screenshot id="invest-stockvalue-report-options">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockvalue_report_options.png"
-                       srccredit="John Ralls"/>
+                         srccredit="John Ralls"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Determining Stock Price/Currency Exchange Rate Source in Reports</phrase>
-            </textobject>
-
             <caption>
               <para>Determining the value of a stock commodity or a currency other than the report currency in a report
                 by setting the Price Source option.
@@ -1582,33 +1479,34 @@ Income
             </caption>
           </mediaobject>
         </screenshot>
-   
+      </figure>
 
       <variablelist>
-      <varlistentry>
-        <term><guilabel>Weighted Average</guilabel></term>        
-        <listitem><para>Calculates the price by summing the absolute value of the
-              amount and the absolute value of every split in every account denominated in the
-              commodity, excluding those splits with a zero amount, and dividing the sum of values
-              by the sum of amounts to obtain a price. For example, if you had a buy transaction for
-              200 shares of XYZ for a total of 2000 and a sell of 100 for 1300 the weighted average
-              would be 3300/300 or 11/share.
+        <varlistentry>
+          <term><guilabel>Weighted Average</guilabel></term>
+          <listitem><para>Calculates the price by summing the absolute value of the
+            amount and the absolute value of every split in every account denominated in the
+            commodity, excluding those splits with a zero amount, and dividing the sum of values
+            by the sum of amounts to obtain a price. For example, if you had a buy transaction for
+            200 shares of XYZ for a total of 2000 and a sell of 100 for 1300 the weighted average
+            would be 3300/300 or 11/share.
+            </para>
             <note>
               <para>Gain/Loss splits have an amount of 0 and are <emphasis>not</emphasis> included in this calculation.
               </para>
             </note>
-          </para>
-        </listitem>
-      </varlistentry>
+          </listitem>
+        </varlistentry>
 
-      <varlistentry>
-        <term><guilabel>Average Cost</guilabel></term>
-        <listitem><para>Calculates the price by summing the amounts and values of every
+        <varlistentry>
+          <term><guilabel>Average Cost</guilabel></term>
+          <listitem><para>Calculates the price by summing the amounts and values of every
             split in every account denominated in the commodity, including the zero amount splits.
             In the example above, with an additional split (either part of the sale transaction or
             in a separate transaction) booking the gain at 0 shares and a 300 gain, the average
             cost is 1000/100 (2000 original cost − 1300 proceeds from the sale + 300 gain)/(200 −
             100) shares or 10/share.
+            </para>
             <note>
               <itemizedlist>
                 <listitem><simpara>Gain/Loss splits <emphasis>are</emphasis> included in this calculation.</simpara></listitem>
@@ -1617,46 +1515,42 @@ Income
               <emphasis>must</emphasis> correctly book your gains and losses.</simpara></listitem>
               </itemizedlist>
             </note>
-          </para>
-        </listitem>
-      </varlistentry>
+          </listitem>
+        </varlistentry>
 
-      <varlistentry>
-        <term><guilabel>Most Recent</guilabel></term>
-        <listitem><para>Uses the latest price from the price database.</para></listitem>
-      </varlistentry>
+        <varlistentry>
+          <term><guilabel>Most Recent</guilabel></term>
+          <listitem><para>Uses the latest price from the price database.</para></listitem>
+        </varlistentry>
 
-      <varlistentry>
-        <term><guilabel>Nearest in time</guilabel></term>
-        <listitem><para>Uses the price nearest in time to the report date—the
+        <varlistentry>
+          <term><guilabel>Nearest in time</guilabel></term>
+          <listitem><para>Uses the price nearest in time to the report date—the
             datum date for time series reports like <guilabel>Assets Over
             Time</guilabel>—from the price database.
               <note>
                 <simpara>The nearest date isn’t necessarily before the date in question.</simpara>
               </note>
             </para>
-        </listitem>
-      </varlistentry>
-      </variablelist>        
-        
-      <screenshot id="invest-stockvalue-report">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_stockvalue_report.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An Asset Barchart Report based on the <guilabel>Nearest in time</guilabel> Price
-            Source.</phrase>
-          </textobject>
+          </listitem>
+        </varlistentry>
+      </variablelist>
 
-          <caption>
-            <para>Tracking what value your stocks would’ve had on the stock exchanges.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>An Asset Barchart Report Based On The <quote>Nearest In Time</quote> Price Source</title>
+        <screenshot id="invest-stockvalue-report">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_stockvalue_report.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>Tracking what value your stocks would’ve had on the stock exchanges.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
   </sect1>
 
@@ -1817,13 +1711,9 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -1944,309 +1834,282 @@ Income
             </tgroup>
           </table>
 
-      <example>
-
-        <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined,
-          Gross Pricing</title>
-      
-        <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
-        <para>
-        You bought 100 shares of AMZN for $20 per share, then later sell them all for $36
-          per share with a commission of $75. The split transaction scheme is as follows:
-          <itemizedlist>
-            <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
-            <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
-            <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
-            <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
-            <listitem><simpara>and finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
-          </itemizedlist>
-        </para>
-        <para>
-        <table>
-          <title>Selling Shares Split Scheme, Sale & Gain Combined, Gross Pricing</title>
+          <example>
+            <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined,
+              Gross Pricing</title>
 
-<?dbfo table-width="70%" ?>
-          <tgroup cols="5">
-            <colspec colnum="1" colwidth="4*"/>
+            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
+            <para>You bought 100 shares of AMZN for $20 per share, then later sell them all for $36
+              per share with a commission of $75. The split transaction scheme is as follows:
+              <itemizedlist>
+                <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
+                <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
+                <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
+                <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
+                <listitem><simpara>and finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
+              </itemizedlist>
+            </para>
+            <para><!-- Hack to get a figure inside of an example -->
+              <table>
+                <title>Selling Shares Split Scheme, Sale & Gain Combined, Gross Pricing</title>
+                <?dbfo table-width="70%" ?>
+                <tgroup cols="5">
+                  <colspec colnum="1" colwidth="4*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+                  <colspec colnum="1" colwidth="1*"/>
 
-            <colspec colnum="1" colwidth="2*"/>
+                  <tbody>
+                    <row>
+                      <entry>
+                        <emphasis>Account</emphasis>
+                      </entry>
 
-            <colspec colnum="1" colwidth="2*"/>
+                      <entry>
+                        <emphasis>Shares</emphasis>
+                      </entry>
 
-            <colspec colnum="1" colwidth="1*"/>
+                      <entry>
+                        <emphasis>Price</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Buy</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Sell</emphasis>
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Bank ABC
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3525.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        1600.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Expenses:Commission
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        75.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        −100
+                      </entry>
+
+                      <entry>
+                        36.00
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3600.00
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Income:Capital Gain (Long Term):AMZN
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        1600.00
+                      </entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </table>
+              <figure pgwide="1">
+                <title>Selling Shares, Gain Combined, Gross Pricing</title>
+                <screenshot id="invest-sellstockManProfComb">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest_sellstock.png"
+                                 srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/invest_sellstock.png"
+                                 srccredit="Chris Good"/>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+              <note>
+                <para>In the above screenshot, it appears there are 2 transactions for Mar. 21, 2006. This is because the
+                  register is in <guilabel> Auto-Split Ledger</guilabel> view and there are 2 splits for
+                  the register account in the 1 transaction. <guilabel>Transaction Journal</guilabel>
+                  view may be clearer. Refer to <xref linkend="txns-registers-txntypes" />. As there are 2
+                  splits for the register account in the sale transaction, this transaction must be
+                  entered in <guilabel>Auto-Split Ledger</guilabel> or <guilabel>Transaction
+                  Journal</guilabel> view. It cannot be entered in <guilabel>Basic Ledger</guilabel> view.
+                </para>
+              </note>
+              <figure pgwide="1">
+                <title>The Account Tree after the Example of Selling Shares for a Gain</title>
+                <screenshot id="invest-sellstockManProfComb2">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest_sellstock2.png"
+                                 srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/invest_sellstock2.png"
+                                 srccredit="Chris Good"/>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </para>
+          </example>
+        </sect4>
 
-            <colspec colnum="1" colwidth="1*"/>
+        <sect4 id="invest-sell-man-comb-net">
+          <title>Combined, Net Pricing</title>
 
-            <tbody>
-              <row>
-                <entry>
-                  <emphasis>Account</emphasis>
-                </entry>
+          <table>
+            <title>Selling Shares Split Scheme, Sale and Capital Gain/Loss Are Combined, Net Pricing</title>
 
-                <entry>
-                  <emphasis>Shares</emphasis>
-                </entry>
+            <tgroup cols="5">
+              <colspec colnum="1" colwidth="2*"/>
+              <colspec colnum="1" colwidth="2*"/>
+              <colspec colnum="1" colwidth="2*"/>
+              <colspec colnum="1" colwidth="2*"/>
+              <colspec colnum="1" colwidth="2*"/>
 
-                <entry>
-                  <emphasis>Price</emphasis>
-                </entry>
+              <tbody>
+                <row>
+                  <entry>
+                    <emphasis>Account</emphasis>
+                  </entry>
 
-                <entry>
-                  <emphasis>Buy</emphasis>
-                </entry>
+                  <entry>
+                    <emphasis>Number of Shares</emphasis>
+                  </entry>
 
-                <entry>
-                  <emphasis>Sell</emphasis>
-                </entry>
-              </row>
+                  <entry>
+                    <emphasis>Share Price</emphasis>
+                  </entry>
 
-              <row>
-                <entry>
-                  Assets:Bank ABC
-                </entry>
+                  <entry>
+                    <emphasis>Total Buy</emphasis>
+                  </entry>
 
-                <entry></entry>
+                  <entry>
+                    <emphasis>Total Sell</emphasis>
+                  </entry>
+                </row>
 
-                <entry></entry>
+                <row>
+                  <entry>
+                    Assets:Bank ABC
+                  </entry>
 
-                <entry>
-                  3525.00
-                </entry>
+                  <entry></entry>
 
-                <entry></entry>
-              </row>
+                  <entry></entry>
 
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
+                  <entry>
+                    NET_SALE
+                  </entry>
 
-                <entry>
-                  0
-                </entry>
+                  <entry></entry>
+                </row>
 
-                <entry>
-                  0
-                </entry>
+                <row>
+                  <entry>
+                    Assets:Stock:SYMBOL
+                  </entry>
 
-                <entry>
-                  1600.00
-                </entry>
+                  <entry>
+                    0
+                  </entry>
 
-                <entry></entry>
-              </row>
+                  <entry>
+                    0
+                  </entry>
 
-              <row>
-                <entry>
-                  Expenses:Commission
-                </entry>
+                  <entry>
+                    NET_PROFIT
+                  </entry>
 
-                <entry></entry>
+                  <entry>
+                    (Loss)
+                  </entry>
+                </row>
 
-                <entry></entry>
+                <row>
+                  <entry>
+                    Assets:Stock:SYMBOL
+                  </entry>
 
-                <entry>
-                  75.00
-                </entry>
+                  <entry>
+                    −NUM_SHARES
+                  </entry>
 
-                <entry></entry>
-              </row>
+                  <entry>
+                    NET_SELL_PRICE
+                  </entry>
 
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
+                  <entry></entry>
 
-                <entry>
-                  −100
-                </entry>
-
-                <entry>
-                  36.00
-                </entry>
-
-                <entry></entry>
-
-                <entry>
-                  3600.00
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Income:Capital Gain (Long Term):AMZN
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  1600.00
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-        </para>
-        <para>
-          <figure pgwide="1">
-          <title>Selling Shares, Gain Combined, Gross Pricing</title>
-          <screenshot id="invest-sellstockManProfComb">
-            <mediaobject>
-              <imageobject role="html">
-                <imagedata fileref="figures/invest_sellstock.png"
-                           srccredit="Chris Good" width="&img-w;"/>
-              </imageobject>
-
-              <imageobject role="fo">
-                <imagedata fileref="figures/invest_sellstock.png"
-                           srccredit="Chris Good"/>
-              </imageobject>
-    
-              <textobject><phrase>Selling Shares,Gain Combined, Gross Pricing</phrase></textobject>
-    
-            </mediaobject>
-          </screenshot>
-          </figure>
-          <note>
-            <para>In the above screenshot, it appears there are 2 transactions for Mar. 21, 2006. This is because the
-              register is in <guilabel> Auto-Split Ledger</guilabel> view and there are 2 splits for
-              the register account in the 1 transaction. <guilabel>Transaction Journal</guilabel>
-              view may be clearer. Refer to <xref linkend="txns-registers-txntypes" />. As there are 2
-              splits for the register account in the sale transaction, this transaction must be
-              entered in <guilabel>Auto-Split Ledger</guilabel> or <guilabel>Transaction
-              Journal</guilabel> view. It cannot be entered in <guilabel>Basic Ledger</guilabel> view.
-            </para>
-          </note>
-        </para>
-        <para>
-          <figure pgwide="1">
-            <title>the Account Tree after the Example of Selling Shares for a Gain</title>
-            <screenshot id="invest-sellstockManProfComb2">
-              <mediaobject>
-                <imageobject role="html">
-                  <imagedata fileref="figures/invest_sellstock2.png"
-                             srccredit="Chris Good" width="&img-w;"/>
-                  </imageobject>
-
-                  <imageobject role="fo">
-                    <imagedata fileref="figures/invest_sellstock2.png"
-                               srccredit="Chris Good"/>
-                  </imageobject>
-
-                  <textobject><phrase>Selling Shares Example</phrase></textobject>
-        
-              </mediaobject>
-            </screenshot>
-          </figure>
-        </para>
-
-   </example>
-
-
-
-        </sect4>
-
-        <sect4 id="invest-sell-man-comb-net">
-          <title>Combined, Net Pricing</title>
-
-          <table>
-            <title>Selling Shares Split Scheme, Sale and Capital Gain/Loss Are Combined, Net Pricing</title>
-
-            <tgroup cols="5">
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <tbody>
-                <row>
-                  <entry>
-                    <emphasis>Account</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Number of Shares</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Share Price</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Total Buy</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Total Sell</emphasis>
-                  </entry>
-                </row>
-
-                <row>
-                  <entry>
-                    Assets:Bank ABC
-                  </entry>
-
-                  <entry></entry>
-
-                  <entry></entry>
-
-                  <entry>
-                    NET_SALE
-                  </entry>
-
-                  <entry></entry>
-                </row>
-
-                <row>
-                  <entry>
-                    Assets:Stock:SYMBOL
-                  </entry>
-
-                  <entry>
-                    0
-                  </entry>
-
-                  <entry>
-                    0
-                  </entry>
-
-                  <entry>
-                    NET_PROFIT
-                  </entry>
-
-                  <entry>
-                    (Loss)
-                  </entry>
-                </row>
-
-                <row>
-                  <entry>
-                    Assets:Stock:SYMBOL
-                  </entry>
-
-                  <entry>
-                    −NUM_SHARES
-                  </entry>
-
-                  <entry>
-                    NET_SELL_PRICE
-                  </entry>
-
-                  <entry></entry>
-
-                  <entry>
-                    NET_SALE
-                  </entry>
-                </row>
+                  <entry>
+                    NET_SALE
+                  </entry>
+                </row>
 
                 <row>
                   <entry>
@@ -2268,161 +2131,150 @@ Income
               </tbody>
             </tgroup>
           </table>
-          
-                <example>
-        <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined, Net Pricing</title>
-        <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
-        <para>You bought 100 shares of AMZN for $20 per share (including commissions), then later
-          sell them all for $36 per share with a commission of $75. The split transaction scheme
-          is as follows:
-          <itemizedlist>
-            <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
-            <listitem><simpara>NET_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
-            <listitem><simpara>NET_BUY is $2,000 (the original buying cost),</simpara></listitem>
-            <listitem><simpara>NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)),</simpara></listitem>
-            <listitem><simpara>GROSS_SALE is $3,600, NET_SALE is $3,525,</simpara></listitem>
-            <listitem><simpara>and finally NET_PROFIT is $1,525 (NET_SALE − NET_BUY).</simpara></listitem>
-          </itemizedlist>
-        </para>
 
-        <para>
-            <table>
-              <title>Selling Shares Split Scheme, Sale & Gain Combined, Net Pricing</title>
-<?dbfo table-width="70%" ?>
-              <tgroup cols="5">
-                <colspec colnum="1" colwidth="4*"/>
-    
-                <colspec colnum="1" colwidth="2*"/>
-    
-                <colspec colnum="1" colwidth="2*"/>
-    
-                <colspec colnum="1" colwidth="1*"/>
-    
-                <colspec colnum="1" colwidth="1*"/>
-    
-                <tbody>
-                  <row>
-                    <entry>
-                      <emphasis>Account</emphasis>
-                    </entry>
-    
-                    <entry>
-                      <emphasis>Shares</emphasis>
-                    </entry>
-    
-                    <entry>
-                      <emphasis>Price</emphasis>
-                    </entry>
-    
-                    <entry>
-                      <emphasis>Buy</emphasis>
-                    </entry>
-    
-                    <entry>
-                      <emphasis>Sell</emphasis>
-                    </entry>
-                  </row>
-    
-                  <row>
-                    <entry>
-                      Assets:Bank ABC
-                    </entry>
-    
-                    <entry></entry>
-    
-                    <entry></entry>
-    
-                    <entry>
-                      3525.00
-                    </entry>
-    
-                    <entry></entry>
-                  </row>
-    
-                  <row>
-                    <entry>
-                      Assets:Brokerage Account:Stock:AMZN
-                    </entry>
-    
-                    <entry>
-                      0
-                    </entry>
-    
-                    <entry>
-                      0
-                    </entry>
-    
-                    <entry>
-                      1525.00
-                    </entry>
-    
-                    <entry></entry>
-                  </row>
-    
-                  <row>
-                    <entry>
-                      Assets:Brokerage Account:Stock:AMZN
-                    </entry>
-    
-                    <entry>
-                      −100
-                    </entry>
-    
-                    <entry>
-                      35.25
-                    </entry>
-    
-                    <entry></entry>
-    
-                    <entry>
-                      3525.00
-                    </entry>
-                  </row>
-    
-                  <row>
-                    <entry>
-                      Income:Capital Gain (Long Term):AMZN
-                    </entry>
-    
-                    <entry></entry>
-    
-                    <entry></entry>
-    
-                    <entry></entry>
-    
-                    <entry>
-                      1525.00
-                    </entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-        </para>
+          <example>
+            <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined, Net Pricing</title>
+            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
+            <para>You bought 100 shares of AMZN for $20 per share (including commissions), then later
+              sell them all for $36 per share with a commission of $75. The split transaction scheme
+              is as follows:
+              <itemizedlist>
+                <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
+                <listitem><simpara>NET_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
+                <listitem><simpara>NET_BUY is $2,000 (the original buying cost),</simpara></listitem>
+                <listitem><simpara>NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)),</simpara></listitem>
+                <listitem><simpara>GROSS_SALE is $3,600, NET_SALE is $3,525,</simpara></listitem>
+                <listitem><simpara>and finally NET_PROFIT is $1,525 (NET_SALE − NET_BUY).</simpara></listitem>
+              </itemizedlist>
+            </para>
+
+            <para><!-- Hack to get a figures and tables inside of an example -->
+              <table>
+                <title>Selling Shares Split Scheme, Sale & Gain Combined, Net Pricing</title>
+                <?dbfo table-width="70%" ?>
+                <tgroup cols="5">
+                  <colspec colnum="1" colwidth="4*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+
+                  <tbody>
+                    <row>
+                      <entry>
+                        <emphasis>Account</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Shares</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Price</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Buy</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Sell</emphasis>
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Bank ABC
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3525.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        1525.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        −100
+                      </entry>
+
+                      <entry>
+                        35.25
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3525.00
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Income:Capital Gain (Long Term):AMZN
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        1525.00
+                      </entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </table>
+
+              <figure pgwide="1">
+                <title>Selling Shares for Gain using Net Pricing in Transaction Journal View</title>
+                <screenshot id="invest-sellstockManProfCombNet">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
+                                 srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
+                                 srccredit="Chris Good"/>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </para>
+          </example>
 
-        <para>
-          <figure pgwide="1">
-            <title>Selling Shares for Gain using Net Pricing in Transaction Journal View</title>
-            <screenshot id="invest-sellstockManProfCombNet">
-              <mediaobject>
-                <imageobject role="html">
-                  <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
-                              srccredit="Chris Good" width="&img-w;"/>
-                </imageobject>
-    
-                <imageobject role="fo">
-                  <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
-                              srccredit="Chris Good"/>
-                </imageobject>
-    
-                <textobject><phrase>Selling Shares Example</phrase></textobject>
-    
-              </mediaobject>
-            </screenshot>
-          </figure>
-        </para>        
-      </example>
-          
-          
         </sect4>
       </sect3>
 
@@ -2442,13 +2294,9 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -2535,13 +2383,9 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -2609,218 +2453,198 @@ Income
               </tbody>
             </tgroup>
           </table>
-      <example>
-        <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated, Gross Pricing</title>
-        <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
-
-        <para>You bought 100 shares of AMZN for $20 per share and commissions $20, then later sell them all for
-          $36 per share with a commission of $75. The split transaction scheme is as follows:
-          <itemizedlist>
-            <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
-            <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
-            <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
-            <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
-            <listitem><simpara>finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
-          </itemizedlist>
-        </para>
-
-        <para>
-        <table>
-          <title>Selling Shares Split Scheme, Sale Transaction, Gross Pricing</title>
-<?dbfo table-width="70%" ?>
-          <tgroup cols="5">
-            <colspec colnum="1" colwidth="4*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <tbody>
-              <row>
-                <entry>
-                  <emphasis>Account</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Shares</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Price</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Buy</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Sell</emphasis>
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Bank ABC
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  3525.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Expenses:Commission
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  75.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
-
-                <entry>
-                  −100
-                </entry>
-
-                <entry>
-                  36.00
-                </entry>
-
-                <entry></entry>
-
-                <entry>
-                  3600.00
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-        </para>
-        
-        <para>
-        <table>
-          <title>Selling Shares Split Scheme, Gain Transaction, Gross Pricing</title>
-<?dbfo table-width="70%" ?>
-          <tgroup cols="5">
-            <colspec colnum="1" colwidth="4*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <tbody>
-              <row>
-                <entry>
-                  <emphasis>Account</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Shares</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Price</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Buy</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Sell</emphasis>
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
-
-                <entry>
-                  0
-                </entry>
-
-                <entry>
-                  0
-                </entry>
-
-                <entry>
-                  1600.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Income:Capital Gain (Long Term):AMZN
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  1600.00
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-        </para>
-        <para>
-        <figure pgwide="1">
-        <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions,
-                in <guilabel>Transaction Journal</guilabel> View</title>
-        <screenshot id="invest-sellstockManProfSep">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                          srccredit="Chris Good" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                          srccredit="Chris Good"/>
-            </imageobject>
-
-            <textobject><phrase>Selling Shares Example</phrase></textobject>
-
-          </mediaobject>
-        </screenshot>
-        </figure>
-        </para>
-      </example>
-
+          <example>
+            <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated, Gross Pricing</title>
+            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
 
+            <para>You bought 100 shares of AMZN for $20 per share and commissions $20, then later sell them all for
+              $36 per share with a commission of $75. The split transaction scheme is as follows:
+              <itemizedlist>
+                <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
+                <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
+                <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
+                <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
+                <listitem><simpara>finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
+              </itemizedlist>
+            </para>
 
+            <para>
+              <table>
+                <title>Selling Shares Split Scheme, Sale Transaction, Gross Pricing</title>
+                <?dbfo table-width="70%" ?>
+                <tgroup cols="5">
+                  <colspec colnum="1" colwidth="4*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+
+                  <tbody>
+                    <row>
+                      <entry>
+                        <emphasis>Account</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Shares</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Price</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Buy</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Sell</emphasis>
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Bank ABC
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3525.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Expenses:Commission
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        75.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        −100
+                      </entry>
+
+                      <entry>
+                        36.00
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3600.00
+                      </entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </table>
+              <table>
+                <title>Selling Shares Split Scheme, Gain Transaction, Gross Pricing</title>
+      <?dbfo table-width="70%" ?>
+                <tgroup cols="5">
+                  <colspec colnum="1" colwidth="4*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+
+                  <tbody>
+                    <row>
+                      <entry>
+                        <emphasis>Account</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Shares</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Price</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Buy</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Sell</emphasis>
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        1600.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Income:Capital Gain (Long Term):AMZN
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        1600.00
+                      </entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </table>
+              <figure pgwide="1">
+                <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions,
+                        in <guilabel>Transaction Journal</guilabel> View</title>
+                <screenshot id="invest-sellstockManProfSep">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest_sellstockManProfSep.png"
+                                 srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
+                     <imageobject role="fo">
+                      <imagedata fileref="figures/invest_sellstockManProfSep.png"
+                                 srccredit="Chris Good"/>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </para>
+          </example>
         </sect4>
 
         <sect4 id="invest-sell-man-sep-net">
@@ -2831,13 +2655,9 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -2908,13 +2728,9 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -3005,13 +2821,9 @@ Income
 <?dbfo table-width="70%" ?>
           <tgroup cols="5">
             <colspec colnum="1" colwidth="4*"/>
-
             <colspec colnum="1" colwidth="2*"/>
-
             <colspec colnum="1" colwidth="2*"/>
-
             <colspec colnum="1" colwidth="1*"/>
-
             <colspec colnum="1" colwidth="1*"/>
 
             <tbody>
@@ -3076,20 +2888,16 @@ Income
           </tgroup>
         </table>
         </para>
-        
+
         <para>
         <table>
           <title>Selling Shares Split Scheme, Gain Transaction, Net Pricing</title>
 <?dbfo table-width="70%" ?>
           <tgroup cols="5">
             <colspec colnum="1" colwidth="4*"/>
-
             <colspec colnum="1" colwidth="2*"/>
-
             <colspec colnum="1" colwidth="2*"/>
-
             <colspec colnum="1" colwidth="1*"/>
-
             <colspec colnum="1" colwidth="1*"/>
 
             <tbody>
@@ -3152,10 +2960,7 @@ Income
               </row>
             </tbody>
           </tgroup>
-        </table>
-        </para>
-        
-        <para>
+        </table>
         <figure pgwide="1">
           <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions,
                     in <guilabel>Transaction Journal</guilabel> View</title>
@@ -3163,17 +2968,12 @@ Income
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/invest_sellstockManProfSepNet.png"
-                              srccredit="Chris Good" width="&img-w;"/>
+                             srccredit="Chris Good" width="&img-w;"/>
                 </imageobject>
-    
                 <imageobject role="fo">
                   <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                              srccredit="Chris Good"/>
+                             srccredit="Chris Good"/>
                 </imageobject>
-    
-                <textobject><phrase>Selling Shares Example</phrase>
-                
-                </textobject>
               </mediaobject>
             </screenshot>
         </figure>
@@ -3191,13 +2991,12 @@ Income
       <sect3 id="invest-sellLotsIntro">
         <title>Introduction</title>
 
-        <para><ulink url="&url-wp-en;Lot">Wikipedia</ulink> includes the following definition of a lot.
+        <para><ulink url="&url-wp-en;Lot">Wikipedia</ulink> includes the following definition of a lot:
+          <blockquote>
+            <simpara>a set of goods for sale together in an auction; or a quantity of a financial instrument</simpara>
+          </blockquote>
         </para>
 
-        <blockquote>
-          <simpara>a set of goods for sale together in an auction; or a quantity of a financial instrument</simpara>
-        </blockquote>
-
         <para>&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 specifically, a lot is used to link
@@ -3214,8 +3013,7 @@ Income
           To see the <guimenuitem>Trial Balance</guimenuitem>, select <menuchoice>
             <guimenu>Reports</guimenu> <guisubmenu>Income & Expense</guisubmenu>
             <guimenuitem>Trial Balance</guimenuitem>
-          </menuchoice>. 
-        </para>
+          </menuchoice>.        </para>
 
         <note>
           <para>If you make an error, you can delete the lot(s) and capital gain/loss transaction(s) and retry.
@@ -3260,7 +3058,7 @@ Income
         <para>To open the <guilabel>Lots in Account</guilabel> window, open the security account register, then
           select
           <menuchoice>
-            <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
+            <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
           </menuchoice>.
         </para>
 
@@ -3271,16 +3069,10 @@ Income
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
                 srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
                            srccredit="Chris Good"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Example of Lots in Account window</phrase>
-              </textobject>
-
               <caption>
                 <para>An image of the <emphasis>Lots in Account</emphasis> window.
                 </para>
@@ -3290,9 +3082,8 @@ Income
         </figure>
 
         <para>Refer to the Help Manual, Chapter 8 Tools & Assistants,
-          <ulink
-url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html">
-          Lots in Account </ulink> for details of the Lots in Account screen elements.
+          <ulink url="&url-docs;/C/gnucash-help/tool-lots.html">Lots in Account</ulink>
+          for details of the Lots in Account screen elements.
         </para>
       </sect3>
 
@@ -3397,7 +3188,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
 
         <para>Running a Trial Balance report (
           <menuchoice>
-            <guimenu>Reports</guimenu> <guisubmenu>Income & Expense</guisubmenu>
+            <guimenu>Reports</guimenu><guisubmenu>Income & Expense</guisubmenu>
             <guimenuitem>Trial Balance</guimenuitem>
           </menuchoice>
           ) after creating capital gain/loss transactions, is a basic check that capital
@@ -3634,18 +3425,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of security register before lot scrubbing</phrase>
-                  </textobject>
-
                   <caption>
                     <simpara>An image of the Security Account register in transaction journal view, before lot scrubbing.</simpara>
                   </caption>
@@ -3653,16 +3438,14 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
               </screenshot>
             </figure>
           </step>
- 
           <step>
             <simpara>Ensure all previous capital gain/loss transactions are separate transactions to the sell
               transactions which record the reduction in the number of shares and the value
               received.</simpara>
           </step>
- 
           <step><simpara>Select
               <menuchoice>
-                <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
+                <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
               </menuchoice>
               to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
               security account.
@@ -3673,18 +3456,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of Lots in Account window before lot scrubbing</phrase>
-                  </textobject>
-
                   <caption>
                     <para>An image of the <emphasis>Lots in Account</emphasis> window before lot scrubbing.
                     </para>
@@ -3737,18 +3514,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of Lots in Account window before scrubbing a single lot</phrase>
-                  </textobject>
-
                   <caption>
                     <simpara>An image of the <emphasis>Lots in Account</emphasis> window before scrubbing a single lot.</simpara>
                   </caption>
@@ -3776,18 +3547,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of Register after scrubbing a single lot</phrase>
-                  </textobject>
-
                   <caption>
                     <simpara>An image of the Register after scrubbing a single lot.</simpara>
                   </caption>
@@ -3799,11 +3564,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
           <step>
             <simpara>Continue to <xref linkend="invest-sellChgCapGainsAcct" />.</simpara>
           </step>
-        
+
         </procedure>
       </example>
 
-      
+
       <example id="invest-sellAutoExample">
         <title>Automatic Creation of Capital Gain Or Loss Transactions</title>
 
@@ -3875,18 +3640,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                  srccredit="Chris Good" width="&img-w;"/>
+                             srccredit="Chris Good" width="&img-w;"/>
                 </imageobject>
-  
                 <imageobject role="fo">
                   <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
                              srccredit="Chris Good"/>
                 </imageobject>
-  
-                <textobject>
-                  <phrase>Example of security register before Scrub Account is used. </phrase>
-                </textobject>
-  
                 <caption>
                   <simpara>An image of the Security Account register in transaction journal view, before Scrub Account is used.</simpara>
                 </caption>
@@ -3898,7 +3657,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <procedure>
           <step><simpara>Select
               <menuchoice>
-                <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
+                <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
               </menuchoice>
               to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
               security account.</simpara>
@@ -3908,19 +3667,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of Lots in Account window before Scrub Account is used.
-                    </phrase>
-                  </textobject>
-
                   <caption>
                     <simpara>An image of the <emphasis>Lots in Account</emphasis> window before Scrub Account is used.</simpara>
                   </caption>
@@ -3937,18 +3689,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of Lots in Account window after using Scrub Account</phrase>
-                  </textobject>
-
                   <caption>
                     <para>An image of the <emphasis>Lots in Account </emphasis> window after using Scrub Account.
                     </para>
@@ -3963,7 +3709,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 reopened so all the lots show.
               </para>
             </note>
-          </step>        
+          </step>
 
           <step>
             <simpara>Close the <guilabel>Lots in Account SSSS</guilabel> window and return to the security account register.</simpara>
@@ -3973,18 +3719,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of security register after using Scrub Account</phrase>
-                  </textobject>
-
                   <caption>
                     <para>An image of the <emphasis>security register</emphasis> after using Scrub Account.
                     </para>
@@ -4022,18 +3762,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                srccredit="Chris Good" width="&img-w;"/>
+                           srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitReg.png"
                            srccredit="Chris Good"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Example of security register after Scrub Account is used. </phrase>
-              </textobject>
-
               <caption>
                 <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
                 </para>
@@ -4047,18 +3781,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                srccredit="Chris Good" width="&img-w;"/>
+                           srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
                            srccredit="Chris Good"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Example of security register after Scrub Account is used. </phrase>
-              </textobject>
-
               <caption>
                 <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
                 </para>
@@ -4072,18 +3800,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                srccredit="Chris Good" width="&img-w;"/>
+                           srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
                            srccredit="Chris Good"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Example of security register after Scrub Account is used. </phrase>
-              </textobject>
-
               <caption>
                 <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
                 </para>
@@ -4130,18 +3852,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of security register after scrubbing a single lot </phrase>
-                  </textobject>
-
                   <caption>
                     <para>An image of the <emphasis>security register</emphasis> after scrubbing a single lot.
                     </para>
@@ -4153,10 +3869,10 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
 
           <step>
             <simpara>Find each new <emphasis>Realized Gain/Loss</emphasis> transaction in the security account register
-              (they will have the same date as the sell transactions). 
-              </simpara>
+              (they will have the same date as the sell transactions).
+            </simpara>
           </step>
-          
+
           <step>
             <simpara>Edit the <emphasis>Orphaned Gains-CCC</emphasis> transaction split to re-assign the income account to a more
               meaningful income (or expense) gain or loss account (for example, <emphasis>Income:Capital Gain (Long Term):IBM</emphasis>).</simpara>
@@ -4165,10 +3881,8 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 with your tax laws.
               </simpara>
             </tip>
-          </step>        
+          </step>
         </procedure>
-
-
       </example>
       </sect3>
     </sect2>
@@ -4196,28 +3910,22 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <emphasis>Broker</emphasis> Account with a tie to the stock account.
       </para>
 
-      <screenshot id="invest-dividendcash1">
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Example Of Cash Dividend Transactions</title>
+        <screenshot id="invest-dividendcash1">
         <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_dividendcash.png"
-                       srccredit="Daniel Dodson" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
+          <imageobject>
             <imagedata fileref="figures/invest_dividendcash.png"
                        srccredit="Daniel Dodson"/>
           </imageobject>
-
-          <textobject>
-            <phrase>Example of cash dividend transactions</phrase>
-          </textobject>
-
           <caption>
             <para>An image of the <emphasis>Brokerage</emphasis> Account register after a series of cash dividends.
             </para>
           </caption>
         </mediaobject>
       </screenshot>
+      </figure>
 
       <note>
         <para>If you want to track dividends on a per-stock basis, you would need to create an
@@ -4248,28 +3956,25 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         corresponding number of <guilabel>Shares</guilabel>.
       </para>
 
-      <screenshot id="invest-dividendreinvest1">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_dividendreinvest1.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_dividendreinvest1.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Example of dividend reinvestment transactions</phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the NST Stock Account register after a dividend reinvestment.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Example Of Dividend Reinvestment Transactions</title>
+        <screenshot id="invest-dividendreinvest1">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/invest_dividendreinvest1.png"
+                          srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/invest_dividendreinvest1.png"
+                          srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>An image of the NST Stock Account register after a dividend reinvestment.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
   </sect1>
 
@@ -4324,28 +4029,25 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
     <para>The other side of the double entry would usually be a debit to the brokerage bank account.
     </para>
 
-    <screenshot id="invest-ret-of-cap">
-      <mediaobject>
-        <imageobject role="html">
-          <imagedata fileref="figures/invest_ret_of_cap.png"
-                      srccredit="Chris Good" width="&img-w;"/>
-        </imageobject>
-
-        <imageobject role="fo">
-          <imagedata fileref="figures/invest_ret_of_cap.png"
-                      srccredit="Chris Good"/>
-        </imageobject>
-
-        <textobject>
-          <phrase>Example of return of capital transactions</phrase>
-        </textobject>
-
-        <caption>
-          <para>An image of the Stock Account register after a return of capital.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure>
+      <title>Example Of Return Of Capital Transactions</title>
+      <screenshot id="invest-ret-of-cap">
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/invest_ret_of_cap.png"
+                        srccredit="Chris Good" width="&img-w;"/>
+          </imageobject>
+          <imageobject role="fo">
+            <imagedata fileref="figures/invest_ret_of_cap.png"
+                        srccredit="Chris Good"/>
+          </imageobject>
+          <caption>
+            <para>An image of the Stock Account register after a return of capital.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <note>
       <para>It is not possible to use the Stock Split Assistant to do this type of transaction.
@@ -4362,9 +4064,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       </para>
     </tip>
   </sect1>
-<!--  Stock Splits - Simple
 
--->
   <sect1 id="invest-splitsnmergers1">
     <title>Splits and Mergers</title>
 
@@ -4386,47 +4086,43 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         to start the assistant.
       </para>
 
-      <screenshot id="invest-split1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_split1.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 1. </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the selection of the stock split assistant.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+ <!-- ToDo: unshrink -->
+      <figure>
+        <title>Activation Of The <quote>Stock Split</quote> Assistant</title>
+        <screenshot id="invest-split1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_split1.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the selection of the stock split assistant.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The first screen is an Introduction, select <guibutton>Forward</guibutton> to display the selection
         of the account and stock for the split. You will need to create an entry for each
         <emphasis>Account:Stock</emphasis> combination you hold.
       </para>
 
-      <screenshot id="invest-split2">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_split2.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 2 - Selection of Account/Stock.
-            </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the stock split assistant at step 2 - Selection of Account/Stock.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Selection Of A Stock Account In The <quote>Stock Split</quote> Assistant</title>
+        <screenshot id="invest-split2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_split2.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the stock split assistant at step 2 - Selection of Account/Stock.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Select the <emphasis>Assets:Investments:DRIPs:NST</emphasis> and click on
         <guibutton>Forward</guibutton>.
@@ -4440,7 +4136,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <term>Date</term>
         <listitem><simpara>Enter the date of the split.</simpara></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term>Shares</term>
         <listitem><para>The number of shares increased (or decreased) in the transaction.
@@ -4452,8 +4148,8 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <varlistentry>
         <term>Description</term>
         <listitem><simpara>The Description should give a brief explanation of the transaction.</simpara></listitem>
-      </varlistentry>      
-      
+      </varlistentry>
+
       <varlistentry>
         <term>New Price</term>
         <listitem><simpara>If desired the new price of the stock, after the split, may be entered.</simpara></listitem>
@@ -4469,72 +4165,65 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <para>Click on the <guibutton>Forward</guibutton> button.
       </para>
 
-      <screenshot id="invest-split3">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_split3.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 3 - Split Details. </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the stock split assistant at step 3 - Split Details.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Split Details In The <quote>Stock Split</quote> Assistant</title>
+        <screenshot id="invest-split3">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_split3.png"
+                         srccredit="Dave Herman"/>
+             </imageobject>
+            <caption>
+              <para>An image of the stock split assistant at step 3 - Split Details.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The next screen will be skipped in this example as there was no <quote>Cash in Lieu</quote>.
       </para>
 
-      <screenshot id="invest-split4">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_split4.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 4 - Cash in Lieu. </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the stock split assistant at step 4 - Cash in Lieu.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+       <figure>
+        <title><quote>Cash In Lieu</quote> In The <quote>Stock Split</quote> Assistant</title>
+        <screenshot id="invest-split4">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_split4.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the stock split assistant at step 4 - Cash in Lieu.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>A final <guilabel>Finish</guilabel> screen will give a last option to;
         <guibutton>Cancel</guibutton>, <guibutton>Back</guibutton> to modify any data entered or
         <guibutton>Apply</guibutton> to complete the stock split with the data entered.
       </para>
 
-      <screenshot id="invest-simplesplit1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_simplesplit1.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Example of simple stock split transaction in the stock’s register</phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the <emphasis>Assets:Investments:DRIPs:NST</emphasis> register after a simple stock
-              split transaction.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+       <figure>
+        <title>The NST Account After A Simple Stock Split</title>
+        <screenshot id="invest-simplesplit1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_simplesplit1.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the <emphasis>Assets:Investments:DRIPs:NST</emphasis> register after a simple stock
+                split transaction.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
-<!--  Moderately Complex Stock Merger
 
--->
     <sect2 id="invest-merger1">
       <title>Moderately Complex Stock Merger</title>
 
@@ -4557,24 +4246,22 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <emphasis>Investment Account:Stock</emphasis> account combination that has shares splitting.
       </para>
 
-      <screenshot id="invest-merge2">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_merge2.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 2. </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the stock split assistant at step 2 - Selection of Account/Stock (<emphasis>Investment
-              Account:T</emphasis>).
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Selection Of A Stock Account In The <quote>Stock Split</quote> Assistant—Moderate</title>
+        <screenshot id="invest-merge2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_merge2.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the stock split assistant at step 2 - Selection of Account/Stock (<emphasis>Investment
+                Account:T</emphasis>).
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Select the <emphasis>Assets:Investments:Brokerage Account:Stock:T</emphasis> and click on
         <guibutton>Forward</guibutton>.
@@ -4588,7 +4275,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <term>Date</term>
         <listitem><simpara>Enter the date of the split. Here we’ll enter November 18, 2005.</simpara></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term>Shares</term>
         <listitem><para>The number of shares increased (or decreased) in the transaction.
@@ -4613,57 +4300,53 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <term>Currency</term>
         <listitem><simpara>The currency of the transaction is required. This should be the same as the stock purchase currency.</simpara></listitem>
       </varlistentry>
-      
+
       </variablelist>
 
       <para>Click on the <guibutton>Forward</guibutton> button.
       </para>
 
-      <screenshot id="invest-merge3">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_merge3.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 3. </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the stock split assistant at step 3 - Split Details.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Split Details In The <quote>Stock Split</quote> Assistant—Moderate</title>
+        <screenshot id="invest-merge3">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_merge3.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the stock split assistant at step 3 - Split Details.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The next screen will be skipped in this example as there was no <quote>Cash in Lieu</quote>.
       </para>
 
-      <para>A final <quote>Finish</quote> screen will give a last option to <guimenu>Back</guimenu> to modify
-        any data entered or <guimenu>Apply</guimenu> to complete the stock split with the data
+      <para>A final <quote>Finish</quote> screen will give a last option to <guibutton>Back</guibutton> to modify
+        any data entered or <guibutton>Apply</guibutton> to complete the stock split with the data
         entered.
       </para>
 
-      <screenshot id="invest-stockmerge1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_stockmerge1.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Example of moderate stock split transaction in the stock’s
-            register</phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the <emphasis>Investment Account:T</emphasis> register after a stock split transaction
-              that decreases the shares.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+       <figure>
+        <title>The T Account After A Moderate Stock Split</title>
+        <screenshot id="invest-stockmerge1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_stockmerge1.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the <emphasis>Investment Account:T</emphasis> register after a stock split transaction
+                that decreases the shares.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
   </sect1>
 <!--  Working Location  !!!!!!!!!!!!
diff --git a/guide/C/ch_loans.xml b/guide/C/ch_loans.xml
index 03384651..35bf53f8 100644
--- a/guide/C/ch_loans.xml
+++ b/guide/C/ch_loans.xml
@@ -199,23 +199,21 @@
       </menuchoice>.
     </para>
 
-    <screenshot id="loans_fcalc">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/loans_fcalc.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Loan Repayment Calculator</phrase>
-        </textobject>
-
-        <caption>
-          <para>The &app; <guilabel>Loan Repayment Calculator</guilabel>.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure>
+      <title>Loan Repayment Calculator</title>
+      <screenshot id="loans_fcalc">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/loans_fcalc.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>The &app; <guilabel>Loan Repayment Calculator</guilabel>.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+      </figure>
 
     <para>The <guilabel>Loan Repayment Calculator</guilabel> can be used to calculate any one of the
       parameters: <guilabel>Payment Periods</guilabel>, <guilabel>Interest Rate</guilabel>,
@@ -475,23 +473,17 @@ The simple case for when  PMT == 0 gives the solution:
     <para>Your accounts before borrowing the money:
     </para>
 
+    <figure>
+      <title>Accounts Before Receiving Loan</title>
     <screenshot id="loans_mortgage">
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/loans_mortgage1.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
-
-        <textobject>
-          <phrase>Accounts Before Receiving Loan</phrase>
-        </textobject>
-
-        <caption>
-          <para>Accounts Before Receiving Loan
-          </para>
-        </caption>
       </mediaobject>
     </screenshot>
+    </figure>
 
     <para>The purchase of the house is recorded with a split transaction in the <emphasis>Assets:Fixed
       Assets:House</emphasis> account, with $50,000 coming from the bank (i.e., your down payment),
@@ -573,44 +565,32 @@ The simple case for when  PMT == 0 gives the solution:
     <para>The split will look like this in the <emphasis>Assets:Fixed Assets:House</emphasis> Account:
     </para>
 
-    <screenshot id="loans_mortgage2.png">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/loans_mortgage2.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Mortgage Split Transaction</phrase>
-        </textobject>
-
-        <caption>
-          <para>Mortgage Split Transaction
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure>
+      <title>Mortgage Split Transaction</title>
+      <screenshot id="loans_mortgage2.png">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/loans_mortgage2.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <para>Which will give a Chart of Accounts like this:
     </para>
 
-    <screenshot id="loans_mortgage3">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/loans_mortgage3.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Mortgage Accounts</phrase>
-        </textobject>
-
-        <caption>
-          <para>Mortgage Account
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure>
+      <title>Mortgage Accounts</title>
+      <screenshot id="loans_mortgage3">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/loans_mortgage3.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
   </sect1>
 
   <sect1 id="loans_CarLoan">
@@ -706,22 +686,20 @@ The simple case for when  PMT == 0 gives the solution:
         <acronym>PMT</acronym> function.
       </para>
 
-      <screenshot id="loans_OpenOfficePrivateLoanDetails">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/loans_PrivateLoanCalculation.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Calculation of Private Loan details</phrase>
-          </textobject>
-
-          <caption id="loans_OpenOfficePrivateLoanDetails.caption">
-            Detailed view over the private loan to Peter
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Calculation Of Private Loan Details</title>
+        <screenshot id="loans_OpenOfficePrivateLoanDetails">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/loans_PrivateLoanCalculation.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption id="loans_OpenOfficePrivateLoanDetails.caption">
+              Detailed view over the private loan to Peter
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="loans_personalLoanToSomeOne_accounts">
@@ -811,23 +789,17 @@ The simple case for when  PMT == 0 gives the solution:
         </table>
       </para>
 
-      <screenshot id="loans_PrivateLoanInitial">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/loans_PrivateLoanInitial.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Lended money</phrase>
-          </textobject>
-
-          <caption>
-            <para>Chart of Accounts after lending money
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Chart of Accounts after lending money</title>
+        <screenshot id="loans_PrivateLoanInitial">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/loans_PrivateLoanInitial.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="loans_personalLoanToSomeOne_FirstPayment">
@@ -867,23 +839,22 @@ The simple case for when  PMT == 0 gives the solution:
       <para>This can be translated to the following &app; entry
       </para>
 
-      <screenshot id="loans_PrivateLoanFirstPayment">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>First payment</phrase>
-          </textobject>
-
-          <caption>
-            <para>Detailed view over first payment
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>First Payment</title>
+        <screenshot id="loans_PrivateLoanFirstPayment">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>Detailed view over first payment
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The balance on Peter’s loan is now $2,000 - $107.23 = $1,892.77.
       </para>
@@ -926,23 +897,21 @@ The simple case for when  PMT == 0 gives the solution:
       <para>This can be translated to the following &app; entry.
       </para>
 
-      <screenshot id="loans_PrivateLoanSecondPayment">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Second payment</phrase>
-          </textobject>
-
-          <caption>
-            <para>Detailed view over the second payment
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Second payment</title>
+        <screenshot id="loans_PrivateLoanSecondPayment">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>Detailed view over the second payment
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The balance on Peter’s loan is now $1,892.77 - $107.67 = $1,785.10.
       </para>
@@ -950,22 +919,18 @@ The simple case for when  PMT == 0 gives the solution:
       <para>The Chart of accounts looks now like this:
       </para>
 
-      <screenshot id="loans_PrivateLoanSecondPaymentAccounts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/loans_PrivateLoanSecondPaymentAccounts.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Chart of Accounts after second payment</phrase>
-          </textobject>
-
-          <caption>
-            Chart of Accounts after second payment
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Chart Of Accounts After Second payment</title>
+        <screenshot id="loans_PrivateLoanSecondPaymentAccounts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/loans_PrivateLoanSecondPaymentAccounts.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>As you can see, the interest varies for every month, as well as the principal amount. So for every
         payment you receive you need to calculate the proper amounts for your various split entries.
@@ -973,7 +938,7 @@ The simple case for when  PMT == 0 gives the solution:
 
       <para>The interest amount will be less and less for every payment (since it is calculated on a smaller
         loan amount all the time), until the last payment where it is more or less 0. Please review
-        <link linkend="loans_OpenOfficePrivateLoanDetails" endterm="loans_OpenOfficePrivateLoanDetails.caption" />
+        <xref linkend="loans_OpenOfficePrivateLoanDetails" endterm="loans_OpenOfficePrivateLoanDetails.caption" />
         for more details.
       </para>
     </sect2>
@@ -982,7 +947,7 @@ The simple case for when  PMT == 0 gives the solution:
   <sect1 id="loans_Reconciling">
     <title>Reconciling with the Loan Statements (How-To)</title>
 
-    <para>Reconciling a loan statement is no different from reconciling a bank or credit card statement.
+    <para>Reconciling a loan statement is not different from reconciling a bank or credit card statement.
     </para>
 
     <para>During the period you should have recorded all the various loan related transactions, and every one
diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index 1b173958..48d5f6f2 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -35,28 +35,21 @@
       need.
     </para>
 
-    <screenshot id="oview-intro">
-      <mediaobject>
-        <imageobject role="html">
-          <imagedata fileref="figures/oview_intro.png"
-                     srccredit="Bengt Thuree" width="&img-w;"/>
-        </imageobject>
-
-        <imageobject role="fo">
-          <imagedata fileref="figures/oview_intro.png"
-                     srccredit="Bengt Thuree"/>
-        </imageobject>
-
-        <textobject>
-          <phrase>&app; Chart of Accounts - Teaser</phrase>
-        </textobject>
-
-        <caption>
-          <para>This image shows a Chart of Accounts with multiple currencies and investments.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure>
+      <title>A Chart Of Accounts With Multiple Currencies And Investments</title>
+      <screenshot id="oview-intro">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/oview_intro.png"
+                       srccredit="Bengt Thuree"/>
+          </imageobject>
+          <caption>
+            <para>This image shows a Chart of Accounts with multiple currencies and investments.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <para>While &app; is well suited for personal finances, it is also powerful enough for business use. There
       are many business features, from integrated accounts receivable and payable systems, to tax
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 466a935c..fda23061 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -126,45 +126,43 @@
       <para>First let’s view the Jeans transaction from your checking account:
       </para>
 
-      <screenshot id="txns-registersplit4">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_registersplit4.png"
-                srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>3 Jeans purchases</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows one split transaction with 3 Jeans purchases
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Purchase Of 3 Jeans In Assets:Checking</title>
+        <screenshot id="txns-registersplit4">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_registersplit4.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows one split transaction with 3 Jeans purchases.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Now, let’s open the <emphasis>Expenses:Clothes</emphasis> account, and look at it in Basic
         view.
       </para>
 
-      <screenshot id="txns-registersplit5">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_registersplit5.png"
-                srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>A jump to the <emphasis>Expenses:Clothes</emphasis> account</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows <emphasis>Expenses:Clothes</emphasis> account in Basic Ledger mode.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+ <!-- ToDo: unshrink -->
+      <figure>
+        <title>Purchase Of 3 Jeans In Expenses:Clothes Account In Basic Ledger Mode</title>
+        <screenshot id="txns-registersplit5">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_registersplit5.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows them in the <emphasis>Expenses:Clothes</emphasis> account in Basic Ledger mode.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Three entries appear here, but there was only the single split entry in the checking account.
         Further examination shows that each row has a different amount, $200, $300, and $500. This
@@ -175,23 +173,22 @@
       <para>Changing to Transaction Journal mode will display only the original split transaction.
       </para>
 
-      <screenshot id="txns-registersplit6">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_registersplit6.png"
-                srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>A jump to the <emphasis>Expenses:Clothes</emphasis> account</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows <emphasis>Expenses:Clothes</emphasis> account in Transaction Journal mode.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Purchase Of 3 Jeans In Expenses:Clothes Account In Transaction Journal Mode</title>
+        <screenshot id="txns-registersplit6">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_registersplit6.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the Expenses:Clothes account in <emphasis>Transaction Journal</emphasis> mode.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="txns-columnwidths1">
@@ -477,23 +474,22 @@
       to show the split-related fields:
     </para>
 
-    <screenshot id="txns-registersplit2">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/txns_registersplit2.png"
-            srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>How split headings change</phrase>
-        </textobject>
-
-        <caption>
-          <para>This image shows how split headings change.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+<!-- ToDo: unshrink -->
+    <figure>
+      <title>Salary In The Assets:Checking Account</title>
+      <screenshot id="txns-registersplit2">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/txns_registersplit2.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>This image shows how split headings change.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <para>Each split contains an optional <guilabel>Action</guilabel>, or type of split, which you can either
       type in or choose from a pull-down list. The split also contains an optional
@@ -519,23 +515,22 @@
       same transaction in the <emphasis>Income:Salary</emphasis> - Register:
     </para>
 
-    <screenshot id="txns-registersplit3">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/txns_registersplit3.png"
-            srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>A jump to the <emphasis>Income:Salary</emphasis> account</phrase>
-        </textobject>
-
-        <caption>
-          <para>This image shows a jump to the <emphasis>Income:Salary</emphasis> account.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+ <!-- ToDo: unshrink -->
+    <figure>
+      <title>Salary In The Income:Salary Account</title>
+      <screenshot id="txns-registersplit3">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/txns_registersplit3.png"
+              srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>This image shows a jump to the <emphasis>Income:Salary</emphasis> account.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <para>Note that the transaction line total now summarizes the effect on the
       <emphasis>Income:Salary</emphasis> account instead of the <emphasis>Checking
@@ -560,24 +555,23 @@
         similar to this figure:
       </para>
 
-      <screenshot id="txns-register-2account">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_register_2account.png"
-                       srccredit="Bengt  Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>The Checking Account - Register</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the <emphasis>Assets:Checking</emphasis> register after inserting the opening balance
-              transaction.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>The Checking Account After Inserting The Opening Balance Transaction</title>
+        <screenshot id="txns-register-2account">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_register_2account.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the <emphasis>Assets:Checking</emphasis> register after inserting the opening balance
+                transaction.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Setting the opening balances of an account is an example of a simple two account transaction. In
         this case, affecting the <emphasis>Assets:Checking</emphasis> and the
@@ -590,24 +584,23 @@
         <emphasis>Expenses:Groceries</emphasis>. The account register should now appear:
       </para>
 
-      <screenshot id="txns-register-2account2">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_register_2account2.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>The Checking Account - Register</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows <emphasis>Assets:Checking</emphasis> - Register after adding a transaction for
-              groceries.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>The Checking Account Adding A Transaction For Groceries</title>
+        <screenshot id="txns-register-2account2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_register_2account2.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows <emphasis>Assets:Checking</emphasis> - Register after adding a transaction for
+                groceries.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="txns-registers-multiaccount2">
@@ -664,17 +657,17 @@
       linkend="txns-registers-features2"/> for details.
       </para>
 
+<!-- ToDo: unshrink -->
       <figure id="txns-register-multiaccount">
-        <title>Entering a split transaction</title><mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_register_multiaccount.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Account Register - Split Transaction</phrase>
-          </textobject>
-        </mediaobject>
+        <title>Entering a split transaction</title>
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_register_multiaccount.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
       </figure>
     </sect3>
   </sect2>
@@ -751,28 +744,17 @@
         </menuchoice>. A window like the one below will appear in which you can enter the reconcile information.
       </para>
 
-      <screenshot id="txns-reconcile-window-1">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_reconcile_window1.png"
+      <figure>
+        <title>The Initial Reconcile Window</title>
+        <screenshot id="txns-reconcile-window-1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_reconcile_window1.png"
                          srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_reconcile_window1.png"
-                         srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Reconcile Window</phrase>
-          </textobject>
-
-          <caption>
-            <para>The initial reconcile window.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>In the initial reconcile window, some <guilabel>Reconcile Information</guilabel> need to be entered.
       </para>
@@ -892,28 +874,21 @@
         reconcile window:
       </para>
 
-      <screenshot id="txns-reconcile-window-2">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_reconcile_window2.png"
-                         srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_reconcile_window2.png"
-                         srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Reconcile Window</phrase>
-          </textobject>
-
-          <caption>
-            <para>The transactions listing in the reconcile window.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Reconcile Window</title>
+          <screenshot id="txns-reconcile-window-2">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/txns_reconcile_window2.png"
+                           srccredit="Cristian Marchi"/>
+              </imageobject>
+              <caption>
+                <para>The transactions listing in the reconcile window.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
       <para>The two panes called <guilabel>Funds In</guilabel> and <guilabel>Funds Out</guilabel>, lists all the
         unreconciled transactions that belongs to the account that is going to be reconciled. The
@@ -1007,23 +982,18 @@
         what has been cleared (<guilabel>Cleared:USD 954.79 Reconciled:USD 0.00</guilabel>)
       </para>
 
-      <screenshot id="txns-reconcile-window-3">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_reconcile_window3.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Checking account</phrase>
-          </textobject>
-
-          <caption>
-            <para>The Checking account after postponing the reconciliation.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>The Checking account after postponing the reconciliation</title>
+        <screenshot id="txns-reconcile-window-3">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_reconcile_window3.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
   </sect2>
 
@@ -1054,23 +1024,18 @@
         <emphasis>Expenses:Internet</emphasis> as shown in the next screenshot.
       </para>
 
-      <screenshot id="txns-sxn-ledger-1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger1.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Step one creating scheduled transaction from the ledger</phrase>
-          </textobject>
-
-          <caption>
-            <para>Step one creating scheduled transaction from the ledger
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Step 1 Of Creating Scheduled Transaction From The Ledger</title>
+        <screenshot id="txns-sxn-ledger-1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_ledger1.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <note>
         <para>Since we did not create the <emphasis>Expenses:Internet</emphasis> account, &app; will prompt us to
@@ -1081,66 +1046,50 @@
       <para>Then you right click on your transaction and select <guilabel>Schedule...</guilabel>
       </para>
 
-      <screenshot id="txns-sxn-ledger-2">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger2.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Step two creating scheduled transaction from the ledger</phrase>
-          </textobject>
-
-          <caption>
-            <para>Step two creating scheduled transaction from the ledger
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Step 2 Of Creating Scheduled Transaction From The Ledger</title>
+        <screenshot id="txns-sxn-ledger-2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_ledger2.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>A window like this will appear:
       </para>
 
-      <screenshot id="txns-sxn-ledger-3">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger3.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Step three creating scheduled transaction from the ledger</phrase>
-          </textobject>
-
-          <caption>
-            <para>Step three creating scheduled transaction from the ledger
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Step 3 Of Creating Scheduled Transaction From The Ledger</title>
+        <screenshot id="txns-sxn-ledger-3">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_ledger3.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Let’s fill the values, we know that the subscription is taken on the 28th each month, and the
         next one is for next month (since we entered the one for this month manually) :
       </para>
 
-      <screenshot id="txns-sxn-ledger-4">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger4.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Filling in data to a scheduled transaction</phrase>
-          </textobject>
-
-          <caption>
-            <para>Filling in data to a scheduled transaction
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Filling In Data To A Scheduled Transaction</title>
+        <screenshot id="txns-sxn-ledger-4">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_ledger4.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Click the <guibutton>OK</guibutton> button, and the transaction will be scheduled. &app; now has
         memorized this scheduled transaction and on the 28th of next month, it will pop up a window
@@ -1163,57 +1112,46 @@
         opened in the current &app; window as shown below:
       </para>
 
-      <screenshot id="txns-sxn-editor-2">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-2.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-2.png"
-                       srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Empty <guilabel>Scheduled Transactions</guilabel> tab</phrase>
-          </textobject>
-
-          <caption>
-            <para>Empty <guilabel>Scheduled Transactions</guilabel> tab
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Empty Scheduled Transactions Tab</title>
+       <screenshot id="txns-sxn-editor-2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_editor-2.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>Empty <guilabel>Scheduled Transactions</guilabel> tab
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>This tab contains a list, now empty, of all the scheduled transactions. Let’s create a new one
         by clicking on the <guibutton>New</guibutton> button in the <emphasis>Toolbar</emphasis>. A
         window like the one below will pop up:
       </para>
 
-      <screenshot id="txns-sxn-editor-3-overview">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
-                       srccredit="Cristian Marchi" />
-          </imageobject>
-
-          <textobject>
-            <phrase> <guimenuitem>Edit Scheduled Transaction</guimenuitem> window,
-            <guilabel>Overview</guilabel> tab</phrase>
-          </textobject>
-
-          <caption>
-            <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Overview</guilabel> tab
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Overview Tab Of The Edit Scheduled Transaction Window</title>
+        <screenshot id="txns-sxn-editor-3-overview">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
+                         srccredit="Cristian Marchi" />
+            </imageobject>
+            <caption>
+              <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Overview</guilabel> tab
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>First, let’s enter a name for this new scheduled transaction in the top of the window.
       </para>
@@ -1279,29 +1217,25 @@
         Transaction</guilabel> window. Here you can set the time-related options of the transaction.
       </para>
 
-      <screenshot id="txns-sxn-editor-3-frequency">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
-                       srccredit="Cristian Marchi" />
-          </imageobject>
-
-          <textobject>
-            <phrase> <guimenuitem>Edit Scheduled Transaction</guimenuitem> window,
-            <guilabel>Frequency</guilabel> tab</phrase>
-          </textobject>
-
-          <caption>
-            <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Frequency</guilabel> tab
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Frequency Tab Of The Edit Scheduled Transaction Window</title>
+        <screenshot id="txns-sxn-editor-3-frequency">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
+                         srccredit="Cristian Marchi" />
+            </imageobject>
+            <caption>
+              <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Frequency</guilabel> tab
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <variablelist>
         <varlistentry>
@@ -1376,30 +1310,26 @@
       <para>Now, you should have a window like this:
       </para>
 
-      <screenshot id="txns-sxn-editor-3-template">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-template.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-template.png"
-                       srccredit="Cristian Marchi" />
-          </imageobject>
-
-          <textobject>
-            <phrase><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Template
-            Transaction</guilabel> tab</phrase>
-          </textobject>
-
-          <caption>
-            <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Template
-              Transaction</guilabel> tab
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Template Tab Of The Edit Scheduled Transaction Window</title>
+        <screenshot id="txns-sxn-editor-3-template">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/txns_sxn_editor-3-template.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/txns_sxn_editor-3-template.png"
+                         srccredit="Cristian Marchi" />
+            </imageobject>
+            <caption>
+              <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Template
+                Transaction</guilabel> tab
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Remember to click on the <guibutton>Enter</guibutton> icon, to validate and enter the transaction.
       </para>
@@ -1408,28 +1338,17 @@
         tab, now showing one item in the <guilabel>Transactions</guilabel> list:
       </para>
 
-      <screenshot id="txns-sxn-editor-4">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-4.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-4.png"
-                       srccredit="Cristian Marchi" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Entered scheduled transaction</phrase>
-          </textobject>
-
-          <caption>
-            <para>Entered scheduled transaction
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Finally Entered Scheduled Transaction</title>
+        <screenshot id="txns-sxn-editor-4">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_editor-4.png"
+                         srccredit="Cristian Marchi" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <tip>
         <para>If you click in the calendar part on the first day of one month, a small window, following your
@@ -1455,28 +1374,17 @@
         etc... a better description of each option can be found in the &app; manual):
       </para>
 
-      <screenshot id="txns-sxn-editor-slr">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor_slr.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor_slr.png"
-                       srccredit="Cristian Marchi" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Scheduled transaction popup reminder</phrase>
-          </textobject>
-
-          <caption>
-            <para>Scheduled transaction popup reminder
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Scheduled Transaction Popup Reminder</title>
+        <screenshot id="txns-sxn-editor-slr">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_editor_slr.png"
+                         srccredit="Cristian Marchi" />
+            </imageobject>
+         </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>You can click on the <guilabel>Status</guilabel> column to change the scheduled transaction status
         if needed. Then just click on <guibutton>Ok</guibutton> to close the <guilabel>Since Last
@@ -1523,23 +1431,21 @@
         like this:
       </para>
 
-      <screenshot id="txns-puttoget1-Charts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_puttoget_Charts.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Starting point for Putting It All Together</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the starting point for this section.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Starting Point For Putting It All Together</title>
+        <screenshot id="txns-puttoget1-Charts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_puttoget_Charts.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the starting point for this section.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="txns-puttoget-open2">
@@ -1596,23 +1502,21 @@
         <emphasis>Assets:Savings</emphasis>, and <emphasis>Liabilities:Visa</emphasis>.
       </para>
 
-      <screenshot id="txns-puttoget1-Charts1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_puttoget_Charts1.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Chart accounts after setting opening balance</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the opening balances.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Chart Of Accounts After Setting The Opening Balance</title>
+        <screenshot id="txns-puttoget1-Charts1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_puttoget_Charts1.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the opening balances.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="txns-puttoget-add2">
@@ -1715,24 +1619,22 @@
         </listitem>
       </orderedlist>
 
-      <screenshot id="txns-puttoget2-Charts1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_puttoget_Charts2.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Chart accounts after setting all the various transactions</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the ending balances after <xref
-          linkend="chapter_txns" />.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Chart Of Accounts After Setting All The Various Transactions</title>
+        <screenshot id="txns-puttoget2-Charts1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_puttoget_Charts2.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the ending balances after <xref
+            linkend="chapter_txns" />.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="txns-puttoget-save">
@@ -1769,24 +1671,22 @@
             </menuchoice>.
           </para>
 
-          <screenshot id="txns-puttoget2-Cash">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/txns_CashFlow.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Cash Flow report for the month of March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Cash Flow report after <xref
-              linkend="chapter_txns" />.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure>
+            <title>Cash Flow Report For The Month Of March</title>
+            <screenshot id="txns-puttoget2-Cash">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/txns_CashFlow.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Cash Flow report after <xref
+                linkend="chapter_txns" />.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
 
           <para>To get this customized report, right click in the report and choose <guilabel>Report
             Options</guilabel>. Then set the time period, and specify which accounts you want in the
@@ -1803,46 +1703,42 @@
             </menuchoice>.
           </para>
 
-          <screenshot id="txns-puttoget2-TransactionRptChecking">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/txns_TransactionRptChecking.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Checking account during March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the Checking account during March.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+           <figure>
+            <title>Transaction Report For The Checking Account During March</title>
+            <screenshot id="txns-puttoget2-TransactionRptChecking">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/txns_TransactionRptChecking.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the Checking account during March.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
           <para>Now let’s change the transaction report to only show the various Expenses accounts.
           </para>
 
-          <screenshot id="txns-puttoget2-TransactionRptExpenses">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/txns_TransactionRptExpenses.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Expenses accounts during March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the various Expense accounts during March.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+        <figure>
+          <title>Transaction Report For The Expenses Accounts During March</title>
+            <screenshot id="txns-puttoget2-TransactionRptExpenses">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/txns_TransactionRptExpenses.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the various Expense accounts during March.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
       </orderedlist>
     </sect3>



Summary of changes:
 guide/C/ch_accts.xml        |  205 ++--
 guide/C/ch_basics.xml       |  179 ++-
 guide/C/ch_bus_features.xml |  315 ++----
 guide/C/ch_capgain.xml      |   97 +-
 guide/C/ch_cbook.xml        |  391 ++++---
 guide/C/ch_cc.xml           |  417 ++++---
 guide/C/ch_currency.xml     |  904 +++++++---------
 guide/C/ch_dep.xml          |   80 +-
 guide/C/ch_invest.xml       | 2511 +++++++++++++++++++------------------------
 guide/C/ch_loans.xml        |  255 ++---
 guide/C/ch_oview.xml        |   37 +-
 guide/C/ch_txns.xml         |  894 +++++++--------
 12 files changed, 2744 insertions(+), 3541 deletions(-)



More information about the gnucash-changes mailing list