[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-2.1.0-1274-gc2102b2
git
git at cross-lfs.org
Tue Jun 24 11:47:10 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, sysvinit has been updated
via c2102b284fbf4c6f9d280a86d3ab769f90411e3f (commit)
from 0994ebdf0fb37976be650c6d209f77d4aeaeb4ee (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c2102b284fbf4c6f9d280a86d3ab769f90411e3f
Author: Chris Staub <chris at beaker67.com>
Date: Tue Jun 24 14:45:38 2014 -0400
Improve consistency in package installation lists, mainly removing 'and'
Conflicts:
BOOK/final-system/common/attr.xml
diff --git a/BOOK/final-system/common/autoconf.xml b/BOOK/final-system/common/autoconf.xml
index 004120d..ef8a5ab 100644
--- a/BOOK/final-system/common/autoconf.xml
+++ b/BOOK/final-system/common/autoconf.xml
@@ -56,7 +56,7 @@
<seglistitem>
<seg>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate,
- and ifnames</seg>
+ ifnames</seg>
<seg>/usr/share/autoconf</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/automake.xml b/BOOK/final-system/common/automake.xml
index 2331fb2..02c4312 100644
--- a/BOOK/final-system/common/automake.xml
+++ b/BOOK/final-system/common/automake.xml
@@ -54,7 +54,7 @@
<seg>aclocal, aclocal-&automake-version2;, automake,
automake-&automake-version2;, compile, config.guess, config.sub,
depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
- py-compile, symlink-tree, and ylwrap</seg>
+ py-compile, symlink-tree, ylwrap</seg>
<seg>/usr/share/aclocal-&automake-version2;,
/usr/share/automake-&automake-version2;, /usr/share/doc/automake</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/bash.xml b/BOOK/final-system/common/bash.xml
index 89c0cb6..899abbb 100644
--- a/BOOK/final-system/common/bash.xml
+++ b/BOOK/final-system/common/bash.xml
@@ -82,7 +82,7 @@
<segtitle>Installed directory</segtitle>
<seglistitem>
- <seg>bash, bashbug, and sh (link to bash)</seg>
+ <seg>bash, bashbug, sh (link to bash)</seg>
<seg>/usr/share/doc/bash-&bash-version;</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/bc.xml b/BOOK/final-system/common/bc.xml
index 478ed7b..6074777 100644
--- a/BOOK/final-system/common/bc.xml
+++ b/BOOK/final-system/common/bc.xml
@@ -50,7 +50,7 @@
<segtitle>Installed programs</segtitle>
<seglistitem>
- <seg>bc and dc</seg>
+ <seg>bc, dc</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/binutils.xml b/BOOK/final-system/common/binutils.xml
index 5af2246..df8352b 100644
--- a/BOOK/final-system/common/binutils.xml
+++ b/BOOK/final-system/common/binutils.xml
@@ -112,10 +112,9 @@ can get `Flex' from any GNU archive site.</computeroutput></screen>
<segtitle>Installed directory</segtitle>
<seglistitem>
- <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm, objcopy,
- objdump,
- ranlib, readelf, size, strings, and strip</seg>
- <seg>libbfd.[a,so], and libopcodes.[a,so]</seg>
+ <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm,
+ objcopy, objdump, ranlib, readelf, size, strings, strip</seg>
+ <seg>libbfd.[a,so], libopcodes.[a,so]</seg>
<seg>/usr/lib/ldscripts</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/bison.xml b/BOOK/final-system/common/bison.xml
index ad3762c..135e898 100644
--- a/BOOK/final-system/common/bison.xml
+++ b/BOOK/final-system/common/bison.xml
@@ -51,7 +51,7 @@
<segtitle>Installed directory</segtitle>
<seglistitem>
- <seg>bison and yacc</seg>
+ <seg>bison, yacc</seg>
<seg>liby.a</seg>
<seg>/usr/share/bison</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/bzip2.xml b/BOOK/final-system/common/bzip2.xml
index c2edb17..47f8555 100644
--- a/BOOK/final-system/common/bzip2.xml
+++ b/BOOK/final-system/common/bzip2.xml
@@ -82,9 +82,9 @@ ln -sv bzip2 /bin/bzcat</userinput></screen>
<seglistitem>
<seg>bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp (link to
bzdiff), bzdiff, bzegrep (link to bzgrep), bzfgrep (link to bzgrep),
- bzgrep, bzip2, bzip2recover, bzless (link to bzmore), and bzmore</seg>
+ bzgrep, bzip2, bzip2recover, bzless (link to bzmore), bzmore</seg>
<seg>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to
- libbz2.so.&bzip2-version;), and libbz2.so.&bzip2-version;</seg>
+ libbz2.so.&bzip2-version;), libbz2.so.&bzip2-version;</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/coreutils.xml b/BOOK/final-system/common/coreutils.xml
index f9388ea..8191d6a 100644
--- a/BOOK/final-system/common/coreutils.xml
+++ b/BOOK/final-system/common/coreutils.xml
@@ -115,7 +115,7 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
rmdir, runcon, seq, sha1sum, sha224sum, sha256sum, sha384sum,
sha512sum, shred, shuf, sleep, sort, split, stat, stdbuf, stty, sum,
sync, tac, tail, tee, test, timeout, touch, tr, true, truncate, tsort,
- tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and yes</seg>
+ tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, yes</seg>
<seg>libstdbuf.so</seg>
<seg>/usr/lib/coreutils</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/diffutils.xml b/BOOK/final-system/common/diffutils.xml
index 9ebe380..6bc9d72 100644
--- a/BOOK/final-system/common/diffutils.xml
+++ b/BOOK/final-system/common/diffutils.xml
@@ -59,7 +59,7 @@
<segtitle>Installed programs</segtitle>
<seglistitem>
- <seg>cmp, diff, diff3, and sdiff</seg>
+ <seg>cmp, diff, diff3, sdiff</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/e2fsprogs.xml b/BOOK/final-system/common/e2fsprogs.xml
index 95ce79d..064af90 100644
--- a/BOOK/final-system/common/e2fsprogs.xml
+++ b/BOOK/final-system/common/e2fsprogs.xml
@@ -111,9 +111,9 @@ cd build</userinput></screen>
e2fsck, e2image, e2initrd_helper, e2label, e2undo, e4defrag, filefrag,
fsck.ext2, fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr,
mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev,
- mklost+found, resize2fs, and tune2fs</seg>
+ mklost+found, resize2fs, tune2fs</seg>
<seg>libcom_err.[a,so], libe2p.[a,so], libext2fs.[a,so],
- libss.[a,so], and libquota.a</seg>
+ libss.[a,so], libquota.a</seg>
<seg>/usr/include/e2p, /usr/include/et, /usr/include/ext2fs,
/usr/include/quota, /usr/include/ss, /usr/share/et, /usr/share/ss</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/findutils.xml b/BOOK/final-system/common/findutils.xml
index 9928d76..755c13a 100644
--- a/BOOK/final-system/common/findutils.xml
+++ b/BOOK/final-system/common/findutils.xml
@@ -68,7 +68,7 @@
<segtitle>Installed directory</segtitle>
<seglistitem>
- <seg>bigram, code, find, frcode, locate, oldfind, updatedb, and xargs</seg>
+ <seg>bigram, code, find, frcode, locate, oldfind, updatedb, xargs</seg>
<seg>/usr/lib/locate</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/flex.xml b/BOOK/final-system/common/flex.xml
index 40828e0..2a15fa6 100644
--- a/BOOK/final-system/common/flex.xml
+++ b/BOOK/final-system/common/flex.xml
@@ -73,8 +73,8 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
<segtitle>Installed directory</segtitle>
<seglistitem>
- <seg>flex, flex++ (link to flex), and lex</seg>
- <seg>libfl.[a,so] and libfl_pic.[a,so]</seg>
+ <seg>flex, flex++ (link to flex), lex</seg>
+ <seg>libfl.[a,so], libfl_pic.[a,so]</seg>
<seg>/usr/share/doc/flex-&flex-version;</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/gawk.xml b/BOOK/final-system/common/gawk.xml
index e691846..be23dc3 100644
--- a/BOOK/final-system/common/gawk.xml
+++ b/BOOK/final-system/common/gawk.xml
@@ -57,7 +57,7 @@ cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</use
<seglistitem>
<seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk,
- pgawk, pgawk-&gawk-version;, and pwcat</seg>
+ pgawk, pgawk-&gawk-version;, pwcat</seg>
<seg>/usr/lib/awk, /usr/lib/gawk, /usr/share/awk,
/usr/share/doc/gawk-&gawk-version;</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/gcc.xml b/BOOK/final-system/common/gcc.xml
index 804c1ba..51a7fc7 100644
--- a/BOOK/final-system/common/gcc.xml
+++ b/BOOK/final-system/common/gcc.xml
@@ -133,10 +133,10 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
<segtitle>Installed directories</segtitle>
<seglistitem>
- <seg>c++, cc (link to gcc), cpp, g++, gcc, and gcov</seg>
+ <seg>c++, cc (link to gcc), cpp, g++, gcc, gcov</seg>
<seg>libasan.[a,so], libatomic.[a,so], libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a,
libgomp.[a,so], libiberty.a, libitm.[a,so], liblto_plugin.so, libmudflap.[a,so], libmudflapth.[a,so],
- libquadmath.[a,so], libssp.[a,so], libssp_nonshared.a, libstdc++.[a,so], libsupc++.a, and
+ libquadmath.[a,so], libssp.[a,so], libssp_nonshared.a, libstdc++.[a,so], libsupc++.a,
libtsan.[a,so]</seg>
<seg>/usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version;</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/gdbm.xml b/BOOK/final-system/common/gdbm.xml
index 841bbb8..7168779 100644
--- a/BOOK/final-system/common/gdbm.xml
+++ b/BOOK/final-system/common/gdbm.xml
@@ -67,7 +67,7 @@
<seglistitem>
<seg>gdbm_dump, gdbm_load, gdbmtool</seg>
- <seg>libgdbm.{a,so} and libgdbm_compat.{a,so}</seg>
+ <seg>libgdbm.{a,so}, libgdbm_compat.{a,so}</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/gettext.xml b/BOOK/final-system/common/gettext.xml
index e1d6bab..abd0277 100644
--- a/BOOK/final-system/common/gettext.xml
+++ b/BOOK/final-system/common/gettext.xml
@@ -57,9 +57,9 @@
<seg>autopoint, config.charset, config.rpath, envsubst, gettext,
gettext.sh, gettextize, hostname, msgattrib, msgcat, msgcmp, msgcomm,
msgconv, msgen, msgexec, msgfilter, msgfmt, msggrep, msginit, msgmerge,
- msgunfmt, msguniq, ngettext, recode-sr-latin, and xgettext</seg>
+ msgunfmt, msguniq, ngettext, recode-sr-latin, xgettext</seg>
<seg>libasprintf.[a,so], libgettextlib.so, libgettextpo.[a,so],
- libgettextsrc.so, and preloadable_libintl.so</seg>
+ libgettextsrc.so, preloadable_libintl.so</seg>
<seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
/usr/share/gettext</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/glibc.xml b/BOOK/final-system/common/glibc.xml
index b173e38..579c209 100644
--- a/BOOK/final-system/common/glibc.xml
+++ b/BOOK/final-system/common/glibc.xml
@@ -387,14 +387,14 @@ EOF</userinput></screen>
<seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
ldd, lddlibc4, locale, localedef, makedb, mtrace, nscd,
pcprofiledump, pldd, rpcgen, sln, sotruss, sprof, tzselect, xtrace,
- zdump, and zic</seg>
+ zdump, zic</seg>
<seg>ld.so, libBrokenLocale.[a,so], libSegFault.so, libanl.[a,so],
libc.[a,so], libc_nonshared.a, libcidn.[a,so], libcrypt.[a,so],
libdl.[a,so], libg.a, libieee.a, libm.[a,so], libmcheck.a,
libmemusage.so, libnsl.a, libnss_compat.so, libnss_dns.so,
libnss_files.so, libnss_hesiod.so, libnss_nis.so, libnss_nisplus.so,
libpcprofile.so, libpthread.[a,so], libpthread_nonshared.a,
- libresolv.[a,so], librpcsvc.a, librt.[a,so], libthread_db.so, and
+ libresolv.[a,so], librpcsvc.a, librt.[a,so], libthread_db.so,
libutil.[a,so]</seg>
<seg>/usr/include/arpa, /usr/include/bits, /usr/include/gnu,
/usr/include/net, /usr/include/netash, /usr/include/netatalk,
@@ -403,7 +403,7 @@ EOF</userinput></screen>
/usr/include/netrom, /usr/include/netrose, /usr/include/nfs,
/usr/include/protocols, /usr/include/rpc, /usr/include/rpcsvc,
/usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/glibc, /usr/lib/locale,
- /usr/share/i18n, /usr/share/zoneinfo, /var/cache/ldconfig, and
+ /usr/share/i18n, /usr/share/zoneinfo, /var/cache/ldconfig,
/var/cache/nscd</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/grep.xml b/BOOK/final-system/common/grep.xml
index 4f50aa2..dbc6ad9 100644
--- a/BOOK/final-system/common/grep.xml
+++ b/BOOK/final-system/common/grep.xml
@@ -50,7 +50,7 @@
<segtitle>Installed programs</segtitle>
<seglistitem>
- <seg>egrep, fgrep, and grep</seg>
+ <seg>egrep, fgrep, grep</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/groff.xml b/BOOK/final-system/common/groff.xml
index d8bc1a9..16e934b 100644
--- a/BOOK/final-system/common/groff.xml
+++ b/BOOK/final-system/common/groff.xml
@@ -59,7 +59,7 @@
hpftodit, indxbib, lkbib, lookbib, mmroff, neqn, nroff, pdfroff,
pfbtops, pic, pic2graph, post-grohtml, pre-grohtml, preconv, refer,
roff2dvi, roff2html, roff2pdf, roff2ps, roff2text, roff2x, soelim,
- tbl, tfmtodit, and troff</seg>
+ tbl, tfmtodit, troff</seg>
<seg>/usr/lib/groff, /usr/share/doc/groff-&groff-version;, /usr/share/groff</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/gzip.xml b/BOOK/final-system/common/gzip.xml
index fb5c48a..49f760b 100644
--- a/BOOK/final-system/common/gzip.xml
+++ b/BOOK/final-system/common/gzip.xml
@@ -56,7 +56,7 @@
<seglistitem>
<seg>gunzip, gzexe, gzip, uncompress, zcat, zcmp, zdiff,
- zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg>
+ zegrep, zfgrep, zforce, zgrep, zless, zmore, znew</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/iana-etc.xml b/BOOK/final-system/common/iana-etc.xml
index 762a319..9533626 100644
--- a/BOOK/final-system/common/iana-etc.xml
+++ b/BOOK/final-system/common/iana-etc.xml
@@ -50,7 +50,7 @@
<segtitle>Installed files</segtitle>
<seglistitem>
- <seg>/etc/protocols and /etc/services</seg>
+ <seg>/etc/protocols, /etc/services</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/iproute2.xml b/BOOK/final-system/common/iproute2.xml
index 780eaf7..f0cc396 100644
--- a/BOOK/final-system/common/iproute2.xml
+++ b/BOOK/final-system/common/iproute2.xml
@@ -59,7 +59,7 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
<seglistitem>
<seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
- and tc</seg>
+ tc</seg>
<seg>/etc/iproute2, /usr/lib/tc,
/usr/share/doc/iproute2-&iproute2-version;</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/iputils.xml b/BOOK/final-system/common/iputils.xml
index 345335d..ef51e88 100644
--- a/BOOK/final-system/common/iputils.xml
+++ b/BOOK/final-system/common/iputils.xml
@@ -55,7 +55,7 @@ install -v -m644 doc/*.8 /usr/share/man/man8</userinput></screen>
<segtitle>Installed programs</segtitle>
<seglistitem>
- <seg>clockdiff, ping, rdisc, tracepath, tracepath6, and traceroute6</seg>
+ <seg>clockdiff, ping, rdisc, tracepath, tracepath6, traceroute6</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/kbd.xml b/BOOK/final-system/common/kbd.xml
index a84da8c..5508dce 100644
--- a/BOOK/final-system/common/kbd.xml
+++ b/BOOK/final-system/common/kbd.xml
@@ -68,7 +68,7 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
(link to psfxtable), psfgettable (link to psfxtable), psfstriptable
(link to psfxtable), psfxtable, resizecons, setfont, setkeycodes,
setleds, setmetamode, setvtrgb, showconsolefont, showkey,
- unicode_start, and unicode_stop</seg>
+ unicode_start, unicode_stop</seg>
<seg>/usr/share/consolefonts, /usr/share/consoletrans,
/usr/share/doc/kbd-&kbd-version;,
/usr/share/keymaps, /usr/share/unimaps</seg>
diff --git a/BOOK/final-system/common/kmod.xml b/BOOK/final-system/common/kmod.xml
index 7eb663c..28b83ea 100644
--- a/BOOK/final-system/common/kmod.xml
+++ b/BOOK/final-system/common/kmod.xml
@@ -83,7 +83,7 @@ done</userinput></screen>
<seglistitem>
<seg>depmod (link to kmod), insmod (link to kmod), kmod,
lsmod (link to kmod), modinfo (link to kmod), modprobe (link to kmod),
- and rmmod (link to kmod) </seg>
+ rmmod (link to kmod) </seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/less.xml b/BOOK/final-system/common/less.xml
index 0f8b344..6370993 100644
--- a/BOOK/final-system/common/less.xml
+++ b/BOOK/final-system/common/less.xml
@@ -65,7 +65,7 @@
<segtitle>Installed programs</segtitle>
<seglistitem>
- <seg>less, lessecho, and lesskey</seg>
+ <seg>less, lessecho, lesskey</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/libtool.xml b/BOOK/final-system/common/libtool.xml
index c3d7ef1..10ee259 100644
--- a/BOOK/final-system/common/libtool.xml
+++ b/BOOK/final-system/common/libtool.xml
@@ -53,7 +53,7 @@
<segtitle>Installed directories</segtitle>
<seglistitem>
- <seg>libtool and libtoolize</seg>
+ <seg>libtool, libtoolize</seg>
<seg>libltdl.[a,so]</seg>
<seg>/usr/include/libltdl, /usr/share/libtool</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/ncurses.xml b/BOOK/final-system/common/ncurses.xml
index 7bb8b15..c5064e7 100644
--- a/BOOK/final-system/common/ncurses.xml
+++ b/BOOK/final-system/common/ncurses.xml
@@ -86,9 +86,9 @@ ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
<seglistitem>
<seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
- ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, and tset</seg>
+ ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, tset</seg>
<seg>libcursesw.so (link to libncursesw.so), libformw.[a,so],
- libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so], and
+ libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so],
libpanelw.[a,so]</seg>
<seg>/usr/share/tabset, /usr/share/terminfo</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/perl.xml b/BOOK/final-system/common/perl.xml
index b389e99..dc0976d 100644
--- a/BOOK/final-system/common/perl.xml
+++ b/BOOK/final-system/common/perl.xml
@@ -126,7 +126,7 @@
perldoc, perlivp, perlthanks (link to perlbug), piconv, pl2pm, pod2html,
pod2latex, pod2man, pod2text, pod2usage, podchecker, podselect, prove,
psed (link to s2p), pstruct (link to c2ph), ptar, ptardiff, ptargrep,
- s2p, shasum, splain, xsubpp, and zipdetails</seg>
+ s2p, shasum, splain, xsubpp, zipdetails</seg>
<seg>Several hundred which cannot all be listed here</seg>
<seg>/usr/lib/perl5</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/procps-ng.xml b/BOOK/final-system/common/procps-ng.xml
index c1dc3b2..7185d8d 100644
--- a/BOOK/final-system/common/procps-ng.xml
+++ b/BOOK/final-system/common/procps-ng.xml
@@ -81,7 +81,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</useri
<seglistitem>
<seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop, sysctl, tload,
- top, uptime, vmstat, w, and watch</seg>
+ top, uptime, vmstat, w, watch</seg>
<seg>libprocps.{a,so}</seg>
<seg>/usr/include/proc, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
</seglistitem>
diff --git a/BOOK/final-system/common/psmisc.xml b/BOOK/final-system/common/psmisc.xml
index 3548e9b..a92b6e5 100644
--- a/BOOK/final-system/common/psmisc.xml
+++ b/BOOK/final-system/common/psmisc.xml
@@ -48,7 +48,7 @@
<segtitle>Installed programs</segtitle>
<seglistitem>
- <seg>fuser, killall, peekfd, prtstat, pstree, and pstree.x11
+ <seg>fuser, killall, peekfd, prtstat, pstree, pstree.x11
(link to pstree)</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/readline.xml b/BOOK/final-system/common/readline.xml
index 46d1ff1..b2465de 100644
--- a/BOOK/final-system/common/readline.xml
+++ b/BOOK/final-system/common/readline.xml
@@ -65,7 +65,7 @@ rm -v /lib/lib{readline,history}.so</userinput></screen>
<segtitle>Installed directories</segtitle>
<seglistitem>
- <seg>libhistory.[a,so], and libreadline.[a,so]</seg>
+ <seg>libhistory.[a,so], libreadline.[a,so]</seg>
<seg>/usr/include/readline, /usr/share/doc/readline-&readline-version;, /usr/share/readline</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/shadow.xml b/BOOK/final-system/common/shadow.xml
index 764d8ea..33710a6 100644
--- a/BOOK/final-system/common/shadow.xml
+++ b/BOOK/final-system/common/shadow.xml
@@ -155,7 +155,7 @@ find man -name Makefile.in -exec sed -i \
groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
lastlog, login, logoutd, newgrp, newusers, passwd, pwck,
pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
- vigr (link to vipw), and vipw</seg>
+ vigr (link to vipw), vipw</seg>
<seg>/etc/default</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/tar.xml b/BOOK/final-system/common/tar.xml
index cc5dd0c..42a0399 100644
--- a/BOOK/final-system/common/tar.xml
+++ b/BOOK/final-system/common/tar.xml
@@ -64,7 +64,7 @@
<segtitle>Installed directory</segtitle>
<seglistitem>
- <seg>rmt and tar</seg>
+ <seg>rmt, tar</seg>
<seg>/usr/share/doc/tar-&tar-version;</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/texinfo.xml b/BOOK/final-system/common/texinfo.xml
index a1cec8e..7fe7973 100644
--- a/BOOK/final-system/common/texinfo.xml
+++ b/BOOK/final-system/common/texinfo.xml
@@ -67,7 +67,7 @@ popd</userinput></screen>
<seglistitem>
<seg>info, infokey, install-info, makeinfo (link to texi2any),
- pdftexi2dvi, texi2dvi, texi2pdf, and texindex</seg>
+ pdftexi2dvi, texi2dvi, texi2pdf, texindex</seg>
<seg>/usr/share/texinfo</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/util-linux.xml b/BOOK/final-system/common/util-linux.xml
index eee7f6c..5452bf7 100644
--- a/BOOK/final-system/common/util-linux.xml
+++ b/BOOK/final-system/common/util-linux.xml
@@ -106,8 +106,8 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
raw, readprofile, rename, renice, resizepart, rev, rtcwake, script,
scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
swapoff, swapon, switch_root, tailf, taskset, ul, umount, unshare,
- utmpdump, uuidd, uuidgen, wall, wdctl, whereis, wipefs, and write</seg>
- <seg>libblkid.[a,so], libmount.[a,so], and libuuid.[a,so]</seg>
+ utmpdump, uuidd, uuidgen, wall, wdctl, whereis, wipefs, write</seg>
+ <seg>libblkid.[a,so], libmount.[a,so], libuuid.[a,so]</seg>
<seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
/usr/share/bash-completion,
/usr/share/doc/util-linux-&util-linux-version;/getopt,
diff --git a/BOOK/final-system/common/vim.xml b/BOOK/final-system/common/vim.xml
index b967891..bf351a9 100644
--- a/BOOK/final-system/common/vim.xml
+++ b/BOOK/final-system/common/vim.xml
@@ -161,7 +161,7 @@ EOF</userinput></screen>
<seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
- vimdiff (link to vim), vimm, vimspell.sh, vimtutor, and xxd</seg>
+ vimdiff (link to vim), vimm, vimspell.sh, vimtutor, xxd</seg>
<seg>/usr/share/vim, /usr/share/doc/vim-&vim-version;</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/xz.xml b/BOOK/final-system/common/xz.xml
index 7efd824..2ebf7f8 100644
--- a/BOOK/final-system/common/xz.xml
+++ b/BOOK/final-system/common/xz.xml
@@ -71,7 +71,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput
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,
- and xzmore</seg>
+ xzmore</seg>
<seg>liblzma.[a,so]</seg>
<seg>/usr/include/lzma, /usr/share/doc/xz-&xz-version;</seg>
</seglistitem>
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/autoconf.xml | 2 +-
BOOK/final-system/common/automake.xml | 2 +-
BOOK/final-system/common/bash.xml | 2 +-
BOOK/final-system/common/bc.xml | 2 +-
BOOK/final-system/common/binutils.xml | 7 +++----
BOOK/final-system/common/bison.xml | 2 +-
BOOK/final-system/common/bzip2.xml | 4 ++--
BOOK/final-system/common/coreutils.xml | 2 +-
BOOK/final-system/common/diffutils.xml | 2 +-
BOOK/final-system/common/e2fsprogs.xml | 4 ++--
BOOK/final-system/common/findutils.xml | 2 +-
BOOK/final-system/common/flex.xml | 4 ++--
BOOK/final-system/common/gawk.xml | 2 +-
BOOK/final-system/common/gcc.xml | 4 ++--
BOOK/final-system/common/gdbm.xml | 2 +-
BOOK/final-system/common/gettext.xml | 4 ++--
BOOK/final-system/common/glibc.xml | 6 +++---
BOOK/final-system/common/grep.xml | 2 +-
BOOK/final-system/common/groff.xml | 2 +-
BOOK/final-system/common/gzip.xml | 2 +-
BOOK/final-system/common/iana-etc.xml | 2 +-
BOOK/final-system/common/iproute2.xml | 2 +-
BOOK/final-system/common/iputils.xml | 2 +-
BOOK/final-system/common/kbd.xml | 2 +-
BOOK/final-system/common/kmod.xml | 2 +-
BOOK/final-system/common/less.xml | 2 +-
BOOK/final-system/common/libtool.xml | 2 +-
BOOK/final-system/common/ncurses.xml | 4 ++--
BOOK/final-system/common/perl.xml | 2 +-
BOOK/final-system/common/procps-ng.xml | 2 +-
BOOK/final-system/common/psmisc.xml | 2 +-
BOOK/final-system/common/readline.xml | 2 +-
BOOK/final-system/common/shadow.xml | 2 +-
BOOK/final-system/common/tar.xml | 2 +-
BOOK/final-system/common/texinfo.xml | 2 +-
BOOK/final-system/common/util-linux.xml | 4 ++--
BOOK/final-system/common/vim.xml | 2 +-
BOOK/final-system/common/xz.xml | 2 +-
38 files changed, 49 insertions(+), 50 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list