From 002a4a406692381ca7c2a798e118b15f6d254c7c Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Thu, 1 Apr 2010 02:34:55 +0000
Subject: [PATCH] 1.13rc15

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@4126 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 b2dd233d..94da0ba8 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -51,8 +51,8 @@
   &ralphm;
 
   <revision>
-    <version>1.13rc14</version>
-    <date>in progress, 2010-03-30</date>
+    <version>1.13rc15</version>
+    <date>in progress, 2010-03-31</date>
     <initials>psa</initials>
     <remark>
       <ul>
@@ -3802,7 +3802,7 @@ And by opposing end them?
   </pubsub>
 </iq>
       ]]></example>
-      <p>The deletion request MAY include the JID and node of a replacement node to which requests might be redirected.</p>
+      <p>The deletion request MAY include the URI of a replacement node to which requests might be redirected. Typically this is an XMPP URI or IRI as described under <link url='#impl-uri'>PubSub URIs</link>, but it can be an HTTP URI or any other scheme.</p>
       <example caption='Owner deletes a node with redirection'><![CDATA[
 <iq type='set'
     from='hamlet@denmark.lit/elsinore'
@@ -3815,6 +3815,7 @@ And by opposing end them?
   </pubsub>
 </iq>
       ]]></example>
+      <p>Support for redirection is OPTIONAL on the part of pubsub services.</p>
     </section3>
     <section3 topic='Success Case' anchor='owner-delete-success'>
       <p>If no error occurs, the service MUST inform the owner of success.</p>
@@ -7025,8 +7026,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
     <xs:complexType>
       <xs:simpleContent>
         <xs:extension base='empty'>
-          <xs:attribute name='jid' type='xs:string' use='required'/>
-          <xs:attribute name='node' type='xs:string' use='optional'/>
+          <xs:attribute name='uri' type='xs:string' use='required'/>
         </xs:extension>
       </xs:simpleContent>
     </xs:complexType>