From 9db55984634f424074784012093c73dcabc67764 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Fri, 15 Feb 2008 18:31:52 +0000
Subject: [PATCH] 1.11pre2

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1682 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0060.xml | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/xep-0060.xml b/xep-0060.xml
index 900018a6..72914d79 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -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'>