Index: general/genlib/libfam/libfam.ent
===================================================================
--- general/genlib/libfam/libfam.ent	(revision 9b0238f4487ad108ad6d67a2917fd16211616d88)
+++ general/genlib/libfam/libfam.ent	(revision d1327596306db4931714de9482f3681ee901ab44)
@@ -13,3 +13,3 @@
 "ftp://oss.sgi.com/projects/fam/download/fam-&libfam-version;.tar.gz">
 <!ENTITY libfam-size "300 KB">
-<!ENTITY libfam-time "0.68">
+<!ENTITY libfam-time "0.68 SBU">
Index: general/genlib/readline/readline-config.xml
===================================================================
--- general/genlib/readline/readline-config.xml	(revision 9b0238f4487ad108ad6d67a2917fd16211616d88)
+++ general/genlib/readline/readline-config.xml	(revision d1327596306db4931714de9482f3681ee901ab44)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring readline</title>
+<title>Configuring <application>readline</application></title>
 
 <sect3><title>Configuration Information</title>
Index: general/genlib/readline/readline-desc.xml
===================================================================
--- general/genlib/readline/readline-desc.xml	(revision 9b0238f4487ad108ad6d67a2917fd16211616d88)
+++ general/genlib/readline/readline-desc.xml	(revision d1327596306db4931714de9482f3681ee901ab44)
@@ -2,6 +2,7 @@
 <title>Contents</title>
 
-<para>The readline package contains the <filename>libreadline</filename>
-libraries and <filename>libhistory</filename> libraries.</para> 
+<para>The <application>readline</application> package contains the <filename>
+libreadline</filename> libraries and <filename>libhistory</filename> libraries.
+</para> 
 
 </sect2>
Index: general/genlib/readline/readline-inst.xml
===================================================================
--- general/genlib/readline/readline-inst.xml	(revision 9b0238f4487ad108ad6d67a2917fd16211616d88)
+++ general/genlib/readline/readline-inst.xml	(revision d1327596306db4931714de9482f3681ee901ab44)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of readline</title>
+<title>Installation of <application>readline</application></title>
 
-<para>Install readline by running the following commands:</para>
+<para>Install <application>readline</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: general/genlib/readline/readline-intro.xml
===================================================================
--- general/genlib/readline/readline-intro.xml	(revision 9b0238f4487ad108ad6d67a2917fd16211616d88)
+++ general/genlib/readline/readline-intro.xml	(revision d1327596306db4931714de9482f3681ee901ab44)
@@ -1,14 +1,23 @@
 <sect2>
-<title>Introduction to readline</title>
+<title>Introduction to <application>readline</application></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 <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>
 
-<para>The Readline library provides a set of functions for use by
-applications that allow users to edit command lines as they are typed
-in.  Both Emacs and vi 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>
Index: general/genlib/readline/readline.ent
===================================================================
--- general/genlib/readline/readline.ent	(revision 9b0238f4487ad108ad6d67a2917fd16211616d88)
+++ general/genlib/readline/readline.ent	(revision d1327596306db4931714de9482f3681ee901ab44)
@@ -4,5 +4,5 @@
 <!ENTITY readline-desc SYSTEM "readline-desc.xml">
 <!ENTITY readline-config SYSTEM "readline-config.xml">
-<!ENTITY readline-buildsize "4.9 MB">
+<!ENTITY readline-buildsize "9.2 MB">
 <!ENTITY readline-version "4.3">
 <!ENTITY readline-download-http
@@ -10,4 +10,4 @@
 <!ENTITY readline-download-ftp
 	 "ftp://ftp.gnu.org/gnu/readline/readline-4.3.tar.gz">
-<!ENTITY readline-size "939 KB">
-<!ENTITY readline-time "0.30 SBU">
+<!ENTITY readline-size "944 KB">
+<!ENTITY readline-time "0.10 SBU">
Index: general/genlib/slang/slang.ent
===================================================================
--- general/genlib/slang/slang.ent	(revision 9b0238f4487ad108ad6d67a2917fd16211616d88)
+++ general/genlib/slang/slang.ent	(revision d1327596306db4931714de9482f3681ee901ab44)
@@ -4,8 +4,8 @@
 <!ENTITY slang-desc SYSTEM "slang-desc.xml">
 <!ENTITY slang-config SYSTEM "slang-config.xml">
-<!ENTITY slang-buildsize "6.1 MB">
+<!ENTITY slang-buildsize "9.6 MB">
 <!ENTITY slang-version "1.4.9">
 <!ENTITY slang-download-http "">
-<!ENTITY slang-download-ftp "ftp://ftp.jedsoft.org/pub/davis/slang/v1.4/slang-&slang-version;.tar.bz2">
+<!ENTITY slang-download-ftp "ftp://space.mit.edu/pub/davis/slang/v1.4/slang-&slang-version;.tar.bz2">
 <!ENTITY slang-size "624 KB">
-<!ENTITY slang-time "">
+<!ENTITY slang-time "0.16 SBU">
Index: postlfs/security/firewalling/library.xml
===================================================================
--- postlfs/security/firewalling/library.xml	(revision 9b0238f4487ad108ad6d67a2917fd16211616d88)
+++ postlfs/security/firewalling/library.xml	(revision d1327596306db4931714de9482f3681ee901ab44)
@@ -3,31 +3,30 @@
 
 <para><blockquote><literallayout>
-<ulink url="http://www.netfilter.org/">Homepage of the netfilter/iptables project</ulink>
-<ulink url="http://www.netfilter.org/documentation/FAQ/netfilter-faq.html">FAQ</ulink>
-<ulink url="http://www.netfilter.org/documentation/index.html#HOWTO">List of Netfilter-related HOWTO's</ulink>
-<ulink url="http://www.linuxdoc.org/LDP/nag2/x-087-2-firewall.html"/>
-<ulink url="http://www.linuxdoc.org/HOWTO/Security-HOWTO.html"></ulink>
-<ulink url="http://www.linuxdoc.org/HOWTO/Firewall-HOWTO.html"></ulink>
-<ulink url="http://www-106.ibm.com/developerworks/security/library/s-fire.html
-+s-fire2.html"></ulink>
-<ulink url="http://www.interhack.net/pubs/fw-faq/"></ulink>
-<ulink url="http://csrc.nist.gov/isptg/html/ISPTG-6.html"></ulink>
-<ulink url="http://www.linuxsecurity.com/docs/"></ulink>
-<ulink url="http://www.little-idiot.de/firewall (German &amp; outdated, but
-very comprehensive)"></ulink>
-<ulink url="http://www.linuxgazette.com/issue65/stumpel.html"></ulink>
-<ulink url="http://linux.oreillynet.com/pub/a/linux/2000/03/10/netadmin/ddos.html"></ulink>
-<ulink url="http://staff.washington.edu/dittrich/misc/ddos"></ulink>
-<ulink url="http://ipmasq.cjb.net/"></ulink>
-<ulink url="http://www.e-infomax.com/ipmasq"></ulink>
-<ulink url="http://www.circlemud.org/~jelson/writings/security/index.htm"></ulink>
-<ulink url="http://www.securityfocus.com"></ulink>
-<ulink url="http://www.cert.org/tech_tips/"></ulink>
-<ulink url="http://www.uni-siegen.de/security/pointers.html"></ulink>
-<ulink url="http://security.ittoolbox.com/"></ulink>
-<ulink url="http://www.linux-firewall-tools.com/linux/"></ulink>
-<ulink url="http://logi.cc/linux/athome-firewall.php3"></ulink>
-<ulink url="http://www.insecure.org/reading.html"></ulink>
-<ulink url="http://www.robertgraham.com/pubs/firewall-seen.html"></ulink>
+<ulink url="http://www.netfilter.org/">www.netfilter.org - Homepage of the netfilter/iptables project</ulink>
+<ulink url="http://www.netfilter.org/documentation/FAQ/netfilter-faq.html">Netfilter related FAQ</ulink>
+<ulink url="http://www.netfilter.org/documentation/index.html#HOWTO">Netfilter related HOWTO's</ulink>
+<ulink url="http://www.linuxdoc.org/LDP/nag2/x-087-2-firewall.html">www.linuxdoc.org/LDP/nag2/x-087-2-firewall.html</ulink>
+<ulink url="http://www.linuxdoc.org/HOWTO/Security-HOWTO.html">www.linuxdoc.org/HOWTO/Security-HOWTO.html</ulink>
+<ulink url="http://www.linuxdoc.org/HOWTO/Firewall-HOWTO.html">www.linuxdoc.org/HOWTO/Firewall-HOWTO.html</ulink>
+<ulink url="http://www-106.ibm.com/developerworks/security/library/s-fire.html">www.ibm.com/developerworks/security/library/s-fire.html</ulink>
+<ulink url="http://www-106.ibm.com/developerworks/security/library/s-fire2.html">www.ibm.com/developerworks/security/library/s-fire2.html</ulink>
+<ulink url="http://www.interhack.net/pubs/fw-faq/">www.interhack.net/pubs/fw-faq/</ulink>
+<ulink url="http://csrc.nist.gov/isptg/html/ISPTG-6.html">csrc.nist.gov/isptg/html/ISPTG-6.html</ulink>
+<ulink url="http://www.linuxsecurity.com/docs/">www.linuxsecurity.com/docs/</ulink>
+<ulink url="http://www.little-idiot.de/firewall">www.little-idiot.de/firewall (German &amp; outdated, but very comprehensive)</ulink>
+<ulink url="http://www.linuxgazette.com/issue65/stumpel.html">www.linuxgazette.com/issue65/stumpel.html</ulink>
+<ulink url="http://linux.oreillynet.com/pub/a/linux/2000/03/10/netadmin/ddos.html">linux.oreillynet.com/pub/a/linux/2000/03/10/netadmin/ddos.html</ulink>
+<ulink url="http://staff.washington.edu/dittrich/misc/ddos">staff.washington.edu/dittrich/misc/ddos</ulink>
+<ulink url="http://ipmasq.cjb.net/">ipmasq.cjb.net/</ulink>
+<ulink url="http://www.e-infomax.com/ipmasq">www.e-infomax.com/ipmasq</ulink>
+<ulink url="http://www.circlemud.org/~jelson/writings/security/index.htm">www.circlemud.org/~jelson/writings/security/index.htm</ulink>
+<ulink url="http://www.securityfocus.com">www.securityfocus.com</ulink>
+<ulink url="http://www.cert.org/tech_tips/">www.cert.org - tech_tips</ulink>
+<ulink url="http://www.uni-siegen.de/security/pointers.html">www.uni-siegen.de/security/pointers.html</ulink>
+<ulink url="http://security.ittoolbox.com/">security.ittoolbox.com</ulink>
+<ulink url="http://www.linux-firewall-tools.com/linux/">www.linux-firewall-tools.com/linux/</ulink>
+<ulink url="http://logi.cc/linux/athome-firewall.php3">logi.cc/linux/athome-firewall.php3</ulink>
+<ulink url="http://www.insecure.org/reading.html">www.insecure.org/reading.html</ulink>
+<ulink url="http://www.robertgraham.com/pubs/firewall-seen.html">www.robertgraham.com/pubs/firewall-seen.html</ulink>
 </literallayout></blockquote></para>
 
