Index: gnome/lib/gnomelib/gnome-libs-intro.xml
===================================================================
--- gnome/lib/gnomelib/gnome-libs-intro.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ gnome/lib/gnomelib/gnome-libs-intro.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -12,5 +12,5 @@
 
 <screen>gnome-libs depends on:
-<xref linkend="ORBit"/>, <xref linkend="GTK"/>, <xref linkend="imlib"/> and <xref linkend="db"/>
+<xref linkend="ORBit"/>, <xref linkend="GTK"/>, <xref linkend="imlib"/> and <xref linkend="db-3.3"/>
 gnome-libs will utilize:
 <xref linkend="audiofile"/>, <xref linkend="esound"/> and <xref linkend="gtk-doc"/></screen>
Index: kde/inst/kde-addons.xml
===================================================================
--- kde/inst/kde-addons.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-addons.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,9 +1,9 @@
 <sect1 id="kde-addons">
 <?dbhtml filename="kde-addons.html" dir="kde"?>
-<title>Installation of KDE Addons</title>
+<title>kdeaddons-&kde-version;</title>
 
-<para><screen>Download location (FTP):    <ulink url="&kde-addons-ftp;"/> 
-Estimated build disk space:  17 MB
-Estimated installed space:    5 MB
+<para><screen>Download location (FTP):     <ulink url="&kde-addons-ftp;"/> 
+Estimated build disk space:  23 MB
+Estimated installed space:   5 MB
 Package size:                &kde-addons-size;
 Estimated build time:        15 min (667 MHz)</screen></para>
Index: kde/inst/kde-admin.xml
===================================================================
--- kde/inst/kde-admin.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-admin.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,9 +1,9 @@
 <sect1 id="kde-admin">
 <?dbhtml filename="kde-admin.html" dir="kde"?>
-<title>Installation of KDE Admin</title>
+<title>kdeadmin-&kde-version;</title>
 
-<para><screen>Download location (FTP):    <ulink url="&kde-admin-ftp;"/> 
-Estimated build disk space:  18 MB
-Estimated installed space:    4 MB
+<para><screen>Download location (FTP):     <ulink url="&kde-admin-ftp;"/> 
+Estimated build disk space:  23 MB
+Estimated installed space:   4 MB
 Package size:                &kde-admin-size;
 Estimated build time:        10 min (667 MHz)</screen></para>
Index: kde/inst/kde-artwork.xml
===================================================================
--- kde/inst/kde-artwork.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-artwork.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,11 +1,11 @@
 <sect1 id="kde-artwork">
 <?dbhtml filename="kde-artwork.html" dir="kde"?>
-<title>Installation of KDE Artwork</title>
+<title>kdeartwork-&kde-version;</title>
 
-<para><screen>Download location (FTP):    <ulink url="&kde-artwork-ftp;"/> 
-Estimated build disk space:  32 MB
+<para><screen>Download location (FTP):     <ulink url="&kde-artwork-ftp;"/> 
+Estimated build disk space:  47 MB
 Estimated installed space:   21 MB
 Package size:                &kde-base-size;
-Estimated build time:         8 min (667 MHz)</screen></para>
+Estimated build time:        8 min (667 MHz)</screen></para>
 
 <para>kdeartwork depends on:
Index: kde/inst/kde-base.xml
===================================================================
--- kde/inst/kde-base.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-base.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,6 +1,6 @@
-<sect1 id="kde-base" xreflabel="kde-base-&kde-version;">
-<title>Installing kdebase</title>
-<para><screen>Download location (FTP):    <ulink url="&kde-base-ftp;"/>
-Estimated build disk space: 132 MB
+<sect1 id="kde-base" xreflabel="kdebase-&kde-version;">
+<title>kdebase-&kde-version;</title>
+<para><screen>Download location (FTP):     <ulink url="&kde-base-ftp;"/>
+Estimated build disk space:  132 MB
 Estimated installed space:   45 MB
 Package size:                &kde-base-size;
Index: kde/inst/kde-edu.xml
===================================================================
--- kde/inst/kde-edu.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-edu.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,8 +1,8 @@
 <sect1 id="kde-edu">
 <?dbhtml filename="kde-edu.html" dir="kde"?>
-<title>Installation of KDE Edu</title>
+<title>kdeedu-&kde-version;</title>
 
-<para><screen>Download location (FTP):    <ulink url="&kde-edu-ftp;"/> 
-Estimated build disk space:  37 MB
+<para><screen>Download location (FTP):     <ulink url="&kde-edu-ftp;"/> 
+Estimated build disk space:  78 MB
 Estimated installed space:   15 MB
 Package size:                &kde-edu-size;
Index: kde/inst/kde-games.xml
===================================================================
--- kde/inst/kde-games.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-games.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,8 +1,8 @@
 <sect1 id="kde-games">
 <?dbhtml filename="kde-games.html" dir="kde"?>
-<title>Installation of KDE Games</title>
+<title>kdegames-&kde-version;</title>
 
-<para><screen>Download location (FTP):    <ulink url="&kde-games-ftp;"/> 
-Estimated build disk space:  54 MB
+<para><screen>Download location (FTP):     <ulink url="&kde-games-ftp;"/> 
+Estimated build disk space:  70 MB
 Estimated installed space:   20 MB
 Package size:                &kde-games-size;
Index: kde/inst/kde-graphics.xml
===================================================================
--- kde/inst/kde-graphics.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-graphics.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,9 +1,9 @@
-<sect1 id="kde-graphics">
+<sect1 id="kde-graphics" xreflabel="kdegraphics-&kde-version;">
 <?dbhtml filename="kde-graphics.html" dir="kde"?>
-<title>Installation of KDE Graphics</title>
+<title>kdegraphics-&kde-version;</title>
 
-<para><screen>Download location (FTP):    <ulink url="&kde-graphics-ftp;"/>  
-Estimated build disk space:  24 MB
-Estimated installed space:    7 MB
+<para><screen>Download location (FTP):     <ulink url="&kde-graphics-ftp;"/>  
+Estimated build disk space:  38 MB
+Estimated installed space:   7 MB
 Package size:                &kde-graphics-size;
 Estimated build time:        24 min (667 MHz)</screen></para>
Index: kde/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-libs.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,7 +1,7 @@
-<sect1 id="kde-libs">
-<title>Installing kdelibs</title>
+<sect1 id="kde-libs" xreflabel="kdebase-&kde-version;">
+<title>kdelibs-&kde-version;</title>
  
-<para><screen>Download location (FTP):    <ulink url="&kde-libs-ftp;"/>
-Estimated build disk space: 115 MB
+<para><screen>Download location (FTP):     <ulink url="&kde-libs-ftp;"/>
+Estimated build disk space:  115 MB
 Estimated installed space:   41 MB
 Package size:                &kde-libs-size;
Index: kde/inst/kde-multimedia.xml
===================================================================
--- kde/inst/kde-multimedia.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-multimedia.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,8 +1,8 @@
-<sect1 id="kde-multimedia" xreflabel="kde-multimedia-&kde-version;">
+<sect1 id="kde-multimedia" xreflabel="kdemultimedia-&kde-version;">
 <?dbhtml filename="kde-multimedia.html" dir="kde"?>
-<title>Installation of KDE Multimedia</title>
+<title>kdemultimedia-&kde-version;</title>
 
-<para><screen>Download location (FTP):    <ulink url="&kde-multimedia-ftp;"/> 
-Estimated build disk space:  69 MB
+<para><screen>Download location (FTP):     <ulink url="&kde-multimedia-ftp;"/> 
+Estimated build disk space:  78 MB
 Estimated installed space:   15 MB
 Package size:                &kde-multimedia-size;
Index: kde/inst/kde-network.xml
===================================================================
--- kde/inst/kde-network.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-network.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,8 +1,8 @@
-<sect1 id="kde-network" xreflabel="kde-network-&kde-version;">
+<sect1 id="kde-network" xreflabel="kdenetwork-&kde-version;">
 <?dbhtml filename="kde-network.html" dir="kde"?>
-<title>Installation of KDE Network</title>
+<title>kdenetwork-&kde-version;</title>
 
-<para><screen>Download location (FTP):    <ulink url="&kde-network-ftp;"/>
-Estimated build disk space:  52 MB
+<para><screen>Download location (FTP):     <ulink url="&kde-network-ftp;"/>
+Estimated build disk space:  71 MB
 Estimated installed space:   16 MB
 Package size:                &kde-network-size;
Index: kde/inst/kde-pim.xml
===================================================================
--- kde/inst/kde-pim.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-pim.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,9 +1,9 @@
 <sect1 id="kde-pim">
 <?dbhtml filename="kde-pim.html" dir="kde"?>
-<title>Installation of KDE PIM</title>
+<title>kdepim-&kde-version;</title>
 
-<para><screen>Download location (FTP):    <ulink url="&kde-pim-ftp;"/> 
-Estimated build disk space:  50 MB
-Estimated installed space:    7 MB
+<para><screen>Download location (FTP):     <ulink url="&kde-pim-ftp;"/> 
+Estimated build disk space:  63 MB
+Estimated installed space:   7 MB
 Package size:                &kde-pim-size;
 Estimated build time:        22 min (667 MHz)</screen></para>
Index: kde/inst/kde-toys.xml
===================================================================
--- kde/inst/kde-toys.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-toys.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,11 +1,11 @@
 <sect1 id="kde-toys">
 <?dbhtml filename="kde-toys.html" dir="kde"?>
-<title>Installation of KDE Toys</title>
+<title>kdetoys-&kde-version;</title>
 
-<para><screen>Download location (FTP):    <ulink url="&kde-toys-ftp;"/> 
+<para><screen>Download location (FTP):     <ulink url="&kde-toys-ftp;"/> 
 Estimated build disk space:  12 MB
-Estimated installed space:    4 MB
+Estimated installed space:   4 MB
 Package size:                &kde-toys-size;
-Estimated build time:         4 min (667 MHz)</screen></para>
+Estimated build time:        4 min (667 MHz)</screen></para>
 
 <para>kdetoys depends on:
Index: kde/inst/kde-utils.xml
===================================================================
--- kde/inst/kde-utils.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kde-utils.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,10 +1,10 @@
 <sect1 id="kde-utils">
 <?dbhtml filename="kde-utils.html" dir="kde"?>
-<title>Installation of KDE Utils</title>
+<title>kdeutils-&kde-version;</title>
 
-<para><screen>Download location (FTP):    <ulink url="&kde-utils-ftp;"/> 
-Estimated build disk space:  23 MB
-Estimated installed space:     6 MB
-Package size:                 &kde-utils-size;
+<para><screen>Download location (FTP):     <ulink url="&kde-utils-ftp;"/> 
+Estimated build disk space:  26 MB
+Estimated installed space:   6 MB
+Package size:                &kde-utils-size;
 Estimated build time:        13 min (667 MHz)</screen></para>
 
Index: kde/inst/kdoc.xml
===================================================================
--- kde/inst/kdoc.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/inst/kdoc.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -1,4 +1,4 @@
 <sect1 id="kdoc" xreflabel="kdoc-&kde-version;">
-<title>Installing kdoc</title>
+<title>kdoc</title>
 <para><screen>Download location (FTP):     <ulink url="&kdoc-ftp;"/>
 Estimated build disk space:  512 KB
Index: kde/kde.ent
===================================================================
--- kde/kde.ent	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/kde.ent	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -9,7 +9,7 @@
 <!ENTITY kde-core-arts SYSTEM    "core/arts.xml">
 <!ENTITY arts-version        "1.1">
-<!ENTITY arts-download-size  "947   KB">
-<!ENTITY arts-build-size     " 35   MB">
-<!ENTITY arts-install-size   "  5.7 MB">
+<!ENTITY arts-download-size  "947 KB">
+<!ENTITY arts-build-size     "35 MB">
+<!ENTITY arts-install-size   "5.7 MB">
 <!ENTITY arts-download-ftp "ftp://ftp.kde.org/pub/kde/stable/&kde-version;/src/arts-&arts-version;.tar.bz2">
 <!ENTITY arts-build-time    "11 min (667 MHz)">
@@ -49,29 +49,29 @@
 
 <!ENTITY kde-libs-ftp "&kde-download;/kdelibs-&kde-version;.tar.bz2">
-<!ENTITY kde-libs-size " 7.2 MB">
+<!ENTITY kde-libs-size "7.2 MB">
 <!ENTITY kde-base-ftp "&kde-download;/kdebase-&kde-version;.tar.bz2">
 <!ENTITY kde-base-size "12.0 MB">
 <!ENTITY kde-multimedia-ftp "&kde-download;/kdemultimedia-&kde-version;.tar.bz2">
-<!ENTITY kde-multimedia-size "5.5 MB">
+<!ENTITY kde-multimedia-size "5.8 MB">
 <!ENTITY kde-network-ftp "&kde-download;/kdenetwork-&kde-version;.tar.bz2">
-<!ENTITY kde-network-size "3.7 MB">
+<!ENTITY kde-network-size "4.8 MB">
 <!ENTITY kde-graphics-ftp "&kde-download;/kdegraphics-&kde-version;.tar.bz2">
-<!ENTITY kde-graphics-size "2.5 MB">
+<!ENTITY kde-graphics-size "4.4 MB">
 <!ENTITY kde-pim-ftp "&kde-download;/kdepim-&kde-version;.tar.bz2">
-<!ENTITY kde-pim-size "3.0 MB">
+<!ENTITY kde-pim-size "3.1 MB">
 <!ENTITY kde-admin-ftp "&kde-download;/kdeadmin-&kde-version;.tar.bz2">
-<!ENTITY kde-admin-size "1.2 MB">
+<!ENTITY kde-admin-size "1.5 MB">
 <!ENTITY kde-games-ftp "&kde-download;/kdegames-&kde-version;.tar.bz2">
-<!ENTITY kde-games-size "6.9 MB">
+<!ENTITY kde-games-size "8.0 MB">
 <!ENTITY kde-utils-ftp "&kde-download;/kdeutils-&kde-version;.tar.bz2">
 <!ENTITY kde-utils-size "1.4 MB">
 <!ENTITY kde-edu-ftp "&kde-download;/kdeedu-&kde-version;.tar.bz2">
-<!ENTITY kde-edu-size   "8.7 MB">
+<!ENTITY kde-edu-size   "20 MB">
 <!ENTITY kde-artwork-ftp "&kde-download;/kdeartwork-&kde-version;.tar.bz2">
-<!ENTITY kde-artwork-size "10.0 MB">
+<!ENTITY kde-artwork-size "14 MB">
 <!ENTITY kde-toys-ftp "&kde-download;/kdetoys-&kde-version;.tar.bz2">
-<!ENTITY kde-toys-size "1.3 MB">
+<!ENTITY kde-toys-size "1.8 MB">
 <!ENTITY kde-addons-ftp "&kde-download;/kdeaddons-&kde-version;.tar.bz2">
-<!ENTITY kde-addons-size "899 KB">
+<!ENTITY kde-addons-size "1.1 MB">
 <!ENTITY kdoc-ftp "http://www.ph.unimelb.edu.au/~ssk/kde/kdoc/kdoc-snapshot.tar.gz">
 <!ENTITY kdoc-size "86 KB">
Index: kde/other/other.xml
===================================================================
--- kde/other/other.xml	(revision ec4b257bf2bef52fda135a22cf763a2feba9161d)
+++ kde/other/other.xml	(revision 26d8ff03818d11913ccbac007951f274cb0c253d)
@@ -4,5 +4,5 @@
 
 &kdoc;
-&kdevelop;
+<!--&kdevelop;-->
 
 </chapter>
