Index: general.ent
===================================================================
--- general.ent	(revision 7aaad25b7f1fecd3738a97a4929a0b7d12a1bafc)
+++ general.ent	(revision 89c768304277af9d4779727a47cd2a4401989289)
@@ -72,4 +72,5 @@
 <!ENTITY libcroco-version             "0.6.0">
 <!ENTITY libgsf-version               "1.10.1">
+<!ENTITY libglade-version             "2.4.0">
 <!ENTITY expat-version                "1.95.8">
 <!ENTITY libesmtp-version             "1.0.3r1">
@@ -278,5 +279,4 @@
 <!ENTITY gnome-vfs-version            "2.6.1.1">
 <!ENTITY libgnome-version             "2.6.1.1">
-<!ENTITY libglade-version             "2.3.6">
 <!ENTITY libgnomecanvas-version       "2.6.1.1">
 <!ENTITY libbonoboui-version          "2.6.1">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 7aaad25b7f1fecd3738a97a4929a0b7d12a1bafc)
+++ general/genlib/genlib.xml	(revision 89c768304277af9d4779727a47cd2a4401989289)
@@ -53,4 +53,5 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libcroco.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgsf.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libglade.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="expat.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libesmtp.xml"/>
Index: general/genlib/libglade.xml
===================================================================
--- general/genlib/libglade.xml	(revision 89c768304277af9d4779727a47cd2a4401989289)
+++ general/genlib/libglade.xml	(revision 89c768304277af9d4779727a47cd2a4401989289)
@@ -0,0 +1,102 @@
+<?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 libglade-download-http "http://ftp.gnome.org/pub/GNOME/sources/libglade/2.4/libglade-&libglade-version;.tar.bz2">
+<!ENTITY libglade-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.4/libglade-&libglade-version;.tar.bz2">
+<!ENTITY libglade-md5sum "c8367c58b2f2c98b76ca0667f0f13bf5">
+<!ENTITY libglade-size "310 KB">
+<!ENTITY libglade-buildsize "5.2 MB">
+<!ENTITY libglade-time "0.16 SBU">
+]>
+
+<sect1 id="libglade" xreflabel="libglade-&libglade-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="libglade.html"?>
+<title>libglade-&libglade-version;</title>
+
+<sect2>
+<title>Introduction to <application>libglade</application></title>
+
+<para>The <application>libglade</application> package contains 
+<filename class="libraryfile">libglade</filename> libraries. These are useful 
+for loading Glade interface files in a program at runtime.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libglade-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libglade-download-ftp;"/></para></listitem>
+<listitem><para>MD5 sum: &libglade-md5sum;</para></listitem>
+<listitem><para>Download size: &libglade-size;</para></listitem>
+<listitem><para>Estimated disk space required:
+&libglade-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libglade-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>libglade</application> dependencies</title>
+
+<sect4><title>Required</title>
+<para><xref linkend="libxml2"/> and 
+<xref linkend="GTK2"/></para>
+</sect4>
+
+<sect4><title>Optional</title>
+<para><xref linkend="Python"/> 
+and <xref linkend="gtk-doc"/></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>libglade</application></title>
+
+<para>Install <application>libglade</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>Command explanations</title>
+
+<para><option>--enable-gtk-doc</option>: This switch can be added to 
+rebuild the <acronym>HTML</acronym> documentation.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libglade</application> package contains 
+<command>libglade-convert</command> (requires <command>python</command> and 
+<filename class='libraryfile'>pyexpat.so</filename>) and 
+<filename class="libraryfile">libglade</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libglade-convert</title>
+<para><command>libglade-convert</command> is used to convert old Glade 
+interface files to Glade-2.0 standards.</para></sect3>
+
+<sect3><title>libglade libraries</title>
+<para><filename class="libraryfile">libglade</filename> libraries contain the 
+functions necessary to load Glade interface files.</para></sect3>
+
+</sect2>
+
+</sect1>
+
Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision 7aaad25b7f1fecd3738a97a4929a0b7d12a1bafc)
+++ gnome/core/core.xml	(revision 89c768304277af9d4779727a47cd2a4401989289)
@@ -21,5 +21,4 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-vfs.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgnome.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libglade.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgnomecanvas.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libbonoboui.xml"/>
Index: ome/core/libglade.xml
===================================================================
--- gnome/core/libglade.xml	(revision 7aaad25b7f1fecd3738a97a4929a0b7d12a1bafc)
+++ 	(revision )
@@ -1,94 +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 libglade-download-http "http://ftp.gnome.org/pub/GNOME/sources/libglade/2.3/libglade-&libglade-version;.tar.bz2">
-<!ENTITY libglade-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.3/libglade-&libglade-version;.tar.bz2">
-<!ENTITY libglade-size "336 KB">
-<!ENTITY libglade-buildsize "7.5 MB">
-<!ENTITY libglade-time "0.16 SBU">
-
-]>
-
-<sect1 id="libglade" xreflabel="libglade-&libglade-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="libglade.html"?>
-<title>libglade-&libglade-version;</title>
-
-<sect2>
-<title>Introduction to <application>libglade</application></title>
-
-<para>The <application>libglade</application> package contains <filename
-class="libraryfile">libglade</filename> libraries. This is useful
-for loading Glade interface files in a program at runtime.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&libglade-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&libglade-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &libglade-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&libglade-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&libglade-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>libglade</application> dependencies</title>
-<sect4><title>Required</title>
-<para>
-<xref linkend="libxml2"/> and
-<xref linkend="GTK2"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="Python"/> (if compiled utilizing <xref linkend="expat"/>) and
-<xref linkend="gtk-doc"/>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>libglade</application></title>
-
-<para>Install <application>libglade</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>Command explanations</title>
-
-<para><option>--enable-gtk-doc</option>: This switch can be added to 
-rebuild the <acronym>HTML</acronym> documentation.</para>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The <application>libglade</application> package contains <filename
-class="libraryfile">libglade</filename> libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>libglade libraries</title>
-<para><filename class="libraryfile">libglade</filename> libraries contain the functions necessary to load Glade
-interface files.</para></sect3>
-
-</sect2>
-
-</sect1>
-
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7aaad25b7f1fecd3738a97a4929a0b7d12a1bafc)
+++ introduction/welcome/changelog.xml	(revision 89c768304277af9d4779727a47cd2a4401989289)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>November 8th, 2004 [randy]: Updated to libglade-2.4.0 and 
+moved the instructions to Chapter 8 - General Libraries.</para></listitem>
 
 <listitem><para>November 8th, 2004 [larry]: Edited /etc/vimrc,~/.vimrc
