From 7f6f9303b939ecf91ded9c4093d7ce667a014c83 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Wed, 2 Jul 2008 21:16:53 +0000
Subject: [PATCH] collection tweaks

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

diff --git a/xep-0060.xml b/xep-0060.xml
index 2de888f2..62a4463e 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -49,8 +49,8 @@
   &ralphm;
 
   <revision>
-    <version>1.12pre1</version>
-    <date>in progress, last updated 2008-06-12</date>
+    <version>1.12pre2</version>
+    <date>in progress, last updated 2008-07-02</date>
     <initials>psa</initials>
     <remark>
       <ul>
@@ -4926,13 +4926,13 @@ And by opposing end them?
  </pubsub>
 </iq>
     ]]></example>
-    <p>In order to send notification of node associations and disassociations, the service shall send an event that contains a &lt;collection/&gt; element that in turns contains an &lt;associate/&gt; element whose 'id' attribute specifies the NodeID of the new node.</p>
+    <p>If the root collection node is configured to send notification of node associations and disassociations, the service shall send an event that contains a &lt;collection/&gt; element whose 'node' attribute specifies the NodeID of the collection (in this case the NodeID is empty to signify that the collection is the root collection); this element in turn contains an &lt;associate/&gt; element whose 'node' attribute specifies the NodeID of node that has been associated with the collection.</p>
     <example caption='Notification of node association'><![CDATA[
 <message from='pubsub.shakespeare.lit'
          to='francisco@denmark.lit'
          id='newnode1'>
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
-    <collection>
+    <collection node='some-collection'>
       <associate node='new-node-id'>
     </collection>
   </event>
@@ -4944,7 +4944,7 @@ And by opposing end them?
          to='francisco@denmark.lit'
          id='newnode2'>
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
-    <collection>
+    <collection node=''>
       <associate node='new-node-id'>
         <x xmlns='jabber:x:data' type='result'>
           <field var='FORM_TYPE' type='hidden'>
@@ -5299,13 +5299,13 @@ And by opposing end them?
   </pubsub>
 </iq>
     ]]></example>
-    <p>If the collection node is configured to send notification of node associations and disassociations, the service shall send an event that contains a &lt;collection/&gt; element that in turns contains an &lt;associate/&gt; element whose 'id' attribute specifies the NodeID of the new node.</p>
+    <p>If the collection node is configured to send notification of node associations and disassociations, the service shall send an event that contains a &lt;collection/&gt; element whose 'node' attribute specifies the NodeID of the collection; this element in turn contains an &lt;associate/&gt; element whose 'node' attribute specifies the NodeID of node that has been associated with the collection.</p>
     <example caption='Notification of node association'><![CDATA[
 <message from='pubsub.shakespeare.lit'
          to='francisco@denmark.lit'
-         id='newnode1'>
+         id='newnode3'>
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
-    <collection>
+    <collection node='some-collection'>
       <associate node='new-node-id'>
     </collection>
   </event>
@@ -5367,20 +5367,20 @@ And by opposing end them?
   </pubsub>
 </iq>
     ]]></example>
-    <p>If the collection node is configured to send notification of node associations and disassociations, the service shall send an event that contains a &lt;collection/&gt; element that in turns contains an &lt;disassociate/&gt; element whose 'id' attribute specifies the NodeID of the new node.</p>
+    <p>If the collection node is configured to send notification of node associations and disassociations, the service shall send an event that contains a &lt;collection/&gt; element whose 'node' attribute specifies the NodeID of the collection; this element in turn contains a &lt;disassociate/&gt; element whose 'node' attribute specifies the NodeID of node that has been disassociated from the collection.</p>
     <example caption='Notification of node disassociation'><![CDATA[
 <message from='pubsub.shakespeare.lit'
          to='francisco@denmark.lit'
          id='oldnode1'>
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
-    <collection>
+    <collection node='some-collection'>
       <disassociate node='new-node-id'>
     </collection>
   </event>
 </message>
     ]]></example>
     <p>If a node is disassociated from a collection node and a new association is not formed, the implementation MAY associate the node with the root collection node or associate it with no collection node.</p>
-    <p>Note: The combination of associating and disassociating a node with a collection can be used to move a node from one collection to another.</p>
+    <p>Note: The combination of associating a node with one collection and disassociating the same node from another collection can be used to move a node from one collection to another.</p>
   </section2>
 
   <section2 topic='Generating Publish Notifications for Collections' anchor='collections-notify'>