Update various packages' list of installed programs and libraries. Many thanks to Chris Staub for the patch. Fixes #2371.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8870 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

16 files changed, 357 insertions, 85 deletions

diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index 8900da74c..779f3702e 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -149,16 +149,6 @@ ln -sv bzip2 /bin/bzcat</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="bzgrep">
-        <term><command>bzgrep</command></term>
-        <listitem>
-          <para>Runs <command>grep</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzgrep">
-            <primary sortas="b-bzgrep">bzgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="bzegrep">
         <term><command>bzegrep</command></term>
         <listitem>
@@ -179,6 +169,16 @@ ln -sv bzip2 /bin/bzcat</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="bzgrep">
+        <term><command>bzgrep</command></term>
+        <listitem>
+          <para>Runs <command>grep</command> on bzipped files</para>
+          <indexterm zone="ch-system-bzip2 bzgrep">
+            <primary sortas="b-bzgrep">bzgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="bzip2">
         <term><command>bzip2</command></term>
         <listitem>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 3334e96b3..04c0e6d9f 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -144,16 +144,16 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>base64, basename, cat, chgrp, chcon, chmod, chown, chroot, cksum,
+        <seg>base64, basename, cat, chcon, chgrp, chmod, chown, chroot, cksum,
         comm, cp, csplit, cut, date, dd, df, dir, dircolors, dirname, du, echo,
         env, expand, expr, factor, false, fmt, fold, groups, head, hostid,
         id, install, join, link, ln, logname, ls, md5sum, mkdir, mkfifo, mknod,
         mktemp, mv, nice, nl, nohup, od, paste, pathchk, pinky, pr, printenv,
         printf, ptx, pwd, readlink, rm, rmdir, runcon, seq, sha1sum, sha224sum,
         sha256sum, sha384sum, sha512sum, shred, shuf, sleep, sort, split, stat,
-        stty, sum, sync, tac, tail, tee, test, touch, tr, true, truncate, tsort,
-        tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and
-        yes</seg>
+        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>
       </seglistitem>
     </segmentedlist>
 
@@ -196,7 +196,7 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
       <varlistentry id="chcon">
         <term><command>chcon</command></term>
         <listitem>
-          <para>Changes the security context of a file</para>
+          <para>Changes security context for files and directories</para>
           <indexterm zone="ch-system-coreutils chcon">
             <primary sortas="b-chcon">chcon</primary>
           </indexterm>
@@ -786,7 +786,7 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
       <varlistentry id="runcon">
         <term><command>runcon</command></term>
         <listitem>
-          <para>Runs a command with a specified security context</para>
+          <para>Runs a command with specified security context</para>
           <indexterm zone="ch-system-coreutils runcon">
             <primary sortas="b-runcon">runcon</primary>
           </indexterm>
@@ -990,6 +990,16 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="timeout">
+        <term><command>timeout</command></term>
+        <listitem>
+          <para>Runs a command with a time limit</para>
+          <indexterm zone="ch-system-coreutils timeout">
+            <primary sortas="b-timeout">timeout</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="touch">
         <term><command>touch</command></term>
         <listitem>
@@ -1027,8 +1037,7 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
       <varlistentry id="truncate">
         <term><command>truncate</command></term>
         <listitem>
-          <para>Shrinks or extends the size of a file to the specified
-          size</para>
+          <para>Shrinks or expands a file to the specified size</para>
           <indexterm zone="ch-system-coreutils truncate">
             <primary sortas="b-truncate">truncate</primary>
           </indexterm>
diff --git a/chapter06/db.xml b/chapter06/db.xml
index d54322358..0a899962b 100644
--- a/chapter06/db.xml
+++ b/chapter06/db.xml
@@ -135,7 +135,7 @@
         <seg>db_archive, db_checkpoint, db_codegen, db_deadlock, db_dump,
         db_hotbackup, db_load, db_printlog, db_recover, db_stat, db_upgrade, and
         db_verify</seg>
-        <seg>libdb.{so,ar}and libdb_cxx.r{o,ar}</seg>
+        <seg>libdb.{a,so}and libdb_cxx.{a,so}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -169,7 +169,7 @@
         <listitem>
           <para>Generates application code to create and configure Berkeley DB
           database environments and databases based on a simple description
-          language.</para>
+          language, and writes it to one or more output files</para>
           <indexterm zone="ch-system-db db_codegen">
             <primary sortas="b-db_codegen">db_codegen</primary>
           </indexterm>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 7f8514871..c22f26243 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -146,9 +146,9 @@ install -v -m644 -D ../doc/libblkid.txt \
 
       <seglistitem>
         <seg>badblocks, blkid, chattr, compile_et, debugfs, dumpe2fs, e2fsck,
-        e2image, e2label, e2undo, filefrag, findfs, fsck, fsck.ext2, fsck.ext3, 
-        fsck.ext4, fsck.ext4dev, logsave, lsattr,
-        mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, fsck.ext4, fsck.ext4dev, 
+        e2image, e2initrd_helper, e2label, e2undo, filefrag, findfs, fsck,
+        fsck.ext2, fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr,
+        mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev,
         mklost+found, resize2fs, tune2fs, uuidd, and uuidgen.</seg>
         <seg>libblkid.{a,so}, libcom_err.{a,so}, libe2p.{a,so},
         libext2fs.{a,so}, libss.{a,so}, and libuuid.{a,so}</seg>
@@ -254,6 +254,17 @@ install -v -m644 -D ../doc/libblkid.txt \
         </listitem>
       </varlistentry>
 
+      <varlistentry id="e2initrd_helper">
+        <term><command>e2initrd_helper</command></term>
+        <listitem>
+          <para>Prints the FS type of a given filesystem, given either a
+          device name or label</para>
+          <indexterm zone="ch-system-e2fsprogs e2initrd_helper">
+            <primary sortas="b-e2initrd_helper">e2initrd_helper</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="e2label">
         <term><command>e2label</command></term>
         <listitem>
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index bf3548340..e90b5eeae 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -92,7 +92,7 @@ sed -i 's/find:=${BINDIR}/find:=\/bin/' /usr/bin/updatedb</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>bigram, code, find, frcode, locate, updatedb, and xargs</seg>
+        <seg>bigram, code, find, frcode, locate, oldfind, updatedb, and xargs</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -157,6 +157,16 @@ sed -i 's/find:=${BINDIR}/find:=\/bin/' /usr/bin/updatedb</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="oldfind">
+        <term><command>oldfind</command></term>
+        <listitem>
+          <para>Older version of find, using a different algorithm</para>
+          <indexterm zone="ch-system-findutils oldfind">
+            <primary sortas="b-oldfind">oldfind</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="updatedb">
       <term><command>updatedb</command></term>
         <listitem>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index f31aecbe2..bb6484912 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -98,11 +98,11 @@ cp    -v doc/flex.pdf \
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
+      <segtitle>Installed libraries</segtitle>
 
       <seglistitem>
         <seg>flex and lex</seg>
-        <seg>libfl.a</seg>
+        <seg>libfl.a and libfl_pic.a</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 77181e12c..dc4e01ede 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -280,8 +280,9 @@ SEARCH_DIR("/usr/lib");</computeroutput></screen>
 
       <seglistitem>
         <seg>c++, cc (link to gcc), cpp, g++, gcc, gccbug, and gcov</seg>
-        <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libmudflap.{a,so},
-        libssp.{a,so}, libstdc++.{a,so}, and libsupc++.a</seg>
+        <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a, libgomp.{a,so},
+        libmudflap.{a,so}, libmudflapth.{a,so}, libssp.{a,so},
+        libssp_nonshared.a, libstdc++.{a,so} and libsupc++.a</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -372,6 +373,28 @@ SEARCH_DIR("/usr/lib");</computeroutput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="libgcov">
+        <term><filename class="libraryfile">libgcov</filename></term>
+        <listitem>
+          <para>This library is linked in to a program when GCC is instructed
+          to enable profiling</para>
+          <indexterm zone="ch-system-gcc libgcov">
+            <primary sortas="c-libgcov">libgcov</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgomp">
+        <term><filename class="libraryfile">libgomp</filename></term>
+        <listitem>
+          <para>GNU implementation of the OpenMP API for multi-platform
+          shared-memory parallel programming in C/C++ and Fortran</para>
+          <indexterm zone="ch-system-gcc libgomp">
+            <primary sortas="c-libgomp">libgomp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libmudflap">
         <term><filename class="libraryfile">libmudflap</filename></term>
         <listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 2d55510f6..9ddb9bd58 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -377,11 +377,12 @@ EOF</userinput></screen>
         pt_chown, rpcgen, rpcinfo, sln, sprof, tzselect, xtrace,
         zdump, and zic</seg>
         <seg>ld.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
-        libbsd-compat.a, libc.{a,so}, libcidn.so, libcrypt.{a,so}, libdl.{a,so},
-        libg.a, libieee.a, libm.{a,so}, libmcheck.a, libmemusage.so,
-        libnsl.{a,so},  libnss_compat.so, libnss_dns.so, libnss_files.so,
-        libnss_hesiod.so, libnss_nis.so, libnss_nisplus.so, libpcprofile.so,
-        libpthread.{a,so}, libresolv.{a,so}, librpcsvc.a, librt.{a,so},
+        libbsd-compat.a, libc.{a,so}, libc_nonshared.a, libcidn.so,
+        libcrypt.{a,so}, libdl.{a,so}, libg.a, libieee.a, libm.{a,so},
+        libmcheck.a, libmemusage.so, libnsl.{a,so}, 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 libutil.{a,so}</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index b4c73666e..232496d4e 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -88,11 +88,13 @@ ln -sv tbl /usr/bin/gtbl</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>addftinfo, afmtodit, eqn, eqn2graph, geqn (link to eqn), grn,
-        grodvi, groff, groffer, grog, grolbp, grolj4, grops, grotty, gtbl
-        (link to tbl), hpftodit, indxbib, lkbib, lookbib, mmroff, neqn,
-        nroff, pfbtops, pic, pic2graph, post-grohtml, pre-grohtml, refer,
-        soelim, tbl, tfmtodit, and troff</seg>
+        <seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk,
+        geqn (link to eqn), grap2graph, grn, grodvi, groff, groffer, grog,
+        grolbp, grolj4, grops, grotty, gtbl (link to tbl), hpftodit,
+        indxbib, lkbib, lookbib, mmroff, neqn, nroff, pdfroff, pfbtops, pic,
+        pic2graph, post-grohtml, preconv, pre-grohtml, refer, roff2dvi,
+        roff2html, roff2pdf, roff2ps, roff2text, roff2x, soelim, tbl, tfmtodit,
+        and troff</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -123,6 +125,16 @@ ln -sv tbl /usr/bin/gtbl</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="chem">
+        <term><command>chem</command></term>
+        <listitem>
+          <para>Groff preprocessor for producing chemical structure diagrams</para>
+          <indexterm zone="ch-system-groff chem">
+            <primary sortas="b-chem">chem</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="eqn">
         <term><command>eqn</command></term>
         <listitem>
@@ -145,6 +157,16 @@ ln -sv tbl /usr/bin/gtbl</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="gdiffmk">
+        <term><command>gdiffmk</command></term>
+        <listitem>
+          <para>Marks differences between groff/nroff/troff files</para>
+          <indexterm zone="ch-system-groff gdiffmk">
+            <primary sortas="b-gdiffmk">gdiffmk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="geqn">
         <term><command>geqn</command></term>
         <listitem>
@@ -155,6 +177,16 @@ ln -sv tbl /usr/bin/gtbl</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="grap2graph">
+        <term><command>grap2graph</command></term>
+        <listitem>
+          <para>Converts a grap diagram into a cropped bitmap image</para>
+          <indexterm zone="ch-system-groff grap2graph">
+            <primary sortas="b-grap2graph">grap2graph</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grn">
         <term><command>grn</command></term>
         <listitem>
@@ -348,6 +380,16 @@ ln -sv tbl /usr/bin/gtbl</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="pdfroff">
+        <term><command>pdfroff</command></term>
+        <listitem>
+          <para>Creates pdf documents using groff</para>
+          <indexterm zone="ch-system-groff pdfroff">
+            <primary sortas="b-pdfroff">pdfroff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="pfbtops">
         <term><command>pfbtops</command></term>
         <listitem>
@@ -392,6 +434,17 @@ ln -sv tbl /usr/bin/gtbl</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="preconv">
+        <term><command>preconv</command></term>
+        <listitem>
+          <para>Converts encoding of input files to something GNU
+          <command>troff</command> understands</para>
+          <indexterm zone="ch-system-groff preconv">
+            <primary sortas="b-pdfroff">preconv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="pre-grohtml">
         <term><command>pre-grohtml </command></term>
         <listitem>
@@ -417,6 +470,66 @@ ln -sv tbl /usr/bin/gtbl</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="roff2dvi">
+        <term><command>roff2dvi</command></term>
+        <listitem>
+          <para>Transforms roff files into DVI format</para>
+          <indexterm zone="ch-system-groff roff2dvi">
+            <primary sortas="b-roff2dvi">roff2dvi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="roff2html">
+        <term><command>roff2html</command></term>
+        <listitem>
+          <para>Transforms roff files into HTML format</para>
+          <indexterm zone="ch-system-groff roff2html">
+            <primary sortas="b-roff2html">roff2html</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="roff2pdf">
+        <term><command>roff2pdf</command></term>
+        <listitem>
+          <para>Transforms roff files into PDFs</para>
+          <indexterm zone="ch-system-groff roff2pdf">
+            <primary sortas="b-roff2pdf">roff2pdf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="roff2ps">
+        <term><command>roff2ps</command></term>
+        <listitem>
+          <para>Transforms roff files into ps files</para>
+          <indexterm zone="ch-system-groff roff2ps">
+            <primary sortas="b-roff2ps">roff2ps</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="roff2text">
+        <term><command>roff2text</command></term>
+        <listitem>
+          <para>Transforms roff files into text files</para>
+          <indexterm zone="ch-system-groff roff2text">
+            <primary sortas="b-roff2text">roff2text</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="roff2x">
+        <term><command>roff2x</command></term>
+        <listitem>
+          <para>Transforms roff files into other formats</para>
+          <indexterm zone="ch-system-groff roff2x">
+            <primary sortas="b-roff2x">roff2x</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="soelim">
         <term><command>soelim</command></term>
         <listitem>
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 8ca2bc4d5..9b530a3ea 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -132,7 +132,8 @@
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>ftp, hostname, ping, ping6, rcp, rlogin, rsh, talk, telnet, and tftp</seg>
+        <seg>ftp, hostname, ping, ping6, rcp, rlogin, rsh, talk, telnet,
+        tftp, and traceroute</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -242,6 +243,18 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="traceroute">
+        <term><command>traceroute</command></term>
+        <listitem>
+          <para>Traces the route your packets take from the host you are
+          working on to another host on a network, showing all the intermediate
+          hops (gateways) along the way</para>
+          <indexterm zone="ch-system-inetutils traceroute">
+            <primary sortas="b-traceroute">traceroute</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 7edcf0a5c..bc33c4a57 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -402,7 +402,7 @@ cp -rv man? /usr/share/man/fr.UTF-8</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>apropos, catman, convert-mans, lexgrog, man, mandb,
+        <seg>accessdb, apropos (link to whatis), catman, convert-mans, lexgrog, man, mandb,
         manpath, whatis, and zsoelim</seg>
       </seglistitem>
     </segmentedlist>
@@ -412,7 +412,7 @@ cp -rv man? /usr/share/man/fr.UTF-8</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <!-- <varlistentry id="accessdb">
+      <varlistentry id="accessdb">
         <term><command>accessdb</command></term>
         <listitem>
           <para>Dumps the <command>whatis</command> database contents in
@@ -421,7 +421,7 @@ cp -rv man? /usr/share/man/fr.UTF-8</userinput></screen>
             <primary sortas="b-accessdb">accessdb</primary>
           </indexterm>
         </listitem>
-      </varlistentry> -->
+      </varlistentry>
 
       <varlistentry id="apropos">
         <term><command>apropos</command></term>
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index 56125d0cd..3e92ac414 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -78,7 +78,7 @@ find . -name \*.html -type f -exec cp \{} /usr/share/doc/mpfr-&mpfr-version; \;<
       <segtitle>Installed Libraries</segtitle>
 
       <seglistitem>
-        <seg>mpfr.so</seg>
+        <seg>libmpfr.{a,so}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -87,12 +87,12 @@ find . -name \*.html -type f -exec cp \{} /usr/share/doc/mpfr-&mpfr-version; \;<
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="mpfr">
-        <term><command>mpfr</command></term>
+      <varlistentry id="libmpfr">
+        <term><command>libmpfr</command></term>
         <listitem>
           <para>Contains multiple-precision math functions.</para>
-          <indexterm zone="ch-system-mpfr mpfr">
-            <primary sortas="c-mpfr">mpfr</primary>
+          <indexterm zone="ch-system-mpfr libmpfr">
+            <primary sortas="c-libmpfr">libmpfr</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 16874b5d6..f86ec8145 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -165,7 +165,7 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
 
       <seglistitem>
         <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
-        ncurses5-config, reset (link to tset), tack, tic, toe, tput, and tset</seg>
+        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"
@@ -218,12 +218,12 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="ncurses5-config">
-        <term><command>ncurses5-config</command></term>
+      <varlistentry id="ncursesw5-config">
+        <term><command>ncursesw5-config</command></term>
         <listitem>
           <para>Provides configuration information for ncurses</para>
-          <indexterm zone="ch-system-ncurses ncurses5-config">
-            <primary sortas="b-ncurses5-config">ncurses5-config</primary>
+          <indexterm zone="ch-system-ncurses ncursesw5-config">
+            <primary sortas="b-ncursesw5-config">ncursesw5-config</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -238,13 +238,12 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="tack">
-        <term><command>tack</command></term>
+      <varlistentry id="tabs">
+        <term><command>tabs</command></term>
         <listitem>
-          <para>The terminfo action checker; it is mainly used to test the
-          accuracy of an entry in the terminfo database</para>
-          <indexterm zone="ch-system-ncurses tack">
-            <primary sortas="b-tack">tack</primary>
+          <para>Clears and sets tab stops on a terminal</para>
+          <indexterm zone="ch-system-ncurses tabs">
+            <primary sortas="b-tabs">tabs</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index d159db493..84788d648 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -138,12 +138,13 @@
       <segtitle>Installed libraries</segtitle>
 
       <seglistitem>
-        <seg>a2p, c2ph, cpan, dprofpp, enc2xs, find2perl, h2ph, h2xs,
+        <seg>a2p, c2ph, config_data, corelist, cpan, cpan2dist, cpanp,
+        cpanp-run-perl, dprofpp, enc2xs, find2perl, h2ph, h2xs,
         instmodsh, libnetcfg, perl, perl&perl-version; (link to perl),
-        perlbug, perlcc, perldoc, perlivp, piconv, pl2pm, pod2html, pod2latex,
+        perlbug, perldoc, perlivp, piconv, pl2pm, pod2html, pod2latex,
         pod2man, pod2text, pod2usage, podchecker, podselect, prove,
-        psed (link to s2p), pstruct (link to c2ph), s2p, splain, and
-        xsubpp</seg>
+        psed (link to s2p), pstruct (link to c2ph), ptar, ptardiff, s2p,
+        shasum, splain, and xsubpp</seg>
         <seg>Several hundred which cannot all be listed here</seg>
       </seglistitem>
     </segmentedlist>
@@ -174,6 +175,26 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="config_data">
+        <term><command>config_data</command></term>
+        <listitem>
+          <para>Queries or changes configuration of Perl modules</para>
+          <indexterm zone="ch-system-perl config_data">
+            <primary sortas="b-config_data">config_data</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="corelist">
+        <term><command>corelist</command></term>
+        <listitem>
+          <para>A commandline frontend to Module::CoreList</para>
+          <indexterm zone="ch-system-perl corelist">
+            <primary sortas="b-corelist">corelist</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="cpan">
         <term><command>cpan</command></term>
         <listitem>
@@ -185,6 +206,36 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="cpan2dist">
+        <term><command>cpan2dist</command></term>
+        <listitem>
+          <para>The CPANPLUS distribution creator</para>
+          <indexterm zone="ch-system-perl cpan2dist">
+            <primary sortas="b-cpan2dist">cpan2dist</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cpanp">
+        <term><command>cpanp</command></term>
+        <listitem>
+          <para>The CPANPLUS launcher</para>
+          <indexterm zone="ch-system-perl cpanp">
+            <primary sortas="b-cpanp">cpanp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cpanp-run-perl">
+        <term><command>cpanp-run-perl</command></term>
+        <listitem>
+          <para>Perl script that (description needed)</para>
+          <indexterm zone="ch-system-perl cpanp-run-perl">
+            <primary sortas="b-cpanp-run-perl">cpanp-run-perl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="dprofpp">
         <term><command>dprofpp</command></term>
         <listitem>
@@ -294,16 +345,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="perlcc">
-        <term><command>perlcc</command></term>
-        <listitem>
-          <para>Generates executables from Perl programs</para>
-          <indexterm zone="ch-system-perl perlcc">
-            <primary sortas="b-perlcc">perlcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="perldoc">
         <term><command>perldoc</command></term>
         <listitem>
@@ -452,6 +493,27 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="ptar">
+        <term><command>ptar</command></term>
+        <listitem>
+          <para>A <command>tar</command>-like program written in Perl</para>
+          <indexterm zone="ch-system-perl ptar">
+            <primary sortas="b-ptar">ptar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ptardiff">
+        <term><command>ptardiff</command></term>
+        <listitem>
+          <para>A Perl program that compares an extracted archive with an
+          unextracted one</para>
+          <indexterm zone="ch-system-perl ptardiff">
+            <primary sortas="b-ptardiff">ptardiff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="s2p">
         <term><command>s2p</command></term>
         <listitem>
@@ -462,6 +524,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="shasum">
+        <term><command>shasum</command></term>
+        <listitem>
+          <para>Prints or checks SHA checksums</para>
+          <indexterm zone="ch-system-perl shasum">
+            <primary sortas="b-shasum">shasum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="splain">
         <term><command>splain</command></term>
         <listitem>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 110438379..4f4a4e31c 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -99,7 +99,7 @@ done</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>info, infokey, install-info, makeinfo, texi2dvi, texi2pdf, and
+        <seg>info, infokey, install-info, makeinfo, pdftexi2dvi, texi2dvi, texi2pdf, and
         texindex</seg>
       </seglistitem>
     </segmentedlist>
@@ -155,6 +155,17 @@ done</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="pdftexi2dvi">
+        <term><command>pdftexi2dvi</command></term>
+        <listitem>
+          <para>Used to format the given Texinfo document into a
+          Portable Document Format (PDF) file</para>
+          <indexterm zone="ch-system-texinfo pdftexi2dvi">
+            <primary sortas="b-pdftexi2dvi">pdftexi2dvi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="texi2dvi">
         <term><command>texi2dvi</command></term>
         <listitem>
diff --git a/chapter06/util-linux-ng.xml b/chapter06/util-linux-ng.xml
index 258c7b897..bccd6eb88 100644
--- a/chapter06/util-linux-ng.xml
+++ b/chapter06/util-linux-ng.xml
@@ -112,8 +112,8 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         linux64, logger, look, losetup, mcookie, mkfs, mkfs.bfs, mkfs.cramfs,
         mkfs.minix, mkswap, more, mount, namei, partx, pg, pivot_root,
         readprofile, rename, renice, rev, rtcwake, script, scriptreplay,
-        setarch, setsid, setterm, sfdisk, swapon, tailf, taskset, tunelp, ul,
-        umount, wall, whereis, and write</seg>
+        setarch, setsid, setterm, sfdisk, swapoff (link to swapon), swapon,
+        tailf, taskset, tunelp, ul, umount, wall, whereis, and write</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -444,6 +444,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="line">
+        <term><command>line</command></term>
+        <listitem>
+          <para>Copies a single line</para>
+          <indexterm zone="ch-system-util-linux-ng line">
+            <primary sortas="b-line">line</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="linux32">
         <term><command>linux32</command></term>
         <listitem>
@@ -464,16 +474,6 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="line">
-        <term><command>line</command></term>
-        <listitem>
-          <para>Copies a single line</para>
-          <indexterm zone="ch-system-util-linux-ng line">
-            <primary sortas="b-line">line</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="logger">
         <term><command>logger</command></term>
         <listitem>
@@ -743,6 +743,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="swapoff">
+        <term><command>swapoff</command></term>
+        <listitem>
+          <para>Disables devices and files for paging and swapping</para>
+          <indexterm zone="ch-system-util-linux-ng swapoff">
+            <primary sortas="b-swapoff">swapoff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="swapon">
         <term><command>swapon</command></term>
         <listitem>