Index: general/sysutils/pkgconfig/pkgconfig-config.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-config.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ general/sysutils/pkgconfig/pkgconfig-config.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Configuring pkgconfig</title>
+<title>Configuring <application>pkgconfig</application></title>
 
 <para>Add to your system or personal profile:
-<screen><userinput>export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig</userinput></screen></para>
+<screen><userinput><command>export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig</command></userinput></screen></para>
 
 <para>The default settings for <envar>PKG_CONFIG_PATH</envar> are
Index: general/sysutils/pkgconfig/pkgconfig-desc.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-desc.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ general/sysutils/pkgconfig/pkgconfig-desc.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The pkgconfig package contains <userinput>pkg-config</userinput>.</para>
+<para>The <application>pkgconfig</application> package contains
+<command>pkg-config</command>.</para>
 
 </sect2>
@@ -9,5 +10,5 @@
 
 <sect3><title>pkg-config</title>
-<para>pkg-config is a function that returns meta information for the
+<para><command>pkg-config</command> is a function that returns meta information for the
 specified library.</para></sect3>
 
Index: general/sysutils/pkgconfig/pkgconfig-inst.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-inst.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ general/sysutils/pkgconfig/pkgconfig-inst.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of pkgconfig</title>
+<title>Installation of <application>pkgconfig</application></title>
 
-<para>Install pkgconfig by running the following commands:</para>
+<para>Install <application>pkgconfig</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen></para>
 
 </sect2>
Index: general/sysutils/pkgconfig/pkgconfig-intro.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-intro.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ general/sysutils/pkgconfig/pkgconfig-intro.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -1,15 +1,19 @@
 <sect2>
-<title>Introduction to pkgconfig</title>
+<title>Introduction to <application>pkgconfig</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&pkgconfig-download-http;"/>
-Download location (FTP):        <ulink url="&pkgconfig-download-ftp;"/>
-Version used:                   &pkgconfig-version;
-Package size:                   &pkgconfig-size;
-Estimated Disk space required:  &pkgconfig-buildsize;
-Estimated build time:           &pkgconfig-time;</screen>
-
-<para>The pkgconfig package contains pkg-config. This is useful for
+<para>The <application>pkgconfig</application> package contains
+<filename>pkg-config</filename>. This is useful for
 passing the include path and/or library path to the compiler during the
 make script.</para>
 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&pkgconfig-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&pkgconfig-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &pkgconfig-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &pkgconfig-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &pkgconfig-time;</para></listitem></itemizedlist>
+</sect3>
+
+
 </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ introduction/welcome/changelog.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -11,6 +11,9 @@
 <itemizedlist>
 
+<listitem><para>June 12th, 2003 [larry]: general: Updated intro on
+pkgconfig and atk.</para></listitem>
+
 <listitem><para>June 12th, 2003 [larry]: x: updated to
-Pango-1.2.3.</para></listitem>
+Pango-1.2.3 and GTK+-2.2.2.</para></listitem>
 
 <listitem><para>June 12th, 2003 [larry]: general: updated to
Index: x/lib/atk/atk-config.xml
===================================================================
--- x/lib/atk/atk-config.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ x/lib/atk/atk-config.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring ATK</title>
+<title>Configuring <application>ATK</application></title>
 
 <sect3><title>Configuration Information</title>
Index: x/lib/atk/atk-desc.xml
===================================================================
--- x/lib/atk/atk-desc.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ x/lib/atk/atk-desc.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The atk package contains <filename>libatk</filename> libraries.</para>
+<para>The <application>atk</application> package contains <filename>libatk</filename> libraries.</para>
 
 </sect2>
@@ -9,5 +9,5 @@
 
 <sect3><title>ATK Libraries</title>
-<para>ATK Libraries contain the API used by assistive technologies in order to 
+<para>ATK Libraries contain the <acronym>API</acronym> used by assistive technologies in order to 
 interact with the desktop and applications.</para></sect3>
 
Index: x/lib/atk/atk-exp.xml
===================================================================
--- x/lib/atk/atk-exp.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ x/lib/atk/atk-exp.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -2,6 +2,6 @@
 <title>Command explanations</title>
 
-<para><userinput>--enable-gtk-doc</userinput> : This switch will rebuild
-the API documentation during the make command.</para>
+<para><command>--enable-gtk-doc</command> : This switch will rebuild
+the <acronym>API</acronym> documentation during the make command.</para>
 
 </sect2>
Index: x/lib/atk/atk-inst.xml
===================================================================
--- x/lib/atk/atk-inst.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ x/lib/atk/atk-inst.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of ATK</title>
+<title>Installation of <application>ATK</application></title>
 
-<para>Install ATK by running the following commands:</para>
+<para>Install <application>ATK</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen></para>
 
 </sect2>
Index: x/lib/atk/atk-intro.xml
===================================================================
--- x/lib/atk/atk-intro.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ x/lib/atk/atk-intro.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -1,20 +1,26 @@
 <sect2>
-<title>Introduction to ATK</title>
+<title>Introduction to <application>ATK</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&ATK-download-http;"/>
-Download location (FTP):        <ulink url="&ATK-download-ftp;"/>
-Version used:                   &ATK-version;
-Package size:                   &ATK-size;
-Estimated Disk space required:  &ATK-buildsize;
-Estimated build time:           &ATK-time;</screen>
-
-<para>The atk package contains the ATK libraries. They are useful for
-allowing accessibility solutions to be available for all GTK2
+<para>The <application>atk</application> package contains the
+<application>ATK</application> libraries. They are useful for
+allowing accessibility solutions to be available for all
+<application>GTK2</application>
 applications.</para>
 
-<screen>ATK depends on:
-<xref linkend="GLib2"/>
-ATK 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="&ATK-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&ATK-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &ATK-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &ATK-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &ATK-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>ATK</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GLib2"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gtk-doc"/> and <xref linkend="sgml-dtd-3"/></para></sect4>
+</sect3>
 
 </sect2>
Index: x/lib/gtk/gtk+2-config.xml
===================================================================
--- x/lib/gtk/gtk+2-config.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ x/lib/gtk/gtk+2-config.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring GTK+</title>
+<title>Configuring <application>GTK+</application></title>
 
 <sect3><title>Configuration Information</title>
Index: x/lib/gtk/gtk+2-desc.xml
===================================================================
--- x/lib/gtk/gtk+2-desc.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ x/lib/gtk/gtk+2-desc.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The GTK+ package contains <filename>libgtk-x11-2.0</filename> libraries.</para>
+<para>The <application>GTK+</application> package contains <filename>libgtk-x11-2.0</filename> libraries.</para>
 
 </sect2>
@@ -9,5 +9,5 @@
 
 <sect3><title>GTK+ Libraries</title>
-<para>GTK+ Libraries provide the API to implement graphical user
+<para>GTK+ Libraries provide the <acronym>API</acronym> to implement graphical user
 interfaces.</para></sect3>
 
Index: x/lib/gtk/gtk+2-exp.xml
===================================================================
--- x/lib/gtk/gtk+2-exp.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ x/lib/gtk/gtk+2-exp.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -2,8 +2,8 @@
 <title>Command explanations</title>
 
-<para><userinput>--sysconfdir=/etc</userinput> : This switch installs the configuration files into <filename>/etc</filename> instead of <filename>/usr/etc</filename>.</para>
+<para><command>--sysconfdir=/etc</command> : This switch installs the configuration files into <filename>/etc</filename> instead of <filename>/usr/etc</filename>.</para>
 
-<para><userinput>--enable-gtk-doc</userinput> : This switch will rebuild
-the API documentation during the make command.</para>
+<para><command>--enable-gtk-doc</command> : This switch will rebuild
+the <acronym>API</acronym> documentation during the make command.</para>
 </sect2>
 
Index: x/lib/gtk/gtk+2-inst.xml
===================================================================
--- x/lib/gtk/gtk+2-inst.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ x/lib/gtk/gtk+2-inst.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of GTK+</title>
+<title>Installation of <application>GTK+</application></title>
 
-<para>Install GTK+ by running the following commands:</para>
+<para>Install <application>GTK+</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<para><screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen></para>
 
 </sect2>
Index: x/lib/gtk/gtk+2-intro.xml
===================================================================
--- x/lib/gtk/gtk+2-intro.xml	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ x/lib/gtk/gtk+2-intro.xml	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -1,20 +1,27 @@
 <sect2>
-<title>Introduction to GTK+</title>
+<title>Introduction to <application>GTK+</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&GTK2-download-http;"/>
-Download location (FTP):        <ulink url="&GTK2-download-ftp;"/>
-Version used:                   &GTK2-version;
-Package size:                   &GTK2-size;
-Estimated Disk space required:  &GTK2-buildsize;
-Estimated build time:           &GTK2-time;</screen>
-
-<para>The GTK+ package contains GTK+ Libraries. This is useful for
+<para>The <application>GTK+</application> package contains
+<application>GTK+</application> Libraries. This is useful for
 creating graphical user interfaces for applications.</para>
 
-<screen>GTK+ depends on:
-<xref linkend="GLib2"/>, <xref linkend="xfree86"/>, <xref linkend="Pango"/>, <xref linkend="ATK"/>, 
-<xref linkend="libpng"/>, <xref linkend="libtiff"/> and <xref linkend="libjpeg"/>
-GTK+ will utilize:
-<xref linkend="gtk-doc"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&GTK2-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&GTK2-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &GTK2-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &GTK2-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &GTK2-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>GTK+</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GLib2"/>, <xref linkend="xfree86"/>, <xref
+linkend="Pango"/>, <xref linkend="ATK"/>,
+<xref linkend="libpng"/>, <xref linkend="libtiff"/> and <xref
+linkend="libjpeg"/> </para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gtk-doc"/> </para></sect4>
+</sect3>
 
 </sect2>
Index: x/lib/gtk/gtk.ent
===================================================================
--- x/lib/gtk/gtk.ent	(revision d4b3e5f6e27806b71ca48ff9fa4159efc0a9c3f9)
+++ x/lib/gtk/gtk.ent	(revision cff9a38a6e99d6103a52f3e720935dc016c0b29f)
@@ -18,8 +18,8 @@
 <!ENTITY GTK2-exp SYSTEM "gtk+2-exp.xml">
 <!ENTITY GTK2-config SYSTEM "gtk+2-config.xml">
-<!ENTITY GTK2-buildsize "66.1 MB">
-<!ENTITY GTK2-version "2.2.1">
+<!ENTITY GTK2-buildsize "68 MB">
+<!ENTITY GTK2-version "2.2.2">
 <!ENTITY GTK2-download-http "">
-<!ENTITY GTK2-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.1.tar.bz2">
-<!ENTITY GTK2-size "6.3 MB">
+<!ENTITY GTK2-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-&GTK2-version;.tar.bz2">
+<!ENTITY GTK2-size "6.8 MB">
 <!ENTITY GTK2-time "5.49 SBU">
