Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
+++ gnome/gnome.ent	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
@@ -20,5 +20,5 @@
 <!ENTITY % libart_lgpl SYSTEM "lib/gnomelib/libart_lgpl.ent">
 <!ENTITY % libzvt SYSTEM "lib/gnomelib/libzvt.ent">
-<!ENTITY % libbonobo SYSTEM "lib/gnomelib/libbonobo.ent">
+<!ENTITY % libbonobo SYSTEM "lib/libbonobo/libbonobo.ent">
 <!ENTITY % gnome-mime-data SYSTEM "lib/gnome-mime-data/gnome-mime-data.ent">
 <!ENTITY % gnome-vfs SYSTEM "lib/gnome-vfs/gnome-vfs.ent">
Index: ome/lib/gnomelib/libbonobo-desc.xml
===================================================================
--- gnome/lib/gnomelib/libbonobo-desc.xml	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application>libbonobo</application> package contains
-<filename class="libraryfile">libbonobo</filename> libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>libbonobo libraries</title>
-<para><filename class="libraryfile">libbonobo</filename> libraries are a set of language and system independent
-<acronym>CORBA</acronym> interfaces for creating reusable components and compound documents.</para></sect3>
-
-</sect2>
-
Index: ome/lib/gnomelib/libbonobo-inst.xml
===================================================================
--- gnome/lib/gnomelib/libbonobo-inst.xml	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect2>
-<title>Installation of <application>libbonobo</application></title>
-
-<para>Install <application>libbonobo</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/libbonobo-intro.xml
===================================================================
--- gnome/lib/gnomelib/libbonobo-intro.xml	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<sect2>
-<title>Introduction to <application>libbonobo</application></title>
-
-<para>The <application>libbonobo</application> package contains
-<filename class="libraryfile">libbonobo</filename> libraries. This is a
-component and compound document system for
-<application><acronym>GNOME</acronym></application>.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&libbonobo-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&libbonobo-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &libbonobo-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&libbonobo-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&libbonobo-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>libbonobo</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="ORBit2"/> and <xref linkend="bonobo-activation"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/> and <xref linkend="DocBook"/></para></sect4>
-</sect3>
-
-</sect2>
Index: ome/lib/gnomelib/libbonobo.ent
===================================================================
--- gnome/lib/gnomelib/libbonobo.ent	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<!ENTITY libbonobo SYSTEM "../libbonobo.xml">
-<!ENTITY libbonobo-intro SYSTEM "libbonobo-intro.xml">
-<!ENTITY libbonobo-inst SYSTEM "libbonobo-inst.xml">
-<!ENTITY libbonobo-desc SYSTEM "libbonobo-desc.xml">
-<!ENTITY libbonobo-version "2.2.3">
-<!ENTITY libbonobo-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.2/libbonobo-&libbonobo-version;.tar.bz2">
-<!ENTITY libbonobo-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.2/libbonobo-&libbonobo-version;.tar.bz2">
-<!ENTITY libbonobo-size "568 KB">
-<!ENTITY libbonobo-buildsize "38.4 MB">
-<!ENTITY libbonobo-time "1.01 SBU">
Index: gnome/lib/libbonobo/libbonobo-desc.xml
===================================================================
--- gnome/lib/libbonobo/libbonobo-desc.xml	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
+++ gnome/lib/libbonobo/libbonobo-desc.xml	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libbonobo</application> package contains
+<filename class="libraryfile">libbonobo</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libbonobo libraries</title>
+<para><filename class="libraryfile">libbonobo</filename> libraries are a set of language and system independent
+<acronym>CORBA</acronym> interfaces for creating reusable components and compound documents.</para></sect3>
+
+</sect2>
+
Index: gnome/lib/libbonobo/libbonobo-inst.xml
===================================================================
--- gnome/lib/libbonobo/libbonobo-inst.xml	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
+++ gnome/lib/libbonobo/libbonobo-inst.xml	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>libbonobo</application></title>
+
+<para>Install <application>libbonobo</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/libbonobo/libbonobo-intro.xml
===================================================================
--- gnome/lib/libbonobo/libbonobo-intro.xml	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
+++ gnome/lib/libbonobo/libbonobo-intro.xml	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Introduction to <application>libbonobo</application></title>
+
+<para>The <application>libbonobo</application> package contains
+<filename class="libraryfile">libbonobo</filename> libraries. This is a
+component and compound document system for
+<application><acronym>GNOME</acronym></application>.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libbonobo-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libbonobo-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libbonobo-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libbonobo-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libbonobo-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>libbonobo</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="ORBit2"/> and <xref linkend="bonobo-activation"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gtk-doc"/> and <xref linkend="DocBook"/></para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/lib/libbonobo/libbonobo.ent
===================================================================
--- gnome/lib/libbonobo/libbonobo.ent	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
+++ gnome/lib/libbonobo/libbonobo.ent	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
@@ -0,0 +1,10 @@
+<!ENTITY libbonobo SYSTEM "../libbonobo.xml">
+<!ENTITY libbonobo-intro SYSTEM "libbonobo-intro.xml">
+<!ENTITY libbonobo-inst SYSTEM "libbonobo-inst.xml">
+<!ENTITY libbonobo-desc SYSTEM "libbonobo-desc.xml">
+<!ENTITY libbonobo-version "2.2.3">
+<!ENTITY libbonobo-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.2/libbonobo-&libbonobo-version;.tar.bz2">
+<!ENTITY libbonobo-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.2/libbonobo-&libbonobo-version;.tar.bz2">
+<!ENTITY libbonobo-size "568 KB">
+<!ENTITY libbonobo-buildsize "38.4 MB">
+<!ENTITY libbonobo-time "1.01 SBU">
