Index: general/general.ent
===================================================================
--- general/general.ent	(revision e8f3675658052b3fa5da4246d3a6eaac5add6204)
+++ 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 e8f3675658052b3fa5da4246d3a6eaac5add6204)
+++ 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 e8f3675658052b3fa5da4246d3a6eaac5add6204)
+++ 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 e8f3675658052b3fa5da4246d3a6eaac5add6204)
+++ 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>
Index: gnome/lib/gtk-doc/gtk-doc-intro.xml
===================================================================
--- gnome/lib/gtk-doc/gtk-doc-intro.xml	(revision e8f3675658052b3fa5da4246d3a6eaac5add6204)
+++ gnome/lib/gtk-doc/gtk-doc-intro.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -11,6 +11,7 @@
 extracting specially-formatted comments from the code to create API
 documentation.  This package is <emphasis>optional</emphasis>, if it is not
-installed, packages will not build the documentation. If you choose to
-install this package, you will need to follow the hint titled <ulink
+installed, packages will not build the documentation. This does not mean
+that you will not have any documentation, if gtk-doc is not available,
+the install process will copy pre-built documentation to your system.  If you choose to install this package, you will need to follow the hint titled <ulink
 url="http://hints.linuxfromscratch.org/hints/docbook.txt">Installing
 Docbook DTDs and Tools</ulink> to centralize the catalogs, add
@@ -20,9 +21,7 @@
 <screen>ln -s /usr/share/automake-1.6 /usr/share/automake</screen>
 
-<para>You also need to add dtd v3.0 to your collection, and finally, you need to modify dtd-3.1 by adding <ulink url="http:www.labs.redhat.com/png/png-support.html">png-support-3.1.dtd</ulink> to <filename>/usr/share/sgml/docbook/sgml-dtd-3.1</filename> and placing:</para>
-
+<para>You also need to add dtd v3.0 to your collection, and finally, you need to modify dtd-3.1 by adding <ulink url="http:www.labs.redhat.com/png/png-support.html">png-support-3.1.dtd</ulink> to <filename>/usr/share/sgml/docbook/sgml-dtd-3.1</filename> and placing:
 <screen>PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN" "png-support-3.1.dtd"</screen>
-
-<para>into the DocBook driver file section of
+into the DocBook driver file section of
 <filename>/usr/share/sgml/docbook/sgml-dtd-3.1/catalog</filename>.</para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e8f3675658052b3fa5da4246d3a6eaac5add6204)
+++ introduction/welcome/changelog.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -10,4 +10,7 @@
 
 <itemizedlist>
+
+<listitem><para>October 2nd, 2002 [larry]: General: Added readline-4.3
+and expat-1.95.5.</para></listitem>
 
 <listitem><para>October 2nd, 2002 [bdubbs]: XFree86: removed incorrect
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision e8f3675658052b3fa5da4246d3a6eaac5add6204)
+++ introduction/welcome/credits.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -101,7 +101,5 @@
 Hymers</emphasis></para></listitem>
 
-<listitem><para>bind, cvs server, emacs, exim, leafnode, lesstif, libfam, pine,
-qmail, qpopper, portmap, PostgreSQL, Samba, sendmail, slrn, tex,
-tcp-wrappers and xinetd: <emphasis>Billy O'Connor</emphasis></para></listitem>
+<listitem><para>bind, cvs server, emacs, exim, expat, leafnode, lesstif, libfam, pine, qmail, qpopper, portmap, PostgreSQL, readline, Samba, sendmail, slrn, tex, tcp-wrappers and xinetd: <emphasis>Billy O'Connor</emphasis></para></listitem>
 
 <listitem><para>fetchmail and wvdial: <emphasis>Paul
Index: server/mail/qpopper/qpopper-config.xml
===================================================================
--- server/mail/qpopper/qpopper-config.xml	(revision e8f3675658052b3fa5da4246d3a6eaac5add6204)
+++ server/mail/qpopper/qpopper-config.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -8,8 +8,12 @@
 
 <sect3><title>Configuring qpopper</title>
+
+<para>If you use inetd, the following command will add the qpopper
+entry to /etc/inetd.conf:</para>
+
 <para><screen><userinput>
 echo "pop stream tcp nowait root /usr/sbin/popper popper" >> \
 /etc/inetd.conf &&
-echo "pop 110/tcp" >> /etc/services &&
+echo "pop 110/tcp" &gt;&gt; /etc/services &&
 killall inetd || inetd &amp;&amp;
 echo "local0.notice;local0.debug        /var/log/POP.log" >> \
@@ -17,4 +21,29 @@
 killall -HUP  syslogd
 </userinput></screen></para>
+
+<para>Issue a killall -HUP inetd to reread the changed inetd.conf
+file.</para>
+
+<para>If you use xinetd, the following command will add the qpopper
+entry to /etc/xinetd.conf:</para>
+
+<para><screen><userinput>
+cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+     service pop
+     {
+          port        = 110
+          socket_type = stream
+          protocol    = tcp
+          wait        = no
+          user        = root
+          passenv     = PATH
+          server      = /usr/sbin/popper
+         server_args = popper
+     }
+EOF
+</userinput></screen></para>
+<para>Issue a killall -HUP xinetd to reread the changed xinetd.conf
+file.</para>
+
 </sect3>
 </sect2>
Index: xsoft/office/abiword/abiword-intro.xml
===================================================================
--- xsoft/office/abiword/abiword-intro.xml	(revision e8f3675658052b3fa5da4246d3a6eaac5add6204)
+++ xsoft/office/abiword/abiword-intro.xml	(revision 6cab80b502d9dc3f6268024279e61bcba662c98e)
@@ -15,5 +15,5 @@
 linkend="gdk"/>, gal-0.20, bonobo-1.0.20 and gnome-print-0.29
 AbiWord will utilize:
-expat and ispell</screen>
+<xref linkend="expat"/> and ispell</screen>
 
 </sect2>
