Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter01/changelog.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -43,4 +43,15 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
+    <listitem>
+      <para>2019-03-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update contents and short descriptions of
+          packages. Fixes
+          <ulink url="&lfs-ticket-root;4443">#4443</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: chapter06/bash.xml
===================================================================
--- chapter06/bash.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/bash.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -111,5 +111,6 @@
       <seglistitem>
         <seg>bash, bashbug, and sh (link to bash)</seg>
-        <seg>/usr/share/doc/bash-&bash-version;</seg>
+        <seg>/usr/include/bash, /usr/lib/bash, and
+        /usr/share/doc/bash-&bash-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/binutils.xml
===================================================================
--- chapter06/binutils.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/binutils.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -170,5 +170,5 @@
 
       <seglistitem>
-        <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, ld.gold, nm,
+        <seg>addr2line, ar, as, c++filt, dwp, elfedit, gprof, ld, ld.bfd, ld.gold, nm,
         objcopy, objdump, ranlib, readelf, size, strings, and strip</seg>
         <seg>libbfd.{a,so} and libopcodes.{a,so}</seg>
@@ -223,4 +223,14 @@
           <indexterm zone="ch-system-binutils c-filt">
             <primary sortas="b-c++filt">c++filt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dwp">
+        <term><command>dwp</command></term>
+        <listitem>
+          <para>The DWARF packaging utility</para>
+          <indexterm zone="ch-system-binutils dwp">
+            <primary sortas="dwp">dwp</primary>
           </indexterm>
         </listitem>
Index: chapter06/coreutils.xml
===================================================================
--- chapter06/coreutils.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/coreutils.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -172,5 +172,5 @@
 
       <seglistitem>
-        <seg>[, base32, base64, basename, cat, chcon, chgrp, chmod, chown,
+        <seg>[, b2sum, base32, base64, basename, basenc, 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,
@@ -183,5 +183,5 @@
         tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and
         yes</seg>
-        <seg>libstdbuf.so</seg>
+        <seg>libstdbuf.so (in /usr/libexec/coreutils)</seg>
         <seg>/usr/libexec/coreutils</seg>
       </seglistitem>
@@ -215,4 +215,14 @@
       </varlistentry>
 
+      <varlistentry id="b2sum">
+        <term><command>b2sum</command></term>
+        <listitem>
+          <para>Prints or checks BLAKE2 (512-bit) checksums</para>
+          <indexterm zone="ch-system-coreutils b2sum">
+            <primary sortas="b-b2sum">b2sum</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="basename">
         <term><command>basename</command></term>
@@ -221,4 +231,14 @@
           <indexterm zone="ch-system-coreutils basename">
             <primary sortas="b-basename">basename</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="basenc">
+        <term><command>basenc</command></term>
+        <listitem>
+          <para>Encodes or decodes data using various algorithms</para>
+          <indexterm zone="ch-system-coreutils basenc">
+            <primary sortas="b-basenc">basenc</primary>
           </indexterm>
         </listitem>
Index: chapter06/e2fsprogs.xml
===================================================================
--- chapter06/e2fsprogs.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/e2fsprogs.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -176,11 +176,13 @@
       <seglistitem>
         <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs,e2freefrag,
-        e2fsck, e2image, 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,
+        e2fsck, e2image, e2label, e2mmpstatus, e2scrub, e2scrub_all, e2undo,
+        e4crypt, e4defrag, filefrag, fsck.ext2,
+        fsck.ext3, fsck.ext4, logsave, lsattr, mk_cmds, mke2fs,
+        mkfs.ext2, mkfs.ext3, mkfs.ext4, mklost+found,
         resize2fs, and tune2fs</seg>
         <seg>libcom_err.so, libe2p.so, libext2fs.so, and libss.so</seg>
         <seg>/usr/include/e2p, /usr/include/et, /usr/include/ext2fs,
-        /usr/include/ss, /usr/share/et, and /usr/share/ss</seg>
+        /usr/include/ss, /usr/lib/e2fsprogs, /usr/share/et, and
+        /usr/share/ss</seg>
       </seglistitem>
     </segmentedlist>
@@ -296,4 +298,34 @@
       </varlistentry>
 
+      <varlistentry id="e2mmpstatus">
+        <term><command>e2mmpstatus</command></term>
+        <listitem>
+          <para>Checks MMP status of an ext4 filesystem</para>
+          <indexterm zone="ch-system-e2fsprogs e2mmpstatus">
+            <primary sortas="b-e2mmpstatus">e2mmpstatus</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="e2scrub">
+        <term><command>e2scrub</command></term>
+        <listitem>
+          <para>Checks the contents of a mounted ext[234] filesystem</para>
+          <indexterm zone="ch-system-e2fsprogs e2scrub">
+            <primary sortas="b-e2scrub">e2scrub</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="e2scrub_all">
+        <term><command>e2scrub_all</command></term>
+        <listitem>
+          <para>Checks all mounted ext[234] filesystems for errors</para>
+          <indexterm zone="ch-system-e2fsprogs e2scrub_all">
+            <primary sortas="b-e2scrub_all">e2scrub_all</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="e2undo">
         <term><command>e2undo</command></term>
@@ -308,4 +340,14 @@
       </varlistentry>
 
+      <varlistentry id="e4crypt">
+        <term><command>e4crypt</command></term>
+        <listitem>
+          <para>Ext4 filesystem encryption utility</para>
+          <indexterm zone="ch-system-e2fsprogs e4crypt">
+            <primary sortas="b-e4crypt">e4crypt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="e4defrag">
         <term><command>e4defrag</command></term>
@@ -357,16 +399,4 @@
           <indexterm zone="ch-system-e2fsprogs fsck.ext4">
             <primary sortas="b-fsck.ext4">fsck.ext4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.ext4dev">
-        <term><command>fsck.ext4dev</command></term>
-        <listitem>
-          <para>By default checks <systemitem class="filesystem">ext4</systemitem>
-          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>
           </indexterm>
         </listitem>
@@ -447,15 +477,4 @@
           <indexterm zone="ch-system-e2fsprogs mkfs.ext4">
             <primary sortas="b-mkfs.ext4">mkfs.ext4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.ext4dev">
-        <term><command>mkfs.ext4dev</command></term>
-        <listitem>
-          <para>By default creates <systemitem class="filesystem">ext4</systemitem>
-          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>
         </listitem>
Index: chapter06/findutils.xml
===================================================================
--- chapter06/findutils.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/findutils.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -108,8 +108,11 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>find, locate, updatedb, and xargs</seg>
+        <seg>/var/lib/locate</seg>
       </seglistitem>
+
     </segmentedlist>
 
Index: chapter06/gawk.xml
===================================================================
--- chapter06/gawk.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/gawk.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -78,7 +78,7 @@
       <seglistitem>
         <seg>awk (link to gawk), gawk, and awk-&gawk-version;</seg>
-        <seg>filefuncs.so, fnmatch.so, fork.so, inplace.so, ordchr.so,
+        <seg>filefuncs.so, fnmatch.so, fork.so, inplace.so, intdiv.so, ordchr.so,
         readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so,
-        testext.so, and time.so</seg>
+        and time.so (all in /usr/lib/gawk)</seg>
         <seg>/usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, and
         /usr/share/doc/gawk-&gawk-version;</seg>
Index: chapter06/gcc.xml
===================================================================
--- chapter06/gcc.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/gcc.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -339,11 +339,12 @@
       <seglistitem>
         <seg>c++, cc (link to gcc), cpp, g++, gcc,
-        gcc-ar, gcc-nm, gcc-ranlib, and 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, 
-        libquadmath.{a,so}, libssp.{a,so},
-        libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a, and libtsan.{a,so}</seg>
+        gcc-ar, gcc-nm, gcc-ranlib, gcov, gcov-dump, and gcov-tool</seg>
+
+        <seg>libasan.{a,so}, libatomic.{a,so}, libcc1.so, libgcc.a, libgcc_eh.a,
+        libgcc_s.so, libgcov.a, libgomp.{a,so}, libitm.{a,so},
+        liblsan.{a,so}, liblto_plugin.so,
+        libquadmath.{a,so}, libssp.{a,so}, libssp_nonshared.a,
+        libstdc++.{a,so}, libstdc++fs.a, libsupc++.a, libtsan.{a,so},
+        and libubsan.{a,so}</seg>
 
         <seg>/usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc, and 
@@ -458,10 +459,50 @@
       </varlistentry>
 
+      <varlistentry id="gcov-dump">
+        <term><command>gcov-dump</command></term>
+        <listitem>
+          <para>Offline gcda and gcno profile dump tool</para>
+          <indexterm zone="ch-system-gcc gcov-dump">
+            <primary sortas="b-gcov-dump">gcov-dump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gcov-tool">
+        <term><command>gcov-tool</command></term>
+        <listitem>
+          <para>Offline gcda profile processing tool</para>
+          <indexterm zone="ch-system-gcc gcov-tool">
+            <primary sortas="b-gcov-tool">gcov-tool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libasan">
-        <term><command>libasan</command></term>
+        <term><filename class="libraryfile">libasan</filename></term>
         <listitem>
           <para>The Address Sanitizer runtime library</para>
           <indexterm zone="ch-system-gcc libasan">
             <primary sortas="b-libasan">libasan</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libatomic">
+        <term><filename class="libraryfile">libatomic</filename></term>
+        <listitem>
+          <para>GCC atomic built-in runtime library</para>
+          <indexterm zone="ch-system-gcc libatomic">
+            <primary sortas="b-libatomic">libatomic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcc1">
+        <term><filename class="libraryfile">libcc1</filename></term>
+        <listitem>
+          <para>The C preprocessing library</para>
+          <indexterm zone="ch-system-gcc libcc1">
+            <primary sortas="b-libcc1">libcc1</primary>
           </indexterm>
         </listitem>
@@ -500,13 +541,10 @@
       </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-gcc libiberty">
-            <primary sortas="c-libiberty">libiberty</primary>
+      <varlistentry id="liblsan">
+        <term><filename class="libraryfile">liblsan</filename></term>
+        <listitem>
+          <para>The Leak Sanitizer runtime library</para>
+          <indexterm zone="ch-system-gcc liblsan">
+            <primary sortas="c-liblsan">liblsan</primary>
           </indexterm>
         </listitem>
@@ -555,4 +593,14 @@
       </varlistentry>
 
+      <varlistentry id="libstdcfs">
+        <term><filename class="libraryfile">libstdc++fs</filename></term>
+        <listitem>
+          <para>ISO/IEC TS 18822:2015 Filesystem library</para>
+          <indexterm zone="ch-system-gcc libstdcfs">
+            <primary sortas="c-libstdc++fs">libstdc++fs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libsupc">
         <term><filename class="libraryfile">libsupc++</filename></term>
@@ -576,4 +624,14 @@
       </varlistentry>
 
+      <varlistentry id="libubsan">
+        <term><filename class="libraryfile">libubsan</filename></term>
+        <listitem>
+          <para>The Undefined Behavior Sanitizer runtime library</para>
+          <indexterm zone="ch-system-gcc libubsan">
+            <primary sortas="c-libubsan">libubsan</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: chapter06/gettext.xml
===================================================================
--- chapter06/gettext.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/gettext.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -103,6 +103,6 @@
         <seg>libasprintf.so, libgettextlib.so, libgettextpo.so,
         libgettextsrc.so, and preloadable_libintl.so</seg>
-        <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;, and
-        /usr/share/gettext</seg>
+        <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
+        /usr/share/gettext, and /usr/share/gettext-0.19.8</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/glibc.xml
===================================================================
--- chapter06/glibc.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/glibc.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -496,13 +496,13 @@
         <seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
         ldd, lddlibc4, locale, localedef, makedb, mtrace, nscd, 
-        pldd, sln, sotruss, sprof, tzselect, xtrace,
+        pcprofiledump, pldd, sln, sotruss, sprof, tzselect, xtrace,
         zdump, and zic</seg>
         <seg>ld-&glibc-version;.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
-        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, libpthread.{a,so},
-        libpthread_nonshared.a, libresolv.{a,so}, librpcsvc.a, librt.{a,so},
+        libc.{a,so}, libc_nonshared.a,
+        libcrypt.{a,so}, libdl.{a,so}, libg.a, libm.{a,so},
+        libmcheck.a, libmemusage.so, libmvec.{a,so}, libnsl.{a,so},
+        libnss_compat.so, libnss_dns.so, libnss_files.so, libnss_hesiod.so,
+        libpcprofile.so, libpthread.{a,so},
+        libpthread_nonshared.a, libresolv.{a,so}, librt.{a,so},
         libthread_db.so, and libutil.{a,so}</seg>
         <seg>/usr/include/arpa, /usr/include/bits, /usr/include/gnu,
@@ -511,5 +511,5 @@
         /usr/include/netipx, /usr/include/netiucv, /usr/include/netpacket,
         /usr/include/netrom, /usr/include/netrose, /usr/include/nfs,
-        /usr/include/protocols, /usr/include/rpc, /usr/include/rpcsvc,
+        /usr/include/protocols, /usr/include/rpc,
         /usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/locale,
         /usr/libexec/getconf, /usr/share/i18n, /usr/share/zoneinfo,
@@ -665,4 +665,14 @@
           <indexterm zone="ch-system-glibc nscd">
             <primary sortas="b-nscd">nscd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pcprofiledump">
+        <term><command>pcprofiledump</command></term>
+        <listitem>
+          <para>Dump information generated by PC profiling</para>
+          <indexterm zone="ch-system-glibc pcprofiledump">
+            <primary sortas="b-pcprofiledump">pcprofiledump</primary>
           </indexterm>
         </listitem>
@@ -805,15 +815,4 @@
       </varlistentry>
 
-      <varlistentry id="libcidn">
-        <term><filename class="libraryfile">libcidn</filename></term>
-        <listitem>
-          <para>Used internally by Glibc for handling internationalized domain
-          names in the <function>getaddrinfo()</function> function</para>
-          <indexterm zone="ch-system-glibc libcidn">
-            <primary sortas="c-libcidn">libcidn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libcrypt">
         <term><filename class="libraryfile">libcrypt</filename></term>
@@ -843,16 +842,4 @@
           <indexterm zone="ch-system-glibc libg">
             <primary sortas="c-libg">libg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libieee">
-        <term><filename class="libraryfile">libieee</filename></term>
-        <listitem>
-          <para>Linking in this module forces error handling rules for math
-          functions as defined by the Institute of Electrical and Electronic
-          Engineers (IEEE). The default is POSIX.1 error handling</para>
-          <indexterm zone="ch-system-glibc libieee">
-            <primary sortas="c-libieee">libieee</primary>
           </indexterm>
         </listitem>
@@ -912,4 +899,14 @@
       </varlistentry>
 
+      <varlistentry id="libpcprofile">
+        <term><filename class="libraryfile">libpcprofile</filename></term>
+        <listitem>
+          <para>Can be preloaded to PC profile an executable</para>
+          <indexterm zone="ch-system-glibc libpcprofile">
+            <primary sortas="c-libpcprofile">libpcprofile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libpthread">
         <term><filename class="libraryfile">libpthread</filename></term>
@@ -933,14 +930,4 @@
       </varlistentry>
 
-      <varlistentry id="librpcsvc">
-        <term><filename class="libraryfile">librpcsvc</filename></term>
-        <listitem>
-          <para>Contains functions providing miscellaneous RPC services</para>
-          <indexterm zone="ch-system-glibc librpcsvc">
-            <primary sortas="c-librpcsvc">librpcsvc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="librt">
         <term><filename class="libraryfile">librt</filename></term>
Index: chapter06/grub.xml
===================================================================
--- chapter06/grub.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/grub.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -104,5 +104,5 @@
             grub-set-default,     grub-sparc64-setup, and grub-syslinux2cfg</seg>
 
-        <seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub, and boot/grub (when grub-install
+        <seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub, and /boot/grub (when grub-install
         is first run)</seg>
       </seglistitem>
Index: chapter06/libelf.xml
===================================================================
--- chapter06/libelf.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/libelf.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -69,8 +69,12 @@
     <segmentedlist>
       <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>
           libelf.so
+        </seg>
+        <seg>
+          /usr/include/elfutils
         </seg>
       </seglistitem>
Index: chapter06/linux-headers.xml
===================================================================
--- chapter06/linux-headers.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/linux-headers.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -131,4 +131,14 @@
       </varlistentry>
 
+      <varlistentry id="misc">
+        <term><filename class="headerfile">/usr/include/misc/*.h</filename></term>
+        <listitem>
+          <para>The Linux API Miscellaneous Headers</para>
+          <indexterm zone="ch-system-linux-headers misc">
+            <primary sortas="e-/usr/include/misc/*.h">/usr/include/misc/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="mtd">
         <term><filename class="headerfile">/usr/include/mtd/*.h</filename></term>
Index: chapter06/man-db.xml
===================================================================
--- chapter06/man-db.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/man-db.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -318,6 +318,6 @@
         <seg>accessdb, apropos (link to whatis), catman, lexgrog, man, mandb,
         manpath, and whatis</seg>
-        <seg>libman.so and libmandb.so</seg>
-        <seg>/usr/lib/man-db, /usr/lib/tmpfiles.d, /usr/libexec/man-db,
+        <seg>libman.so and libmandb.so (both in /usr/lib/man-db)</seg>
+        <seg>/usr/lib/man-db, /usr/libexec/man-db,
         and /usr/share/doc/man-db-&man-db-version;</seg>
       </seglistitem>
Index: chapter06/meson.xml
===================================================================
--- chapter06/meson.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/meson.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -78,6 +78,6 @@
 
       <seglistitem>
-        <seg>meson, mesonconf, mesonintrospect, mesontest, and wraptool</seg>
-		<seg>/usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg</seg>
+        <seg>meson</seg>
+        <seg>/usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg-info and /usr/lib/python&python-minor;/site-packages/mesonbuild</seg>
       </seglistitem>
     </segmentedlist>
@@ -98,43 +98,4 @@
       </varlistentry>
 
-      <varlistentry id="mesonconf">
-		<term><command>mesonconf</command></term>
-        <listitem>
-          <para>A tool to configure Meson builds</para>
-          <indexterm zone="ch-system-meson mesonconf">
-            <primary sortas="b-mesonconf">mesonconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mesonintrospect">
-		<term><command>mesonintrospect</command></term>
-        <listitem>
-          <para>A tool to extract information about a Meson build</para>
-          <indexterm zone="ch-system-meson mesonintrospect">
-            <primary sortas="b-mesonintrospect">mesonintrospect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mesontest">
-		<term><command>mesontest</command></term>
-        <listitem>
-          <para>Test tool for the Meson build system</para>
-          <indexterm zone="ch-system-meson mesontest">
-            <primary sortas="b-mesontest">mesontest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wraptool">
-		<term><command>wraptool</command></term>
-        <listitem>
-          <para>Source dependency downloader</para>
-          <indexterm zone="ch-system-meson wraptool">
-            <primary sortas="b-wraptool">wraptool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
     </variablelist>
 
Index: chapter06/psmisc.xml
===================================================================
--- chapter06/psmisc.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/psmisc.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -71,5 +71,5 @@
 
       <seglistitem>
-        <seg>fuser, killall, peekfd, prtstat, pstree, and pstree.x11 (link to pstree)</seg>
+        <seg>fuser, killall, peekfd, prtstat, pslog, pstree, and pstree.x11 (link to pstree)</seg>
       </seglistitem>
     </segmentedlist>
@@ -123,4 +123,14 @@
       </varlistentry>
 
+      <varlistentry id="pslog">
+        <term><command>pslog</command></term>
+        <listitem>
+          <para>Reports current logs path of a process</para>
+          <indexterm zone="ch-system-psmisc pslog">
+            <primary sortas="b-pslog">pslog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="pstree">
         <term><command>pstree</command></term>
Index: chapter06/python.xml
===================================================================
--- chapter06/python.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/python.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -144,5 +144,5 @@
       <seglistitem>
         <seg>
-          2to3, idle3, pydoc3, python3, python3-config, pyvenv
+          2to3, idle3, pip3, pydoc3, python3, python3-config, and pyvenv
         </seg>
         <seg>
@@ -191,4 +191,17 @@
       </varlistentry>
 
+      <varlistentry id="pip3">
+        <term><command>pip3</command></term>
+        <listitem>
+          <para>
+            The package installer for Python. You can use pip to install
+            pacakges from Python Package Index and other indexes.
+          </para>
+          <indexterm zone="ch-system-Python">
+            <primary sortas="b-pip3">pip3</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="pydoc3">
         <term><command>pydoc3</command></term>
Index: chapter06/readline.xml
===================================================================
--- chapter06/readline.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/readline.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -102,5 +102,5 @@
       <seglistitem>
         <seg>libhistory.so and libreadline.so</seg>
-        <seg>/usr/include/readline, /usr/share/readline, and
+        <seg>/usr/include/readline and
         /usr/share/doc/readline-&readline-version;</seg>
       </seglistitem>
Index: chapter06/systemd.xml
===================================================================
--- chapter06/systemd.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/systemd.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -220,17 +220,22 @@
 
       <seglistitem>
-        <seg>bootctl, busctl, coredumpctl, halt, hostnamectl, init, journalctl,
-        kernel-install, localectl, loginctl, machinectl, networkctl, poweroff,
-        reboot, runlevel, shutdown, systemctl, systemd-analyze,
+        <seg>bootctl, busctl, coredumpctl, halt (symlink to systemctl),
+        hostnamectl, init, journalctl, kernel-install, localectl, loginctl,
+        machinectl, networkctl, portablectl, poweroff (symlink to
+        systemctl), reboot (symlink to systemctl), resolvconf (symlink to
+        resolvectl), resolvectl, runlevel (symlink to systemctl), shutdown
+        (symlink to systemctl), systemctl, systemd-analyze,
         systemd-ask-password, systemd-cat, systemd-cgls, systemd-cgtop,
         systemd-delta, systemd-detect-virt, systemd-escape, systemd-hwdb,
-        systemd-inhibit, systemd-machine-id-setup, systemd-mount, 
-        systemd-notify, systemd-nspawn, systemd-path, systemd-resolve, 
-        systemd-run, systemd-socket-activate,
-        systemd-stdio-bridge, systemd-tmpfiles, systemd-tty-ask-password-agent,
-        telinit, timedatectl, and udevadm</seg>
+        systemd-id128, systemd-inhibit, systemd-machine-id-setup,
+        systemd-mount, systemd-notify, systemd-nspawn, systemd-path,
+        systemd-resolve (symlink to resolvectl), systemd-run,
+        systemd-socket-activate, systemd-stdio-bridge, systemd-tmpfiles,
+        systemd-tty-ask-password-agent, systemd-umount (symlink to
+        systemd-mount), telinit (symlink to systemctl), timedatectl, and
+        udevadm</seg>
         <seg>libnss_myhostname.so.2, libnss_mymachines.so.2,
-        libnss_resolve.so.2, libnss_systemd.so.2, 
-        libsystemd.so, libsystemd-shared-&systemd-version;.so,
+        libnss_resolve.so.2, libnss_systemd.so.2,
+        libsystemd.so, libsystemd-shared-&systemd-version;.so (in /lib/systemd),
         and libudev.so</seg>
         <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,
@@ -381,4 +386,15 @@
       </varlistentry>
 
+      <varlistentry id="portablectl">
+        <term><command>portablectl</command></term>
+        <listitem>
+          <para>Used to attach or detach portable services from the local
+          system</para>
+          <indexterm zone="ch-system-systemd portablectl">
+            <primary sortas="b-portablectl">portablectl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="poweroff">
         <term><command>poweroff</command></term>
@@ -399,4 +415,27 @@
           <indexterm zone="ch-system-systemd reboot">
             <primary sortas="b-reboot">reboot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="resolvconf">
+        <term><command>resolvconf</command></term>
+        <listitem>
+          <para>Register DNS server and domain configuration with
+          <command>systemd-resolved</command>)</para>
+          <indexterm zone="ch-system-systemd resolvconf">
+            <primary sortas="b-resolvconf">resolvconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="resolvectl">
+        <term><command>resolvectl</command></term>
+        <listitem>
+          <para>Send control commands to the network name resolution
+          manager, or resolve domain names, IPv4 and IPv6 addresses,
+          DNS records, and services.</para>
+          <indexterm zone="ch-system-systemd resolvectl">
+            <primary sortas="b-resolvectl">resolvectl</primary>
           </indexterm>
         </listitem>
@@ -530,4 +569,14 @@
           <indexterm zone="ch-system-systemd systemd-hwdb">
             <primary sortas="b-systemd-hwdb">systemd-hwdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-id128">
+        <term><command>systemd-id128</command></term>
+        <listitem>
+          <para>Generate and print id128 strings</para>
+          <indexterm zone="ch-system-systemd systemd-id128">
+            <primary sortas="b-systemd-id128">systemd-id128</primary>
           </indexterm>
         </listitem>
@@ -655,4 +704,14 @@
       </varlistentry>
 
+      <varlistentry id="systemd-umount">
+        <term><command>systemd-umount</command></term>
+        <listitem>
+          <para>Unmount mount points</para>
+          <indexterm zone="ch-system-systemd systemd-umount">
+            <primary sortas="b-systemd-umount">systemd-umount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="systemd-tty-ask-password-agent">
         <term><command>systemd-tty-ask-password-agent</command></term>
Index: chapter06/texinfo.xml
===================================================================
--- chapter06/texinfo.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/texinfo.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -121,5 +121,6 @@
         <seg>info, install-info, makeinfo (link to texi2any),
         pdftexi2dvi, pod2texi, texi2any, texi2dvi, texi2pdf, and texindex</seg>
-        <seg>XSParagraph.so</seg>
+        <seg>MiscXS.so, Parsetexi.so, and XSParagraph.so
+        (all in /usr/lib/texinfo)</seg>
         <seg>/usr/share/texinfo and /usr/lib/texinfo</seg>
       </seglistitem>
Index: chapter06/util-linux.xml
===================================================================
--- chapter06/util-linux.xml	(revision 1263de24b91da3f03775e358e8efe4f4820b4a56)
+++ chapter06/util-linux.xml	(revision 78cc3be1c3edc5f411095e26ae251b290b17bfe5)
@@ -131,16 +131,16 @@
 
       <seglistitem>
-        <seg>addpart, agetty, blkdiscard, blkid, blockdev, cal, cfdisk, chcpu,
-        choom, chrt, col, colcrt, colrm, column, ctrlaltdel, delpart, dmesg,
-        eject, fallocate, fdformat, fdisk, findfs, findmnt, flock, fsck,
+        <seg>addpart, agetty, blkdiscard, blkid, blkzone, blockdev, cal, cfdisk, chcpu,
+        chmem, choom, chrt, col, colcrt, colrm, column, ctrlaltdel, delpart, dmesg,
+        eject, fallocate, fdformat, fdisk, fincore, findfs, findmnt, flock, fsck,
         fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock,
         i386, ionice, ipcmk, ipcrm, ipcs, isosize, kill, last, lastb (link to
         last), ldattach, linux32, linux64, logger, look, losetup, lsblk, lscpu,
-        lsipc, lslocks, lslogins, mcookie, mesg, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
-        more, mount, mountpoint, namei, nsenter, partx, pg, pivot_root, prlimit, raw,
-        readprofile, rename, renice, resizepart, rev, rtcwake, script,
+        lsipc, lslocks, lslogins, lsmem, lsns, mcookie, mesg, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
+        more, mount, mountpoint, namei, nsenter, partx, pivot_root, prlimit, raw,
+        readprofile, rename, renice, resizepart, rev, rfkill, rtcwake, script,
         scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
-        swapoff (link to swapon), swapon, switch_root, tailf, taskset, ul,
-        umount, uname26, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis,
+        swapoff (link to swapon), swapon, switch_root, taskset, ul,
+        umount, uname26, unshare, utmpdump, uuidd, uuidgen, uuidparse, wall, wdctl, whereis,
         wipefs, x86_64, and zramctl</seg>
         <seg>libblkid.so, libfdisk.so, libmount.so, 
@@ -203,4 +203,14 @@
       </varlistentry>
 
+      <varlistentry id="blkzone">
+        <term><command>blkzone</command></term>
+        <listitem>
+          <para>Runs zone command on the given block device</para>
+          <indexterm zone="ch-system-util-linux blkzone">
+            <primary sortas="b-blkzone">blkzone</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="blockdev">
         <term><command>blockdev</command></term>
@@ -244,4 +254,14 @@
       </varlistentry>
 
+      <varlistentry id="chmem">
+        <term><command>chmem</command></term>
+        <listitem>
+          <para>Configures memory</para>
+          <indexterm zone="ch-system-util-linux chmem">
+            <primary sortas="b-chmem">chmem</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="choom">
         <term><command>choom</command></term>
@@ -372,4 +392,14 @@
           <indexterm zone="ch-system-util-linux fdisk">
             <primary sortas="b-fdisk">fdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fincore">
+        <term><command>fincore</command></term>
+        <listitem>
+          <para>Counts pages of file contents in core</para>
+          <indexterm zone="ch-system-util-linux fincore">
+            <primary sortas="b-fincore">fincore</primary>
           </indexterm>
         </listitem>
@@ -700,4 +730,25 @@
       </varlistentry>
 
+      <varlistentry id="lsmem">
+        <term><command>lsmem</command></term>
+        <listitem>
+          <para>Lists the ranges of available memory with their online
+          status</para>
+          <indexterm zone="ch-system-util-linux lsmem">
+            <primary sortas="b-lsmem">lsmem</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lsns">
+        <term><command>lsns</command></term>
+        <listitem>
+          <para>Lists namespaces</para>
+          <indexterm zone="ch-system-util-linux lsns">
+            <primary sortas="b-lsns">lsns</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="mcookie">
         <term><command>mcookie</command></term>
@@ -836,14 +887,4 @@
       </varlistentry>
 
-      <varlistentry id="pg">
-        <term><command>pg</command></term>
-        <listitem>
-          <para>Displays a text file one screen full at a time</para>
-          <indexterm zone="ch-system-util-linux pg">
-            <primary sortas="b-pg">pg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="pivot_root">
         <term><command>pivot_root</command></term>
@@ -924,4 +965,14 @@
           <indexterm zone="ch-system-util-linux rev">
             <primary sortas="b-rev">rev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rkfill">
+        <term><command>rkfill</command></term>
+        <listitem>
+          <para>Tool for enabling and disabling wireless devices</para>
+          <indexterm zone="ch-system-util-linux rkfill">
+            <primary sortas="b-rkfill">rkfill</primary>
           </indexterm>
         </listitem>
@@ -1150,4 +1201,14 @@
       </varlistentry>
 
+      <varlistentry id="uuidparse">
+        <term><command>uuidparse</command></term>
+        <listitem>
+          <para>An utility to parse unique identifiers</para>
+          <indexterm zone="ch-system-util-linux uuidparse">
+            <primary sortas="b-uuidparse">uuidparse</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="wall">
         <term><command>wall</command></term>
