Index: final-system/common/shadow.xml
===================================================================
--- final-system/common/shadow.xml	(revision 75739bf3639cee18f25f9a2ca14101fe38c1bea9)
+++ final-system/common/shadow.xml	(revision e4c7d5c08b843ee5b4f569b4b0d85dd27ba1723c)
@@ -36,5 +36,5 @@
     <para os="b">Prepare Shadow for compilation:</para>
 
-<screen os="c"><userinput>./configure --libdir=/lib --enable-shared \
+<screen os="c"><userinput>./configure --libdir=/lib --sysconfdir=/etc --enable-shared \
     --without-libpam --without-audit --without-selinux</userinput></screen>
 
@@ -80,19 +80,5 @@
 <screen os="l"><userinput>make install</userinput></screen>
 
-    <para id="shadow-limits-login_access" os="m">Shadow uses two files to configure
-    authentication settings for the system. Install these two configuration
-    files:</para>
-
-    <indexterm zone="shadow-limits-login_access" os="n">
-      <primary sortas="e-/etc/limits">/etc/limits</primary>
-    </indexterm>
-
-    <indexterm zone="shadow-limits-login_access" os="o">
-      <primary sortas="e-/etc/login.access">/etc/login.access</primary>
-    </indexterm>
-
-<screen os="p"><userinput>cp -v etc/{limits,login.access} /etc</userinput></screen>
-
-    <para id="shadow-login_defs" os="q">Instead of using the default
+    <para id="shadow-login_defs">Instead of using the default
     <emphasis>crypt</emphasis> method, use the more secure
     <emphasis>MD5</emphasis> method of password encryption, which also allows
@@ -104,11 +90,11 @@
     while copying it to its destination:</para>
 
-    <indexterm zone="shadow-login_defs" os="r">
+    <indexterm zone="shadow-login_defs">
       <primary sortas="e-/etc/login.defs">/etc/login.defs</primary>
     </indexterm>
 
-<screen os="s"><userinput>sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
-    -e 's@/var/spool/mail@/var/mail@' \
-    etc/login.defs &gt; /etc/login.defs</userinput></screen>
+<screen os="s"><userinput>sed -i /etc/login.defs \
+    -e 's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
+    -e 's@/var/spool/mail@/var/mail@'</userinput></screen>
 
     <note os="t">
Index: final-system/multilib/shadow-64bit.xml
===================================================================
--- final-system/multilib/shadow-64bit.xml	(revision 75739bf3639cee18f25f9a2ca14101fe38c1bea9)
+++ final-system/multilib/shadow-64bit.xml	(revision e4c7d5c08b843ee5b4f569b4b0d85dd27ba1723c)
@@ -83,28 +83,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
Index: introduction/common/changelog.xml
===================================================================
--- introduction/common/changelog.xml	(revision 75739bf3639cee18f25f9a2ca14101fe38c1bea9)
+++ introduction/common/changelog.xml	(revision e4c7d5c08b843ee5b4f569b4b0d85dd27ba1723c)
@@ -38,4 +38,13 @@
 
     <listitem>
+      <para>June 9, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updates to Shadow 4.0.16 build instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 7, 2006</para>
       <itemizedlist>
