7 files changed, 81 insertions, 12 deletions
diff --git a/chapter01/bootcd.xml b/chapter01/bootcd.xml
new file mode 100644
index 000000000..a693c55a8
--- /dev/null
+++ b/chapter01/bootcd.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 id="prepare-bootcd">
+<title>About the Included CD</title>
+<?dbhtml filename="bootcd.html"?>
+
+<para>For your convenience, we have included a CD with this book that
+contains the source packages needed for creating a Linux From Scratch
+system.  The CD is bootable and provides a stable working environment
+for building LFS.  This book refers to this system as the
+<emphasis>host system.</emphasis></para>
+
+<para>In addition to the tools required to build LFS, the host system
+on the CD has a number of other helpful tools installed:</para>
+
+<itemizedlist>
+	<listitem><para>An HTML version of this book</para></listitem>
+	<listitem><para>The X Window System Environment</para></listitem>
+	<listitem>
+		<para>Web Tools</para>
+		<itemizedlist>
+			<listitem><para>Wget (command line file retriever)</para></listitem>
+			<listitem><para>Lynx (text web browser)</para></listitem>
+			<listitem><para>Irssi (console IRC client)</para></listitem>
+			<listitem><para>Firefox (graphical web browser)</para></listitem>
+			<listitem><para>xchat (X-based IRC client)</para></listitem>
+		</itemizedlist>
+	</listitem>
+
+	<listitem>
+		<para>Text Editors</para>
+		<itemizedlist>
+			<listitem><para>Vim</para></listitem>
+			<listitem><para>nano</para></listitem>
+		</itemizedlist>
+	</listitem>
+
+	<listitem>
+		<para>Network Tools</para>
+		<itemizedlist>
+		<listitem><para>SSH Server and Client</para></listitem>
+		<listitem><para>NFS Server and Client</para></listitem>
+		<listitem><para>smbmount (mount.cifs) for Windows shares</para></listitem>
+		<listitem><para>Subversion</para></listitem>
+		<listitem><para>dhcpcd (DHCP client)</para></listitem>
+	</itemizedlist>
+	</listitem>
+
+	<listitem>
+		<para>Filesystem Programs</para>
+		<itemizedlist>
+			<listitem><para>reiserfsprogs</para></listitem>
+			<listitem><para>xfsprogs</para></listitem>
+		</itemizedlist>
+	</listitem>
+
+	<listitem><para>nALFS - A tool for automating LFS builds</para></listitem>
+</itemizedlist>
+
+</sect1>
+
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f3881f934..ac97e0a61 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -87,6 +87,10 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 30th, 2004 [gerard]: Minor textual edits.
+Added page to explain bootable CD included with the printed
+book.</para></listitem>
+
 <listitem><para>September 29th, 2004 [matt]: chapter08/kernel - Removed
 redundant comment regarding hotplug configuration (fixes bug 914 - Alexander E.
 Patrakov).</para></listitem>
diff --git a/chapter01/chapter01.xml b/chapter01/chapter01.xml
index 2090daa0e..f06458600 100644
--- a/chapter01/chapter01.xml
+++ b/chapter01/chapter01.xml
@@ -12,5 +12,6 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="changelog.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="administrativa.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="askforhelp.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootcd.xml"/>
 
 </chapter>
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index c091967b4..602253b71 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -46,11 +46,11 @@ unset them when building Grub.</para>
 <para>To test the results, issue:
 <userinput>make check</userinput>.</para>
 
-<para>Note that the test results will always give the error
-  <quote>ufs2_stage1_5 is too big</quote>.  This is due to a compiler issue,
-  but can be ignored unless you plan to boot from a UFS partition, normally only
-  used by Sun workstations.
-</para>
+<para>Note that the test results will always show the error
+<quote>ufs2_stage1_5 is too big</quote>.  This is due to a compiler
+issue, but can be ignored unless you plan to boot from an UFS
+partition. The partitions are normally only used by Sun
+workstations.</para>
 
 <para>Install the package:</para>
 
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 9878f4569..70ba44a29 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -29,9 +29,9 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Texinfo</title>
 
-<para>Texinfo-&texinfo-version; has a bug that can lead to the
-<command>info</command> program to crash.  Apply a patch to fix this
-problem:</para>
+<para>The following patch fixes a problem where the
+<command>info</command> program sometimes crashes when hitting the
+<emphasis>Delete</emphasis> key on the keyboard:</para>.
 
 <screen><userinput>patch -Np1 -i ../texinfo-&texinfo-version;-segfault-1.patch</userinput></screen>
 
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 9ef9f6104..8931ebbb0 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -28,8 +28,8 @@ some programs.</para>
 <sect2 role="installation">
 <title>Installation of Zlib</title>
 
-<para>Zlib-&zlib-version; has a known security vulnerability.  Apply a patch to
-fix this problem:</para>
+<para>The following patch fixes a Denial of Service vulnerability in
+the Zlib compression library:</para>
 
 <screen><userinput>patch -Np1 -i ../zlib-&zlib-version;-security-1.patch</userinput></screen>
 
diff --git a/general.ent b/general.ent
index e5d5e8630..1eeedb6db 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "6.0-testing-20040929">
-<!ENTITY releasedate "September 29, 2004">
+<!ENTITY version "6.0-testing-20040930">
+<!ENTITY releasedate "September 30, 2004">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
 <!ENTITY blfs-root "&lfs-root;blfs/">