hal: Branch 'master'

[Sjoerd Simons]

 doc/spec/hal-spec-properties.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit be6219ea91d2b18a3614669026a399834c010c16
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Sat Mar 29 13:34:52 2008 +0100

    make portable_audio_player.access_method.protocols mandatory and clarify  portable_audio_player.[drivername].protocol
    
    Make the portable_audio_player.access_method.protocols property mandatory as it's quite vital. Also note that
    portable_audio_player.[drivername].protocol is only mandatory if mandator iff portable_audio_player.access_method.drivers is set.

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 7fe1251..f18e183 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -5387,7 +5387,7 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'}
                 <literal>portable_audio_player.access_method.protocols</literal> (strlist)
               </entry>
               <entry>example: storage ipod mtp pde iriver karma</entry>
-              <entry>No</entry>
+              <entry>Yes</entry>
               <entry>
                 Indicates transfer protocols that this device can speak.
                 <literal>storage</literal> indicates USB Mass Storage (UMS) is an access
@@ -5417,7 +5417,7 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'}
                 <literal>portable_audio_player.[drivername].protocol</literal> (strlist)
               </entry>
               <entry>example: mtp</entry>
-              <entry>Yes</entry>
+              <entry>If portable_audio_player.drivers is set</entry>
               <entry>
                 This entry is required for drivers listed in
                 <literal>portable_audio_player.access_method.drivers</literal>. Indicates which