changed the try value of the otr attribute to prefer

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@164 4b5297f7-1745-476d-ba37-a9c6900126ab

xep-0136.xml

@@ -36,6 +36,12 @@
   </author>
   &stpeter;
   &infiniti;
+  <revision>
+    <version>0.11</version>
+    <date>2006-11-03</date>
+    <initials>ip</initials>
+    <remark><p>Changed the try otr attribute value to prefer</p></remark>
+  </revision>
   <revision>
     <version>0.10</version>
     <date>2006-10-11</date>
@@ -155,7 +161,7 @@
     <p>Note: Support for the 'all' value is optional and, to conserve bandwidth and storage space, it is RECOMMENDED that client implementations do not specify the 'all' value.</p>
     <p>Note: When archiving <em>locally</em> a client MAY save the full XML content of each &lt;message/&gt; element even if the Save Mode is 'body'.</p>
     <p>Each &lt;default/&gt; or &lt;item/&gt; element in the response whose 'save' attribute is not set to 'false' is RECOMMENDED to also include an 'expire' attribute which indicates how many seconds after messages are archived that the server SHOULD delete them.</p>
-    <p>Each &lt;default/&gt; or &lt;item/&gt; element in the response MUST include an 'otr' attribute, whose value MAY be 'deny' (if <link url='#otr'>Off The Record</link> is <em>required</em> by the contact the client MUST send no messages), 'allow' (the client MAY save messages unless the contact requests OTR), 'try' (the client MUST try to negotiate OTR with the contact) or 'require' (the client MUST send no messages unless the contact explicitly agrees to OTR).</p>
+    <p>Each &lt;default/&gt; or &lt;item/&gt; element in the response MUST include an 'otr' attribute, whose value MAY be 'deny' (if <link url='#otr'>Off The Record</link> is <em>required</em> by the contact the client MUST send no messages), 'allow' (the client MAY save messages unless the contact requests OTR), 'prefer' (the client MUST try to negotiate OTR with the contact) or 'require' (the client MUST send no messages unless the contact explicitly agrees to OTR).</p>
     <p>Note: If the OTR Mode is 'require' then the Save Mode MUST be 'false'.</p>
     <p>The server MUST also include &lt;method/&gt; elements that reflect the user's preferences for each of the possible archiving methods. There MUST be at least three such elements for local file archiving (type "local"), automatic archiving by the user's server (type "auto"), and manual archiving to a server (type "manual"). The 'use' attribute of each &lt;method/&gt; element MUST be set to "prefer", "allow" or "never" - indicating which archiving methods the user's clients SHOULD, MAY (if it does not support any preferred method) or MUST NOT use.</p>
     <p>The server MUST also include an &lt;auto/&gt; element reflecting the current <link url='#auto'>Automated Archiving</link> settings for <em>this stream</em>.</p>
@@ -191,7 +197,7 @@
     <example caption='Client Sets Default Modes'><![CDATA[
 <iq type='set' id='pref2'>
   <pref xmlns='http://jabber.org/protocol/archive'>
-    <default save='false' otr='try'/>
+    <default save='false' otr='prefer'/>
   </pref>
 </iq>
     ]]></example>
@@ -203,13 +209,13 @@
     <example caption='Server Pushes New Modes'><![CDATA[
 <iq type='set' id='push1' to='juliet@capulet.com/chamber'>
   <pref xmlns='http://jabber.org/protocol/archive'>
-    <default save='false' otr='try'/>
+    <default save='false' otr='prefer'/>
   </pref>
 </iq>
 
 <iq type='set' id='push2' to='juliet@capulet.com/pda'>
   <pref xmlns='http://jabber.org/protocol/archive'>
-    <default save='false' otr='try'/>
+    <default save='false' otr='prefer'/>
   </pref>
 </iq>
     ]]></example>
@@ -1056,8 +1062,8 @@
               <xs:restriction base='xs:NCName'>
                 <xs:enumeration value='allow'/>
                 <xs:enumeration value='deny'/>
+                <xs:enumeration value='prefer'/>
                 <xs:enumeration value='require'/>
-                <xs:enumeration value='try'/>
               </xs:restriction>
             </xs:simpleType>
           </xs:attribute>
@@ -1097,8 +1103,8 @@
               <xs:restriction base='xs:NCName'>
                 <xs:enumeration value='allow'/>
                 <xs:enumeration value='deny'/>
+                <xs:enumeration value='prefer'/>
                 <xs:enumeration value='require'/>
-                <xs:enumeration value='try'/>
               </xs:restriction>
             </xs:simpleType>
           </xs:attribute>