Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision bb8322867809ad1d42d74b3076df3a5b03436aa4)
+++ gnome/gnome.ent	(revision e50966a0b4fbab5fa51b3f2bf043e51da8d3ee20)
@@ -9,5 +9,4 @@
 <!ENTITY % intltool SYSTEM "lib/intltool/intltool.ent">
 <!ENTITY % scrollkeeper SYSTEM "lib/scrollkeeper/scrollkeeper.ent">
-<!ENTITY % gdk SYSTEM "lib/gdk/gdk.ent">
 <!ENTITY % gtk-doc SYSTEM "lib/gtk-doc/gtk-doc.ent">
 <!ENTITY % linc SYSTEM "lib/linc/linc.ent">
@@ -47,5 +46,4 @@
 %intltool;
 %scrollkeeper;
-%gdk;
 %gtk-doc;
 %linc;
@@ -145,4 +143,5 @@
 <!ENTITY % oaf SYSTEM "otherlibs/oaf/oaf.ent">
 <!ENTITY % gnome-libs SYSTEM "otherlibs/gnome-libs/gnome-libs.ent">
+<!ENTITY % gdk SYSTEM "otherlibs/gdk/gdk.ent">
 <!ENTITY % gconf-editor SYSTEM "other/gconf-editor/gconf-editor.ent">
 <!ENTITY % gnome-print SYSTEM "otherlibs/gnome-print/gnome-print.ent">
@@ -161,4 +160,5 @@
 %oaf;
 %gnome-libs;
+%gdk;
 %gnome-print;
 %libglade14;
Index: ome/lib/gdk.xml
===================================================================
--- gnome/lib/gdk.xml	(revision bb8322867809ad1d42d74b3076df3a5b03436aa4)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<sect1 id="gdk" xreflabel="GDK Pixel Buffer-&gdk-version;">
-<?dbhtml filename="gdkpixbuf.html" dir="gnome"?>
-<title>GDK Pixel Buffer-&gdk-version;</title>
-
-&gdk-intro;
-&gdk-inst;
-&gdk-desc;
-
-</sect1>
-
Index: ome/lib/gdk/gdk-desc.xml
===================================================================
--- gnome/lib/gdk/gdk-desc.xml	(revision bb8322867809ad1d42d74b3076df3a5b03436aa4)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application><acronym>GDK</acronym> Pixel Buffer</application>
-package contains <filename class="libraryfile">libgdk_pixbuf</filename> libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>libgdk_pixbuf libraries</title>
-<para><filename class="libraryfile">libdgk_pixbuf</filename> libraries contain the
-<acronym>GTK</acronym>+ pixel buffer libraries for the
-<application><acronym>GIMP</acronym></application>
-Toolkit.</para></sect3>
-
-
-</sect2>
-
Index: ome/lib/gdk/gdk-inst.xml
===================================================================
--- gnome/lib/gdk/gdk-inst.xml	(revision bb8322867809ad1d42d74b3076df3a5b03436aa4)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<sect2>
-<title>Installation of <application><acronym>GDK</acronym> Pixel Buffer</application></title>
-
-<para>The <command>make</command> command attempts to open an <application>X
-</application> display during the compile, so an <application>X</application>
-server must be running during this process.</para>
-
-<para>Install <application><acronym>GDK</acronym> Pixel Buffer</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>./configure --prefix=/opt/gnome --disable-gtk-doc &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
Index: ome/lib/gdk/gdk-intro.xml
===================================================================
--- gnome/lib/gdk/gdk-intro.xml	(revision bb8322867809ad1d42d74b3076df3a5b03436aa4)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<sect2>
-<title>Introduction to <application><acronym>GDK</acronym> Pixel Buffer</application></title>
-
-<para>The <application><acronym>GDK</acronym> Pixel Buffer</application> package is the
-<acronym>GTK</acronym>+ pixel buffer library</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gdk-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gdk-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &gdk-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&gdk-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gdk-time;</para></listitem></itemizedlist>
-</sect3>
-                                                                                
-<sect3><title><application><acronym>GDK</acronym> Pixel Buffer</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="GTK"/>, <xref linkend="libpng"/>, <xref
-linkend="libjpeg"/> and <xref linkend="libtiff"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/> and <xref linkend="gnome-libs"/></para></sect4>
-</sect3>
-
-
-</sect2>
Index: ome/lib/gdk/gdk.ent
===================================================================
--- gnome/lib/gdk/gdk.ent	(revision bb8322867809ad1d42d74b3076df3a5b03436aa4)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<!ENTITY gdk SYSTEM "../gdk.xml">
-<!ENTITY gdk-intro SYSTEM "gdk-intro.xml">
-<!ENTITY gdk-inst SYSTEM "gdk-inst.xml">
-<!ENTITY gdk-desc SYSTEM "gdk-desc.xml">
-<!ENTITY gdk-version "0.22.0">
-<!ENTITY gdk-download-http "http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/0.22/gdk-pixbuf-&gdk-version;.tar.bz2">
-<!ENTITY gdk-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/0.22/gdk-pixbuf-&gdk-version;.tar.bz2">
-<!ENTITY gdk-size "396 KB">
-<!ENTITY gdk-buildsize "13.3 MB">
-<!ENTITY gdk-time "0.34 SBU">
Index: gnome/otherlibs/gdk.xml
===================================================================
--- gnome/otherlibs/gdk.xml	(revision e50966a0b4fbab5fa51b3f2bf043e51da8d3ee20)
+++ gnome/otherlibs/gdk.xml	(revision e50966a0b4fbab5fa51b3f2bf043e51da8d3ee20)
@@ -0,0 +1,10 @@
+<sect1 id="gdk" xreflabel="GDK Pixel Buffer-&gdk-version;">
+<?dbhtml filename="gdkpixbuf.html" dir="gnome"?>
+<title>GDK Pixel Buffer-&gdk-version;</title>
+
+&gdk-intro;
+&gdk-inst;
+&gdk-desc;
+
+</sect1>
+
Index: gnome/otherlibs/gdk/gdk-desc.xml
===================================================================
--- gnome/otherlibs/gdk/gdk-desc.xml	(revision e50966a0b4fbab5fa51b3f2bf043e51da8d3ee20)
+++ gnome/otherlibs/gdk/gdk-desc.xml	(revision e50966a0b4fbab5fa51b3f2bf043e51da8d3ee20)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GDK</acronym> Pixel Buffer</application>
+package contains <filename class="libraryfile">libgdk_pixbuf</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libgdk_pixbuf libraries</title>
+<para><filename class="libraryfile">libdgk_pixbuf</filename> libraries contain the
+<acronym>GTK</acronym>+ pixel buffer libraries for the
+<application><acronym>GIMP</acronym></application>
+Toolkit.</para></sect3>
+
+
+</sect2>
+
Index: gnome/otherlibs/gdk/gdk-inst.xml
===================================================================
--- gnome/otherlibs/gdk/gdk-inst.xml	(revision e50966a0b4fbab5fa51b3f2bf043e51da8d3ee20)
+++ gnome/otherlibs/gdk/gdk-inst.xml	(revision e50966a0b4fbab5fa51b3f2bf043e51da8d3ee20)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Installation of <application><acronym>GDK</acronym> Pixel Buffer</application></title>
+
+<para>The <command>make</command> command attempts to open an <application>X
+</application> display during the compile, so an <application>X</application>
+server must be running during this process.</para>
+
+<para>Install <application><acronym>GDK</acronym> Pixel Buffer</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>./configure --prefix=/opt/gnome --disable-gtk-doc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/otherlibs/gdk/gdk-intro.xml
===================================================================
--- gnome/otherlibs/gdk/gdk-intro.xml	(revision e50966a0b4fbab5fa51b3f2bf043e51da8d3ee20)
+++ gnome/otherlibs/gdk/gdk-intro.xml	(revision e50966a0b4fbab5fa51b3f2bf043e51da8d3ee20)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Introduction to <application><acronym>GDK</acronym> Pixel Buffer</application></title>
+
+<para>The <application><acronym>GDK</acronym> Pixel Buffer</application> package is the
+<acronym>GTK</acronym>+ pixel buffer library</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gdk-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gdk-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gdk-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gdk-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gdk-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>GDK</acronym> Pixel Buffer</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GTK"/>, <xref linkend="libpng"/>, <xref
+linkend="libjpeg"/> and <xref linkend="libtiff"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gtk-doc"/> and <xref linkend="gnome-libs"/></para></sect4>
+</sect3>
+
+
+</sect2>
Index: gnome/otherlibs/gdk/gdk.ent
===================================================================
--- gnome/otherlibs/gdk/gdk.ent	(revision e50966a0b4fbab5fa51b3f2bf043e51da8d3ee20)
+++ gnome/otherlibs/gdk/gdk.ent	(revision e50966a0b4fbab5fa51b3f2bf043e51da8d3ee20)
@@ -0,0 +1,10 @@
+<!ENTITY gdk SYSTEM "../gdk.xml">
+<!ENTITY gdk-intro SYSTEM "gdk-intro.xml">
+<!ENTITY gdk-inst SYSTEM "gdk-inst.xml">
+<!ENTITY gdk-desc SYSTEM "gdk-desc.xml">
+<!ENTITY gdk-version "0.22.0">
+<!ENTITY gdk-download-http "http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/0.22/gdk-pixbuf-&gdk-version;.tar.bz2">
+<!ENTITY gdk-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/0.22/gdk-pixbuf-&gdk-version;.tar.bz2">
+<!ENTITY gdk-size "396 KB">
+<!ENTITY gdk-buildsize "13.3 MB">
+<!ENTITY gdk-time "0.34 SBU">
