Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
+++ gnome/gnome.ent	(revision 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9)
@@ -37,5 +37,4 @@
 <!ENTITY % gtk-engines SYSTEM "lib/gtk-engines/gtk-engines.ent">
 <!ENTITY % oaf SYSTEM "lib/oaf/oaf.ent">
-<!ENTITY % gconf1 SYSTEM "lib/gconf/gconf1.ent">
 <!ENTITY % gnome-vfs1 SYSTEM "lib/gnome-vfs/gnome-vfs1.ent">
 <!ENTITY % gnome-icon-themes SYSTEM "lib/themes/gnome-icon-themes.ent">
@@ -77,5 +76,4 @@
 %libgtkhtml;
 %gtk-engines;
-%gconf1;
 %gnome-vfs1;
 %gnome-icon-themes;
@@ -159,4 +157,5 @@
 <!ENTITY % libghttp SYSTEM "otherlibs/libghttp/libghttp.ent">
 <!ENTITY % bonobo14 SYSTEM "otherlibs/bonobo14/bonobo14.ent">
+<!ENTITY % gconf1 SYSTEM "otherlibs/gconf/gconf1.ent">
 <!ENTITY % guppi SYSTEM "otherlibs/guppi/guppi.ent">
 <!ENTITY % soup SYSTEM "otherlibs/soup/soup.ent">
@@ -170,4 +169,5 @@
 %libghttp;
 %bonobo14;
+%gconf1;
 %guppi;
 %soup;
Index: ome/lib/gconf/gconf1-desc.xml
===================================================================
--- gnome/lib/gconf/gconf1-desc.xml	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application>GConf</application> package contains <filename>libgconf
-</filename> libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>libgconf libraries</title>
-<para><filename>libgconf</filename> libraries provide the functions necessary 
-to maintain the configuration database.</para></sect3>
-
-
-</sect2>
-
Index: ome/lib/gconf/gconf1-inst.xml
===================================================================
--- gnome/lib/gconf/gconf1-inst.xml	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<sect2>
-<title>Installation of <application>GConf</application></title>
-
-<para>Install <application>GConf</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/gconf/gconf1-intro.xml
===================================================================
--- gnome/lib/gconf/gconf1-intro.xml	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<sect2>
-<title>Introduction to <application>GConf</application></title>
-
-<para>The <application>GConf</application> package contains a configuration 
-database system.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&GConf1-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&GConf1-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &GConf1-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&GConf1-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&GConf1-time;</para></listitem></itemizedlist>
-</sect3>
-                                                                                
-<sect3><title><application>GConf</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="oaf"/>, <xref linkend="GTK"/> and <xref linkend="gdk"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="db-3.3"/> and <xref linkend="guile"/></para></sect4>
-</sect3>
-
-
-</sect2>
Index: ome/lib/gconf/gconf1.ent
===================================================================
--- gnome/lib/gconf/gconf1.ent	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<!ENTITY GConf1 SYSTEM "../gconf1.xml">
-<!ENTITY GConf1-intro SYSTEM "gconf1-intro.xml">
-<!ENTITY GConf1-inst SYSTEM "gconf1-inst.xml">
-<!ENTITY GConf1-desc SYSTEM "gconf1-desc.xml">
-<!ENTITY GConf1-version "1.0.9">
-<!ENTITY GConf1-download-http "http://ftp.gnome.org/pub/GNOME/sources/GConf/1.0/GConf-&GConf1-version;.tar.bz2">
-<!ENTITY GConf1-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/GConf/1.0/GConf-&GConf1-version;.tar.bz2">
-<!ENTITY GConf1-size "772 KB">
-<!ENTITY GConf1-buildsize "20.0 MB">
-<!ENTITY GConf1-time "0.44">
Index: ome/lib/gconf1.xml
===================================================================
--- gnome/lib/gconf1.xml	(revision c356d2560a1ee7da08499d6b3c04a7dddd378078)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<sect1 id="GConf1" xreflabel="GConf-&GConf1-version;">
-<?dbhtml filename="gconf1.html" dir="gnome"?>
-<title>GConf-&GConf1-version;</title>
-
-&GConf1-intro;
-&GConf1-inst;
-&GConf1-desc;
-
-</sect1>
-
Index: gnome/otherlibs/gconf/gconf1-desc.xml
===================================================================
--- gnome/otherlibs/gconf/gconf1-desc.xml	(revision 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9)
+++ gnome/otherlibs/gconf/gconf1-desc.xml	(revision 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>GConf</application> package contains <filename>libgconf
+</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libgconf libraries</title>
+<para><filename>libgconf</filename> libraries provide the functions necessary 
+to maintain the configuration database.</para></sect3>
+
+
+</sect2>
+
Index: gnome/otherlibs/gconf/gconf1-inst.xml
===================================================================
--- gnome/otherlibs/gconf/gconf1-inst.xml	(revision 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9)
+++ gnome/otherlibs/gconf/gconf1-inst.xml	(revision 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of <application>GConf</application></title>
+
+<para>Install <application>GConf</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/gconf/gconf1-intro.xml
===================================================================
--- gnome/otherlibs/gconf/gconf1-intro.xml	(revision 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9)
+++ gnome/otherlibs/gconf/gconf1-intro.xml	(revision 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9)
@@ -0,0 +1,28 @@
+<sect2>
+<title>Introduction to <application>GConf</application></title>
+
+<para>The <application>GConf</application> package contains a configuration 
+database system.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&GConf1-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&GConf1-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &GConf1-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&GConf1-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&GConf1-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>GConf</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="oaf"/>, <xref linkend="GTK"/> and <xref linkend="gdk"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="db-3.3"/> and <xref linkend="guile"/></para></sect4>
+</sect3>
+
+
+</sect2>
Index: gnome/otherlibs/gconf/gconf1.ent
===================================================================
--- gnome/otherlibs/gconf/gconf1.ent	(revision 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9)
+++ gnome/otherlibs/gconf/gconf1.ent	(revision 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9)
@@ -0,0 +1,10 @@
+<!ENTITY GConf1 SYSTEM "../gconf1.xml">
+<!ENTITY GConf1-intro SYSTEM "gconf1-intro.xml">
+<!ENTITY GConf1-inst SYSTEM "gconf1-inst.xml">
+<!ENTITY GConf1-desc SYSTEM "gconf1-desc.xml">
+<!ENTITY GConf1-version "1.0.9">
+<!ENTITY GConf1-download-http "http://ftp.gnome.org/pub/GNOME/sources/GConf/1.0/GConf-&GConf1-version;.tar.bz2">
+<!ENTITY GConf1-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/GConf/1.0/GConf-&GConf1-version;.tar.bz2">
+<!ENTITY GConf1-size "772 KB">
+<!ENTITY GConf1-buildsize "20.0 MB">
+<!ENTITY GConf1-time "0.44">
Index: gnome/otherlibs/gconf1.xml
===================================================================
--- gnome/otherlibs/gconf1.xml	(revision 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9)
+++ gnome/otherlibs/gconf1.xml	(revision 0ae36b81583f3fe3b8dd17bdccf49d8b4e80a2d9)
@@ -0,0 +1,10 @@
+<sect1 id="GConf1" xreflabel="GConf-&GConf1-version;">
+<?dbhtml filename="gconf1.html" dir="gnome"?>
+<title>GConf-&GConf1-version;</title>
+
+&GConf1-intro;
+&GConf1-inst;
+&GConf1-desc;
+
+</sect1>
+
