Index: general.ent
===================================================================
--- general.ent	(revision f1e6141361f37276e632eb11d4db5dc5bb8a8982)
+++ general.ent	(revision cf3ab518155f1d4e5c4b65ed8cdfe20759aafdad)
@@ -104,4 +104,5 @@
 <!ENTITY hd2u-version                 "0.9.1">
 <!ENTITY gtk-doc-version              "1.2">
+<!ENTITY intltool-version             "0.32.1">
 <!ENTITY screen-version               "4.0.2">
 <!ENTITY tidy-version                 "041005">
@@ -271,5 +272,4 @@
 <!ENTITY gnome-version                "2.6">
 <!ENTITY ORBit2-version               "2.10.2">
-<!ENTITY intltool-version             "0.30">
 <!ENTITY libbonobo-version            "2.6.2">
 <!ENTITY GConf-version                "2.6.2">
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision f1e6141361f37276e632eb11d4db5dc5bb8a8982)
+++ general/genutils/genutils.xml	(revision cf3ab518155f1d4e5c4b65ed8cdfe20759aafdad)
@@ -16,4 +16,5 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="hd2u.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtk-doc.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="intltool.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="screen.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tidy.xml"/>
Index: general/genutils/intltool.xml
===================================================================
--- general/genutils/intltool.xml	(revision cf3ab518155f1d4e5c4b65ed8cdfe20759aafdad)
+++ general/genutils/intltool.xml	(revision cf3ab518155f1d4e5c4b65ed8cdfe20759aafdad)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY intltool-download-http "http://ftp.gnome.org/pub/GNOME/sources/intltool/0.32/intltool-&intltool-version;.tar.bz2">
+<!ENTITY intltool-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/intltool/0.32/intltool-&intltool-version;.tar.bz2">
+<!ENTITY intltool-md5sum "b829f3d426c6a68e09196b95ba7ffa3b">
+<!ENTITY intltool-size "125 KB">
+<!ENTITY intltool-buildsize "1.6 MB">
+<!ENTITY intltool-time "0.01 SBU">
+]>
+
+<sect1 id="intltool" xreflabel="intltool-&intltool-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="intltool.html"?>
+<title>intltool-&intltool-version;</title>
+
+<sect2>
+<title>Introduction to <application>intltool</application></title>
+
+<para>The <application>intltool</application> package contains an 
+internationalization tool. This is useful for extracting translatable strings 
+from source files, collecting the extracted strings with messages from 
+traditional source files (<filename class="directory">&lt;source 
+directory&gt;/&lt;package&gt;/po</filename>) and merging the translations into 
+<filename>.xml</filename>, <filename>.desktop</filename> and 
+<filename>.oaf</filename> files.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&intltool-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&intltool-download-ftp;"/></para></listitem>
+<listitem><para>MD5 sum: &intltool-md5sum;</para></listitem>
+<listitem><para>Download size: &intltool-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&intltool-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&intltool-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>intltool</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="perl-modules"/>: XML-Parser</para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>intltool</application></title>
+
+<para>Install <application>intltool</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>intltool</application> package contains 
+<command>intltoolize</command>, 
+<command>intltool-update</command>, 
+<command>intltool-extract</command>, 
+<command>intltool-merge</command> and 
+<command>intltool-prepare</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>intltoolize</title>
+<para><command>intltoolize</command> prepares a package to use 
+<application>intltool</application>.</para></sect3>
+
+<sect3><title>intltool-update</title>
+<para><command>intltool-update</command> updates the <filename>po</filename> 
+template files and merges them with the translations.</para></sect3>
+
+<sect3><title>intltool-extract</title>
+<para><command>intltool-extract</command> generates header files that can be 
+read by <command>gettext</command>.</para></sect3>
+
+<sect3><title>intltool-merge</title>
+<para><command>intltool-merge</command> merges translated strings into various 
+file types.</para></sect3>
+
+<sect3><title>intltool-prepare</title>
+<para><command>intltool-prepare</command> updates pot files and merges them 
+with translation files.</para></sect3>
+
+</sect2>
+
+</sect1>
+
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision f1e6141361f37276e632eb11d4db5dc5bb8a8982)
+++ general/prog/perl-modules.xml	(revision cf3ab518155f1d4e5c4b65ed8cdfe20759aafdad)
@@ -55,6 +55,8 @@
 
 <listitem><para><ulink
-url="http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-&XML-Parser-version;.tar.gz">XML-Parser-&XML-Parser-version;</ulink>
-</para></listitem>
+url="http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-&XML-Parser-version;.tar.gz">XML-Parser-&XML-Parser-version;</ulink></para><itemizedlist spacing='compact'>
+
+<listitem><para><xref linkend="expat"/></para></listitem></itemizedlist>
+</listitem>
 
 <listitem><para><xref linkend="GTK"/></para>
Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision f1e6141361f37276e632eb11d4db5dc5bb8a8982)
+++ gnome/core/core.xml	(revision cf3ab518155f1d4e5c4b65ed8cdfe20759aafdad)
@@ -16,5 +16,4 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pre-install-config.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="orbit2.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="intltool.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libbonobo.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gconf.xml"/>
Index: ome/core/intltool.xml
===================================================================
--- gnome/core/intltool.xml	(revision f1e6141361f37276e632eb11d4db5dc5bb8a8982)
+++ 	(revision )
@@ -1,99 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-<!ENTITY intltool-download-http "http://ftp.gnome.org/pub/GNOME/sources/intltool/&intltool-version;/intltool-&intltool-version;.tar.bz2">
-<!ENTITY intltool-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/intltool/&intltool-version;/intltool-&intltool-version;.tar.bz2">
-<!ENTITY intltool-size "112 KB">
-<!ENTITY intltool-buildsize "1010 KB">
-<!ENTITY intltool-time "0.00 SBU">
-
-]>
-
-<sect1 id="intltool" xreflabel="intltool-&intltool-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="intltool.html"?>
-<title>intltool-&intltool-version;</title>
-
-<sect2>
-<title>Introduction to <application>intltool</application></title>
-
-<para>The intltool package contains an internationalization tool. This
-is useful for extracting translatable strings from source files,
-collecting the extracted strings with messages from traditional source
-files (<filename class="directory">&lt;source
-directory&gt;/&lt;package&gt;/po</filename>)
-and merging the translations into <filename>XML</filename>,
-<filename>.desktop</filename> and <filename>OAF</filename>
-files.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&intltool-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&intltool-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &intltool-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&intltool-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&intltool-time;</para></listitem></itemizedlist>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>intltool</application></title>
-
-<para>Install <application>intltool</application> by running the following commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The <application>intltool</application> package contains
-<command>intltoolize</command>,
-<command>intltool-update</command>,
-<command>intltool-extract</command>,
-<command>intltool-merge</command>,
-<command>intltool-prepare</command> and
-<command>xml-i18n-toolize</command>.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>intltoolize</title>
-<para><command>intltoolize</command> prepares a package to use intltool.</para></sect3>
-
-<sect3><title>intltool-update</title>
-<para><command>intltool-update</command> updates the <filename>po</filename> template files
-and merges them with the translations.</para></sect3>
-
-<sect3><title>intltool-extract</title>
-<para><command>intltool-extract</command> generates header files that can be read by
-<command>gettext</command>.</para></sect3>
-
-<sect3><title>intltool-merge</title>
-<para><command>intltool-merge</command> merges translated strings into various file
-types.</para></sect3>
-
-<sect3><title>intltool-prepare</title>
-<para><command>intltool-prepare</command> updates pot files and merges them with
-translation files.</para></sect3>
-
-</sect2>
-
-</sect1>
-
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f1e6141361f37276e632eb11d4db5dc5bb8a8982)
+++ introduction/welcome/changelog.xml	(revision cf3ab518155f1d4e5c4b65ed8cdfe20759aafdad)
@@ -22,4 +22,8 @@
 
 <itemizedlist>
+
+<listitem><para>November 6th, 2004 [randy]: Updated intltool to 0.32.1 and 
+moved the instructions to Chapter 10 - General Utilities; added expat as
+a dependency of the XML::Parser Perl Module.</para></listitem>
 
 <listitem><para>November 6th, 2004 [randy]: Moved libart_lgpl to Chapter 9 - 
