Index: gnome/core/control-center.xml
===================================================================
--- gnome/core/control-center.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/control-center.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,5 +1,5 @@
-<sect1 id="control-center" xreflabel="control-center-&control-center-version;">
+<sect1 id="control-center" xreflabel="Control Center-&control-center-version;">
 <?dbhtml filename="control-center.html" dir="gnome"?>
-<title>control-center-&control-center-version;</title>
+<title>Control Center-&control-center-version;</title>
 
 &control-center-intro;
Index: gnome/core/control/control-center-desc.xml
===================================================================
--- gnome/core/control/control-center-desc.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/control/control-center-desc.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The control-center package contains
+<para>The <application>Control Center</application> package contains
 <command>gnome-control-center</command>, <command>gnome-settings-daemon</command>, gnome-background-properties, gnome-default-applications-properties, gnome-file-types-properties, gnome-font-properties, gnome-keybinding-properties, gnome-keyboard-properties, gnome-mouse-properties, gnome-network-preferences, gnome-sound-properties, gnome-theme-properties and gnome-ui-properties.</para>
 
Index: gnome/core/control/control-center-exp.xml
===================================================================
--- gnome/core/control/control-center-exp.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/control/control-center-exp.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -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/core/control/control-center-inst.xml
===================================================================
--- gnome/core/control/control-center-inst.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/control/control-center-inst.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>control-center</application></title>
+<title>Installation of <application>Control Center</application></title>
 
-<para>Install <application>control-center</application> by running the following commands:</para>
+<para>Install <application>Control Center</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib \
Index: gnome/core/control/control-center-intro.xml
===================================================================
--- gnome/core/control/control-center-intro.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/control/control-center-intro.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,6 +1,7 @@
 <sect2>
-<title>Introduction to <application>control-center</application></title>
+<title>Introduction to <application>Control Center</application></title>
 
-<para>The <application>control-center</application> package contains the GNOME settings
+<para>The <application>Control Center</application> package contains the
+<application><acronym>GNOME</acronym></application> settings
 managers.</para>
 
@@ -18,5 +19,5 @@
 </sect3>
 
-<sect3><title><application>control-center</application> dependencies</title>
+<sect3><title><application>Control Center</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="gnome-desktop"/> and <xref linkend="metacity"/></para></sect4>
Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/core.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -3,5 +3,6 @@
 <title>GNOME core</title>
 
-<para>This section contains required elements of the GNOME environment
+<para>This section contains required elements of the
+<application><acronym>GNOME</acronym></application> environment
 to display a functional desktop.</para>
 
Index: gnome/core/desktop/gnome-desktop-config.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-config.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/desktop/gnome-desktop-config.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>gnome-desktop</application></title>
+<title>Configuring <application><acronym>GNOME</acronym> Desktop</application></title>
 
 
Index: gnome/core/desktop/gnome-desktop-desc.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-desc.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/desktop/gnome-desktop-desc.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The <application>gnome-desktop</application> package contains
-<filename>libgnome-desktop-2</filename> libraries and
+<para>The <application><acronym>GNOME</acronym> Desktop</application> package contains
+<filename class="libraryfile">libgnome-desktop-2</filename> libraries and
 <command>gnome-about</command>.</para>
 
@@ -11,7 +11,8 @@
 
 <sect3><title>libgnome-desktop libraries</title>
-<para><filename>libgnome-desktop</filename> libraries contain
+<para><filename class="libraryfile">libgnome-desktop</filename> libraries contain
 <acronym>API</acronym>'s being tested for
-inclusion in libgnome or libgnomeui.</para></sect3>
+inclusion in <application>libgnome</application> or
+<application>libgnomeui</application>.</para></sect3>
 
 <sect3><title>gnome-about</title>
Index: gnome/core/desktop/gnome-desktop-exp.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-exp.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/desktop/gnome-desktop-exp.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -2,7 +2,7 @@
 <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>
 
 </sect2>
Index: gnome/core/desktop/gnome-desktop-inst.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-inst.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/desktop/gnome-desktop-inst.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>gnome-desktop</application></title>
+<title>Installation of <application><acronym>GNOME</acronym> Desktop</application></title>
 
-<para>Install <application>gnome-desktop</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> Desktop</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome &amp;&amp;
Index: gnome/core/desktop/gnome-desktop-intro.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-intro.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/desktop/gnome-desktop-intro.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,7 +1,9 @@
 <sect2>
-<title>Introduction to <application>gnome-desktop</application></title>
+<title>Introduction to <application><acronym>GNOME</acronym> Desktop</application></title>
 
-<para>The <application>gnome-desktop</application> package contains GNOME's 
-.desktop files, the gnome-about program, man pages and GNOME's core graphics 
+<para>The <application><acronym>GNOME</acronym> Desktop</application>
+package contains <application><acronym>GNOME</acronym></application>'s 
+<filename>.desktop</filename> files, the gnome-about program, man pages
+and <application><acronym>GNOME</acronym></application>'s core graphics 
 files and icons.</para>
 
@@ -19,5 +21,5 @@
 </sect3>
 
-<sect3><title><application>gnome-desktop</application> dependencies</title>
+<sect3><title><application><acronym>GNOME</acronym> Desktop</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/> and <xref linkend="scrollkeeper"/></para></sect4>
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/gnome-desktop.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,5 +1,5 @@
-<sect1 id="gnome-desktop" xreflabel="gnome-desktop-&gnome-desktop-version;">
+<sect1 id="gnome-desktop" xreflabel="GNOME Desktop-&gnome-desktop-version;">
 <?dbhtml filename="gnome-desktop.html" dir="gnome"?>
-<title>gnome-desktop-&gnome-desktop-version;</title>
+<title>GNOME Desktop-&gnome-desktop-version;</title>
 
 &gnome-desktop-intro;
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/gnome-panel.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,5 +1,5 @@
-<sect1 id="gnome-panel" xreflabel="gnome-panel-&gnome-panel-version;">
+<sect1 id="gnome-panel" xreflabel="GNOME Panel-&gnome-panel-version;">
 <?dbhtml filename="gnome-panel.html" dir="gnome"?>
-<title>gnome-panel-&gnome-panel-version;</title>
+<title>GNOME Panel-&gnome-panel-version;</title>
 
 &gnome-panel-intro;
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/gnome-session.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,5 +1,5 @@
-<sect1 id="gnome-session" xreflabel="gnome-session-&gnome-session-version;">
+<sect1 id="gnome-session" xreflabel="GNOME Session-&gnome-session-version;">
 <?dbhtml filename="gnome-session.html" dir="gnome"?>
-<title>gnome-session-&gnome-session-version;</title>
+<title>GNOME Session-&gnome-session-version;</title>
 
 &gnome-session-intro;
Index: gnome/core/panel/gnome-panel-config.xml
===================================================================
--- gnome/core/panel/gnome-panel-config.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/panel/gnome-panel-config.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>gnome-panel</application></title>
+<title>Configuring <application><acronym>GNOME</acronym> Panel</application></title>
 
 
Index: gnome/core/panel/gnome-panel-desc.xml
===================================================================
--- gnome/core/panel/gnome-panel-desc.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/panel/gnome-panel-desc.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The <application>gnome-panel</application> package contains
-<filename>libpanel-applet-2</filename> libraries and applets.</para>
+<para>The <application><acronym>GNOME</acronym> Panel</application> package contains
+<filename class="libraryfile">libpanel-applet-2</filename> libraries and applets.</para>
 
 </sect2>
@@ -10,9 +10,9 @@
 
 <sect3><title>libpanel-applet libraries</title>
-<para><filename>libpanel-applet</filename> libraries allow development of small 
+<para><filename class="libraryfile">libpanel-applet</filename> libraries allow development of small 
 applications which may be embedded in the panel called applets.</para></sect3>
 
-<sect3><title>applets</title>
-<para>applets included are Workspace Switcher, Window List, Inbox
+<sect3><title>Applets</title>
+<para>Applets included are Workspace Switcher, Window List, Inbox
 Monitor, Clock and 'Wanda the Fish'.</para></sect3>
 
Index: gnome/core/panel/gnome-panel-exp.xml
===================================================================
--- gnome/core/panel/gnome-panel-exp.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/panel/gnome-panel-exp.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -2,18 +2,19 @@
 <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>--disable-gtk-doc</command> : This switch prevents
-the rebuilding of documentation during the make command.</para>
+<para><option>--disable-gtk-doc</option>: This switch prevents
+the rebuilding of documentation during the <command>make</command> command.</para>
 
 </sect2>
Index: gnome/core/panel/gnome-panel-inst.xml
===================================================================
--- gnome/core/panel/gnome-panel-inst.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/panel/gnome-panel-inst.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>gnome-panel</application></title>
+<title>Installation of <application><acronym>GNOME</acronym> Panel</application></title>
 
-<para>Install <application>gnome-panel</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> Panel</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
Index: gnome/core/panel/gnome-panel-intro.xml
===================================================================
--- gnome/core/panel/gnome-panel-intro.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/panel/gnome-panel-intro.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>gnome-panel</application></title>
+<title>Introduction to <application><acronym>GNOME</acronym> Panel</application></title>
 
-<para>The <application>gnome-panel</application> package contains the menu and 
+<para>The <application><acronym>GNOME</acronym> Panel</application> package contains the menu and 
 applet systems.</para>
 
@@ -18,5 +18,5 @@
 </sect3>
 
-<sect3><title><application>gnome-panel</application> dependencies</title>
+<sect3><title><application><acronym>GNOME</acronym> Panel</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/> and <xref linkend="scrollkeeper"/></para></sect4>
Index: gnome/core/session/gnome-session-desc.xml
===================================================================
--- gnome/core/session/gnome-session-desc.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/session/gnome-session-desc.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>gnome-session</application> package contains
+<para>The <application><acronym>GNOME</acronym> Session</application> package contains
 <command>gnome-session</command>, session utilities and <command>manager proxy</command>.</para>
 
@@ -10,5 +10,6 @@
 
 <sect3><title>gnome-session</title>
-<para><command>gnome-session</command> starts up the GNOME desktop.</para></sect3>
+<para><command>gnome-session</command> starts up the
+<application><acronym>GNOME</acronym></application> desktop.</para></sect3>
 
 <sect3><title>session utilities</title>
Index: gnome/core/session/gnome-session-exp.xml
===================================================================
--- gnome/core/session/gnome-session-exp.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/session/gnome-session-exp.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -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/core/session/gnome-session-inst.xml
===================================================================
--- gnome/core/session/gnome-session-inst.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/session/gnome-session-inst.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>gnome-session</application></title>
+<title>Installation of <application><acronym>GNOME</acronym> Session</application></title>
 
-<para>Install <application>gnome-session</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> Session</application> by running the following commands:</para>
 
 <screen><userinput><command>export PATH=$PATH:$GNOME_PREFIX/sbin:/sbin &amp;&amp;
Index: gnome/core/session/gnome-session-intro.xml
===================================================================
--- gnome/core/session/gnome-session-intro.xml	(revision a35680c982f52f30f333785ef82d84b50fa7bd9c)
+++ gnome/core/session/gnome-session-intro.xml	(revision 5c9313a6fbec19da58da158e5f30961fa6343651)
@@ -1,6 +1,7 @@
 <sect2>
-<title>Introduction to <application>gnome-session</application></title>
+<title>Introduction to <application><acronym>GNOME</acronym> Session</application></title>
 
-<para>The <application>gnome-session</application> package contains the GNOME 
+<para>The <application><acronym>GNOME</acronym> Session</application>
+package contains the <application><acronym>GNOME</acronym></application> 
 session manager.</para>
 
@@ -18,5 +19,5 @@
 </sect3>
 
-<sect3><title><application>gnome-session</application> dependencies</title>
+<sect3><title><application><acronym>GNOME</acronym> Session</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="libgnomeui"/></para></sect4>
