Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
+++ kde/core/arts.xml	(revision 0f7ddd7dc1226c3099808c4641e042a0d724a537)
@@ -22,7 +22,15 @@
 <para><xref linkend="qt"/></para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="alsa"/>, <xref linkend="audiofile"/>, <xref
-linkend="libvorbis"/>, <xref linkend="pkgconfig"/>, <xref
-linkend="GLib2"/> and <xref linkend="libmad"/></para></sect4>
+<para>
+<xref linkend="libogg"/>,
+<xref linkend="libvorbis"/>,
+<xref linkend="alsa"/>,
+<xref linkend="audiofile"/>,
+<xref linkend="pkgconfig"/>,
+<xref linkend="GLib2"/>,
+<xref linkend="libmad"/>,
+<xref linkend="esound"/> and
+<ulink url="http://www.mediaapplicationserver.net/">MAS</ulink>
+</para></sect4>
 </sect3>
 
Index: kde/core/config.xml
===================================================================
--- kde/core/config.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
+++ kde/core/config.xml	(revision 0f7ddd7dc1226c3099808c4641e042a0d724a537)
@@ -3,15 +3,10 @@
 <title>Configuring the core <acronym>KDE</acronym> packages</title>
 
-<para>
-First add <filename class="directory">/opt/kde/bin</filename> to
-your <envar>PATH</envar> environment variable:</para>
-<screen><userinput><command>export PATH=$PATH:/opt/kde/bin</command></userinput></screen>
+<para>Create an <filename>.xinitrc</filename> file to start
+<acronym>KDE</acronym>:</para>
 
+<screen><userinput><command>echo "exec startkde" &gt; ~/.xinitrc</command></userinput></screen>
 
-<para>
-Then create an <filename>.xinitrc</filename> file to start
-<acronym>KDE</acronym>:</para>
-<screen><userinput><command>echo "exec startkde" &gt; ~/.xinitrc</command></userinput></screen>
-<para>and ensure all libraries can be found with:</para>
+<para>Ensure all libraries can be found with:</para>
 <screen><userinput><command>ldconfig</command></userinput></screen>
 
Index: kde/inst/kde-base.xml
===================================================================
--- kde/inst/kde-base.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
+++ kde/inst/kde-base.xml	(revision 0f7ddd7dc1226c3099808c4641e042a0d724a537)
@@ -23,13 +23,18 @@
 <sect4><title>Optional</title>
 <para>
+<xref linkend="libxml2"/>,
+<xref linkend="samba"/>, <!-- Point to 3.0 if Billy doesn't update
+                              before next release. -->
+<xref linkend="j2sdk"/>,
+<xref linkend="lesstif"/>,
 <xref linkend="openssl"/>,
-<xref linkend="lesstif"/>,
 <xref linkend="Linux_PAM"/>,
+<xref linkend="libtiff"/>,
 <xref linkend="openldap"/>,
-<xref linkend="libtiff"/>,
-<xref linkend="j2sdk"/>,
-<xref linkend="samba"/>,
 <xref linkend="pkgconfig"/>,
-<ulink url="http://www.pdc.kth.se/kth-krb/">KTH Kerberos</ulink>,
+<xref linkend="libart_lgpl"/>,
+<ulink url="http://mtools.linux.lu/">Mtools</ulink>,
+<ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
+<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
 <ulink url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink> and
 <ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
@@ -60,5 +65,5 @@
 <title>Contents</title>
 
-<para>Major programs in kdebase include 
+<para>Major programs in <application>kdebase</application> include 
 <command>kdesktop</command>,
 <command>kaddressbook</command>,
@@ -76,5 +81,5 @@
 <command>konsole</command>,
 <command>kscreensaver</command> and 
-<command>ktip</command>
+<command>ktip</command>.
 </para>
 
Index: kde/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
+++ kde/inst/kde-libs.xml	(revision 0f7ddd7dc1226c3099808c4641e042a0d724a537)
@@ -24,11 +24,19 @@
 <para><xref linkend="kde-core-arts"/></para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl"/>, <xref linkend="pcre"/>, <xref
-linkend="libxml2"/>, <xref linkend="libxslt"/>, <xref
-linkend="libfam"/>, <xref linkend="libart_lgpl"/>,
-<xref linkend="cups"/>, <xref linkend="openldap"/>, <xref
-linkend="alsa"/>, <xref linkend="libtiff"/>,
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink>
-and <ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
+<para>
+<xref linkend="libxml2"/>,
+<xref linkend="libxslt"/>,
+<xref linkend="cups"/>,
+<xref linkend="openldap"/>,
+<xref linkend="libfam"/>,
+<xref linkend="pcre"/>,
+<xref linkend="openssl"/>,
+<xref linkend="libart_lgpl"/>,
+<xref linkend="alsa"/>,
+<xref linkend="libtiff"/>,
+<ulink url="http://www.gnu.org/software/libidn/">Libidn</ulink>,
+<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
+<ulink url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink> and
+<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
 </para></sect4>
 </sect3>
@@ -50,4 +58,9 @@
 make &amp;&amp;
 make install</command></userinput></screen>
+
+<note><para>If you wish to create the <acronym>API</acronym> documentation and you have
+doxygen and graphviz installed, <command>make apidox</command> must be done
+before <command>make install</command>. This applies to all packages
+which can utilize doxygen.</para></note>
 
 </sect2>
@@ -74,4 +87,17 @@
 </sect2>
 
+<sect2>
+<title>Configuring <application>kdelibs</application></title>
+
+<sect3><title>Configuration Information</title>
+
+<para>Add <filename class="directory">/opt/kde/bin</filename> to
+your <envar>PATH</envar> environment variable:</para>
+
+<screen><userinput><command>export PATH=$PATH:/opt/kde/bin</command></userinput></screen>
+
+</sect3>
+</sect2>
+
 <sect2><title>Contents</title>
 <para>kdelibs provides numerous libraries needed by
Index: kde/inst/kde-multimedia.xml
===================================================================
--- kde/inst/kde-multimedia.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
+++ kde/inst/kde-multimedia.xml	(revision 0f7ddd7dc1226c3099808c4641e042a0d724a537)
@@ -25,15 +25,13 @@
 <xref linkend="lame"/>,
 <xref linkend="audiofile"/>,
-<xref linkend="esound"/>,
-<xref linkend="nas"/>,
-<xref linkend="slang"/>,
-<xref linkend="lesstif"/>,
-<xref linkend="tk"/>,
-<xref linkend="GTK"/>,
 <xref linkend="libogg"/>,
 <xref linkend="libvorbis"/>,
 <xref linkend="xine-lib"/>,
-<xref linkend="libtiff"/> and
-<ulink url="http://xanim.polter.net/home.html">XAnim</ulink>
+<xref linkend="libtiff"/>,
+<xref linkend="libxml2"/>,
+<xref linkend="flac"/>,
+<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
+<ulink url="http://developer.kde.org/~wheeler/taglib/">TagLib</ulink> and
+<ulink url="http://www.musicbrainz.org/">libmusicbrainz</ulink>
 </para></sect4>
 </sect3>
@@ -50,5 +48,4 @@
 sed -i -e 's/strings -ansi/strings/' kioslave/audiocd/Makefile &amp;&amp;
 sed -i -e 's/-ansi//' kscd/libwm/Makefile &amp;&amp;
-sed -i -e 's/-pedantic//' mpeglib/lib/input/Makefile &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
@@ -72,8 +69,4 @@
 a broken header in the kernel.</para>
 
-<para><command>sed -i -e 's/-pedantic//' mpeglib/lib/input/Makefile</command> :
-Remove <parameter>-pedantic</parameter> from <application>gcc</application>
-parameters to work around a broken header in the kernel.</para>
-
 </sect2>
 
@@ -96,12 +89,13 @@
 <title>Contents</title>
 
-<para>The <acronym>KDE</acronym> Multimedia package provides 
+<para>Major programs in <application>kdemultimedia</application> include
+<command>aktion</command>,
+<command>artsbuilder</command>,
 <command>kaboodle</command>,
-<command>noatun</command>,
-<command>timidity</command>,
-<command>kmidi</command>,
+<command>kmid</command>,
 <command>kmix</command>,
+<command>krec</command>,
 <command>kscd</command> and
-<command>aktion</command>.
+<command>noatun</command>.
 </para>
 
@@ -110,26 +104,26 @@
 <sect2><title>Description</title>
 
+<sect3><title>aktion</title>
+<para><command>aktion</command> is a video player.</para></sect3>
+
 <sect3><title>kaboodle</title>
 <para><command>kaboodle</command> is a multimedia player.</para></sect3>
+
+<sect3><title>kmid</title>
+<para><command>kmid</command> is a midi/karaoke player.</para></sect3>
+
+<sect3><title>kmix</title>
+<para><command>kmix</command> is a sound mixer.</para></sect3>
+
+<sect3><title>krec</title>
+<para><command>krec</command> is a recording frontend for
+<application>aRts</application>.</para></sect3>
+
+<sect3><title>kscd</title>
+<para><command>kscd</command> is a CD player.</para></sect3>
 
 <sect3><title>noatun</title>
 <para><command>noatun</command> is another multimedia player.</para></sect3>
 
-<sect3><title>timidity</title>
-<para><command>timidity</command> is a midi player.</para></sect3>
-
-<sect3><title>kmidi</title>
-<para><command>kmidi</command> is a front end for
-<command>timidity</command>.</para></sect3>
-
-<sect3><title>kmix</title>
-<para><command>kmix</command> is a sound mixer.</para></sect3>
-
-<sect3><title>kscd</title>
-<para><command>kscd</command> is a CD player.</para></sect3>
-
-<sect3><title>aktion</title>
-<para><command>aktion</command> is a video player.</para></sect3>
-
 </sect2>
 </sect1>
Index: kde/inst/kde-network.xml
===================================================================
--- kde/inst/kde-network.xml	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
+++ kde/inst/kde-network.xml	(revision 0f7ddd7dc1226c3099808c4641e042a0d724a537)
@@ -21,8 +21,14 @@
 <sect4><title>Optional</title>
 <para>
+<xref linkend="libxml2"/>,
+<xref linkend="libxslt"/>,
 <xref linkend="ppp"/>,
-<xref linkend="samba"/>,
-<xref linkend="libtiff"/> and
-<ulink url="http://www.openslp.org/">OpenSLP</ulink>
+<xref linkend="openssl"/>,
+<xref linkend="libtiff"/>,
+<xref linkend="xmms"/>,
+<ulink url="http://www.openslp.org/">OpenSLP</ulink>,
+<ulink url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html">Wireless Tools</ulink>,
+<ulink url="http://dev.null.pl/ekg/">libgadu</ulink> and
+<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>
 </para></sect4>
 </sect3>
@@ -53,12 +59,17 @@
 <title>Contents</title>
 
-<para>The <acronym>KDE</acronym> Network package provides
-<command>kmail</command>,
+<para>Major programs in <application>kdenetwork</application> include
+<command>kdict</command>,
+<command>kget</command>,
 <command>knewsticker</command>,
-<command>knode</command>,
+<command>kopete</command>,
+<command>kpf</command>,
 <command>kppp</command>,
+<command>krdc</command>,
+<command>krfb</command>,
 <command>ksirc</command>,
-<command>kit</command> and 
-<command>korn</command>.
+<command>ktalkd</command>,
+<command>kwifimanager</command> and
+<command>lisa</command>.
 </para>
 
@@ -67,6 +78,11 @@
 <sect2><title>Description</title>
 
-<sect3><title>kmail</title>
-<para><command>kmail</command> is a mail client.</para></sect3>
+<sect3><title>kdict</title>
+<para><command>kdict</command> is a graphical client for the
+Dictionary Server Protocol (DICT).</para></sect3>
+
+<sect3><title>kget</title>
+<para><command>kget</command> allows you to group
+downloads.</para></sect3>
 
 <sect3><title>knewsticker</title>
@@ -74,19 +90,45 @@
 <acronym>KDE</acronym> Application Launcher Panel.</para></sect3>
 
-<sect3><title>knode</title>
-<para><command>knode</command> is a news reader.</para></sect3>
+<sect3><title>kopete</title>
+<para><command>kopete</command> is <acronym>KDE</acronym>'s
+multi-protocol instant messenger client.</para></sect3>
+
+<sect3><title>kpf</title>
+<para><command>kpf</command> allows you to share files over a
+network.</para></sect3>
 
 <sect3><title>kppp</title>
 <para><command>kppp</command> is a dial-up utility.</para></sect3>
 
+<sect3><title>krdc</title>
+<para><command>krdc</command> is a client application that allows you to
+view or even control the desktop session on another machine that is
+running a compatible (<acronym>VNC</acronym>) server.</para></sect3>
+
+<sect3><title>krfb</title>
+<para><command>krfb</command> is a server application that allows you to
+share your current session with a user on another machine, who can use a
+<acronym>VNC</acronym> client to view or even control the
+desktop.</para></sect3>
+
 <sect3><title>ksirc</title>
 <para><command>ksirc</command> is a chat client.</para></sect3>
 
-<sect3><title>kit</title>
-<para><command>kit</command> is an <acronym>AOL</acronym> messaging
-client (<acronym>AIM</acronym>).</para></sect3>
+<sect3><title>ktalkd</title>
+<para><command>ktalkd</command> is an enhanced <command>talk</command>
+daemon - a program to handle incoming <command>talk</command> requests,
+announce them and allow you to respond to them using a talk
+client.</para></sect3>
 
-<sect3><title>korn</title>
-<para><command>korn</command> is a mail notification utility.</para></sect3>
+<sect3><title>kwifimanager</title>
+<para>The <command>kwifimanager</command> suite can be used to
+configure and monitor wireless <acronym>LAN</acronym>
+cards.</para></sect3>
+
+<sect3><title>lisa</title>
+<para><command>lisa</command> is intended to provide a kind of network
+neighborhood, but only relying on the
+<acronym>TCP</acronym>/<acronym>IP</acronym> protocol stack, no
+<acronym>SMB</acronym> or anything else required.</para></sect3>
 
 </sect2>
Index: kde/kde.ent
===================================================================
--- kde/kde.ent	(revision 1fdbdb4756e539e6c5b09894a059a591e4ffc8f2)
+++ kde/kde.ent	(revision 0f7ddd7dc1226c3099808c4641e042a0d724a537)
@@ -2,5 +2,5 @@
 <!ENTITY kde-intro SYSTEM "kde-intro.xml">
 
-<!ENTITY kde-version "3.1.5">
+<!ENTITY kde-version "3.2">
 <!ENTITY kde-download-http "http://mirrors.isc.org/pub/kde/stable/&kde-version;/src">
 <!ENTITY kde-download-ftp "ftp://ftp.kde.org/pub/kde/stable/&kde-version;/src">
@@ -12,10 +12,10 @@
 
 <!ENTITY kde-core-arts SYSTEM "core/arts.xml">
-<!ENTITY arts-version "1.1.5">
+<!ENTITY arts-version "1.2.0">
 <!ENTITY arts-download-http "&kde-download-http;/arts-&arts-version;.tar.bz2">
 <!ENTITY arts-download-ftp "&kde-download-ftp;/arts-&arts-version;.tar.bz2">
-<!ENTITY arts-size "967 KB">
+<!ENTITY arts-size "971 KB">
 <!ENTITY arts-buildsize "24 MB">
-<!ENTITY arts-time "1.63 SBU">
+<!ENTITY arts-time "1.58 SBU">
 
 <!-- KDE Additional -->
@@ -34,30 +34,30 @@
 
 <!ENTITY kde-libs SYSTEM "inst/kde-libs.xml">
-<!ENTITY kde-libs-download-http "&kde-download-http;/kdelibs-&kde-version;.tar.bz2">
-<!ENTITY kde-libs-download-ftp "&kde-download-ftp;/kdelibs-&kde-version;.tar.bz2">
-<!ENTITY kde-libs-size "11 MB">
-<!ENTITY kde-libs-buildsize "133 MB">
-<!ENTITY kde-libs-time "11.03 SBU">
+<!ENTITY kde-libs-download-http "&kde-download-http;/kdelibs-&kde-version;.0.tar.bz2">
+<!ENTITY kde-libs-download-ftp "&kde-download-ftp;/kdelibs-&kde-version;.0.tar.bz2">
+<!ENTITY kde-libs-size "12 MB">
+<!ENTITY kde-libs-buildsize "158 MB">
+<!ENTITY kde-libs-time "15.07 SBU">
 
 <!ENTITY kde-base SYSTEM "inst/kde-base.xml">
-<!ENTITY kde-base-download-http "&kde-download-http;/kdebase-&kde-version;.tar.bz2">
-<!ENTITY kde-base-download-ftp "&kde-download-ftp;/kdebase-&kde-version;.tar.bz2">
-<!ENTITY kde-base-size "15 MB">
-<!ENTITY kde-base-buildsize "196 MB">
-<!ENTITY kde-base-time "18.43 SBU">
+<!ENTITY kde-base-download-http "&kde-download-http;/kdebase-&kde-version;.0.tar.bz2">
+<!ENTITY kde-base-download-ftp "&kde-download-ftp;/kdebase-&kde-version;.0.tar.bz2">
+<!ENTITY kde-base-size "17 MB">
+<!ENTITY kde-base-buildsize "173 MB">
+<!ENTITY kde-base-time "19.13 SBU">
 
 <!ENTITY kde-multimedia SYSTEM "inst/kde-multimedia.xml">
-<!ENTITY kde-multimedia-download-http "&kde-download-http;/kdemultimedia-&kde-version;.tar.bz2">
-<!ENTITY kde-multimedia-download-ftp "&kde-download-ftp;/kdemultimedia-&kde-version;.tar.bz2">
-<!ENTITY kde-multimedia-size "5.7 MB">
-<!ENTITY kde-multimedia-buildsize "72 MB">
-<!ENTITY kde-multimedia-time "9.57 SBU">
+<!ENTITY kde-multimedia-download-http "&kde-download-http;/kdemultimedia-&kde-version;.0.tar.bz2">
+<!ENTITY kde-multimedia-download-ftp "&kde-download-ftp;/kdemultimedia-&kde-version;.0.tar.bz2">
+<!ENTITY kde-multimedia-size "4.7 MB">
+<!ENTITY kde-multimedia-buildsize "78 MB">
+<!ENTITY kde-multimedia-time "8.20 SBU">
 
 <!ENTITY kde-network SYSTEM "inst/kde-network.xml">
-<!ENTITY kde-network-download-http "&kde-download-http;/kdenetwork-&kde-version;.tar.bz2">
-<!ENTITY kde-network-download-ftp "&kde-download-ftp;/kdenetwork-&kde-version;.tar.bz2">
-<!ENTITY kde-network-size "4.8 MB">
+<!ENTITY kde-network-download-http "&kde-download-http;/kdenetwork-&kde-version;.0.tar.bz2">
+<!ENTITY kde-network-download-ftp "&kde-download-ftp;/kdenetwork-&kde-version;.0.tar.bz2">
+<!ENTITY kde-network-size "5.9 MB">
 <!ENTITY kde-network-buildsize "67 MB">
-<!ENTITY kde-network-time "6.14 SBU">
+<!ENTITY kde-network-time "3.24 SBU">
 
 <!ENTITY kde-graphics SYSTEM "inst/kde-graphics.xml">
