From 7bb9fda5ec3bfcf9c174b52a4129ae76aec4c85e Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 10 Feb 2015 21:54:19 +0000 Subject: [PATCH] Minor text and punctuation updates git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10844 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter06/autoconf.xml | 8 ++++---- chapter06/automake.xml | 6 +++--- chapter06/binutils.xml | 17 ++--------------- chapter06/coreutils.xml | 4 ++-- chapter06/e2fsprogs.xml | 22 +++++++++++----------- chapter06/gawk.xml | 2 +- chapter06/gcc.xml | 17 +++-------------- chapter06/gettext.xml | 2 +- chapter06/glibc.xml | 6 +++--- chapter06/groff.xml | 2 +- chapter06/intltool.xml | 2 +- chapter06/iproute2.xml | 10 +++++----- chapter06/kbd.xml | 6 +++--- chapter06/libtool.xml | 2 +- chapter06/linux-headers.xml | 4 ++-- chapter06/m4.xml | 4 ++-- chapter06/man-db.xml | 5 +++-- chapter06/ncurses.xml | 8 ++++---- chapter06/patch.xml | 4 ++-- chapter06/procps.xml | 2 +- chapter06/readline.xml | 4 ++-- chapter06/shadow.xml | 2 +- chapter06/sysklogd.xml | 4 ++-- chapter06/sysvinit.xml | 5 ++--- chapter06/texinfo.xml | 4 ++-- chapter06/util-linux.xml | 7 ++++--- chapter06/xz.xml | 2 +- 27 files changed, 69 insertions(+), 92 deletions(-) diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml index 08dfe71c2..12166a8ea 100644 --- a/chapter06/autoconf.xml +++ b/chapter06/autoconf.xml @@ -87,8 +87,8 @@ autoconf Produces shell scripts that automatically configure software - source code packages to adapt to many kinds of Unix-like systems. - The configuration scripts it produces are independent—running + source code packages to adapt to many kinds of Unix-like systems; + the configuration scripts it produces are independent—running them does not require the autoconf program autoconf @@ -164,11 +164,11 @@ Helps when writing configure.in files for a software package; it prints the identifiers that the package - uses in C preprocessor conditionals. If a package has already been set + uses in C preprocessor conditionals [If a package has already been set up to have some portability, this program can help determine what configure needs to check for. It can also fill in gaps in a configure.in file generated by - autoscan + autoscan.] ifnames diff --git a/chapter06/automake.xml b/chapter06/automake.xml index c58cf6184..9c8132d2b 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -77,7 +77,7 @@ make -j4 check automake-&am-minor-version;, compile, config.guess, config.sub, depcomp, install-sh, mdate-sh, missing, mkinstalldirs, py-compile, and ylwrap - /usr/share/aclocal-&am-minor-version;, /usr/share/automake-&am-minor-version;, + /usr/share/aclocal-&am-minor-version;, /usr/share/automake-&am-minor-version;, and /usr/share/doc/automake-&automake-version; @@ -113,12 +113,12 @@ make -j4 check A tool for automatically generating Makefile.in files from - Makefile.am files. To create all the + Makefile.am files [To create all the Makefile.in files for a package, run this program in the top-level directory. By scanning the configure.in file, it automatically finds each appropriate Makefile.am file and generates the - corresponding Makefile.in file + corresponding Makefile.in file.] automake diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index e3e15faa3..c87ab1ea9 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -129,7 +129,7 @@ cd ../binutils-build addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm, objcopy, objdump, ranlib, readelf, size, strings, and strip - libbfd.{a,so}, and libopcodes.{a,so} + libbfd.{a,so} and libopcodes.{a,so} /usr/lib/ldscripts @@ -315,20 +315,7 @@ cd ../binutils-build - + libbfd diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 568aae7fe..2c1b26654 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -607,8 +607,8 @@ sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8 mkfifo - Creates First-In, First-Outs (FIFOs), a named - pipe in UNIX parlance, with the given names + Creates First-In, First-Outs (FIFOs), a "named + pipe" in UNIX parlance, with the given names mkfifo diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 7374c75c0..7aa781254 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -176,7 +176,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.infolibcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so}, libquota.a, and libss.{a,so} /usr/include/e2p, /usr/include/et, /usr/include/ext2fs, - /usr/include/quota, /usr/include/ss, /usr/share/et, /usr/share/ss + /usr/include/quota, /usr/include/ss, /usr/share/et, and /usr/share/ss @@ -294,8 +294,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.infoe2undo Replays the undo log undo_log for an ext2/ext3/ext4 filesystem - found on a device. This can be used to undo a failed operation by an - e2fsprogs program + found on a device [This can be used to undo a failed operation by an + e2fsprogs program.] e2undo @@ -326,7 +326,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.infofsck.ext2 By default checks ext2 - file systems. This is a hard link to e2fsck + file systems and is a hard link to e2fsck fsck.ext2 @@ -337,7 +337,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.infofsck.ext3 By default checks ext3 - file systems. This is a hard link to e2fsck + file systems and is a hard link to e2fsck fsck.ext3 @@ -348,7 +348,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.infofsck.ext4 By default checks ext4 - file systems. This is a hard link to e2fsck + file systems and is a hard link to e2fsck fsck.ext4 @@ -359,7 +359,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.infofsck.ext4dev By default checks ext4 - development file systems. This is a hard link to + development file systems and is a hard link to e2fsck fsck.ext4dev @@ -416,7 +416,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.infomkfs.ext2 By default creates ext2 - file systems. This is a hard link to mke2fs + file systems and is a hard link to mke2fs mkfs.ext2 @@ -427,7 +427,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.infomkfs.ext3 By default creates ext3 - file systems. This is a hard link to mke2fs + file systems and is a hard link to mke2fs mkfs.ext3 @@ -438,7 +438,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.infomkfs.ext4 By default creates ext4 - file systems. This is a hard link to mke2fs + file systems and is a hard link to mke2fs mkfs.ext4 @@ -449,7 +449,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.infomkfs.ext4dev By default creates ext4 - development file systems. This is a hard link to mke2fs + development file systems and is a hard link to mke2fs mkfs.ext4dev diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml index 81e572172..32b8165a3 100644 --- a/chapter06/gawk.xml +++ b/chapter06/gawk.xml @@ -76,7 +76,7 @@ cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;filefuncs.so, fnmatch.so, fork.so, inplace.so, ordchr.so, readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so, testext.so, and time.so - /usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, + /usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, and /usr/share/doc/gawk-&gawk-version; diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index c9063842a..ab0fde85a 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -314,9 +314,9 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib libgcc_s.so, libgcov.a, libgomp.{a,so}, libiberty.a, libitm.{a,so}, liblto_plugin.so, libquadmath.{a,so}, libssp.{a,so}, - libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a and libtsan.{a,so} + libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a, and libtsan.{a,so} - /usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc, + /usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc, and /usr/share/gcc-&gcc-version; @@ -492,18 +492,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib - + libquadmath diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml index cdbcdc392..f1a236ae8 100644 --- a/chapter06/gettext.xml +++ b/chapter06/gettext.xml @@ -77,7 +77,7 @@ ngettext, recode-sr-latin, and xgettext libasprintf.{a,so}, libgettextlib.so, libgettextpo.{a,so}, libgettextsrc.so, and preloadable_libintl.so - /usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;, + /usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;, and /usr/share/gettext diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index ed69cd7b9..a16ff6c58 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -295,8 +295,8 @@ unset ZONEINFO test-suites will report errors. On an embedded system, where space is tight and you do not intend to ever update the timezones, you could save 1.9MB by not using the posix - directory, but some applications or test-suites might give less good - results + directory, but some applications or test-suites might produce some + failures. @@ -417,7 +417,7 @@ mkdir -pv /etc/ld.so.conf.d /usr/include/protocols, /usr/include/rpc, /usr/include/rpcsvc, /usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/locale, /usr/libexec/getconf, /usr/share/i18n, /usr/share/zoneinfo, - /var/cache/nscd, /var/lib/nss_db + /var/cache/nscd, and /var/lib/nss_db diff --git a/chapter06/groff.xml b/chapter06/groff.xml index 9e837f5fc..b35c563f4 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -80,7 +80,7 @@ pic2graph, post-grohtml, preconv, pre-grohtml, refer, roff2dvi, roff2html, roff2pdf, roff2ps, roff2text, roff2x, soelim, tbl, tfmtodit, and troff - /usr/lib/groff, /usr/share/doc/groff-&groff-version;, + /usr/lib/groff and /usr/share/doc/groff-&groff-version;, /usr/share/groff diff --git a/chapter06/intltool.xml b/chapter06/intltool.xml index ac157a2cd..af71ca422 100644 --- a/chapter06/intltool.xml +++ b/chapter06/intltool.xml @@ -70,7 +70,7 @@ install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-&intltool-version;/I18N intltool-extract, intltool-merge, intltool-prepare, intltool-update, and intltoolize - /usr/share/doc/intltool-&intltool-version;, + /usr/share/doc/intltool-&intltool-version; and /usr/share/intltool diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index 14d3a2cb0..2a6cbf637 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -89,7 +89,7 @@ sed -i 's/arpd.8//' man/man8/Makefile nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss, and tc /etc/iproute2, /usr/lib/tc, /usr/share/doc/iproute2-&iproute2-version;, - /usr/lib/tc + and /usr/lib/tc @@ -131,10 +131,10 @@ sed -i 's/arpd.8//' man/man8/Makefile ifcfg - A shell script wrapper for the ip command. - Note that it requires the arping and + A shell script wrapper for the ip command + [Note that it requires the arping and rdisk programs from the - iputils package found at + iputils package found at .] ifcfg @@ -193,7 +193,7 @@ sed -i 's/arpd.8//' man/man8/Makefile lnstat - Provides Linux network statistics. It is a generalized and more + Provides Linux network statistics; it is a generalized and more feature-complete replacement for the old rtstat program diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index 3a347be9b..412ec6f29 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -136,7 +136,7 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version; setfont, setkeycodes, setleds, setmetamode, showconsolefont, showkey, unicode_start, and unicode_stop /usr/share/consolefonts, /usr/share/consoletrans, /usr/share/keymaps, - /usr/share/unimaps + and /usr/share/unimaps @@ -385,9 +385,9 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version; unicode_start - Puts the keyboard and console in UNICODE mode. Don't use this + Puts the keyboard and console in UNICODE mode [Don't use this program unless your keymap file is in the ISO-8859-1 encoding. For - other encodings, this utility produces incorrect results + other encodings, this utility produces incorrect results.] unicode_start diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml index 35f8b5419..5ad81b563 100644 --- a/chapter06/libtool.xml +++ b/chapter06/libtool.xml @@ -76,7 +76,7 @@ libtool and libtoolize libltdl.{a,so} - /usr/include/libltdl, /usr/share/libtool + /usr/include/libltdl and /usr/share/libtool diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml index 17b2694db..bf2a8adf8 100644 --- a/chapter06/linux-headers.xml +++ b/chapter06/linux-headers.xml @@ -76,10 +76,10 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete /usr/include/asm/*.h, /usr/include/asm-generic/*.h, /usr/include/drm/*.h, /usr/include/linux/*.h, /usr/include/mtd/*.h, /usr/include/rdma/*.h, /usr/include/scsi/*.h, /usr/include/sound/*.h, - /usr/include/video/*.h, /usr/include/xen/*.h + /usr/include/video/*.h, and /usr/include/xen/*.h /usr/include/asm, /usr/include/asm-generic, /usr/include/drm, /usr/include/linux, /usr/include/mtd, /usr/include/rdma, - /usr/include/scsi, /usr/include/sound, /usr/include/video, /usr/include/xen + /usr/include/scsi, /usr/include/sound, /usr/include/video, and /usr/include/xen diff --git a/chapter06/m4.xml b/chapter06/m4.xml index 783aca41d..ca2f5b582 100644 --- a/chapter06/m4.xml +++ b/chapter06/m4.xml @@ -80,13 +80,13 @@ m4 copies the given files while expanding the macros that they - contain. These macros are either built-in or user-defined and can + contain [These macros are either built-in or user-defined and can take any number of arguments. Besides performing macro expansion, m4 has built-in functions for including named files, running Unix commands, performing integer arithmetic, manipulating text, 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 + in its own right.] m4 diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index 503c9c07a..40a3d261f 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -280,8 +280,9 @@ accessdb, apropos (link to whatis), catman, lexgrog, man, mandb, manpath, whatis, and zsoelim - libman.so, libmandb.so - /usr/lib/man-db, /usr/libexec/man-db, /usr/share/doc/man-db-&man-db-version; + libman.so and libmandb.so + /usr/lib/man-db, /usr/libexec/man-db, + and /usr/share/doc/man-db-&man-db-version; diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 571ac00b9..6761124d4 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -172,9 +172,9 @@ cp -av lib/lib*.so.5* /usr/lib ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, and tset libcursesw.{a,so} (symlink and linker script to libncursesw.{a,so}), libformw.{a,so}, libmenuw.{a,so}, libncurses++w.a, libncursesw.{a,so}, - libpanelw.{a,so} and their non-wide-character counterparts without "w" + libpanelw.{a,so}, and their non-wide-character counterparts without "w" in the library names. - /usr/share/tabset, /usr/share/terminfo, + /usr/share/tabset, /usr/share/terminfo, and /usr/share/doc/ncurses-&ncurses-version; @@ -259,8 +259,8 @@ cp -av lib/lib*.so.5* /usr/lib The terminfo entry-description compiler that translates a terminfo file from source format into the binary format needed for the - ncurses library routines. A terminfo file contains information on the - capabilities of a certain terminal + ncurses library routines [A terminfo file contains information on the + capabilities of a certain terminal.] tic diff --git a/chapter06/patch.xml b/chapter06/patch.xml index e75881820..6c6c6852b 100644 --- a/chapter06/patch.xml +++ b/chapter06/patch.xml @@ -79,10 +79,10 @@ patch - Modifies files according to a patch file. A patch file is + Modifies files according to a patch file [A patch file is normally a difference listing created with the diff program. By applying these differences to the original files, - patch creates the patched versions + patch creates the patched versions.] patch diff --git a/chapter06/procps.xml b/chapter06/procps.xml index a4f4b412b..b8fb4182f 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -97,7 +97,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.sofree, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop, sysctl, tload, top, uptime, vmstat, w, and watch libprocps.so - /usr/include/proc, /usr/share/doc/procps-ng-&procps-ng-version; + /usr/include/proc and /usr/share/doc/procps-ng-&procps-ng-version; diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 308d04af5..1f8c63e56 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -103,8 +103,8 @@ ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.soInstalled directories - libhistory.{a,so}, and libreadline.{a,so} - /usr/include/readline, /usr/share/readline, + libhistory.{a,so} and libreadline.{a,so} + /usr/include/readline, /usr/share/readline, and /usr/share/doc/readline-&readline-version; diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml index 25fc55a29..625b313e4 100644 --- a/chapter06/shadow.xml +++ b/chapter06/shadow.xml @@ -438,7 +438,7 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so --> nologin - Displays a message that an account is not available. Designed + Displays a message that an account is not available; it is designed to be used as the default shell for accounts that have been disabled diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml index 421eb18c7..db76b6c85 100644 --- a/chapter06/sysklogd.xml +++ b/chapter06/sysklogd.xml @@ -118,10 +118,10 @@ EOF syslogd - Logs the messages that system programs offer for logging. Every + Logs the messages that system programs offer for logging [Every logged message contains at least a date stamp and a hostname, and normally the program's name too, but that depends on how trusting the - logging daemon is told to be + logging daemon is told to bei.] syslogd diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml index 6394b4e05..33376f7c2 100644 --- a/chapter06/sysvinit.xml +++ b/chapter06/sysvinit.xml @@ -141,7 +141,7 @@ The first process to be started when the kernel has initialized the hardware which takes over the boot process and starts all the - proceses it is instructed to + proceses specified in its configuration file init @@ -152,8 +152,7 @@ killall5 Sends a signal to all processes, except the processes in its own - session so it will not kill the shell running the script that called - it + session so it will not kill its parent shell killall5 diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml index b4a5639b6..d94c049eb 100644 --- a/chapter06/texinfo.xml +++ b/chapter06/texinfo.xml @@ -117,8 +117,8 @@ popd Used to read info pages which are similar to man pages, but often go much deeper than just explaining all the available command - line options. For example, compare man bison and - info bison + line options [For example, compare man bison and + info bison.] info diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 2f3f9dd73..0b6d41d7c 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -128,9 +128,10 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check" swapoff (link to swapon), swapon, switch_root, tailf, taskset, ul, umount, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis, wipefs, and x86_64 - libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so} + libblkid.{a,so}, libmount.{a,so}, and libuuid.{a,so} /etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount, - /usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt, /var/lib/hwclock + /usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt, + and /var/lib/hwclock @@ -1013,7 +1014,7 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check" tailf - Tracks the growth of a log file. Displays the last 10 lines + Tracks the growth of a log file; displays the last 10 lines of a log file, then continues displaying any new entries in the log file as they are created diff --git a/chapter06/xz.xml b/chapter06/xz.xml index 60402cd18..77f3c298d 100644 --- a/chapter06/xz.xml +++ b/chapter06/xz.xml @@ -81,7 +81,7 @@ ln -svf ../../lib/$(readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so + xzfgrep (link to xzgrep), xzgrep, xzless, and xzmore liblzma.{a,so} /usr/include/lzma and /usr/share/doc/xz-&xz-version;