hal: Branch 'master'

[David Zeuthen]

 doc/spec/hal-spec-properties.xml |   10 +++++-----
 hald/linux/acpi.c                |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
diff-tree e6ab4d554f21bfa1df56022b0e007da5c6e7363f (from bf29b2f07dc05cf8b95463ad76b0b2ebe4ed596a)
Author: Julius Schulz-Zander <lists-hal at fazzepullis.de>
Date:   Mon Apr 23 15:53:43 2007 -0400

    fix speling of AC adapter

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 726fef7..852d5ee 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -5376,12 +5376,12 @@ org.freedesktop.Hal.Device.Volume.method
         </tgroup>
       </informaltable>
     </sect2>
-    <sect2 id="device-properties-ac_adaptor">
+    <sect2 id="device-properties-ac_adapter">
       <title>
-        ac_adaptor namespace
+        ac_adapter namespace
       </title>
       <para>
-        Device objects with the capability <literal>ac_adaptor</literal>
+        Device objects with the capability <literal>ac_adapter</literal>
         represent all the devices capable of powering the system from AC power
       </para>
       <informaltable>
@@ -5397,12 +5397,12 @@ org.freedesktop.Hal.Device.Volume.method
           <tbody>
             <row>
               <entry>
-                <literal>ac_adaptor.present</literal> (bool)
+                <literal>ac_adapter.present</literal> (bool)
               </entry>
               <entry></entry>
               <entry>Yes</entry>
               <entry>
-                The state of the adaptor, i.e. whether it is providing power to
+                The state of the adapter, i.e. whether it is providing power to
                 the unit from mains power.
               </entry>
             </row>
diff --git a/hald/linux/acpi.c b/hald/linux/acpi.c
index 3111170..edce4e9 100644
--- a/hald/linux/acpi.c
+++ b/hald/linux/acpi.c
@@ -66,7 +66,7 @@ typedef struct ACPIDevHandler_s
 
 /** 
  *  ac_adapter_refresh_poll
- *  @d:		valid ac_adaptor HalDevice
+ *  @d:		valid ac_adapter HalDevice
  *
  * Just sets the ac_adapter.present key when called 
  */
@@ -330,7 +330,7 @@ acpi_poll_battery (void)
  * 
  *  Returns:			TRUE
  *
- *  Fallback polling method to detect if the ac_adaptor is plugged in 
+ *  Fallback polling method to detect if the ac_adapter is plugged in 
  *
  *  Note: This just calls ac_adapter_refresh_poll for each ac_adapter
  */
@@ -369,7 +369,7 @@ acpi_poll_acadap (void)
  *
  *  Fallback polling method called every minute. 
  *
- *  Note: This just forces a poll refresh for *every* ac_adaptor
+ *  Note: This just forces a poll refresh for *every* ac_adapter
  *        and primary battery in the system.
  */
 static gboolean