Index: basicnet/netprogs/ntp.xml
===================================================================
--- basicnet/netprogs/ntp.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ basicnet/netprogs/ntp.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -34,5 +34,5 @@
 <sect3><title><application><acronym>NTP</acronym></application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="readline"/> and <xref linkend="openssl"/></para></sect4>
+<para><xref linkend="openssl"/></para></sect4>
 </sect3>
 
Index: content/databases/mysql.xml
===================================================================
--- content/databases/mysql.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ content/databases/mysql.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -35,5 +35,5 @@
 <sect3><title><application>My<acronym>SQL</acronym></application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="readline"/>, <xref linkend="openssl"/> and
+<para><xref linkend="openssl"/> and
 <xref linkend="tcpwrappers"/>
 </para></sect4>
Index: content/databases/postgresql.xml
===================================================================
--- content/databases/postgresql.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ content/databases/postgresql.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -35,5 +35,4 @@
 <sect4><title>Optional</title>
 <para>
-<xref linkend="readline"/>,
 <xref linkend="Python"/>,
 <xref linkend="tcl"/>,
@@ -55,5 +54,5 @@
 <para>Install <application>Postgre<acronym>SQL</acronym></application> with the following commands: </para>
 
-<screen><userinput><command>./configure --prefix=/usr --without-readline &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
@@ -103,8 +102,4 @@
 <sect2>
 <title>Command explanations</title>
-
-<para><option>--without-readline</option>: Omit this switch if you have
-<application>readline</application> installed and wish to utilize
-it.</para>
 
 <para><command>useradd -d /var/pgsql/data postgres</command>: Add an unprivileged user to run the database server.</para>
Index: content/web/php.xml
===================================================================
--- content/web/php.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ content/web/php.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -52,5 +52,4 @@
 <xref linkend="pcre"/>,
 <xref linkend="postgresql"/>,
-<xref linkend="readline"/>,
 <xref linkend="libtiff"/>,
 <xref linkend="expat"/> and
Index: general.ent
===================================================================
--- general.ent	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ general.ent	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -1,3 +1,3 @@
-<!ENTITY day          "13">
+<!ENTITY day          "14">
 <!ENTITY month        "07">
 <!ENTITY year         "2004">
@@ -60,5 +60,4 @@
 <!ENTITY libxml2-version              "2.6.11">
 <!ENTITY libxslt-version              "1.1.8">
-<!ENTITY readline-version             "4.3">
 <!ENTITY gmp-version                  "4.1.3">
 <!ENTITY gdbm-version                 "1.8.3">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ general/genlib/genlib.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -46,5 +46,4 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxml2.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxslt.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmp.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gdbm.xml"/>
Index: general/genlib/gmp.xml
===================================================================
--- general/genlib/gmp.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ general/genlib/gmp.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -37,9 +37,4 @@
 </sect3>
 
-<sect3><title><application><acronym>GMP</acronym></application> dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="readline"/></para></sect4>
-</sect3>
-
 </sect2>
 
Index: general/genlib/guile.xml
===================================================================
--- general/genlib/guile.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ general/genlib/guile.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -36,10 +36,4 @@
 <listitem><para>Estimated build time:
 &guile-time;</para></listitem></itemizedlist>
-</sect3>
-                                                                               
-                                                                               
-<sect3><title><application>Guile</application> dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="readline"/></para></sect4>
 </sect3>
                                                                                
Index: general/genlib/libxml2.xml
===================================================================
--- general/genlib/libxml2.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ general/genlib/libxml2.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -39,5 +39,5 @@
 <sect3><title><application>libxml2</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="Python"/> and <xref linkend="readline"/></para></sect4>
+<para><xref linkend="Python"/></para></sect4>
 </sect3>
 
@@ -50,5 +50,5 @@
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --with-history &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
Index: neral/genlib/readline.xml
===================================================================
--- general/genlib/readline.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-<!ENTITY readline-download-http "http://ftp.gnu.org/gnu/readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-download-ftp "ftp://ftp.gnu.org/gnu/readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-size "944 KB">
-<!ENTITY readline-buildsize "9.2 MB">
-<!ENTITY readline-time "0.10 SBU">
-
-]>
-
-<sect1 id="readline" xreflabel="readline-&readline-version;">
-<?dbhtml filename="readline.html"?>
-<title>readline-&readline-version;</title>
-
-<sect2>
-<title>Introduction to <application>readline</application></title>
-                                                                              
-<para>The <application>readline</application> library provides a set of
-functions for use by applications that allow users to edit command-lines as
-they are typed in.  Both <application>Emacs</application> and
-<application>vi</application> editing modes are available.</para>
-                                                                              
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&readline-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&readline-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &readline-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&readline-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&readline-time;</para></listitem></itemizedlist>
-</sect3>
-                                                                              
-                                                                              
-</sect2>
-
-<sect2>
-<title>Installation of <application>readline</application></title>
-                                                                              
-<para>Install <application>readline</application> by running the following
-commands:</para>
-                                                                              
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make SHLIB_LIBS=-lcurses &amp;&amp;
-make install</command></userinput></screen>
-                                                                              
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-                                                                              
-<para><command>make SHLIB_LIBS=-lcurses</command>: This command makes the
-proper symbols available for applications that assume
-<application>readline</application> is compiled with
-<application>ncurses</application> links.</para>
-                                                                              
-</sect2>
-
-<sect2>
-<title>Configuring <application>readline</application></title>
-                                                                              
-<sect3><title>Configuration Information</title>
-                                                                              
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../lib-config.xml"/>       
-                                                                              
-</sect3>
-                                                                              
-</sect2>
-
-<sect2>
-<title>Contents</title>
-                                                                              
-<para>The <application>readline</application> package contains the <filename>
-libreadline</filename> libraries and <filename>libhistory</filename> libraries.
-</para>
-                                                                              
-</sect2>
-
-</sect1>
-
Index: general/genutils/bc.xml
===================================================================
--- general/genutils/bc.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ general/genutils/bc.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -44,9 +44,4 @@
 </itemizedlist></sect3>
 
-<sect3><title><application>bc</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="readline"/></para></sect4>
-</sect3>
-
 </sect2>
 
Index: general/prog/librep.xml
===================================================================
--- general/prog/librep.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ general/prog/librep.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -42,8 +42,5 @@
 <para><xref linkend="gdbm"/></para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="gmp"/>, and <xref linkend="readline"/></para></sect4>
-<!--
-<ulink url="http://sources.redhat.com/libffi/">libffi</ulink>
--->
+<para><xref linkend="gmp"/></para></sect4>
 </sect3>
                                                                                
Index: general/prog/python.xml
===================================================================
--- general/prog/python.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ general/prog/python.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -44,6 +44,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="openssl"/>, <xref linkend="expat"/>, <xref linkend="tk"/>, <xref
-linkend="gdbm"/>, <xref linkend="db"/>, <xref linkend="gmp"/> and
-<xref linkend="readline"/>
+linkend="gdbm"/>, <xref linkend="db"/> and <xref linkend="gmp"/>
 </para></sect4>
 </sect3>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ introduction/welcome/changelog.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -19,4 +19,8 @@
 <itemizedlist>
 
+<listitem><para>July 14th, 2004 [igor]: Removed readline and all
+references in packages' dependencies, passed switches for readline
+support where it's not on by default.</para></listitem>
+
 <listitem><para>July 13th, 2004 [larry]: Updated to MIT
 KRB5-1.3.4.</para></listitem>
Index: postlfs/security/heimdal.xml
===================================================================
--- postlfs/security/heimdal.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ postlfs/security/heimdal.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -60,5 +60,4 @@
 <sect4><title>Optional</title>
 <para>
-<xref linkend="readline"/>,
 <xref linkend="Linux_PAM"/>,
 <xref linkend="openldap"/>,
Index: pst/printing/gimp-print.xml
===================================================================
--- pst/printing/gimp-print.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ pst/printing/gimp-print.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -41,7 +41,6 @@
 <para>
 <xref linkend="cups"/>,
-<ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
-<ulink url="http://www.linuxprinting.org/ijs/">IJS</ulink> and
-<xref linkend="readline"/>
+<ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink> and
+<ulink url="http://www.linuxprinting.org/ijs/">IJS</ulink>
 </para></sect4>
 </sect3>
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ server/other/openldap.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -42,5 +42,4 @@
 <xref linkend="gdbm"/>,
 <xref linkend="tcpwrappers"/>,
-<xref linkend="readline"/>, 
 <xref linkend="heimdal"/> or
 <xref linkend="mitkrb"/>,  and
Index: server/other/samba3.xml
===================================================================
--- server/other/samba3.xml	(revision 821b881500f8fb02d0364d9d3a9d4cffb532283f)
+++ server/other/samba3.xml	(revision 4ca92e2ca9a7d9b868d7b04bafa413ba36ac4ea9)
@@ -46,5 +46,4 @@
 <para>
 <xref linkend="Linux_PAM"/>,
-<xref linkend="readline"/>,
 <xref linkend="openldap"/>,
 <xref linkend="cups"/>,
