From 714cda7a258df7f026735e8a09dbdf4b9f21d022 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Wed, 26 Sep 2007 19:33:11 +0000
Subject: [PATCH] 1.10 published

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

diff --git a/xep-0060.xml b/xep-0060.xml
index 65a3515a..67680e6f 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -49,8 +49,8 @@
   &ralphm;
 
   <revision>
-    <version>1.10pre10</version>
-    <date>in progress, last updated 2007-09-24</date>
+    <version>1.10</version>
+    <date>2007-09-26</date>
     <initials>psa</initials>
     <remark>
       <ul>
@@ -805,7 +805,7 @@ And by opposing end them?
          node='princely_musings'/>
 </iq>
     ]]></example>
-    <example caption='Service responds with identity of pubsub/collection'><![CDATA[
+    <example caption='Service responds with identity of pubsub/leaf'><![CDATA[
 <iq type='result'
     from='pubsub.shakespeare.lit'
     to='francisco@denmark.lit/barracks'
@@ -5353,7 +5353,7 @@ And by opposing end them?
   </section2>
 
   <section2 topic='Handling Notification-Related Errors' anchor='impl-bounce'>
-    <p>As noted above, a pubsub service SHOULD ensure that the &MESSAGE; stanza for each event notification it generates possesses an 'id' attribute with a unique value. (This notification ID is not to be confused with either the node ID or the item ID.) This ID MUST be unique within the context of the pubsub service in order to ensure proper tracking of any delivery-related errors.</p>
+    <p>As noted above, a pubsub service SHOULD ensure that the &MESSAGE; stanza for each event notification it generates possesses an 'id' attribute with a value. (This notification ID is not to be confused with either the node ID or the item ID.) This ID MUST be unique within the context of the pubsub service in order to ensure proper tracking of any delivery-related errors.</p>
     <p>Exactly how a service shall handle delivery-related errors is a matter of implementation. In general, such handling is effectively similar to the bounce processing performed by other message delivery systems, such as mail transfer agents and mailing list software. The following are some suggested guidelines regarding the handling of XMPP-specific error conditions in relation to pubsub event notifications (see <cite>RFC 3920</cite> and <cite>XEP-0086</cite> regarding XMPP error condition semantics):</p>
     <ul>
       <li>If the XMPP error is of type "cancel" (e.g., &notfound;), or the error condition is &gone;, the pubsub service SHOULD terminate the subscription of the entity to that node and MAY terminate the subscription of that entity to all nodes hosted at the service.</li>
@@ -7058,7 +7058,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=unsubscribe;node=princely_musings
 </section1>
 
 <section1 topic='Acknowledgements' anchor='ack'>
-  <p>Thanks to Bob Wyman, Gaston Dombiak, and Matt Tucker for their feedback.</p>
+  <p>Thanks to Gaston Dombiak, Chris Teegarden, Matt Tucker, and Bob Wyman for their feedback.</p>
 </section1>
 
 <section1 topic='Author Note' anchor='authornote'>