diff --git a/appendices/glossary.xml b/appendices/glossary.xml
index 6d77bd1d89..d3e7f0ce3c 100644
--- a/appendices/glossary.xml
+++ b/appendices/glossary.xml
@@ -61,6 +61,10 @@
 <glossentry id="IMON"><glossterm><abbrev>imon</abbrev></glossterm>
 <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>
 
@@ -89,9 +93,15 @@ otherterm="gCORBA">CORBA</glossseealso></glossdef></glossentry>
 <glossentry id="gPPPoE"><glossterm><acronym>PPPoE</acronym></glossterm>
 <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>
 <glossdef><para>X MultiMedia System</para></glossdef></glossentry>
 
diff --git a/connect/dhcp/dhcp-client.xml b/connect/dhcp/dhcp-client.xml
index b1bb2be48e..c2defbf94d 100644
--- a/connect/dhcp/dhcp-client.xml
+++ b/connect/dhcp/dhcp-client.xml
@@ -1,10 +1,10 @@
 <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 
 do <emphasis>not</emphasis> need to run the server and so do not need 
diff --git a/connect/dialup/ppp.xml b/connect/dialup/ppp.xml
index 069dd67486..a5a8b27565 100644
--- a/connect/dialup/ppp.xml
+++ b/connect/dialup/ppp.xml
@@ -1,6 +1,6 @@
-<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;
 &ppp-inst;
diff --git a/connect/dialup/ppp/ppp-config.xml b/connect/dialup/ppp/ppp-config.xml
index 7c910f6f4a..6a914eb63d 100644
--- a/connect/dialup/ppp/ppp-config.xml
+++ b/connect/dialup/ppp/ppp-config.xml
@@ -1,5 +1,5 @@
 <sect2>
-<title>Configuring <application>ppp</application></title>
+<title>Configuring <application><acronym>PPP</acronym></application></title>
 
 <sect3><title>Config files</title>
 <para><filename>/etc/ppp/*</filename></para>
@@ -7,10 +7,10 @@
 
 <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>
 
 </sect2>
diff --git a/connect/dialup/ppp/ppp-desc.xml b/connect/dialup/ppp/ppp-desc.xml
index 874a8fef2c..ee78df5d93 100644
--- a/connect/dialup/ppp/ppp-desc.xml
+++ b/connect/dialup/ppp/ppp-desc.xml
@@ -1,8 +1,8 @@
 <sect2>
 <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>
 
@@ -22,12 +22,12 @@ connection between the Point-to-Point Protocol  Daemon
 
 <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>
 
diff --git a/connect/dialup/ppp/ppp-inst.xml b/connect/dialup/ppp/ppp-inst.xml
index 3fa7a586ec..a1873fec80 100644
--- a/connect/dialup/ppp/ppp-inst.xml
+++ b/connect/dialup/ppp/ppp-inst.xml
@@ -1,11 +1,11 @@
 <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;
 make &amp;&amp;
diff --git a/connect/dialup/ppp/ppp-intro.xml b/connect/dialup/ppp/ppp-intro.xml
index a8af19d46e..4454ffdae5 100644
--- a/connect/dialup/ppp/ppp-intro.xml
+++ b/connect/dialup/ppp/ppp-intro.xml
@@ -1,8 +1,8 @@
 <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>
 
diff --git a/connect/dialup/wvdial/wvdial-config.xml b/connect/dialup/wvdial/wvdial-config.xml
index 9ee3530f2b..a0711fe33f 100644
--- a/connect/dialup/wvdial/wvdial-config.xml
+++ b/connect/dialup/wvdial/wvdial-config.xml
@@ -15,7 +15,7 @@ and try to determine it's exact setup. You will then need to enter your
 <filename>/etc/wvdial.conf</filename> file.</para>
 
 <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>
 
diff --git a/connect/dialup/wvdial/wvdial-desc.xml b/connect/dialup/wvdial/wvdial-desc.xml
index 302ed80fe2..3789992d97 100644
--- a/connect/dialup/wvdial/wvdial-desc.xml
+++ b/connect/dialup/wvdial/wvdial-desc.xml
@@ -9,7 +9,7 @@ and <command>wvdialconf</command> programs.</para>
 <sect2><title>Description</title>
 
 <sect3><title>wvdial</title>
-<para>Starts a ppp connection.</para></sect3>
+<para>Starts a <acronym>PPP</acronym> connection.</para></sect3>
 
 <sect3><title>wvdialconf</title>
 <para>Automates the configuration of wvdial.</para></sect3>
diff --git a/connect/other/pppoe/pppoe-config.xml b/connect/other/pppoe/pppoe-config.xml
index 930f1138c1..326146b1e7 100644
--- a/connect/other/pppoe/pppoe-config.xml
+++ b/connect/other/pppoe/pppoe-config.xml
@@ -1,5 +1,5 @@
 <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>
 <para><filename>/etc/ppp/pppoe.conf</filename>, 
@@ -12,8 +12,9 @@
 
 <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 
 <acronym>ISP</acronym>'s nameserver information available, as well as your 
diff --git a/connect/other/pppoe/pppoe-desc.xml b/connect/other/pppoe/pppoe-desc.xml
index 7e13096996..09c6c445ee 100644
--- a/connect/other/pppoe/pppoe-desc.xml
+++ b/connect/other/pppoe/pppoe-desc.xml
@@ -1,7 +1,7 @@
 <sect2>
 <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>
 pppoe</command>, <command>pppoe-relay</command>, <command>pppoe-server
@@ -20,8 +20,8 @@ in <filename>/etc/ppp/pppoe.conf</filename>.</para></sect3>
 specified in <filename>/etc/ppp/pppoe.conf</filename>.</para></sect3>
 
 <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>
 <para><command>adsl-stop</command> stops the client.</para></sect3>
diff --git a/connect/other/pppoe/pppoe-inst.xml b/connect/other/pppoe/pppoe-inst.xml
index 428a87d3f5..0943e968d6 100644
--- a/connect/other/pppoe/pppoe-inst.xml
+++ b/connect/other/pppoe/pppoe-inst.xml
@@ -1,5 +1,5 @@
 <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
 <acronym>PPPoE</acronym>, you need to patch <xref linkend="ppp"/> and
@@ -9,7 +9,7 @@ patch can be downloaded from here:
 information about kernel mode <acronym>PPPoE</acronym> can be found in
 <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>
 
 <screen><userinput><command>cd src &amp;&amp;
diff --git a/connect/other/pppoe/pppoe-intro.xml b/connect/other/pppoe/pppoe-intro.xml
index e8881a23ee..bf8d035ee8 100644
--- a/connect/other/pppoe/pppoe-intro.xml
+++ b/connect/other/pppoe/pppoe-intro.xml
@@ -1,5 +1,5 @@
 <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> 
 package contains both a client and a server component that works with the 
@@ -22,7 +22,7 @@ url="&pppoe-download-ftp;"/></para></listitem>
 &pppoe-time;</para></listitem></itemizedlist>
 </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>
 </sect3>
diff --git a/postlfs/security/shadow/shadow-inst.xml b/postlfs/security/shadow/shadow-inst.xml
index 7af84814e0..0dc9ab30f7 100644
--- a/postlfs/security/shadow/shadow-inst.xml
+++ b/postlfs/security/shadow/shadow-inst.xml
@@ -9,7 +9,7 @@
 
 <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;
 make &amp;&amp;