Index: general/genlib/glib/glib-config.xml
===================================================================
--- general/genlib/glib/glib-config.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ general/genlib/glib/glib-config.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring GLib</title>
+<title>Configuring <application>GLib</application></title>
 
 <sect3><title>Configuration Information</title>
Index: general/genlib/glib/glib-desc.xml
===================================================================
--- general/genlib/glib/glib-desc.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ general/genlib/glib/glib-desc.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -9,5 +9,5 @@
 
 <sect3><title>GLib libraries</title>
-<para>GLib libraries contain a low-level core library for the Gimp
+<para><application>GLib</application> libraries contain a low-level core library for the Gimp
 Tool Kit.</para></sect3>
 
Index: gnome/gnome-intro.xml
===================================================================
--- gnome/gnome-intro.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ gnome/gnome-intro.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -1,59 +1,60 @@
 <partintro>
-<title>Introduction to Gnome</title>
+<title>Introduction to GNOME</title>
 
-<para>This chapter attempts to install a complete Gnome-&gnome-version; desktop
-environment and a limited Gnome 1.4 library environment that is
-sufficient to run Gnome 1.4 applications included in this book. The
+<para>This chapter attempts to install a complete GNOME-&gnome-version; desktop
+environment and a limited GNOME 1.4 library environment that is
+sufficient to run GNOME 1.4 applications included in this book. The
 order of the pages are meant to follow the build order defined by the
-Gnome development team as published in the <ulink
+GNOME development team as published in the <ulink
 url="http://www.gnome.org/start/&gnome-version;/notes/rninstallation.html">release notes</ulink>, with two exceptions.  If a package is in the release notes build list, but not in this chapter, it has been installed elsewhere in the book.</para>
 
-<para>The installation of Gnome-&gnome-version; is a large undertaking and one we would
+<para>The installation of GNOME-&gnome-version; is a large undertaking and one we would
 like to see you complete with the least amount of stress. One
 of our first goals in this installation is to protect your previously
-installed software, especially if you are testing Gnome on your machine.
-Gnome-&gnome-version; packages utilize the --prefix= option for configure, so we will
+installed software, especially if you are testing GNOME on your machine.
+GNOME-&gnome-version; packages utilize the --prefix= option for configure, so we will
 use that and an Environment variable (<envar>GNOME_PREFIX</envar>) to add flexibility to 
 the install.</para>
 
-<para>If you know that you want Gnome as your desktop, it is recommended that
+<para>If you know that you want GNOME as your desktop, it is recommended that
 you install with --prefix=/usr. If you are not sure that you are going
-to keep Gnome on your installation, it is recommended that you install with 
+to keep GNOME on your installation, it is recommended that you install with 
 --prefix=/opt/gnome-&gnome-version;.  Setting the Environment variable and the
 additional edits required by the second option are covered on the
 pre-installation page.</para>
 
-<para>If you choose the second option, removal of Gnome-2.2 is as easy
+<para>If you choose the second option, removal of GNOME-2.2 is as easy
 as removing the edits from the pre-installation page and issueing the following command:
 <screen><userinput><command>rm /opt/gnome-&gnome-version; -r </command></userinput></screen></para>
 
-<para>If your system was completely built per LFS and BLFS
-instructions, you have a very good chance of using Gnome-&gnome-version;
-after your first install.  If you are a typical LFS user, you have made
+<para>If your system was completely built per <acronym>LFS</acronym> and
+<acronym>BLFS</acronym>
+instructions, you have a very good chance of using GNOME-&gnome-version;
+after your first install.  If you are a typical <acronym>LFS</acronym> user, you have made
 modifications to the instructions along the way knowing that you have to
 take those modifications into account on future installations.  You
-should have no problems integrating Gnome-&gnome-version; into your unique setup, but
-you will have 28 to 33 packages installed before you can run Gnome
+should have no problems integrating GNOME-&gnome-version; into your unique setup, but
+you will have 28 to 33 packages installed before you can run GNOME
 through any testing (assuming your window manager is preinstalled and
-tested). We would anticipate that you will be rebuilding gnome at least
+tested). We would anticipate that you will be rebuilding GNOME at least
 once to make adjustments for your setup.</para>
 
-<para>If you are building a Gnome 1.4 desktop environment, you would
-install only those libraries in the Gnome 1.4 chapter
-<emphasis>and</emphasis> any dependencies listed on those pages, whether labeled or not. Gnome packages without pages are simply installed with:
+<para>If you are building a GNOME 1.4 desktop environment, you would
+install only those libraries in the GNOME 1.4 chapter
+<emphasis>and</emphasis> any dependencies listed on those pages, whether labeled or not. GNOME packages without pages are simply installed with:
 <screen><command>./configure --prefix=/opt/gnome &amp;&amp;
 make &amp;&amp;
 make install</command></screen>
-These instructions are simplistic to facilitate removal of Gnome 1.4
-from BLFS systems when it is no longer necessary.  These instructions
-may be refined later to comply with BLFS standards for file locations,
+These instructions are simplistic to facilitate removal of GNOME 1.4
+from <acronym>BLFS</acronym> systems when it is no longer necessary.  These instructions
+may be refined later to comply with <acronym>BLFS</acronym> standards for file locations,
 specifically <filename class='directory'>/opt/gnome/etc</filename> to
 <filename class='directory'>/etc</filename> and <filename
 class='directory'>/opt/gnome/var</filename> to
-<filename class='directory'>/var</filename>.  You should consider using the Gnome 1.4 hint
+<filename class='directory'>/var</filename>.  You should consider using the GNOME 1.4 hint
 located at <ulink url="http://hints.linuxfromscratch.org/hints"/> if you
-have no interest in Gnome-&gnome-version;.</para>
+have no interest in GNOME-&gnome-version;.</para>
 
-<para><screen>Gnome-&gnome-version; requires:
+<para><screen>GNOME-&gnome-version; requires:
 <xref linkend="xfree86"/>, <xref linkend="GTK2"/>, <xref linkend="libpng"/>, 
 <xref linkend="libjpeg"/>, <xref linkend="libtiff"/>, <xref linkend="popt"/>
Index: gnome/gnome.xml
===================================================================
--- gnome/gnome.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ gnome/gnome.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -1,5 +1,5 @@
 <part id="gnome" xreflabel="gnome">
 <?dbhtml filename="gnome.html" dir="gnome"?>
-<title>Gnome</title>
+<title>GNOME</title>
 
 &gnome-intro;
Index: gnome/lib/linc/linc-exp.xml
===================================================================
--- gnome/lib/linc/linc-exp.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ gnome/lib/linc/linc-exp.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -2,9 +2,10 @@
 <title>Command explanations</title>
 
-<para><command>--with-openssl</command> : This switch compiles linc
-with OpenSSL support.</para>
+<para><command>--with-openssl</command> : This switch compiles
+<application>linc</application>
+with <application>OpenSSL</application> support.</para>
 
 <para><command>--disable-gtk-doc</command> : This switch will
-prevent the rebuilding of the API documentation during the make command.</para>
+prevent the rebuilding of the <acronym>API</acronym> documentation during the make command.</para>
 
 </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ introduction/welcome/changelog.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -15,5 +15,5 @@
 
 <listitem><para>August 3rd, 2003 [larry]: modified intro to
-qt, startup-notification, slrn, popt and slang.</para></listitem>
+qt, gtk+, startup-notification, slrn, popt and slang.</para></listitem>
 
 <listitem><para>August 3rd, 2003 [larry]: basicnet: updated to
Index: preface/organization.xml
===================================================================
--- preface/organization.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ preface/organization.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -12,15 +12,16 @@
 <para>Here we introduce basic configuration and security issues.  We also
 discuss a range of editors, filesystems and shells which aren't covered in
-the main LFS book.</para></sect2>
+the main <acronym>LFS</acronym> book.</para></sect2>
 
 <sect2><title>Part III - General Libraries and Utilities</title>
 <para>In this section we cover libraries which are often needed by the rest
 of the book as well as system utilities.  Information on Programming
-(including recompiling gcc to support its full range of languages) concludes
+(including recompiling <application>gcc</application> to support its full range of languages) concludes
 this part.</para></sect2>
 
 <sect2><title>Part IV - Connecting to a Network</title>
 <para>Here we cover how to connect to a network when you aren't using 
-the simple static IP setup given in the main LFS book.</para></sect2>
+the simple static <acronym>IP</acronym> setup given in the main
+<acronym>LFS</acronym> book.</para></sect2>
 
 <sect2><title>Part V - Basic Networking</title>
@@ -29,6 +30,7 @@
 
 <sect2><title>Part VI - Server Networking</title>
-<para>Here we deal with setting up mail and other servers (such as SSH,
-CVS, etc.).</para></sect2>
+<para>Here we deal with setting up mail and other servers (such as
+<application>SSH</application>,
+<application>CVS</application>, etc.).</para></sect2>
 
 <sect2><title>Part VII - Content Serving</title>
@@ -37,6 +39,7 @@
 
 <sect2><title>Part VIII - X + Window Managers</title>
-<para>This part explains how to set up a basic XFree86 installation along
-with some generic X libraries and Window managers.</para></sect2>
+<para>This part explains how to set up a basic
+<application>XFree86</application> installation along
+with some generic <application>X</application> libraries and Window managers.</para></sect2>
 
 <sect2><title>Part IX - KDE</title>
@@ -44,11 +47,11 @@
 it, this part covers it.</para></sect2>
 
-<sect2><title>Part X - Gnome</title>
-<para>Gnome is the main alternative to KDE in the Desktop Environment arena
-and we cover both gnome-1.4 and gnome-2.2 here.</para></sect2>
+<sect2><title>Part X - GNOME</title>
+<para><application>GNOME</application> is the main alternative to <application>KDE</application> in the Desktop Environment arena
+and we cover both gnome-1.4 and gnome-&gnome-version; here.</para></sect2>
 
 <sect2><title>Part XI - X Software</title>
 <para>Office programs and graphical web browsers are important to most
-people.  They, along with some generic X software can be found in this part
+people.  They, along with some generic <application>X</application> software can be found in this part
 of the book.</para></sect2>
 
@@ -58,6 +61,8 @@
 
 <sect2><title>Part XIII - Printing, Scanning and Typesetting</title>
-<para>The PST part of the book covers things from ghostscript, cups and DocBook 
-to installing TeX.</para></sect2>
+<para>The <acronym>PST</acronym> part of the book covers things from
+<application>ghostscript</application>, <application>CUPS</application>
+and <application>DocBook</application> 
+to installing <application>TeX</application>.</para></sect2>
 
 <sect2><title>Appendices</title>
Index: x/lib/atk/atk-desc.xml
===================================================================
--- x/lib/atk/atk-desc.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/atk/atk-desc.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -9,5 +9,5 @@
 
 <sect3><title>ATK Libraries</title>
-<para>ATK Libraries contain the <acronym>API</acronym> used by assistive technologies in order to 
+<para><application>ATK</application> libraries contain the <acronym>API</acronym> used by assistive technologies in order to 
 interact with the desktop and applications.</para></sect3>
 
Index: x/lib/freetype2/freetype2-desc.xml
===================================================================
--- x/lib/freetype2/freetype2-desc.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/freetype2/freetype2-desc.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -9,5 +9,5 @@
 
 <sect3><title>freetype2 libraries</title>
-<para>Freetype2 libraries add TrueType font capabilities to
+<para><application>freetype2</application> libraries add TrueType font capabilities to
 <application>XFree86</application>.</para></sect3>
 
Index: x/lib/gtk/gtk+-config.xml
===================================================================
--- x/lib/gtk/gtk+-config.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/gtk/gtk+-config.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring GTK+</title>
+<title>Configuring <application>GTK+</application></title>
 
 <sect3><title>Configuration Information</title>
Index: x/lib/gtk/gtk+-desc.xml
===================================================================
--- x/lib/gtk/gtk+-desc.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/gtk/gtk+-desc.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The GTK+ package contains <filename>libgtk-1.2</filename> libraries.</para>
+<para>The <application>GTK+</application> package contains <filename>libgtk-1.2</filename> libraries.</para>
 
 </sect2>
@@ -9,5 +9,6 @@
 
 <sect3><title>GTK+ Libraries</title>
-<para>GTK+ Libraries provide the API to implement graphical user
+<para><application>GTK+</application> Libraries provide the
+<acronym>API</acronym> to implement graphical user
 interfaces.</para></sect3>
 
Index: x/lib/gtk/gtk+-exp.xml
===================================================================
--- x/lib/gtk/gtk+-exp.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/gtk/gtk+-exp.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -2,7 +2,7 @@
 <title>Command explanations</title>
 
-<para><userinput>--sysconfdir=/etc</userinput> : This installs the configuration files into <filename>/etc</filename> instead of <filename>/usr/etc</filename>.</para>
+<para><command>--sysconfdir=/etc</command> : This installs the configuration files into <filename>/etc</filename> instead of <filename>/usr/etc</filename>.</para>
 
-<para><userinput>--with-xinput=xfree</userinput> : This configuration
+<para><command>--with-xinput=xfree</command> : This configuration
 flag is necessary to utilize alternative input devices.</para>
 
Index: x/lib/gtk/gtk+-inst.xml
===================================================================
--- x/lib/gtk/gtk+-inst.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/gtk/gtk+-inst.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of GTK+</title>
+<title>Installation of <application>GTK+</application></title>
 
-<para>Install GTK+ by running the following commands:</para>
+<para>Install <application>GTK+</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<para><screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen></para>
 
 </sect2>
Index: x/lib/gtk/gtk+-intro.xml
===================================================================
--- x/lib/gtk/gtk+-intro.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/gtk/gtk+-intro.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -1,18 +1,24 @@
 <sect2>
-<title>Introduction to GTK+</title>
+<title>Introduction to <application>GTK+</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&GTK-download-http;"/>
-Download location (FTP):        <ulink url="&GTK-download-ftp;"/>
-Version used:                   &GTK-version;
-Package size:                   &GTK-size;
-Estimated Disk space required:  &GTK-buildsize;
-Estimated build time:           &GTK-time;</screen>
-
-<para>The GTK+ package contains GTK+ Libraries. This is useful for
+<para>The <application>GTK+</application> package contains
+<application>GTK+</application> Libraries. This is useful for
 creating graphical user interfaces for applications.</para>
 
-<screen>GTK+ depends on:
-<xref linkend="GLib"/>, <xref linkend="libpng"/>, <xref linkend="libtiff"/>, <xref linkend="libjpeg"/>
-and <xref linkend="xfree86"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&GTK-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&GTK-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &GTK-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &GTK-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &GTK-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>GTK+</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GLib"/>, <xref linkend="libpng"/>, <xref
+linkend="libtiff"/>, <xref linkend="libjpeg"/>
+and <xref linkend="xfree86"/></para></sect4>
+</sect3>
 
 </sect2>
Index: x/lib/gtk/gtk+2-desc.xml
===================================================================
--- x/lib/gtk/gtk+2-desc.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/gtk/gtk+2-desc.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -9,5 +9,5 @@
 
 <sect3><title>GTK+ Libraries</title>
-<para>GTK+ Libraries provide the <acronym>API</acronym> to implement graphical user
+<para><application>GTK+</application> Libraries provide the <acronym>API</acronym> to implement graphical user
 interfaces.</para></sect3>
 
Index: x/lib/lesstif/lesstif-desc.xml
===================================================================
--- x/lib/lesstif/lesstif-desc.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/lesstif/lesstif-desc.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -9,5 +9,6 @@
 
 <sect3><title>lesstif libraries</title>
-<para>Lesstif libraries are an OSF/Motif(R) source code compatible
+<para><application>lesstif</application> libraries are an
+<application>OSF/Motif(R)</application> source code compatible
 library for <application>X</application> Windows.</para></sect3>
 
Index: x/lib/lesstif/lesstif-exp.xml
===================================================================
--- x/lib/lesstif/lesstif-exp.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/lesstif/lesstif-exp.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -2,16 +2,22 @@
 <title>Command explanations</title>
 
-<para><command>--enable-build-20</command> : Build the Motif 2.0 compatible version of the lesstif libraries.</para> 
+<para><command>--enable-build-20</command> : Build the
+<application>Motif</application> 2.0 compatible version of the
+<application>lesstif</application> libraries.</para> 
 
 <para>
-<command>--enable-build-21</command> : Also build the Motif 2.1 compatible versions.</para> 
+<command>--enable-build-21</command> : Also build the
+<application>Motif</application> 2.1 compatible versions.</para> 
 
 <para><command>--disable-debug</command> : Do not generate debugging information.</para> 
 
-<para><command>--enable-production</command> : Build the release version of the lesstif libraries.</para> 
+<para><command>--enable-production</command> : Build the release version
+of the <application>lesstif</application> libraries.</para> 
 
-<para><command>--disable-build-tests</command> : Do not build the test/ tree (see testing note below).</para> 
+<para><command>--disable-build-tests</command> : Do not build the
+<filename class="directory">test/</filename> tree (see Testing lesstif).</para> 
 
-<para><command>--with-xdnd</command> : Enable XDND Gnome compatibility support.</para> 
+<para><command>--with-xdnd</command> : Enable <acronym>XDND</acronym>
+<application>Gnome</application> compatibility support.</para> 
 
 </sect2>
Index: x/lib/lesstif/lesstif-intro.xml
===================================================================
--- x/lib/lesstif/lesstif-intro.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/lesstif/lesstif-intro.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -2,5 +2,6 @@
 <title>Introduction to <application>lesstif</application></title>
 
-<para>The <application>lesstif</application> package contains an Open Source version of OSF/Motif(R).</para>
+<para>The <application>lesstif</application> package contains an Open
+Source version of <application>OSF/Motif(R)</application>.</para>
 
 <sect3><title>Package information</title>
Index: x/lib/pango/pango-desc.xml
===================================================================
--- x/lib/pango/pango-desc.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/pango/pango-desc.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -9,5 +9,5 @@
 
 <sect3><title>Pango libraries</title>
-<para>Pango libraries contains low level layout rendering routines, a
+<para><application>pango</application> libraries contains low level layout rendering routines, a
 high level driver for laying out entire blocks of text, and routines to
 assist in editing internationalized text.</para></sect3>
Index: x/lib/pango/pango-exp.xml
===================================================================
--- x/lib/pango/pango-exp.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/pango/pango-exp.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -5,5 +5,5 @@
 
 <para><command>--enable-gtk-doc</command> : This switch will rebuild
-the API documentation during the make command.</para>
+the <acronym>API</acronym> documentation during the make command.</para>
 
 </sect2>
Index: x/lib/qt/qt-config.xml
===================================================================
--- x/lib/qt/qt-config.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/qt/qt-config.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -18,5 +18,5 @@
 ldconfig</command></userinput></screen></para>
 
-<para>You need to add the path for the qt man pages to the
+<para>You need to add the path for the <application>qt</application> man pages to the
 <filename>man.conf</filename>
 file.  This can be done with the following command:</para>
Index: x/lib/qt/qt-desc.xml
===================================================================
--- x/lib/qt/qt-desc.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/qt/qt-desc.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -10,5 +10,5 @@
 
 <sect3><title>qt library</title>
-<para>The QT/X11 library contains <acronym>API</acronym>'s necessary to
+<para>The <application>QT</application>/<application>X11</application> library contains <acronym>API</acronym>'s necessary to
 use <acronym>KDE</acronym> programs.</para></sect3>
 
Index: x/lib/qt/qt-exp.xml
===================================================================
--- x/lib/qt/qt-exp.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/qt/qt-exp.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -14,5 +14,5 @@
 
 <para><command>-no-g++-exceptions</command> : This command disables
-the exceptions coding generated by the C++ compiler.</para>
+the exceptions coding generated by the <application>C++</application> compiler.</para>
 
 <para><command>-thread</command> : This command compiles the library
@@ -20,10 +20,11 @@
 
 <para><command>ln -sfn /opt/qt-&qt-version; /opt/qt</command> : This command
-standardizes the location of the qt libraries to the ld.so.conf entry
+standardizes the location of the <application>qt</application> libraries
+to the <filename>ld.so.conf</filename> entry
 described below.</para>
 
 <para><command>ln -s /opt/qt/lib/libqt-mt.so
 /opt/qt/lib/libqt.so</command> : This command allows configure scripts
-to find a working QT installation.</para>
+to find a working <application>QT</application> installation.</para>
 
 <para><command>cp -r doc/man /opt/qt/doc</command> : This command
Index: x/lib/qt/qt-intro.xml
===================================================================
--- x/lib/qt/qt-intro.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/lib/qt/qt-intro.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -2,7 +2,7 @@
 <title>Introduction to <application>qt</application></title>
 
-<para>The <application>qt</application> package contains a C++
-<acronym>GUI</acronym> library. This is useful for
-creating graphical applications or executing graphical applications that
+<para>The <application>qt</application> package contains a
+<application>C++</application> <acronym>GUI</acronym> library. This is useful 
+for creating graphical applications or executing graphical applications that
 are dynamically linked to the <application>qt</application> library.</para>
 
Index: x/wm/wm.xml
===================================================================
--- x/wm/wm.xml	(revision 6f74ff19fd18f629301f2599b70513a54034a131)
+++ x/wm/wm.xml	(revision ab8a3cb5f3a72503356da00c6391fda09ccddcc9)
@@ -4,5 +4,5 @@
 
 <para>Window Mangers and Desktop Environments are the primary user
-interfaces into the X Windows System.  A window manager is a program 
+interfaces into the <application>X</application> Windows System.  A window manager is a program 
 that controls the appearance of windows and provides the means by which 
 the user can interact with them.  A Desktop Environment provides a more 
@@ -11,23 +11,29 @@
 
 <para>There are many Window Mangers available.  Some of the more well
-known ones include fvwm2, Window Maker, AfterStep, Enlightenment, Sawfish, 
-and Blackbox.</para>
+known ones include <application>fvwm2</application>, <application>Window
+Maker</application>, <application>AfterStep</application>,
+<application>Enlightenment</application>,
+<application>Sawfish</application>, 
+and <application>Blackbox</application>.</para>
 
-<para>The Desktop Environments available for Linux are GNOME, KDE, and
-XFce.</para>
+<para>The Desktop Environments available for Linux are
+<application>GNOME</application>, <application>KDE</application>, and
+<application>XFce</application>.</para>
 
 <para>Choosing a Window Manager or Desktop Environment is highly 
 subjective.  The choice depends on the look and feel of the packages, the 
-resources (RAM, disk space) required, and the utilities included.  One web 
+resources (<acronym>RAM</acronym>, disk space) required, and the utilities included.  One web 
 site that provides a very good summary of what is available, screenshots, 
 and their respective features is <ulink url="http://www.plig.org/xwinman/">Window Managers for X</ulink>.</para>
 
 <para>In this chapter, the installation instructions of
-several Window Managers and one lightweight Desktop Environment are presented.  Later in the book, both KDE and Gnome have their own Parts.</para>
+several Window Managers and one lightweight Desktop Environment are
+presented.  Later in the book, both <application>KDE</application> and
+<application>Gnome</application> have their own Parts.</para>
 
 &sawfish;
 &fluxbox;
+&metacity;
 &xfce;
-&metacity;
 
 </chapter>
