Index: basicnet/netutils/ethereal.xml
===================================================================
--- basicnet/netutils/ethereal.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ basicnet/netutils/ethereal.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -59,5 +59,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="pkgconfig"/>, 
-<xref linkend="GTK"/> or <xref linkend="GTK2"/> (to build the 
+<xref linkend="GTK"/> or <xref linkend="gtk2"/> (to build the 
 <acronym>GUI</acronym> front-end), 
 <xref linkend="openssl"/>, 
Index: general.ent
===================================================================
--- general.ent	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ general.ent	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -280,5 +280,5 @@
 <!ENTITY pango-version                "1.8.0">   
 <!ENTITY atk-version                  "1.9.0"> 
-<!ENTITY GTK2-version                 "2.4.13"> 
+<!ENTITY gtk2-version                 "2.6.0"> 
 <!ENTITY lesstif-version              "0.94.0">   
 <!ENTITY startup-notification-version "0.8">   
Index: general/genlib/libglade.xml
===================================================================
--- general/genlib/libglade.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ general/genlib/libglade.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -46,5 +46,5 @@
 <sect4><title>Required</title>
 <para><xref linkend="libxml2"/> and 
-<xref linkend="GTK2"/></para>
+<xref linkend="gtk2"/></para>
 </sect4>
 
Index: general/genutils/rep-gtk.xml
===================================================================
--- general/genutils/rep-gtk.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ general/genutils/rep-gtk.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -52,5 +52,5 @@
 <sect3><title><application>rep-gtk</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="GTK2"/>, <xref linkend="libglade"/> and 
+<para><xref linkend="gtk2"/>, <xref linkend="libglade"/> and 
 <xref linkend="librep"/></para></sect4>
 </sect3>
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ general/graphlib/librsvg.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -45,5 +45,5 @@
 <sect3><title><application>librsvg</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="GTK2"/>, 
+<para><xref linkend="gtk2"/>, 
 <xref linkend="libxml2"/>, 
 <xref linkend="libart_lgpl"/> and 
Index: gnome/add/gucharmap.xml
===================================================================
--- gnome/add/gucharmap.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ gnome/add/gucharmap.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -48,5 +48,5 @@
 <sect3><title><application>gucharmap</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="intltool"/> and <xref linkend="GTK2"/></para>
+<para><xref linkend="intltool"/> and <xref linkend="gtk2"/></para>
 </sect4>
 
Index: gnome/core/gconf.xml
===================================================================
--- gnome/core/gconf.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ gnome/core/gconf.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -43,5 +43,5 @@
 <sect4><title>Required</title>
 <para><xref linkend="ORBit2"/>, 
-<xref linkend="GTK2"/> and 
+<xref linkend="gtk2"/> and 
 <xref linkend="libxml2"/></para>
 </sect4>
Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ gnome/core/gnome-keyring.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -43,5 +43,5 @@
 <sect3><title><application>gnome-keyring</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="GTK2"/></para>
+<para><xref linkend="gtk2"/></para>
 </sect4>
 </sect3>
Index: gnome/core/gtk-engines.xml
===================================================================
--- gnome/core/gtk-engines.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ gnome/core/gtk-engines.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -46,5 +46,5 @@
 dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="GTK2"/></para>
+<para><xref linkend="gtk2"/></para>
 </sect4>
 </sect3>
Index: gnome/core/libwnck.xml
===================================================================
--- gnome/core/libwnck.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ gnome/core/libwnck.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -43,5 +43,5 @@
 <sect3><title><application>libwnck</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="GTK2"/></para>
+<para><xref linkend="gtk2"/></para>
 </sect4>
 
Index: gnome/core/vte.xml
===================================================================
--- gnome/core/vte.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ gnome/core/vte.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -43,5 +43,5 @@
 <sect3><title><application>VTE</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="GTK2"/> and 
+<para><xref linkend="gtk2"/> and 
 <xref linkend="Python"/></para>
 </sect4>
Index: gnome/gnome-intro.xml
===================================================================
--- gnome/gnome-intro.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ gnome/gnome-intro.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -88,5 +88,5 @@
 <para>Required</para>
 <para>
-<xref linkend="GTK2"/> and
+<xref linkend="gtk2"/> and
 <xref linkend="popt"/>
 </para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ introduction/welcome/changelog.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -24,5 +24,6 @@
 
 <listitem><para>January 5th, 2004 [igor]: Updated to
-GLib-2.6.0, Pango-1.8.0, ATK-1.9.0 and libtiff-3.7.1.</para></listitem>
+GLib-2.6.0, Pango-1.8.0, ATK-1.9.0, libtiff-3.7.1 and
+GTK+-2.6.0.</para></listitem>
 
 <listitem><para>January 5th, 2004 [randy]: Updated to 
Index: multimedia/libdriv/gst-plugins.xml
===================================================================
--- multimedia/libdriv/gst-plugins.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ multimedia/libdriv/gst-plugins.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -54,5 +54,5 @@
 <xref linkend="freetype2"/>, 
 <xref linkend="GConf"/>, 
-<xref linkend="GTK2"/>, 
+<xref linkend="gtk2"/>, 
 <xref linkend="gnome-vfs"/>, 
 <ulink url="http://talinux.fi.tal.org/pub/talinux/sources/Hermes-1.3.3.tar.gz">Hermes</ulink>, 
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ postlfs/editors/vim.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -44,5 +44,5 @@
 url="&vim-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &vim-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &vim-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
@@ -64,5 +64,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="GTK2"/>, 
+<para><xref linkend="gtk2"/>, 
 <xref linkend="lesstif"/>, 
 <xref linkend="Python"/>, 
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ pst/scanning/sane.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -84,5 +84,5 @@
 <sect4><title>Optional (front ends)</title>
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
-<xref linkend="GTK2"/> and 
+<xref linkend="gtk2"/> and 
 <xref linkend="gimp"/></para>
 </sect4>
Index: pst/scanning/xsane.xml
===================================================================
--- pst/scanning/xsane.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ pst/scanning/xsane.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -42,5 +42,5 @@
 <sect4><title>Required</title>
 <para><xref linkend="sane"/> (back ends) and
-<xref linkend="GTK2"/></para></sect4>
+<xref linkend="gtk2"/></para></sect4>
 <sect4><title>Optional</title>
 <para><xref linkend="libtiff"/>, 
Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ x/lib/gtk+2.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -5,12 +5,13 @@
   %general-entities;
 
-  <!ENTITY GTK2-download-http "http://gd.tuwien.ac.at/graphics/gimp/gtk/v2.4/gtk+-&GTK2-version;.tar.bz2">
-  <!ENTITY GTK2-download-ftp  "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-&GTK2-version;.tar.bz2">
-  <!ENTITY GTK2-size          "8.9 MB">
-  <!ENTITY GTK2-buildsize     "198 MB">
-  <!ENTITY GTK2-time          "2.88 SBU">
+  <!ENTITY gtk2-download-http "http://gd.tuwien.ac.at/graphics/gimp/gtk/v2.6/gtk+-&gtk2-version;.tar.bz2">
+  <!ENTITY gtk2-download-ftp  "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-&gtk2-version;.tar.bz2">
+  <!ENTITY gtk2-md5sum        "ca717c728264fa0b3302ca00da2bcfe4">
+  <!ENTITY gtk2-size          "11 MB">
+  <!ENTITY gtk2-buildsize     "198 MB">
+  <!ENTITY gtk2-time          "3.09 SBU">
 ]>
 
-<sect1 id="GTK2" xreflabel="GTK+-&GTK2-version;">
+<sect1 id="gtk2" xreflabel="GTK+-&gtk2-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -18,23 +19,24 @@
 </sect1info>
 <?dbhtml filename="gtk2.html" ?>
-<title>GTK+-&GTK2-version;</title>
+<title>GTK+-&gtk2-version;</title>
 
 <sect2>
-<title>Introduction to <application>GTK+</application></title>
+<title>Introduction to <application><acronym>GTK</acronym>+</application></title>
 
-<para>The <application>GTK+</application> package contains
-<application>GTK+</application> Libraries. This is useful for
+<para>The <application><acronym>GTK</acronym>+</application> package contains
+<application><acronym>GTK</acronym>+</application> Libraries. This is useful for
 creating graphical user interfaces for applications.</para>
 
 <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>
+<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 MD5 sum: &gtk2-md5sum;</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>
+<sect3><title><application><acronym>GTK</acronym>+</application> dependencies</title>
 <sect4><title>Required</title>
 <para>
@@ -74,8 +76,8 @@
 instead of <filename class="directory">/usr/etc</filename>.</para>
 
-<para><option>--without-libtiff</option>: Omit this switch if you have
+<para><parameter>--without-libtiff</parameter>: Omit this switch if you have
 <application>libtiff</application> installed.</para>
 
-<para><option>--without-libjpeg</option>: Omit this switch if you have
+<para><parameter>--without-libjpeg</parameter>: Omit this switch if you have
 <application>libjpeg</application> installed.</para>
 
@@ -88,5 +90,10 @@
 <title>Contents</title>
 
-<para>The <application>GTK+</application> package contains
+<para>The <application><acronym>GTK</acronym>+</application> package contains
+<command>gdk-pixbuf-csource</command>,
+<command>gdk-pixbuf-query-loaders</command>,
+<command>gtk-demo</command>,
+<command>gtk-query-immodules-2.0</command>,
+<command>gtk-update-icon-cache</command>,
 <filename class="libraryfile">libgdk_pixbuf-2.0</filename>,
 <filename class="libraryfile">libgdk-x11-2.0</filename>,
@@ -99,6 +106,26 @@
 <sect2><title>Description</title>
 
-<sect3><title>GTK+ Libraries</title>
-<para><application>GTK+</application> Libraries provide the 
+<sect3><title>gdk-pixbuf-csource</title>
+<para><command>gdk-pixbuf-csource</command> generates C code containing
+images, useful for compiling images directly into
+programs.</para></sect3>
+
+<sect3><title>gdk-pixbuf-query-loaders</title>
+<para><command>gdk-pixbuf-query-loaders</command> collects information
+about loadable modules for gdk-pixbuf and writes it to standard
+output.</para></sect3>
+
+<sect3><title>gtk-query-immodules-2.0</title>
+<para><command>gtk-query-immodules-2.0</command> collects information
+about loadable input method modules for
+<application><acronym>GTK</acronym>+</application> and writes it to
+standard output.</para></sect3>
+
+<sect3><title>gtk-update-icon-cache</title>
+<para><command>gtk-update-icon-cache</command> creates mmap()able cache
+files for icon themes.</para></sect3>
+
+<sect3><title><application><acronym>GTK</acronym>+</application> Libraries</title>
+<para><application><acronym>GTK</acronym>+</application> Libraries provide the 
 <acronym>API</acronym> to implement graphical user
 interfaces.</para></sect3>
@@ -107,3 +134,2 @@
 
 </sect1>
-
Index: x/wm/metacity.xml
===================================================================
--- x/wm/metacity.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ x/wm/metacity.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -45,5 +45,5 @@
 <para><xref linkend="intltool"/>, 
 <xref linkend="GConf"/> and 
-<xref linkend="GTK2"/></para>
+<xref linkend="gtk2"/></para>
 </sect4>
 
Index: x/wm/sawfish.xml
===================================================================
--- x/wm/sawfish.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ x/wm/sawfish.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -47,5 +47,5 @@
 <xref linkend="rep-gtk"/>, 
 <xref linkend="esound"/> and 
-<xref linkend="GTK2"/></para>
+<xref linkend="gtk2"/></para>
 </sect4>
 
Index: x/wm/xfce.xml
===================================================================
--- x/wm/xfce.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ x/wm/xfce.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -41,5 +41,5 @@
 <sect3><title><application>XFce</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="GTK2"/> and 
+<para><xref linkend="gtk2"/> and 
 <xref linkend="libxml2"/></para>
 </sect4>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ xsoft/graphweb/firefox.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -43,5 +43,5 @@
 <sect3><title><application>Firefox</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="GTK2"/>, 
+<para><xref linkend="gtk2"/>, 
 <xref linkend="libIDL"/> and 
 <xref linkend="zip"/></para>
Index: xsoft/graphweb/mozilla.xml
===================================================================
--- xsoft/graphweb/mozilla.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ xsoft/graphweb/mozilla.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -84,5 +84,5 @@
 <sect4><title>Required</title>
 <para><xref linkend="zip"/>, 
-<xref linkend="GTK2"/>, 
+<xref linkend="gtk2"/>, 
 <xref linkend="libIDL"/></para>
 </sect4>
Index: xsoft/office/gimp.xml
===================================================================
--- xsoft/office/gimp.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ xsoft/office/gimp.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -58,5 +58,5 @@
 dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="GTK2"/> and 
+<para><xref linkend="gtk2"/> and 
 <xref linkend="libart_lgpl"/></para>
 </sect4>
Index: xsoft/other/pan.xml
===================================================================
--- xsoft/other/pan.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ xsoft/other/pan.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -34,5 +34,5 @@
 url="&pan-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &pan-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &pan-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
@@ -42,5 +42,5 @@
 <sect3><title><application>Pan</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="GTK2"/>, <xref linkend="gnet"/>, <xref
+<para><xref linkend="gtk2"/>, <xref linkend="gnet"/>, <xref
 linkend="intltool"/> and <xref linkend="libxml2"/></para></sect4>
 <sect4><title>Optional</title>
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision f13a39eb5fad48438e63ad16a2531ed6b86933fa)
+++ xsoft/other/thunderbird.xml	(revision a8eba109d59ac8c74e85ae9390e01d9e43f637ca)
@@ -64,5 +64,5 @@
 <sect4><title>Required</title>
 <para><xref linkend="zip"/>, 
-<xref linkend="GTK2"/> and 
+<xref linkend="gtk2"/> and 
 <xref linkend="libIDL"/></para>
 </sect4>
