hal: Branch 'master'

[Jeff Mitchell]

 doc/spec/hal-spec-properties.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

New commits:
diff-tree 281bc1f76ef048bc884c1259e97edd61a9b07a9d (from f9d9cd823bcd0c52289780d99163dc85ebb56db6)
Author: Jeff Mitchell <kde-dev at emailgoeshere.com>
Date:   Mon Jun 4 08:30:15 2007 -0400

    More accurate information handed down to me from higher-ups.  Older pre-MTP devices are actually mostly PDE, not PTP.

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 2736fd9..3e7807b 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -4766,14 +4766,13 @@ org.freedesktop.Hal.Device.Volume.method
               <entry>
                 <literal>portable_audio_player.access_method.protocols</literal> (strlist)
               </entry>
-              <entry>example: storage ipod mtp ptp iriver karma</entry>
+              <entry>example: storage ipod mtp pde iriver karma</entry>
               <entry>No</entry>
               <entry>
                 Indicates transfer protocols that this device can speak.
                 <literal>storage</literal> indicates USB Mass Storage (UMS) is an access
                 protocol.  <literal>ipod</literal> indicates UMS plus an iTunes-style database.
-                <literal>ptp</literal> or <literal>mtp</literal> indicates a device using Microsoft's Picture Transfer
-                Protocol or its replacement, the newer Media Transfer Protocol.
+                <literal>mtp</literal> indicates a device using Microsoft's Media Transfer Protocol.
                 Arbitrary values for newer or obscure protocols are allowed but
                 entities providing this information should try to ensure that
                 they are not duplicating protocols under a different name.