diff --git a/gnome/add/gst-plugins.xml b/gnome/add/gst-plugins.xml
index c2fdd52282..1e026949d5 100644
--- a/gnome/add/gst-plugins.xml
+++ b/gnome/add/gst-plugins.xml
@@ -4,6 +4,7 @@
 
 &gst-plugins-intro;
 &gst-plugins-inst;
+&gst-plugins-desc;
 
 </sect1>
 
diff --git a/gnome/add/media/gst-plugins-desc.xml b/gnome/add/media/gst-plugins-desc.xml
index 4a93f1a76e..1704632022 100644
--- a/gnome/add/media/gst-plugins-desc.xml
+++ b/gnome/add/media/gst-plugins-desc.xml
@@ -1,17 +1,9 @@
 <sect2>
 <title>Contents</title>
 
-<para>The <application>gst-plugins</application> package contains <userinput>LISTOFFILES</userinput></para>
+<para>The <application>gst-plugins</application> package contains
+<filename class="libraryfile">libgst*</filename> libraries.</para>
 
 </sect2>
 
-<sect2><title>Description</title>
-
-<sect3><title>item1</title>
-<para>item1 does this</para></sect3>
-
-<sect3><title>item2</title>
-<para>item2 does that</para></sect3>
-
-</sect2>
 
diff --git a/gnome/add/media/gst-plugins-intro.xml b/gnome/add/media/gst-plugins-intro.xml
index b432b38b55..bdc15cabe7 100644
--- a/gnome/add/media/gst-plugins-intro.xml
+++ b/gnome/add/media/gst-plugins-intro.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Introduction to <application>gst-plugins</application></title>
 
-<para>The <application>gst-plugins</application> package contains codec interfaces.</para>
+<para>The <application>gst-plugins</application> package contains CODEC interfaces.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
diff --git a/gnome/add/media/gstreamer-desc.xml b/gnome/add/media/gstreamer-desc.xml
index 88ad9a173f..acff79b0c9 100644
--- a/gnome/add/media/gstreamer-desc.xml
+++ b/gnome/add/media/gstreamer-desc.xml
@@ -1,8 +1,9 @@
 <sect2>
 <title>Contents</title>
 
-<para>The <application>gstreamer</application> package contains <filename>libgstreamer</filename>
-libraries and <filename>libgst</filename> libraries.</para>
+<para>The <application>GStreamer</application> package contains
+<filename class="libraryfile">libgstreamer</filename>
+libraries and <filename class="libraryfile">libgst</filename> libraries.</para>
 
 </sect2>
 
diff --git a/gnome/add/media/gstreamer-exp.xml b/gnome/add/media/gstreamer-exp.xml
index 61463cb741..0925a8d31c 100644
--- a/gnome/add/media/gstreamer-exp.xml
+++ b/gnome/add/media/gstreamer-exp.xml
@@ -1,9 +1,10 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><command>--localstatedir=/var/lib</command> : This switch
-puts gst-register's cache in <filename>/var/lib/cache</filename>
-instead of <filename>$GNOME_PREFIX/var/cache</filename>.</para>
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch
+puts <application>gst-register</application>'s cache in <filename
+class="directory">/var/lib/cache</filename>
+instead of <filename class="directory">$GNOME_PREFIX/var/cache</filename>.</para>
 
 </sect2>
 
diff --git a/gnome/add/media/gstreamer-inst.xml b/gnome/add/media/gstreamer-inst.xml
index 3dbb99177f..7716641ebd 100644
--- a/gnome/add/media/gstreamer-inst.xml
+++ b/gnome/add/media/gstreamer-inst.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of <application>gstreamer</application></title>
+<title>Installation of <application>GStreamer</application></title>
 
-<para>Install <application>gstreamer</application> by running the following commands:</para>
+<para>Install <application>GStreamer</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib  &amp;&amp;
 make &amp;&amp;
diff --git a/gnome/add/media/gstreamer-intro.xml b/gnome/add/media/gstreamer-intro.xml
index 0271d115a4..7a90e3892e 100644
--- a/gnome/add/media/gstreamer-intro.xml
+++ b/gnome/add/media/gstreamer-intro.xml
@@ -1,8 +1,8 @@
 <sect2>
-<title>Introduction to <application>gstreamer</application></title>
+<title>Introduction to <application>GStreamer</application></title>
 
-<para>The <application>gstreamer</application> package contains a framework for streaming media.
-This is useful for interfacing with binary codecs.</para>
+<para>The <application>GStreamer</application> package contains a framework for streaming media.
+This is useful for interfacing with binary <acronym>CODEC</acronym>s.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -17,7 +17,7 @@ url="&gstreamer-download-ftp;"/></para></listitem>
 &gstreamer-time;</para></listitem></itemizedlist>
 </sect3>
                                                                                 
-<sect3><title><application>gstreamer</application> dependencies</title>
+<sect3><title><application>GStreamer</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/></para></sect4>
 </sect3>
diff --git a/gnome/add/media/nautilus-media-desc.xml b/gnome/add/media/nautilus-media-desc.xml
index aa52914a74..b48d1d4b0c 100644
--- a/gnome/add/media/nautilus-media-desc.xml
+++ b/gnome/add/media/nautilus-media-desc.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Contents</title>
 
-<para>The <application>nautilus-media</application> package contains
+<para>The <application>Nautilus Media</application> package contains
 <command>nautilus-audio-view</command> and support libraries.</para>
 
 </sect2>
diff --git a/gnome/add/media/nautilus-media-exp.xml b/gnome/add/media/nautilus-media-exp.xml
index 89375d025b..874c0b47f3 100644
--- a/gnome/add/media/nautilus-media-exp.xml
+++ b/gnome/add/media/nautilus-media-exp.xml
@@ -1,17 +1,18 @@
 <sect2>
 <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=/opt/gnome2/sbin</command> : This
-command puts libexec files in <filename>$GNOME_PREFIX/sbin</filename>
-instead of <filename>$GNOME_PREFIX/libexec</filename>.</para>
+<para><parameter>--libexecdir=/opt/gnome2/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>
 
diff --git a/gnome/add/media/nautilus-media-inst.xml b/gnome/add/media/nautilus-media-inst.xml
index 9cc025566d..3b55e23b3c 100644
--- a/gnome/add/media/nautilus-media-inst.xml
+++ b/gnome/add/media/nautilus-media-inst.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of <application>nautilus-media</application></title>
+<title>Installation of <application>Nautilus Media</application></title>
 
-<para>Install <application>nautilus-media</application> by running the following commands:</para>
+<para>Install <application>Nautilus Media</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome \
 --localstatedir=/var/lib --libexecdir=$GNOME_PREFIX/sbin &amp;&amp;
diff --git a/gnome/add/media/nautilus-media-intro.xml b/gnome/add/media/nautilus-media-intro.xml
index 75aecc360d..626be77591 100644
--- a/gnome/add/media/nautilus-media-intro.xml
+++ b/gnome/add/media/nautilus-media-intro.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>nautilus-media</application></title>
+<title>Introduction to <application>Nautilus Media</application></title>
 
-<para>The <application>nautilus-media</application> package contains GNOME's media applications
+<para>The <application>Nautilus Media</application> package contains GNOME's media applications
 used by nautilus.</para>
 
 <sect3><title>Package information</title>
@@ -17,11 +17,9 @@ url="&nautilus-media-download-ftp;"/></para></listitem>
 &nautilus-media-time;</para></listitem></itemizedlist>
 </sect3>
                                                                                 
-<sect3><title><application>nautilus-media</application> dependencies</title>
+<sect3><title><application>Nautilus Media</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/> and <xref linkend="gstreamer"/></para></sect4>
-<sect4><title>Optional</title>
-<para>OPTIONAL LIST</para></sect4>
 </sect3>
 
 
diff --git a/gnome/add/monitor/gnome-system-monitor-desc.xml b/gnome/add/monitor/gnome-system-monitor-desc.xml
index be67ad3fab..1f7a819e75 100644
--- a/gnome/add/monitor/gnome-system-monitor-desc.xml
+++ b/gnome/add/monitor/gnome-system-monitor-desc.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Contents</title>
 
-<para>The <application>gnome-system-monitor</application> package contains <command>gnome-system-monitor</command>.</para>
+<para>The <application><acronym>GNOME</acronym> System Monitor</application> package contains <command>gnome-system-monitor</command>.</para>
 
 </sect2>
 
diff --git a/gnome/add/monitor/gnome-system-monitor-exp.xml b/gnome/add/monitor/gnome-system-monitor-exp.xml
index 4b2675e7a9..421b813e31 100644
--- a/gnome/add/monitor/gnome-system-monitor-exp.xml
+++ b/gnome/add/monitor/gnome-system-monitor-exp.xml
@@ -1,13 +1,14 @@
 <sect2>
 <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>
 
diff --git a/gnome/add/monitor/gnome-system-monitor-inst.xml b/gnome/add/monitor/gnome-system-monitor-inst.xml
index 736f86aeab..1a8be97817 100644
--- a/gnome/add/monitor/gnome-system-monitor-inst.xml
+++ b/gnome/add/monitor/gnome-system-monitor-inst.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of <application>gnome-system-monitor</application></title>
+<title>Installation of <application><acronym>GNOME</acronym> System Monitor</application></title>
 
-<para>Install <application>gnome-system-monitor</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> System Monitor</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib \
 --sysconfdir=/etc/gnome &amp;&amp;
diff --git a/gnome/add/monitor/gnome-system-monitor-intro.xml b/gnome/add/monitor/gnome-system-monitor-intro.xml
index ad65c7273d..ef993b886c 100644
--- a/gnome/add/monitor/gnome-system-monitor-intro.xml
+++ b/gnome/add/monitor/gnome-system-monitor-intro.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>gnome-system-monitor</application></title>
+<title>Introduction to <application><acronym>GNOME</acronym> System Monitor</application></title>
 
-<para>The <application>gnome-system-monitor</application> package contains procman, GNOME's
+<para>The <application><acronym>GNOME</acronym> System Monitor</application> package contains procman, GNOME's
 replacement to gtop.</para>
 
 <sect3><title>Package information</title>
@@ -17,7 +17,7 @@ url="&gnome-system-monitor-download-ftp;"/></para></listitem>
 &gnome-system-monitor-time;</para></listitem></itemizedlist>
 </sect3>
                                                                                 
-<sect3><title><application>gnome-system-monitor</application> dependencies</title>
+<sect3><title><application><acronym>GNOME</acronym> System Monitor</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/> and <xref linkend="startup-notification"/></para></sect4>
 </sect3>
diff --git a/gnome/add/nautilus/nautilus-config.xml b/gnome/add/nautilus/nautilus-config.xml
index 49eeca79fe..e761fbe1db 100644
--- a/gnome/add/nautilus/nautilus-config.xml
+++ b/gnome/add/nautilus/nautilus-config.xml
@@ -1,5 +1,5 @@
 <sect2>
-<title>Configuring <application>nautilus</application></title>
+<title>Configuring <application>Nautilus</application></title>
 
 
 <sect3><title>Configuration Information</title>
diff --git a/gnome/add/nautilus/nautilus-desc.xml b/gnome/add/nautilus/nautilus-desc.xml
index 24bbad01e4..310df68a14 100644
--- a/gnome/add/nautilus/nautilus-desc.xml
+++ b/gnome/add/nautilus/nautilus-desc.xml
@@ -1,18 +1,19 @@
 <sect2>
 <title>Contents</title>
 
-<para>The <application>nautilus</application> package contains <command>nautilus</command> and
-<filename>libnautilus</filename> libraries.</para>
+<para>The <application>Nautilus</application> package contains <command>nautilus</command> and
+<filename class="libraryfile">libnautilus</filename> libraries.</para>
 
 </sect2>
 
 <sect2><title>Description</title>
 
 <sect3><title>nautilus</title>
-<para><application>nautilus</application> is the GNOME file manager.</para></sect3>
+<para><application>nautilus</application> is the
+<application><acronym>GNOME</acronym></application> file manager.</para></sect3>
 
 <sect3><title>nautilus libraries</title>
-<para><filename>nautilus</filename> libraries supply the functions needed by the file
+<para><filename class="libraryfile">libnautilus</filename> libraries supply the functions needed by the file
 manager.</para></sect3>
 
 </sect2>
diff --git a/gnome/add/nautilus/nautilus-exp.xml b/gnome/add/nautilus/nautilus-exp.xml
index d3b76ac5a4..84b3068345 100644
--- a/gnome/add/nautilus/nautilus-exp.xml
+++ b/gnome/add/nautilus/nautilus-exp.xml
@@ -1,13 +1,13 @@
 <sect2>
 <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>--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>
 
 
 </sect2>
diff --git a/gnome/add/nautilus/nautilus-inst.xml b/gnome/add/nautilus/nautilus-inst.xml
index 97cc1dd841..de1498ddec 100644
--- a/gnome/add/nautilus/nautilus-inst.xml
+++ b/gnome/add/nautilus/nautilus-inst.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of <application>nautilus</application></title>
+<title>Installation of <application>Nautilus</application></title>
 
-<para>Install <application>nautilus</application> by running the following commands:</para>
+<para>Install <application>Nautilus</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome \
 --libexecdir=$GNOME_PREFIX/sbin &amp;&amp; 
diff --git a/gnome/add/nautilus/nautilus-intro.xml b/gnome/add/nautilus/nautilus-intro.xml
index 58428f8ed1..477ffac39b 100644
--- a/gnome/add/nautilus/nautilus-intro.xml
+++ b/gnome/add/nautilus/nautilus-intro.xml
@@ -1,7 +1,8 @@
 <sect2>
-<title>Introduction to <application>nautilus</application></title>
+<title>Introduction to <application>Nautilus</application></title>
 
-<para>The <application>nautilus</application> package contains the GNOME shell and file
+<para>The <application>Nautilus</application> package contains the
+<application><acronym>GNOME</acronym></application> shell and file
 manager.</para>
 
 <sect3><title>Package information</title>
@@ -17,7 +18,7 @@ url="&nautilus-download-ftp;"/></para></listitem>
 &nautilus-time;</para></listitem></itemizedlist>
 </sect3>
                                                                                 
-<sect3><title><application>nautilus</application> dependencies</title>
+<sect3><title><application>Nautilus</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/></para></sect4>
 <sect4><title>Optional</title>
diff --git a/gnome/add/terminal/gnome-terminal-desc.xml b/gnome/add/terminal/gnome-terminal-desc.xml
index 971a987ab1..2bcd019f55 100644
--- a/gnome/add/terminal/gnome-terminal-desc.xml
+++ b/gnome/add/terminal/gnome-terminal-desc.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Contents</title>
 
-<para>The <application>gnome-terminal</application> package contains
+<para>The <application><acronym>GNOME</acronym> Terminal</application> package contains
 <command>gnome-terminal</command>.</para>
 
 </sect2>
@@ -9,7 +9,8 @@
 <sect2><title>Description</title>
 
 <sect3><title>gnome-terminal</title>
-<para><command>gnome-terminal</command> provides the command prompt in the GNOME environment.</para></sect3>
+<para><command>gnome-terminal</command> provides the command prompt in
+the <application><acronym>GNOME</acronym></application> environment.</para></sect3>
 
 
 </sect2>
diff --git a/gnome/add/terminal/gnome-terminal-exp.xml b/gnome/add/terminal/gnome-terminal-exp.xml
index 2bc3d4d9fe..bd7158678a 100644
--- a/gnome/add/terminal/gnome-terminal-exp.xml
+++ b/gnome/add/terminal/gnome-terminal-exp.xml
@@ -1,13 +1,14 @@
 <sect2>
 <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>
 
diff --git a/gnome/add/terminal/gnome-terminal-inst.xml b/gnome/add/terminal/gnome-terminal-inst.xml
index 749584662c..56865df360 100644
--- a/gnome/add/terminal/gnome-terminal-inst.xml
+++ b/gnome/add/terminal/gnome-terminal-inst.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of <application>gnome-terminal</application></title>
+<title>Installation of <application><acronym>GNOME</acronym> Terminal</application></title>
 
-<para>Install <application>gnome-terminal</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> Terminal</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib \
 --sysconfdir=/etc/gnome &amp;&amp;
diff --git a/gnome/add/terminal/gnome-terminal-intro.xml b/gnome/add/terminal/gnome-terminal-intro.xml
index 6e66db95c7..07fbd0a239 100644
--- a/gnome/add/terminal/gnome-terminal-intro.xml
+++ b/gnome/add/terminal/gnome-terminal-intro.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>gnome-terminal</application></title>
+<title>Introduction to <application><acronym>GNOME</acronym> Terminal</application></title>
 
-<para>The <application>gnome-terminal</application> package contains the console. This is useful
+<para>The <application><acronym>GNOME</acronym> Terminal</application> package contains the console. This is useful
 for executing programs from a command prompt.</para>
 
 <sect3><title>Package information</title>
@@ -17,7 +17,7 @@ url="&gnome-terminal-download-ftp;"/></para></listitem>
 &gnome-terminal-time;</para></listitem></itemizedlist>
 </sect3>
 
-<sect3><title><application>gnome-terminal</application> dependencies</title>
+<sect3><title><application><acronym>GNOME</acronym> Terminal</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/>, <xref linkend="startup-notification"/> and <xref linkend="vte"/></para></sect4>
 </sect3>
diff --git a/gnome/add/utils/gnome-utils-desc.xml b/gnome/add/utils/gnome-utils-desc.xml
index 4cd8d39c72..3ba468c115 100644
--- a/gnome/add/utils/gnome-utils-desc.xml
+++ b/gnome/add/utils/gnome-utils-desc.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Contents</title>
 
-<para>The gnome-utils package contains
+<para>The <application><acronym>GNOME</acronym> Utilities</application> package contains
 <command>gnome-system-log</command>,
 <command>gnome-character-map</command>,
 <command>gnome-calculator</command>,
@@ -36,7 +36,7 @@ words.</para></sect3>
 
 <sect3><title>archive-generator</title>
 <para><command>archive-generator</command> creates archives from collections of files and
-directories using gzip compressed archive files.</para></sect3>
+directories using <application>gzip</application> compressed archive files.</para></sect3>
 
 <sect3><title>gfloppy</title>
 <para><command>gfloppy</command> formats floppy disks under Linux.</para></sect3>
diff --git a/gnome/add/utils/gnome-utils-exp.xml b/gnome/add/utils/gnome-utils-exp.xml
index 2cd1577c08..02e54f2fe9 100644
--- a/gnome/add/utils/gnome-utils-exp.xml
+++ b/gnome/add/utils/gnome-utils-exp.xml
@@ -1,21 +1,23 @@
 <sect2>
 <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>
 
-<para><command>--with-pam-prefix=/etc/pam.d</command> : This switch
-puts PAM file in <filename>/etc/pam.d</filename> instead of
-<filename>/etc/gnome</filename>.</para>
+<para><parameter>--with-pam-prefix=/etc/pam.d</parameter>: This switch
+puts <application><acronym>PAM</acronym></application> files in
+<filename class="directory">/etc/pam.d</filename> instead of
+<filename class="directory">/etc/gnome</filename>.</para>
 
 </sect2>
 
diff --git a/gnome/add/utils/gnome-utils-inst.xml b/gnome/add/utils/gnome-utils-inst.xml
index 6796d9a4a0..080003674d 100644
--- a/gnome/add/utils/gnome-utils-inst.xml
+++ b/gnome/add/utils/gnome-utils-inst.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of <application>gnome-utils</application></title>
+<title>Installation of <application><acronym>GNOME</acronym> Utilities</application></title>
 
-<para>Install <application>gnome-utils</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> Utilities</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
 --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
diff --git a/gnome/add/utils/gnome-utils-intro.xml b/gnome/add/utils/gnome-utils-intro.xml
index 4dea35d6cf..aca569bdbb 100644
--- a/gnome/add/utils/gnome-utils-intro.xml
+++ b/gnome/add/utils/gnome-utils-intro.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>gnome-utils</application></title>
+<title>Introduction to <application><acronym>GNOME</acronym> Utilities</application></title>
 
-<para>The <application>gnome-utils</application> package contains a collection of small
+<para>The <application><acronym>GNOME</acronym> Utilities</application> package contains a collection of small
 applications designed to make your life a little easier.</para>
 
 <sect3><title>Package information</title>
@@ -17,7 +17,7 @@ url="&gnome-utils-download-ftp;"/></para></listitem>
 &gnome-utils-time;</para></listitem></itemizedlist>
 </sect3>
                                                                                 
-<sect3><title><application>gnome-utils</application> dependencies</title>
+<sect3><title><application><acronym>GNOME</acronym> Utilities</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/></para></sect4>
 </sect3>
diff --git a/gnome/add/yelp/yelp-desc.xml b/gnome/add/yelp/yelp-desc.xml
index 64d795440e..155a03074a 100644
--- a/gnome/add/yelp/yelp-desc.xml
+++ b/gnome/add/yelp/yelp-desc.xml
@@ -1,14 +1,15 @@
 <sect2>
 <title>Contents</title>
 
-<para>The <application>yelp</application> package contains <command>yelp</command>.</para>
+<para>The <application>Yelp</application> package contains <command>yelp</command>.</para>
 
 </sect2>
 
 <sect2><title>Description</title>
 
 <sect3><title>yelp</title>
-<para><command>yelp</command> is the GNOME help browser.</para></sect3>
+<para><command>yelp</command> is the
+<application><acronym>GNOME</acronym></application> help browser.</para></sect3>
 
 </sect2>
 
diff --git a/gnome/add/yelp/yelp-exp.xml b/gnome/add/yelp/yelp-exp.xml
index ede5481648..69fa0b9d35 100644
--- a/gnome/add/yelp/yelp-exp.xml
+++ b/gnome/add/yelp/yelp-exp.xml
@@ -1,9 +1,9 @@
 <sect2>
 <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>
 
 
 </sect2>
diff --git a/gnome/add/yelp/yelp-inst.xml b/gnome/add/yelp/yelp-inst.xml
index 3f51cc56d2..7508ed2eba 100644
--- a/gnome/add/yelp/yelp-inst.xml
+++ b/gnome/add/yelp/yelp-inst.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of <application>yelp</application></title>
+<title>Installation of <application>Yelp</application></title>
 
-<para>Install <application>yelp</application> by running the following commands:</para>
+<para>Install <application>Yelp</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin &amp;&amp;
 make &amp;&amp;
diff --git a/gnome/add/yelp/yelp-intro.xml b/gnome/add/yelp/yelp-intro.xml
index c3e5dfcf20..c300d8d967 100644
--- a/gnome/add/yelp/yelp-intro.xml
+++ b/gnome/add/yelp/yelp-intro.xml
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>yelp</application></title>
+<title>Introduction to <application>Yelp</application></title>
 
-<para>The <application>yelp</application> package contains the help browser. This is useful for
+<para>The <application>Yelp</application> package contains the help browser. This is useful for
 viewing help files.</para>
 
 <sect3><title>Package information</title>
@@ -17,7 +17,7 @@ url="&yelp-download-ftp;"/></para></listitem>
 &yelp-time;</para></listitem></itemizedlist>
 </sect3>
                                                                                 
-<sect3><title><application>yelp</application> dependencies</title>
+<sect3><title><application>Yelp</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/></para></sect4>
 </sect3>