Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision 603585ab7fe8e5c32633f0006bfd9e2a5755a3e8)
+++ gnome/gnome.ent	(revision cd289cbe483385c5f659a2a3d936a332c63fd864)
@@ -38,5 +38,4 @@
 <!ENTITY % libgtkhtml SYSTEM "lib/libgtkhtml/libgtkhtml.ent">
 <!ENTITY % gtk-engines SYSTEM "lib/gtk-engines/gtk-engines.ent">
-<!ENTITY % oaf SYSTEM "lib/oaf/oaf.ent">
 <!ENTITY % gnome-icon-themes SYSTEM "lib/gnome-icon-themes/gnome-icon-themes.ent">
 <!ENTITY % vte SYSTEM "lib/vte/vte.ent">
@@ -57,5 +56,4 @@
 %orbit2;
 %bonobo-activation;
-%oaf;
 %gconf;
 %libart_lgpl;
@@ -147,4 +145,5 @@
 <!ENTITY gnome-otherlibs-config SYSTEM "otherlibs/otherlibs-config.xml">
 <!ENTITY % orbit SYSTEM "otherlibs/orbit/orbit.ent">
+<!ENTITY % oaf SYSTEM "otherlibs/oaf/oaf.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 @@
 <!ENTITY % bonobo-conf SYSTEM "otherlibs/bonobo-conf/bonobo-conf.ent">
 %orbit;
+%oaf;
 %gnome-print;
 %libglade14;
Index: ome/lib/oaf.xml
===================================================================
--- gnome/lib/oaf.xml	(revision 603585ab7fe8e5c32633f0006bfd9e2a5755a3e8)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<sect1 id="oaf" xreflabel="OAF-&oaf-version;">
-<?dbhtml filename="oaf.html" dir="gnome"?>
-<title>OAF-&oaf-version;</title>
-
-&oaf-intro;
-&oaf-inst;
-&oaf-desc;
-
-</sect1>
-
Index: ome/lib/oaf/oaf-desc.xml
===================================================================
--- gnome/lib/oaf/oaf-desc.xml	(revision 603585ab7fe8e5c32633f0006bfd9e2a5755a3e8)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application><acronym>OAF</acronym></application> package
-contains <filename class="libraryfile">liboaf</filename> libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>liboaf libraries</title>
-<para>No description available.</para></sect3>
-
-
-</sect2>
-
Index: ome/lib/oaf/oaf-inst.xml
===================================================================
--- gnome/lib/oaf/oaf-inst.xml	(revision 603585ab7fe8e5c32633f0006bfd9e2a5755a3e8)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<sect2>
-<title>Installation of <application><acronym>OAF</acronym></application></title>
-
-<para>Install <application><acronym>OAF</acronym></application> by running the following commands:
-</para>
-
-<screen><userinput><command>ldconfig &amp;&amp;
-./configure --prefix=/opt/gnome --disable-gtk-doc &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
Index: ome/lib/oaf/oaf-intro.xml
===================================================================
--- gnome/lib/oaf/oaf-intro.xml	(revision 603585ab7fe8e5c32633f0006bfd9e2a5755a3e8)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<sect2>
-<title>Introduction to <application><acronym>OAF</acronym></application></title>
-
-<para>The <application><acronym>OAF</acronym></application> package contains the Object Activation 
-Framework for <application><acronym>GNOME</acronym></application>.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&oaf-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&oaf-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &oaf-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&oaf-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&oaf-time;</para></listitem></itemizedlist>
-</sect3>
-                                                                                
-<sect3><title><application><acronym>OAF</acronym></application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="ORBit"/> and <xref linkend="libxml"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/></para></sect4>
-</sect3>
-
-
-</sect2>
Index: ome/lib/oaf/oaf.ent
===================================================================
--- gnome/lib/oaf/oaf.ent	(revision 603585ab7fe8e5c32633f0006bfd9e2a5755a3e8)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<!ENTITY oaf SYSTEM "../oaf.xml">
-<!ENTITY oaf-intro SYSTEM "oaf-intro.xml">
-<!ENTITY oaf-inst SYSTEM "oaf-inst.xml">
-<!ENTITY oaf-desc SYSTEM "oaf-desc.xml">
-<!ENTITY oaf-version "0.6.10">
-<!ENTITY oaf-download-http "http://ftp.gnome.org/pub/GNOME/sources/oaf/0.6/oaf-&oaf-version;.tar.bz2">
-<!ENTITY oaf-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/oaf/0.6/oaf-&oaf-version;.tar.bz2">
-<!ENTITY oaf-size "432 KB">
-<!ENTITY oaf-buildsize "10.3 MB">
-<!ENTITY oaf-time "0.16">
Index: gnome/otherlibs/oaf.xml
===================================================================
--- gnome/otherlibs/oaf.xml	(revision cd289cbe483385c5f659a2a3d936a332c63fd864)
+++ gnome/otherlibs/oaf.xml	(revision cd289cbe483385c5f659a2a3d936a332c63fd864)
@@ -0,0 +1,10 @@
+<sect1 id="oaf" xreflabel="OAF-&oaf-version;">
+<?dbhtml filename="oaf.html" dir="gnome"?>
+<title>OAF-&oaf-version;</title>
+
+&oaf-intro;
+&oaf-inst;
+&oaf-desc;
+
+</sect1>
+
Index: gnome/otherlibs/oaf/oaf-desc.xml
===================================================================
--- gnome/otherlibs/oaf/oaf-desc.xml	(revision cd289cbe483385c5f659a2a3d936a332c63fd864)
+++ gnome/otherlibs/oaf/oaf-desc.xml	(revision cd289cbe483385c5f659a2a3d936a332c63fd864)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>OAF</acronym></application> package
+contains <filename class="libraryfile">liboaf</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>liboaf libraries</title>
+<para>No description available.</para></sect3>
+
+
+</sect2>
+
Index: gnome/otherlibs/oaf/oaf-inst.xml
===================================================================
--- gnome/otherlibs/oaf/oaf-inst.xml	(revision cd289cbe483385c5f659a2a3d936a332c63fd864)
+++ gnome/otherlibs/oaf/oaf-inst.xml	(revision cd289cbe483385c5f659a2a3d936a332c63fd864)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Installation of <application><acronym>OAF</acronym></application></title>
+
+<para>Install <application><acronym>OAF</acronym></application> by running the following commands:
+</para>
+
+<screen><userinput><command>ldconfig &amp;&amp;
+./configure --prefix=/opt/gnome --disable-gtk-doc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/otherlibs/oaf/oaf-intro.xml
===================================================================
--- gnome/otherlibs/oaf/oaf-intro.xml	(revision cd289cbe483385c5f659a2a3d936a332c63fd864)
+++ gnome/otherlibs/oaf/oaf-intro.xml	(revision cd289cbe483385c5f659a2a3d936a332c63fd864)
@@ -0,0 +1,28 @@
+<sect2>
+<title>Introduction to <application><acronym>OAF</acronym></application></title>
+
+<para>The <application><acronym>OAF</acronym></application> package contains the Object Activation 
+Framework for <application><acronym>GNOME</acronym></application>.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&oaf-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&oaf-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &oaf-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&oaf-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&oaf-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>OAF</acronym></application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="ORBit"/> and <xref linkend="libxml"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gtk-doc"/></para></sect4>
+</sect3>
+
+
+</sect2>
Index: gnome/otherlibs/oaf/oaf.ent
===================================================================
--- gnome/otherlibs/oaf/oaf.ent	(revision cd289cbe483385c5f659a2a3d936a332c63fd864)
+++ gnome/otherlibs/oaf/oaf.ent	(revision cd289cbe483385c5f659a2a3d936a332c63fd864)
@@ -0,0 +1,10 @@
+<!ENTITY oaf SYSTEM "../oaf.xml">
+<!ENTITY oaf-intro SYSTEM "oaf-intro.xml">
+<!ENTITY oaf-inst SYSTEM "oaf-inst.xml">
+<!ENTITY oaf-desc SYSTEM "oaf-desc.xml">
+<!ENTITY oaf-version "0.6.10">
+<!ENTITY oaf-download-http "http://ftp.gnome.org/pub/GNOME/sources/oaf/0.6/oaf-&oaf-version;.tar.bz2">
+<!ENTITY oaf-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/oaf/0.6/oaf-&oaf-version;.tar.bz2">
+<!ENTITY oaf-size "432 KB">
+<!ENTITY oaf-buildsize "10.3 MB">
+<!ENTITY oaf-time "0.16">
