Index: BOOK/final-system/common/udev.xml
===================================================================
--- BOOK/final-system/common/udev.xml	(revision 6cd5eb922c819955181d9c188a38b69cba719ae0)
+++ BOOK/final-system/common/udev.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -26,62 +26,26 @@
     <title>Installation of Udev</title>
 
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make EXTRAS="extras/ata_id extras/cdrom_id extras/collect \
-    extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator \
-    extras/scsi_id extras/usb_id extras/volume_id" udevdir=/dev</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-      <term><parameter>EXTRAS="extras/ata_id extras/cdrom_id extras/collect
-      extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator
-      extras/scsi_id extras/usb_id extras/volume_id"</parameter></term>
-        <listitem>
-          <para>This builds the helper applications that are used with
-          udev. The helper programs assist in correct handling of devices.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">If you want to run the testsuite, you need to change
-    a hardcoded reference to the <command>test</command> program:</para>
-
-    <screen os="e"><userinput>sed -i 's@/usr/bin/test@/bin/test@' test/udev-test.pl</userinput></screen>
-
-    <para os="f">To test the results, issue:
-    <userinput>make test</userinput>.</para>
+    <para os="a">Prepare Udev for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix= \
+    --sysconfdir=/etc</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
 
     <para os="g">Install the package:</para>
 
-<screen os="h"><userinput>make EXTRAS="extras/ata_id extras/cdrom_id extras/collect \
-    extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator \
-    extras/scsi_id extras/usb_id extras/volume_id" DESTDIR=/ udevdir=/dev install</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-      <term><parameter>DESTDIR=/</parameter></term>
-        <listitem>
-          <para>This prevents the Udev build process from killing any
-          <command>udevd</command> processes that may be running on the
-          system.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="j">Install documentation:</para>
-
-<screen os="k"><userinput>install -v -m644 -D docs/writing_udev_rules/index.html \
+<screen os="h"><userinput>make install</userinput></screen>
+
+    <para os="i">Install documentation:</para>
+
+<screen os="j"><userinput>install -v -m644 -D docs/writing_udev_rules/index.html \
     /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
 
-    <para os="l">Create a directory for storing firmware that can be
+    <para os="k">Create a directory for storing firmware that can be
     loaded by <command>udev</command>:</para>
 
-<screen os="m"><userinput>install -dv /lib/firmware</userinput></screen>
+<screen os="l"><userinput>install -dv /lib/firmware</userinput></screen>
 
   </sect2>
@@ -96,7 +60,6 @@
 
       <seglistitem>
-        <seg>udevadm, udevd, udevinfo (symlink to udevadm),
-        udevsettle (symlink to udevadm)</seg>
-        <seg>libvolume_id</seg>
+        <seg>udevadm, udevd</seg>
+        <seg>libvolume_id, libudev</seg>
         <seg>/etc/udev, /lib/udev</seg>
       </seglistitem>
@@ -111,22 +74,8 @@
         <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>
+        <para>udevadm controls the runtime behavior of udev, requests kernel
+        events, manages the event queue, and provides simple debugging.</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. (Symlink to
-          udevadm)</para>
-          <indexterm zone="ch-system-udev udevadm-control">
-            <primary sortas="b-udevadm-control">udevadm control</primary>
           </indexterm>
         </listitem>
@@ -145,63 +94,4 @@
       </varlistentry>
 
-      <varlistentry id="udevinfo">
-        <term><command>udevinfo</command></term>
-        <listitem>
-          <para>Allows users to query the <command>udev</command> database for
-          information on any device currently present on the system; it also
-          provides a way to query any device in the <systemitem
-          class="filesystem">sysfs</systemitem> tree to help create udev
-          rules. (Symlink to udevadm)</para>
-          <indexterm zone="ch-system-udev udevinfo">
-            <primary sortas="b-udevinfo">udevinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <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 udevadm-monitor">
-            <primary sortas="b-udevadm-monitor">udevadm monitor</primary>
-          </indexterm>
-        </listitem>
-      </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. (Symlink to udevadm)</para>
-          <indexterm zone="ch-system-udev udevsettle">
-            <primary sortas="b-udevsettle">udevsettle</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <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 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 udevadm-trigger">
-            <primary sortas="b-udeadm-vtrigger">udevadm trigger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>     
-
  <!-- Start of Helpers -->
       <varlistentry id="ata_id">
@@ -226,4 +116,14 @@
       </varlistentry>
 
+      <varlistentry id="collect">
+        <term><command>collect</command></term>
+        <listitem>
+          <para>DESCRIPTION REQUIRED</para>
+          <indexterm zone="ch-system-udev collect">
+            <primary sortas="b-collect">collect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="create_floppy_devices">
         <term><command>create_floppy_devices</command></term>
@@ -236,14 +136,4 @@
       </varlistentry>
 
-      <varlistentry id="dasd_id">
-        <term><command>dasd_id</command></term>
-        <listitem>
-          <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>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="edd_id">
         <term><command>edd_id</command></term>
@@ -262,4 +152,14 @@
           <indexterm zone="ch-system-udev firmware.sh">
             <primary sortas="b-firmware.sh">firmware.sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fstab_import">
+        <term><command>fstab_import</command></term>
+        <listitem>
+          <para>DESCRIPTION REQUIRED</para>
+          <indexterm zone="ch-system-udev fstab_import">
+            <primary sortas="b-fstab_import">fstab_import</primary>
           </indexterm>
         </listitem>
@@ -303,4 +203,24 @@
           <indexterm zone="ch-system-udev vol_id">
             <primary sortas="b-vol_id">vol_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write_cd_rules">
+        <term><command>write_cd_rules</command></term>
+        <listitem>
+          <para>DESCRIPTION REQUIRED</para>
+          <indexterm zone="ch-system-udev write_cd_rules">
+            <primary sortas="b-write_cd_rules">write_cd_rules</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write_net_rules">
+        <term><command>write_net_rules</command></term>
+        <listitem>
+          <para>DESCRIPTION REQUIRED</para>
+          <indexterm zone="ch-system-udev write_net_rules">
+            <primary sortas="b-write_net_rules">write_net_rules</primary>
           </indexterm>
         </listitem>
@@ -320,4 +240,14 @@
       </varlistentry>
 
+      <varlistentry id="libudev">
+        <term><filename class="libraryfile">libudev</filename></term>
+        <listitem>
+          <para>DESCRIPTION REQUIRED</para>
+          <indexterm zone="ch-system-udev libudev">
+            <primary sortas="b-libudev">libudev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="etc-udev">
         <term><filename class="directory">/etc/udev</filename></term>
