[Telepathy-commits] [telepathy-spec/master] Connection: resolve conflict

[Simon McVittie]

20080522175317-53eee-ae4a28a0ab77c28d929f221ba58150197f4aaa60.gz
---
 spec/Connection.xml |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/spec/Connection.xml b/spec/Connection.xml
index 0d54008..ecbc68e 100644
--- a/spec/Connection.xml
+++ b/spec/Connection.xml
@@ -160,10 +160,8 @@ USA.</p>
       </arg>
 
       <tp:docstring>
-        Get the handle which represents the user on this connection, which will
-        remain valid for the lifetime of this connection, or until a change
-        in the user's identifier is signalled by the Renamed signal on the
-        Renaming interface (if present). This is always a CONTACT type handle.
+        Returns the value of the SelfHandle property. Change notification
+        is via the SelfHandleChanged signal.
       </tp:docstring>
       <tp:deprecated version="0.17.UNRELEASED">Use GetAll to get the
         SelfHandle property (and all other Connection properties)
-- 
1.5.6.3