Index: appendices/acronymlist.xml
===================================================================
--- appendices/acronymlist.xml	(revision 960d87aab4754affccf0be6dc4a4ff50ad12052f)
+++ appendices/acronymlist.xml	(revision 6a8ff5c68c42185dda761bd6591113d007b11345)
@@ -327,5 +327,5 @@
       <term><emphasis role="bold">LSB</emphasis></term>
       <listitem>
-        <para>Linux Standards Base</para>
+        <para>Linux Standard Base</para>
       </listitem>
     </varlistentry>
Index: final-preps/abouttestsuites.xml
===================================================================
--- final-preps/abouttestsuites.xml	(revision 960d87aab4754affccf0be6dc4a4ff50ad12052f)
+++ final-preps/abouttestsuites.xml	(revision 6a8ff5c68c42185dda761bd6591113d007b11345)
@@ -28,15 +28,7 @@
 
   <note>
-    <para>Experience has shown that there is little to be gained
-    from running the test suites in <xref
-    linkend="chapter-testsuite-tools"/>. There can be no escaping the fact
-    that the host system always exerts some influence on the tests in that
-    chapter, often causing inexplicable failures. Because the tools built
-    in <xref linkend="chapter-testsuite-tools"/> are temporary and
-    eventually discarded, we do not recommend running the test suites in
-    <xref linkend="chapter-testsuite-tools"/> for the average reader. The
-    instructions for running those test suites are provided for the
-    benefit of testers and developers, but they are strictly
-    optional.</para>
+    <para>It is not possible to run testsuites when cross-compiling, so there
+    are no instructions given for running testsuites until
+    <xref linkend="chapter-building-system"/>.</para>
   </note>
 
@@ -46,6 +38,6 @@
   most likely cause is that the host system does not have the
   <systemitem class="filesystem">devpts</systemitem> file system set up
-  correctly. This issue is discussed in greater detail in <xref
-  linkend="chapter-testsuite-tools"/>.</para>
+  correctly. This issue is discussed in greater detail at
+  <ulink url="http://www.linuxfromscratch.org/lfs/faq.html#no-ptys"/>.</para>
 
   <para>Sometimes package test suites will fail, but for reasons which the
Index: final-preps/settingenviron.xml
===================================================================
--- final-preps/settingenviron.xml	(revision 960d87aab4754affccf0be6dc4a4ff50ad12052f)
+++ final-preps/settingenviron.xml	(revision 6a8ff5c68c42185dda761bd6591113d007b11345)
@@ -56,5 +56,5 @@
   the shell will always search the <envar>PATH</envar> when a program is to
   be run. As such, the shell will find the newly compiled tools in
-  <filename class="directory">$LFS/tools</filename> as soon as they are
+  <filename class="directory">$LFS/cross-tools</filename> as soon as they are
   available without remembering a previous version of the same program in a
   different location.</para>
Index: final-system/common/inetutils.xml
===================================================================
--- final-system/common/inetutils.xml	(revision 960d87aab4754affccf0be6dc4a4ff50ad12052f)
+++ final-system/common/inetutils.xml	(revision 6a8ff5c68c42185dda761bd6591113d007b11345)
@@ -25,5 +25,5 @@
       <seglistitem>
         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
-        Make, Ncurses, Patch, and Sed</seg>
+        Make, Ncurses, Patch, Sed, and Zlib</seg>
       </seglistitem>
     </segmentedlist>
Index: final-system/common/vim.xml
===================================================================
--- final-system/common/vim.xml	(revision 960d87aab4754affccf0be6dc4a4ff50ad12052f)
+++ final-system/common/vim.xml	(revision 6a8ff5c68c42185dda761bd6591113d007b11345)
@@ -114,5 +114,5 @@
 
     <indexterm zone="conf-vim">
-      <primary sortas="e-/etc/vim">/etc/vim</primary>
+      <primary sortas="e-/etc/vim">/etc/vimrc</primary>
     </indexterm>
 
Index: introduction/common/how.xml
===================================================================
--- introduction/common/how.xml	(revision 960d87aab4754affccf0be6dc4a4ff50ad12052f)
+++ introduction/common/how.xml	(revision 6a8ff5c68c42185dda761bd6591113d007b11345)
@@ -20,5 +20,5 @@
 
   <para>As an alternative to installing an entire separate distribution
-  onto your machine, and if your host machine is x86 based, you may wish to
+  onto your machine, you may wish to
   use the Linux From Scratch LiveCD. The CD works well as a host system,
   providing all the tools you need to successfully follow the instructions
Index: introduction/common/resources.xml
===================================================================
--- introduction/common/resources.xml	(revision 960d87aab4754affccf0be6dc4a4ff50ad12052f)
+++ introduction/common/resources.xml	(revision 6a8ff5c68c42185dda761bd6591113d007b11345)
@@ -39,5 +39,5 @@
     <title>News Server</title>
 
-    <para> The Linux From Scratch is no longer available.
+    <para> The Linux From Scratch News Server is no longer available.
     Please use the other support methods listed on this page
     </para>
Index: temp-system/common/introduction.xml
===================================================================
--- temp-system/common/introduction.xml	(revision 960d87aab4754affccf0be6dc4a4ff50ad12052f)
+++ temp-system/common/introduction.xml	(revision 6a8ff5c68c42185dda761bd6591113d007b11345)
@@ -17,10 +17,5 @@
   with more user convenience than a minimum environment would.</para>
 
-  <para>There are two steps in building this minimal system. The first
-  step is to build a new and host-independent toolchain (compiler,
-  assembler, linker, libraries, and a few useful utilities).  The second
-  step uses this toolchain to build the other essential tools.</para>
-
-  <para>The files compiled in this chapter will be installed under the
+  <para>The tools in this chapter are cross-compiled using the toolchain in /cross-tools. The files compiled in this chapter will be installed under the
   <filename class="directory">$LFS/tools</filename> directory to keep
   them separate from the files installed in <xref
