Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision 904004f27fe9d4c91ef96657b89c17722efe3d39)
+++ gnome/gnome.ent	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
@@ -10,5 +10,4 @@
 <!ENTITY % scrollkeeper SYSTEM "lib/scrollkeeper/scrollkeeper.ent">
 <!ENTITY % gdk SYSTEM "lib/gdk/gdk.ent">
-<!ENTITY % orbit SYSTEM "lib/orbit/orbit.ent">
 <!ENTITY % gnome-libs SYSTEM "lib/gnomelib/gnome-libs.ent">
 <!ENTITY % gtk-doc SYSTEM "lib/gtk-doc/gtk-doc.ent">
@@ -51,5 +50,4 @@
 %scrollkeeper;
 %gdk;
-%orbit;
 %gnome-libs;
 %gtk-doc;
@@ -152,4 +150,5 @@
 <!ENTITY gnome-otherlibs SYSTEM "otherlibs/otherlibs.xml">
 <!ENTITY gnome-otherlibs-config SYSTEM "otherlibs/otherlibs-config.xml">
+<!ENTITY % orbit SYSTEM "otherlibs/orbit/orbit.ent">
 <!ENTITY % gconf-editor SYSTEM "other/gconf-editor/gconf-editor.ent">
 <!ENTITY % gnome-print SYSTEM "otherlibs/gnome-print/gnome-print.ent">
@@ -163,4 +162,5 @@
 <!ENTITY % soup SYSTEM "otherlibs/soup/soup.ent">
 <!ENTITY % bonobo-conf SYSTEM "otherlibs/bonobo-conf/bonobo-conf.ent">
+%orbit;
 %gnome-print;
 %libglade14;
Index: ome/lib/orbit.xml
===================================================================
--- gnome/lib/orbit.xml	(revision 904004f27fe9d4c91ef96657b89c17722efe3d39)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<sect1 id="ORBit" xreflabel="ORBit-&ORBit-version;">
-<?dbhtml filename="ORBit.html" dir="gnome"?>
-<title>ORBit-&ORBit-version;</title>
-
-&ORBit-intro;
-&ORBit-inst;
-&ORBit-desc;
-
-</sect1>
-
Index: ome/lib/orbit/orbit-desc.xml
===================================================================
--- gnome/lib/orbit/orbit-desc.xml	(revision 904004f27fe9d4c91ef96657b89c17722efe3d39)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application><acronym>ORB</acronym>it</application> package contains <filename
-class="libraryfile">libIDL</filename>,
-<filename class="libraryfile">libIIOP</filename>, <filename
-class="libraryfile">libORBit</filename>,
-<filename class="libraryfile">libORBitCosNaming</filename> and
-<filename class="libraryfile">libORBitutil</filename> libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>libIDL</title>
-<para><filename class="libraryfile">libIDL</filename> library is the Interface Definition Language mappings for CORBA.</para></sect3>
-
-<sect3><title>libIIOP</title>
-<para><filename class="libraryfile">libIIOP</filename> library is for low level CORBA communications.</para></sect3>
-
-<sect3><title>libORBit</title>
-<para><filename class="libraryfile">libORBit</filename> library is the CORBA API.</para></sect3>
-
-<sect3><title>libORBitCosNaming</title>
-<para>No description available.</para></sect3>
-
-<sect3><title>libORBitutil</title>
-<para><filename class="libraryfile">libORBitutil</filename> library contain the convenience routines for ORBit.</para></sect3>
-
-
-</sect2>
-
Index: ome/lib/orbit/orbit-inst.xml
===================================================================
--- gnome/lib/orbit/orbit-inst.xml	(revision 904004f27fe9d4c91ef96657b89c17722efe3d39)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<sect2>
-<title>Installation of <application><acronym>ORB</acronym>it</application></title>
-
-<para>Install <application><acronym>ORB</acronym>it</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>./configure --prefix=/opt/gnome &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
Index: ome/lib/orbit/orbit-intro.xml
===================================================================
--- gnome/lib/orbit/orbit-intro.xml	(revision 904004f27fe9d4c91ef96657b89c17722efe3d39)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<sect2>
-<title>Introduction to <application><acronym>ORB</acronym>it</application></title>
-
-<para>The <application><acronym>ORB</acronym>it</application> package contains a high-performance 
-<acronym>CORBA</acronym> Object Request Broker. This allows programs to send requests and receive 
-replies from other programs.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&ORBit-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&ORBit-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &ORBit-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&ORBit-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&ORBit-time;</para></listitem></itemizedlist>
-</sect3>
-                                                                                
-<sect3><title><application><acronym>ORB</acronym>it</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="popt"/> and <xref linkend="GLib"/></para></sect4>
-</sect3>
-
-
-</sect2>
Index: ome/lib/orbit/orbit.ent
===================================================================
--- gnome/lib/orbit/orbit.ent	(revision 904004f27fe9d4c91ef96657b89c17722efe3d39)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<!ENTITY ORBit SYSTEM "../orbit.xml">
-<!ENTITY ORBit-intro SYSTEM "orbit-intro.xml">
-<!ENTITY ORBit-inst SYSTEM "orbit-inst.xml">
-<!ENTITY ORBit-desc SYSTEM "orbit-desc.xml">
-<!ENTITY ORBit-version "0.5.17">
-<!ENTITY ORBit-download-http "http://ftp.gnome.org/pub/GNOME/sources/ORBit/0.5/ORBit-&ORBit-version;.tar.bz2">
-<!ENTITY ORBit-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/ORBit/0.5/ORBit-&ORBit-version;.tar.bz2">
-<!ENTITY ORBit-size "1 MB">
-<!ENTITY ORBit-buildsize "51.4 MB">
-<!ENTITY ORBit-time "0.73 SBU">
Index: gnome/otherlibs/orbit.xml
===================================================================
--- gnome/otherlibs/orbit.xml	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
+++ gnome/otherlibs/orbit.xml	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
@@ -0,0 +1,10 @@
+<sect1 id="ORBit" xreflabel="ORBit-&ORBit-version;">
+<?dbhtml filename="ORBit.html" dir="gnome"?>
+<title>ORBit-&ORBit-version;</title>
+
+&ORBit-intro;
+&ORBit-inst;
+&ORBit-desc;
+
+</sect1>
+
Index: gnome/otherlibs/orbit/orbit-desc.xml
===================================================================
--- gnome/otherlibs/orbit/orbit-desc.xml	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
+++ gnome/otherlibs/orbit/orbit-desc.xml	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
@@ -0,0 +1,32 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>ORB</acronym>it</application> package contains <filename
+class="libraryfile">libIDL</filename>,
+<filename class="libraryfile">libIIOP</filename>, <filename
+class="libraryfile">libORBit</filename>,
+<filename class="libraryfile">libORBitCosNaming</filename> and
+<filename class="libraryfile">libORBitutil</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libIDL</title>
+<para><filename class="libraryfile">libIDL</filename> library is the Interface Definition Language mappings for CORBA.</para></sect3>
+
+<sect3><title>libIIOP</title>
+<para><filename class="libraryfile">libIIOP</filename> library is for low level CORBA communications.</para></sect3>
+
+<sect3><title>libORBit</title>
+<para><filename class="libraryfile">libORBit</filename> library is the CORBA API.</para></sect3>
+
+<sect3><title>libORBitCosNaming</title>
+<para>No description available.</para></sect3>
+
+<sect3><title>libORBitutil</title>
+<para><filename class="libraryfile">libORBitutil</filename> library contain the convenience routines for ORBit.</para></sect3>
+
+
+</sect2>
+
Index: gnome/otherlibs/orbit/orbit-inst.xml
===================================================================
--- gnome/otherlibs/orbit/orbit-inst.xml	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
+++ gnome/otherlibs/orbit/orbit-inst.xml	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of <application><acronym>ORB</acronym>it</application></title>
+
+<para>Install <application><acronym>ORB</acronym>it</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>./configure --prefix=/opt/gnome &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/otherlibs/orbit/orbit-intro.xml
===================================================================
--- gnome/otherlibs/orbit/orbit-intro.xml	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
+++ gnome/otherlibs/orbit/orbit-intro.xml	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
@@ -0,0 +1,27 @@
+<sect2>
+<title>Introduction to <application><acronym>ORB</acronym>it</application></title>
+
+<para>The <application><acronym>ORB</acronym>it</application> package contains a high-performance 
+<acronym>CORBA</acronym> Object Request Broker. This allows programs to send requests and receive 
+replies from other programs.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&ORBit-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&ORBit-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &ORBit-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&ORBit-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&ORBit-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>ORB</acronym>it</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="popt"/> and <xref linkend="GLib"/></para></sect4>
+</sect3>
+
+
+</sect2>
Index: gnome/otherlibs/orbit/orbit.ent
===================================================================
--- gnome/otherlibs/orbit/orbit.ent	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
+++ gnome/otherlibs/orbit/orbit.ent	(revision a6b09d5cc923aeae6c79d8fcf908250dd191b0ea)
@@ -0,0 +1,10 @@
+<!ENTITY ORBit SYSTEM "../orbit.xml">
+<!ENTITY ORBit-intro SYSTEM "orbit-intro.xml">
+<!ENTITY ORBit-inst SYSTEM "orbit-inst.xml">
+<!ENTITY ORBit-desc SYSTEM "orbit-desc.xml">
+<!ENTITY ORBit-version "0.5.17">
+<!ENTITY ORBit-download-http "http://ftp.gnome.org/pub/GNOME/sources/ORBit/0.5/ORBit-&ORBit-version;.tar.bz2">
+<!ENTITY ORBit-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/ORBit/0.5/ORBit-&ORBit-version;.tar.bz2">
+<!ENTITY ORBit-size "1 MB">
+<!ENTITY ORBit-buildsize "51.4 MB">
+<!ENTITY ORBit-time "0.73 SBU">
