Index: general.ent
===================================================================
--- general.ent	(revision c45cb57babf20eeea024253c9876c7833ea0517a)
+++ general.ent	(revision 3e5fad058c38716815c363cdb7f7bba8400b6d6e)
@@ -164,5 +164,5 @@
 <!ENTITY apache-ant-version           "1.6.5">
 <!ENTITY dbus-version                 "0.62">
-<!ENTITY hal-version                  "0.5.4">
+<!ENTITY hal-version                  "0.5.7">
 
 <!-- Chapter 12 -->
Index: general/sysutils/hal.xml
===================================================================
--- general/sysutils/hal.xml	(revision c45cb57babf20eeea024253c9876c7833ea0517a)
+++ general/sysutils/hal.xml	(revision 3e5fad058c38716815c363cdb7f7bba8400b6d6e)
@@ -7,7 +7,7 @@
   <!ENTITY hal-download-http "http://freedesktop.org/~david/dist/hal-&hal-version;.tar.gz">
   <!ENTITY hal-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/hal-&hal-version;.tar.gz">
-  <!ENTITY hal-md5sum        "2f84ddbc22bc35baa9388e7794d1fa31">
-  <!ENTITY hal-size          "1.4 MB">
-  <!ENTITY hal-buildsize     "18.0 MB">
+  <!ENTITY hal-md5sum        "4163afb8285db64e00e7b1392b401d92">
+  <!ENTITY hal-size          "1.5 MB">
+  <!ENTITY hal-buildsize     "19.0 MB">
   <!ENTITY hal-time          "0.5 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">hal-&hal-version;.tar</keyword>
-      <keyword role="ftpdir">hal</keyword>
-    </keywordset>
   </sect1info>
 
@@ -73,12 +69,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Recommended USB ID list:
-        <ulink url="http://www.linux-usb.org/usb.ids"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">HAL Dependencies</bridgehead>
 
@@ -86,11 +74,12 @@
     <para role="required"><xref linkend="glib2"/>,
     <xref linkend="dbus"/> (see the <xref linkend="hal-requirements"/>),
-    <xref linkend="python"/>,
-    <xref linkend="popt"/>, and
+    <xref linkend="python"/>, and
     <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="pciutils"/> (with a current
-    <filename>pci.ids</filename> file)</para>
+    <para role="recommended"><xref linkend="pciutils"/>
+    (with a current <filename>pci.ids</filename> file) and
+    <xref linkend="usbutils"/>
+    (with a current <filename>usb.ids</filename> file)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -108,10 +97,4 @@
   <sect2 role="installation">
     <title>Installation of HAL</title>
-
-    <para>If you downloaded the USB ID list, install it by issuing the
-    following command as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>install -v -m644 ../usb.ids /usr/share</userinput></screen>
 
     <para>You must create a dedicated user and group before installing the
@@ -131,16 +114,11 @@
     commands:</para>
 
-<screen><userinput>sed -i -e "s/managed&lt;/comment=&amp;/" \
-       -e "s/pamconsole/users/" \
-    fdi/policy/10osvendor/10-storage-policy.fdi &amp;&amp;
-./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
             --libexecdir=/usr/lib/hal \
-            --localstatedir=/var \
-            --enable-fstab-sync \
-            --enable-pcmcia-support &amp;&amp;
+            --localstatedir=/var &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>To test the results, issue <command>make check</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -153,8 +131,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><command>sed -i -e ...</command>: This command adjusts the policy for
-    storage devices so that the <filename>/etc/fstab</filename> file is updated
-    to standards used by LFS systems.</para>
 
     <para><parameter>--libexecdir=/usr/lib/hal</parameter>: This parameter
@@ -167,10 +141,4 @@
     <filename class='directory'>/var/run/hald</filename> instead of
     <filename class='directory'>/usr/var/run/hald</filename>.</para>
-
-    <para><parameter>--enable-fstab-sync</parameter>: This parameter will
-    ensure the <command>fstab-sync</command> program is built.</para>
-
-    <para><parameter>--enable-pcmcia-support</parameter>: This parameter
-    provides extended PCMCIA support.</para>
 
   </sect2>
@@ -262,5 +230,5 @@
           <listitem>
             <para><ulink
-              url="&gnome-download-http;/pyorbit/2.0/">PyORBit</ulink> (optional)
+              url="&gnome-download-http;/pyorbit/">PyORBit</ulink> (optional)
             </para>
 
@@ -311,4 +279,7 @@
     </sect3>
 
+    <!-- This section commented out for now until it is determined what should
+         be placed in this section
+
     <sect3><title>Configuration Information</title>
 
@@ -330,12 +301,12 @@
 <screen role="root"><userinput>install -v -m755 -d /etc/hal/fdi/policy/30user &amp;&amp;
 cat &gt; /etc/hal/fdi/policy/30user/30user-policy.fdi &lt;&lt; "EOF"
-<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;!-- -*- SGML -*- --&gt;
-
-&lt;!--
+<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;!- -*- SGML -*- -&gt;
+
+&lt;!-
 This file is used to set custom options to the HAL policy settings.
 The default policy settings are defined in files contained in the
 /usr/share/hal/fdi/policy directories. User defined customizations
 should be in files contained in the /etc/hal/fdi/policy directories.
---&gt;
+-&gt;
 
 &lt;deviceinfo version="0.2"&gt;
@@ -345,10 +316,10 @@
         string="/org/freedesktop/Hal/devices/computer"&gt;
 
-      &lt;!-- Set the iocharset variable in the /etc/fstab file entry --&gt;
+      &lt;!- Set the iocharset variable in the /etc/fstab file entry -&gt;
       &lt;merge
         key="storage.policy.default.mount_option.iocharset=<replaceable>&lt;iocharset&gt;</replaceable>"
         type="bool"&gt;true&lt;/merge&gt;
 
-      &lt;!-- Set the codepage variable in the /etc/fstab file entry --&gt;
+      &lt;!- Set the codepage variable in the /etc/fstab file entry -&gt;
       &lt;merge
         key="storage.policy.default.mount_option.codepage=<replaceable>&lt;codepage&gt;</replaceable>"
@@ -374,8 +345,8 @@
     &lt;match key="<replaceable>&lt;text&gt;</replaceable>" string="<replaceable>&lt;text&gt;</replaceable>"&gt;
 
-      &lt;!-- Set the iocharset variable in the /etc/fstab file entry --&gt;
+      &lt;!- Set the iocharset variable in the /etc/fstab file entry -&gt;
       &lt;merge key="<replaceable>&lt;iocharset text&gt;</replaceable>" type="bool"&gt;true&lt;/merge&gt;
 
-      &lt;!-- Set the codepage variable in the /etc/fstab file entry --&gt;
+      &lt;!- Set the codepage variable in the /etc/fstab file entry -&gt;
       &lt;merge key="<replaceable>&lt;codepage text&gt;</replaceable>" type="bool"&gt;true&lt;/merge&gt;
 
@@ -386,4 +357,6 @@
 
     </sect3>
+
+    -->
 
     <sect3  id="hal-init">
@@ -399,4 +372,11 @@
         <primary sortas="f-haldaemon">haldaemon</primary>
       </indexterm>
+
+      <!-- Not sure if this is still required any longer as the HAL daemon
+           used to hang if you didn't first restart the DBUS daemon. This is
+           not the case any longer, but it still seems that D-Bus should be
+           restarted, as the hald.conf file is read by the D-BUS daemon.
+           Leaving it in for now until it is positively confirmed it is not
+           required. -->
 
       <important>
@@ -423,13 +403,7 @@
 
       <seglistitem>
-        <seg>fstab-sync, hal.hotplug, hal-device, hal-device-manager,
+        <seg>hal-device, hal-device-manager,
         hal-find-by-capability, hal-find-by-property, hal-get-property,
-        hal-luks-remove, hal-luks-setup, hal-set-property,
-        hal-system-power-hibernate, hal-system-power-set-power-save,
-        hal-system-power-suspend, hald, hald-addon-acpi, hald-addon-hid-ups,
-        hald-addon-pmu, hald-addon-storage, hald-addon-usb-csr,
-        hald-probe-hiddev, hald-probe-input, hald-probe-pc-floppy,
-        hald-probe-printer, hald-probe-smbios, hald-probe-storage,
-        hald-probe-volume and lshal</seg>
+        hal-set-property, hald and lshal</seg>
         <seg>libhal.{so,a} and libhal-storage,{so,a}</seg>
         <seg>/etc/hal, /usr/include/hal, /usr/lib/hal,
@@ -443,19 +417,4 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fstab-sync">
-        <term><command>fstab-sync</command></term>
-        <listitem>
-          <para>updates the file systems table file
-          <filename class='directory'>/etc/fstab</filename> and creates/removes
-          mount points in <filename class='directory'>/media</filename> in
-          response to <application>HAL</application> events. This program is
-          usually never run directly from a shell; instead it is invoked as a
-          callout by the <application>HAL</application> daemon.</para>
-          <indexterm zone="hal fstab-sync">
-            <primary sortas="b-fstab-sync">fstab-sync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="hal-device">
@@ -521,28 +480,4 @@
       </varlistentry>
 
-      <varlistentry id="hal-luks-remove">
-        <term><command>hal-luks-remove</command></term>
-        <listitem>
-          <para>is a <application>HAL</application> method wrapper for
-          <command>cryptsetup</command> remove. This program requires <ulink
-          url="http://luks.endorphin.org/dm-crypt">LUKS</ulink>.</para>
-          <indexterm zone="hal hal-luks-remove">
-            <primary sortas="b-hal-luks-remove">hal-luks-remove</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-luks-setup">
-        <term><command>hal-luks-setup</command></term>
-        <listitem>
-          <para>is a <application>HAL</application> method wrapper for
-          <command>luks-setup</command>. This program requires  <ulink
-          url="http://luks.endorphin.org/dm-crypt">LUKS</ulink>.</para>
-          <indexterm zone="hal hal-luks-setup">
-            <primary sortas="b-hal-luks-setup">hal-luks-setup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="hal-set-property">
         <term><command>hal-set-property</command></term>
@@ -557,40 +492,4 @@
       </varlistentry>
 
-      <varlistentry id="hal-system-power-hibernate">
-        <term><command>hal-system-power-hibernate</command></term>
-        <listitem>
-          <para>is a <application>HAL</application> wrapper script for
-          system power saving features. This program is currently not supported
-          on LFS platforms.</para>
-          <indexterm zone="hal hal-system-power-hibernate">
-            <primary sortas="b-hal-system-power-hibernate">hal-system-power-hibernate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-system-power-set-power-save">
-        <term><command>hal-system-power-set-power-save</command></term>
-        <listitem>
-          <para>is a <application>HAL</application> wrapper script for
-          system power saving features. This program is currently not supported
-          on LFS platforms.</para>
-          <indexterm zone="hal hal-system-power-set-power-save">
-            <primary sortas="b-hal-system-power-set-power-save">hal-system-power-set-power-save</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-system-power-suspend">
-        <term><command>hal-system-power-suspend</command></term>
-        <listitem>
-          <para>is a <application>HAL</application> wrapper script for
-          system power saving features. This program is currently not supported
-          on LFS platforms.</para>
-          <indexterm zone="hal hal-system-power-suspend">
-            <primary sortas="b-hal-system-power-suspend">hal-system-power-suspend</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="hald">
         <term><command>hald</command></term>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c45cb57babf20eeea024253c9876c7833ea0517a)
+++ introduction/welcome/changelog.xml	(revision 3e5fad058c38716815c363cdb7f7bba8400b6d6e)
@@ -46,4 +46,7 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated to HAL-0.5.7.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to D-BUS-0.62.</para>
         </listitem>
