Explorar el Código

Applied Bill Maltby's grammatic-fixes patch.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2164 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Timothy Bauscher hace 23 años
padre
commit
6a9875daac

+ 8 - 8
appendixa/bootscripts-desc.xml

@@ -17,12 +17,12 @@ systems).</para></sect4>
 
 <sect4><title>cleanfs</title>
 <para>The cleanfs script removes files that shouldn't be preserved between
-reboots, such as /var/run/*, /var/lock/*, it re-creates /var/run/utmp and
-removes the possible present /etc/nologin, /fastboot and /forcefsck
+reboots, such as /var/run/* and /var/lock/*. It re-creates /var/run/utmp and
+removes the possibly present /etc/nologin, /fastboot and /forcefsck
 files.</para></sect4>
 
 <sect4><title>functions</title>
-<para>The functions script contains shared functions among different
+<para>The functions script contains functions shared among different
 scripts such as error checking, status checking, etc.</para></sect4>
 
 <sect4><title>halt</title>
@@ -33,8 +33,8 @@ scripts such as error checking, status checking, etc.</para></sect4>
 network devices.</para></sect4>
 
 <sect4><title>loadkeys</title>
-<para>The loadkeys script loads the proper keymap table that matches your
-keyboard layout.</para></sect4>
+<para>The loadkeys script loads the keymap table you specified as proper for
+your keyboard layout.</para></sect4>
 
 <sect4><title>localnet</title>
 <para>The localnet script sets up the system's hostname and local loopback
@@ -48,11 +48,11 @@ or aren't network based.</para></sect4>
 <para>The mountproc script is used to mount the proc filesystem.</para></sect4>
 
 <sect4><title>network</title>
-<para>The network script sets up network interfaces (such as network cards)
+<para>The network script sets up network interfaces, such as network cards,
 and sets up the default gateway where applicable.</para></sect4>
 
 <sect4><title>rc</title>
-<para>The rc script is the master runlevel control script which is
+<para>The rc script is the master runlevel control script. It is
 responsible for running all the other scripts one-by-one in a specific
 sequence.</para></sect4>
 
@@ -72,7 +72,7 @@ the hardware clock isn't set to GMT time.</para></sect4>
 partitions.</para></sect4>
 
 <sect4><title>sysklogd</title>
-<para>The sysklogd script start and stops the system and kernel log
+<para>The sysklogd script starts and stops the system and kernel log
 daemons.</para></sect4>
 
 <sect4><title>template</title>

+ 2 - 2
appendixa/make-desc.xml

@@ -8,8 +8,8 @@
 <sect3><title>Descriptions</title>
 
 <sect4><title>make</title>
-<para>make determines automatically which pieces of a large program need to be 
-recompiled, and issues the commands to recompile them.</para></sect4>
+<para>make determines, automatically, which pieces of a large program need to be 
+recompiled and issues the commands to recompile them.</para></sect4>
 
 </sect3>
 

+ 1 - 1
appendixa/netkitbase-desc.xml

@@ -8,7 +8,7 @@
 <sect3><title>Descriptions</title>
 
 <sect4><title>inetd</title>
-<para>inetd is the mother of all daemons. It listens for connections, and 
+<para>inetd is the mother of all daemons. It listens for connections and 
 transfers the call to the appropriate daemon.</para></sect4>
 
 <sect4><title>ping</title>

+ 2 - 2
appendixa/patch-desc.xml

@@ -9,12 +9,12 @@
 
 <sect4><title>patch</title>
 <para>The patch program modifies a file according to a patch file. A patch
-file usually is a list created by the diff program that contains
+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 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 1 MB or just as a patch file of 1 KB 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>

+ 5 - 5
appendixa/procps-desc.xml

@@ -37,8 +37,8 @@ criteria.</para></sect4>
 
 <sect4><title>tload</title>
 <para>tload prints a graph of the current system load average to the 
-specified tty (or the tty of the tload process if 
-none is specified).</para></sect4>
+specified tty or, if none is specified, the tty of the tload 
+process.</para></sect4>
 
 <sect4><title>top</title>
 <para>top provides an ongoing look at processor activity 
@@ -46,11 +46,11 @@ in real time.</para></sect4>
 
 <sect4><title>vmstat</title>
 <para>vmstat reports information about processes, memory, paging, block IO, 
-traps, and cpu activity.</para></sect4>
+traps and cpu activity.</para></sect4>
 
 <sect4><title>w</title>
-<para>w displays information about the users currently on the machine, and 
-their processes.</para></sect4>
+<para>w displays information about the users, and their processes,
+currently on the machine.</para></sect4>
 
 <sect4><title>watch</title>
 <para>watch runs command repeatedly, displaying its output (the first 

+ 4 - 4
appendixa/shadowpwd-desc.xml

@@ -29,14 +29,14 @@ existing users.</para></sect4>
 <para>chsh changes the user login shell.</para></sect4>
 
 <sect4><title>dpasswd</title>
-<para>dpasswd adds, deletes, and updates dial-up passwords for 
+<para>dpasswd adds, deletes and updates dial-up passwords for 
 user login shells.</para></sect4>
 
 <sect4><title>expiry</title>
 <para>expiry checks and enforces a password expiration policy.</para></sect4>
 
 <sect4><title>faillog</title>
-<para>faillog formats the contents of the failure log,/var/log/faillog, and 
+<para>faillog formats the contents of the failure log, /var/log/faillog, and 
 maintains failure counts and limits.</para></sect4>
 
 <sect4><title>gpasswd</title>
@@ -72,7 +72,7 @@ group files.</para></sect4>
 
 <sect4><title>lastlog</title>
 <para>lastlog formats and prints the contents of the last login log, 
-/var/log/lastlog. The login-name, port, and last login time will be 
+/var/log/lastlog. The login-name, port and last login time will be 
 printed.</para></sect4>
 
 <sect4><title>login</title>
@@ -114,7 +114,7 @@ to a normal password file.</para></sect4>
 given command as member of the given group.</para></sect4>
 
 <sect4><title>useradd</title>
-<para>useradd creates a new user or update default new user 
+<para>useradd creates a new user or updates default new user 
 information.</para></sect4>
 
 <sect4><title>userdel</title>

+ 2 - 2
appendixa/sysklogd-desc.xml

@@ -13,8 +13,8 @@ messages.</para></sect4>
 
 <sect4><title>syslogd</title>
 <para>syslogd provides the kind of logging that many modern programs use. Every
-logged message contains at least a time and a hostname field, normally a 
-program name field, too, but that depends on how trusty the logging 
+logged message contains at least a time and a hostname field and, normally, a
+program name field, too. But that depends on how trusty the logging
 program is.</para></sect4>
 
 </sect3>

+ 9 - 9
appendixa/sysvinit-desc.xml

@@ -11,8 +11,8 @@ wall</para></sect3>
 <sect3><title>Descriptions</title>
 
 <sect4><title>halt</title>
-<para>halt notes that the system is being brought down in the file 
-/var/log/wtmp, and then either tells the kernel to halt, reboot or 
+<para>halt notes, in the file /var/log/wtmp, that the system is being
+brought down and then tells the kernel to either halt, reboot or 
 poweroff the system. If halt or reboot is called when the system is not 
 in runlevel 0 or 6, shutdown will be invoked instead (with 
 the flag -h or -r).</para></sect4>
@@ -20,8 +20,8 @@ the flag -h or -r).</para></sect4>
 <sect4><title>init</title>
 <para>init is the parent of all processes. Its primary role is to create 
 processes from a script stored in the file /etc/inittab. This
-file usually has entries which cause init to spawn gettys on each line that
-users can log in. It also controls autonomous processes required by any 
+file usually has entries which cause init to spawn gettys on each line from
+which users can log in. It also controls autonomous processes required by any 
 particular system.</para></sect4>
 
 <sect4><title>killall5</title>
@@ -56,13 +56,13 @@ enabled in the kernel).</para></sect4>
 the computer.</para></sect4>
 
 <sect4><title>runlevel</title>
-<para>runlevel reads the system utmp file (typically /var/run/utmp) to locate 
-the runlevel record, and then prints the previous and current system 
+<para>runlevel reads the system utmp file (usually /var/run/utmp), locates
+the runlevel record and prints the previous and current system 
 runlevel on its standard output, separated by a single space.</para></sect4>
 
 <sect4><title>shutdown</title>
 <para>shutdown brings the system down in a secure way. All logged-in users are 
-notified that the system is going down, and login is blocked.</para></sect4>
+notified that the system is going down and login is blocked.</para></sect4>
 
 <sect4><title>sulogin</title>
 <para>sulogin is invoked by init when the system goes into single user mode 
@@ -72,14 +72,14 @@ execute sulogin when it is passed the -b flag from the boot loader
 
 <sect4><title>telinit</title>
 <para>telinit sends appropriate signals to init, telling it which runlevel to
-change to.</para></sect4>
+enter.</para></sect4>
 
 <sect4><title>utmpdump</title>
 <para>utmpdumps prints the content of a file (usually /var/run/utmp) on
 standard output in a user friendly format.</para></sect4>
 
 <sect4><title>wall</title>
-<para>wall sends a message to everybody logged in with their mesg permission 
+<para>wall sends a message to logged in users that have their mesg permission 
 set to yes.</para></sect4>
 
 </sect3>

+ 2 - 2
appendixa/tar-desc.xml

@@ -8,8 +8,8 @@
 <sect3><title>Descriptions</title>
 
 <sect4><title>rmt</title>
-<para>rmt is a program used by the remote dump and restore programs in 
-manipulating a magnetic tape drive through an interprocess communication
+<para>rmt is a program used by the remote dump and restore programs to
+manipulate a magnetic tape drive through an interprocess communication
 connection.</para></sect4>
 
 <sect4><title>tar</title>

+ 12 - 11
appendixa/utillinux-desc.xml

@@ -64,7 +64,7 @@ driver.</para></sect4>
 messages from the kernel).</para></sect4>
 
 <sect4><title>elvtune</title>
-<para>elvtune allows to tune the I/O elevator per block device queue 
+<para>elvtune lets you tune the I/O elevator per block device queue 
 basis.</para></sect4>
 
 <sect4><title>fdformat</title>
@@ -89,7 +89,7 @@ command.</para></sect4>
 format (ascii, decimal, hexadecimal, octal).</para></sect4>
 
 <sect4><title>hwclock</title>
-<para>hwclock queries and sets the hardware clock (Also called the RTC or BIOS
+<para>hwclock queries and sets the hardware clock (also called the RTC or BIOS
 clock).</para></sect4>
 
 <sect4><title>ipcrm</title>
@@ -99,7 +99,7 @@ clock).</para></sect4>
 <para>ipcs provides information on IPC facilities.</para></sect4>
 
 <sect4><title>isosize</title>
-<para>isosize outputs the length of a iso9660 file system.</para></sect4>
+<para>isosize outputs the length of an iso9660 file system.</para></sect4>
 
 <sect4><title>line</title>
 <para>line copies one line (up to a newline) from standard input and writes it
@@ -122,7 +122,7 @@ to standard output.</para></sect4>
 partition.</para></sect4>
 
 <sect4><title>mkfs.bfs</title>
-<para>mkfs.bfs creates a SCO bfs file system on a device, usually a harddisk
+<para>mkfs.bfs creates an SCO bfs file system on a device, usually a harddisk
 partition.</para></sect4>
 
 <sect4><title>mkfs.cramfs</title>
@@ -140,8 +140,8 @@ harddisk partition.</para></sect4>
 time.</para></sect4>
 
 <sect4><title>mount</title>
-<para>mount mounts a filesystem from a device to a directory (mount 
-point).</para></sect4>
+<para>mount mounts, from many possible sources, filesystems or directories
+on a directory (mount point).</para></sect4>
 
 <sect4><title>namei</title>
 <para>namei follows a pathname until a terminal point is found.</para></sect4>
@@ -163,7 +163,7 @@ BASH or TCSH.</para></sect4>
 <para>raw is used to bind a Linux raw character device to a block device.</para></sect4>
 
 <sect4><title>rdev</title>
-<para>rdev queries and sets image root device, swap device, RAM disk size, or
+<para>rdev queries and sets image root device, swap device, RAM disk size or
 video mode.</para></sect4>
 
 <sect4><title>readprofile</title>
@@ -183,10 +183,10 @@ video mode.</para></sect4>
 root.</para></sect4>
 
 <sect4><title>script</title>
-<para>script makes typescript of terminal session.</para></sect4>
+<para>script makes a typescript of terminal session.</para></sect4>
 
 <sect4><title>setfdprm</title>
-<para>setfdprm sets user-provides floppy disk parameters.</para></sect4>
+<para>setfdprm sets user-provided floppy disk parameters.</para></sect4>
 
 <sect4><title>setsid</title>
 <para>setsid runs programs in a new session.</para></sect4>
@@ -211,7 +211,7 @@ root.</para></sect4>
 which indicates underlining for the terminal in use.</para></sect4>
 
 <sect4><title>umount</title>
-<para>umount unmounts a mounted filesystem.</para></sect4>
+<para>umount unmounts a mounted filesystem or directory.</para></sect4>
 
 <sect4><title>vidmode</title>
 <para>vidmode queries and sets the video mode.</para></sect4>
@@ -221,7 +221,8 @@ which indicates underlining for the terminal in use.</para></sect4>
 command.</para></sect4>
 
 <sect4><title>write</title>
-<para>write sends a message to another user.</para></sect4>
+<para>write sends a message to another user, if that user has writing 
+enabled (usually by using mesg).</para></sect4>
 
 </sect3>
 

+ 7 - 0
chapter01/changelog.xml

@@ -4,6 +4,13 @@
 
 <para>&version; - &releasedate;</para>
 
+<itemizedlist>
+
+<listitem><para>October 6th, 2002 [timothy]: Chapter 06 - Applied Bill
+Maltby's grammatic-fixes patch.</para></listitem>
+
+</itemizedlist>
+
 <para>4.0 - October 5th, 2002</para>
 
 <itemizedlist>

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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 

+ 1 - 1
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>

+ 2 - 2
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>
 

+ 2 - 2
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>
 

+ 3 - 3
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>

+ 2 - 2
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;

+ 1 - 1
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>
 

+ 1 - 1
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

+ 1 - 2
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>
 

+ 3 - 3
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%' \

+ 2 - 2
index.xml

@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "book/book.xml">
 
-<!ENTITY version "20021005">
-<!ENTITY releasedate "October 5th, 2002">
+<!ENTITY version "20021006">
+<!ENTITY releasedate "October 6th, 2002">
 
 <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
 <!ENTITY http-root "http://ftp.linuxfromscratch.org">