hal: Branch 'master' - 2 commits

[Richard Hughes]

 doc/spec/hal-spec-properties.xml |   10 ++++++++++
 1 files changed, 10 insertions(+)

New commits:
diff-tree ac51780c0934ca21e50d3edc5ffa642353beda85 (from parents)
Merge: 5e20fa37cb0e855e9f7e23f09e692521cda26010 03ba32d721e60f7e6e3afa61048278dbbcccfc00
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 10 18:15:06 2007 +0100

    Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal

diff-tree 5e20fa37cb0e855e9f7e23f09e692521cda26010 (from f42df3da3119e9cbf6ddf3764fd56ae701c0da1a)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 10 18:13:48 2007 +0100

    add battery type 'usb' into the spec

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 9e183d3..5c25240 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -5790,6 +5790,16 @@ org.freedesktop.Hal.Device.Volume.method
             <row>
               <entry></entry>
               <entry>
+                <literal>usb</literal>
+              </entry>
+              <entry></entry>
+              <entry>
+                The device containing the battery is a generic usb device.
+              </entry>
+            </row>
+            <row>
+              <entry></entry>
+              <entry>
                 <literal>unknown</literal>
               </entry>
               <entry></entry>