Index: BOOK/final-system/common/udev.xml
===================================================================
--- BOOK/final-system/common/udev.xml	(revision 28d689523b366c4c4f1f7dacb9ea7d3e25b7dade)
+++ BOOK/final-system/common/udev.xml	(revision 3a9adc5c48c22e64183913743ad489e5428db618)
@@ -96,8 +96,8 @@
 
       <seglistitem>
-        <seg>udevcontrol, udevd, udevinfo, udevmonitor, udevsettle,
-        udevtest, and udevtrigger</seg>
+        <seg>udevadm, udevd, udevinfo, (symlink to udevadm),
+        udevsettle (symlink to udevadm)</seg>
         <seg>libvolume_id</seg>
-        <seg>/etc/udev</seg>
+        <seg>/etc/udev, /lib/udev</seg>
       </seglistitem>
     </segmentedlist>
@@ -108,11 +108,25 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="udevcontrol">
-        <term><command>udevcontrol</command></term>
+      <varlistentry id="udevadm">
+        <term><command>udevadm</command></term>
+        <listitem>
+          <para>This program combines <command>udevinfo</command>,
+          <command>udevtrigger</command>, <command>udevsettle</command>,
+          <command>udevcontrol</command>, <command>udevmonitor</command>,
+          and <command>udevtest</command> into one command.</para>
+          <indexterm zone="ch-system-udev udevadm">
+            <primary sortas="b-udevadm">udevadm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevadm-control">
+        <term><command>udevadm control</command></term>
         <listitem>
           <para>Configures a number of options for the running
-          <command>udevd</command> daemon, such as the log level.</para>
-          <indexterm zone="ch-system-udev udevcontrol">
-            <primary sortas="b-udevcontrol">udevcontrol</primary>
+          <command>udevd</command> daemon, such as the log level. (Symlink to
+          udevadm)</para>
+          <indexterm zone="ch-system-udev udevadm-control">
+            <primary sortas="b-udevadm-control">udevadm control</primary>
           </indexterm>
         </listitem>
@@ -138,5 +152,5 @@
           provides a way to query any device in the <systemitem
           class="filesystem">sysfs</systemitem> tree to help create udev
-          rules</para>
+          rules. (Symlink to udevadm)</para>
           <indexterm zone="ch-system-udev udevinfo">
             <primary sortas="b-udevinfo">udevinfo</primary>
@@ -145,11 +159,11 @@
       </varlistentry>
 
-      <varlistentry id="udevmonitor">
-        <term><command>udevmonitor</command></term>
+      <varlistentry id="udevadm-monitor">
+        <term><command>udevadm monitor</command></term>
         <listitem>
           <para>Prints the event received from the kernel and the event which
           <command>udev</command> sends out after rule processing</para>
-          <indexterm zone="ch-system-udev udevmonitor">
-            <primary sortas="b-udevmonitor">udevmonitor</primary>
+          <indexterm zone="ch-system-udev udevadm-monitor">
+            <primary sortas="b-udevadm-monitor">udevadm monitor</primary>
           </indexterm>
         </listitem>
@@ -160,5 +174,5 @@
         <listitem>
           <para>Watches the Udev event queue and exits if all current uevents
-          have been handled</para>
+          have been handled. (Symlink to udevadm)</para>
           <indexterm zone="ch-system-udev udevsettle">
             <primary sortas="b-udevsettle">udevsettle</primary>
@@ -167,28 +181,28 @@
       </varlistentry>
 
-      <varlistentry id="udevtest">
-        <term><command>udevtest</command></term>
+      <varlistentry id="udevadm-test">
+        <term><command>udevadm test</command></term>
         <listitem>
           <para>Simulates a <command>udev</command> run for the given device,
           and prints out the name of the node the real <command>udev</command>
           would have created or the name of the renamed network interface</para>
-          <indexterm zone="ch-system-udev udevtest">
-            <primary sortas="b-udevtest">udevtest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevtrigger">
-        <term><command>udevtrigger</command></term>
+          <indexterm zone="ch-system-udev udevadm-test">
+            <primary sortas="b-udevadm-test">udevadm test</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevadm-trigger">
+        <term><command>udevadm trigger</command></term>
         <listitem>
           <para>Walks the sysfs tree for devices that need to be added to the
-	  system.</para>
-          <indexterm zone="ch-system-udev udevtrigger">
-            <primary sortas="b-udevtrigger">udevtrigger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
- <!-- helpers start here -->
+          system.</para>
+          <indexterm zone="ch-system-udev udevadm-trigger">
+            <primary sortas="b-udeadm-vtrigger">udevadm trigger</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>     
+
+ <!-- Start of Helpers -->
       <varlistentry id="ata_id">
         <term><command>ata_id</command></term>
@@ -205,5 +219,5 @@
         <term><command>cdrom_id</command></term>
         <listitem>
-	  <para>Print the capabilities of a CDROM or DVDROM drive.</para>
+          <para>Print the capabilities of a CDROM or DVDROM drive.</para>
           <indexterm zone="ch-system-udev cdrom_id">
             <primary sortas="b-cdrom_id">cdrom_id</primary>
@@ -225,5 +239,5 @@
         <term><command>dasd_id</command></term>
         <listitem>
-	  <para>Read the label from an s390 block device.</para>
+          <para>Read the label from an s390 block device.</para>
           <indexterm zone="ch-system-udev dasd_id">
             <primary sortas="b-dasd_id">dasd_id</primary>
@@ -235,5 +249,5 @@
         <term><command>edd_id</command></term>
         <listitem>
-	  <para>Identify x86 disk drives from Enhanced Disk Drive calls.</para>
+          <para>Identify x86 disk drives from Enhanced Disk Drive calls.</para>
           <indexterm zone="ch-system-udev edd_id">
             <primary sortas="b-edd_id">edd_id</primary>
@@ -245,5 +259,5 @@
         <term><command>firmware.sh</command></term>
         <listitem>
-	  <para>Script to load firmware for a device</para>
+          <para>Script to load firmware for a device</para>
           <indexterm zone="ch-system-udev firmware.sh">
             <primary sortas="b-firmware.sh">firmware.sh</primary>
@@ -266,5 +280,5 @@
         <term><command>scsi_id</command></term>
         <listitem>
-	  <para>Retrieve or generate a unique SCSI identifier.</para>
+          <para>Retrieve or generate a unique SCSI identifier.</para>
           <indexterm zone="ch-system-udev scsi_id">
             <primary sortas="b-scsi_id">scsi_id</primary>
@@ -276,5 +290,5 @@
         <term><command>usb_id</command></term>
         <listitem>
-	  <para>Identify a USB block device.</para>
+          <para>Identify a USB block device.</para>
           <indexterm zone="ch-system-udev usb_id">
             <primary sortas="b-usb_id">usb_id</primary>
@@ -286,5 +300,5 @@
         <term><command>vol_id</command></term>
         <listitem>
-	  <para>Probe filesystem type and read label and uuid.</para>
+          <para>Probe filesystem type and read label and uuid.</para>
           <indexterm zone="ch-system-udev vol_id">
             <primary sortas="b-vol_id">vol_id</primary>
@@ -292,9 +306,12 @@
         </listitem>
       </varlistentry>
+<!-- End of Helpers -->
 
       <varlistentry id="libvolume_id">
         <term><filename class="libraryfile">libvolume_id</filename></term>
         <listitem>
-	  <para>Description needed.</para>
+          <para>This library provides programs such as <command>vol_id</command>
+          with a filesystems type, abel, and uuid from a device node or a
+          image.</para>
           <indexterm zone="ch-system-udev libvolume_id">
             <primary sortas="b-libvolume_id">libvolume_id</primary>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 28d689523b366c4c4f1f7dacb9ea7d3e25b7dade)
+++ BOOK/introduction/common/changelog.xml	(revision 3a9adc5c48c22e64183913743ad489e5428db618)
@@ -36,4 +36,13 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>September 7, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - A lot of text changes.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
