diff --git a/gnome/lib/bonobo/bonobo-activation-config.xml b/gnome/lib/bonobo/bonobo-activation-config.xml
deleted file mode 100644
index ae8d287fba..0000000000
--- a/gnome/lib/bonobo/bonobo-activation-config.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Configuring Bonobo Activation
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/bonobo/bonobo-activation.ent b/gnome/lib/bonobo/bonobo-activation.ent
index ff443d12f6..fe2bc46d83 100644
--- a/gnome/lib/bonobo/bonobo-activation.ent
+++ b/gnome/lib/bonobo/bonobo-activation.ent
@@ -3,10 +3,9 @@
-
-
+
diff --git a/gnome/lib/eel/eel-config.xml b/gnome/lib/eel/eel-config.xml
deleted file mode 100644
index 53bf80d382..0000000000
--- a/gnome/lib/eel/eel-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring EEL
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/eel/eel.ent b/gnome/lib/eel/eel.ent
index c82645160c..dbbe41cc9a 100644
--- a/gnome/lib/eel/eel.ent
+++ b/gnome/lib/eel/eel.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/gail/gail-config.xml b/gnome/lib/gail/gail-config.xml
deleted file mode 100644
index 4c35c2d4f1..0000000000
--- a/gnome/lib/gail/gail-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring GAIL
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/gail/gail.ent b/gnome/lib/gail/gail.ent
index 7226c4e7ce..ba61f9840c 100644
--- a/gnome/lib/gail/gail.ent
+++ b/gnome/lib/gail/gail.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/gal/gal2-config.xml b/gnome/lib/gal/gal2-config.xml
deleted file mode 100644
index 84026c92c8..0000000000
--- a/gnome/lib/gal/gal2-config.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-Configuring GAL
-
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/gal/gal2.ent b/gnome/lib/gal/gal2.ent
index 52111b8755..8c48338090 100644
--- a/gnome/lib/gal/gal2.ent
+++ b/gnome/lib/gal/gal2.ent
@@ -1,12 +1,10 @@
-
-
-
+
diff --git a/gnome/lib/gconf/gconf-config.xml b/gnome/lib/gconf/gconf-config.xml
deleted file mode 100644
index cc0de490e5..0000000000
--- a/gnome/lib/gconf/gconf-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring GConf
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/gconf/gconf.ent b/gnome/lib/gconf/gconf.ent
index 5a28bea9ca..ec36af7cfb 100644
--- a/gnome/lib/gconf/gconf.ent
+++ b/gnome/lib/gconf/gconf.ent
@@ -3,10 +3,9 @@
-
-
-
-
+
+
+
diff --git a/gnome/lib/gnome-mime-data/gnome-mime-data.ent b/gnome/lib/gnome-mime-data/gnome-mime-data.ent
index 2d34d0accf..c2ad69a19f 100644
--- a/gnome/lib/gnome-mime-data/gnome-mime-data.ent
+++ b/gnome/lib/gnome-mime-data/gnome-mime-data.ent
@@ -3,10 +3,9 @@
-
-
-
-
+
+
+
diff --git a/gnome/lib/gnome-vfs/gnome-vfs-config.xml b/gnome/lib/gnome-vfs/gnome-vfs-config.xml
deleted file mode 100644
index 04d4fe29d4..0000000000
--- a/gnome/lib/gnome-vfs/gnome-vfs-config.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Configuring GNOME Virtual File
-System
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/gnome-vfs/gnome-vfs.ent b/gnome/lib/gnome-vfs/gnome-vfs.ent
index 9b2806fbd6..06c8383fc6 100644
--- a/gnome/lib/gnome-vfs/gnome-vfs.ent
+++ b/gnome/lib/gnome-vfs/gnome-vfs.ent
@@ -3,10 +3,9 @@
-
-
-
-
+
+
+
diff --git a/gnome/lib/gnomelib/libart_lgpl-config.xml b/gnome/lib/gnomelib/libart_lgpl-config.xml
deleted file mode 100644
index 35cbf220a1..0000000000
--- a/gnome/lib/gnomelib/libart_lgpl-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libart_lgpl
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/gnomelib/libart_lgpl.ent b/gnome/lib/gnomelib/libart_lgpl.ent
index 567462dd69..1ef129ed3f 100644
--- a/gnome/lib/gnomelib/libart_lgpl.ent
+++ b/gnome/lib/gnomelib/libart_lgpl.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/gnomelib/libbonobo-config.xml b/gnome/lib/gnomelib/libbonobo-config.xml
deleted file mode 100644
index 44f8a0f660..0000000000
--- a/gnome/lib/gnomelib/libbonobo-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libbonobo
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/gnomelib/libbonobo.ent b/gnome/lib/gnomelib/libbonobo.ent
index b0ba81f0f1..a5d692cbe9 100644
--- a/gnome/lib/gnomelib/libbonobo.ent
+++ b/gnome/lib/gnomelib/libbonobo.ent
@@ -1,12 +1,10 @@
-
-
-
+
diff --git a/gnome/lib/gnomelib/libbonoboui-config.xml b/gnome/lib/gnomelib/libbonoboui-config.xml
deleted file mode 100644
index 8eb6279698..0000000000
--- a/gnome/lib/gnomelib/libbonoboui-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libbonoboui
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/gnomelib/libbonoboui.ent b/gnome/lib/gnomelib/libbonoboui.ent
index 5cd520097c..4bb05d5c41 100644
--- a/gnome/lib/gnomelib/libbonoboui.ent
+++ b/gnome/lib/gnomelib/libbonoboui.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/gnomelib/libgnome-config.xml b/gnome/lib/gnomelib/libgnome-config.xml
deleted file mode 100644
index 4954f6836d..0000000000
--- a/gnome/lib/gnomelib/libgnome-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libgnome
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/gnomelib/libgnome.ent b/gnome/lib/gnomelib/libgnome.ent
index c692b6debc..1ecfcb24c7 100644
--- a/gnome/lib/gnomelib/libgnome.ent
+++ b/gnome/lib/gnomelib/libgnome.ent
@@ -3,10 +3,9 @@
-
-
-
-
+
+
+
diff --git a/gnome/lib/gnomelib/libgnomecanvas-config.xml b/gnome/lib/gnomelib/libgnomecanvas-config.xml
deleted file mode 100644
index 3f4db2ccad..0000000000
--- a/gnome/lib/gnomelib/libgnomecanvas-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libgnomecanvas
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/gnomelib/libgnomecanvas.ent b/gnome/lib/gnomelib/libgnomecanvas.ent
index fcb1ebff9c..30dced0b2f 100644
--- a/gnome/lib/gnomelib/libgnomecanvas.ent
+++ b/gnome/lib/gnomelib/libgnomecanvas.ent
@@ -3,10 +3,9 @@
-
-
-
-
+
+
+
diff --git a/gnome/lib/gnomelib/libgnomeui-config.xml b/gnome/lib/gnomelib/libgnomeui-config.xml
deleted file mode 100644
index 51ca37a72a..0000000000
--- a/gnome/lib/gnomelib/libgnomeui-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libgnomeui
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/gnomelib/libgnomeui.ent b/gnome/lib/gnomelib/libgnomeui.ent
index 819fac4325..d515969726 100644
--- a/gnome/lib/gnomelib/libgnomeui.ent
+++ b/gnome/lib/gnomelib/libgnomeui.ent
@@ -3,10 +3,9 @@
-
-
-
-
+
+
+
diff --git a/gnome/lib/gtk-doc/gtk-doc.ent b/gnome/lib/gtk-doc/gtk-doc.ent
index b11e08c018..4da3bee5d1 100644
--- a/gnome/lib/gtk-doc/gtk-doc.ent
+++ b/gnome/lib/gtk-doc/gtk-doc.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/gtk-engines/gtk-engines-config.xml b/gnome/lib/gtk-engines/gtk-engines-config.xml
deleted file mode 100644
index 57974ba68d..0000000000
--- a/gnome/lib/gtk-engines/gtk-engines-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring GTK Engines
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/gtk-engines/gtk-engines.ent b/gnome/lib/gtk-engines/gtk-engines.ent
index 5c7c1b62a3..d0b339e0c3 100644
--- a/gnome/lib/gtk-engines/gtk-engines.ent
+++ b/gnome/lib/gtk-engines/gtk-engines.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/gtkhtml/gtkhtml2.ent b/gnome/lib/gtkhtml/gtkhtml2.ent
index 65332cdb27..419c8bf86a 100644
--- a/gnome/lib/gtkhtml/gtkhtml2.ent
+++ b/gnome/lib/gtkhtml/gtkhtml2.ent
@@ -1,12 +1,10 @@
-
-
-
+
diff --git a/gnome/lib/intltool/intltool.ent b/gnome/lib/intltool/intltool.ent
index c5a9c0e662..de7a60f063 100644
--- a/gnome/lib/intltool/intltool.ent
+++ b/gnome/lib/intltool/intltool.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/libglade/libglade-config.xml b/gnome/lib/libglade/libglade-config.xml
deleted file mode 100644
index 605d99a439..0000000000
--- a/gnome/lib/libglade/libglade-config.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Configuring libglade
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/libglade/libglade.ent b/gnome/lib/libglade/libglade.ent
index ec3525463b..55e230060d 100644
--- a/gnome/lib/libglade/libglade.ent
+++ b/gnome/lib/libglade/libglade.ent
@@ -3,10 +3,9 @@
-
-
-
-
+
+
+
diff --git a/gnome/lib/libgnomeprint/libgnomeprint-config.xml b/gnome/lib/libgnomeprint/libgnomeprint-config.xml
deleted file mode 100644
index 77d83e5b97..0000000000
--- a/gnome/lib/libgnomeprint/libgnomeprint-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libgnomeprint
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/libgnomeprint/libgnomeprint.ent b/gnome/lib/libgnomeprint/libgnomeprint.ent
index 3273244972..b702995785 100644
--- a/gnome/lib/libgnomeprint/libgnomeprint.ent
+++ b/gnome/lib/libgnomeprint/libgnomeprint.ent
@@ -3,10 +3,9 @@
-
-
-
-
+
+
+
diff --git a/gnome/lib/libgnomeprint/libgnomeprintui-config.xml b/gnome/lib/libgnomeprint/libgnomeprintui-config.xml
deleted file mode 100644
index b18118804f..0000000000
--- a/gnome/lib/libgnomeprint/libgnomeprintui-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libgnomeprintui
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/libgnomeprint/libgnomeprintui.ent b/gnome/lib/libgnomeprint/libgnomeprintui.ent
index 055dd57261..1c4fab6f2a 100644
--- a/gnome/lib/libgnomeprint/libgnomeprintui.ent
+++ b/gnome/lib/libgnomeprint/libgnomeprintui.ent
@@ -3,11 +3,9 @@
-
-
-
-
+
+
+
diff --git a/gnome/lib/libgsf/libgsf.ent b/gnome/lib/libgsf/libgsf.ent
index b51a31a1b3..f30707aae2 100644
--- a/gnome/lib/libgsf/libgsf.ent
+++ b/gnome/lib/libgsf/libgsf.ent
@@ -3,10 +3,9 @@
-
-
+
diff --git a/gnome/lib/libgtkhtml/libgtkhtml-config.xml b/gnome/lib/libgtkhtml/libgtkhtml-config.xml
deleted file mode 100644
index 114f49f8e1..0000000000
--- a/gnome/lib/libgtkhtml/libgtkhtml-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libgtkhtml
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/libgtkhtml/libgtkhtml.ent b/gnome/lib/libgtkhtml/libgtkhtml.ent
index da991074ff..58632b8a19 100644
--- a/gnome/lib/libgtkhtml/libgtkhtml.ent
+++ b/gnome/lib/libgtkhtml/libgtkhtml.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/libgtop/libgtop-config.xml b/gnome/lib/libgtop/libgtop-config.xml
deleted file mode 100644
index c23c4a8045..0000000000
--- a/gnome/lib/libgtop/libgtop-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libgtop
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/libgtop/libgtop.ent b/gnome/lib/libgtop/libgtop.ent
index 0b09492dd8..20678d156f 100644
--- a/gnome/lib/libgtop/libgtop.ent
+++ b/gnome/lib/libgtop/libgtop.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/libidl/libidl-config.xml b/gnome/lib/libidl/libidl-config.xml
deleted file mode 100644
index f46f9603a6..0000000000
--- a/gnome/lib/libidl/libidl-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libIDL
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/libidl/libidl.ent b/gnome/lib/libidl/libidl.ent
index 16bc1f625b..2674db40bb 100644
--- a/gnome/lib/libidl/libidl.ent
+++ b/gnome/lib/libidl/libidl.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/librsvg/librsvg-config.xml b/gnome/lib/librsvg/librsvg-config.xml
deleted file mode 100644
index 0550c82a1a..0000000000
--- a/gnome/lib/librsvg/librsvg-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring librsvg
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/librsvg/librsvg.ent b/gnome/lib/librsvg/librsvg.ent
index ae69df4a9b..f03d942df7 100644
--- a/gnome/lib/librsvg/librsvg.ent
+++ b/gnome/lib/librsvg/librsvg.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/libwnck/libwnck-config.xml b/gnome/lib/libwnck/libwnck-config.xml
deleted file mode 100644
index 484d3c7c06..0000000000
--- a/gnome/lib/libwnck/libwnck-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring libwnck
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/libwnck/libwnck.ent b/gnome/lib/libwnck/libwnck.ent
index 8d2c401d6e..9135d3e63a 100644
--- a/gnome/lib/libwnck/libwnck.ent
+++ b/gnome/lib/libwnck/libwnck.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/linc/linc-config.xml b/gnome/lib/linc/linc-config.xml
deleted file mode 100644
index dca7ecdb96..0000000000
--- a/gnome/lib/linc/linc-config.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-Configuring linc
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/linc/linc.ent b/gnome/lib/linc/linc.ent
index 101c13a91c..07bc755c4e 100644
--- a/gnome/lib/linc/linc.ent
+++ b/gnome/lib/linc/linc.ent
@@ -3,10 +3,9 @@
-
-
-
-
+
+
+
diff --git a/gnome/lib/orbit/orbit2-config.xml b/gnome/lib/orbit/orbit2-config.xml
deleted file mode 100644
index 68ab25e831..0000000000
--- a/gnome/lib/orbit/orbit2-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Configuring ORBit2
-
-
-Configuration Information
-
-&library-config;
-
-
-
-
-
diff --git a/gnome/lib/orbit/orbit2.ent b/gnome/lib/orbit/orbit2.ent
index 1f28e5ec83..0edfb73557 100644
--- a/gnome/lib/orbit/orbit2.ent
+++ b/gnome/lib/orbit/orbit2.ent
@@ -1,13 +1,11 @@
-
-
-
+
diff --git a/gnome/lib/scrollkeeper.xml b/gnome/lib/scrollkeeper.xml
index 765bae9470..db4bd0af0f 100644
--- a/gnome/lib/scrollkeeper.xml
+++ b/gnome/lib/scrollkeeper.xml
@@ -5,7 +5,7 @@
&scrollkeeper-intro;
&scrollkeeper-inst;
&scrollkeeper-exp;
+&scrollkeeper-config;
&scrollkeeper-desc;
-
diff --git a/gnome/lib/scrollkeeper/scrollkeeper-config.xml b/gnome/lib/scrollkeeper/scrollkeeper-config.xml
index e6e901706b..55bc18a2e4 100644
--- a/gnome/lib/scrollkeeper/scrollkeeper-config.xml
+++ b/gnome/lib/scrollkeeper/scrollkeeper-config.xml
@@ -12,9 +12,6 @@ of all of the omf directories in the syst
configure command so no futher action is needed until another
OMF file is created.
-&library-config;
-
-
diff --git a/gnome/lib/scrollkeeper/scrollkeeper.ent b/gnome/lib/scrollkeeper/scrollkeeper.ent
index 4d94f01db8..6dbc006d8c 100644
--- a/gnome/lib/scrollkeeper/scrollkeeper.ent
+++ b/gnome/lib/scrollkeeper/scrollkeeper.ent
@@ -2,11 +2,11 @@
-
-
+
-
-
+
+
+
diff --git a/gnome/lib/themes/gnome-icon-themes.ent b/gnome/lib/themes/gnome-icon-themes.ent
index 54ed19c4a0..d1a7b12360 100644
--- a/gnome/lib/themes/gnome-icon-themes.ent
+++ b/gnome/lib/themes/gnome-icon-themes.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/themes/gnome-themes.ent b/gnome/lib/themes/gnome-themes.ent
index 15a41e06d0..ba8e05df82 100644
--- a/gnome/lib/themes/gnome-themes.ent
+++ b/gnome/lib/themes/gnome-themes.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/themes/gtk-thinice-engine.ent b/gnome/lib/themes/gtk-thinice-engine.ent
index 864f2ab427..6bb416a18f 100644
--- a/gnome/lib/themes/gtk-thinice-engine.ent
+++ b/gnome/lib/themes/gtk-thinice-engine.ent
@@ -1,12 +1,10 @@
-
-
-
-
-
+
+
+
diff --git a/gnome/lib/vte/vte.ent b/gnome/lib/vte/vte.ent
index fae0d266fb..f40c0932e6 100644
--- a/gnome/lib/vte/vte.ent
+++ b/gnome/lib/vte/vte.ent
@@ -3,10 +3,9 @@
-
-
-
-
+
+
+
diff --git a/index.xml b/index.xml
index 8bbae53a1f..5d08426cda 100644
--- a/index.xml
+++ b/index.xml
@@ -2,8 +2,8 @@
-
+
+