Index: BOOK/final-system/common/automake.xml
===================================================================
--- BOOK/final-system/common/automake.xml	(revision ddf299bfd62b41214229acbd8d1265253fec56e0)
+++ BOOK/final-system/common/automake.xml	(revision 59fb197f5c955759dc03aa48b4797a54590fdb99)
@@ -47,6 +47,6 @@
 
       <seglistitem>
-        <seg>acinstall, aclocal, aclocal-&automake-version;, automake,
-        automake-&automake-version;, compile, config.guess, config.sub,
+        <seg>acinstall, aclocal, aclocal-1.9, automake,
+        automake-1.9, compile, config.guess, config.sub,
         depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs,
         py-compile, symlink-tree, and ylwrap</seg>
@@ -81,5 +81,5 @@
 
       <varlistentry id="aclocal-version">
-        <term><command>aclocal-&automake-version;</command></term>
+        <term><command>aclocal-1.9</command></term>
         <listitem>
           <para>A hard link to <command>aclocal</command></para>
@@ -109,5 +109,5 @@
 
       <varlistentry id="automake-version">
-        <term><command>automake-&automake-version;</command></term>
+        <term><command>automake-1.9</command></term>
         <listitem>
           <para>A hard link to <command>automake</command></para>
Index: BOOK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml	(revision ddf299bfd62b41214229acbd8d1265253fec56e0)
+++ BOOK/final-system/common/iproute2.xml	(revision 59fb197f5c955759dc03aa48b4797a54590fdb99)
@@ -93,5 +93,5 @@
           <para>Connection status utility</para>
           <indexterm zone="ch-system-iproute2 ctstat">
-            <primary sortas="b-cstat">ctstat</primary>
+            <primary sortas="b-ctstat">ctstat</primary>
           </indexterm>
         </listitem>
@@ -165,5 +165,5 @@
           program</para>
           <indexterm zone="ch-system-iproute2 lnstat">
-            <primary sortas="b-cstat">lnstat</primary>
+            <primary sortas="b-lnstat">lnstat</primary>
           </indexterm>
         </listitem>
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision ddf299bfd62b41214229acbd8d1265253fec56e0)
+++ BOOK/final-system/common/kbd.xml	(revision 59fb197f5c955759dc03aa48b4797a54590fdb99)
@@ -63,10 +63,10 @@
 
       <seglistitem>
-        <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, getunimap,
-        kbd_mode, kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable
+        <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbd_mode,
+        kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable
         (link to psfxtable), psfgettable (link to psfxtable), psfstriptable
         (link to psfxtable), psfxtable, resizecons, setfont, setkeycodes,
-        setleds, setlogcons, setmetamode, setvesablank, showconsolefont,
-        showkey, unicode_start, and unicode_stop</seg>
+        setleds, setmetamode, showconsolefont, showkey, unicode_start, and
+        unicode_stop</seg>
       </seglistitem>
     </segmentedlist>
@@ -123,14 +123,4 @@
           <indexterm zone="ch-system-kbd getkeycodes">
             <primary sortas="b-getkeycodes">getkeycodes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getunimap">
-        <term><command>getunimap</command></term>
-        <listitem>
-          <para>Prints the currently used unicode-to-font mapping table</para>
-          <indexterm zone="ch-system-kbd getunimap">
-            <primary sortas="b-getunimap">getunimap</primary>
           </indexterm>
         </listitem>
@@ -281,14 +271,4 @@
       </varlistentry>
 
-      <varlistentry id="setlogcons">
-        <term><command>setlogcons</command></term>
-        <listitem>
-          <para>Sends kernel messages to the console</para>
-          <indexterm zone="ch-system-kbd setlogcons">
-            <primary sortas="b-setlogcons">setlogcons</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="setmetamode">
         <term><command>setmetamode</command></term>
@@ -297,15 +277,4 @@
           <indexterm zone="ch-system-kbd setmetamode">
             <primary sortas="b-setmetamode">setmetamode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setvesablank">
-        <term><command>setvesablank</command></term>
-        <listitem>
-          <para>Lets the user adjust the built-in hardware screensaver (a blank
-          screen)</para>
-          <indexterm zone="ch-system-kbd setvesablank">
-            <primary sortas="b-setvesablank">setvesablank</primary>
           </indexterm>
         </listitem>
Index: BOOK/final-system/common/module-init-tools.xml
===================================================================
--- BOOK/final-system/common/module-init-tools.xml	(revision ddf299bfd62b41214229acbd8d1265253fec56e0)
+++ BOOK/final-system/common/module-init-tools.xml	(revision 59fb197f5c955759dc03aa48b4797a54590fdb99)
@@ -60,6 +60,7 @@
 
       <seglistitem>
-        <seg>depmod, insmod, insmod.static, lsmod (link to insmod),
-        modinfo, modprobe (link to insmod), and rmmod (link to insmod)</seg>
+        <seg>depmod, generate-modprobe.conf, insmod, insmod.static,
+        lsmod (link to insmod), modinfo, modprobe (link to insmod), and
+        rmmod (link to insmod)</seg>
       </seglistitem>
     </segmentedlist>
@@ -79,4 +80,15 @@
           <indexterm zone="ch-system-module-init-tools depmod">
             <primary sortas="b-depmod">depmod</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="generate-modprobe.conf">
+        <term><command>generate-modprobe.conf</command></term>
+        <listitem>
+          <para>Creates a modprobe.conf file from an existing 2.2 or 2.4
+          module setup</para>
+          <indexterm zone="ch-system-module-init-tools generate-modprobe.conf">
+            <primary sortas="b-generate-modprobe.conf">generate-modprobe.conf</primary>
           </indexterm>
         </listitem>
Index: BOOK/final-system/common/perl.xml
===================================================================
--- BOOK/final-system/common/perl.xml	(revision ddf299bfd62b41214229acbd8d1265253fec56e0)
+++ BOOK/final-system/common/perl.xml	(revision 59fb197f5c955759dc03aa48b4797a54590fdb99)
@@ -86,5 +86,5 @@
 
       <seglistitem>
-        <seg>a2p, c2ph, dprofpp, enc2xs, find2perl, h2ph, h2xs, libnetcfg,
+        <seg>a2p, c2ph, dprofpp, find2perl, h2ph, h2xs, libnetcfg,
         perl, perl&perl-version; (link to perl), perlbug, perlcc, perldoc,
         perlivp, piconv, pl2pm, pod2html, pod2latex, pod2man, pod2text,
@@ -131,15 +131,4 @@
       </varlistentry>
 
-      <varlistentry id="en2cxs">
-        <term><command>en2cxs</command></term>
-        <listitem>
-          <para>Builds a Perl extension for the Encode module from either
-          Unicode Character Mappings or Tcl Encoding Files</para>
-          <indexterm zone="ch-system-perl en2cxs">
-            <primary sortas="b-en2cxs">en2cxs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="find2perl">
         <term><command>find2perl</command></term>
@@ -191,5 +180,5 @@
           <para>Combines some of the best features of C, <command>sed</command>,
           <command>awk</command> and <command>sh</command> into a single
-          swiss-army language</para>
+          swiss-army-knife language</para>
           <indexterm zone="ch-system-perl perl">
             <primary sortas="b-perl">perl</primary>
Index: BOOK/final-system/common/psmisc.xml
===================================================================
--- BOOK/final-system/common/psmisc.xml	(revision ddf299bfd62b41214229acbd8d1265253fec56e0)
+++ BOOK/final-system/common/psmisc.xml	(revision 59fb197f5c955759dc03aa48b4797a54590fdb99)
@@ -108,4 +108,15 @@
       </varlistentry>
 
+      <varlistentry id="oldfuser">
+        <term><command>oldfuser</command></term>
+        <listitem>
+          <para>Reports the Process IDs (PIDs) of processes that use the given
+          files or file systems</para>
+          <indexterm zone="ch-system-psmisc oldfuser">
+            <primary sortas="b-oldfuser">oldfuser</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="pstree">
         <term><command>pstree</command></term>
Index: BOOK/final-system/common/shadow.xml
===================================================================
--- BOOK/final-system/common/shadow.xml	(revision ddf299bfd62b41214229acbd8d1265253fec56e0)
+++ BOOK/final-system/common/shadow.xml	(revision 59fb197f5c955759dc03aa48b4797a54590fdb99)
@@ -171,10 +171,4 @@
 <screen role="nodump"><userinput>grpconv</userinput></screen>
 
-    <para>Under normal circumstances, passwords will not have been created
-    yet. However, if returning to this section later to enable shadowing,
-    reset any current user passwords with the <command>passwd</command>
-    command or any group passwords with the <command>gpasswd</command>
-    command.</para>
-
   </sect2>
 
@@ -197,7 +191,7 @@
 
       <seglistitem>
-        <seg>chage, chfn, chpasswd, chsh, expiry, faillog, gpasswd, groupadd,
-        groupdel, groupmod, grpck, grpconv, grpunconv, lastlog, login,
-        logoutd, newgrp, newusers, passwd, pwck, pwconv, pwunconv,
+        <seg>chage, chfn, chpasswd, chgpasswd, chsh, expiry, faillog, gpasswd,
+        groupadd, groupdel, groupmod, grpck, grpconv, grpunconv, lastlog,
+        login, logoutd, newgrp, newusers, passwd, pwck, pwconv, pwunconv,
         sg (link to newgrp), useradd, userdel, usermod, vigr (link to vipw),
         and vipw</seg>
@@ -232,4 +226,14 @@
       </varlistentry>
 
+      <varlistentry id="chgpasswd">
+        <term><command>chgpasswd</command></term>
+        <listitem>
+          <para>Used to update group passwords in batch mode</para>
+          <indexterm zone="ch-system-shadow chgpasswd">
+            <primary sortas="b-chgpasswd">chgpasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="chpasswd">
         <term><command>chpasswd</command></term>
Index: BOOK/final-system/common/sysvinit.xml
===================================================================
--- BOOK/final-system/common/sysvinit.xml	(revision ddf299bfd62b41214229acbd8d1265253fec56e0)
+++ BOOK/final-system/common/sysvinit.xml	(revision 59fb197f5c955759dc03aa48b4797a54590fdb99)
@@ -122,5 +122,5 @@
 
       <seglistitem>
-        <seg>halt, init, killall5, last, lastb (link to last), mesg, pidof
+        <seg>halt, init, killall5, last, lastb (link to last), mesg, mountpoint, pidof
         (link to killall5), poweroff (link to halt), reboot (link to halt),
         runlevel, shutdown, sulogin, telinit (link to init), utmpdump,
@@ -206,4 +206,14 @@
       </varlistentry>
 
+      <varlistentry id="mountpoint">
+        <term><command>mountpoint</command></term>
+        <listitem>
+          <para>Tells you whether or not a directory is a mount point.</para>
+          <indexterm zone="ch-system-sysvinit mountpoint">
+            <primary sortas="b-mountpoint">mountpoint</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="pidof">
         <term><command>pidof</command></term>
Index: BOOK/final-system/common/udev.xml
===================================================================
--- BOOK/final-system/common/udev.xml	(revision ddf299bfd62b41214229acbd8d1265253fec56e0)
+++ BOOK/final-system/common/udev.xml	(revision 59fb197f5c955759dc03aa48b4797a54590fdb99)
@@ -139,4 +139,15 @@
       </varlistentry>
 
+      <varlistentry id="udevsettle">
+        <term><command>udevsettle</command></term>
+        <listitem>
+          <para>Watches the Udev event queue and exits if all current uevents
+          have been handled</para>
+          <indexterm zone="ch-system-udev udevsettle">
+            <primary sortas="b-udevsettle">udevsettle</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="udevtest">
         <term><command>udevtest</command></term>
@@ -163,4 +174,15 @@
       </varlistentry>
 
+      <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-udev ata_id">
+            <primary sortas="b-ata_id">ata_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="cdrom_id">
         <term><command>cdrom_id</command></term>
@@ -173,10 +195,31 @@
       </varlistentry>
 
-      <varlistentry id="firmware_helper">
+      <varlistentry id="create_floppy_devices">
+        <term><command>create_floppy_devices</command></term>
+        <listitem>
+          <para>Creates all possible floppy devices based on the CMOS type</para>
+          <indexterm zone="ch-system-udev create_floppy_devices">
+            <primary sortas="b-create_floppy_devices">create_floppy_devices</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="firmware.sh">
         <term><command>firmware.sh</command></term>
         <listitem>
 	  <para>To be written</para>  
-          <indexterm zone="ch-system-udev firmware_helper">
-            <primary sortas="b-firmware_helper">firmware.sh</primary>
+          <indexterm zone="ch-system-udev firmware.sh">
+            <primary sortas="b-firmware.sh">firmware.sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="path_id">
+        <term><command>path_id</command></term>
+        <listitem>
+          <para>Provide the shortest possible unique hardware path to a
+          device</para>
+          <indexterm zone="ch-system-udev path_id">
+            <primary sortas="b-path_id">path_id</primary>
           </indexterm>
         </listitem>
@@ -193,20 +236,10 @@
       </varlistentry>
 
-      <varlistentry id="volume_id">
-        <term><command>volume_id</command></term>
-        <listitem>
-	  <para>To be written</para>  
-          <indexterm zone="ch-system-udev volume_id">
-            <primary sortas="b-volume_id">volume_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ata_id">
-        <term><command>ata_id</command></term>
-        <listitem>
-	  <para>To be written</para>  
-          <indexterm zone="ch-system-udev ata_id">
-            <primary sortas="b-volume_id">ata_id</primary>
+      <varlistentry id="vol_id">
+        <term><command>vol_id</command></term>
+        <listitem>
+	  <para>To be written</para>  
+          <indexterm zone="ch-system-udev vol_id">
+            <primary sortas="b-vol_id">vol_id</primary>
           </indexterm>
         </listitem>
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision ddf299bfd62b41214229acbd8d1265253fec56e0)
+++ BOOK/final-system/common/util-linux.xml	(revision 59fb197f5c955759dc03aa48b4797a54590fdb99)
@@ -52,4 +52,9 @@
 
 <screen os="p4"><userinput>patch -Np1 -i ../&util-linux-gcc4_fixes-patch;</userinput></screen>
+
+   <para os="p5">The following patch fixes swapon.c, it tries to find the
+   variable R_OK, but the header that has R_OK is not included:</para>
+
+<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-missing_header-patch;</userinput></screen>
 
     <para os="s1">The following sed prevents the installed files from being
@@ -135,5 +140,5 @@
         ramsize (link to rdev), raw, rdev, readprofile, rename, renice, rev,
         rootflags (link to rdev), script, setfdprm, setsid, setterm, sfdisk,
-        swapdev, swapoff (link to swapon), swapon, tunelp, ul, umount, vidmode
+        swapoff (link to swapon), swapon, tunelp, ul, umount, vidmode
         (link to rdev), whereis, and write</seg>
       </seglistitem>
@@ -695,14 +700,4 @@
       </varlistentry>
 
-      <varlistentry id="swapdev">
-        <term><command>swapdev</command></term>
-        <listitem>
-          <para>Sets the swap device in a bootable image</para>
-          <indexterm zone="ch-system-util-linux swapdev">
-            <primary sortas="b-swapdev">swapdev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="swapoff">
         <term><command>swapoff</command></term>
