hal: Branch 'master'

[Jeff Mitchell]

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

New commits:
diff-tree 89d9fbf8cef868f4a3535ff60a1055c95323ccde (from c1a5e770569eaf2d038dd7e982037cc221446716)
Author: Jeff Mitchell <kde-dev at emailgoeshere.com>
Date:   Mon Jun 11 16:10:05 2007 -0400

    Provide some extra information as to what information should be put in the sub-namespaces.

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 2d9efec..c99da84 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -4798,6 +4798,8 @@ org.freedesktop.Hal.Device.Volume.method
                 Indicates installed device driver libraries that can
                 handle this device.  These drivers can export information
                 in <literal>portable_audio_player.[drivername]</literal> sub-namespaces.
+                Can also be used by libraries or programs providing extra device information
+                to indicate the presence of this information in the appropriate sub-namespace.
               </entry>
             </row>
             <row>
@@ -4810,7 +4812,8 @@ org.freedesktop.Hal.Device.Volume.method
                 This entry is required for drivers listed in
                 <literal>portable_audio_player.access_method.drivers</literal>. Indicates which
                 protocol in <literal>portable_audio_player.access_method.protocols</literal>
-                a particular driver will use.
+                a particular driver will use.  If the driver is providing information only, this
+                should be set to <literal>information</literal>.
               </entry>
             </row>
             <row>