aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorTimothy Bauscher <timothy@linuxfromscratch.org>2002-10-06 15:50:25 +0000
committerTimothy Bauscher <timothy@linuxfromscratch.org>2002-10-06 15:50:25 +0000
commit6a9875daac5d3c5dd0c3623a7a5587947bb90147 (patch)
treea1229c1f27aa707d0c08bf9643c091280f052d16 /chapter06
parent6b8e9e97de1965df7a820d90943385f2e06696d6 (diff)
Applied Bill Maltby's grammatic-fixes patch.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2164 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/config-glibc.xml2
-rw-r--r--chapter06/config-keyboard.xml2
-rw-r--r--chapter06/config-ldso.xml2
-rw-r--r--chapter06/config-shadowpwd.xml2
-rw-r--r--chapter06/config-vim.xml2
-rw-r--r--chapter06/create-utmp.xml4
-rw-r--r--chapter06/procps-exp.xml4
-rw-r--r--chapter06/psmisc-inst.xml6
-rw-r--r--chapter06/shadowpwd-exp.xml4
-rw-r--r--chapter06/shadowpwd-inst.xml2
-rw-r--r--chapter06/sysvinit-inst.xml2
-rw-r--r--chapter06/tar-inst.xml3
-rw-r--r--chapter06/utillinux-inst.xml6
13 files changed, 20 insertions, 21 deletions
diff --git a/chapter06/config-glibc.xml b/chapter06/config-glibc.xml
index f04711c2f..18931e530 100644
--- a/chapter06/config-glibc.xml
+++ b/chapter06/config-glibc.xml
@@ -2,7 +2,7 @@
<para>We need to create the /etc/nsswitch.conf file. Although glibc should
provide defaults when this file is missing or corrupt, its defaults don't work
-well with networking which will be dealt with in a later chapter. Also, our
+well with networking. That is dealt with in a later chapter. Also, our
timezone needs to be set up.</para>
<para>Create a new file <filename>/etc/nsswitch.conf</filename> by running the
diff --git a/chapter06/config-keyboard.xml b/chapter06/config-keyboard.xml
index 5541f3d10..0fdacb6d3 100644
--- a/chapter06/config-keyboard.xml
+++ b/chapter06/config-keyboard.xml
@@ -18,7 +18,7 @@ example, if you have a Dutch keyboard, you would run:</para>
<para>A second option to configure your keyboard's layout is to compile
the keymap directly into the kernel. This will make sure that your
keyboard always works as expected, even when you have booted into
-maintenance mode (by passing `init=/bin/sh' to the kernel) in which case
+maintenance mode (by passing `init=/bin/sh' to the kernel), in which case
the bootscript that normally sets up your keymap isn't run.</para>
<para>Run the following command to patch the correct keymap into the
diff --git a/chapter06/config-ldso.xml b/chapter06/config-ldso.xml
index 2f169b974..522fd0431 100644
--- a/chapter06/config-ldso.xml
+++ b/chapter06/config-ldso.xml
@@ -8,7 +8,7 @@ class="directory">/usr/lib</filename> for dynamic libraries that are needed
by programs when you run them. However, if there are libraries in
directories other than <filename class="directory">/lib</filename> and
<filename class="directory">/usr/lib</filename>, you need to add them to
-the <filename>/etc/ld.so.conf</filename> file in order for the dynamic
+the <filename>/etc/ld.so.conf</filename> file for the dynamic
loader to find them. Two directories that are commonly known to contain
additional libraries are <filename
class="directory">/usr/local/lib</filename> and <filename
diff --git a/chapter06/config-shadowpwd.xml b/chapter06/config-shadowpwd.xml
index 4f0e84e61..75527f2a6 100644
--- a/chapter06/config-shadowpwd.xml
+++ b/chapter06/config-shadowpwd.xml
@@ -1,6 +1,6 @@
<sect2><title>Configuring Shadow Password Suite</title>
-<para>This package contains utilities to modify users's passwords, add
+<para>This package contains utilities to modify users' passwords, add
or delete users and groups, and the like. We're not going to explain
what 'password shadowing' means. A full explanation can be found in the doc/HOWTO
file within the unpacked shadow password suite's source tree. There's one
diff --git a/chapter06/config-vim.xml b/chapter06/config-vim.xml
index e750963d6..39aea4b4a 100644
--- a/chapter06/config-vim.xml
+++ b/chapter06/config-vim.xml
@@ -1,6 +1,6 @@
<sect2><title>Configuring Vim</title>
-<para>By default vim runs in vi compatible mode. Some people might like this,
+<para>By default, vim runs in vi compatible mode. Some people might like this,
but we have a high preference to run vim in vim mode (else we wouldn't
have included vim in this book, but the original vi). Create the
<filename>/root/.vimrc</filename> by running the following:</para>
diff --git a/chapter06/create-utmp.xml b/chapter06/create-utmp.xml
index a8fe88450..a5d3b5df0 100644
--- a/chapter06/create-utmp.xml
+++ b/chapter06/create-utmp.xml
@@ -3,8 +3,8 @@
files</title>
<para>Programs like login, shutdown, uptime and others want to read from and
-write to the /var/run/utmp /var/log/btmp and /var/log/wtmp. These files contain
-information about who is currently logged in. It also contains information
+write to the /var/run/utmp, /var/log/btmp and /var/log/wtmp. These files contain
+information about who is currently logged in. They also contain information
on when the computer was last booted and shutdown and a record of the
bad login attempts.</para>
diff --git a/chapter06/procps-exp.xml b/chapter06/procps-exp.xml
index 76730c875..539ceccd2 100644
--- a/chapter06/procps-exp.xml
+++ b/chapter06/procps-exp.xml
@@ -6,8 +6,8 @@
<para><userinput>make XSCPT="" install:</userinput>
This will set the Makefile variable XSCPT to an empty value so that
the XConsole installation is disabled. Otherwise "Make install" tries to
-copy the file XConsole to /usr/X11R6/lib/X11/app-defaults. And that directory
-does not exist, because X is not installed.</para>
+copy the file XConsole to /usr/X11R6/lib/X11/app-defaults. That directory
+does not exist because X is not installed.</para>
</sect2>
diff --git a/chapter06/psmisc-inst.xml b/chapter06/psmisc-inst.xml
index a349a4e9b..8f38b0014 100644
--- a/chapter06/psmisc-inst.xml
+++ b/chapter06/psmisc-inst.xml
@@ -9,12 +9,12 @@ make install</userinput></screen></para>
<para>Psmisc installs the
<filename>/usr/share/man/man1/pidof.1</filename> man page, but Psmisc's
-pidof program isn't installed by default. Generally this isn't a problem,
-because we install the Sysvinit package later on which provides
+pidof program isn't installed by default. Generally, this isn't a problem
+because we later install the Sysvinit package, which provides
a better pidof program.</para>
<para>It's up to you now to decide if you are going to use the Sysvinit
-package which provides a pidof program, or not. If you are going to, you
+package, which provides a pidof program, or not. If you are going to, you
should remove Psmisc's pidof man page by running:</para>
<para><screen><userinput>rm /usr/share/man/man1/pidof.1</userinput></screen></para>
diff --git a/chapter06/shadowpwd-exp.xml b/chapter06/shadowpwd-exp.xml
index 5c76e3592..6b02a060b 100644
--- a/chapter06/shadowpwd-exp.xml
+++ b/chapter06/shadowpwd-exp.xml
@@ -2,8 +2,8 @@
<title>Command explanations</title>
<para><userinput>cp limits login.access /etc:</userinput> These files
-were not installed during the installation of the package so we copy
-them manually as those files are used to configure authentication
+were not installed during the installation of the package, so we copy
+them manually because those files are used to configure authentication
details on the system.</para>
<para><userinput>sed "s%/var/spool/mail%/var/mail%" login.defs.linux &gt;
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index 05f997f6c..c3d4f362f 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -3,7 +3,7 @@
<para>Before you install this package, you may want to have a look at
the Shadow hint. It discusses how you can make your system more secure
-regarding passwords, such as how to enable the more secure MD5 passwords,
+regarding passwords, such as how to enable the more secure MD5 passwords
and how to get the most out of this Shadow package. The Shadow hint can
be found at <ulink url="&hints-root;shadowpasswd_plus.txt"/>.</para>
diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml
index a6c846260..ca0f81f1b 100644
--- a/chapter06/sysvinit-inst.xml
+++ b/chapter06/sysvinit-inst.xml
@@ -1,7 +1,7 @@
<sect2>
<title>Installation of Sysvinit</title>
-<para>When run levels are changed (for example, when halting the system)
+<para>When run levels are changed (for example, when halting the system),
init sends the TERM and KILL signals to the processes which it started.
init prints "Sending processes the TERM signal" to the screen. This seems
to imply that init is sending these signals to all the currently running
diff --git a/chapter06/tar-inst.xml b/chapter06/tar-inst.xml
index 07ab9fb4b..9164358c8 100644
--- a/chapter06/tar-inst.xml
+++ b/chapter06/tar-inst.xml
@@ -4,8 +4,7 @@
<para>If you want to be able to directly use bzip2 files with tar, you can
use the tar
patch available from the LFS FTP site. This patch will add the -j option
-to tar which works the same as the -z option to tar (which can be used
-for gzip files).</para>
+to tar, which works the same as the -z option used for gzip files.</para>
<para>Apply the patch by running the following command:</para>
diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml
index 1f6ee9f9c..b8d0c88e5 100644
--- a/chapter06/utillinux-inst.xml
+++ b/chapter06/utillinux-inst.xml
@@ -1,9 +1,9 @@
<sect2>
<title>FHS compliance notes</title>
-<para>The FHS recommends that we use /var/lib/hwclock as the location of the
-adjtime file, instead of the usual /etc. To make hwclock, which is part of the
-util-linux package, FHS-compliant, run the following.</para>
+<para>The FHS recommends that we use /var/lib/hwclock, instead of the
+usual /etc, as the location of the adjtime file. To make hwclock, which
+is part of the util-linux package, FHS-compliant, run the following.</para>
<para><screen><userinput>cp hwclock/hwclock.c{,.backup} &amp;&amp;
sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \