Index: appendices/glossary.xml
===================================================================
--- appendices/glossary.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ appendices/glossary.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -62,4 +62,8 @@
 <glossdef><para>Inode MONitor</para></glossdef></glossentry>
 
+<glossentry id="gIP"><glossterm><acronym>IP</acronym></glossterm>
+<glossdef><para>Internet Protocol</para><glossseealso otherterm="gTCP">TCP
+</glossseealso></glossdef></glossentry>
+
 <glossentry id="gISP"><glossterm><acronym>ISP</acronym></glossterm>
 <glossdef><para>Internet Service Provider</para></glossdef></glossentry>
@@ -90,6 +94,12 @@
 <glossdef><para>Point to Point Protocol over Ethernet</para></glossdef></glossentry>
 
+<glossentry id="gRFC"><glossterm><acronym>RFC</acronym></glossterm>
+<glossdef><para>Request For Comments</para></glossdef></glossentry>
+
 <glossentry id="gRP"><glossterm><acronym>RP</acronym></glossterm>
 <glossdef><para>Roaring Penguin</para></glossdef></glossentry>
+
+<glossentry id="gTCP"><glossterm><acronym>TCP</acronym></glossterm>
+<glossdef><para>Transmission Control Protocol</para></glossdef></glossentry>
 
 <glossentry id="gXMMS"><glossterm><acronym>XMMS</acronym></glossterm>
Index: connect/dhcp/dhcp-client.xml
===================================================================
--- connect/dhcp/dhcp-client.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/dhcp/dhcp-client.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -1,9 +1,9 @@
 <sect1 id="connect-dhcp-client">
 <?dbhtml filename="dhcpclient.html" dir="connect"?>
-<title>dhcp-&dhcp-version;</title>
+<title>DHCP-&dhcp-version;</title>
 
-<para>The <application>dhcp</application> package comes with both a client 
-(called <command>dhclient</command>) and a server program for using
-<acronym>DHCP</acronym>.  If you want to install this package, 
+<para>The <application><acronym>DHCP</acronym></application> package comes with
+both a client (called <command>dhclient</command>) and a server program for 
+using <acronym>DHCP</acronym>.  If you want to install this package, 
 the instructions can be found at <xref linkend="dhcp"/>.  
 Note that if you only want to use the client, you 
Index: connect/dialup/ppp.xml
===================================================================
--- connect/dialup/ppp.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/dialup/ppp.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -1,5 +1,5 @@
-<sect1 id="ppp" xreflabel="ppp-&ppp-version;">
+<sect1 id="ppp" xreflabel="PPP-&ppp-version;">
 <?dbhtml filename="ppp.html" dir="connect"?>
-<title>ppp-&ppp-version;</title>
+<title>PPP-&ppp-version;</title>
 
 &ppp-intro;
Index: connect/dialup/ppp/ppp-config.xml
===================================================================
--- connect/dialup/ppp/ppp-config.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/dialup/ppp/ppp-config.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>ppp</application></title>
+<title>Configuring <application><acronym>PPP</acronym></application></title>
 
 <sect3><title>Config files</title>
@@ -8,8 +8,8 @@
 <sect3><title>Configuration Information</title>
 
-<para>The ppp daemon itself requires very little configuration.  The
-main trick is scripting the connection.  This can be done either using the
-chat program which comes with this package or by using <xref
-linkend="wvdial"/>.</para>
+<para>The <application><acronym>PPP</acronym></application> daemon itself 
+requires very little configuration.  The main trick is scripting the 
+connection.  This can be done either using the chat program which comes with 
+this package or by using <xref linkend="wvdial"/>.</para>
 </sect3>
 
Index: connect/dialup/ppp/ppp-desc.xml
===================================================================
--- connect/dialup/ppp/ppp-desc.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/dialup/ppp/ppp-desc.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The <application>ppp</application> package contains the
-<command>chat</command>,
+<para>The <application><acronym>PPP</acronym></application> package contains 
+the <command>chat</command>,
 <command>pppd</command>, <command>pppdump</command> and
 <command>pppstats</command> programs.</para>
@@ -23,10 +23,10 @@
 <sect3><title>pppdump</title>
 <para><command>pppdump</command> is used to convert
-<acronym>PPP</acronym> record files 
+<application><acronym>PPP</acronym></application> record files 
 to a readable format.</para></sect3>
 
 <sect3><title>pppstats</title>
 <para><command>pppstats</command> is used to print
-<acronym>PPP</acronym> statistics.</para></sect3>
+<application><acronym>PPP</acronym></application> statistics.</para></sect3>
 
 </sect2>
Index: connect/dialup/ppp/ppp-inst.xml
===================================================================
--- connect/dialup/ppp/ppp-inst.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/dialup/ppp/ppp-inst.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of <application>ppp</application></title>
+<title>Installation of <application><acronym>PPP</acronym></application></title>
 
-<note><para><acronym>PPP</acronym> support must be compiled into the
-kernel or available as a kernel module.</para></note>
+<note><para><application><acronym>PPP</acronym></application> support must be 
+compiled into the kernel or available as a kernel module.</para></note>
 
-<para>Install <application>ppp</application> by running the following commands:
-</para>
+<para>Install <application><acronym>PPP</acronym></application> by running the 
+following commands:</para>
 
 <screen><userinput><command>./configure &amp;&amp;
Index: connect/dialup/ppp/ppp-intro.xml
===================================================================
--- connect/dialup/ppp/ppp-intro.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/dialup/ppp/ppp-intro.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>ppp</application></title>
+<title>Introduction to <application><acronym>PPP</acronym></application></title>
 
-<para>The <application>ppp</application> package contains the <command>pppd
-</command> daemon and the <command>chat</command> program.
+<para>The <application><acronym>PPP</acronym></application> package contains 
+the <command>pppd</command> daemon and the <command>chat</command> program.
 This is used for connecting to other machines; often for connecting to
 the Internet via a dial-up connection to an <acronym>ISP</acronym>.</para>
Index: connect/dialup/wvdial/wvdial-config.xml
===================================================================
--- connect/dialup/wvdial/wvdial-config.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/dialup/wvdial/wvdial-config.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -16,5 +16,5 @@
 
 <para>You then start wvdial with:
-<screen><userinput><command>wvdial</command></userinput>.</screen></para>
+<screen><userinput><command>wvdial</command></userinput></screen></para>
 
 <para>For more information examine the wvdialconf, wvdial.conf and wvdial man pages.</para>
Index: connect/dialup/wvdial/wvdial-desc.xml
===================================================================
--- connect/dialup/wvdial/wvdial-desc.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/dialup/wvdial/wvdial-desc.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -10,5 +10,5 @@
 
 <sect3><title>wvdial</title>
-<para>Starts a ppp connection.</para></sect3>
+<para>Starts a <acronym>PPP</acronym> connection.</para></sect3>
 
 <sect3><title>wvdialconf</title>
Index: connect/other/pppoe/pppoe-config.xml
===================================================================
--- connect/other/pppoe/pppoe-config.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/other/pppoe/pppoe-config.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application><acronym>RP-PPPoE</acronym></application></title>
+<title>Configuring <application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application></title>
 
 <sect3><title>Config files</title>
@@ -13,6 +13,7 @@
 <sect3><title>Configuration Information</title>
 
-<para>To configure <application><acronym>RP-PPPoE</acronym></application> after 
-installation, you should run the <command>adsl-setup</command> script.</para>
+<para>To configure <application><acronym>RP</acronym>-<acronym>PPPoE</acronym>
+</application> after installation, you should run the <command>adsl-setup
+</command> script.</para>
 
 <para>When configuring your connection, you will need to have your 
Index: connect/other/pppoe/pppoe-desc.xml
===================================================================
--- connect/other/pppoe/pppoe-desc.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/other/pppoe/pppoe-desc.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application><acronym>RP-PPPoE</acronym></application> package 
+<para>The <application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application> package 
 contains <command>adsl-setup</command>, <command>adsl-start</command>, 
 <command>adsl-status</command>, <command>adsl-stop</command>, <command>
@@ -21,6 +21,6 @@
 
 <sect3><title>adsl-status</title>
-<para><command>adsl-status</command> displays the status of the adsl connection.
-</para></sect3>
+<para><command>adsl-status</command> displays the status of the
+<acronym>ADSL</acronym> connection.</para></sect3>
 
 <sect3><title>adsl-stop</title>
Index: connect/other/pppoe/pppoe-inst.xml
===================================================================
--- connect/other/pppoe/pppoe-inst.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/other/pppoe/pppoe-inst.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Installation of <application><acronym>RP-PPPoE</acronym></application></title>
+<title>Installation of <application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application></title>
 
 <para>If you plan on using demand dialing, or kernel mode
@@ -10,5 +10,5 @@
 <filename>rp-pppoe-&pppoe-version;/doc/KERNEL-MODE-PPPOE</filename>.</para>
 
-<para>Install <application><acronym>RP-PPPoE</acronym></application> by running 
+<para>Install <application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application> by running 
 the following commands:</para>
 
Index: connect/other/pppoe/pppoe-intro.xml
===================================================================
--- connect/other/pppoe/pppoe-intro.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ connect/other/pppoe/pppoe-intro.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Introduction to <application><acronym>RP-PPPoE</acronym></application></title>
+<title>Introduction to <application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application></title>
 
 <para>The Roaring Penguin <application><acronym>PPPoE</acronym></application> 
@@ -23,5 +23,5 @@
 </sect3>
                                                                                 
-<sect3><title><application><acronym>RP-PPPoE</acronym></application> dependencies</title>
+<sect3><title><application><acronym>RP</acronym>-<acronym>PPPoE</acronym></application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="ppp"/></para></sect4>
Index: postlfs/security/shadow/shadow-inst.xml
===================================================================
--- postlfs/security/shadow/shadow-inst.xml	(revision 9635613edb824b6c5dfcb4c13d66054021048ed0)
+++ postlfs/security/shadow/shadow-inst.xml	(revision f07203c54add57ec6bfe5355b400587e1b92386a)
@@ -10,5 +10,5 @@
 <para>Reinstall shadow by running the following commands:</para>
 
-<para><screen><userinput><command>patch -Np1 -i ../shadow-4.0.3-pam.patch &amp;&amp;
+<para><screen><userinput><command>patch -Np1 -i ../shadow-4.0.3-pamfix-1.patch &amp;&amp;
 LDFLAGS="-lpam -lpam_misc" ./configure --prefix=/usr --libdir=/usr/lib \
 --enable-shared --with-libpam &amp;&amp;
