Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/add.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -4,6 +4,6 @@
 
 <para>These packages are modular and add desktop applications to the
-GNOME  environment.  Feel free to install them on an as-needed or
-as-wanted basis.</para>
+<application><acronym>GNOME</acronym></application>  environment.  Feel free to install them on an as needed or
+as wanted basis.</para>
 
 &gnome-terminal;
Index: gnome/add/applets/gnome-applets-desc.xml
===================================================================
--- gnome/add/applets/gnome-applets-desc.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/applets/gnome-applets-desc.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The gnome-applets package contains
+<para>The <application><acronym>GNOME</acronym> Applets</application> package contains
 <command>battstat</command>, <command>cdplayer</command>,
 <command>charpick</command>, <command>drivemount</command>,
Index: gnome/add/applets/gnome-applets-exp.xml
===================================================================
--- gnome/add/applets/gnome-applets-exp.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/applets/gnome-applets-exp.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,15 +2,16 @@
 <title>Command explanations</title>
 
-<para><command>--libexecdir=$GNOME_PREFIX/sbin</command> : This switch puts
-libexec files in <filename>$GNOME_PREFIX/sbin</filename> instead of
-<filename>$GNOME_PREFIX/libexec</filename>.</para>
+<para><parameter>--libexecdir=$GNOME_PREFIX/sbin</parameter>: This switch puts
+libexec files in <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+<filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-<para><command>--localstatedir=/var/lib :</command> This switch
-puts scrollkeeper files in <filename>/var/lib/scrollkeeper</filename>
-instead of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>ScrollKeeper</application> files in <filename
+class="directory">/var/lib/scrollkeeper</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-<para><command>--sysconfdir=/etc/gnome :</command>  This switch
-puts configuration files in <filename>/etc/gnome</filename> instead of
-<filename>$GNOME_PREFIX/etc</filename>.</para>
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
+puts configuration files in <filename class="directory">/etc/gnome</filename> instead of
+<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
 </sect2>
Index: gnome/add/applets/gnome-applets-inst.xml
===================================================================
--- gnome/add/applets/gnome-applets-inst.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/applets/gnome-applets-inst.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>gnome-applets</application></title>
+<title>Installation of <application><acronym>GNOME</acronym> Applets</application></title>
 
-<para>Install <application>gnome-applets</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> Applets</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
Index: gnome/add/applets/gnome-applets-intro.xml
===================================================================
--- gnome/add/applets/gnome-applets-intro.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/applets/gnome-applets-intro.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>gnome-applets</application></title>
+<title>Introduction to <application><acronym>GNOME</acronym> Applets</application></title>
 
-<para>The <application>gnome-applets</application> package contains small applications which
+<para>The <application><acronym>GNOME</acronym> Applets</application> package contains small applications which
 generally run in the background and display their output to the gnome
 panel.</para>
@@ -19,5 +19,5 @@
 </sect3>
                                                                                 
-<sect3><title><application>gnome-applets</application> dependencies</title>
+<sect3><title><application><acronym>GNOME</acronym> Applets</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="gail"/>, <xref linkend="libgtop"/> and <xref
Index: gnome/add/at-spi.xml
===================================================================
--- gnome/add/at-spi.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/at-spi.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="at-spi" xreflabel="at-spi-&at-spi-version;">
+<sect1 id="at-spi" xreflabel="AT SPI-&at-spi-version;">
 <?dbhtml filename="at-spi.html" dir="gnome"?>
-<title>at-spi-&at-spi-version;</title>
+<title>AT SPI-&at-spi-version;</title>
 
 &at-spi-intro;
Index: gnome/add/bug-buddy/bug-buddy-exp.xml
===================================================================
--- gnome/add/bug-buddy/bug-buddy-exp.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/bug-buddy/bug-buddy-exp.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,7 +2,7 @@
 <title>Command explanations</title>
 
-<para><command>--localstatedir=/var/lib</command> : This switch
-puts scrollkeeper files in <filename>/var/lib/scrollkeeper</filename>
-instead of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>ScrollKeeper</application> files in <filename class="directory">/var/lib/scrollkeeper</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
 </sect2>
Index: gnome/add/docs/gnome2-user-docs-desc.xml
===================================================================
--- gnome/add/docs/gnome2-user-docs-desc.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/docs/gnome2-user-docs-desc.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>gnome2-user-docs</application> package contains <filename>OMF</filename> files.</para>
+<para>The <application>GNOME2 User Docs</application> package contains <filename>OMF</filename> files.</para>
 
 </sect2>
@@ -9,5 +9,5 @@
 
 <sect3><title>OMF files</title>
-<para>OMF files contain user documentation.  These include introductions and 
+<para><filename>OMF</filename> files contain user documentation.  These include introductions and 
 help on the core packages.</para></sect3>
 
Index: gnome/add/docs/gnome2-user-docs-exp.xml
===================================================================
--- gnome/add/docs/gnome2-user-docs-exp.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/docs/gnome2-user-docs-exp.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,7 +2,8 @@
 <title>Command explanations</title>
 
-<para><command>--localstatedir=/var/lib</command> : This switch
-puts scrollkeeper files in <filename>/var/lib/scrollkeeper</filename>
-instead of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>ScrollKeeper</application> files in <filename
+class="directory">/var/lib/scrollkeeper</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
 </sect2>
Index: gnome/add/docs/gnome2-user-docs-inst.xml
===================================================================
--- gnome/add/docs/gnome2-user-docs-inst.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/docs/gnome2-user-docs-inst.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>gnome2-user-docs</application></title>
+<title>Installation of <application>GNOME2 User Docs</application></title>
 
-<para>Install <application>gnome2-user-docs</application> by running the following commands:</para>
+<para>Install <application>GNOME2 User Docs</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib &amp;&amp;
Index: gnome/add/docs/gnome2-user-docs-intro.xml
===================================================================
--- gnome/add/docs/gnome2-user-docs-intro.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/docs/gnome2-user-docs-intro.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>gnome2-user-docs</application></title>
+<title>Introduction to <application>GNOME2 User Docs</application></title>
 
-<para>The <application>gnome2-user-docs</application> package contains end user documents for
+<para>The <application>GNOME2 User Docs</application> package contains end user documents for
 GNOME.</para>
 
@@ -18,9 +18,7 @@
 </sect3>
                                                                                 
-<sect3><title><application>gnome2-user-docs</application> dependencies</title>
+<sect3><title><application>GNOME2 User Docs</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="scrollkeeper"/></para></sect4>
-<sect4><title>Optional</title>
-<para>OPTIONAL LIST</para></sect4>
 </sect3>
 
Index: gnome/add/eog.xml
===================================================================
--- gnome/add/eog.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/eog.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="eog" xreflabel="eog-&eog-version;">
+<sect1 id="eog" xreflabel="EOG-&eog-version;">
 <?dbhtml filename="eog.html" dir="gnome"?>
-<title>eog-&eog-version;</title>
+<title>EOG-&eog-version;</title>
 
 &eog-intro;
Index: gnome/add/eog/eog-desc.xml
===================================================================
--- gnome/add/eog/eog-desc.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/eog/eog-desc.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>eog</application> package contains
+<para>The <application><acronym>EOG</acronym></application> package contains
 <command>eog</command>.</para>
 
Index: gnome/add/eog/eog-exp.xml
===================================================================
--- gnome/add/eog/eog-exp.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/eog/eog-exp.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,15 +2,16 @@
 <title>Command explanations</title>
 
-<para><command>--libexecdir=$GNOME_PREFIX/sbin</command> : This switch puts
-libexec files in <filename>$GNOME_PREFIX/sbin</filename> instead of
-<filename>$GNOME_PREFIX/libexec</filename>.</para>
+<para><parameter>--libexecdir=$GNOME_PREFIX/sbin</parameter>: This switch puts
+libexec files in <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+<filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-<para><command>--localstatedir=/var/lib</command> : This switch
-puts scrollkeeper files in <filename>/var/lib/scrollkeeper</filename>
-instead of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>ScrollKeeper</application> files in <filename
+class="directory">/var/lib/scrollkeeper</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-<para><command>--sysconfdir=/etc/gnome</command> : This switch
-puts configuration files in <filename>/etc/gnome</filename> instead of
-<filename>$GNOME_PREFIX/etc</filename>.</para>
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
+puts configuration files in <filename class="directory">/etc/gnome</filename> instead of
+<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
 </sect2>
Index: gnome/add/eog/eog-inst.xml
===================================================================
--- gnome/add/eog/eog-inst.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/eog/eog-inst.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>eog</application></title>
+<title>Installation of <application><acronym>EOG</acronym></application></title>
 
-<para>Install <application>eog</application> by running the following commands:</para>
+<para>Install <application><acronym>EOG</acronym></application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
Index: gnome/add/eog/eog-intro.xml
===================================================================
--- gnome/add/eog/eog-intro.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/eog/eog-intro.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,6 +1,7 @@
 <sect2>
-<title>Introduction to <application>eog</application></title>
+<title>Introduction to <application><acronym>EOG</acronym></application></title>
 
-<para>The <application>eog</application> package contains Eyes of GNOME. This 
+<para>The <application><acronym>EOG</acronym></application> package
+contains Eyes of <application><acronym>GNOME</acronym></application>. This 
 is useful for viewing and cataloging image files.</para>
 
@@ -18,5 +19,5 @@
 </sect3>
                                                                                 
-<sect3><title><application>eog</application> dependencies</title>
+<sect3><title><application><acronym>EOG</acronym></application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/> and <xref linkend="libgnomeprint"/></para></sect4>
Index: gnome/add/games/gnome-games-desc.xml
===================================================================
--- gnome/add/games/gnome-games-desc.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/games/gnome-games-desc.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The gnome-games package contains
+<para>The <application><acronym>GNOME</acronym> Games</application> package contains
 <command>aisleriot</command>, <command>freecell</command>,
 <command>gataxx</command>, <command>glines</command>,
Index: gnome/add/games/gnome-games-exp.xml
===================================================================
--- gnome/add/games/gnome-games-exp.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/games/gnome-games-exp.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,11 +2,11 @@
 <title>Command explanations</title>
 
-<para><command>--localstatedir=/var/lib</command> : This switch
-puts scrollkeeper files in <filename>/var/lib/scrollkeeper</filename>
-instead of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>ScrollKeeper</application> files in <filename class="directory">/var/lib/scrollkeeper</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-<para><command>--sysconfdir=/etc/gnome</command> : This switch puts
-configuration files in <filename>/etc/gnome</filename> instead of
-<filename>$GNOME_PREFIX/etc</filename>.</para>
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
+configuration files in <filename class="directory">/etc/gnome</filename> instead of
+<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
 </sect2>
Index: gnome/add/games/gnome-games-inst.xml
===================================================================
--- gnome/add/games/gnome-games-inst.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/games/gnome-games-inst.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>gnome-games</application></title>
+<title>Installation of <application><acronym>GNOME</acronym> Games</application></title>
 
-<para>Install <application>gnome-games</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> Games</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib \
Index: gnome/add/games/gnome-games-intro.xml
===================================================================
--- gnome/add/games/gnome-games-intro.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/games/gnome-games-intro.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>gnome-games</application></title>
+<title>Introduction to <application><acronym>GNOME</acronym> Games</application></title>
 
-<para>The <application>gnome-games</application> package contains games.</para>
+<para>The <application><acronym>GNOME</acronym> Games</application> package contains games.</para>
 
 <sect3><title>Package information</title>
@@ -17,5 +17,5 @@
 </sect3>
                                                                                 
-<sect3><title><application>gnome-games</application> dependencies</title>
+<sect3><title><application><acronym>GNOME</acronym> Games</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/></para></sect4>
Index: gnome/add/gedit/gedit-exp.xml
===================================================================
--- gnome/add/gedit/gedit-exp.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/gedit/gedit-exp.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,11 +2,12 @@
 <title>Command explanations</title>
 
-<para><command>--localstatedir=/var/lib</command> : This switch
-puts scrollkeeper files in <filename>/var/lib/scrollkeeper</filename>
-instead of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>ScrollKeeper</application> files in <filename
+class="directory">/var/lib/scrollkeeper</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-<para><command>--sysconfdir=/etc/gnome</command> : This switch puts
-configuration files in <filename>/etc/gnome</filename> instead of
-<filename>$GNOME_PREFIX/etc</filename>.</para>
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
+configuration files in <filename class="directory">/etc/gnome</filename> instead of
+<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
 </sect2>
Index: gnome/add/gedit/gedit-intro.xml
===================================================================
--- gnome/add/gedit/gedit-intro.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/gedit/gedit-intro.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -3,5 +3,5 @@
 
 <para>The <application>gedit</application> package contains a lightweight UTF-8 text editor for the
-GNOME
+<application><acronym>GNOME</acronym></application>
 desktop.</para>
 
Index: gnome/add/gnome-applets.xml
===================================================================
--- gnome/add/gnome-applets.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/gnome-applets.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="gnome-applets" xreflabel="gnome-applets-&gnome-applets-version;">
+<sect1 id="gnome-applets" xreflabel="GNOME Applets-&gnome-applets-version;">
 <?dbhtml filename="gnome-applets.html" dir="gnome"?>
-<title>gnome-applets-&gnome-applets-version;</title>
+<title>GNOME Applets-&gnome-applets-version;</title>
 
 &gnome-applets-intro;
Index: gnome/add/gnome-games.xml
===================================================================
--- gnome/add/gnome-games.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/gnome-games.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="gnome-games" xreflabel="gnome-games-&gnome-games-version;">
+<sect1 id="gnome-games" xreflabel="GNOME Games-&gnome-games-version;">
 <?dbhtml filename="gnome-games.html" dir="gnome"?>
-<title>gnome-games-&gnome-games-version;</title>
+<title>GNOME Games-&gnome-games-version;</title>
 
 &gnome-games-intro;
Index: gnome/add/gnome-media.xml
===================================================================
--- gnome/add/gnome-media.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/gnome-media.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="gnome-media" xreflabel="gnome-media-&gnome-media-version;">
+<sect1 id="gnome-media" xreflabel="GNOME Media-&gnome-media-version;">
 <?dbhtml filename="gnome-media.html" dir="gnome"?>
-<title>gnome-media-&gnome-media-version;</title>
+<title>GNOME Media-&gnome-media-version;</title>
 
 &gnome-media-intro;
Index: gnome/add/gnome-system-monitor.xml
===================================================================
--- gnome/add/gnome-system-monitor.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/gnome-system-monitor.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="gnome-system-monitor" xreflabel="gnome-system-monitor-&gnome-system-monitor-version;">
+<sect1 id="gnome-system-monitor" xreflabel="GNOME System Monitor-&gnome-system-monitor-version;">
 <?dbhtml filename="gnome-system-monitor.html" dir="gnome"?>
-<title>gnome-system-monitor-&gnome-system-monitor-version;</title>
+<title>GNOME System Monitor-&gnome-system-monitor-version;</title>
 
 &gnome-system-monitor-intro;
Index: gnome/add/gnome-terminal.xml
===================================================================
--- gnome/add/gnome-terminal.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/gnome-terminal.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="gnome-terminal" xreflabel="gnome-terminal-&gnome-terminal-version;">
+<sect1 id="gnome-terminal" xreflabel="GNOME Terminal-&gnome-terminal-version;">
 <?dbhtml filename="gnome-terminal.html" dir="gnome"?>
-<title>gnome-terminal-&gnome-terminal-version;</title>
+<title>GNOME Terminal-&gnome-terminal-version;</title>
 
 &gnome-terminal-intro;
Index: gnome/add/gnome-utils.xml
===================================================================
--- gnome/add/gnome-utils.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/gnome-utils.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="gnome-utils" xreflabel="gnome-utils-&gnome-utils-version;">
+<sect1 id="gnome-utils" xreflabel="GNOME Utilities-&gnome-utils-version;">
 <?dbhtml filename="gnome-utils.html" dir="gnome"?>
-<title>gnome-utils-&gnome-utils-version;</title>
+<title>GNOME Utilities-&gnome-utils-version;</title>
 
 &gnome-utils-intro;
Index: gnome/add/gnome2-user-docs.xml
===================================================================
--- gnome/add/gnome2-user-docs.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/gnome2-user-docs.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="gnome2-user-docs" xreflabel="gnome2-user-docs-&gnome2-user-docs-version;">
+<sect1 id="gnome2-user-docs" xreflabel="GNOME2 User Docs-&gnome2-user-docs-version;">
 <?dbhtml filename="gnome2-user-docs.html" dir="gnome"?>
-<title>gnome2-user-docs-&gnome2-user-docs-version;</title>
+<title>GNOME2 User Docs-&gnome2-user-docs-version;</title>
 
 &gnome2-user-docs-intro;
Index: gnome/add/gstreamer.xml
===================================================================
--- gnome/add/gstreamer.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/gstreamer.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="gstreamer" xreflabel="gstreamer-&gstreamer-version;">
+<sect1 id="gstreamer" xreflabel="GStreamer-&gstreamer-version;">
 <?dbhtml filename="gstreamer.html" dir="gnome"?>
-<title>gstreamer-&gstreamer-version;</title>
+<title>GStreamer-&gstreamer-version;</title>
 
 &gstreamer-intro;
Index: gnome/add/media/gnome-media-desc.xml
===================================================================
--- gnome/add/media/gnome-media-desc.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/media/gnome-media-desc.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The gnome-media package contains
+<para>The <application><acronym>GNOME</acronym> Media</application> package contains
 <command>gnome-sound-recorder</command>,
 <command>gnome-cd</command>,
@@ -13,11 +13,15 @@
 
 <sect3><title>gnome-sound-recorder</title>
-<para><command>gnome-sound-recorder</command> is GNOME's recorder.</para></sect3>
+<para><command>gnome-sound-recorder</command> is
+<application><acronym>GNOME</acronym></application>'s recorder.</para></sect3>
 
 <sect3><title>gnome-cd</title>
-<para><command>gnome-cd</command> is GNOME's CD Player.</para></sect3>
+<para><command>gnome-cd</command> is
+<application><acronym>GNOME</acronym></application>'s
+<acronym>CD</acronym> Player.</para></sect3>
 
 <sect3><title>gnome-volume-control</title>
-<para><command>gnome-volume-control</command> is GNOME's mixer with volume
+<para><command>gnome-volume-control</command> is
+<application><acronym>GNOME</acronym></application>'s mixer with volume
 applet.</para></sect3>
 
Index: gnome/add/media/gnome-media-exp.xml
===================================================================
--- gnome/add/media/gnome-media-exp.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/media/gnome-media-exp.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,15 +2,16 @@
 <title>Command explanations</title>
 
-<para><command>--sysconfdir=/etc/gnome</command> : This switch puts
-configuration files in <filename>/etc/gnome</filename> instead of
-<filename>$GNOME_PREFIX/etc</filename>.</para>
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
+configuration files in <filename class="directory">/etc/gnome</filename> instead of
+<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
-<para><command>--localstatedir=/var/lib</command> : This switch
-puts scrollkeeper files in <filename>/var/lib/scrollkeeper</filename>
-instead of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>ScrollKeeper</application> files in <filename
+class="directory">/var/lib/scrollkeeper</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-<para><command>--libexecdir=$GNOME_PREFIX/sbin</command> : This
-command puts libexec files in <filename>$GNOME_PREFIX/sbin</filename>
-instead of <filename>$GNOME_PREFIX/libexec</filename>.</para>
+<para><parameter>--libexecdir=$GNOME_PREFIX/sbin</parameter>: This
+command puts libexec files in <filename class="directory">$GNOME_PREFIX/sbin</filename>
+instead of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
 </sect2>
Index: gnome/add/media/gnome-media-inst.xml
===================================================================
--- gnome/add/media/gnome-media-inst.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/media/gnome-media-inst.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>gnome-media</application></title>
+<title>Installation of <application><acronym>GNOME</acronym> Media</application></title>
 
-<para>Install <application>gnome-media</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> Media</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome \
Index: gnome/add/media/gnome-media-intro.xml
===================================================================
--- gnome/add/media/gnome-media-intro.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/media/gnome-media-intro.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,6 +1,7 @@
 <sect2>
-<title>Introduction to <application>gnome-media</application></title>
+<title>Introduction to <application><acronym>GNOME</acronym> Media</application></title>
 
-<para>The <application>gnome-media</application> package contains GNOME's media
+<para>The <application><acronym>GNOME</acronym> Media</application>
+package contains <application><acronym>GNOME</acronym></application>'s media
 applications.</para>
 
@@ -18,5 +19,5 @@
 </sect3>
                                                                                 
-<sect3><title><application>gnome-media</application> dependencies</title>
+<sect3><title><application><acronym>GNOME</acronym> Media</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/> and <xref linkend="gstreamer"/></para></sect4>
Index: gnome/add/nautilus-media.xml
===================================================================
--- gnome/add/nautilus-media.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/nautilus-media.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="nautilus-media" xreflabel="nautilus-media-&nautilus-media-version;">
+<sect1 id="nautilus-media" xreflabel="Nautilus Media-&nautilus-media-version;">
 <?dbhtml filename="nautilus-media.html" dir="gnome"?>
-<title>nautilus-media-&nautilus-media-version;</title>
+<title>Nautilus Media-&nautilus-media-version;</title>
 
 &nautilus-media-intro;
Index: gnome/add/nautilus.xml
===================================================================
--- gnome/add/nautilus.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/nautilus.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="nautilus" xreflabel="nautilus-&nautilus-version;">
+<sect1 id="nautilus" xreflabel="Nautilus-&nautilus-version;">
 <?dbhtml filename="nautilus.html" dir="gnome"?>
-<title>nautilus-&nautilus-version;</title>
+<title>Nautilus-&nautilus-version;</title>
 
 &nautilus-intro;
Index: gnome/add/yelp.xml
===================================================================
--- gnome/add/yelp.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/add/yelp.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -1,5 +1,5 @@
-<sect1 id="yelp" xreflabel="yelp-&yelp-version;">
+<sect1 id="yelp" xreflabel="Yelp-&yelp-version;">
 <?dbhtml filename="yelp.html" dir="gnome"?>
-<title>yelp-&yelp-version;</title>
+<title>Yelp-&yelp-version;</title>
 
 &yelp-intro;
Index: gnome/other/other.xml
===================================================================
--- gnome/other/other.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/other/other.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -3,5 +3,5 @@
 <title>Other GNOME Packages</title>
 
-<para>This section will contains other
+<para>This section will contain other
 <application><acronym>GNOME</acronym></application> packages.</para>
 
Index: gnome/otherlibs/bonobo14/bonobo14-exp.xml
===================================================================
--- gnome/otherlibs/bonobo14/bonobo14-exp.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/otherlibs/bonobo14/bonobo14-exp.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -2,6 +2,6 @@
 <title>Command explanations</title>
 
-<para><parameter>--prefix=/opt/gnome:</parameter>
-Install <application>Bonobo</application> in the
+<para><parameter>--prefix=/opt/gnome</parameter>: Install 
+<application>Bonobo</application> in the
 <application><acronym>GNOME</acronym></application> 1.4 area.</para>
 
Index: gnome/otherlibs/libglade14/libglade14-intro.xml
===================================================================
--- gnome/otherlibs/libglade14/libglade14-intro.xml	(revision 8f286422c1c4d7f999e113bc394bcaef196923c1)
+++ gnome/otherlibs/libglade14/libglade14-intro.xml	(revision 9b8404ef2042f89287cf4eaefba8e497d11283c3)
@@ -3,5 +3,5 @@
 
 <para>The <application>libglade</application> package contains libraries which 
-allow applications to load glade interface files at runtime.</para>
+allow applications to load Glade interface files at runtime.</para>
 
 <sect3><title>Package information</title>
