Index: gnome/core/session/gnome-session-desc.xml
===================================================================
--- gnome/core/session/gnome-session-desc.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ gnome/core/session/gnome-session-desc.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -2,7 +2,6 @@
 <title>Contents</title>
 
-<para>The gnome-session package contains
-<userinput>gnome-session</userinput>, <userinput>session
-utilities</userinput> and <userinput>manager proxy</userinput>.</para>
+<para>The <application>gnome-session</application> package contains
+<command>gnome-session</command>, session utilities and <command>manager proxy</command>.</para>
 
 </sect2>
@@ -11,5 +10,5 @@
 
 <sect3><title>gnome-session</title>
-<para>gnome-session starts up the GNOME desktop.</para></sect3>
+<para><command>gnome-session</command> starts up the GNOME desktop.</para></sect3>
 
 <sect3><title>session utilities</title>
@@ -18,6 +17,6 @@
 
 <sect3><title>manager proxy</title>
-<para>manager proxy handles basic session management for applications
-that do not support XSM.</para></sect3>
+<para><command>manager proxy</command> handles basic session management for applications
+that do not support <acronym>XSM</acronym>.</para></sect3>
 
 </sect2>
Index: gnome/core/session/gnome-session-exp.xml
===================================================================
--- gnome/core/session/gnome-session-exp.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ gnome/core/session/gnome-session-exp.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -2,9 +2,9 @@
 <title>Command explanations</title>
 
-<para><userinput>--localstatedir=/var/lib</userinput> : This switch
+<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><userinput>--sysconfdir=/etc/gnome</userinput> : This switch
+<para><command>--sysconfdir=/etc/gnome</command> : This switch
 puts configuration files in <filename>/etc/gnome</filename> instead of
 <filename>$GNOME_PREFIX/etc</filename>.</para>
Index: gnome/core/session/gnome-session-inst.xml
===================================================================
--- gnome/core/session/gnome-session-inst.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ gnome/core/session/gnome-session-inst.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,12 +1,12 @@
 <sect2>
-<title>Installation of gnome-session</title>
+<title>Installation of <application>gnome-session</application></title>
 
-<para>Install gnome-session by running the following commands:</para>
+<para>Install <application>gnome-session</application> by running the following commands:</para>
 
-<para><screen><userinput>export PATH=$PATH:$GNOME_PREFIX/sbin:/sbin &amp;&amp;
+<screen><userinput><command>export PATH=$PATH:$GNOME_PREFIX/sbin:/sbin &amp;&amp;
 ./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib \
 --sysconfdir=/etc/gnome  &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/core/session/gnome-session-intro.xml
===================================================================
--- gnome/core/session/gnome-session-intro.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ gnome/core/session/gnome-session-intro.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,16 +1,25 @@
 <sect2>
-<title>Introduction to gnome-session</title>
+<title>Introduction to <application>gnome-session</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&gnome-session-download-http;"/>
-Download location (FTP):        <ulink url="&gnome-session-download-ftp;"/>
-Version used:                   &gnome-session-version;
-Package size:                   &gnome-session-size;
-Estimated Disk space required:  &gnome-session-buildsize;
-Estimated build time:           &gnome-session-time;</screen>
+<para>The <application>gnome-session</application> package contains the GNOME 
+session manager.</para>
 
-<para>The gnome-session package contains the GNOME session manager.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-session-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-session-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-session-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-session-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-session-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>gnome-session depends on:
-<xref linkend="libgnomeui"/></screen>
+<sect3><title><application>gnome-session</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libgnomeui"/></para></sect4>
+</sect3>
 
 </sect2>
Index: gnome/core/session/gnome-session.ent
===================================================================
--- gnome/core/session/gnome-session.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ gnome/core/session/gnome-session.ent	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -5,8 +5,8 @@
 <!ENTITY gnome-session-desc SYSTEM "gnome-session-desc.xml">
 <!ENTITY gnome-session-config SYSTEM "gnome-session-config.xml">
-<!ENTITY gnome-session-buildsize "6.6 MB">
-<!ENTITY gnome-session-version "2.2.1">
-<!ENTITY gnome-session-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.2/gnome-session-2.2.1.tar.bz2">
-<!ENTITY gnome-session-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.2/gnome-session-2.2.1.tar.bz2">
-<!ENTITY gnome-session-size "709 KB">
-<!ENTITY gnome-session-time "0.88 SBU">
+<!ENTITY gnome-session-buildsize "15 MB">
+<!ENTITY gnome-session-version "2.2.2">
+<!ENTITY gnome-session-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.2/gnome-session-2.2.2.tar.bz2">
+<!ENTITY gnome-session-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.2/gnome-session-2.2.2.tar.bz2">
+<!ENTITY gnome-session-size "704 KB">
+<!ENTITY gnome-session-time "0.22 SBU">
