Merge r8515 from trunk to jh branch

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8516 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter06/shadow.xml

@@ -113,7 +113,7 @@ convert-mans UTF-8 ISO-8859-9 man/tr/*.?</userinput></screen>
     -e 's@/var/spool/mail@/var/mail@' etc/login.defs</userinput></screen>
 
     <note>
-      <para>If you built Shadow with Cracklib support, run the following:</para>
+      <para>If you chose to build Shadow with Cracklib support, run the following:</para>
 
 <screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' \
     etc/login.defs</userinput></screen>

chapter06/util-linux-ng.xml

@@ -64,6 +64,8 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
 
 <screen><userinput remap="make">make</userinput></screen>
 
+    <para>Install the package:</para>
+
 <screen><userinput remap="install">make install</userinput></screen>
 
   </sect2>