Index: appendices/glossary.xml
===================================================================
--- appendices/glossary.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ appendices/glossary.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -129,5 +129,8 @@
 
 <glossentry id="gFLAC"><glossterm><acronym>FLAC</acronym></glossterm>
-<glossdef><para>Free Lossless Audio Codec</para></glossdef></glossentry>
+<glossdef><para>Free Lossless Audio <acronym>CODEC</acronym></para></glossdef></glossentry>
+
+<glossentry id="gFO"><glossterm><acronym>FO</acronym></glossterm>
+<glossdef><para>Formatted Objects</para></glossdef></glossentry>
 
 <glossentry id="gFOURCC"><glossterm><acronym>FOURCCC</acronym></glossterm>
@@ -196,4 +199,7 @@
 <glossentry id="gIDL"><glossterm><acronym>IDL</acronym></glossterm>
 <glossdef><para>Interface Definition Language</para></glossdef></glossentry>
+
+<glossentry id="gIJS"><glossterm><acronym>IJS</acronym></glossterm>
+<glossdef><para>Ink Jet Systems</para></glossdef></glossentry>
 
 <glossentry id="gIMAP"><glossterm><acronym>IMAP</acronym></glossterm>
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ general/prog/gcc.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -5,8 +5,4 @@
 &gcc-intro;
 &gcc-inst;
-<!--&gnat-intro;
-&gnat-inst; 
-&gcc-intro;
-&gcc-inst; -->
 &gcc-exp;
 &gcc-desc;
Index: general/prog/gcc/gcc-inst.xml
===================================================================
--- general/prog/gcc/gcc-inst.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ general/prog/gcc/gcc-inst.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -4,5 +4,7 @@
 &gnat-intro;
 </sect2>
+
 &gnat-inst;
+
 <sect2><title>Return to Installation of <application><acronym>GCC</acronym></application></title>
 
Index: general/prog/gcc/gnat-intro.xml
===================================================================
--- general/prog/gcc/gnat-intro.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ general/prog/gcc/gnat-intro.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -1,15 +1,2 @@
-<!-- <sect2>
-<title>Introduction to <application><acronym>GNAT</acronym></application> 
-(binary version)</title>
-
-<para>The <application><acronym>GNAT</acronym></application> package contains a 
-precompiled <application>Ada</application> compiler. This package is used to 
-satisfy the circular dependency when you recompile <application><acronym>
-GCC</acronym></application> to include <application>Ada</application>.</para>
-
-<para>You may skip installation of <application><acronym>GNAT</acronym>
-</application> if you do not want to recompile <application><acronym>GCC
-</acronym></application> with <application>Ada</application> support.</para>
--->
 <para>If you plan to compile Ada, you will need to install
 <application><acronym>GNAT</acronym></application> temporarily to
@@ -18,5 +5,4 @@
 GCC</acronym></application> to include
 <application>Ada</application>.</para>
-
 
 <sect3><title>Package information</title>
@@ -33,6 +19,4 @@
 </sect3>
 
-
-
 <sect3><title><application><acronym>GNAT</acronym></application> dependencies</title>
 <sect4><title>Required</title>
Index: pst/printing/cups/cups-desc.xml
===================================================================
--- pst/printing/cups/cups-desc.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/printing/cups/cups-desc.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -65,5 +65,6 @@
 
 <sect3><title>cupstestppd</title>
-<para><command>cupstestppd</command> tests the conformance of <acronym>PPD</acronym> files.
+<para><command>cupstestppd</command> tests the conformance of
+<filename>PPD</filename> files.
 </para></sect3>
 
Index: pst/printing/gs/espgs-exp.xml
===================================================================
--- pst/printing/gs/espgs-exp.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/printing/gs/espgs-exp.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -3,5 +3,5 @@
 
 <para><command>--without-gimp-print</command> : This switch disables
-the building of the gimp-print driver.</para>
+the building of the <application><acronym>GIMP</acronym></application> print driver.</para>
 
 <para><command>--without-ijs</command> : This switch disables the
Index: pst/printing/gs/espgs-intro.xml
===================================================================
--- pst/printing/gs/espgs-intro.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/printing/gs/espgs-intro.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -5,5 +5,5 @@
 PostScript data with the ability to render PostScript to different targets. 
 ESP Ghostscript is a customized version of <acronym>GNU</acronym> Ghostscript 
-that includes an enhanced autoconf-based configuration script, the <acronym>
+that includes an enhanced configuration script, the <acronym>
 CUPS</acronym> raster driver to support <acronym>CUPS</acronym> raster printer 
 drivers, and additional patches and drivers from
Index: pst/scanning/gocr/gocr-inst.xml
===================================================================
--- pst/scanning/gocr/gocr-inst.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/scanning/gocr/gocr-inst.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -8,5 +8,5 @@
 make install</command></userinput></screen>
 
-<para>To install the <acronym>GTK</acronym>-frontend, use the following commands:</para>
+<para>To install the <acronym>GTK</acronym> frontend, use the following commands:</para>
 
 <screen><userinput><command>cd frontend/gnome &amp;&amp;
@@ -15,7 +15,12 @@
 make install</command></userinput></screen>
 
-<para>To install the help, run <command>make help</command>, to
-install the documentation execute <command>make doc</command> and
-<command>make examples</command> runs some tests on gocr.</para>
+<para>To install the help:</para>
+<screen><userinput><command>make help</command></userinput></screen>
+
+<para>To install the documentation:</para>
+<screen><userinput><command>make doc</command></userinput></screen>
+
+<para>To run tests on <application>GOCR</application>:</para>
+<screen><userinput><command>make examples</command></userinput></screen>
 
 </sect2>
Index: pst/scanning/gocr/gocr-intro.xml
===================================================================
--- pst/scanning/gocr/gocr-intro.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/scanning/gocr/gocr-intro.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -8,5 +8,5 @@
 
 <para><application>GOCR</application> can used as a console utility, but 
-there is an <acronym>GTK</acronym>-frontend in the source package, also.</para>
+there is an <acronym>GTK</acronym> frontend in the source package, also.</para>
 
 <sect3><title>Package information</title>
Index: pst/scanning/gocr/gocr.ent
===================================================================
--- pst/scanning/gocr/gocr.ent	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/scanning/gocr/gocr.ent	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -5,7 +5,7 @@
 <!ENTITY gocr-exp SYSTEM "gocr-exp.xml">
 <!ENTITY gocr-buildsize "5.7 MB">
-<!ENTITY gocr-version "0.3.7">
-<!ENTITY gocr-download-http "http://jocr.sourceforge.net">
-<!ENTITY gocr-download-ftp "ftp://ftp.sourceforge.net/pub/sourceforge/jocr/gocr-0.3.7.tar.gz">
+<!ENTITY gocr-version "0.37">
+<!ENTITY gocr-download-http "http://telia.dl.sourceforge.net/sourceforge/jocr/gocr-0.37.tar.gz">
+<!ENTITY gocr-download-ftp "ftp://ftp.sourceforge.net/pub/sourceforge/jocr/gocr-0.37.tar.gz">
 <!ENTITY gocr-size "657 KB">
 <!ENTITY gocr-time "">
Index: pst/scanning/sane/sane-desc.xml
===================================================================
--- pst/scanning/sane/sane-desc.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/scanning/sane/sane-desc.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -13,5 +13,5 @@
 scanning.</para>
 <para><command>gimp-plugin</command> : xscanimage as
-<application><acronym>GIMP</acronym></application>-plugin.</para>
+<application><acronym>GIMP</acronym></application> plugin.</para>
 </sect3>
 
Index: pst/scanning/xsane/xsane-desc.xml
===================================================================
--- pst/scanning/xsane/xsane-desc.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/scanning/xsane/xsane-desc.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -3,5 +3,6 @@
 
 <para><application>XSane</application> comes with a graphical user interface, 
-and (if <xref linkend="gimp"/> is available) a <application>gimp</application> 
+and (if <xref linkend="gimp"/> is available) a
+<application><acronym>GIMP</acronym></application> 
 plugin with advanced features. Please refer to the documentation for further 
 support.</para>
Index: pst/typesetting/docbook-dsssl.xml
===================================================================
--- pst/typesetting/docbook-dsssl.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/typesetting/docbook-dsssl.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -1,5 +1,5 @@
-<sect1 id="docbook-dsssl" xreflabel="DocBook DSSSL-&docbook-dsssl-version;">
+<sect1 id="docbook-dsssl" xreflabel="DocBook DSSSL Stylesheets-&docbook-dsssl-version;">
 <?dbhtml filename="docbook-dsssl.html" dir="pst"?>
-<title>DocBook DSSSL-&docbook-dsssl-version;</title>
+<title>DocBook DSSSL Stylesheets-&docbook-dsssl-version;</title>
 
 &docbook-dsssl-intro;
Index: pst/typesetting/docbook-xsl.xml
===================================================================
--- pst/typesetting/docbook-xsl.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/typesetting/docbook-xsl.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -1,5 +1,5 @@
-<sect1 id="docbook-xsl" xreflabel="DocBook XSL-&docbook-xsl-version;">
+<sect1 id="docbook-xsl" xreflabel="DocBook XSL Stylesheets-&docbook-xsl-version;">
 <?dbhtml filename="docbook-xsl.html" dir="pst"?>
-<title>DocBook XSL-&docbook-xsl-version;</title>
+<title>DocBook XSL Stylesheets-&docbook-xsl-version;</title>
 
 &docbook-xsl-intro;
Index: pst/typesetting/docbook.xml
===================================================================
--- pst/typesetting/docbook.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/typesetting/docbook.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -1,5 +1,5 @@
-<sect1 id="DocBook" xreflabel="XML DTD-&DocBook-version;">
+<sect1 id="DocBook" xreflabel="DocBook XML DTD-&DocBook-version;">
 <?dbhtml filename="DocBook.html" dir="pst"?>
-<title>XML DTD-&DocBook-version;</title>
+<title>DocBook XML DTD-&DocBook-version;</title>
 
 &DocBook-intro;
Index: pst/typesetting/sgml-common.xml
===================================================================
--- pst/typesetting/sgml-common.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/typesetting/sgml-common.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -1,5 +1,5 @@
-<sect1 id="sgml-common" xreflabel="SGML-common-&sgml-common-version;">
+<sect1 id="sgml-common" xreflabel="SGML Common-&sgml-common-version;">
 <?dbhtml filename="sgml-common.html" dir="pst"?>
-<title>SGML-common-&sgml-common-version;</title>
+<title>SGML Common-&sgml-common-version;</title>
 
 &sgml-common-intro;
Index: pst/typesetting/sgml-dtd-3.xml
===================================================================
--- pst/typesetting/sgml-dtd-3.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/typesetting/sgml-dtd-3.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -1,5 +1,5 @@
-<sect1 id="sgml-dtd-3" xreflabel="SGML DTD-&sgml-dtd-3-version;">
+<sect1 id="sgml-dtd-3" xreflabel="DocBook SGML DTD-&sgml-dtd-3-version;">
 <?dbhtml filename="sgml-dtd-3.html" dir="pst"?>
-<title>SGML DTD-&sgml-dtd-3-version;</title>
+<title>DocBook SGML DTD-&sgml-dtd-3-version;</title>
 
 &sgml-dtd-3-intro;
Index: pst/typesetting/sgml-dtd.xml
===================================================================
--- pst/typesetting/sgml-dtd.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ pst/typesetting/sgml-dtd.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -1,5 +1,5 @@
-<sect1 id="sgml-dtd" xreflabel="SGML DTD-&sgml-dtd-version;">
+<sect1 id="sgml-dtd" xreflabel="DocBook SGML DTD-&sgml-dtd-version;">
 <?dbhtml filename="sgml-dtd.html" dir="pst"?>
-<title>SGML DTD-&sgml-dtd-version;</title>
+<title>DocBook SGML DTD-&sgml-dtd-version;</title>
 
 &sgml-dtd-intro;
Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ xsoft/office/evolution.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -3,7 +3,4 @@
 <title>Evolution-&evolution-version;</title>
 
-&db-3.1-intro;
-&db-3.1-inst;
-&db-3.1-exp;
 &evolution-intro;
 &evolution-inst;
Index: xsoft/office/evolution/db-3.1-intro.xml
===================================================================
--- xsoft/office/evolution/db-3.1-intro.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ xsoft/office/evolution/db-3.1-intro.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -1,14 +1,10 @@
-<sect2>
-<title>Introduction to <application>Berkeley DB</application>-&db-3.1-version;</title>
-
-<para>The <application>Berkeley DB</application> package contains 
-version &db-3.1-version; of the Berkeley database. <application>Evolution
-</application> requires this particular version. The details on 
+<para><application>Evolution </application> requires this particular version. 
+The details on 
 "why" are in the <filename>README</filename> file distibuted with the
-<application>evolution</application> source code. <application>Evolution
+<application>Evolution</application> source code. <application>Evolution
 </application> links to the library statically, hence this book installs 
 the <application>Berkeley DB</application>-&db-3.1-version; in <filename
 class="directory">/opt</filename>, which can be removed once 
-<application>Evolution</application> is compiled.</para>
+<application>Evolution</application> is installed.</para>
 
 
@@ -27,3 +23,2 @@
 
 
-</sect2>
Index: xsoft/office/evolution/evolution-inst.xml
===================================================================
--- xsoft/office/evolution/evolution-inst.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ xsoft/office/evolution/evolution-inst.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -2,4 +2,11 @@
 <title>Installation of <application>Evolution</application></title>
 
+&db-3.1-intro;
+</sect2>
+
+&db-3.1-inst;
+&db-3.1-exp;
+
+<sect2><title>Return to Installation of <application>Evolution</application></title>
 <para>Install <application>Evolution</application> by running the following 
 commands:</para>
Index: xsoft/office/gimp/gimp-desc.xml
===================================================================
--- xsoft/office/gimp/gimp-desc.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ xsoft/office/gimp/gimp-desc.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -25,5 +25,5 @@
 <sect3><title>gimp-remote</title>
 <para><command>gimp-remote</command> is a small utility that tells a running 
-gimp to open a local or remote image file.</para></sect3>
+<application><acronym>GIMP</acronym></application> to open a local or remote image file.</para></sect3>
 
 </sect2>
Index: xsoft/office/gnucash/gnucash-exp.xml
===================================================================
--- xsoft/office/gnucash/gnucash-exp.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ xsoft/office/gnucash/gnucash-exp.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -3,5 +3,6 @@
 
 <para><command>--prefix=/opt/gnome</command> : Version &gnucash-version; of 
-<application>GnuCash</application> is a GNOME 1.4 application.
+<application>GnuCash</application> is a
+<application><acronym>GNOME</acronym></application> 1.4 application.
 </para>
 
Index: xsoft/office/gnumeric/gnumeric-desc.xml
===================================================================
--- xsoft/office/gnumeric/gnumeric-desc.xml	(revision aef50bc215386f5f77113cdcde46cc56e98ac0aa)
+++ xsoft/office/gnumeric/gnumeric-desc.xml	(revision b028890d860ea3305ea7ccc1decb35bb69de09bd)
@@ -9,5 +9,5 @@
 
 <sect3><title>gnumeric</title>
-<para><command>gnumeric</command> is GNOME's spreadsheet application.</para></sect3>
+<para><command>gnumeric</command> is <application><acronym>GNOME</acronym></application>'s spreadsheet application.</para></sect3>
 
 
