Index: general/general.ent
===================================================================
--- general/general.ent	(revision 37e8bccdcf060c6c28e3baa6f0af382593e0e58d)
+++ general/general.ent	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -12,4 +12,6 @@
 <!ENTITY % gdbm SYSTEM "genlib/gdbm/gdbm.ent">
 <!ENTITY % glib SYSTEM "genlib/glib/glib.ent">
+<!ENTITY % expat SYSTEM "genlib/expat/expat.ent">
+<!ENTITY % readline SYSTEM "genlib/readline/readline.ent">
 %openssl;
 %pcre;
@@ -21,4 +23,6 @@
 %gdbm;
 %glib;
+%expat;
+%readline;
 
 <!-- Graphics Libraries -->
Index: general/genlib/expat.xml
===================================================================
--- general/genlib/expat.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/expat.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,10 @@
+<sect1 id="expat" xreflabel="expat-&expat-version;">
+<?dbhtml filename="expat.html" dir="general"?>
+<title>expat-&expat-version;</title>
+
+&expat-intro;
+&expat-inst;
+&expat-config;
+&expat-desc;
+
+</sect1>
Index: general/genlib/expat/expat-config.xml
===================================================================
--- general/genlib/expat/expat-config.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/expat/expat-config.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring expat</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/genlib/expat/expat-desc.xml
===================================================================
--- general/genlib/expat/expat-desc.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/expat/expat-desc.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Contents</title>
+
+<para>The expat package contains the <userinput>expat
+libraries</userinput> and 
+<userinput>xmlwf</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>xmlwf</title>
+<para>xmlwf is a non-validating utility to check whether or not XML
+documents are well formed.</para></sect3>
+
+</sect2>
+
Index: general/genlib/expat/expat-inst.xml
===================================================================
--- general/genlib/expat/expat-inst.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/expat/expat-inst.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of expat</title>
+
+<para>Install expat by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/genlib/expat/expat-intro.xml
===================================================================
--- general/genlib/expat/expat-intro.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/expat/expat-intro.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Introduction to expat</title>
+
+<screen>Download location (HTTP):       <ulink url="&expat-download-http;"/>
+Version used:                   &expat-version;
+Package size:                   &expat-size;
+Estimated Disk space required:  &expat-buildsize;</screen>
+
+<para>The expat package contains a stream oriented C library for
+parsing XML.</para>
+
+</sect2>
Index: general/genlib/expat/expat.ent
===================================================================
--- general/genlib/expat/expat.ent	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/expat/expat.ent	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,10 @@
+<!ENTITY expat SYSTEM "../expat.xml">
+<!ENTITY expat-intro SYSTEM "expat-intro.xml">
+<!ENTITY expat-inst SYSTEM "expat-inst.xml">
+<!ENTITY expat-desc SYSTEM "expat-desc.xml">
+<!ENTITY expat-config SYSTEM "expat-config.xml">
+<!ENTITY expat-buildsize "2.4 MB">
+<!ENTITY expat-version "1.95.5">
+<!ENTITY expat-download-http
+	 "http://umn.dl.sourceforge.net/sourceforge/expat/expat-1.95.5.tar.gz">
+<!ENTITY expat-size "275 KB">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 37e8bccdcf060c6c28e3baa6f0af382593e0e58d)
+++ general/genlib/genlib.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -40,8 +40,9 @@
 &libxml2;
 &libxslt;
+&readline;
 &gmp;
 &gdbm;
 &GLib;
 &GLib2;
-
+&expat;
 </chapter>
Index: general/genlib/gmp/gmp-intro.xml
===================================================================
--- general/genlib/gmp/gmp-intro.xml	(revision 37e8bccdcf060c6c28e3baa6f0af382593e0e58d)
+++ general/genlib/gmp/gmp-intro.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -11,6 +11,5 @@
 arbitrary precision arithmetic.</para>
 
-<screen>gmp will utilize:
-readline</screen>
+<screen>gmp will utilize: <xref linkend="readline"/>.</screen>
 
 </sect2>
Index: general/genlib/readline.xml
===================================================================
--- general/genlib/readline.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/readline.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,10 @@
+<sect1 id="readline" xreflabel="readline-&readline-version;">
+<?dbhtml filename="readline.html" dir="general"?>
+<title>readline-&readline-version;</title>
+
+&readline-intro;
+&readline-inst;
+&readline-config;
+&readline-desc;
+
+</sect1>
Index: general/genlib/readline/readline-config.xml
===================================================================
--- general/genlib/readline/readline-config.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/readline/readline-config.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring readline</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/genlib/readline/readline-desc.xml
===================================================================
--- general/genlib/readline/readline-desc.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/readline/readline-desc.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,7 @@
+<sect2>
+<title>Contents</title>
+
+<para>The readline package contains the GNU readline and history
+libraries.</para> 
+
+</sect2>
Index: general/genlib/readline/readline-inst.xml
===================================================================
--- general/genlib/readline/readline-inst.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/readline/readline-inst.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of readline</title>
+
+<para>Install readline by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/genlib/readline/readline-intro.xml
===================================================================
--- general/genlib/readline/readline-intro.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/readline/readline-intro.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to readline</title>
+
+<screen>Download location (HTTP):       <ulink url="&readline-download-http;"/>
+Download location (FTP):        <ulink url="&readline-download-ftp;"/>
+Version used:                   &readline-version;
+Package size:                   &readline-size;
+Estimated Disk space required:  &readline-buildsize;</screen>
+
+<para>The readline package contains a stream oriented C library for
+parsing XML.</para>
+
+</sect2>
Index: general/genlib/readline/readline.ent
===================================================================
--- general/genlib/readline/readline.ent	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
+++ general/genlib/readline/readline.ent	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -0,0 +1,12 @@
+<!ENTITY readline SYSTEM "../readline.xml">
+<!ENTITY readline-intro SYSTEM "readline-intro.xml">
+<!ENTITY readline-inst SYSTEM "readline-inst.xml">
+<!ENTITY readline-desc SYSTEM "readline-desc.xml">
+<!ENTITY readline-config SYSTEM "readline-config.xml">
+<!ENTITY readline-buildsize "4.9 MB">
+<!ENTITY readline-version "4.3">
+<!ENTITY readline-download-http
+	 "http://ftp.gnu.org/gnu/readline/readline-4.3.tar.gz">
+<!ENTITY readline-download-ftp
+	 "ftp://ftp.gnu.org/gnu/readline/readline-4.3.tar.gz">
+<!ENTITY readline-size "939 KB">
Index: general/prog/python/python-intro.xml
===================================================================
--- general/prog/python/python-intro.xml	(revision 37e8bccdcf060c6c28e3baa6f0af382593e0e58d)
+++ general/prog/python/python-intro.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -12,6 +12,5 @@
 prototyping large programs or developing them entirely.</para>
 
-<screen>Python will utiltize:
-expat</screen>
+<screen>Python will utilize: <xref linkend="expat"/>.</screen>
 
 </sect2>
