19 files changed, 72 insertions, 53 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5aaf9b283..6c9db3a91 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,25 +36,15 @@
     </listitem>
 -->
 
-    <!-- Remove this when adding the first entry -->
+    <!-- Remove this when adding the first entry for 6.3
+    No 6.2 entries should be placed here. -->
     <listitem>
-      <para>July 21, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[dnicholson] - Fixed dead link to Linux Driver Model paper
-          on the Device and Module Handling page. Replaced with sysfs paper
-          by the same author. Thanks to Chris Staub and Bryan Kadzban.</para>
-        </listitem>
-        <listitem>
-          <para>[dnicholson] - Added a reminder to check that the virtual
-          kernel file systems are mounted after the description of the
-          revised chroot command.</para>
-        </listitem>
-      </itemizedlist>
+      <para>None yet</para>
     </listitem>
 
   </itemizedlist>
 
+  <!-- Update this when release 6.2 -->
   <para>LFS 6.2 Branch created July 15, 2006.</para>
 
 </sect1>
diff --git a/chapter01/how.xml b/chapter01/how.xml
index 16d565c4e..e77aab35b 100644
--- a/chapter01/how.xml
+++ b/chapter01/how.xml
@@ -11,7 +11,7 @@
   <title>How to Build an LFS System</title>
 
   <para>The LFS system will be built by using a previously installed
-  Linux distribution (such as Debian, Mandrake, Red Hat, or SuSE). This
+  Linux distribution (such as Debian, Mandriva, Red Hat, or SuSE). This
   existing Linux system (the host) will be used as a starting point to
   provide necessary programs, including a compiler, linker, and shell,
   to build the new system. Select the <quote>development</quote> option
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 5c8d8fba1..201760d08 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -22,7 +22,7 @@
   <itemizedlist>
     <title>Upgraded to:</title>
 
-    <!-- Remove this after the first package update -->
+    <!-- Remove this after the first 6.3 package update -->
     <listitem>
       <para>None yet</para>
     </listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index e5cc7bf2d..36ed2336d 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -317,6 +317,14 @@
         <para>Home page: <ulink url="&linux-home;"/></para>
         <para>Download: <ulink url="&linux-url;"/></para>
         <para>MD5 sum: <literal>&linux-md5;</literal></para>
+
+        <note>
+          <para>The Linux kernel is updated relatively often, many times due to
+          discoveries of security vulnerabilities.  The latest available
+          2.6.16.x kernel version should be used, unless the errata page says
+          otherwise.  Do not use version 2.6.17 or later kernels due to
+          potential incompatibilites of the bootscripts.</para>
+        </note>
       </listitem>
     </varlistentry>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 040bb8962..bdd6dc8a7 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -123,6 +123,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&grub-geometry-patch;"/></para>
+        <para>MD5 sum: <literal>&grub-geometry-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Gzip Security Patch - <token>&gzip-security_fix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&gzip-security_fix-patch;"/></para>
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index b4c29a99c..87093c89b 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -37,6 +37,11 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
+    <para>Upstream developers have fixed several issues since the initial
+    release of Bash-&bash-version;.  Apply those fixes:</para>
+
+<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+
     <para>Prepare Bash for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools --without-bash-malloc</userinput></screen>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 451cd5424..7fc0bb49b 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -85,7 +85,7 @@ sed 's/^XCFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in.tmp \
   &gt; gcc/Makefile.in</userinput></screen>
 
     <para>Apply the following patch to change the location of GCC's default
-    dynamiclinker (typically <filename
+    dynamic linker (typically <filename
     class="libraryfile">ld-linux.so.2</filename>):</para>
 
 <screen><userinput>patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
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>
 
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 8545dd4dc..afb2df34b 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -76,15 +76,6 @@
     configuration menus and create the kernel configuration from
     scratch.</para>
 
-    <note>
-      <para>NPTL requires the kernel to be compiled with GCC-3.x or later, in
-      this case &gcc-version;. It is not recommended to compile the kernel with
-      GCC-2.95.x, as this causes failures in the Glibc test suite. Normally,
-      this wouldn't be mentioned as LFS doesn't build GCC-2.95.x. Unfortunately,
-      the kernel documentation is outdated and still claims GCC-2.95.3 is the
-      recommended compiler.</para>
-    </note>
-
     <para>Compile the kernel image and modules:</para>
 
 <screen><userinput>make</userinput></screen>
diff --git a/general.ent b/general.ent
index 5221e2cc3..d80be37c1 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060721">
-<!ENTITY releasedate "July 21, 2006">
+<!ENTITY version "SVN-20060723">
+<!ENTITY releasedate "July 23, 2006">
 <!ENTITY milestone "6.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
diff --git a/packages.ent b/packages.ent
index 9aeee048f..731e1bc9a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -57,7 +57,7 @@
 <!ENTITY bison-home "&gnu-software;bison/">
 <!--
 <!ENTITY bison-ch5-du "">
-<!ENTITY bison-ch6-sbu "">
+<!ENTITY bison-ch5-sbu "">
 -->
 <!ENTITY bison-ch6-du "11.9 MB">
 <!ENTITY bison-ch6-sbu "0.6 SBU">
@@ -281,7 +281,7 @@
 <!ENTITY lfs-bootscripts-version "20060712">
 <!ENTITY lfs-bootscripts-size "24 KB">
 <!ENTITY lfs-bootscripts-url "http://www.linuxfromscratch.org/lfs/downloads/development/lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
-<!ENTITY lfs-bootscripts-md5 "7d8dfbf1387f5a469b2aa0db47bb3ef6">
+<!ENTITY lfs-bootscripts-md5 "24ad0604791f0c2a4cac12679298bf9c">
 <!ENTITY lfs-bootscripts-home " ">
 <!ENTITY lfs-bootscripts-ch7-du "0.4 MB">
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
@@ -295,10 +295,10 @@
 <!ENTITY libtool-ch6-sbu "0.1 SBU">
 
 <!ENTITY linux-dl-version "2.6">
-<!ENTITY linux-version "2.6.16.26">
-<!ENTITY linux-size "39,924 KB">
+<!ENTITY linux-version "2.6.16.27">
+<!ENTITY linux-size "39,886 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "e50cea2dbc4f427b4b555b8e0f77337d">
+<!ENTITY linux-md5 "ebedfe5376efec483ce12c1629c7a5b1">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-ch8-du "310 - 350 MB">
 <!ENTITY linux-ch8-sbu "1.5 - 3 SBU">
@@ -493,7 +493,7 @@
 <!ENTITY udev-config "udev-config-20060715">
 <!ENTITY udev-config-size "4 KB">
 <!ENTITY udev-config-url "http://www.linuxfromscratch.org/lfs/downloads/development/&udev-config;.tar.bz2">
-<!ENTITY udev-config-md5 "49ec838ac51af68f507e1e81d7c3d66e">
+<!ENTITY udev-config-md5 "aaecd7c2d977ee35b19777776476e012">
 <!-- <!ENTITY udev-config-md5 "TBD-udev-config-md5"> -->
 <!ENTITY udev-config-home " ">
 
diff --git a/patches.ent b/patches.ent
index 7aaaa6c9b..b1755584e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -62,6 +62,10 @@
 <!ENTITY groff-debian-patch-md5 "a47c281afdda457ba4033498f973400d">
 <!ENTITY groff-debian-patch-size "360 KB">
 
+<!ENTITY grub-geometry-patch "grub-&grub-version;-disk_geometry-1.patch">
+<!ENTITY grub-geometry-patch-md5 "2d29c8ad60d548f2abfaec79ea8bc268">
+<!ENTITY grub-geometry-patch-size "28 KB">
+
 
 <!ENTITY gzip-security_fix-patch "gzip-&gzip-version;-security_fixes-1.patch">
 <!ENTITY gzip-security_fix-patch-md5 "f107844f01fc49446654ae4a8f8a0728">
@@ -148,9 +152,9 @@
 <!ENTITY util-linux-cramfs-patch-md5 "1c3f40b30e12738eb7b66a35b7374572">
 <!ENTITY util-linux-cramfs-patch-size "2.8 KB">
 
-<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-3.patch">
-<!ENTITY vim-fixes-patch-md5 "ed158ebfb653b797b642fbff175addea">
-<!ENTITY vim-fixes-patch-size "18 KB">
+<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-7.patch">
+<!ENTITY vim-fixes-patch-md5 "d274219566702b0bafcb83ab4685bbde">
+<!ENTITY vim-fixes-patch-size "42 KB">
 
 <!ENTITY vim-mandir-patch "vim-&vim-version;-mandir-1.patch">
 <!ENTITY vim-mandir-patch-md5 "b6426eb4192faba1e867ddd502323f5b">