Index: general/sysutils/udisks.xml
===================================================================
--- general/sysutils/udisks.xml	(revision 06f76d2c7c39a164244643b0656af4f4c25a1b75)
+++ general/sysutils/udisks.xml	(revision ac4b41a9b9f0f8f7e82c067036734af260a432f1)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY udisks-download-http "http://hal.freedesktop.org/releases/udisks-1.0.1.tar.gz">
+  <!ENTITY udisks-download-http "http://hal.freedesktop.org/releases/udisks-&udisks-version;.tar.gz">
   <!ENTITY udisks-download-ftp  " ">
-  <!ENTITY udisks-md5sum        "3654d994eb43b80c8c2d04fe03da30c4">
-  <!ENTITY udisks-size          "698 MB">
-  <!ENTITY udisks-buildsize     "10 MB">
-  <!ENTITY udisks-time          "0.2 SBU">
+  <!ENTITY udisks-md5sum        "86c63b2b5484f2060499a052b5b6256b">
+  <!ENTITY udisks-size          "704 KB">
+  <!ENTITY udisks-buildsize     "12 MB">
+  <!ENTITY udisks-time          "0.4 SBU">
 ]>
 
-<sect1 id="udisks" xreflabel="udisks-&udisks-version;">
+<sect1 id="udisks" xreflabel="UDisks-&udisks-version;">
   <?dbhtml filename="udisks.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>udisks-&udisks-version;</title>
+  <title>UDisks-&udisks-version;</title>
 
   <indexterm zone="udisks">
@@ -28,31 +28,45 @@
 
   <sect2 role="package">
-    <title>Introduction to udisks</title>
+    <title>Introduction to UDisks</title>
 
-    <para>The <application>udisks</application> package is a daemon that provide
-    interfaces to obtain information and perform operations on storage
-    devices.</para>
+    <para>
+      The <application>UDisks</application> package provides a
+      storage daemon that implements well-defined D-Bus interfaces
+      that can be used to query and manipulate storage devices.
+    </para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&udisks-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&udisks-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&udisks-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&udisks-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &udisks-md5sum;</para>
+        <para>
+          Download MD5 sum: &udisks-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &udisks-size;</para>
+        <para>
+          Download size: &udisks-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &udisks-buildsize;</para>
+        <para>
+          Estimated disk space required: &udisks-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &udisks-time;</para>
+        <para>
+          Estimated build time: &udisks-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -61,14 +75,19 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-glib"/>,
-    <xref linkend="libatasmart"/>,
-    <xref linkend="parted"/> (with <xref linkend="lvm2"/>, device-mapper),
-    <xref linkend="polkit"/>,
-    <xref linkend="sg3_utils"/>, and
-    <xref linkend="udev"/> (gudev)</para>
+    <para role="required">
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="libatasmart"/>,
+      <xref linkend="lvm2"/>,
+      <xref linkend="parted"/>,
+      <xref linkend="polkit"/>,
+      <xref linkend="sg3_utils"/> and
+      <xref linkend="udev"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="sudo"/> (to run the test)</para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="sudo"/> (to run the test)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -78,18 +97,24 @@
 
   <sect2 role="installation">
-    <title>Installation of udisks</title>
+    <title>Installation of UDisks</title>
 
-    <para>Install <application>udisks</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>UDisks</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
-            --libexecdir=/usr/lib/udisks \
-            --localstatedir=/var &amp;&amp;
+            --localstatedir=/var \
+            --libexecdir=/usr/lib/udisks &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -103,7 +128,4 @@
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
-
   </sect2>
 
@@ -113,21 +135,16 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>udisks-dm-export, udisks-part-id, udisks-probe-ata-smart,
-        udisks-probe-sas-expander, umount.udisks, udisks, udisks-tcp-bridge,
-        udisks-daemon, udisks-helper-ata-smart-collect,
-        udisks-helper-ata-smart-selftest, udisks-helper-change-filesystem-label,
-        udisks-helper-change-luks-password, udisks-helper-create-partition,
-        udisks-helper-create-partition-table, udisks-helper-delete-partition,
-        udisks-helper-drive-benchmark, udisks-helper-drive-detach,
-        udisks-helper-drive-poll, udisks-helper-fstab-mounter,
-        udisks-helper-linux-md-check, udisks-helper-linux-md-remove-component,
-        udisks-helper-mdadm-expand, udisks-helper-mkfs, and
-        udisks-helper-modify-partition</seg>
-        <seg>libudisks-action-lookup.{so,a}</seg>
-        <seg>/usr/lib/udisks, /var/{lib/udisks,run/udisks}</seg>
+        <seg>
+          udisks, udisks-daemon, udisks-tcp-bridge and
+          umount.udisks
+        </seg>
+        <seg> 
+          /usr/lib/udisks,
+          /usr/share/gtk-doc/html/udisks and
+          /var/lib/udisks
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -141,5 +158,8 @@
         <term><command>udisks</command></term>
         <listitem>
-          <para>is a command line tool.</para>
+          <para>
+            is a simple command line interface for the 
+            <application>UDisks</application> Daemon.
+          </para>
           <indexterm zone="udisks udisks-prog">
             <primary sortas="b-udisks">udisks</primary>
@@ -151,5 +171,7 @@
         <term><command>udisks-tcp-bridge</command></term>
         <listitem>
-          <para>is a <application>udisks</application> TCP/IP bridge.</para>
+          <para>
+            is the <application>UDisks</application> TCP/IP bridge.
+          </para>
           <indexterm zone="udisks udisks-tcp-bridge">
             <primary sortas="b-udisks-tcp-bridge">udisks-tcp-bridge</primary>
@@ -161,17 +183,9 @@
         <term><command>udisks-daemon</command></term>
         <listitem>
-          <para>is the <application>udisks</application> Daemon.</para>
+          <para>
+            is the <application>UDisks</application> Daemon.
+          </para>
           <indexterm zone="udisks udisks-daemon">
             <primary sortas="b-udisks-daemon">udisks-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libudisks-action-lookup">
-        <term><filename class='libraryfile'>libudisks-action-lookup.{so,a}</filename></term>
-        <listitem>
-          <para>is a <application>polkit</application> extension.</para>
-          <indexterm zone="udisks libudisks-action-lookup">
-            <primary sortas="c-libudisks-action-lookup">libudisks-action-lookup.{so,a}</primary>
           </indexterm>
         </listitem>
