aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Bauscher <timothy@linuxfromscratch.org>2002-09-24 04:52:43 +0000
committerTimothy Bauscher <timothy@linuxfromscratch.org>2002-09-24 04:52:43 +0000
commit695ae0bc31b390e1a544b0bd2f613ed514731168 (patch)
tree325d247284a14ec2f45f24150665fdb9db4271ed
parent4a7171007fe7374ca39694ade3b062d18a496caa (diff)
Applied Bill's chapter 5 fixes patch.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2133 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--appendixa/fileutils-desc.xml2
-rw-r--r--appendixa/findutils-desc.xml14
-rw-r--r--appendixa/gawk-desc.xml2
-rw-r--r--appendixa/gcc-desc.xml12
-rw-r--r--appendixa/gzip-desc.xml6
-rw-r--r--appendixa/texinfo-desc.xml4
-rw-r--r--chapter01/changelog.xml6
-rw-r--r--chapter05/gcc-exp.xml2
-rw-r--r--chapter05/patch-exp.xml2
-rw-r--r--chapter05/shellutils-inst.xml2
10 files changed, 26 insertions, 26 deletions
diff --git a/appendixa/fileutils-desc.xml b/appendixa/fileutils-desc.xml
index 1d94d9224..f25533d1a 100644
--- a/appendixa/fileutils-desc.xml
+++ b/appendixa/fileutils-desc.xml
@@ -67,7 +67,7 @@ their owner and group.</para></sect4>
<para>mkfifo creates a FIFO with each given name.</para></sect4>
<sect4><title>mknod</title>
-<para>mknod creates a FIFO, character special file, or block special file
+<para>mknod creates a FIFO, character special file or block special file
with the given file name.</para></sect4>
<sect4><title>mv</title>
diff --git a/appendixa/findutils-desc.xml b/appendixa/findutils-desc.xml
index 6152a3ce7..c65d63def 100644
--- a/appendixa/findutils-desc.xml
+++ b/appendixa/findutils-desc.xml
@@ -28,26 +28,26 @@ using front-compression, which reduces the database size by a factor of
4 to 5.</para></sect4>
<sect4><title>locate</title>
-<para>locate scans a database which contain all files and directories on a
+<para>locate scans a database which contains all files and directories on a
filesystem. This program lists the files and directories in this
database matching a certain criteria. If a user is looking for a file this
program will scan the database and tell him exactly where the files he
requested are located. This only makes sense if the locate database is
-fairly up-to-date else it will provide out-of-date information.</para></sect4>
+fairly up-to-date, else it will provide out-of-date information.</para></sect4>
<sect4><title>updatedb</title>
<para>The updatedb program updates the locate database. It scans the entire
-file system (including other file system that are currently mounted
+file system (including other file systems that are currently mounted
unless it is told not to do so) and puts every directory and file it finds
-into the database that's used by the locate program which retrieves this
+into the database that's used by the locate program, which retrieves this
information. It's good practice to update this database once a day to
have it up-to-date whenever it is needed.</para></sect4>
<sect4><title>xargs</title>
<para>The xargs command applies a command to a list of files. If there is
-a need to perform the same command on multiple files, a file can be created
-that contains all these files (one per line) and use xargs to perform that
-command on the list.</para></sect4>
+a need to perform the same command on multiple files, a list can be created
+that names all those files (one per line) and xargs can perform that
+command on those files.</para></sect4>
</sect3>
diff --git a/appendixa/gawk-desc.xml b/appendixa/gawk-desc.xml
index 31b105314..5eb82948e 100644
--- a/appendixa/gawk-desc.xml
+++ b/appendixa/gawk-desc.xml
@@ -12,7 +12,7 @@ pwcat</para></sect3>
<para>awk is a symbolic link to gawk.</para></sect4>
<sect4><title>gawk, gawk-3.1.1</title>
-<para>gawk is the GNU implementation of the AWK,
+<para>gawk is the GNU implementation of awk,
a pattern scanning and processing language.</para></sect4>
<sect4><title>grcat</title>
diff --git a/appendixa/gcc-desc.xml b/appendixa/gcc-desc.xml
index 04a59e522..f2408b4de 100644
--- a/appendixa/gcc-desc.xml
+++ b/appendixa/gcc-desc.xml
@@ -15,7 +15,7 @@ file is compiled into an object file, a linker will create an executable
file from one or more of these compiler generated object files.</para></sect4>
<sect4><title>c++, cc1plus, g++</title>
-<para>These are the C++ compiler; the equivalent of cc and
+<para>These are the C++ compiler, the equivalent of cc and
gcc etc.</para></sect4>
<sect4><title>c++filt</title>
@@ -31,12 +31,10 @@ from clashing.</para></sect4>
<para>collect2 assists with the compilation of constructors.</para></sect4>
<sect4><title>cpp, cpp0</title>
-<para>cpp pre-processes a source file, such as including
-the contents of header files into the source file. It's a good idea to
-not do this manually to save a lot of time. Someone just inserts a line
-like #include &lt;filename&gt;. The preprocessor inserts the
-contents of that file into the source file. That's one of the things a
-preprocessor does.</para></sect4>
+<para>cpp pre-processes a source file, such as including the contents of
+header files into the source file. Simply add a line, such as #include
+&lt;filename&gt;, to your source file. The preprocessor will insert the
+contents of the included file into the source file.</para></sect4>
<sect4><title>gccbug</title>
<para>gccbug is a shell script which is used to simplify the creation of
diff --git a/appendixa/gzip-desc.xml b/appendixa/gzip-desc.xml
index 3510b95f4..e2d168386 100644
--- a/appendixa/gzip-desc.xml
+++ b/appendixa/gzip-desc.xml
@@ -23,9 +23,9 @@ performance).</para></sect4>
Lempel-Ziv coding (LZ77).</para></sect4>
<sect4><title>zcat</title>
-<para>zcat uncompresses either a list of files on the command line or its
-standard input and writes the uncompressed data on
-standard output.</para></sect4>
+<para>zcat uncompresses either a list of files on the command line or a
+file being read from its standard input. Then, that uncompressed data is
+written to standard output.</para></sect4>
<sect4><title>zcmp</title>
<para>zcmp invokes the cmp program on compressed files.</para></sect4>
diff --git a/appendixa/texinfo-desc.xml b/appendixa/texinfo-desc.xml
index 9a3679ddc..76ae79f04 100644
--- a/appendixa/texinfo-desc.xml
+++ b/appendixa/texinfo-desc.xml
@@ -20,8 +20,8 @@ a binary format.</para></sect4>
<sect4><title>install-info</title>
<para>The install-info program updates the info entries. When the info
-program is run a list with available topics (ie: available info documents) will
-be presented. The install-info program is used to maintain this list of
+program is run, a list with available topics (ie: available info documents)
+will be presented. The install-info program is used to maintain this list of
available topics. If info files are removed manually, it is also necessary
to delete the topic in the index file as well. This program is used for
that. It also works the other way around when info documents are
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 18c377a13..05e954ebf 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -60,8 +60,10 @@
</para></listitem>
<listitem><para>September 23rd, 2002 [timothy]: Applied Bill Maltby's
-grammatic-fixes patch. Added <userinput>-</userinput> before
-<userinput>tar</userinput> options (for clarity).</para></listitem>
+grammatic-related patches.</para></listitem>
+
+<listitem><para>September 23rd, 2002 [timothy]: Added <userinput>-</userinput>
+before <userinput>tar</userinput> options (for clarity).</para></listitem>
<listitem><para>September 22nd, 2002 [timothy]: Chapter 06: Applied Alex's
grammatic-fixes patch.</para></listitem>
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml
index dc2e67bf2..b1fd52b43 100644
--- a/chapter05/gcc-exp.xml
+++ b/chapter05/gcc-exp.xml
@@ -25,7 +25,7 @@ This is the equivalent to make LDFLAGS=-static as we use with other
packages to compile them statically.</para>
<para><userinput>ln -s gcc $LFS/static/bin/cc:</userinput> This
-creates the $LFS/static/bin/gcc symlink which some packages need.</para>
+creates the $LFS/static/bin/gcc symlink, which some packages need.</para>
</sect2>
diff --git a/chapter05/patch-exp.xml b/chapter05/patch-exp.xml
index fc87079f0..0c71ff135 100644
--- a/chapter05/patch-exp.xml
+++ b/chapter05/patch-exp.xml
@@ -4,7 +4,7 @@
<para><userinput>CPPFLAGS=-D_GNU_SOURCE: </userinput>
This flag fixes installation problems of this package on PPC and m68k
platforms (that we know of). It 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>
diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml
index 9c31de806..c13dea8c3 100644
--- a/chapter05/shellutils-inst.xml
+++ b/chapter05/shellutils-inst.xml
@@ -5,7 +5,7 @@
applied. This patch is needed to avoid a conflict of variable names with
certain Glibc versions (usually glibc-2.1.x) when compiling sh-utils
statically. It is however safe to apply the patch even if you are running
-a different glibc version, so if you aren't sure, it's best to apply
+a different glibc version. So, if you aren't sure, it's best to apply
it.</para>
<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch</userinput></screen></para>