changed the never value of the use attribute to forbid

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

xep-0136.xml

@@ -40,7 +40,7 @@
     <version>0.11</version>
     <date>2006-11-03</date>
     <initials>ip</initials>
-    <remark><p>Changed the try and deny otr attribute values to prefer and never</p></remark>
+    <remark><p>Changed the try and deny otr attribute values to prefer and forbid, and the never use attribute value to forbid</p></remark>
   </revision>
   <revision>
     <version>0.10</version>
@@ -161,17 +161,17 @@
     <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 'never' (if <link url='#otr'>Off The Record</link> is <em>required</em> by the contact the client MUST send no messages), 'allow' (the client SHOULD save messages unless the contact <em>requests</em> or requires OTR), 'prefer' (the client MUST do its best 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 'forbid' (if <link url='#otr'>Off The Record</link> is <em>required</em> by the contact the client MUST send no messages), 'allow' (the client SHOULD save messages unless the contact <em>requests</em> or requires OTR), 'prefer' (the client MUST do its best 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 &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 "forbid" - 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>
     <example caption='Server Returns Preferences'><![CDATA[
 <iq type='result' id='pref1' to='juliet@capulet.com/chamber'>
   <pref xmlns='http://jabber.org/protocol/archive'>
     <default save='body' otr='allow' expire='31536000'/>
     <item jid='romeo@montague.net' save='false' otr='require'/>
-    <item jid='benvolio@montague.net' save='all' expire='630720000' otr='never'/>
+    <item jid='benvolio@montague.net' save='all' expire='630720000' otr='forbid'/>
-    <method type='auto' use='never'/>
+    <method type='auto' use='forbid'/>
     <method type='local' use='allow'/>
     <method type='manual' use='prefer'/>
     <auto save='false'/>
@@ -257,7 +257,7 @@
 <iq type='set' id='pref4'>
   <pref xmlns='http://jabber.org/protocol/archive'>
     <method type='auto' use='allow'/>
-    <method type='local' use='never'/>
+    <method type='local' use='forbid'/>
     <method type='manual' use='prefer'/>
   </pref>
 </iq>
@@ -269,7 +269,7 @@
 <iq type='set' id='push5' to='juliet@capulet.com/chamber'>
   <pref xmlns='http://jabber.org/protocol/archive'>
     <method type='auto' use='allow'/>
-    <method type='local' use='never'/>
+    <method type='local' use='forbid'/>
     <method type='manual' use='prefer'/>
   </pref>
 </iq>
@@ -277,7 +277,7 @@
 <iq type='set' id='push6' to='juliet@capulet.com/pda'>
   <pref xmlns='http://jabber.org/protocol/archive'>
     <method type='auto' use='allow'/>
-    <method type='local' use='never'/>
+    <method type='local' use='forbid'/>
     <method type='manual' use='prefer'/>
   </pref>
 </iq>
@@ -1061,7 +1061,7 @@
             <xs:simpleType>
               <xs:restriction base='xs:NCName'>
                 <xs:enumeration value='allow'/>
-                <xs:enumeration value='never'/>
+                <xs:enumeration value='forbid'/>
                 <xs:enumeration value='prefer'/>
                 <xs:enumeration value='require'/>
               </xs:restriction>
@@ -1102,7 +1102,7 @@
             <xs:simpleType>
               <xs:restriction base='xs:NCName'>
                 <xs:enumeration value='allow'/>
-                <xs:enumeration value='never'/>
+                <xs:enumeration value='forbid'/>
                 <xs:enumeration value='prefer'/>
                 <xs:enumeration value='require'/>
               </xs:restriction>
@@ -1152,7 +1152,7 @@
             <xs:simpleType>
               <xs:restriction base='xs:NCName'>
                 <xs:enumeration value='allow'/>
-                <xs:enumeration value='never'/>
+                <xs:enumeration value='forbid'/>
                 <xs:enumeration value='prefer'/>
               </xs:restriction>
             </xs:simpleType>