More miscellaneous adjustments.

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

INSTALL

@@ -1,6 +1,6 @@
 LFS Book Conversion Tools Installation Instructions
 
-After downloading the CVS source, there are some things that need to be setup 
+After downloading the CVS source, there are some things that need to be set up 
 on your computer if you want to convert the XML source into something easier to 
 read (e.g. HTML, TXT, PS or PDF).  If you are interested in this, then keep 
 reading.  If you are only interested in editing the XML source for re- 

appendixa/bootscripts-shortdesc.xml

@@ -4,7 +4,7 @@
 
 <para>The LFS-Bootscripts package contains SysV init style shell
 scripts. These scripts do various tasks such as check filesystem
-integrity during boot, load keymaps, setup networks and halt
+integrity during boot, load keymaps, set up networks and halt
 processes at shutdown.</para>
 
 <para>LFS-bootscripts installs the following:</para>

appendixa/gzip-shortdesc.xml

@@ -2,7 +2,7 @@
 
 <para>(Last checked against version &gzip-contversion;.)</para>
 
-<para>The gzip package contains programs to compress and decompress files
+<para>The Gzip package contains programs to compress and decompress files
 using the Lempel-Ziv coding (LZ77).</para>
 
 <para>Gzip installs the following:</para>

appendixa/vim-alt.xml

@@ -1,13 +0,0 @@
-<sect2>
-<title>Alternatives to Vim</title>
-
-<itemizedlist>
-
-  <listitem>
-    <para>emacs, joe and nano</para>
-    <para><ulink url="&blfs-root;view/cvs/postlfs/editors.html"/></para>
-  </listitem>
-
-</itemizedlist>
-
-</sect2>

appendixa/vim.xml

@@ -6,7 +6,6 @@
 
 &aa-vim-down;
 &aa-vim-shortdesc;
-&aa-vim-alt;
 &aa-vim-desc;
 &aa-vim-dep;
 

chapter01/acknowledgements.xml

@@ -11,8 +11,8 @@ contributions to the Linux From Scratch Project.</para>
 <itemizedlist>
 
 <listitem><para><ulink url="mailto:gerard@linuxfromscratch.org">Gerard
-Beekmans</ulink> &lt;gerard@linuxfromscratch.org&gt; -- LFS Project
+Beekmans</ulink> &lt;gerard@linuxfromscratch.org&gt; -- Linux-From-Scratch
-Organization/Leadership.</para></listitem>
+initiator, LFS Project organizer.</para></listitem>
 
 <listitem><para><ulink url="mailto:matthew@linuxfromscratch.org">Matthew
 Burgess</ulink> &lt;matthew@linuxfromscratch.org&gt; -- LFS General Package
@@ -28,7 +28,7 @@ maintainer.</para></listitem>
 
 <listitem><para><ulink url="mailto:bruce@linuxfromscratch.org">Bruce
 Dubbs</ulink> &lt;bruce@linuxfromscratch.org&gt; -- LFS Quality Assurance Team
-Leader, BLFS Book editor.</para></listitem>
+leader, BLFS Book editor.</para></listitem>
 
 <listitem><para><ulink url="mailto:alex@linuxfromscratch.org">Alex
 Groenewoud</ulink> &lt;alex@linuxfromscratch.org&gt; -- LFS Book
@@ -36,11 +36,11 @@ editor.</para></listitem>
 
 <listitem><para><ulink url="mailto:markh@linuxfromscratch.org">Mark
 Hymers</ulink> &lt;markh@linuxfromscratch.org&gt; -- CVS maintainer, BLFS Book
-Creator, former LFS Book editor.</para></listitem>
+creator, former LFS Book editor.</para></listitem>
 
 <listitem><para><ulink url="mailto:iwanek@linuxfromscratch.org">James
 Iwanek</ulink> &lt;iwanek@linuxfromscratch.org&gt; -- System Administration
-team member.</para></listitem>
+Team member.</para></listitem>
 
 <listitem><para><ulink url="mailto:nicholas@linuxfromscratch.org">Nicholas
 Leippe</ulink> &lt;nicholas@linuxfromscratch.org&gt; -- Wiki
@@ -52,22 +52,22 @@ creator and maintainer.</para></listitem>
 
 <listitem><para><ulink url="mailto:bill@linuxfromscratch.org">Bill
 Maltby</ulink> &lt;bill@linuxfromscratch.org&gt; -- LFS Project
-Organization/Leadership.</para></listitem>
+organizer.</para></listitem>
 
 <listitem><para><ulink url="mailto:scot@linuxfromscratch.org">Scot Mc
 Pherson</ulink> &lt;scot@linuxfromscratch.org&gt; -- LFS NNTP gateway
 maintainer.</para></listitem>
 
 <listitem><para><ulink url="mailto:ryan@linuxfromscratch.org">Ryan
-Oliver</ulink> &lt;ryan@linuxfromscratch.org&gt; -- Testing Team Leader, co-
+Oliver</ulink> &lt;ryan@linuxfromscratch.org&gt; -- Testing Team leader,
-creator of PLFS.</para></listitem>
+co-creator of PLFS.</para></listitem>
 
 <listitem><para><ulink url="mailto:jwrober@linuxfromscratch.org">James
 Robertson</ulink> &lt;jwrober@linuxfromscratch.org&gt; -- Bugzilla maintainer,
 Wiki developer, LFS Book editor.</para></listitem>
 
 <listitem><para><ulink url="mailto:greg@linuxfromscratch.org">Greg
-Schafer</ulink> &lt;greg@linuxfromscratch.org&gt; -- Toolchain Maintainer,
+Schafer</ulink> &lt;greg@linuxfromscratch.org&gt; -- Toolchain maintainer,
 LFS Book editor, co-creator of PLFS.</para></listitem>
 
 <listitem><para><ulink url="mailto:tushar@linuxfromscratch.org">Tushar
@@ -165,13 +165,13 @@ Neefs</ulink> -- linuxfromscratch.rave.org mirror.</para></listitem>
 Odisho</ulink> &lt;ervin@activalink.net&gt; -- lfs.activalink.net
 mirror.</para></listitem>
 
-<listitem><para><ulink url="mailto:miha@xuy.biz">Mikhail Pastukhov</ulink>
-&lt;miha@xuy.biz&gt; -- lfs.130th.net mirror.</para></listitem>
-
 <listitem><para><ulink url="mailto:guido@primerelay.net">Guido Passet</ulink>
 &lt;guido@primerelay.net&gt; -- nl.linuxfromscratch.org
 mirror.</para></listitem>
 
+<listitem><para><ulink url="mailto:miha@xuy.biz">Mikhail Pastukhov</ulink>
+&lt;miha@xuy.biz&gt; -- lfs.130th.net mirror.</para></listitem>
+
 <listitem><para><ulink url="mailto:jpolen@rackspace.com">Jeremy Polen</ulink>
 &lt;jpolen@rackspace.com&gt; -- us2.linuxfromscratch.org
 mirror.</para></listitem>
@@ -233,15 +233,16 @@ who, on behalf of <ulink url="http://www.linux.com">Linux.com</ulink>, donated
 a VA Linux 420 (former StartX SP2) workstation.</para></listitem>
 
 <listitem><para><ulink url="mailto:strider@linux.com">Mark Stone</ulink> for 
-donating shadowfax, the linuxfromscratch.org server.</para></listitem>
+donating <emphasis>shadowfax</emphasis>, the first linuxfromscratch.org
+server.</para></listitem>
 
 <listitem><para><ulink url="mailto:highos@linuxfromscratch.org">Jesse
 Tie-Ten-Quee</ulink> &lt;highos@linuxfromscratch.org&gt; for donating a Yamaha
-CDRW 8824E cd writer.</para></listitem>
+CDRW 8824E CD-writer.</para></listitem>
 
 <listitem><para>Countless other people on the various LFS mailinglists who are
-making this book happen by giving their suggestions, testing the book and
+making this book happen by giving their suggestions, submitting bug reports,
-submitting bug reports.</para></listitem>
+and throwing in their criticism.</para></listitem>
 
 </itemizedlist>
 
@@ -256,11 +257,12 @@ submitting bug reports.</para></listitem>
 Bauscher</ulink> &lt;timothy@linuxfromscratch.org&gt; -- LFS Book editor, Hints
 Project maintainer.</para></listitem>
 
-<listitem><para>Robert Briggs for originally donating the linuxfromscratch.org
+<listitem><para>Robert Briggs for originally donating the
-and linuxfromscratch.com domain names.</para></listitem>
+<emphasis>linuxfromscratch.org</emphasis> and
+<emphasis>linuxfromscratch.com</emphasis> domain names.</para></listitem>
 
 <listitem><para><ulink url="mailto:ian@ichilton.co.uk">Ian Chilton</ulink>
-&lt;ian@ichilton.co.uk&gt; for maintaining the Hints project</para></listitem>
+&lt;ian@ichilton.co.uk&gt; for maintaining the Hints project.</para></listitem>
 
 <listitem><para><ulink url="mailto:gimli@linuxfromscratch.org">Marc
 Heerdink</ulink> &lt;gimli@linuxfromscratch.org&gt; -- LFS Book
@@ -268,7 +270,7 @@ editor.</para></listitem>
 
 <listitem><para><ulink url="mailto:sklein@linuxfromscratch.org">Seth W.
 Klein</ulink> &lt;sklein@linuxfromscratch.org&gt; -- LFS FAQ
-Creator.</para></listitem>
+creator.</para></listitem>
 
 <listitem><para><ulink url="mailto:garrett@linuxart.com">Garrett
 LeSage</ulink> &lt;garrett@linuxart.com&gt; -- Original LFS banner
@@ -280,11 +282,11 @@ maintainer.</para></listitem>
 
 <listitem><para><ulink url="mailto:Geert.Poels@skynet.be">Geert Poels</ulink>
 &lt;Geert.Poels@skynet.be&gt; -- Original BLFS banner creator; based on the
-original LFS banner by Garrett LeSage.</para></listitem>
+LFS banner by Garrett LeSage.</para></listitem>
 
-<listitem><para><ulink url="mailto:bkenoah@oswd.org">Frank Skettino</ulink> 
+<listitem><para><ulink url="mailto:bkenoah@oswd.org">Frank Skettino</ulink>
-&lt;bkenoah@oswd.org&gt; -- Initial design of the old website - <ulink 
+&lt;bkenoah@oswd.org&gt; for the initial design of the old website -- have a
-url="http://www.oswd.org">OSWD</ulink>.</para></listitem>
+look at <ulink url="http://www.oswd.org/"/>.</para></listitem>
 
 <listitem><para><ulink url="mailto:highos@linuxfromscratch.org">Jesse
 Tie-Ten-Quee</ulink> &lt;highos@linuxfromscratch.org&gt; for answering

chapter01/changelog.xml

@@ -115,7 +115,7 @@ Bug 574.</para></listitem>
 to Appendix A. Closes Bug 661.</para></listitem>
 
 <listitem><para>September 26th, 2003 [jeremy]: Added new workaround for the
-devpts problems</para></listitem>
+devpts problems.</para></listitem>
 
 <listitem><para>September 24th, 2003 [greg]: Various changes across the board
 addressing Bug 675.</para></listitem>
@@ -127,7 +127,7 @@ the short descriptions, and the content of most of them too.</para></listitem>
 file: Made mounting devpts the default.</para></listitem>
 
 <listitem><para>September 22nd, 2003 [jeremy]: Added net-tools patch to fix
-mii-tool compilation</para></listitem>
+mii-tool compilation.</para></listitem>
 
 <listitem><para>September 22nd, 2003 [jwrober]: Chapter 5 - Updated the Why 
 Static page to more accurately represent the difference between statically and 
@@ -172,7 +172,7 @@ rationale notes.</para></listitem>
 <listitem><para>September 17th, 2003 [jwrober]: Updated the acknowledgements
 page to match the website.</para></listitem>
 
-<listitem><para>September 17th, 2003 [jeremy]: Upgraded File to 4.04</para></listitem>
+<listitem><para>September 17th, 2003 [jeremy]: Upgraded File to 4.04.</para></listitem>
 
 <listitem><para>September 17th, 2003 [jeremy]: Chapter 6 - changed 2 of the
 occurrences of exec bash --login to include the +h directive. </para></listitem>

chapter01/how.xml

@@ -2,18 +2,17 @@
 <title>How things are going to be done</title>
 <?dbhtml filename="how.html" dir="chapter01"?>
 
-<para>You are going to build your LFS system by using a previously installed 
+<para>You are going to build your LFS system by using a previously installed
-Linux distribution such as Debian, Mandrake, Red Hat, etc. The existing Linux 
+Linux distribution (such as Debian, Mandrake, Red Hat, or SuSE). This existing
-system (host) will be used as a starting point, because you will need programs 
+Linux system (the host) will be used as a starting point, because you will need
-like a compiler, linker, text editor, and other development tools to build the 
+programs like a compiler, linker and shell to build the new system. Normally
-new system. Ordinarily, the required tools are available by default if you 
+all the required tools are available if you selected <quote>development</quote>
-selected <quote>development</quote> as one of your installation options when 
+as one of the options when you installed your distribution.</para>
-you installed your Linux distribution.</para>
 
-<para>After you have downloaded the packages that make up an LFS system, you 
+<para>In Chapter 3 you will first create a new Linux native partition and
-will create a new Linux native partition and filesystem. This new Linux 
+filesystem, the place where your new LFS system will be compiled and installed.
-partition and filesystem is where your new LFS system will be compiled and 
+Then in Chapter 4 you download all the packages and patches required to build
-installed onto.</para>
+an LFS system, and store them on the new filesystem.</para>
 
 <para>Chapter 5 will then discuss the installation of a number of packages that 
 will form the basic development suite (or tool-set) which is used to build the 
@@ -68,11 +67,11 @@ simply switch to a different VC (Virtual Console) or X desktop and continue
 using the computer as you normally would.</para>
 
 <para>When all the software from Chapter 6 is installed, the temporary tools 
-built in Chapter 5 will be removed. Chapters 7, 8 and 9 will finalize the 
+built in Chapter 5 are removed. In Chapters 7, 8 and 9 the installation will
-installation. The bootscripts are setup in Chapter 7, the kernel and boot 
+then be finalized. The bootscripts are set up in Chapter 7, the kernel and
-loader are setup in Chapter 8 and Chapter 9 has some pointers to help you after 
+bootloader are set up in Chapter 8, and Chapter 9 has some pointers to help
-you finish with the book.  Then, finally, you reboot your computer into your 
+you after you finish the book.  Then, finally, you're ready to reboot your
-new LFS system.</para>
+computer into your new LFS system.</para>
 
 <para>This is the process in a nutshell. Detailed information on the steps you 
 will take are discussed in the chapters and package descriptions as you 

chapter02/askforhelp.xml

@@ -93,7 +93,7 @@ need.</para>
 <para>Many packages provide a test suite which, depending on the importance
 of the package, we may encourage you to run. Sometimes packages will
 generate false or expected failures. If you encounter these, you can check
-the LFS Wiki page at <ulink url="http://wiki.linuxfromscratch.org"/> to see
+the LFS Wiki page at <ulink url="http://wiki.linuxfromscratch.org/"/> to see
 whether we have already investigated and noted them. If we already know
 about them, then usually there is no need to be concerned.</para>
 

chapter04/chapter04.xml

@@ -17,7 +17,7 @@ reason for not using the latest version due to known problems that haven't
 been worked around yet.</para>
 
 <para>All the URLs, when possible, refer to the project's page at
-<ulink url="http://www.freshmeat.net">Freshmeat.net</ulink>. The Freshmeat
+<ulink url="http://www.freshmeat.net"/>. The Freshmeat
 pages will give you easy access to the official download sites as well as
 project websites, mailinglists, FAQs, Changelogs and more.</para>
 

chapter05/chapter05.xml

@@ -1,5 +1,5 @@
 <chapter id="chapter05">
-<title>Preparing the LFS system</title>
+<title>Constructing a temporary system</title>
 <?dbhtml filename="chapter05.html" dir="chapter05"?>
 
 &c5-introduction;

chapter05/coreutils-inst.xml

@@ -22,7 +22,7 @@ following command will do so:</para>
 <itemizedlist>
 <listitem><para><userinput>RUN_EXPENSIVE_TESTS=yes</userinput>: This tells the
 test suite to run several additional tests that are considered relatively
-expensive on some platforms. Hovever, they are generally not a problem on
+expensive on some platforms. However, they are generally not a problem on
 Linux.</para></listitem>
 </itemizedlist>
 

chapter05/gcc-pass2-inst.xml

@@ -21,7 +21,7 @@ simple test:</para>
 <para>Your host distribution is not set up for proper PTY operation. In this
 case there is no point in running the test suites for GCC and Binutils until you
 are able to resolve the issue. You can consult the LFS Wiki at
-<ulink url="http://wiki.linuxfromscratch.org"/> for more information on how to
+<ulink url="http://wiki.linuxfromscratch.org/"/> for more information on how to
 get PTYs working.</para>
 
 <note><para>It's worth pointing out that the GCC test suite we run in this

chapter05/introduction.xml

@@ -32,7 +32,7 @@ worry when instructions for a downloaded patch seem to be missing.</para>
 <para>During the installation of most packages you will
 see all kinds of compiler warnings scroll by on your screen. These are
 normal and can be safely ignored. They are just what they say they are:
-warnings -- mostly about improper, but not illegal, use of the C or C++
+warnings -- mostly about deprecated, but not invalid, use of the C or C++
 syntax. It's just that C standards have changed rather often and some
 packages still use the older standard, which is not really a problem.</para>
 

chapter05/tcl-inst.xml

@@ -34,7 +34,7 @@ available later on in Chapter 7.</para></listitem>
 </itemizedlist>
 
 <para>Sometimes, package test suites will give false failures.  You can
-consult the LFS Wiki at <ulink url="http://wiki.linuxfromscratch.org"/>
+consult the LFS Wiki at <ulink url="http://wiki.linuxfromscratch.org/"/>
 to verify that these failures are normal.  This applies to all tests
 throughout the book.</para>
 

chapter06/vim.xml

@@ -5,8 +5,16 @@
 <screen>Estimated build time:           &vim-time;
 Estimated required disk space:  &vim-compsize;</screen>
 
+<sect2>
+<title>Alternatives to Vim</title>
+
+<para>If you prefer another editor -- like Emacs, Joe, or Nano -- to Vim,
+have a look at <ulink url="&blfs-root;view/cvs/postlfs/editors.html"/> for
+suggested installation instructions.</para>
+
+</sect2>
+
 &aa-vim-shortdesc;
-&aa-vim-alt;
 &aa-vim-dep;
 &c6-vim-inst;
 &c6-cf-vim;