Index: general/general.ent
===================================================================
--- general/general.ent	(revision cc1fe1e4f9a5d51cca3a1915529425d22e3780d4)
+++ general/general.ent	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -5,5 +5,7 @@
 <!ENTITY % openssl SYSTEM "genlib/openssl/openssl.ent">
 <!ENTITY % pcre SYSTEM "genlib/pcre/pcre.ent">
-<!ENTITY % xmllib SYSTEM "genlib/xmllib/xmllib.ent">
+<!ENTITY % libxml SYSTEM "genlib/libxml/libxml.ent">
+<!ENTITY % libxml2 SYSTEM "genlib/libxml2/libxml2.ent">
+<!ENTITY % libxslt SYSTEM "genlib/libxslt/libxslt.ent">
 <!ENTITY % popt SYSTEM "genlib/popt/popt.ent">
 <!ENTITY % libfam SYSTEM "genlib/libfam/libfam.ent">
@@ -25,5 +27,7 @@
 %openssl;
 %pcre;
-%xmllib;
+%libxml;
+%libxml2;
+%libxslt;
 %popt;
 %libfam;
Index: general/genlib/libxml/libxml-desc.xml
===================================================================
--- general/genlib/libxml/libxml-desc.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxml/libxml-desc.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libxml</application> package contains
+<filename>libxml</filename> libraries, <command>xmllint</command> and
+<command>xmlcatalog</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libxml libraries</title>
+<para><filename>libxml</filename> libraries provide the functions for programs 
+to parse files that use the <acronym>XML</acronym> format.</para></sect3>
+
+</sect2>
+
Index: general/genlib/libxml/libxml-inst.xml
===================================================================
--- general/genlib/libxml/libxml-inst.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxml/libxml-inst.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of <application>libxml</application></title>
+
+<para>Install <application>libxml</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: general/genlib/libxml/libxml-intro.xml
===================================================================
--- general/genlib/libxml/libxml-intro.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxml/libxml-intro.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,20 @@
+<sect2>
+<title>Introduction to <application>libxml</application></title>
+
+<para>The <application>libxml</application> package contains the libxml 
+libraries. These are useful for parsing <acronym>XML</acronym> files.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libxml-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libxml-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libxml-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libxml-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libxml-time;</para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
Index: general/genlib/libxml/libxml.ent
===================================================================
--- general/genlib/libxml/libxml.ent	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxml/libxml.ent	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,10 @@
+<!ENTITY libxml SYSTEM "../libxml.xml">
+<!ENTITY libxml-intro SYSTEM "libxml-intro.xml">
+<!ENTITY libxml-inst SYSTEM "libxml-inst.xml">
+<!ENTITY libxml-desc SYSTEM "libxml-desc.xml">
+<!ENTITY libxml-version "1.8.17">
+<!ENTITY libxml-download-http "http://ftp.gnome.org/pub/GNOME/sources/libxml/1.8/libxml-&libxml-version;.tar.bz2">
+<!ENTITY libxml-download-ftp "ftp://ftp.xmlsoft.org/old/libxml-&libxml-version;.tar.gz">
+<!ENTITY libxml-size "973 KB">
+<!ENTITY libxml-buildsize "11 MB">
+<!ENTITY libxml-time "0.41 SBU">
Index: general/genlib/libxml2/libxml2-desc.xml
===================================================================
--- general/genlib/libxml2/libxml2-desc.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxml2/libxml2-desc.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libxml2</application> package contains <filename
+class='libraryfile'>libxml2</filename> libraries, <command>xmllint</command> 
+and <command>xmlcatalog</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libxml2 libraries</title>
+<para><filename class='libraryfile'>libxml2</filename> libraries provide
+the functions for programs to parse files that use the <acronym>XML</acronym> 
+format.</para></sect3>
+
+<sect3><title>xmllint</title>
+<para><command>xmllint</command> parses XML files and outputs reports (based 
+upon options) to detect errors in <acronym>XML</acronym> coding.</para></sect3>
+
+<sect3><title>xmlcatalog</title>
+<para><command>xmlcatalog</command> allows users to monitor and manipulate 
+<acronym>XML</acronym> and <acronym>SGML</acronym> catalogs.</para></sect3>
+
+</sect2>
+
Index: general/genlib/libxml2/libxml2-inst.xml
===================================================================
--- general/genlib/libxml2/libxml2-inst.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxml2/libxml2-inst.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Installation of <application>libxml2</application></title>
+
+<para>Install <application>libxml2</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+<!--
+<tip><title>Upgrade Hint</title><para>You may wish to remove the old
+documentation directories for libxml2 in <filename>/usr/share/doc</filename>.</para></tip>
+-->
+
+</sect2>
+
Index: general/genlib/libxml2/libxml2-intro.xml
===================================================================
--- general/genlib/libxml2/libxml2-intro.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxml2/libxml2-intro.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Introduction to <application>libxml2</application></title>
+
+<para>The <application>libxml2</application> package contains
+<acronym>XML</acronym> libraries. These are useful for parsing
+<acronym>XML</acronym> files.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libxml2-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libxml2-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libxml2-size;</para></listitem>
+<listitem><para>Estimated Disk space
+required: &libxml2-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libxml2-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>libxml2</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="Python"/></para></sect4>
+</sect3>
+
+</sect2>
Index: general/genlib/libxml2/libxml2.ent
===================================================================
--- general/genlib/libxml2/libxml2.ent	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxml2/libxml2.ent	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,10 @@
+<!ENTITY libxml2 SYSTEM "../libxml2.xml">
+<!ENTITY libxml2-intro SYSTEM "libxml2-intro.xml">
+<!ENTITY libxml2-inst SYSTEM "libxml2-inst.xml">
+<!ENTITY libxml2-desc SYSTEM "libxml2-desc.xml">
+<!ENTITY libxml2-version "2.5.11">
+<!ENTITY libxml2-download-http "http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.5/libxml2-&libxml2-version;.tar.bz2">
+<!ENTITY libxml2-download-ftp "ftp://ftp.xmlsoft.org/libxml2-&libxml2-version;.tar.gz">
+<!ENTITY libxml2-size "2.9 MB">
+<!ENTITY libxml2-buildsize "41.8 MB">
+<!ENTITY libxml2-time "0.97 SBU">
Index: general/genlib/libxslt/libxslt-desc.xml
===================================================================
--- general/genlib/libxslt/libxslt-desc.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxslt/libxslt-desc.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,24 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libxslt</application> package contains <filename>
+libxslt</filename> libraries, <filename>libexslt</filename> libraries and 
+<command>xsltproc</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libxslt libraries</title>
+<para><filename>libxslt</filename> libraries provide extensions to the
+<filename>libxml2</filename> libraries to parse files that use the
+<acronym>XSLT</acronym> format.</para></sect3>
+
+<sect3><title>xsltproc</title>
+<para><command>xsltproc</command> is used to apply
+<acronym>XSLT</acronym> stylesheets to <acronym>XML</acronym>
+documents.</para></sect3>
+
+
+</sect2>
+
Index: general/genlib/libxslt/libxslt-inst.xml
===================================================================
--- general/genlib/libxslt/libxslt-inst.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxslt/libxslt-inst.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Installation of <application>libxslt</application></title>
+
+<para>Install <application>libxslt</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+<!--
+<tip><title>Upgrade Hint</title><para>You may wish to remove the old
+documentation directories for <application>libxslt</application> in <filename>/usr/share/doc</filename>.</para></tip>
+-->
+
+</sect2>
+
Index: general/genlib/libxslt/libxslt-intro.xml
===================================================================
--- general/genlib/libxslt/libxslt-intro.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxslt/libxslt-intro.xml	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,27 @@
+<sect2>
+<title>Introduction to <application>libxslt</application></title>
+
+<para>The <application>libxslt</application> package contains
+<acronym>XSLT</acronym> libraries. These are useful
+for extending <filename>libxml2</filename> libraries to support
+<acronym>XSLT</acronym> files.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libxslt-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libxslt-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libxslt-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libxslt-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libxslt-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>libxslt</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libxml2"></xref></para></sect4>
+</sect3>
+
+</sect2>
Index: general/genlib/libxslt/libxslt.ent
===================================================================
--- general/genlib/libxslt/libxslt.ent	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
+++ general/genlib/libxslt/libxslt.ent	(revision 78ddb7e671663cb088895a072285a969bb68b1ab)
@@ -0,0 +1,10 @@
+<!ENTITY libxslt SYSTEM "../libxslt.xml">
+<!ENTITY libxslt-intro SYSTEM "libxslt-intro.xml">
+<!ENTITY libxslt-inst SYSTEM "libxslt-inst.xml">
+<!ENTITY libxslt-desc SYSTEM "libxslt-desc.xml">
+<!ENTITY libxslt-version "1.0.33">
+<!ENTITY libxslt-download-http "http://ftp.gnome.org/pub/GNOME/sources/libxslt/1.0/libxslt-&libxslt-version;.tar.bz2">
+<!ENTITY libxslt-download-ftp "ftp://ftp.xmlsoft.org/libxslt-&libxslt-version;.tar.gz">
+<!ENTITY libxslt-size "2.3 M">
+<!ENTITY libxslt-buildsize "30 MB">
+<!ENTITY libxslt-time "0.29 SBU">
