Index: general.ent
===================================================================
--- general.ent	(revision 1aaa772af0367fc2970de755e7b3497a8b191416)
+++ general.ent	(revision c0ce0a4ff21c538760144d94c16228f9ad151098)
@@ -71,4 +71,5 @@
 <!ENTITY libIDL-version               "0.8.4">
 <!ENTITY libcroco-version             "0.6.0">
+<!ENTITY libgsf-version               "1.10.1">
 <!ENTITY expat-version                "1.95.8">
 <!ENTITY libesmtp-version             "1.0.3r1">
@@ -297,5 +298,4 @@
 <!ENTITY gst-plugins-version          "0.8.1">
 <!ENTITY gnome-applets-version        "2.6.2">
-<!ENTITY libgsf-version               "1.10.1">
 <!ENTITY librsvg-version              "2.8.1">
 <!ENTITY eel-version                  "2.6.2">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 1aaa772af0367fc2970de755e7b3497a8b191416)
+++ general/genlib/genlib.xml	(revision c0ce0a4ff21c538760144d94c16228f9ad151098)
@@ -52,4 +52,5 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libidl.xml"/>
 <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="expat.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libesmtp.xml"/>
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision c0ce0a4ff21c538760144d94c16228f9ad151098)
+++ general/genlib/libgsf.xml	(revision c0ce0a4ff21c538760144d94c16228f9ad151098)
@@ -0,0 +1,77 @@
+<?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 libgsf-download-http "http://ftp.gnome.org/pub/gnome/sources/libgsf/1.10/libgsf-&libgsf-version;.tar.bz2">
+<!ENTITY libgsf-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/libgsf/1.10/libgsf-&libgsf-version;.tar.bz2">
+<!ENTITY libgsf-md5sum "b7b1c1e9adf3fd39a4df6f6891bf3bca">
+<!ENTITY libgsf-size "391 KB">
+<!ENTITY libgsf-buildsize "13.9 MB">
+<!ENTITY libgsf-time "0.28 SBU">
+]>
+
+<sect1 id="libgsf" xreflabel="libgsf-&libgsf-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="libgsf.html"?>
+<title>libgsf-&libgsf-version;</title>
+
+<sect2>
+<title>Introduction to <application>libgsf</application></title>
+
+<para>The <application>libgsf</application> package contains 
+<filename class="libraryfile">libgsf</filename> libraries. These are useful for 
+providing an extensible input/output abstraction layer for structured file 
+formats.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&libgsf-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&libgsf-download-ftp;"/></para></listitem>
+<listitem><para>MD5 sum: &libgsf-md5sum;</para></listitem>
+<listitem><para>Download size: &libgsf-size;</para></listitem>
+<listitem><para>Estimated disk space required: &libgsf-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &libgsf-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>libgsf</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GLib2"/> and 
+<xref linkend="libxml2"/></para>
+</sect4>
+
+<sect4><title>Optional</title>
+<para><xref linkend="gnome-vfs"/> (required for GNOME-2 support) and 
+<xref linkend="gtk-doc"/> (with <xref linkend="sgml-dtd-3"/> installed)</para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>libgsf</application></title>
+
+<para>Install <application>libgsf</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>libgsf</application> package contains 
+<filename class='libraryfile'>libgsf</filename> and optionally, 
+<filename class='libraryfile'>libgsf-gnome</filename> libraries.</para>
+
+</sect2>
+
+</sect1>
+
Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision 1aaa772af0367fc2970de755e7b3497a8b191416)
+++ gnome/core/core.xml	(revision c0ce0a4ff21c538760144d94c16228f9ad151098)
@@ -41,5 +41,4 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gst-plugins.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnome-applets.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="librsvg.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="eel.xml"/>
Index: ome/core/libgsf.xml
===================================================================
--- gnome/core/libgsf.xml	(revision 1aaa772af0367fc2970de755e7b3497a8b191416)
+++ 	(revision )
@@ -1,77 +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 libgsf-download-http "http://ftp.gnome.org/pub/gnome/sources/libgsf/1.10/libgsf-&libgsf-version;.tar.bz2">
-<!ENTITY libgsf-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/libgsf/1.10/libgsf-&libgsf-version;.tar.bz2">
-<!ENTITY libgsf-md5sum "b7b1c1e9adf3fd39a4df6f6891bf3bca">
-<!ENTITY libgsf-size "391 KB">
-<!ENTITY libgsf-buildsize "13.9 MB">
-<!ENTITY libgsf-time "0.28 SBU">
-]>
-
-<sect1 id="libgsf" xreflabel="libgsf-&libgsf-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="libgsf.html"?>
-<title>libgsf-&libgsf-version;</title>
-
-<sect2>
-<title>Introduction to <application>libgsf</application></title>
-
-<para>The <application>libgsf</application> package contains 
-<filename class="libraryfile">libgsf</filename> libraries. These are useful for 
-providing an extensible input/output abstraction layer for structured file 
-formats.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&libgsf-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&libgsf-download-ftp;"/></para></listitem>
-<listitem><para>MD5 sum: &libgsf-md5sum;</para></listitem>
-<listitem><para>Download size: &libgsf-size;</para></listitem>
-<listitem><para>Estimated disk space required: &libgsf-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &libgsf-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>libgsf</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="GLib2"/> and 
-<xref linkend="libxml2"/></para>
-</sect4>
-
-<sect4><title>Optional</title>
-<para><xref linkend="gnome-vfs"/> (required for GNOME-2 support) and 
-<xref linkend="gtk-doc"/> (with <xref linkend="sgml-dtd-3"/> installed)</para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>libgsf</application></title>
-
-<para>Install <application>libgsf</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>libgsf</application> package contains 
-<filename class='libraryfile'>libgsf</filename> and optionally, 
-<filename class='libraryfile'>libgsf-gnome</filename> libraries.</para>
-
-</sect2>
-
-</sect1>
-
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1aaa772af0367fc2970de755e7b3497a8b191416)
+++ introduction/welcome/changelog.xml	(revision c0ce0a4ff21c538760144d94c16228f9ad151098)
@@ -26,5 +26,5 @@
 shared-mime-info-0.15; inserted a chmod command into the CDParanoia 
 instructions to turn on the execution bits for the shared 
-libraries.</para></listitem>
+libraries; moved libgsf to Chapter 8 - General Libraries.</para></listitem>
 
 <listitem><para>November 6th, 2004 [randy]: Updated intltool to 0.32.1 and 
