Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision 97fd07dacf1df91d828a610fa2f872342a2fce3d)
+++ gnome/gnome.ent	(revision b6ef0b319ad484910486e3fb389f6ce24975666f)
@@ -25,5 +25,5 @@
 <!ENTITY % libgnome SYSTEM "lib/libgnome/libgnome.ent">
 <!ENTITY % libgnomecanvas SYSTEM "lib/libgnomecanvas/libgnomecanvas.ent">
-<!ENTITY % libbonoboui SYSTEM "lib/gnomelib/libbonoboui.ent">
+<!ENTITY % libbonoboui SYSTEM "lib/libbonoboui/libbonoboui.ent">
 <!ENTITY % libgnomeui SYSTEM "lib/gnomelib/libgnomeui.ent">
 <!ENTITY % libwnck SYSTEM "lib/libwnck/libwnck.ent">
Index: ome/lib/gnomelib/libbonoboui-desc.xml
===================================================================
--- gnome/lib/gnomelib/libbonoboui-desc.xml	(revision 97fd07dacf1df91d828a610fa2f872342a2fce3d)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application>libbonoboui</application> package contains
-<filename class="libraryfile">libbonoboui</filename> libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>libbonoboui libraries</title>
-<para><filename class="libraryfile">libbonoboui</filename> libraries are the
-<acronym>GUI</acronym> portion of the <application>Bonobo</application> libraries.</para></sect3>
-
-
-</sect2>
-
Index: ome/lib/gnomelib/libbonoboui-inst.xml
===================================================================
--- gnome/lib/gnomelib/libbonoboui-inst.xml	(revision 97fd07dacf1df91d828a610fa2f872342a2fce3d)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect2>
-<title>Installation of <application>libbonoboui</application></title>
-
-<para>Install <application>libbonoboui</application> by running the following commands:</para>
-
-<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --disable-gtk-doc &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
Index: ome/lib/gnomelib/libbonoboui-intro.xml
===================================================================
--- gnome/lib/gnomelib/libbonoboui-intro.xml	(revision 97fd07dacf1df91d828a610fa2f872342a2fce3d)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<sect2>
-<title>Introduction to <application>libbonoboui</application></title>
-
-<para>The <application>libbonoboui</application> package contains
-<filename class="libraryfile">libbonoboui</filename> libraries.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&libbonoboui-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&libbonoboui-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &libbonoboui-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&libbonoboui-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&libbonoboui-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>libbonoboui</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="libgnome"/>, <xref linkend="libbonobo"/> and <xref
-linkend="libgnomecanvas"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/> and <xref linkend="DocBook"/></para></sect4>
-</sect3>
-
-</sect2>
Index: ome/lib/gnomelib/libbonoboui.ent
===================================================================
--- gnome/lib/gnomelib/libbonoboui.ent	(revision 97fd07dacf1df91d828a610fa2f872342a2fce3d)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<!ENTITY libbonoboui SYSTEM "../libbonoboui.xml">
-<!ENTITY libbonoboui-intro SYSTEM "libbonoboui-intro.xml">
-<!ENTITY libbonoboui-inst SYSTEM "libbonoboui-inst.xml">
-<!ENTITY libbonoboui-desc SYSTEM "libbonoboui-desc.xml">
-<!ENTITY libbonoboui-version "2.2.2">
-<!ENTITY libbonoboui-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.2/libbonoboui-&libbonoboui-version;.tar.bz2">
-<!ENTITY libbonoboui-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.2/libbonoboui-&libbonoboui-version;.tar.bz2">
-<!ENTITY libbonoboui-size "740 KB">
-<!ENTITY libbonoboui-buildsize "65.5 MB">
-<!ENTITY libbonoboui-time "1.71 SBU">
Index: gnome/lib/libbonoboui/libbonoboui-desc.xml
===================================================================
--- gnome/lib/libbonoboui/libbonoboui-desc.xml	(revision b6ef0b319ad484910486e3fb389f6ce24975666f)
+++ gnome/lib/libbonoboui/libbonoboui-desc.xml	(revision b6ef0b319ad484910486e3fb389f6ce24975666f)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libbonoboui</application> package contains
+<filename class="libraryfile">libbonoboui</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libbonoboui libraries</title>
+<para><filename class="libraryfile">libbonoboui</filename> libraries are the
+<acronym>GUI</acronym> portion of the <application>Bonobo</application> libraries.</para></sect3>
+
+
+</sect2>
+
Index: gnome/lib/libbonoboui/libbonoboui-inst.xml
===================================================================
--- gnome/lib/libbonoboui/libbonoboui-inst.xml	(revision b6ef0b319ad484910486e3fb389f6ce24975666f)
+++ gnome/lib/libbonoboui/libbonoboui-inst.xml	(revision b6ef0b319ad484910486e3fb389f6ce24975666f)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>libbonoboui</application></title>
+
+<para>Install <application>libbonoboui</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --disable-gtk-doc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/lib/libbonoboui/libbonoboui-intro.xml
===================================================================
--- gnome/lib/libbonoboui/libbonoboui-intro.xml	(revision b6ef0b319ad484910486e3fb389f6ce24975666f)
+++ gnome/lib/libbonoboui/libbonoboui-intro.xml	(revision b6ef0b319ad484910486e3fb389f6ce24975666f)
@@ -0,0 +1,28 @@
+<sect2>
+<title>Introduction to <application>libbonoboui</application></title>
+
+<para>The <application>libbonoboui</application> package contains
+<filename class="libraryfile">libbonoboui</filename> libraries.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libbonoboui-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libbonoboui-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libbonoboui-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libbonoboui-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libbonoboui-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>libbonoboui</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libgnome"/>, <xref linkend="libbonobo"/> and <xref
+linkend="libgnomecanvas"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gtk-doc"/> and <xref linkend="DocBook"/></para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/lib/libbonoboui/libbonoboui.ent
===================================================================
--- gnome/lib/libbonoboui/libbonoboui.ent	(revision b6ef0b319ad484910486e3fb389f6ce24975666f)
+++ gnome/lib/libbonoboui/libbonoboui.ent	(revision b6ef0b319ad484910486e3fb389f6ce24975666f)
@@ -0,0 +1,10 @@
+<!ENTITY libbonoboui SYSTEM "../libbonoboui.xml">
+<!ENTITY libbonoboui-intro SYSTEM "libbonoboui-intro.xml">
+<!ENTITY libbonoboui-inst SYSTEM "libbonoboui-inst.xml">
+<!ENTITY libbonoboui-desc SYSTEM "libbonoboui-desc.xml">
+<!ENTITY libbonoboui-version "2.2.2">
+<!ENTITY libbonoboui-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.2/libbonoboui-&libbonoboui-version;.tar.bz2">
+<!ENTITY libbonoboui-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.2/libbonoboui-&libbonoboui-version;.tar.bz2">
+<!ENTITY libbonoboui-size "740 KB">
+<!ENTITY libbonoboui-buildsize "65.5 MB">
+<!ENTITY libbonoboui-time "1.71 SBU">
