moparisthebest
/
xeps
mirror of https://github.com/moparisthebest/xeps
1
0
Fork 0
Code Issues Releases Wiki Activity

1.11pre2 

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1682 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2008-02-15 18:31:52 +00:00
parent 7bc1d72c10
commit 9db5598463
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
xep-0060.xml
View File

@ -49,8 +49,8 @@
&ralphm;
<revision>
<version>1.11pre1</version>
<date>in progress, last updated 2008-02-13</date>
<version>1.11pre2</version>
<date>in progress, last updated 2008-02-15</date>
<initials>rm/psa</initials>
<remark><p>For collection nodes, changed name of node child element to associate and added disassociate child element to handle disassociation use case; corrected SHIM examples to conform to XEP-0131.</p></remark>
</revision>
@ -4669,7 +4669,7 @@ And by opposing end them?
id='newnode1'>
<event xmlns='http://jabber.org/protocol/pubsub#event'>
<collection>
<associate id='new-node-id'>
<associate node='new-node-id'>
</collection>
</event>
</message>
@ -4681,7 +4681,7 @@ And by opposing end them?
id='newnode2'>
<event xmlns='http://jabber.org/protocol/pubsub#event'>
<collection>
<associate id='new-node-id'>
<associate node='new-node-id'>
<x xmlns='jabber:x:data' type='result'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#meta-data</value>
@ -4996,7 +4996,7 @@ And by opposing end them?
id='newnode1'>
<event xmlns='http://jabber.org/protocol/pubsub#event'>
<collection>
<associate id='new-node-id'>
<associate node='new-node-id'>
</collection>
</event>
</message>
@ -5062,7 +5062,7 @@ And by opposing end them?
id='oldnode1'>
<event xmlns='http://jabber.org/protocol/pubsub#event'>
<collection>
<disassociate id='new-node-id'>
<disassociate node='new-node-id'>
</collection>
</event>
</message>
@ -7049,6 +7049,26 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=unsubscribe;node=princely_musings
</xs:complexType>
</xs:element>
<xs:element name='associate'>
<xs:complexType>
<xs:simpleContent>
<xs:extension base='empty'>
<xs:attribute name='node' type='xs:string' use='required'/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name='disassociate'>
<xs:complexType>
<xs:simpleContent>
<xs:extension base='empty'>
<xs:attribute name='node' type='xs:string' use='required'/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name='configuration'>
<xs:complexType>
<xs:sequence minOccurs='0' xmlns:xdata='jabber:x:data'>