aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter06/autoconf.xml8
-rw-r--r--chapter06/automake.xml6
-rw-r--r--chapter06/binutils.xml17
-rw-r--r--chapter06/coreutils.xml4
-rw-r--r--chapter06/dbus.xml2
-rw-r--r--chapter06/e2fsprogs.xml22
-rw-r--r--chapter06/gawk.xml2
-rw-r--r--chapter06/gcc.xml17
-rw-r--r--chapter06/gettext.xml2
-rw-r--r--chapter06/glibc.xml6
-rw-r--r--chapter06/groff.xml2
-rw-r--r--chapter06/intltool.xml2
-rw-r--r--chapter06/iproute2.xml10
-rw-r--r--chapter06/kbd.xml6
-rw-r--r--chapter06/libtool.xml2
-rw-r--r--chapter06/linux-headers.xml4
-rw-r--r--chapter06/m4.xml4
-rw-r--r--chapter06/man-db.xml5
-rw-r--r--chapter06/ncurses.xml8
-rw-r--r--chapter06/patch.xml4
-rw-r--r--chapter06/procps.xml2
-rw-r--r--chapter06/readline.xml4
-rw-r--r--chapter06/shadow.xml2
-rw-r--r--chapter06/systemd.xml2
-rw-r--r--chapter06/texinfo.xml4
-rw-r--r--chapter06/util-linux.xml7
-rw-r--r--chapter06/xz.xml2
27 files changed, 67 insertions, 89 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 @@
<term><command>autoconf</command></term>
<listitem>
<para>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&mdash;running
+ source code packages to adapt to many kinds of Unix-like systems;
+ the configuration scripts it produces are independent&mdash;running
them does not require the <command>autoconf</command> program</para>
<indexterm zone="ch-system-autoconf autoconf">
<primary sortas="b-autoconf">autoconf</primary>
@@ -164,11 +164,11 @@
<listitem>
<para>Helps when writing <filename>configure.in</filename> 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
<command>configure</command> needs to check for. It can also fill in
gaps in a <filename>configure.in</filename> file generated by
- <command>autoscan</command></para>
+ <command>autoscan</command>.]</para>
<indexterm zone="ch-system-autoconf ifnames">
<primary sortas="b-ifnames">ifnames</primary>
</indexterm>
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</userinput></screen>
automake-&am-minor-version;, compile, config.guess, config.sub,
depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
py-compile, and ylwrap</seg>
- <seg>/usr/share/aclocal-&am-minor-version;, /usr/share/automake-&am-minor-version;,
+ <seg>/usr/share/aclocal-&am-minor-version;, /usr/share/automake-&am-minor-version;, and
/usr/share/doc/automake-&automake-version;</seg>
</seglistitem>
</segmentedlist>
@@ -113,12 +113,12 @@ make -j4 check</userinput></screen>
<listitem>
<para>A tool for automatically generating
<filename>Makefile.in</filename> files from
- <filename>Makefile.am</filename> files. To create all the
+ <filename>Makefile.am</filename> files [To create all the
<filename>Makefile.in</filename> files for a package, run this program
in the top-level directory. By scanning the
<filename>configure.in</filename> file, it automatically finds each
appropriate <filename>Makefile.am</filename> file and generates the
- corresponding <filename>Makefile.in</filename> file</para>
+ corresponding <filename>Makefile.in</filename> file.]</para>
<indexterm zone="ch-system-automake automake">
<primary sortas="b-automake">automake</primary>
</indexterm>
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</userinput></screen>
<seglistitem>
<seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm,
objcopy, objdump, ranlib, readelf, size, strings, and strip</seg>
- <seg><!--libiberty.a,--> libbfd.{a,so}, and libopcodes.{a,so}</seg>
+ <seg>libbfd.{a,so} and libopcodes.{a,so}</seg>
<seg>/usr/lib/ldscripts</seg>
</seglistitem>
</segmentedlist>
@@ -315,20 +315,7 @@ cd ../binutils-build</userinput></screen>
</indexterm>
</listitem>
</varlistentry>
-<!--
- <varlistentry id="libiberty">
- <term><filename class="libraryfile">libiberty</filename></term>
- <listitem>
- <para>Contains routines used by various GNU programs, including
- <command>getopt</command>, <command>obstack</command>,
- <command>strerror</command>, <command>strtol</command>, and
- <command>strtoul</command></para>
- <indexterm zone="ch-system-binutils libiberty">
- <primary sortas="c-libiberty">libiberty</primary>
- </indexterm>
- </listitem>
- </varlistentry>
--->
+
<varlistentry id="libbfd">
<term><filename class="libraryfile">libbfd</filename></term>
<listitem>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 4d786cd70..003ddf9ff 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -605,8 +605,8 @@ sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8</userinput></screen>
<varlistentry id="mkfifo">
<term><command>mkfifo</command></term>
<listitem>
- <para>Creates First-In, First-Outs (FIFOs), a <quote>named
- pipe</quote> in UNIX parlance, with the given names</para>
+ <para>Creates First-In, First-Outs (FIFOs), a "named
+ pipe" in UNIX parlance, with the given names</para>
<indexterm zone="ch-system-coreutils mkfifo">
<primary sortas="b-mkfifo">mkfifo</primary>
</indexterm>
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index 9df74a631..00579d312 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -109,7 +109,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
<seg>libdbus-1.{a,so}</seg>
<seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0,
/usr/share/dbus-1, /usr/share/doc/dbus-&dbus-version;,
- /var/lib/dbus</seg>
+ and /var/lib/dbus</seg>
</seglistitem>
</segmentedlist>
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.info</userin
<seg>libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so},
libquota.a, and libss.{a,so}</seg>
<seg>/usr/include/e2p, /usr/include/et, /usr/include/ext2fs,
- /usr/include/quota, /usr/include/ss, /usr/share/et, /usr/share/ss</seg>
+ /usr/include/quota, /usr/include/ss, /usr/share/et, and /usr/share/ss</seg>
</seglistitem>
</segmentedlist>
@@ -294,8 +294,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
<term><command>e2undo</command></term>
<listitem>
<para>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</para>
+ found on a device [This can be used to undo a failed operation by an
+ e2fsprogs program.]</para>
<indexterm zone="ch-system-e2fsprogs e2undo">
<primary sortas="b-e2undo">e2undo</primary>
</indexterm>
@@ -326,7 +326,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
<term><command>fsck.ext2</command></term>
<listitem>
<para>By default checks <systemitem class="filesystem">ext2</systemitem>
- file systems. This is a hard link to <command>e2fsck</command></para>
+ file systems and is a hard link to <command>e2fsck</command></para>
<indexterm zone="ch-system-e2fsprogs fsck.ext2">
<primary sortas="b-fsck.ext2">fsck.ext2</primary>
</indexterm>
@@ -337,7 +337,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
<term><command>fsck.ext3</command></term>
<listitem>
<para>By default checks <systemitem class="filesystem">ext3</systemitem>
- file systems. This is a hard link to <command>e2fsck</command></para>
+ file systems and is a hard link to <command>e2fsck</command></para>
<indexterm zone="ch-system-e2fsprogs fsck.ext3">
<primary sortas="b-fsck.ext3">fsck.ext3</primary>
</indexterm>
@@ -348,7 +348,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
<term><command>fsck.ext4</command></term>
<listitem>
<para>By default checks <systemitem class="filesystem">ext4</systemitem>
- file systems. This is a hard link to <command>e2fsck</command></para>
+ file systems and is a hard link to <command>e2fsck</command></para>
<indexterm zone="ch-system-e2fsprogs fsck.ext4">
<primary sortas="b-fsck.ext4">fsck.ext4</primary>
</indexterm>
@@ -359,7 +359,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
<term><command>fsck.ext4dev</command></term>
<listitem>
<para>By default checks <systemitem class="filesystem">ext4</systemitem>
- development file systems. This is a hard link to
+ development file systems and is a hard link to
<command>e2fsck</command></para>
<indexterm zone="ch-system-e2fsprogs fsck.ext4dev">
<primary sortas="b-fsck.ext4dev">fsck.ext4dev</primary>
@@ -416,7 +416,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
<term><command>mkfs.ext2</command></term>
<listitem>
<para>By default creates <systemitem class="filesystem">ext2</systemitem>
- file systems. This is a hard link to <command>mke2fs</command></para>
+ file systems and is a hard link to <command>mke2fs</command></para>
<indexterm zone="ch-system-e2fsprogs mkfs.ext2">
<primary sortas="b-mkfs.ext2">mkfs.ext2</primary>
</indexterm>
@@ -427,7 +427,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
<term><command>mkfs.ext3</command></term>
<listitem>
<para>By default creates <systemitem class="filesystem">ext3</systemitem>
- file systems. This is a hard link to <command>mke2fs</command></para>
+ file systems and is a hard link to <command>mke2fs</command></para>
<indexterm zone="ch-system-e2fsprogs mkfs.ext3">
<primary sortas="b-mkfs.ext3">mkfs.ext3</primary>
</indexterm>
@@ -438,7 +438,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
<term><command>mkfs.ext4</command></term>
<listitem>
<para>By default creates <systemitem class="filesystem">ext4</systemitem>
- file systems. This is a hard link to <command>mke2fs</command></para>
+ file systems and is a hard link to <command>mke2fs</command></para>
<indexterm zone="ch-system-e2fsprogs mkfs.ext4">
<primary sortas="b-mkfs.ext4">mkfs.ext4</primary>
</indexterm>
@@ -449,7 +449,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
<term><command>mkfs.ext4dev</command></term>
<listitem>
<para>By default creates <systemitem class="filesystem">ext4</systemitem>
- development file systems. This is a hard link to <command>mke2fs</command></para>
+ development file systems and is a hard link to <command>mke2fs</command></para>
<indexterm zone="ch-system-e2fsprogs mkfs.ext4dev">
<primary sortas="b-mkfs.ext4dev">mkfs.ext4dev</primary>
</indexterm>
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;</
<seg>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</seg>
- <seg>/usr/lib/gawk, /usr/libexec/awk, /usr/share/awk,
+ <seg>/usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, and
/usr/share/doc/gawk-&gawk-version;</seg>
</seglistitem>
</segmentedlist>
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</userinput></screen>
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}</seg>
+ libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a, and libtsan.{a,so}</seg>
- <seg>/usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc,
+ <seg>/usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc, and
/usr/share/gcc-&gcc-version;</seg>
</seglistitem>
</segmentedlist>
@@ -492,18 +492,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
</indexterm>
</listitem>
</varlistentry>
-<!--
- <varlistentry id="libmudflap">
- <term><filename class="libraryfile">libmudflap</filename></term>
- <listitem>
- <para>Contains routines that support GCC's bounds checking
- functionality</para>
- <indexterm zone="ch-system-gcc libmudflap">
- <primary sortas="c-libmudflap*">libmudflap*</primary>
- </indexterm>
- </listitem>
- </varlistentry>
--->
+
<varlistentry id="libquadmath">
<term><filename class="libraryfile">libquadmath</filename></term>
<listitem>
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</seg>
<seg>libasprintf.{a,so}, libgettextlib.so, libgettextpo.{a,so},
libgettextsrc.so, and preloadable_libintl.so</seg>
- <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
+ <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;, and
/usr/share/gettext</seg>
</seglistitem>
</segmentedlist>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 2c5488e81..aa7a0f986 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -300,8 +300,8 @@ unset ZONEINFO</userinput></screen>
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 <filename class="directory">posix</filename>
- directory, but some applications or test-suites might give less good
- results</para>
+ directory, but some applications or test-suites might produce some
+ failures.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -422,7 +422,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
/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</seg>
+ /var/cache/nscd, and /var/lib/nss_db</seg>
</seglistitem>
</segmentedlist>
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</seg>
- <seg>/usr/lib/groff, /usr/share/doc/groff-&groff-version;,
+ <seg>/usr/lib/groff and /usr/share/doc/groff-&groff-version;,
/usr/share/groff</seg>
</seglistitem>
</segmentedlist>
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
<seglistitem>
<seg>intltool-extract, intltool-merge, intltool-prepare,
intltool-update, and intltoolize</seg>
- <seg>/usr/share/doc/intltool-&intltool-version;,
+ <seg>/usr/share/doc/intltool-&intltool-version; and
/usr/share/intltool</seg>
</seglistitem>
</segmentedlist>
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</userinput></screen>
nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
and tc</seg>
<seg>/etc/iproute2, /usr/lib/tc, /usr/share/doc/iproute2-&iproute2-version;,
- /usr/lib/tc</seg>
+ and /usr/lib/tc</seg>
</seglistitem>
</segmentedlist>
@@ -131,10 +131,10 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
<varlistentry id="ifcfg">
<term><command>ifcfg</command></term>
<listitem>
- <para>A shell script wrapper for the <command>ip</command> command.
- Note that it requires the <command>arping</command> and
+ <para>A shell script wrapper for the <command>ip</command> command
+ [Note that it requires the <command>arping</command> and
<command>rdisk</command> programs from the
- iputils package found at <ulink url="http://www.skbuff.net/iputils/"/></para>
+ iputils package found at <ulink url="http://www.skbuff.net/iputils/"/>.]</para>
<indexterm zone="ch-system-iproute2 ifcfg">
<primary sortas="b-ifcfg">ifcfg</primary>
</indexterm>
@@ -193,7 +193,7 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
<varlistentry id="lnstat">
<term><command>lnstat</command></term>
<listitem>
- <para>Provides Linux network statistics. It is a generalized and more
+ <para>Provides Linux network statistics; it is a generalized and more
feature-complete replacement for the old <command>rtstat</command>
program</para>
<indexterm zone="ch-system-iproute2 lnstat">
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;</userinput></screen>
setfont, setkeycodes, setleds, setmetamode,
showconsolefont, showkey, unicode_start, and unicode_stop</seg>
<seg>/usr/share/consolefonts, /usr/share/consoletrans, /usr/share/keymaps,
- /usr/share/unimaps</seg>
+ and /usr/share/unimaps</seg>
</seglistitem>
</segmentedlist>
@@ -385,9 +385,9 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
<varlistentry id="unicode_start">
<term><command>unicode_start</command></term>
<listitem>
- <para>Puts the keyboard and console in UNICODE mode. Don't use this
+ <para>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</para>
+ other encodings, this utility produces incorrect results.]</para>
<indexterm zone="ch-system-kbd unicode_start">
<primary sortas="b-unicode_start">unicode_start</primary>
</indexterm>
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 @@
<seglistitem>
<seg>libtool and libtoolize</seg>
<seg>libltdl.{a,so}</seg>
- <seg>/usr/include/libltdl, /usr/share/libtool</seg>
+ <seg>/usr/include/libltdl and /usr/share/libtool</seg>
</seglistitem>
</segmentedlist>
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
<seg>/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</seg>
+ /usr/include/video/*.h, and /usr/include/xen/*.h</seg>
<seg>/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</seg>
+ /usr/include/scsi, /usr/include/sound, /usr/include/video, and /usr/include/xen</seg>
</seglistitem>
</segmentedlist>
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 @@
<term><command>m4 </command></term>
<listitem>
<para>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,
<command>m4</command> has built-in functions for including named
files, running Unix commands, performing integer arithmetic,
manipulating text, recursion, etc. The <command>m4</command> program
can be used either as a front-end to a compiler or as a macro processor
- in its own right</para>
+ in its own right.]</para>
<indexterm zone="ch-system-m4 m4">
<primary sortas="b-m4">m4</primary>
</indexterm>
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 9ebe6caef..84d932df0 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -284,8 +284,9 @@
<seglistitem>
<seg>accessdb, apropos (link to whatis), catman, lexgrog, man, mandb,
manpath, whatis, and zsoelim</seg>
- <seg>libman.so, libmandb.so</seg>
- <seg>/usr/lib/man-db, /usr/libexec/man-db, /usr/share/doc/man-db-&man-db-version;</seg>
+ <seg>libman.so and libmandb.so</seg>
+ <seg>/usr/lib/man-db, /usr/libexec/man-db,
+ and /usr/share/doc/man-db-&man-db-version;</seg>
</seglistitem>
</segmentedlist>
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</userinput></screen>
ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, and tset</seg>
<seg>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.</seg>
- <seg>/usr/share/tabset, /usr/share/terminfo,
+ <seg>/usr/share/tabset, /usr/share/terminfo, and
/usr/share/doc/ncurses-&ncurses-version;</seg>
</seglistitem>
</segmentedlist>
@@ -259,8 +259,8 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
<listitem>
<para>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</para>
+ ncurses library routines [A terminfo file contains information on the
+ capabilities of a certain terminal.]</para>
<indexterm zone="ch-system-ncurses tic">
<primary sortas="b-tic">tic</primary>
</indexterm>
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 @@
<varlistentry id="patch">
<term><command>patch</command></term>
<listitem>
- <para>Modifies files according to a patch file. A patch file is
+ <para>Modifies files according to a patch file [A patch file is
normally a difference listing created with the <command>diff</command>
program. By applying these differences to the original files,
- <command>patch</command> creates the patched versions</para>
+ <command>patch</command> creates the patched versions.]</para>
<indexterm zone="ch-system-patch patch">
<primary sortas="b-patch">patch</primary>
</indexterm>
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.so</useri
<seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop,
sysctl, tload, top, uptime, vmstat, w, and watch</seg>
<seg>libprocps.so</seg>
- <seg>/usr/include/proc, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
+ <seg>/usr/include/proc and /usr/share/doc/procps-ng-&procps-ng-version;</seg>
</seglistitem>
</segmentedlist>
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.so</us
<segtitle>Installed directories</segtitle>
<seglistitem>
- <seg>libhistory.{a,so}, and libreadline.{a,so}</seg>
- <seg>/usr/include/readline, /usr/share/readline,
+ <seg>libhistory.{a,so} and libreadline.{a,so}</seg>
+ <seg>/usr/include/readline, /usr/share/readline, and
/usr/share/doc/readline-&readline-version;</seg>
</seglistitem>
</segmentedlist>
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</userinput></screen> -->
<varlistentry id="nologin">
<term><command>nologin</command></term>
<listitem>
- <para>Displays a message that an account is not available. Designed
+ <para>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</para>
<indexterm zone="ch-system-shadow nologin">
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 101918a85..a22c51b18 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -244,7 +244,7 @@ make LD_LIBRARY_PATH=/tools/lib -k check</userinput></screen>
/usr/lib/binfmt.d, /usr/lib/kernel, /usr/lib/modules-load.d,
/usr/lib/sysctl.d, /usr/lib/systemd, /usr/lib/tmpfiles.d,
/usr/share/doc/systemd-&systemd-version;, /usr/share/factory,
- /usr/share/systemd, /var/lib/systemd, /var/log/journal</seg>
+ /usr/share/systemd, /var/lib/systemd, and /var/log/journal</seg>
</seglistitem>
</segmentedlist>
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</userinput></screen>
<listitem>
<para>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 <command>man bison</command> and
- <command>info bison</command></para>
+ line options [For example, compare <command>man bison</command> and
+ <command>info bison</command>.]</para>
<indexterm zone="ch-system-texinfo info">
<primary sortas="b-info">info</primary>
</indexterm>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 9689c3440..225d0e4a2 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -126,9 +126,10 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
swapoff (link to swapon), swapon, switch_root, tailf, taskset, ul,
umount, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis,
wipefs, and x86_64</seg>
- <seg>libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so}</seg>
+ <seg>libblkid.{a,so}, libmount.{a,so}, and libuuid.{a,so}</seg>
<seg>/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</seg>
+ /usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt,
+ and /var/lib/hwclock</seg>
</seglistitem>
</segmentedlist>
@@ -1011,7 +1012,7 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
<varlistentry id="tailf">
<term><command>tailf</command></term>
<listitem>
- <para>Tracks the growth of a log file. Displays the last 10 lines
+ <para>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</para>
<indexterm zone="ch-system-util-linux tailf">
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</userinput
lzmadec, lzmainfo, lzmore (link to xzmore),
unlzma (link to xz), unxz, (link to xz), xz, xzcat (link to xz),
xzcmp (link to xzdiff), xzdec, xzdiff, xzegrep (link to xzgrep),
- xzfgrep (link to xzgrep), xzgrep, xzless, xzmore</seg>
+ xzfgrep (link to xzgrep), xzgrep, xzless, and xzmore</seg>
<seg>liblzma.{a,so}</seg>
<seg>/usr/include/lzma and /usr/share/doc/xz-&xz-version;</seg>
</seglistitem>