Index: gnome/otherlibs/gal.xml
===================================================================
--- gnome/otherlibs/gal.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect1 id="gal" xreflabel="GAL-&gal-version;">
-<?dbhtml filename="gal.html"?>
-<title>GAL-&gal-version;</title>
-
-&gal-intro;
-&gal-inst;
-&gal-exp;
-&gal-desc;
-
-</sect1>
-
Index: gnome/otherlibs/gal/gal-desc.xml
===================================================================
--- gnome/otherlibs/gal/gal-desc.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application><acronym>GAL</acronym></application> package contains library routines 
-refactored from <application>Evolution</application> and <application>Gnumeric
-</application>.</para>
-</sect2>
-
Index: gnome/otherlibs/gal/gal-exp.xml
===================================================================
--- gnome/otherlibs/gal/gal-exp.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>--prefix=/opt/gnome</parameter>: Install
-<application><acronym>GAL</acronym>
-</application> in the <application><acronym>GNOME</acronym></application> 1.4 area.</para>
-
-</sect2>
-
Index: gnome/otherlibs/gal/gal-inst.xml
===================================================================
--- gnome/otherlibs/gal/gal-inst.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<sect2>
-<title>Installation of <application><acronym>GAL</acronym></application></title>
-
-<para>Install <application><acronym>GAL</acronym></application> by running the following commands:
-</para>
-
-<screen><userinput><command>./configure --prefix=/opt/gnome --disable-gtk-doc &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
Index: gnome/otherlibs/gal/gal-intro.xml
===================================================================
--- gnome/otherlibs/gal/gal-intro.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<sect2>
-<title>Introduction to <application><acronym>GAL</acronym></application></title>
-
-<para>The <application><acronym>GAL</acronym></application> package contains library functions 
-that came from <application>Gnumeric</application> and <application>Evolution
-</application>. <acronym>GAL</acronym> is short for
-<application><acronym>GNOME</acronym></application> Application Libs.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gal-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gal-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &gal-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&gal-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gal-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application><acronym>GAL</acronym></application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="gnome-print"/> and <xref linkend="libglade14"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="gnome-vfs1"/></para></sect4>
-</sect3>
-
-</sect2>
Index: gnome/otherlibs/gal/gal.ent
===================================================================
--- gnome/otherlibs/gal/gal.ent	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<!ENTITY gal SYSTEM "../gal.xml">
-<!ENTITY gal-intro SYSTEM "gal-intro.xml">
-<!ENTITY gal-inst SYSTEM "gal-inst.xml">
-<!ENTITY gal-exp SYSTEM "gal-exp.xml">
-<!ENTITY gal-desc SYSTEM "gal-desc.xml">
-<!ENTITY gal-version "0.24">
-<!ENTITY gal-download-http "http://ftp.gnome.org/pub/GNOME/sources/gal/&gal-version;/gal-&gal-version;.tar.bz2">
-<!ENTITY gal-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gal/&gal-version;/gal-&gal-version;.tar.bz2">
-<!ENTITY gal-size "1.0 MB">
-<!ENTITY gal-buildsize "100.8 MB">
-<!ENTITY gal-time "1.51 SBU">
Index: gnome/otherlibs/gal/gal1-desc.xml
===================================================================
--- gnome/otherlibs/gal/gal1-desc.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gal/gal1-desc.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GAL</acronym></application> package contains library routines 
+refactored from <application>Evolution</application> and <application>Gnumeric
+</application>.</para>
+</sect2>
+
Index: gnome/otherlibs/gal/gal1-exp.xml
===================================================================
--- gnome/otherlibs/gal/gal1-exp.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gal/gal1-exp.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,9 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--prefix=/opt/gnome</parameter>: Install
+<application><acronym>GAL</acronym>
+</application> in the <application><acronym>GNOME</acronym></application> 1.4 area.</para>
+
+</sect2>
+
Index: gnome/otherlibs/gal/gal1-inst.xml
===================================================================
--- gnome/otherlibs/gal/gal1-inst.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gal/gal1-inst.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of <application><acronym>GAL</acronym></application></title>
+
+<para>Install <application><acronym>GAL</acronym></application> by running the following commands:
+</para>
+
+<screen><userinput><command>./configure --prefix=/opt/gnome --disable-gtk-doc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/otherlibs/gal/gal1-intro.xml
===================================================================
--- gnome/otherlibs/gal/gal1-intro.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gal/gal1-intro.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Introduction to <application><acronym>GAL</acronym></application></title>
+
+<para>The <application><acronym>GAL</acronym></application> package contains library functions 
+that came from <application>Gnumeric</application> and <application>Evolution
+</application>. <acronym>GAL</acronym> is short for
+<application><acronym>GNOME</acronym></application> Application Libs.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gal1-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gal1-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gal1-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gal1-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gal1-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>GAL</acronym></application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="gnome-print"/> and <xref linkend="libglade14"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="gnome-vfs1"/></para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/otherlibs/gal/gal1.ent
===================================================================
--- gnome/otherlibs/gal/gal1.ent	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gal/gal1.ent	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,11 @@
+<!ENTITY gal1 SYSTEM "../gal1.xml">
+<!ENTITY gal1-intro SYSTEM "gal1-intro.xml">
+<!ENTITY gal1-inst SYSTEM "gal1-inst.xml">
+<!ENTITY gal1-exp SYSTEM "gal1-exp.xml">
+<!ENTITY gal1-desc SYSTEM "gal1-desc.xml">
+<!ENTITY gal1-version "0.24">
+<!ENTITY gal1-download-http "http://ftp.gnome.org/pub/GNOME/sources/gal/&gal1-version;/gal-&gal1-version;.tar.bz2">
+<!ENTITY gal1-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gal/&gal1-version;/gal-&gal1-version;.tar.bz2">
+<!ENTITY gal1-size "1.0 MB">
+<!ENTITY gal1-buildsize "100.8 MB">
+<!ENTITY gal1-time "1.51 SBU">
Index: gnome/otherlibs/gal1.xml
===================================================================
--- gnome/otherlibs/gal1.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gal1.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,10 @@
+<sect1 id="gal1" xreflabel="GAL-&gal1-version;">
+<?dbhtml filename="gal1.html"?>
+<title>GAL-&gal1-version;</title>
+
+&gal1-intro;
+&gal1-inst;
+&gal1-exp;
+&gal1-desc;
+
+</sect1>
Index: gnome/otherlibs/gtkhtml.xml
===================================================================
--- gnome/otherlibs/gtkhtml.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect1 id="gtkhtml" xreflabel="GtkHTML-&gtkhtml-version;">
-<?dbhtml filename="gtkhtml.html"?>
-<title>GtkHTML-&gtkhtml-version;</title>
-
-&gtkhtml-intro;
-&gtkhtml-inst;
-&gtkhtml-exp;
-&gtkhtml-desc;
-
-</sect1>
-
Index: gnome/otherlibs/gtkhtml/gtkhtml-desc.xml
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml-desc.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application><acronym>Gtk</acronym><acronym>HTML</acronym></application> package contains the
-<application><acronym>GNOME</acronym></application> 1.4 
-<acronym>HTML</acronym> rendering engine.</para>
-
-</sect2>
Index: gnome/otherlibs/gtkhtml/gtkhtml-exp.xml
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml-exp.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>--prefix=/opt/gnome</parameter>: Install
-<application><acronym>GTK</acronym> <acronym>HTML</acronym></application> in the
-<application><acronym>GNOME</acronym></application> 1.4 area.</para>
-
-</sect2>
-
Index: gnome/otherlibs/gtkhtml/gtkhtml-inst.xml
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml-inst.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<sect2>
-<title>Installation of <application><acronym>Gtk</acronym><acronym>HTML</acronym></application></title>
-
-<para>Install <application><acronym>Gtk</acronym><acronym>HTML</acronym></application> by running the following 
-commands:</para>
-
-<screen><userinput><command>./configure --prefix=/opt/gnome --disable-gtk-doc &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
Index: gnome/otherlibs/gtkhtml/gtkhtml-intro.xml
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml-intro.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<sect2>
-<title>Introduction to <application><acronym>Gtk</acronym><acronym>HTML</acronym></application></title>
-
-<para>The <application><acronym>Gtk</acronym><acronym>HTML</acronym></application> package contains a lightweight
-<acronym>HTML</acronym> rendering/printing/editing engine.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gtkhtml-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gtkhtml-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &gtkhtml-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&gtkhtml-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gtkhtml-time;</para></listitem></itemizedlist>
-</sect3>
-                                                                                
-<sect3><title><application><acronym>Gtk</acronym><acronym>HTML</acronym></application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="GConf1"/>, <xref linkend="gal"/>, <xref
-linkend ="libglade14"/> and <xref linkend="libcapplet"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="soup"/></para></sect4>
-</sect3>
-
-</sect2>
Index: gnome/otherlibs/gtkhtml/gtkhtml.ent
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml.ent	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<!ENTITY gtkhtml SYSTEM "../gtkhtml.xml">
-<!ENTITY gtkhtml-intro SYSTEM "gtkhtml-intro.xml">
-<!ENTITY gtkhtml-inst SYSTEM "gtkhtml-inst.xml">
-<!ENTITY gtkhtml-exp SYSTEM "gtkhtml-exp.xml">
-<!ENTITY gtkhtml-desc SYSTEM "gtkhtml-desc.xml">
-<!ENTITY gtkhtml-version "1.1.7">
-<!ENTITY gtkhtml-download-http "http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/1.1/gtkhtml-&gtkhtml-version;.tar.bz2">
-<!ENTITY gtkhtml-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/1.1/gtkhtml-&gtkhtml-version;.tar.bz2">
-<!ENTITY gtkhtml-size "1.1 MB">
-<!ENTITY gtkhtml-buildsize "78.6 MB">
-<!ENTITY gtkhtml-time "1.83 SBU">
Index: gnome/otherlibs/gtkhtml/gtkhtml1-desc.xml
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml1-desc.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gtkhtml/gtkhtml1-desc.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>Gtk</acronym><acronym>HTML</acronym></application> package contains the
+<application><acronym>GNOME</acronym></application> 1.4 
+<acronym>HTML</acronym> rendering engine.</para>
+
+</sect2>
Index: gnome/otherlibs/gtkhtml/gtkhtml1-exp.xml
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml1-exp.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gtkhtml/gtkhtml1-exp.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,9 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--prefix=/opt/gnome</parameter>: Install
+<application><acronym>GTK</acronym> <acronym>HTML</acronym></application> in the
+<application><acronym>GNOME</acronym></application> 1.4 area.</para>
+
+</sect2>
+
Index: gnome/otherlibs/gtkhtml/gtkhtml1-inst.xml
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml1-inst.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gtkhtml/gtkhtml1-inst.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of <application><acronym>Gtk</acronym><acronym>HTML</acronym></application></title>
+
+<para>Install <application><acronym>Gtk</acronym><acronym>HTML</acronym></application> by running the following 
+commands:</para>
+
+<screen><userinput><command>./configure --prefix=/opt/gnome --disable-gtk-doc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/otherlibs/gtkhtml/gtkhtml1-intro.xml
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml1-intro.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gtkhtml/gtkhtml1-intro.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,28 @@
+<sect2>
+<title>Introduction to <application><acronym>Gtk</acronym><acronym>HTML</acronym></application></title>
+
+<para>The <application><acronym>Gtk</acronym><acronym>HTML</acronym></application> package contains a lightweight
+<acronym>HTML</acronym> rendering/printing/editing engine.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gtkhtml1-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gtkhtml1-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gtkhtml1-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gtkhtml1-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gtkhtml1-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application><acronym>Gtk</acronym><acronym>HTML</acronym></application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GConf1"/>, <xref linkend="gal1"/>, <xref
+linkend ="libglade14"/> and <xref linkend="libcapplet"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="soup"/></para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/otherlibs/gtkhtml/gtkhtml1.ent
===================================================================
--- gnome/otherlibs/gtkhtml/gtkhtml1.ent	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gtkhtml/gtkhtml1.ent	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,11 @@
+<!ENTITY gtkhtml1 SYSTEM "../gtkhtml1.xml">
+<!ENTITY gtkhtml1-intro SYSTEM "gtkhtml1-intro.xml">
+<!ENTITY gtkhtml1-inst SYSTEM "gtkhtml1-inst.xml">
+<!ENTITY gtkhtml1-exp SYSTEM "gtkhtml1-exp.xml">
+<!ENTITY gtkhtml1-desc SYSTEM "gtkhtml1-desc.xml">
+<!ENTITY gtkhtml1-version "1.1.7">
+<!ENTITY gtkhtml1-download-http "http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/1.1/gtkhtml-&gtkhtml-version;.tar.bz2">
+<!ENTITY gtkhtml1-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/1.1/gtkhtml-&gtkhtml-version;.tar.bz2">
+<!ENTITY gtkhtml1-size "1.1 MB">
+<!ENTITY gtkhtml1-buildsize "78.6 MB">
+<!ENTITY gtkhtml1-time "1.83 SBU">
Index: gnome/otherlibs/gtkhtml1.xml
===================================================================
--- gnome/otherlibs/gtkhtml1.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
+++ gnome/otherlibs/gtkhtml1.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -0,0 +1,10 @@
+<sect1 id="gtkhtml1" xreflabel="GtkHTML-&gtkhtml1-version;">
+<?dbhtml filename="gtkhtml1.html"?>
+<title>GtkHTML-&gtkhtml1-version;</title>
+
+&gtkhtml1-intro;
+&gtkhtml1-inst;
+&gtkhtml1-exp;
+&gtkhtml1-desc;
+
+</sect1>
Index: gnome/otherlibs/guppi/guppi-intro.xml
===================================================================
--- gnome/otherlibs/guppi/guppi-intro.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ gnome/otherlibs/guppi/guppi-intro.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -21,9 +21,8 @@
 <sect3><title><application>Guppi</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="bonobo14"/> and <xref linkend="gal"/></para></sect4>
+<para><xref linkend="bonobo14"/> and <xref linkend="gal1"/></para></sect4>
 <sect4><title>Optional</title>
 <para><xref linkend="libglade14"/></para></sect4>
 </sect3>
 
-
 </sect2>
Index: gnome/otherlibs/otherlibs.xml
===================================================================
--- gnome/otherlibs/otherlibs.xml	(revision dd3f20f0b684628b62144bc4778527bb4c3df922)
+++ gnome/otherlibs/otherlibs.xml	(revision eb2ca2421d5a239962fa9485290add068a372837)
@@ -21,9 +21,9 @@
 &gnome-vfs1;
 &libglade14;
-&gal;
+&gal1;
 &guppi;
 &libcapplet;
 &soup;
-&gtkhtml;
+&gtkhtml1;
 &libghttp;
 </chapter>
