Index: boot/ppc64/yaboot.xml
===================================================================
--- boot/ppc64/yaboot.xml	(revision dbbb76581f645b732e9447272d65b6dd3d87fd8e)
+++ boot/ppc64/yaboot.xml	(revision c35d00e93340d28c8dbaedf92c0110119c2106b0)
@@ -48,5 +48,5 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="f2">It is also apprpriate if you are running an old 32-bit Linux
+    <para os="f2">It is also appropriate if you are running an old 32-bit Linux
     kernel on a 64-bit machine, or if the kernel personality has been forced to
     32-bit.</para>
Index: final-system/common/glibc.xml
===================================================================
--- final-system/common/glibc.xml	(revision dbbb76581f645b732e9447272d65b6dd3d87fd8e)
+++ final-system/common/glibc.xml	(revision c35d00e93340d28c8dbaedf92c0110119c2106b0)
@@ -29,5 +29,5 @@
 
     <note os="z">
-      <para>Some packages outside of LFS suggest installing GNU libiconv in
+      <para>Some packages outside of CLFS suggest installing GNU libiconv in
       order to translate data from one encoding to another. The project's
       home page (<ulink url="http://www.gnu.org/software/libiconv/"/>) says
@@ -36,5 +36,5 @@
       implementation cannot convert from/to Unicode.</quote> Glibc provides
       an <function>iconv()</function> implementation and can convert from/to
-      Unicode, therefore libiconv is not required on an LFS system.</para>
+      Unicode, therefore libiconv is not required on a CLFS system.</para>
     </note>
 
Index: final-system/common/shadow.xml
===================================================================
--- final-system/common/shadow.xml	(revision dbbb76581f645b732e9447272d65b6dd3d87fd8e)
+++ final-system/common/shadow.xml	(revision c35d00e93340d28c8dbaedf92c0110119c2106b0)
@@ -45,5 +45,5 @@
       <term><parameter>--without-libpam</parameter></term>
       <listitem><para>Support for Linux-PAM is enabled by default in Shadow,
-      however PAM is not installed on a base LFS system, so this switch
+      however PAM is not installed on a base CLFS system, so this switch
       disables PAM support in Shadow. For instructions to install PAM and
       link Shadow to it, you can look at
@@ -53,5 +53,5 @@
       <term><parameter>--without-audit</parameter></term>
       <listitem><para>Support for auditing is enabled by default, but a
-      library that it needs is not installed in a base LFS system. This
+      library that it needs is not installed in a base CLFS system. This
       switch disables auditing support.</para></listitem>
     </varlistentry>
@@ -59,5 +59,5 @@
       <term><parameter>--without-selinux</parameter></term>
       <listitem><para>Support for selinux is enabled by default, but selinux
-      is not built in a base LFS system and configure will fail without this
+      is not built in a base CLFS system and configure will fail without this
       switch.</para></listitem>
     </varlistentry>
@@ -86,7 +86,7 @@
     obsolete <filename class="directory">/var/spool/mail</filename> location
     for user mailboxes that Shadow uses by default to the <filename
-    class="directory">/var/mail</filename> location used currently. Both of
-    these can be accomplished by changing the relevant configuration file
-    while copying it to its destination:</para>
+    class="directory">/var/mail</filename> location used currently. Use the
+    following sed command to make these changes to the appropriate
+    configuration file:</para>
 
     <indexterm zone="shadow-login_defs">
@@ -116,10 +116,4 @@
 rm -v /lib/libshadow.so
 ln -svf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen>
-
-    <para os="y">The <option>-D</option> option of the <command>useradd</command>
-    program requires the <filename class="directory">/etc/default</filename>
-    directory for it to work properly:</para>
-
-<screen os="z"><userinput>install -dv /etc/default</userinput></screen>
 
   </sect2>
@@ -149,4 +143,10 @@
 
 <screen role="nodump"><userinput>grpconv</userinput></screen>
+
+    <para>To view or change the default settings for new user accounts that
+    you create, you can edit <filename>/etc/default/useradd</filename>. See 
+    <command>man useradd</command> or
+    <ulink url="&blfs-root;view/svn/postlfs/skel.html"/> for more
+    information.</para>
 
   </sect2>
Index: final-system/common/vim.xml
===================================================================
--- final-system/common/vim.xml	(revision dbbb76581f645b732e9447272d65b6dd3d87fd8e)
+++ final-system/common/vim.xml	(revision c35d00e93340d28c8dbaedf92c0110119c2106b0)
@@ -99,8 +99,8 @@
 
     <para os="p">If an X Window System is going to be installed on the LFS
-    system, it may be necessary to recompile Vim after installing X. Vim
+    system, you may want to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some
-    additional libraries to be installed. For more information on this
-    process, refer to the Vim documentation and the Vim installation page
+    additional libraries to be installed. For more information, refer to the
+    Vim documentation and the Vim installation page
     in the BLFS book at <ulink
     url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para>
Index: final-system/multilib/shadow-64bit.xml
===================================================================
--- final-system/multilib/shadow-64bit.xml	(revision dbbb76581f645b732e9447272d65b6dd3d87fd8e)
+++ final-system/multilib/shadow-64bit.xml	(revision c35d00e93340d28c8dbaedf92c0110119c2106b0)
@@ -105,12 +105,4 @@
 ln -svf ../../lib64/libshadow.so.0 /usr/lib64/libshadow.so</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
   </sect2>
 
