Syncing trunk with 6.2 branch.

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

8 files changed, 29 insertions, 16 deletions

diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index d2a89174d..1fe6d792a 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -71,11 +71,11 @@
     <command>find</command>.  As <filename class="directory">/usr</filename>
     may not be available during the early stages of booting, this program
     needs to be on the root partition.  The <command>updatedb</command>
-    script also needs to correct an explicit path.</para> 
+    script also needs to be modified to correct an explicit path:</para>
 
 <screen><userinput>mv -v /usr/bin/find /bin</userinput>
 sed -i -e 's/find:=${BINDIR}/find:=\/bin/' /usr/bin/updatedb</screen>
-                    
+
   </sect2>
 
   <sect2 id="contents-findutils" role="content">
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index eb39a12e9..eb6d8d080 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -135,8 +135,8 @@ grep Error glibc-check-log</userinput></screen>
 
     <itemizedlist>
       <listitem>
-        <para>The <emphasis>nptl/tst-clock2</emphasis> and 
-        <emphasis>tst-attr3</emphasis> tests sometimes 
+        <para>The <emphasis>nptl/tst-clock2</emphasis> and
+        <emphasis>tst-attr3</emphasis> tests sometimes
         fail.  The reason is not completely understood, but indications
         are that a heavy system load can trigger these failures.</para>
       </listitem>
@@ -254,20 +254,27 @@ rpc: files
 # End /etc/nsswitch.conf</literal>
 EOF</userinput></screen>
 
-    <para>To determine the local time zone, run the following script:</para>
+    <para>One way to determine the local time zone, run the following
+    script:</para>
 
 <screen role="nodump"><userinput>tzselect</userinput></screen>
 
     <para>After answering a few questions about the location, the script will
-    output the name of the time zone (e.g., <emphasis>EST5EDT</emphasis> or
-    <emphasis>Canada/Eastern</emphasis>). Then create the
-    <filename>/etc/localtime</filename> file by running:</para>
+    output the name of the time zone (e.g.,
+    <emphasis>America/Edmonton</emphasis>). There are also some other possible
+    timezones listed in <filename
+    class='directory'>/usr/share/zoneinfo</filename> such as
+    <emphasis>Canada/Eastern</emphasis> or <emphasis>EST5EDT</emphasis> that
+    are not identified by the script but can be used.</para>
+
+    <para>Then create the <filename>/etc/localtime</filename> file by
+    running:</para>
 
 <screen><userinput>cp -v --remove-destination /usr/share/zoneinfo/<replaceable>&lt;xxx&gt;</replaceable> \
     /etc/localtime</userinput></screen>
 
-    <para>Replace <replaceable>&lt;xxx&gt;</replaceable> with the name of the time zone
-    that <command>tzselect</command> provided (e.g., Canada/Eastern).</para>
+    <para>Replace <replaceable>&lt;xxx&gt;</replaceable> with the name of the
+    time zone selected (e.g., Canada/Eastern).</para>
 
     <variablelist>
       <title>The meaning of the cp option:</title>
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 8651c95c8..8570a6ac2 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -41,6 +41,12 @@
     as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
     unset them when building GRUB.</para>
 
+    <para>Start by applying the following patch to allow for better drive
+    detection, fix some <application>GCC 4.x</application> issues, and provide
+    better SATA support for some disk controllers:</para>
+
+<screen><userinput>patch -Np1 -i ../&grub-geometry-patch;</userinput></screen>
+
     <para>Prepare GRUB for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/man-pages.xml b/chapter06/man-pages.xml
index 6c289385c..746693b4f 100644
--- a/chapter06/man-pages.xml
+++ b/chapter06/man-pages.xml
@@ -59,7 +59,7 @@
       <varlistentry id="man-pages">
         <term><filename>man pages</filename></term>
         <listitem>
-          <para>Describe the C and C++ functions, important
+          <para>Describe C programming language functions, important
           device files, and significant configuration files</para>
           <indexterm zone="ch-system-man-pages man-pages">
             <primary sortas="e-man-pages">man pages</primary>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 9dc0f48e2..39ea3a3b6 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -86,7 +86,7 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
 
     <para>Next, remove the <filename class="extension">.so</filename> files in
     <filename class="directory">/lib</filename> and relink them into <filename
-    class="directory">/usr/lib</filename>.</para>
+    class="directory">/usr/lib</filename>:</para>
 
 <screen><userinput>rm -v /lib/lib{readline,history}.so
 ln -sfv ../../lib/libreadline.so.5 /usr/lib/libreadline.so
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 83b8cf53c..861c6ed6d 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -62,7 +62,7 @@
     </variablelist>
 
     <para>Disable the installation of the <command>groups</command> program
-    and its man page, as Coreutils provides a better version:</para>
+    and its man pages, as Coreutils provides a better version:</para>
 
 <screen><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
 find man -name Makefile -exec sed -i '/groups/d' {} \;</userinput></screen>
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 095fd087c..87ec2e842 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -36,13 +36,13 @@
     <title>Installation of Sysklogd</title>
 
     <para>The following patch fixes various issues, including a problem building
-    Sysklogd with Linux 2.6 series kernels</para>
+    Sysklogd with Linux 2.6 series kernels:</para>
 
 <screen><userinput>patch -Np1 -i ../&sysklogd-fixes-patch;</userinput></screen>
 
     <para>The following patch makes sysklogd treat bytes in the 0x80--0x9f range
     literally in the messages being logged, instead of replacing them with octal
-    codes. Unpatched sysklogd would damage messages in the UTF-8 encoding.</para>
+    codes. Unpatched sysklogd would damage messages in the UTF-8 encoding:</para>
 
 <screen><userinput>patch -Np1 -i ../&sysklogd-8bit-patch;</userinput></screen>
 
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index cdd6302eb..516133d31 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -36,7 +36,7 @@
     <title>Installation of Udev</title>
 
     <para>The udev-config tarball contains LFS-specific files used to configure
-    Udev.</para>
+    Udev. Unpack it into the Udev source directory:</para>
 
 <screen><userinput>tar xf ../&udev-config;.tar.bz2</userinput></screen>