summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-05-13 08:30:15 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-05-13 11:10:30 +0100
commitd84b118c073edd2c0fc5668b7df1730427122207 (patch)
tree30bed4784787bc7842bbe421b29db0b8efbd4102
parentbb91ecdc01027eb7507ac48e79cdf4b5fa311367 (diff)
OTR spec tweaks
-rw-r--r--src/Channel_Interface_OTR1.xml20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/Channel_Interface_OTR1.xml b/src/Channel_Interface_OTR1.xml
index bca0fcbcf..2a6effb32 100644
--- a/src/Channel_Interface_OTR1.xml
+++ b/src/Channel_Interface_OTR1.xml
@@ -26,12 +26,14 @@
value="true"/>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>A simple D-Bus API <a
- href="https://otr.cypherpunks.ca/">Off The Record.</a>.</p>
- <p>In telepathy 0.x this interface must be implemented on a special bus
- name composed using the Connection bus name with ".OTR" suffix. The object
- path is the same as channel's. That special trick will go away in
- telepathy1.0</p>
+ <p>A simple D-Bus API for the <a
+ href="https://otr.cypherpunks.ca/">Off The Record.</a> protocol,
+ providing encryption and optional authentication.</p>
+
+ <p>In Telepathy 0.x this interface must be implemented on a special bus
+ name composed using the Connection bus name with ".OTR" suffix. The object
+ path is the same as channel's. That special trick will go away in
+ Telepathy 1.0.</p>
</tp:docstring>
<property name="TrustLevel"
@@ -103,13 +105,13 @@
</tp:docstring>
</method>
- <tp:enum name="Trust_Level" type="u">
+ <tp:enum name="OTR_Trust_Level" type="u">
<tp:docstring>
<p>Enumeration describing trust level of this conversation. The trust
level can only increase unless Initialize/Stop are called or
- TrustFingerprint with trust=false</p>
+ TrustFingerprint is called with trust=false.</p>
</tp:docstring>
- <tp:enumvalue suffix="NotPrivate" value="0">
+ <tp:enumvalue suffix="Not_Private" value="0">
<tp:docstring>
<p>The conversation is currently unencrypted</p>
</tp:docstring>