moparisthebest/xeps
1
0
Fork 0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-28 12:12:22 -05:00
Code Issues Releases Wiki Activity

0.11 RC2 corrected schema renamed two attribute values

Browse Source 
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@170 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Ian Paterson 2006-11-05 15:53:05 +00:00
parent 609befce8b
commit 64a72f81ca
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
xep-0136.xml
View File

@ -38,9 +38,9 @@
&infiniti; &infiniti;
<revision> <revision>
<version>0.11</version> <version>0.11</version>
<date>2006-11-03</date> <date>2006-11-06</date>
<initials>ip</initials> <initials>ip</initials>
<remark><p>Added more otr attribute values and clarified their meaning, changed the never use attribute value to forbid</p></remark> <remark><p>Added more otr attribute values and clarified their meanings, changed the names of the use attribute values</p></remark>
</revision> </revision>
<revision> <revision>
<version>0.10</version> <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: 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 &MESSAGE; element even if the Save Mode is 'body'.</p> <p>Note: When archiving <em>locally</em> a client MAY save the full XML content of each &MESSAGE; 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 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 'require', 'prefer', 'approve', 'allow', 'resist' or 'forbid'. The client MUST be guided by the specified 'otr' attribute value when negotiating (see &xep0155;) whether or not all messages exchanged with a contact will be <link url='#otr'>Off The Record</link>. Note: If the OTR Mode is 'require' then the Save Mode MUST be 'false'.</p> <p>Each &lt;default/&gt; or &lt;item/&gt; element in the response MUST include an 'otr' attribute, whose value MAY be 'require', 'prefer', 'approve', 'concede', 'oppose' or 'forbid'. The client MUST be guided by the specified 'otr' attribute value when negotiating (see &xep0155;) whether or not all messages exchanged with a contact will be <link url='#otr'>Off The Record</link>. 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 '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 &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', 'concede' 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> <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[ <example caption='Server Returns Preferences'><![CDATA[
<iq type='result' id='pref1' to='juliet@capulet.com/chamber'> <iq type='result' id='pref1' to='juliet@capulet.com/chamber'>
<pref xmlns='http://jabber.org/protocol/archive'> <pref xmlns='http://jabber.org/protocol/archive'>
<default save='body' otr='allow' expire='31536000'/> <default save='body' otr='concede' expire='31536000'/>
<item jid='romeo@montague.net' save='false' otr='require'/> <item jid='romeo@montague.net' save='false' otr='require'/>
<item jid='benvolio@montague.net' save='all' expire='630720000' otr='forbid'/> <item jid='benvolio@montague.net' save='all' expire='630720000' otr='forbid'/>
<method type='auto' use='forbid'/> <method type='auto' use='forbid'/>
<method type='local' use='allow'/> <method type='local' use='concede'/>
<method type='manual' use='prefer'/> <method type='manual' use='prefer'/>
<auto save='false'/> <auto save='false'/>
</pref> </pref>
@ -181,10 +181,10 @@
<example caption='Server Returns Service Default Preferences'><![CDATA[ <example caption='Server Returns Service Default Preferences'><![CDATA[
<iq type='result' id='pref1' to='juliet@capulet.com/chamber'> <iq type='result' id='pref1' to='juliet@capulet.com/chamber'>
<pref xmlns='http://jabber.org/protocol/archive'> <pref xmlns='http://jabber.org/protocol/archive'>
<default save='false' otr='allow' unset='true'/> <default save='false' otr='concede' unset='true'/>
<method type='auto' use='allow'/> <method type='auto' use='concede'/>
<method type='local' use='allow'/> <method type='local' use='concede'/>
<method type='manual' use='allow'/> <method type='manual' use='concede'/>
<auto save='false'/> <auto save='false'/>
</pref> </pref>
</iq> </iq>
@ -229,7 +229,7 @@
<example caption='Client Sets Modes for a Contact'><![CDATA[ <example caption='Client Sets Modes for a Contact'><![CDATA[
<iq type='set' id='pref3'> <iq type='set' id='pref3'>
<pref xmlns='http://jabber.org/protocol/archive'> <pref xmlns='http://jabber.org/protocol/archive'>
<item jid='romeo@montague.net' save='body' expire='604800' otr='allow'/> <item jid='romeo@montague.net' save='body' expire='604800' otr='concede'/>
</pref> </pref>
</iq> </iq>
]]></example> ]]></example>
@ -239,13 +239,13 @@
<example caption='Server Pushes New Modes'><![CDATA[ <example caption='Server Pushes New Modes'><![CDATA[
<iq type='set' id='push3' to='juliet@capulet.com/chamber'> <iq type='set' id='push3' to='juliet@capulet.com/chamber'>
<pref xmlns='http://jabber.org/protocol/archive'> <pref xmlns='http://jabber.org/protocol/archive'>
<item jid='romeo@montague.net' save='body' expire='604800' otr='allow'/> <item jid='romeo@montague.net' save='body' expire='604800' otr='concede'/>
</pref> </pref>
</iq> </iq>
<iq type='set' id='push4' to='juliet@capulet.com/pda'> <iq type='set' id='push4' to='juliet@capulet.com/pda'>
<pref xmlns='http://jabber.org/protocol/archive'> <pref xmlns='http://jabber.org/protocol/archive'>
<item jid='romeo@montague.net' save='body' expire='604800' otr='allow'/> <item jid='romeo@montague.net' save='body' expire='604800' otr='concede'/>
</pref> </pref>
</iq> </iq>
]]></example> ]]></example>
@ -255,7 +255,7 @@
<example caption='Client Sets Method Preferences'><![CDATA[ <example caption='Client Sets Method Preferences'><![CDATA[
<iq type='set' id='pref4'> <iq type='set' id='pref4'>
<pref xmlns='http://jabber.org/protocol/archive'> <pref xmlns='http://jabber.org/protocol/archive'>
<method type='auto' use='allow'/> <method type='auto' use='concede'/>
<method type='local' use='forbid'/> <method type='local' use='forbid'/>
<method type='manual' use='prefer'/> <method type='manual' use='prefer'/>
</pref> </pref>
@ -267,7 +267,7 @@
<example caption='Server Pushes New Method Preferences'><![CDATA[ <example caption='Server Pushes New Method Preferences'><![CDATA[
<iq type='set' id='push5' to='juliet@capulet.com/chamber'> <iq type='set' id='push5' to='juliet@capulet.com/chamber'>
<pref xmlns='http://jabber.org/protocol/archive'> <pref xmlns='http://jabber.org/protocol/archive'>
<method type='auto' use='allow'/> <method type='auto' use='concede'/>
<method type='local' use='forbid'/> <method type='local' use='forbid'/>
<method type='manual' use='prefer'/> <method type='manual' use='prefer'/>
</pref> </pref>
@ -275,7 +275,7 @@
<iq type='set' id='push6' to='juliet@capulet.com/pda'> <iq type='set' id='push6' to='juliet@capulet.com/pda'>
<pref xmlns='http://jabber.org/protocol/archive'> <pref xmlns='http://jabber.org/protocol/archive'>
<method type='auto' use='allow'/> <method type='auto' use='concede'/>
<method type='local' use='forbid'/> <method type='local' use='forbid'/>
<method type='manual' use='prefer'/> <method type='manual' use='prefer'/>
</pref> </pref>
@ -306,11 +306,11 @@
<td>true,false</td> <td>true,false</td>
</tr> </tr>
<tr> <tr>
<td>allow</td> <td>concede</td>
<td>false,true**</td> <td>false,true**</td>
</tr> </tr>
<tr> <tr>
<td>resist</td> <td>oppose</td>
<td>false,true**</td> <td>false,true**</td>
</tr> </tr>
<tr> <tr>
@ -352,14 +352,14 @@
<td>false</td> <td>false</td>
</tr> </tr>
<tr> <tr>
<td>allow</td> <td>concede</td>
<td>true</td> <td>true</td>
<td>true</td> <td>true</td>
<td>false</td> <td>false</td>
<td>false</td> <td>false</td>
</tr> </tr>
<tr> <tr>
<td>resist</td> <td>oppose</td>
<td>true</td> <td>true</td>
<td>false</td> <td>false</td>
<td>false</td> <td>false</td>
@ -1151,8 +1151,10 @@
<xs:attribute name='otr' use='required'> <xs:attribute name='otr' use='required'>
<xs:simpleType> <xs:simpleType>
<xs:restriction base='xs:NCName'> <xs:restriction base='xs:NCName'>
<xs:enumeration value='allow'/> <xs:enumeration value='approve'/>
<xs:enumeration value='concede'/>
<xs:enumeration value='forbid'/> <xs:enumeration value='forbid'/>
<xs:enumeration value='oppose'/>
<xs:enumeration value='prefer'/> <xs:enumeration value='prefer'/>
<xs:enumeration value='require'/> <xs:enumeration value='require'/>
</xs:restriction> </xs:restriction>
@ -1192,8 +1194,10 @@
<xs:attribute name='otr' use='required'> <xs:attribute name='otr' use='required'>
<xs:simpleType> <xs:simpleType>
<xs:restriction base='xs:NCName'> <xs:restriction base='xs:NCName'>
<xs:enumeration value='allow'/> <xs:enumeration value='approve'/>
<xs:enumeration value='concede'/>
<xs:enumeration value='forbid'/> <xs:enumeration value='forbid'/>
<xs:enumeration value='oppose'/>
<xs:enumeration value='prefer'/> <xs:enumeration value='prefer'/>
<xs:enumeration value='require'/> <xs:enumeration value='require'/>
</xs:restriction> </xs:restriction>
@ -1242,7 +1246,7 @@
<xs:attribute name='use' use='required'> <xs:attribute name='use' use='required'>
<xs:simpleType> <xs:simpleType>
<xs:restriction base='xs:NCName'> <xs:restriction base='xs:NCName'>
<xs:enumeration value='allow'/> <xs:enumeration value='concede'/>
<xs:enumeration value='forbid'/> <xs:enumeration value='forbid'/>
<xs:enumeration value='prefer'/> <xs:enumeration value='prefer'/>
</xs:restriction> </xs:restriction>