Fixing several small things.

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

7 files changed, 30 insertions, 36 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b0b4cd210..ea37d74cc 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -6,6 +6,10 @@
 
 <itemizedlist>
 
+<listitem><para>February 5th, 2004 [alex]: Chapter 6 - Simplified the final
+install of the kernel headers to just copying them from the temporary tools
+directory.</para></listitem>
+
 <listitem><para>February 4th, 2004 [alex]: Chapters 5 + 6 - Moved the Mounting
 of proc and devpts to before Chrooting, dropped Util-linux from the tools, and
 added a little arch script for Perl.</para></listitem>
diff --git a/chapter01/chapter01.xml b/chapter01/chapter01.xml
index 17bf587f8..7eb9aec66 100644
--- a/chapter01/chapter01.xml
+++ b/chapter01/chapter01.xml
@@ -4,7 +4,6 @@
 
 &c1-how;
 &c1-conventions;
-&c1-version;
 &c1-changelog;
 &c1-resources;
 &c1-acknowledgements;
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index 79e770ccd..b5ed2a808 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -100,7 +100,7 @@ Ed (&ed-version;) - &ed-size;:
 Expect (&expect-version;) - &expect-size;:
 <ulink url="http://freshmeat.net/projects/expect/"/>
 
-File (&file-version;) - &file-size;: -- <emphasis role="strong">(see Note 1 below)</emphasis>
+File (&file-version;) - &file-size;: -- <emphasis>(see Note 1 below)</emphasis>
 <ulink url="http://freshmeat.net/projects/file/"/>
 
 Findutils (&findutils-version;) - &findutils-size;:
@@ -127,7 +127,7 @@ GCC-testsuite (&gcc-version;) - &gcc-testsuite-size;:
 Gettext (&gettext-version;) - &gettext-size;:
 <ulink url="http://freshmeat.net/projects/gettext/"/>
 
-Glibc (&glibc-version;) - &glibc-size;: -- <emphasis role="strong">(see Note 2 below)</emphasis>
+Glibc (&glibc-version;) - &glibc-size;: -- <emphasis>(see Note 2 below)</emphasis>
 <ulink url="http://freshmeat.net/projects/glibc/"/>
 
 Grep (&grep-version;) - &grep-size;:
@@ -253,7 +253,7 @@ tar jcvf &glibc-package; &glibc-dir;</userinput></screen>
 
 <para>Alternatively, we've made our own tarball available which you can
 download courtesy of the generous LFS mirror sites. Please refer to the
-<xref linkend="ch-system-glibc"/> section for the download links.</para></note>
+<xref linkend="ch-tools-glibc"/> section for the download links.</para></note>
 
 </sect1>
 
diff --git a/chapter05/kernelheaders.xml b/chapter05/kernelheaders.xml
index adc7a668d..67636e622 100644
--- a/chapter05/kernelheaders.xml
+++ b/chapter05/kernelheaders.xml
@@ -42,13 +42,6 @@ cp -R include/asm-generic /tools/include</userinput></screen>
 
 <screen><userinput>cp -R include/linux /tools/include</userinput></screen>
 
-<para>There are a few kernel header files which make use of the
-<filename>autoconf.h</filename> header file. Since we do not yet configure the
-kernel, we need to create this file ourselves in order to avoid compilation
-failures. Create an empty <filename>autoconf.h</filename> file:</para>
-
-<screen><userinput>touch /tools/include/linux/autoconf.h</userinput></screen>
-
 </sect2>
 
 </sect1>
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index 7251700c1..d6633ce75 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -18,7 +18,7 @@
 <screen><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
 
 <para>Perl insists on using the <command>arch</command> program to find out
-the machine type. Create a little script to mimick this command:</para>
+the machine type. Create a little script to mimic this command:</para>
 
 <screen><userinput>echo "uname -m" &gt; /tools/bin/arch
 chmod 755 /tools/bin/arch</userinput></screen>
diff --git a/chapter06/mountproc.xml b/chapter06/mountproc.xml
index 381786f57..876dbd5c5 100644
--- a/chapter06/mountproc.xml
+++ b/chapter06/mountproc.xml
@@ -4,34 +4,34 @@
 
 <para>In order for certain programs to function properly, the
 <emphasis>proc</emphasis> and <emphasis>devpts</emphasis> file systems must be
-available within the chroot environment. Since kernel version 2.4 a file system
-can be mounted as many times and in as many places as you like, thus it's not a
-problem that these file systems are already mounted on your host system,
-especially so because they are virtual file systems.</para>
-
-<para>First make the mount points for these filesystems:</para>
+available within the chroot environment. The proc file system is the process
+information pseudo file system through which the kernel provides information
+about the status of the system. And the devpts file system is nowadays the most
+common way pseudo terminals (PTYs) are implemented. Since kernel version 2.4, a
+file system can be mounted as many times and in as many places as you like,
+thus it's not a problem that these file systems are already mounted on your
+host system, especially so because they are virtual file systems.</para>
+
+<para>First become <emphasis>root</emphasis>, as only <emphasis>root</emphasis>
+can mount file systems in unusual places. Then check again that the LFS
+environment variable is set correctly by running <userinput>echo
+$LFS</userinput> and making sure it shows the path to your LFS partition's
+mount point, which is <filename class="directory">/mnt/lfs</filename> if you
+followed our example.</para>
+
+<para>Now make the mount points for these filesystems:</para>
 
 <screen><userinput>mkdir -p $LFS/{proc,dev/pts}</userinput></screen>
 
-<para>Now become <emphasis>root</emphasis>, since only
-<emphasis>root</emphasis> can mount file systems in unusual places. Then
-check again that the LFS environment variable is set correctly by running 
-<userinput>echo $LFS</userinput> and making sure it shows the path to your LFS
-partition's mount point, which is <filename
-class="directory">/mnt/lfs</filename> if you followed our example.</para>
-
-<para>The <emphasis>proc</emphasis> file system is the process information
-pseudo file system through which the kernel provides information about the
-status of the system. Mount it with:</para>
+<para>Mount the <emphasis>proc</emphasis> file system with:</para>
 
 <screen><userinput>mount proc $LFS/proc -t proc</userinput></screen>
 
-<para>The <emphasis>devpts</emphasis> file system is now the most common way
-for pseudo terminals (PTYs) to be implemented. Mount it with:</para>
+<para>And mount the <emphasis>devpts</emphasis> file system with:</para>
 
 <screen><userinput>mount devpts $LFS/dev/pts -t devpts</userinput></screen>
 
-<para>This last command might fail with an error to the effect of:</para>
+<para>This last command might fail with an error like:</para>
 
 <blockquote><screen>filesystem devpts not supported by kernel</screen></blockquote>
 
@@ -47,9 +47,9 @@ because there is yet a third way to get PTYs working inside the chroot
 environment. We'll cover this shortly in the aforementioned
 <xref linkend="ch-system-MAKEDEV"/> section.</para>
 
-<para>Remember, if for any reason you stop working on your LFS, and start again
-later, it's important to check that these file systems are mounted again before
-entering the chroot environment, otherwise some problems could occur.</para>
+<para>Remember that if for any reason you stop working on your LFS, and start
+again later, it's important to check that these file systems are mounted again
+before entering the chroot environment, otherwise problems could occur.</para>
 
 </sect1>
 
diff --git a/entities/book-structure.xml b/entities/book-structure.xml
index e42cb7160..6147befbc 100644
--- a/entities/book-structure.xml
+++ b/entities/book-structure.xml
@@ -7,7 +7,6 @@
 <!ENTITY chapter01 SYSTEM "../chapter01/chapter01.xml">
 <!ENTITY c1-how SYSTEM "../chapter01/how.xml">
 <!ENTITY c1-conventions SYSTEM "../chapter01/conventions.xml">
-<!ENTITY c1-version SYSTEM "../chapter01/versions.xml">
 <!ENTITY c1-changelog SYSTEM "../chapter01/changelog.xml">
 <!ENTITY c1-resources SYSTEM "../chapter01/contactinfo.xml">
 <!ENTITY c1-acknowledgements SYSTEM "../chapter01/acknowledgements.xml">
@@ -55,6 +54,5 @@
 <!ENTITY c9-whatnow SYSTEM "../chapter09/whatnow.xml">
 
 <!ENTITY appendixa SYSTEM "../appendixa/appendixa.xml">
-<!ENTITY aa-introduction SYSTEM "../appendixa/introduction.xml">
 
 <!ENTITY appendixb SYSTEM "../appendixb/appendixb.xml">