Index: basicnet/netprogs/cvs/cvs.ent
===================================================================
--- basicnet/netprogs/cvs/cvs.ent	(revision f4bc1ffb956e0906ea21b5be085b6299f73414ea)
+++ basicnet/netprogs/cvs/cvs.ent	(revision 13b9bfad98896c5e4bea061976e78bb1231850d4)
@@ -6,6 +6,6 @@
 <!ENTITY cvs-buildsize "14 MB">
 <!ENTITY cvs-version "1.11.6">
-<!ENTITY cvs-download-http "">
-<!ENTITY cvs-download-ftp "ftp://ftp.cvshome.org/pub/release/stable/cvs-&cvs-version;/cvs-&cvs-version;.tar.bz2">
+<!ENTITY cvs-download-http "http://ccvs.cvshome.org/servlets/ProjectDownloadList">
+<!ENTITY cvs-download-ftp "">
 <!ENTITY cvs-size "2.1 MB">
 <!ENTITY cvs-time "0.37 SBU">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f4bc1ffb956e0906ea21b5be085b6299f73414ea)
+++ introduction/welcome/changelog.xml	(revision 13b9bfad98896c5e4bea061976e78bb1231850d4)
@@ -11,4 +11,7 @@
 <itemizedlist>
 
+<listitem><para>August 26th, 2003 [larry]: updated intro for PAM, added
+link to cracklib, modified cvs download.</para></listitem>
+
 <listitem><para>August 26th, 2003 [tushar]: Added dependencies for
 fontconfig.</para></listitem>
Index: postlfs/security/pam/linux_pam-config.xml
===================================================================
--- postlfs/security/pam/linux_pam-config.xml	(revision f4bc1ffb956e0906ea21b5be085b6299f73414ea)
+++ postlfs/security/pam/linux_pam-config.xml	(revision 13b9bfad98896c5e4bea061976e78bb1231850d4)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Configuring Linux_PAM</title>
+<title>Configuring <application>Linux_PAM</application></title>
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/pam.d</userinput> or <userinput>/etc/pam.conf</userinput></para>
+<para><filename>/etc/pam.d</filename> or <filename>/etc/pam.conf</filename></para>
 </sect3>
 
@@ -10,5 +10,5 @@
 <para>Configuration information is placed in
 <filename>/etc/pam.d</filename> or <filename>/etc/pam.conf</filename>
-depending on the application that is using PAM. Below are example files of
+depending on the application that is using <acronym>PAM</acronym>. Below are example files of
 each type:
 </para>
Index: postlfs/security/pam/linux_pam-desc.xml
===================================================================
--- postlfs/security/pam/linux_pam-desc.xml	(revision f4bc1ffb956e0906ea21b5be085b6299f73414ea)
+++ postlfs/security/pam/linux_pam-desc.xml	(revision 13b9bfad98896c5e4bea061976e78bb1231850d4)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The Linux_PAM package contains <userinput>unix-chkpwd</userinput>
+<para>The <application>Linux_PAM</application> package contains
+<command>unix-chkpwd</command>
 and <filename>libpam</filename> libraries.</para>
 
@@ -13,6 +14,6 @@
 
 <sect3><title>libpam libraries</title>
-<para>libpam libraries provide the interfaces between applications and
-the PAM modules.</para></sect3>
+<para><filename>libpam</filename> libraries provide the interfaces between applications and
+the <acronym>PAM</acronym> modules.</para></sect3>
 
 </sect2>
Index: postlfs/security/pam/linux_pam-exp.xml
===================================================================
--- postlfs/security/pam/linux_pam-exp.xml	(revision f4bc1ffb956e0906ea21b5be085b6299f73414ea)
+++ postlfs/security/pam/linux_pam-exp.xml	(revision 13b9bfad98896c5e4bea061976e78bb1231850d4)
@@ -2,14 +2,16 @@
 <title>Command explanations</title>
 
-<para><userinput>--enable-static-libpam</userinput> : This switch builds static PAM libraries as well as the dynamic libraries.</para>
+<para><command>--enable-static-libpam</command> : This switch builds
+static <acronym>PAM</acronym> libraries as well as the dynamic libraries.</para>
 
-<para><userinput>--with-mailspool=/var/mail</userinput> : This switch makes the mailspool directory FHS compliant.</para>
+<para><command>--with-mailspool=/var/mail</command> : This switch makes
+the mailspool directory <acronym>FHS</acronym> compliant.</para>
 
-<para><userinput>--enable-read-both-confs</userinput>  : This switch lets the local administrator choose which configuration file setup to
+<para><command>--enable-read-both-confs</command>  : This switch lets the local administrator choose which configuration file setup to
 use.</para>
 
-<para><userinput>mv /lib/libpam.a /lib/libpam_misc.a /lib/libpamc.a
-/usr/lib</userinput> : This command moves the static libraries to
-<filename>/usr/lib</filename> to comply with FHS.</para>
+<para><command>mv /lib/libpam.a /lib/libpam_misc.a /lib/libpamc.a
+/usr/lib</command> : This command moves the static libraries to
+<filename>/usr/lib</filename> to comply with <acronym>FHS</acronym>.</para>
 
 </sect2>
Index: postlfs/security/pam/linux_pam-inst.xml
===================================================================
--- postlfs/security/pam/linux_pam-inst.xml	(revision f4bc1ffb956e0906ea21b5be085b6299f73414ea)
+++ postlfs/security/pam/linux_pam-inst.xml	(revision 13b9bfad98896c5e4bea061976e78bb1231850d4)
@@ -1,8 +1,8 @@
 <sect2>
-<title>Installation of Linux_PAM</title>
+<title>Installation of <application>Linux_PAM</application></title>
 
-<para>Install Linux_PAM by running the following commands:</para>
+<para>Install <application>Linux_PAM</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --enable-static-libpam --with-mailspool=/var/mail \
+<para><screen><userinput><command>./configure --enable-static-libpam --with-mailspool=/var/mail \
 --enable-read-both-confs --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
@@ -11,5 +11,5 @@
 ln -sf ../../lib/libpam.so.&Linux_PAM-version; /usr/lib/libpam.so &amp;&amp;
 ln -sf ../../lib/libpam_misc.so.&Linux_PAM-version; /usr/lib/libpam_misc.so &amp;&amp;
-ln -sf ../../lib/libpamc.so.&Linux_PAM-version; /usr/lib/libpamc.so</userinput></screen></para>
+ln -sf ../../lib/libpamc.so.&Linux_PAM-version; /usr/lib/libpamc.so</command></userinput></screen></para>
 
 
Index: postlfs/security/pam/linux_pam-intro.xml
===================================================================
--- postlfs/security/pam/linux_pam-intro.xml	(revision f4bc1ffb956e0906ea21b5be085b6299f73414ea)
+++ postlfs/security/pam/linux_pam-intro.xml	(revision 13b9bfad98896c5e4bea061976e78bb1231850d4)
@@ -1,17 +1,26 @@
 <sect2>
-<title>Introduction to Linux_PAM</title>
+<title>Introduction to <application>Linux_PAM</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&Linux_PAM-download-http;"/>
-Download location (FTP):        <ulink url="&Linux_PAM-download-ftp;"/>
-Version used:                   &Linux_PAM-version;
-Package size:                   &Linux_PAM-size;
-Estimated Disk space required:  &Linux_PAM-buildsize;</screen>
-
-<para>The Linux_PAM package contains Pluggable Authentication Modules.
+<para>The <application>Linux_PAM</application> package contains Pluggable Authentication Modules.
 This is useful to enable the local system administrator to choose how
 applications authenticate users.</para>
 
-<screen>Linux_PAM will utilize:
-cracklib</screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&Linux_PAM-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&Linux_PAM-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &Linux_PAM-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&Linux_PAM-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&Linux_PAM-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Linux_PAM</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><ulink url="http://www.crypticide.org/users/alecm/security/cracklib,2.7.tar.gz">cracklib v2.7</ulink></para></sect4>
+</sect3>
 
 </sect2>
Index: postlfs/security/pam/linux_pam.ent
===================================================================
--- postlfs/security/pam/linux_pam.ent	(revision f4bc1ffb956e0906ea21b5be085b6299f73414ea)
+++ postlfs/security/pam/linux_pam.ent	(revision 13b9bfad98896c5e4bea061976e78bb1231850d4)
@@ -10,2 +10,3 @@
 <!ENTITY Linux_PAM-download-ftp "">
 <!ENTITY Linux_PAM-size "332 KB">
+<!ENTITY Linux_PAM-time "0.07 SBU">
