Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter01/changelog.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -36,4 +36,27 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>2015-10-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to man-db-2.7.4. Fixes
+          <ulink url="&lfs-ticket-root;3850">#3850</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.2.3. Fixes
+          <ulink url="&lfs-ticket-root;3844">#3844</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata2015g. Fixes
+          <ulink url="&lfs-ticket-root;3845">#3845</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Many updates to installed files and 
+          directories.  Huge thanks to Fernando. Fixes
+          <ulink url="&lfs-ticket-root;3849">#3849</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter01/whatsnew.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -212,7 +212,7 @@
       <para>Texinfo &texinfo-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Tzdata &tzdata-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Util-Linux &util-linux-version;</para>
Index: chapter06/acl.xml
===================================================================
--- chapter06/acl.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/acl.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -100,5 +100,5 @@
       <seglistitem>
         <seg>chacl, getfacl, and setacl</seg>
-        <seg>libacl.{a,so}</seg>
+        <seg>libacl.so</seg>
         <seg>/usr/include/acl and /usr/share/doc/acl-&acl-version;</seg>
       </seglistitem>
Index: chapter06/attr.xml
===================================================================
--- chapter06/attr.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/attr.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -94,5 +94,5 @@
       <seglistitem>
         <seg>attr, getfattr, and setattr</seg>
-        <seg>libattr.{a,so}</seg>
+        <seg>libattr.so</seg>
         <seg>/usr/include/attr and /usr/share/doc/attr-&attr-version;</seg>
       </seglistitem>
Index: chapter06/automake.xml
===================================================================
--- chapter06/automake.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/automake.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -78,8 +78,6 @@
 
       <seglistitem>
-        <seg>aclocal, aclocal-&am-minor-version;, automake,
-        automake-&am-minor-version;, compile, config.guess, config.sub,
-        depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
-        py-compile, and ylwrap</seg>
+        <seg>aclocal, aclocal-&am-minor-version; (hard linked with aclocal), automake, and
+        automake-&am-minor-version; (hard linked with automake) </seg>
         <seg>/usr/share/aclocal-&am-minor-version;, /usr/share/automake-&am-minor-version;, and
         /usr/share/doc/automake-&automake-version;</seg>
@@ -140,109 +138,4 @@
       </varlistentry>
 
-      <varlistentry id="compile">
-        <term><command>compile</command></term>
-        <listitem>
-          <para>A wrapper for compilers</para>
-          <indexterm zone="ch-system-automake compile">
-            <primary sortas="b-compile">compile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.guess">
-        <term><command>config.guess</command></term>
-        <listitem>
-          <para>A script that attempts to guess the canonical triplet for
-          the given build, host, or target architecture</para>
-          <indexterm zone="ch-system-automake config.guess">
-            <primary sortas="b-config.guess">config.guess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.sub">
-        <term><command>config.sub</command></term>
-        <listitem>
-          <para>A configuration validation subroutine script</para>
-          <indexterm zone="ch-system-automake config.sub">
-            <primary sortas="b-config.sub">config.sub</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="depcomp">
-        <term><command>depcomp</command></term>
-        <listitem>
-          <para>A script for compiling a program so that dependency information
-          is generated in addition to the desired output</para>
-          <indexterm zone="ch-system-automake depcomp">
-            <primary sortas="b-depcomp">depcomp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="install-sh">
-        <term><command>install-sh</command></term>
-        <listitem>
-          <para>A script that installs a program, script, or data file</para>
-          <indexterm zone="ch-system-automake install-sh">
-            <primary sortas="b-install-sh">install-sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mdate-sh">
-        <term><command>mdate-sh</command></term>
-        <listitem>
-          <para>A script that prints the modification time of a file or
-          directory</para>
-          <indexterm zone="ch-system-automake mdate-sh">
-            <primary sortas="b-mdate-sh">mdate-sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="missing">
-        <term><command>missing</command></term>
-        <listitem>
-          <para>A script acting as a common stub for missing GNU programs during
-          an installation</para>
-          <indexterm zone="ch-system-automake missing">
-            <primary sortas="b-missing">missing</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkinstalldirs">
-        <term><command>mkinstalldirs</command></term>
-        <listitem>
-          <para>A script that creates a directory tree</para>
-          <indexterm zone="ch-system-automake mkinstalldirs">
-            <primary sortas="b-mkinstalldirs">mkinstalldirs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="py-compile">
-        <term><command>py-compile</command></term>
-        <listitem>
-          <para>Compiles a Python program</para>
-          <indexterm zone="ch-system-automake py-compile">
-            <primary sortas="b-py-compile">py-compile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ylwrap">
-        <term><command>ylwrap</command></term>
-        <listitem>
-          <para>A wrapper for <command>lex</command> and
-          <command>yacc</command></para>
-          <indexterm zone="ch-system-automake ylwrap">
-            <primary sortas="b-ylwrap">ylwrap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
Index: chapter06/bison.xml
===================================================================
--- chapter06/bison.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/bison.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -53,5 +53,5 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results (about 0.5 SBU), issue:</para>
+    <para>To test the results (about 2.2 SBU), issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
Index: chapter06/e2fsprogs.xml
===================================================================
--- chapter06/e2fsprogs.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/e2fsprogs.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -172,10 +172,9 @@
         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, 
+        mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev, mklost+found,
         resize2fs, and tune2fs</seg>
-        <seg>libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so},
-        libquota.a, and libss.{a,so}</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/quota, /usr/include/ss, /usr/share/et, and /usr/share/ss</seg>
+        /usr/include/ss, /usr/share/et, and /usr/share/ss</seg>
       </seglistitem>
     </segmentedlist>
@@ -523,5 +522,5 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="libquota">
         <term><filename class="libraryfile">libquota</filename></term>
@@ -534,5 +533,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="libss">
         <term><filename class="libraryfile">libss</filename></term>
Index: chapter06/eudev.xml
===================================================================
--- chapter06/eudev.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/eudev.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -140,5 +140,5 @@
         <seg>libudev.so</seg>
 
-        <seg>/etc/udev, /lib/udev, and /lib/firmware</seg>
+        <seg>/etc/udev, /lib/udev, and /usr/share/doc/udev-20140408</seg>
       </seglistitem>
     </segmentedlist>
@@ -148,51 +148,4 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-<!--
-      <varlistentry id="ata_id">
-        <term><command>ata_id</command></term>
-        <listitem>
-          <para>Provides Udev with a unique string and
-          additional information (uuid, label) for an ATA drive</para>
-          <indexterm zone="ch-system-eudev ata_id">
-            <primary sortas="b-ata_id">ata_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cdrom_id">
-        <term><command>cdrom_id</command></term>
-        <listitem>
-          <para>Provides Udev with the capabilities of a
-          CD-ROM or DVD-ROM drive</para>
-          <indexterm zone="ch-system-eudev cdrom_id">
-            <primary sortas="b-cdrom_id">cdrom_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="collect">
-        <term><command>collect</command></term>
-        <listitem>
-          <para>Given an ID for the current uevent and a list of
-          IDs (for all target uevents), registers the current ID
-          and indicates whether all target IDs have been registered</para>
-          <indexterm zone="ch-system-eudev collect">
-            <primary sortas="b-collect">collect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_id">
-        <term><command>scsi_id</command></term>
-        <listitem>
-          <para>Provides Udev with a unique SCSI identifier
-          based on the data returned from sending a SCSI INQUIRY command to
-          the specified device</para>
-          <indexterm zone="ch-system-eudev scsi_id">
-            <primary sortas="b-scsi_id">scsi_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
       <varlistentry id="udevadm">
         <term><command>udevadm</command></term>
Index: chapter06/expat.xml
===================================================================
--- chapter06/expat.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/expat.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -75,5 +75,5 @@
       <seglistitem>
         <seg>xmlwf</seg>
-        <seg>libexpat.{a,so}</seg>
+        <seg>libexpat.so</seg>
         <seg>/usr/share/doc/expat-&expat-version;</seg>
       </seglistitem>
Index: chapter06/findutils.xml
===================================================================
--- chapter06/findutils.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/findutils.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -92,5 +92,5 @@
 
       <seglistitem>
-        <seg>bigram, code, find, frcode, locate, oldfind, updatedb, and xargs</seg>
+        <seg>code, find, locate, oldfind, updatedb, and xargs</seg>
       </seglistitem>
     </segmentedlist>
@@ -100,15 +100,4 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bigram">
-        <term><command>bigram</command></term>
-        <listitem>
-          <para>Was formerly used to produce <command>locate</command>
-          databases</para>
-          <indexterm zone="ch-system-findutils bigram">
-            <primary sortas="b-bigram">bigram</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="code">
@@ -130,16 +119,4 @@
           <indexterm zone="ch-system-findutils find">
             <primary sortas="b-find">find</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="frcode">
-        <term><command>frcode</command></term>
-        <listitem>
-          <para>Is called by <command>updatedb</command> to compress the list
-          of file names; it uses front-compression, reducing the database size
-          by a factor of four to five</para>
-          <indexterm zone="ch-system-findutils frcode">
-            <primary sortas="b-frcode">frcode</primary>
           </indexterm>
         </listitem>
Index: chapter06/flex.xml
===================================================================
--- chapter06/flex.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/flex.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -48,5 +48,7 @@
     <para>Prepare Flex for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr    \
+            --disable-static \
+            --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -89,5 +91,5 @@
       <seglistitem>
         <seg>flex, flex++ (link to flex), and lex (link to flex)</seg>
-        <seg>libfl.{a,so} and libfl_pic.{a,so}</seg>
+        <seg>libfl.so and libfl_pic.so</seg>
         <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>
Index: chapter06/gcc.xml
===================================================================
--- chapter06/gcc.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/gcc.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -140,5 +140,6 @@
 
 <screen><userinput remap="install">install -v -dm755 /usr/lib/bfd-plugins
-ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so /usr/lib/bfd-plugins/</userinput></screen>
+ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so \
+        /usr/lib/bfd-plugins/</userinput></screen>
 
     <para>Now that our final toolchain is in place, it is important to again ensure
Index: chapter06/gdbm.xml
===================================================================
--- chapter06/gdbm.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/gdbm.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -87,5 +87,5 @@
       <seglistitem>
         <seg>gdbm_dump, gdbm_load, and gdbmtool</seg>
-        <seg>libgdbm.{a,so} and libgdbm_compat.{a,so}</seg>
+        <seg>libgdbm.so and libgdbm_compat.so</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/gettext.xml
===================================================================
--- chapter06/gettext.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/gettext.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -61,5 +61,6 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install
+chmod -v 0755 /usr/lib/preloadable_libintl.so</userinput></screen>
 
   </sect2>
@@ -74,9 +75,9 @@
 
       <seglistitem>
-        <seg>autopoint, config.charset, config.rpath, envsubst, gettext, gettext.sh,
+        <seg>autopoint, 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>
-        <seg>libasprintf.{a,so}, libgettextlib.so, libgettextpo.{a,so},
+        <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
@@ -97,27 +98,4 @@
           <indexterm zone="ch-system-gettext autopoint">
             <primary sortas="b-autopoint">autopoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.charset">
-        <term><command>config.charset</command></term>
-        <listitem>
-          <para>Outputs a system-dependent table of character encoding
-          aliases</para>
-          <indexterm zone="ch-system-gettext config.charset">
-            <primary sortas="b-config.charset">config.charset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.rpath">
-        <term><command>config.rpath</command></term>
-        <listitem>
-          <para>Outputs a system-dependent set of variables, describing how
-          to set the runtime search path of shared libraries in an
-          executable</para>
-          <indexterm zone="ch-system-gettext config.rpath">
-            <primary sortas="b-config.rpath">config.rpath</primary>
           </indexterm>
         </listitem>
Index: chapter06/gmp.xml
===================================================================
--- chapter06/gmp.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/gmp.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -112,5 +112,5 @@
 
       <seglistitem>
-        <seg>libgmp.{a,so} and libgmpxx.{a,so}</seg>
+        <seg>libgmp.so and libgmpxx.so</seg>
         <seg>/usr/share/doc/gmp-&gmp-version;</seg>
       </seglistitem>
Index: chapter06/gperf.xml
===================================================================
--- chapter06/gperf.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/gperf.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -66,7 +66,9 @@
     <segmentedlist>
       <segtitle>Installed program</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>gperf</seg>
+        <seg>/usr/share/doc/gperf-&gperf-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/groff.xml
===================================================================
--- chapter06/groff.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/groff.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -74,11 +74,11 @@
 
       <seglistitem>
-        <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>
+        <seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk, glilypond,
+        gperl, gpinyin, grap2graph, grn, grodvi, groff, groffer, grog, grolbp,
+        grolj4, gropdf, grops, grotty, hpftodit, indxbib, lkbib, lookbib,
+        mmroff, neqn, nroff, pdfmom, pdfroff, pfbtops, pic, pic2graph,
+        post-grohtml, preconv, pre-grohtml, refer, roff2dvi, roff2html,
+        roff2pdf, roff2ps, roff2text, roff2x, soelim, tbl, tfmtodit, and
+        troff</seg>
         <seg>/usr/lib/groff and /usr/share/doc/groff-&groff-version;,
         /usr/share/groff</seg>
@@ -155,10 +155,33 @@
       </varlistentry>
 
-      <varlistentry id="geqn">
-        <term><command>geqn</command></term>
-        <listitem>
-          <para>A link to <command>eqn</command></para>
-          <indexterm zone="ch-system-groff geqn">
-            <primary sortas="b-geqn">geqn</primary>
+      <varlistentry id="glilypond">
+        <term><command>glilypond</command></term>
+        <listitem>
+          <para>Transforms sheet music written in the lilypond language into
+          the groff language</para>
+          <indexterm zone="ch-system-groff glilypond">
+            <primary sortas="b-glilypond">glilypond</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gperl">
+        <term><command>gperl</command></term>
+        <listitem>
+          <para>Preprocesor for groff, allowing addition of perl code
+          into groff files</para>
+          <indexterm zone="ch-system-groff gperl">
+            <primary sortas="b-gperl">gperl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpinyin">
+        <term><command>gpinyin</command></term>
+        <listitem>
+          <para>Preprocesor for groff, allowing addition of Chinese
+          European-like language Pinyin into groff files.</para>
+          <indexterm zone="ch-system-groff gpinyin">
+            <primary sortas="b-gpinyin">gpinyin</primary>
           </indexterm>
         </listitem>
@@ -255,4 +278,15 @@
       </varlistentry>
 
+      <varlistentry id="gropdf">
+        <term><command>gropdf</command></term>
+        <listitem>
+          <para>Translates the output of GNU <command>troff</command> to
+          PDF</para>
+          <indexterm zone="ch-system-groff gropdf">
+            <primary sortas="b-gropdf">gropdf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grops">
         <term><command>grops</command></term>
@@ -273,14 +307,4 @@
           <indexterm zone="ch-system-groff grotty">
             <primary sortas="b-grotty">grotty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtbl">
-        <term><command>gtbl</command></term>
-        <listitem>
-          <para>A link to <command>tbl</command></para>
-          <indexterm zone="ch-system-groff gtbl">
-            <primary sortas="b-gtbl">gtbl</primary>
           </indexterm>
         </listitem>
@@ -368,4 +392,15 @@
       </varlistentry>
 
+      <varlistentry id="pdfmom">
+        <term><command>pdfmom</command></term>
+        <listitem>
+          <para>Is a wrapper around groff that facilitates the production of PDF
+          documents from files formatted with the mom macros.</para>
+          <indexterm zone="ch-system-groff pdfmom">
+            <primary sortas="b-pdfmom">pdfmom</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="pdfroff">
         <term><command>pdfroff</command></term>
Index: chapter06/grub.xml
===================================================================
--- chapter06/grub.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/grub.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -95,12 +95,15 @@
       <seglistitem>
 
-       <seg>                      grub-bios-setup, grub-editenv,     grub-fstest,
-            grub-install,         grub-kbdcomp,    grub-menulst2cfg, grub-mkconfig,
+       <seg>grub-bios-setup,      grub-editenv,    grub-file,        grub-fstest,
+            grub-glue-efi,        grub-install,    grub-kbdcomp,     grub-macbless,   
+            grub-menulst2cfg,     grub-mkconfig,
                                   grub-mkimage,    grub-mklayout,    grub-mknetdir,
             grub-mkpasswd-pbkdf2, grub-mkrelpath,  grub-mkrescue,    grub-mkstandalone,
-            grub-ofpathname,      grub-probe,      grub-reboot,      grub-script-check,
-            grub-set-default,                      grub-sparc64-setup </seg>
-
-        <seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub, /boot/grub</seg>
+            grub-ofpathname,      grub-probe,      grub-reboot,      grub-render-label, 
+            grub-script-check,
+            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
+        is first run)</seg>
       </seglistitem>
     </segmentedlist>
@@ -131,4 +134,14 @@
       </varlistentry>
 
+      <varlistentry id="grub-file">
+        <term><command>grub-file</command></term>
+        <listitem>
+          <para>Checks if FILE is of the specified type.</para>
+          <indexterm zone="ch-system-grub grub-file">
+            <primary sortas="b-grub-file">grub-file</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grub-fstest">
         <term><command>grub-fstest</command></term>
@@ -137,4 +150,15 @@
           <indexterm zone="ch-system-grub grub-fstest">
             <primary sortas="b-grub-fstest">grub-fstest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="grub-glue-efi">
+        <term><command>grub-glue-efi</command></term>
+        <listitem>
+          <para>Processes ia32 and amd64 EFI images and glues them
+          according to Apple format.</para>
+          <indexterm zone="ch-system-grub grub-glue-efi">
+            <primary sortas="b-grub-glue-efi">grub-glue-efi</primary>
           </indexterm>
         </listitem>
@@ -162,4 +186,14 @@
       </varlistentry>
 
+      <varlistentry id="grub-macbless">
+        <term><command>grub-macbless</command></term>
+        <listitem>
+          <para>Mac-style bless on HFS or HFS+ files</para>
+          <indexterm zone="ch-system-grub grub-macbless">
+            <primary sortas="b-grub-macbless">grub-macbless</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grub-menulst2cfg">
         <term><command>grub-menulst2cfg</command></term>
@@ -284,4 +318,14 @@
       </varlistentry>
 
+      <varlistentry id="grub-render-label">
+        <term><command>grub-render-label</command></term>
+        <listitem>
+          <para>Render Apple .disk_label for Apple Macs</para>
+          <indexterm zone="ch-system-grub grub-render-label">
+            <primary sortas="b-grub-render-label">grub-render-label</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grub-script-check">
         <term><command>grub-script-check</command></term>
@@ -314,4 +358,14 @@
       </varlistentry>
 
+      <varlistentry id="grub-syslinux2cfg">
+        <term><command>grub-syslinux2cfg</command></term>
+        <listitem>
+          <para>Transform a syslinux config file into grub.cfg format</para>
+          <indexterm zone="ch-system-grub grub-syslinux2cfg">
+            <primary sortas="b-grub-syslinux2cfg">grub-syslinux2cfg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: chapter06/gzip.xml
===================================================================
--- chapter06/gzip.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/gzip.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -72,6 +72,6 @@
 
       <seglistitem>
-        <seg>gunzip, gzexe, gzip, uncompress, zcat, zcmp, zdiff, zegrep, zfgrep,
-        zforce, zgrep, zless, zmore, and znew</seg>
+        <seg>gunzip, gzexe, gzip, uncompress (hard link with gunzip), zcat, zcmp, 
+        zdiff, zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/inetutils.xml
===================================================================
--- chapter06/inetutils.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/inetutils.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -134,6 +134,6 @@
 
       <seglistitem>
-        <seg>ftp, ifconfig, hostname, ping, ping6, rcp, rexec, rlogin, 
-        rsh, talk, telnet, tftp, and traceroute</seg>
+        <seg>dnsdomainname, ftp, ifconfig, hostname, ping, ping6, 
+        talk, telnet, tftp, and traceroute</seg>
       </seglistitem>
     </segmentedlist>
@@ -144,4 +144,14 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="dnsdomainname">
+        <term><command>dnsdomainname</command></term>
+        <listitem>
+        <para>Show the system's DNS domain name</para>
+        <indexterm zone="ch-system-inetutils dnsdomainname">
+          <primary sortas="b-dnsdomainname">dnsdomainname</primary>
+        </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="ftp">
         <term><command>ftp</command></term>
@@ -154,4 +164,14 @@
       </varlistentry>
 
+      <varlistentry id="hostname">
+        <term><command>hostname</command></term>
+        <listitem>
+          <para>Reports or sets the name of the host</para>
+          <indexterm zone="ch-system-inetutils hostname">
+            <primary sortas="b-hostname">hostname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="ifconfig">
         <term><command>ifconfig</command></term>
@@ -161,14 +181,4 @@
           <primary sortas="b-ifconfig">ifconfig</primary>
         </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hostname">
-        <term><command>hostname</command></term>
-        <listitem>
-          <para>Reports or sets the name of the host</para>
-          <indexterm zone="ch-system-inetutils hostname">
-            <primary sortas="b-hostname">hostname</primary>
-          </indexterm>
         </listitem>
       </varlistentry>
Index: chapter06/kbd.xml
===================================================================
--- chapter06/kbd.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/kbd.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -134,8 +134,8 @@
         mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to
         psfxtable), psfstriptable (link to psfxtable), psfxtable, <!--resizecons,-->
-        setfont, setkeycodes, setleds, setmetamode,
+        setfont, setkeycodes, setleds, setmetamode, setvtrgb,
         showconsolefont, showkey, unicode_start, and unicode_stop</seg>
-        <seg>/usr/share/consolefonts, /usr/share/consoletrans, /usr/share/keymaps,
-        and /usr/share/unimaps</seg>
+        <seg>/usr/share/consolefonts, /usr/share/consoletrans, /usr/share/keymaps, 
+        /usr/share/doc/kbd-&kbd-version;,  and /usr/share/unimaps</seg>
       </seglistitem>
     </segmentedlist>
@@ -310,14 +310,4 @@
       </varlistentry>
 
-  <!--<varlistentry id="resizecons">
-        <term><command>resizecons</command></term>
-        <listitem>
-          <para>Changes the kernel idea of the console size</para>
-          <indexterm zone="ch-system-kbd resizecons">
-            <primary sortas="b-resizecons">resizecons</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
       <varlistentry id="setfont">
         <term><command>setfont</command></term>
@@ -358,4 +348,14 @@
           <indexterm zone="ch-system-kbd setmetamode">
             <primary sortas="b-setmetamode">setmetamode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setvtrgb">
+        <term><command>setvtrgb</command></term>
+        <listitem>
+          <para>Sets the console color map in all virtual terminals</para>
+          <indexterm zone="ch-system-kbd setvtrgb">
+            <primary sortas="b-setvtrgb">setvtrgb</primary>
           </indexterm>
         </listitem>
Index: chapter06/libcap.xml
===================================================================
--- chapter06/libcap.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/libcap.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -92,5 +92,5 @@
       <seglistitem>
         <seg>capsh, getcap, getpcaps, and setcap</seg>
-        <seg>libcap.{a,so}</seg>
+        <seg>libcap.so</seg>
       </seglistitem>
     </segmentedlist>
Index: chapter06/libtool.xml
===================================================================
--- chapter06/libtool.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/libtool.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -76,5 +76,5 @@
       <seglistitem>
         <seg>libtool and libtoolize</seg>
-        <seg>libltdl.{a,so}</seg>
+        <seg>libltdl.so</seg>
         <seg>/usr/include/libltdl and /usr/share/libtool</seg>
       </seglistitem>
Index: chapter06/man-db.xml
===================================================================
--- chapter06/man-db.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/man-db.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -280,7 +280,7 @@
       <seglistitem>
         <seg>accessdb, apropos (link to whatis), catman, lexgrog, man, mandb,
-        manpath, whatis, and zsoelim</seg>
+        manpath, and whatis</seg>
         <seg>libman.so and libmandb.so</seg>
-        <seg>/usr/lib/man-db, /usr/libexec/man-db,
+        <seg>/usr/lib/man-db, /usr/lib/tmpfiles.d, /usr/libexec/man-db,
         and /usr/share/doc/man-db-&man-db-version;</seg>
       </seglistitem>
@@ -380,16 +380,4 @@
       </varlistentry>
 
-      <varlistentry id="zsoelim">
-        <term><command>zsoelim</command></term>
-        <listitem>
-          <para>Reads files and replaces lines of the form <emphasis>.so
-          file</emphasis> by the contents of the mentioned
-          <emphasis>file</emphasis></para>
-          <indexterm zone="ch-system-man-db zsoelim">
-            <primary sortas="b-zsoelim">zsoelim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libman">
         <term><filename class="libraryfile">libman</filename></term>
Index: chapter06/mpc.xml
===================================================================
--- chapter06/mpc.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/mpc.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -74,5 +74,5 @@
 
       <seglistitem>
-        <seg>libmpc.{a,so}</seg>
+        <seg>libmpc.so</seg>
         <seg>/usr/share/doc/mpc-&mpc-version;</seg>
       </seglistitem>
Index: chapter06/mpfr.xml
===================================================================
--- chapter06/mpfr.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/mpfr.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -84,5 +84,5 @@
 
       <seglistitem>
-        <seg>libmpfr.{a,so}</seg>
+        <seg>libmpfr.so</seg>
         <seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
       </seglistitem>
Index: chapter06/ncurses.xml
===================================================================
--- chapter06/ncurses.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/ncurses.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -189,4 +189,5 @@
            libmenuw.so, 
            libncursesw.so,
+           libncurses++w.a,
            libpanelw.so, and their non-wide-character counterparts without "w"
               in the library names.</seg>
Index: chapter06/perl.xml
===================================================================
--- chapter06/perl.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/perl.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -136,12 +136,11 @@
 
       <seglistitem>
-        <seg>a2p, c2ph, corelist, cpan, cpan2dist, cpanp,
-        cpanp-run-perl, enc2xs, find2perl, h2ph, h2xs,
-        instmodsh, json_pp, libnetcfg, perl, perl&perl-version; (link to perl),
-        perlbug, 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>
-        <seg>Several hundred which cannot all be listed here</seg>
+        <seg>c2ph, corelist, cpan, enc2xs, encguess, h2ph, h2xs, instmodsh,
+        json_pp, libnetcfg, perl, perl&perl-version; (hard link to perl),
+        perlbug, perldoc, perlivp, perlthanks (hard link to perlbug), piconv,
+        pl2pm, pod2html, pod2man, pod2text, pod2usage, podchecker, podselect,
+        prove, pstruct (hard link to c2ph), ptar, ptardiff, ptargrep, shasum,
+        splain, xsubpp, and zipdetails</seg>
+        <seg>Many which cannot all be listed here</seg>
         <seg>/usr/lib/perl5</seg>
       </seglistitem>
@@ -233,4 +232,14 @@
           <indexterm zone="ch-system-perl enc2xs">
             <primary sortas="b-enc2xs">enc2xs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="encguess">
+        <term><command>encguess</command></term>
+        <listitem>
+          <para>Guess the encoding type of one or several files</para>
+          <indexterm zone="ch-system-perl encguess">
+            <primary sortas="b-encguess">encguess</primary>
           </indexterm>
         </listitem>
@@ -473,14 +482,4 @@
       </varlistentry>
 
-      <varlistentry id="psed">
-        <term><command>psed</command></term>
-        <listitem>
-          <para>A Perl version of the stream editor <command>sed</command></para>
-          <indexterm zone="ch-system-perl psed">
-            <primary sortas="b-psed">psed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="pstruct">
         <term><command>pstruct</command></term>
Index: chapter06/readline.xml
===================================================================
--- chapter06/readline.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/readline.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -106,6 +106,6 @@
 
       <seglistitem>
-        <seg>libhistory.{a,so} and libreadline.{a,so}</seg>
-        <seg>/usr/include/readline, /usr/share/readline, and
+        <seg>libhistory.so and libreadline.so</seg>
+        <seg>/usr/include/readline and
         /usr/share/doc/readline-&readline-version;</seg>
       </seglistitem>
Index: chapter06/revisedchroot.xml
===================================================================
--- chapter06/revisedchroot.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/revisedchroot.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -47,10 +47,9 @@
   remove them now:</para>
 
-<screen><userinput>rm /usr/lib/lib{bfd,opcodes}.a
-rm /usr/lib/libbz2.a
-rm /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
-<!--rm /usr/lib/lib{fl,fl_pic}.a
--->rm /usr/lib/libltdl.a
-rm /usr/lib/libz.a</userinput></screen>
+<screen><userinput>rm -f /usr/lib/lib{bfd,opcodes}.a
+rm -f /usr/lib/libbz2.a
+rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
+rm -f /usr/lib/libltdl.a
+rm -f /usr/lib/libz.a</userinput></screen>
 
 <!-- Flex shared library is broken. Keep static until next flex release. -->
Index: chapter06/shadow.xml
===================================================================
--- chapter06/shadow.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/shadow.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -212,7 +212,7 @@
         <seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
         groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
-        lastlog, login, logoutd, newgrp, newusers, nologin, passwd, pwck,
-        pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
-        vigr (link to vipw), and vipw</seg>
+        lastlog, login, logoutd, newgidmap, newgrp, newuidmap, newusers,
+        nologin, passwd, pwck, pwconv, pwunconv, sg (link to newgrp), su,
+        useradd, userdel, usermod, vigr (link to vipw), and vipw</seg>
         <seg>/etc/default</seg>
       </seglistitem>
@@ -415,4 +415,14 @@
       </varlistentry>
 
+      <varlistentry id="newgidmap">
+        <term><command>newgidmap</command></term>
+        <listitem>
+          <para>Is used to set the gid mapping of a user namespace</para>
+          <indexterm zone="ch-system-shadow newgidmap">
+            <primary sortas="b-newgidmap">newgidmap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="newgrp">
         <term><command>newgrp</command></term>
@@ -421,4 +431,14 @@
           <indexterm zone="ch-system-shadow newgrp">
             <primary sortas="b-newgrp">newgrp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="newuidmap">
+        <term><command>newuidmap</command></term>
+        <listitem>
+          <para>Is used to set the uid mapping of a user namespace</para>
+          <indexterm zone="ch-system-shadow newuidmap">
+            <primary sortas="b-newuidmap">newuidmap</primary>
           </indexterm>
         </listitem>
Index: chapter06/tar.xml
===================================================================
--- chapter06/tar.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/tar.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -77,9 +77,5 @@
 <screen><userinput remap="install">make install
 make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
-<!--
-    <para>Finally, generate the man page and place it in the proper location:</para>
 
-<screen><userinput remap="install">perl tarman &gt; /usr/share/man/man1/tar.1</userinput></screen>
--->
   </sect2>
 
@@ -93,5 +89,5 @@
 
       <seglistitem>
-        <seg>rmt and tar</seg>
+        <seg>tar</seg>
         <seg>/usr/share/doc/tar-&tar-version;</seg>
       </seglistitem>
@@ -102,15 +98,4 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rmt">
-        <term><command>rmt</command></term>
-        <listitem>
-          <para>Remotely manipulates a magnetic
-          tape drive through an interprocess communication connection</para>
-          <indexterm zone="ch-system-tar rmt">
-            <primary sortas="b-rmt">rmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="tar">
Index: chapter06/texinfo.xml
===================================================================
--- chapter06/texinfo.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/texinfo.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -102,5 +102,5 @@
 
       <seglistitem>
-        <seg>info, infokey, install-info, makeinfo (link to texi2any),
+        <seg>info, install-info, makeinfo (link to texi2any),
         pdftexi2dvi, pod2texi, texi2any, texi2dvi, texi2pdf, and texindex</seg>
         <seg>/usr/share/texinfo</seg>
@@ -126,15 +126,4 @@
       </varlistentry>
 
-      <varlistentry id="infokey">
-        <term><command>infokey</command></term>
-        <listitem>
-          <para>Compiles a source file containing Info customizations into a
-          binary format</para>
-          <indexterm zone="ch-system-texinfo infokey">
-            <primary sortas="b-infokey">infokey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="install-info">
         <term><command>install-info</command></term>
Index: chapter06/util-linux.xml
===================================================================
--- chapter06/util-linux.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter06/util-linux.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -124,16 +124,20 @@
         i386, ionice, ipcmk, ipcrm, ipcs, isosize, kill, last, lastb (link to
         last), ldattach, linux32, linux64, logger, look, losetup, lsblk, lscpu,
-        lslocks, lslogins, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
-        more, mount, mountpoint, namei, partx, pg, pivot_root, prlimit, raw,
+        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,
         scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
         swapoff (link to swapon), swapon, switch_root, tailf, taskset, ul,
-        umount, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis,
+        umount, uname26, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis,
         wipefs, x86_64, and zramctl</seg>
-        <seg>libblkid.{a,so}, libfdisk.{a,so}, libmount.{a,so}, 
-        libsmartcols.{a,so}, and libuuid.{a,so}</seg>
-        <seg>/etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount, 
-        /usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt, 
-        and /var/lib/hwclock</seg>
+        <seg>libblkid.so, libfdisk.so, libmount.so, 
+        libsmartcols.so, and libuuid.so</seg>
+        <seg>/usr/include/blkid, 
+             /usr/include/libfdisk, 
+             /usr/include/libmount, 
+             /usr/include/libsmartcols, 
+             /usr/include/uuid, 
+             /usr/share/doc/util-linux-&util-linux-version;, 
+         and /var/lib/hwclock</seg>
       </seglistitem>
     </segmentedlist>
@@ -642,4 +646,15 @@
       </varlistentry>
 
+      <varlistentry id="lsipc">
+        <term><command>lsipc</command></term>
+        <listitem>
+          <para>Prints information on IPC facilities currently employed
+          in the system</para>
+          <indexterm zone="ch-system-util-linux lsipc">
+            <primary sortas="b-lsipc">lsipc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="lslocks">
         <term><command>lslocks</command></term>
@@ -1058,4 +1073,14 @@
       </varlistentry>
 
+      <varlistentry id="uname26">
+        <term><command>uname26</command></term>
+        <listitem>
+          <para>A symbolic link to setarch</para>
+          <indexterm zone="ch-system-util-linux uname26">
+            <primary sortas="b-uname26">uname26</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="unshare">
         <term><command>unshare</command></term>
Index: chapter08/kernel.xml
===================================================================
--- chapter08/kernel.xml	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ chapter08/kernel.xml	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -76,6 +76,6 @@
 Device Drivers  ---&gt;
   Generic Driver Options  ---&gt;
-    [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
-    [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]</screen></note>
+   [ ] Support for uevent helper [CONFIG_UEVENT_HELPER]
+   [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS]</screen></note>
 
     <para>There are several other options that may be desired depending
Index: general.ent
===================================================================
--- general.ent	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ general.ent	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -1,6 +1,6 @@
-<!ENTITY version         "SVN-20151011">
+<!ENTITY version         "SVN-20151012">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;. Change to x.y for release 
                                       but not -rc releases -->
-<!ENTITY releasedate     "October 11, 2015">
+<!ENTITY releasedate     "October 12, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
Index: packages.ent
===================================================================
--- packages.ent	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ packages.ent	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -29,5 +29,5 @@
 <!ENTITY autoconf-home "&gnu-software;autoconf/">
 <!ENTITY autoconf-ch6-du "17.3 MB">
-<!ENTITY autoconf-ch6-sbu "4.0 SBU">
+<!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about 4.7 SBU with tests)">
 
 <!ENTITY automake-version "1.15">
@@ -383,10 +383,10 @@
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "2">
-<!ENTITY linux-patch-version "1">
+<!ENTITY linux-patch-version "3">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "83,514 KB">
+<!ENTITY linux-size "83,520 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "2a538d1dac3f5426c7a8ab8ef20e95c2">
+<!ENTITY linux-md5 "936530a3b28f38ec9dbfa1fcabe9acd4">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
@@ -421,8 +421,8 @@
 <!ENTITY make-ch6-sbu "0.6 SBU">
 
-<!ENTITY man-db-version "2.7.3">
-<!ENTITY man-db-size "1,468 KB">
+<!ENTITY man-db-version "2.7.4">
+<!ENTITY man-db-size "1,469 KB">
 <!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "df898c82d766dad6492a5a96d5a26647">
+<!ENTITY man-db-md5 "1b400af5b03c7ac44769dbfdd28a86fc">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "30 MB">
@@ -578,8 +578,8 @@
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
-<!ENTITY tzdata-version "2015f">
-<!ENTITY tzdata-size "292 KB">
+<!ENTITY tzdata-version "2015g">
+<!ENTITY tzdata-size "294 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "e3b82732d20e973e48af1c6f13df9a1d">
+<!ENTITY tzdata-md5 "8d46e8b225b9a04c75f5c39636435ad6">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 
Index: pdf-fixups.sh
===================================================================
--- pdf-fixups.sh	(revision a0afc1b210511f9da42c74a7d424ff79fbb1d8fd)
+++ pdf-fixups.sh	(revision 040ecb6de9078e372b188f7ac210f95f48e4d1b7)
@@ -15,2 +15,4 @@
 #sed -i -e "$LINE s/monospace/&\" font-size=\"9pt/" $FILE
 
+# Break a block of code at the right place
+sed -i -e 's@gcc --version@<fo:block page-break-before="always"></fo:block>&@' $FILE
