Applied Alex Groenewoud's namesandspaces.dat patch

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

appendixa/autoconf-desc.xml

@@ -9,7 +9,7 @@ ifnames</para></sect3>
 <sect4><title>autoconf</title>
 <para>autoconf is a tool for producing shell scripts that automatically
 configure software source code packages to adapt to many kinds of
-UNIX-like systems.  The configuration scripts produced by autoconf are
+Unix-like systems.  The configuration scripts produced by autoconf are
 independent of autoconf when they are run, so their users do not need to
 have autoconf.</para></sect4>
 

appendixa/diffutils-down.xml

@@ -1,6 +1,6 @@
 <sect2>
 <title>Official Download Location</title>
 
-<para><literallayout>Diff Utils (&diffutils-version;): 
+<para><literallayout>Diffutils (&diffutils-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/diffutils/"/></literallayout></para>
 </sect2>

appendixa/fileutils-down.xml

@@ -1,6 +1,6 @@
 <sect2>
 <title>Official Download Location</title>
 
-<para><literallayout>File Utils (&fileutils-version;): 
+<para><literallayout>Fileutils (&fileutils-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/fileutils/"/></literallayout></para>
 </sect2>

appendixa/findutils-down.xml

@@ -1,10 +1,10 @@
 <sect2>
 <title>Official Download Location</title>
 
-<para><literallayout>Find Utils (&findutils-version;): 
+<para><literallayout>Findutils (&findutils-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/findutils/"/>
 
-Find Utils Patch (&findutils-version;):
+Findutils Patch (&findutils-version;):
 <ulink url="&ftp;/"/>
 <ulink url="&http;/"/></literallayout></para>
 </sect2>

appendixa/gawk-desc.xml

@@ -1,6 +1,6 @@
 <sect2><title>Contents of Gawk-&gawk-contversion;</title>
 
-<para>Not yet checked</para>
+<para>(Not checked yet.)</para>
 
 </sect2>
 

appendixa/glibc-desc.xml

@@ -214,7 +214,7 @@ the POSIX.1b Realtime Extension.</para></sect4>
 multi-threaded programs.</para></sect4>
 
 <sect4><title>libutil, libutil_p</title>
-<para>Contains code for "standard" functions used in many different unix
+<para>Contains code for "standard" functions used in many different Unix
 utilities.</para></sect4>
 
 </sect3>

appendixa/kernel-down.xml

@@ -1,6 +1,6 @@
 <sect2>
 <title>Official Download Location</title>
 
-<para><literallayout>Linux Kernel (&kernel-version;): 
+<para><literallayout>Linux (&kernel-version;):
 <ulink url="ftp://ftp.kernel.org/pub/linux/kernel/"/></literallayout></para>
 </sect2>

appendixa/m4-desc.xml

@@ -8,8 +8,8 @@
 <sect4><title>m4</title>
 <para>m4 is a macro processor. It copies input to output expanding macros as it
 goes. Macros are either built-in or user-defined and can take any number
-of arguments. Besides just doing macro expansion m4 has built-in functions 
+of arguments. Besides just doing macro expansion, m4 has built-in functions
-for including named files, running UNIX commands, doing integer arithmetic, 
+for including named files, running Unix commands, doing integer arithmetic,
 manipulating text in various ways, recursion, etc. The m4 program can be used either
 as a front-end to a compiler or as a macro processor in its own
 right.</para></sect4>

appendixa/patch-desc.xml

@@ -10,9 +10,9 @@
 file usually is a list created by the diff program that contains
 instructions on how an original file needs to be modified. Patch is used
 a lot for source code patches since it saves time and space. Imagine
-a package that is 1MB in size. The next version of that package
+a package that is 1 MB in size. The next version of that package
 only has changes in two files of the first version. It can be shipped as an
-entirely new package of 1MB or just as a patch file of 1KB which will
+entirely new package of 1 MB or just as a patch file of 1 KB which will
 update the first version to make it identical to the second version. So
 if the first version was downloaded already, a patch file avoids
 a second large download.</para></sect4>

appendixa/shadowpwd-down.xml

@@ -1,6 +1,6 @@
 <sect2>
 <title>Official Download Location</title>
 
-<para><literallayout>Shadow Password Suite (&shadow-version;):
+<para><literallayout>Shadow (&shadow-version;):
 <ulink url="ftp://ftp.pld.org.pl/software/shadow/"/></literallayout></para>
 </sect2>

appendixa/textutils-down.xml

@@ -1,6 +1,6 @@
 <sect2>
 <title>Official Download Location</title>
 
-<para><literallayout>Text Utils (&textutils-version;):
+<para><literallayout>Textutils (&textutils-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/textutils/"/></literallayout></para>
 </sect2>

appendixa/utillinux-down.xml

@@ -1,6 +1,6 @@
 <sect2>
 <title>Official Download Location</title>
 
-<para><literallayout>Util Linux (&util-linux-version;):
+<para><literallayout>Util-linux (&util-linux-version;):
 <ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/"/></literallayout></para>
 </sect2>

chapter01/newsserver.xml

@@ -7,7 +7,7 @@ accessible via the NNTP server. All messages posted to a mailing list
 will be copied to the correspondent newsgroup, and vice versa.</para>
 
 <para>The news server can be reached at
-<emphasis>news.linuxfromscratch.org</emphasis></para>
+<emphasis>news.linuxfromscratch.org</emphasis>.</para>
 
 </sect1>
 

chapter03/introduction.xml

@@ -3,9 +3,8 @@
 <?dbhtml filename="introduction.html" dir="chapter04"?>
 
 <para>In this chapter, the partition that is going to host the LFS system is
-going to be prepared. We will be creating the partition itself, a file
+prepared. We will create the partition itself, make a file
-system and the directory structure. When this is done, we can move on
+system on it, and mount it.</para>
-to the next chapter and start the actual building process.</para>
 
 </sect1>
 

chapter05/bzip2-inst.xml

@@ -12,7 +12,7 @@ program to compress and uncompress using bzip2/bunzip2 easily. With a
 plain tar, you have to use constructions like bzcat file.tar.bz|tar
 xv or tar --use-compress-prog=bunzip2 -xvf file.tar.bz2 to use bzip2 and
 bunzip2 with tar. This patch provides the -j option so you can unpack a
-Bzip2 archive with tar xvfj file.tar.bz2. Applying this patch will be
+bzip2'ed archive with tar xvfj file.tar.bz2. Applying this patch will be
 mentioned later on when the Tar package is installed.</para>
 
 </sect2>

chapter05/fileutils-inst.xml

@@ -3,13 +3,13 @@
 
 <para>The programs from a statically linked Fileutils package may cause
 segmentation faults on certain systems, if your distribution has
-Glibc-2.2.3 or higher installed. It also seems to happen mostly on machines
+Glibc-2.2.3 or higher installed. It seems to happen mostly on machines
 powered by an AMD CPU, but there is a case or two where an Intel system
-is affected as well. If your system falls under this category, try the
+is affected as well. If your system falls in this category, try the
 following fix.</para>
 
 <para>Note that in some cases using these sed commands will result in
-problems not being able to compile this package at all, even when your
+not being able to compile this package at all, even when your
 system has an AMD CPU and has Glibc-2.2.3 (or higher) installed. If that's 
 the case, you'll need to remove the fileutils-&fileutils-version; directory
 and unpack it again from the tarball before continuing. We believe this

chapter05/gcc-exp.xml

@@ -2,8 +2,8 @@
 <title>Command explanations</title>
 
 <para><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch:</userinput>
-This new patch deals with incorrect handling of weak symbols, the 
+This patch deals with the incorrect handling of weak symbols, the 
-over-optimization of calls to those weak symbols, an atexit issue and
+over-optimization of calls to those weak symbols, an atexit issue, and
 the  __dso_handle symbol required for atexit's proper function.</para>
 
 <para><userinput>make BOOT_LDFLAGS=-static:</userinput>

chapter05/installasuser.xml

@@ -37,7 +37,7 @@ EOF
 source ~/.bash_profile</userinput></screen></para>
 
 <para>This profile makes sure the umask is set to 022 so newly created
-files and directories will have the correct permission. It is advisable
+files and directories will have the correct permissions. It is advisable
 to keep this setting throughout your LFS installation. Also, the $LFS
 and $LC_ALL environment variables are set. $LFS has been explained in
 previous chapters already. $LC_ALL is a variable that is used for

chapter05/introduction.xml

@@ -21,7 +21,7 @@ compiler.</para>
 
 <para>All the files from this chapter will be installed under the <filename
 class="directory">$LFS/static</filename> directory. By doing it this way,
-we keep the installation from this chapter seperate from the final
+we keep the installation from this chapter separate from the final
 installation in the next chapter. Everything done here is only temporarily
 so we don't want it to pollute the to-be LFS system.</para>
 

chapter05/make-inst.xml

@@ -14,10 +14,10 @@ make install</userinput></screen></para>
 otherwise the `-l' option will probably not work. You may need special
 privileges to complete the installation of /mnt/lfs/static/bin/make.</screen></blockquote>
 
-<para>You can safely ignore this warning. make doesn't need to be owned by
+<para>You can safely ignore this warning. The make program doesn't actually need to be owned by
-group kmem and setgid for the <emphasis>-l</emphasis> option to work (which
+group kmem and setgid for the <emphasis>-l</emphasis> option to work. (This option
-you can use to tell make not to start any new jobs when a certain load on
+tells make not to start any new jobs when a certain load on
-the system is reached).</para>
+the system has been reached.)</para>
 
 </sect2>
 

chapter05/patch-exp.xml

@@ -2,10 +2,9 @@
 <title>Command explanations</title>
 
 <para><userinput>CPPFLAGS=-D_GNU_SOURCE: </userinput>
-Adding <userinput>-D_GNU_SOURCE</userinput> to CPPFLAGS command before
+This flag fixes installation problems of this package on PPC and m68k
-we configure patch fixes installation of the package on PPC and m68k
+platforms (that we know of).  It doesn't hurt compilation on other
-platforms (that we know of).  It also doesn't hurt compilation on other
+platforms (such as x86); so we do it by default.</para>
-platforms (such as x86) so we do it by default.</para>
 
 </sect2>
 

chapter05/shellutils-inst.xml

@@ -14,9 +14,9 @@ make install</userinput></screen></para>
 NOTE: to install su, run 'make install-root' as root</screen></blockquote>
 
 <para>You can safely ignore that warning. You need to be logged in as root
-in order to install su the way sh-utils wants to install it, that being
+in order to install su the way Sh-utils wants to install it, which is being
 suid root. Because we don't need su during chapter 6, and su will be properly
-installed when we re-install sh-utils in chapter 6 anyways, you can just
+installed when we re-install Sh-utils in chapter 6, you can just
 pretend you didn't see it.</para>
 
 </sect2>

chapter05/utillinux-inst.xml

@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of Util-Linux</title>
+<title>Installation of Util-linux</title>
 
 <para>We only need the mount and umount programs at the moment, so we won't
 be compiling the entire package.</para>
 
-<para>Install Util-Linux by running the following commands:</para>
+<para>Install Util-linux by running the following commands:</para>
 
 <para><screen><userinput>./configure &amp;&amp;
 make -C lib &amp;&amp;

chapter05/whystatic.xml

@@ -2,8 +2,8 @@
 <title>Why do we use static linking?</title>
 <?dbhtml filename="whystatic.html" dir="chapter05"?>
 
-<para>Thanks to Plasmatic for posting the text on which this is mainly
+<para>(Thanks to Plasmatic for posting the text on which this is mainly
-based to one of the LFS mailing lists.</para>
+based to one of the LFS mailing lists.)</para>
 
 <para>When making (compiling) a program, rather than having to rewrite all the
 functions for dealing with the kernel, hardware, files, etc. every time you
@@ -16,15 +16,15 @@ new program, so that it can use any of the functions that the library
 has.</para>
 
 <para>However, these libraries can be very large (for example, libc.a
-can often be around 2.5MB), so you may not want a separate copy of each
+can often be around 2.5 MB), so you may not want a separate copy of each
 library attached to the program. Just imagine if you had a simple command
-like ls with an extra 2.5MB attached to it! Instead of making the library
+like ls with an extra 2.5 MB attached to it! Instead of making the library
 an actual part of the program, or statically linked, the library is kept a
 separate file, which is loaded only when the program needs it. This is what
 we call dynamically linked, as the library is loaded and unloaded dynamically,
 as the program needs it.</para>
 
-<para>So now we have a 1KB file and a 2.5MB file, but we still haven't saved any
+<para>So now we have a 1 KB file and a 2.5 MB file, but we still haven't saved any
 space (except maybe RAM until the library is needed). The REAL advantage to
 dynamically linked libraries is that we only need one copy of the library.
 If <filename>ls</filename> and <filename>rm</filename> both use the same 

chapter06/e2fsprogs-exp.xml

@@ -6,7 +6,7 @@ reason for supplying this option is because of the setup of the
 e2fsprogs Makefile. Some programs are essential for system use when,
 for example, /usr isn't mounted (like the e2fsck program).  These 
 programs and libraries therefore belong in directories like /lib and 
-/sbin. If this option isn't passed to e2fsprogs' configure, it places 
+/sbin. If this option isn't passed to E2fsprogs's configure, it places 
 these programs in /usr which  is not what we want.</para>
 
 <para><userinput>--enable-elf-shlibs:</userinput> This creates shared

chapter06/introduction.xml

@@ -2,24 +2,24 @@
 <title>Introduction</title>
 <?dbhtml filename="introduction.html" dir="chapter06"?>
  
-<para>The installation of all the software is pretty straightforward and
+<para>The installation of all the software is pretty straightforward, and
-you will probably think it's so much easier and shorter to give the generic 
+you will probably think it would be so much easier and shorter to give
-installation instructions for each package and only explain how to 
+the generic installation instructions for a package here and only explain
-install something if a certain package requires an alternate installation 
+in full the installation of those packages that require an alternate
-method. Although I agree on that, I choose to give the 
+method. Although we agree with that, we choose to give the 
-full instructions for each and every package. This is simply to avoid any 
+full instructions for each and every package, simply to avoid any 
 possible confusion and errors.</para>
 
 <para>Now would be a good time to take a look at the optimization hint 
-at <ulink url="&hints-root;optimization.txt"/> if you plan on using 
+at <ulink url="&hints-root;optimization.txt"/> if you plan to use 
 compiler optimization for the packages
-installed in the following chapter. Compiler optimization can make a program run
+installed in this chapter. Compiler optimization can make a program run
-faster, but may also cause some compilation problems. If you run into problems
+faster, but may also cause compilation problems. If you run into problems
-after having used optimization, always try it without optimizing to see if 
+when using optimization, always try it without optimization to see if 
 the problem persists.</para>
 
 <para>Please refrain from installing more than one package at a time, even
-if it may safe you time (especially with dual CPU machines). If you install
+if it may save you time (especially with dual CPU machines). If you install
 the wrong package at the wrong time, it may hard-wire program paths to
 <filename class="directory">$LFS/static</filename> which will cause the
 programs to stop working once the static directory is removed. The order

chapter06/manpages-inst.xml

@@ -1,7 +1,7 @@
 <sect2>
 <title>Installation of Man-pages</title>
 
-<para>Install Man-pages by running the following commands:</para>
+<para>Install Man-pages by running the following command:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>
 

chapter06/shellutils-inst.xml

@@ -1,7 +1,7 @@
 <sect2>
 <title>Installation of Sh-utils</title>
 
-<para>Install Shellutils by running the following commands:</para>
+<para>Install Sh-utils by running the following commands:</para>
 
 <para><screen><userinput>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;

chapter06/utillinux-inst.xml

@@ -13,9 +13,9 @@ mkdir -p /var/lib/hwclock</userinput></screen></para>
 </sect2>
 
 <sect2>
-<title>Installation of Util-Linux</title>
+<title>Installation of Util-linux</title>
 
-<para>Install Util-Linux by running the following commands:</para>
+<para>Install Util-linux by running the following commands:</para>
 
 <para><screen><userinput>./configure &amp;&amp;
 make HAVE_SLN=yes &amp;&amp;

entities/flex.ent

@@ -15,5 +15,5 @@
 <!ENTITY flex-dir "flex-&flex-version;">
 <!ENTITY flex-package "flex-&flex-version;.tar.bz2">
 
-<!ENTITY flex-compsize "3MB">
+<!ENTITY flex-compsize "3 MB">
 <!ENTITY flex-time "1 minute">

entities/gettext.ent

@@ -16,5 +16,5 @@
 <!ENTITY gettext-dir "gettext-&gettext-version;">
 <!ENTITY gettext-package "gettext-&gettext-version;.tar.bz2">
 
-<!ENTITY gettext-compsize "11MB">
+<!ENTITY gettext-compsize "11 MB">
 <!ENTITY gettext-time "1 minute">