Index: general/graphlib/svgalib/svgalib-exp.xml
===================================================================
--- general/graphlib/svgalib/svgalib-exp.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ general/graphlib/svgalib/svgalib-exp.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -2,6 +2,6 @@
 <title>Command explanations</title>
 
-<para><userinput>cd doc &amp;&amp; dir in man?; do for file in $dir/*; do
-gunzip /usr/share/man/$file; done; done</userinput> : SVGAlib installs its man
+<para><command>cd doc &amp;&amp; for dir in man?; do for file in $dir/*; do
+gunzip /usr/share/man/$file; done; done</command> : SVGAlib installs its man
 pages in compressed format so we uncompress them.</para>
 
Index: gnome/lib/gconf/gconf-config.xml
===================================================================
--- gnome/lib/gconf/gconf-config.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gconf/gconf-config.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring GConf</title>
+<title>Configuring <application>GConf</application></title>
 
 
Index: gnome/lib/gconf/gconf-desc.xml
===================================================================
--- gnome/lib/gconf/gconf-desc.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gconf/gconf-desc.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The GConf package contains <filename>libgconf</filename> libraries.</para>
+<para>The <application>GConf</application> package contains <filename>libgconf</filename> libraries.</para>
 
 </sect2>
@@ -9,5 +9,5 @@
 
 <sect3><title>libgconf libraries</title>
-<para>libgconf libraries provide the functions necessary to maintain
+<para><filename>libgconf</filename> libraries provide the functions necessary to maintain
 the configuration database.</para></sect3>
 
Index: gnome/lib/gconf/gconf-exp.xml
===================================================================
--- gnome/lib/gconf/gconf-exp.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gconf/gconf-exp.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -2,9 +2,9 @@
 <title>Command explanations</title>
 
-<para><userinput>--libexecdir=$GNOME_PREFIX/sbin</userinput> : This switch puts
+<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><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>.  This installation controls all
@@ -12,5 +12,5 @@
 eliminating this command <emphasis>must</emphasis> be consistent.</para>
 
-<para><userinput>--disable-gtk-doc</userinput> : This switch will
+<para><command>--disable-gtk-doc</command> : This switch will
 prevent the rebuilding of documentation during the make command.</para>
 
Index: gnome/lib/gconf/gconf-inst.xml
===================================================================
--- gnome/lib/gconf/gconf-inst.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gconf/gconf-inst.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -1,11 +1,11 @@
 <sect2>
-<title>Installation of GConf</title>
+<title>Installation of <application>GConf</application></title>
 
-<para>Install GConf by running the following commands:</para>
+<para>Install <application>GConf</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
 --sysconfdir=/etc/gnome --disable-gtk-doc &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/lib/gconf/gconf-intro.xml
===================================================================
--- gnome/lib/gconf/gconf-intro.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gconf/gconf-intro.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -2,17 +2,25 @@
 <title>Introduction to GConf</title>
 
-<screen>Download location (HTTP):       <ulink url="&GConf-download-http;"/>
-Download location (FTP):        <ulink url="&GConf-download-ftp;"/>
-Version used:                   &GConf-version;
-Package size:                   &GConf-size;
-Estimated Disk space required:  &GConf-buildsize;
-Estimated build time:           &GConf-time;</screen>
-
 <para>The GConf package contains a configuration database system.</para>
 
-<screen>GConf depends on:
-<xref linkend="ORBit2"/> and <xref linkend="GTK2"/>
-GConf will utilize:
-<xref linkend="gtk-doc"/> and <xref linkend="sgml-dtd-3"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&GConf-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&GConf-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &GConf-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&GConf-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&GConf-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>GConf</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="ORBit2"/> and <xref linkend="GTK2"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gtk-doc"/> and <xref linkend="sgml-dtd-3"/></para></sect4>
+</sect3>
 
 </sect2>
Index: gnome/lib/gnome-mime-data/gnome-mime-data-desc.xml
===================================================================
--- gnome/lib/gnome-mime-data/gnome-mime-data-desc.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gnome-mime-data/gnome-mime-data-desc.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -12,11 +12,11 @@
 
 <sect3><title>icons</title>
-<para>icons contains all the default document type icons.</para></sect3>
+<para><filename>icons</filename> contains all the default document type icons.</para></sect3>
 
 <sect3><title>application-registry</title>
-<para>application-registry contains the application mime database.</para></sect3>
+<para><filename>application-registry</filename> contains the application mime database.</para></sect3>
 
 <sect3><title>mime-info</title>
-<para>mime-info contains the mime description database.</para></sect3>
+<para><filename>mime-info</filename> contains the mime description database.</para></sect3>
 
 </sect2>
Index: gnome/lib/gnome-mime-data/gnome-mime-data-exp.xml
===================================================================
--- gnome/lib/gnome-mime-data/gnome-mime-data-exp.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gnome-mime-data/gnome-mime-data-exp.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<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/lib/gnome-mime-data/gnome-mime-data-inst.xml
===================================================================
--- gnome/lib/gnome-mime-data/gnome-mime-data-inst.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gnome-mime-data/gnome-mime-data-inst.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of gnome-mime-data</title>
+<title>Installation of <application>gnome-mime-data</application></title>
 
-<para>Install gnome-mime-data by running the following commands:</para>
+<para>Install <application>gnome-mime-data</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome &amp;&amp;
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/lib/gnome-mime-data/gnome-mime-data-intro.xml
===================================================================
--- gnome/lib/gnome-mime-data/gnome-mime-data-intro.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gnome-mime-data/gnome-mime-data-intro.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -1,14 +1,20 @@
 <sect2>
-<title>Introduction to gnome-mime-data</title>
+<title>Introduction to <application>gnome-mime-data</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&gnome-mime-data-download-http;"/>
-Download location (FTP):        <ulink url="&gnome-mime-data-download-ftp;"/>
-Version used:                   &gnome-mime-data-version;
-Package size:                   &gnome-mime-data-size;
-Estimated Disk space required:  &gnome-mime-data-buildsize;
-Estimated build time:           &gnome-mime-data-time;</screen>
+<para>The <application>gnome-mime-data</application> package contains the base set of file types
+and applications for GNOME.</para>
 
-<para>The gnome-mime-data package contains the base set of file types
-and applications for GNOME.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-mime-data-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-mime-data-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-mime-data-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-mime-data-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-mime-data-time;</para></listitem></itemizedlist>
+</sect3>
 
 
Index: gnome/lib/gnome-mime-data/gnome-mime-data.ent
===================================================================
--- gnome/lib/gnome-mime-data/gnome-mime-data.ent	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gnome-mime-data/gnome-mime-data.ent	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -5,8 +5,8 @@
 <!ENTITY gnome-mime-data-desc SYSTEM "gnome-mime-data-desc.xml">
 <!ENTITY gnome-mime-data-config SYSTEM "gnome-mime-data-config.xml">
-<!ENTITY gnome-mime-data-buildsize "4.4 MB">
-<!ENTITY gnome-mime-data-version "2.2.0">
-<!ENTITY gnome-mime-data-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.2/gnome-mime-data-2.2.0.tar.bz2">
-<!ENTITY gnome-mime-data-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.2/gnome-mime-data-2.2.0.tar.bz2">
+<!ENTITY gnome-mime-data-buildsize "6.0 MB">
+<!ENTITY gnome-mime-data-version "2.2.1">
+<!ENTITY gnome-mime-data-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.2/gnome-mime-data-2.2.1.tar.bz2">
+<!ENTITY gnome-mime-data-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.2/gnome-mime-data-2.2.1.tar.bz2">
 <!ENTITY gnome-mime-data-size "1.1 MB">
-<!ENTITY gnome-mime-data-time "0.02 SBU">
+<!ENTITY gnome-mime-data-time "0.01 SBU">
Index: gnome/lib/gnome-vfs/gnome-vfs-config.xml
===================================================================
--- gnome/lib/gnome-vfs/gnome-vfs-config.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gnome-vfs/gnome-vfs-config.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring gnome-vfs</title>
+<title>Configuring <application>gnome-vfs</application></title>
 
 
Index: gnome/lib/gnome-vfs/gnome-vfs-desc.xml
===================================================================
--- gnome/lib/gnome-vfs/gnome-vfs-desc.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gnome-vfs/gnome-vfs-desc.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The gnome-vfs package contains <filename>libgnomevfs</filename> libraries.</para>
+<para>The <application>gnome-vfs</application> package contains <filename>libgnomevfs</filename> libraries.</para>
 
 </sect2>
Index: gnome/lib/gnome-vfs/gnome-vfs-exp.xml
===================================================================
--- gnome/lib/gnome-vfs/gnome-vfs-exp.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gnome-vfs/gnome-vfs-exp.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -2,9 +2,9 @@
 <title>Command explanations</title>
 
-<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>
 
-<para><userinput>--disable-gtk-doc</userinput> : This switch will prevent
+<para><command>--disable-gtk-doc</command> : This switch will prevent
 the rebuilding of documentation during the make command.</para>
 
Index: gnome/lib/gnome-vfs/gnome-vfs-inst.xml
===================================================================
--- gnome/lib/gnome-vfs/gnome-vfs-inst.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gnome-vfs/gnome-vfs-inst.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of gnome-vfs</title>
+<title>Installation of <application>gnome-vfs</application></title>
 
-<para>Install gnome-vfs by running the following commands:</para>
+<para>Install <application>gnome-vfs</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome --disable-gtk-doc &amp;&amp;
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome --disable-gtk-doc &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/lib/gnome-vfs/gnome-vfs-intro.xml
===================================================================
--- gnome/lib/gnome-vfs/gnome-vfs-intro.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gnome-vfs/gnome-vfs-intro.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -2,18 +2,31 @@
 <title>Introduction to gnome-vfs</title>
 
-<screen>Download location (HTTP):       <ulink url="&gnome-vfs-download-http;"/>
-Download location (FTP):        <ulink url="&gnome-vfs-download-ftp;"/>
-Version used:                   &gnome-vfs-version;
-Package size:                   &gnome-vfs-size;
-Estimated Disk space required:  &gnome-vfs-buildsize;
-Estimated build time:           &gnome-vfs-time;</screen>
+<para>The <application>gnome-vfs</application> package contains virtual file system libraries. This
+is used
+as one of the foundations of the <application>Nautilus</application> file manager.</para>
 
-<para>The gnome-vfs package contains virtual file system libraries. This is used
-as one of the foundations of the Nautilus file manager.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-vfs-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-vfs-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-vfs-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-vfs-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-vfs-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>gnome-vfs depends on:
-<xref linkend="ORBit2"/>, <xref linkend="GConf"/>, <xref linkend="bonobo-activation"/> and <xref linkend="gnome-mime-data"/>
-gnome-vfs will utilize:
-<xref linkend="libfam"/>, <xref linkend="openssl"/>, <xref linkend="CDParanoia"/>, <xref linkend="gtk-doc"/> and <xref linkend="DocBook"/></screen>
+<sect3><title><application>template</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="ORBit2"/>, <xref linkend="GConf"/>, <xref
+linkend="bonobo-activation"/> and <xref linkend="gnome-mime-data"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="libfam"/>, <xref linkend="openssl"/>, <xref
+linkend="CDParanoia"/>, <xref linkend="gtk-doc"/> and <xref
+linkend="DocBook"/></para></sect4>
+</sect3>
+
 
 </sect2>
Index: gnome/lib/gnome-vfs/gnome-vfs.ent
===================================================================
--- gnome/lib/gnome-vfs/gnome-vfs.ent	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ gnome/lib/gnome-vfs/gnome-vfs.ent	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -5,8 +5,8 @@
 <!ENTITY gnome-vfs-desc SYSTEM "gnome-vfs-desc.xml">
 <!ENTITY gnome-vfs-config SYSTEM "gnome-vfs-config.xml">
-<!ENTITY gnome-vfs-buildsize "13.6 MB">
-<!ENTITY gnome-vfs-version "2.2.3">
-<!ENTITY gnome-vfs-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.2/gnome-vfs-2.2.3.tar.bz2">
-<!ENTITY gnome-vfs-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.2/gnome-vfs-2.2.3.tar.bz2">
-<!ENTITY gnome-vfs-size "972 KB">
-<!ENTITY gnome-vfs-time "2.17 SBU">
+<!ENTITY gnome-vfs-buildsize "36.0 MB">
+<!ENTITY gnome-vfs-version "2.2.5">
+<!ENTITY gnome-vfs-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.2/gnome-vfs-2.2.5.tar.bz2">
+<!ENTITY gnome-vfs-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.2/gnome-vfs-2.2.5.tar.bz2">
+<!ENTITY gnome-vfs-size "956 KB">
+<!ENTITY gnome-vfs-time "1.36 SBU">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ introduction/welcome/changelog.xml	(revision 8f847979b34d379f61f6b6666dca8e9dc8be8e70)
@@ -11,4 +11,7 @@
 <itemizedlist>
 
+<listitem><para>August 31st, 2003 [larry]: gnome: updated to
+GConf-2.2.1, gnome-mime-data-2.2.1, gnome-vfs-2.2.5.</para></listitem>
+
 <listitem><para>August 31st, 2003 [larry]: updated into of wvdial and
 wvstreams submitted by Igor.</para></listitem>
