From 105d057b181a579818a2594e5c8a04bf83e9df03 Mon Sep 17 00:00:00 2001
From: stpeter <stpeter@stpeter.im>
Date: Wed, 6 Jul 2011 11:21:31 -0600
Subject: [PATCH] 0.11

---
 xep-0220.xml | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/xep-0220.xml b/xep-0220.xml
index 8c4d9ae8..c0a4aa29 100644
--- a/xep-0220.xml
+++ b/xep-0220.xml
@@ -27,6 +27,12 @@
     <surname>Hancke</surname>
     <jid>fippo@psyced.org</jid>
   </author>
+  <revision>
+    <version>0.11</version>
+    <date>2011-07-06</date>
+    <initials>psa</initials>
+    <remark><p>Per list discussion, reverted the stream features versioning that was added to version 0.10, thus reverting to the format used in versions 0.5 through 0.9 of the spec; corrected several errors in the examples.</p></remark>
+  </revision>
   <revision>
     <version>0.10</version>
     <date>2011-05-16</date>
@@ -305,8 +311,8 @@ recv: <db:verify
       <example caption="Receiving Server Receives Dialback Error from Authoritative Server (Step 3)"><![CDATA[
 recv: <db:verify
           from='sender.tld'
-          to='target.tld'
           id='D60000229F'
+          to='target.tld'
           type='error'>
         <error type='cancel'>
           <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -379,8 +385,8 @@ recv: <db:verify
       <example caption="Authoritative Server Sends Dialback Error to Receiving Server (Step 3)"><![CDATA[
 send: <db:verify
           from='sender.tld'
-          to='target.tld' 
           id='D60000229F'
+          to='target.tld' 
           type='error'>
         <error type='cancel'>
           <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -436,10 +442,12 @@ send: <db:verify
     </section3>
 
     <section3 topic="Dialback with Error Handling" anchor='advertisement-errors'>
-      <p>If a server supports graceful handling of dialback errors as described under Section 2.5, it MUST advertise that though a stream feature which is a &lt;dialback/&gt; element qualified by the 'urn:xmpp:features:dialback:1' namespace.</p>
+      <p>If a server supports graceful handling of dialback errors as described under Section 2.5, it MUST advertise that though a stream feature which is a &lt;dialback/&gt; element qualified by the 'urn:xmpp:features:dialback' namespace.</p>
       <example caption="Stream Features With &lt;errors/&gt; Element"><![CDATA[
 <stream:features>
-  <dialback xmlns='urn:xmpp:features:dialback:1'>
+  <dialback xmlns='urn:xmpp:features:dialback'>
+    <errors/>
+  </dialback>
 </stream:features>
       ]]></example>
     </section3>
@@ -523,11 +531,11 @@ receiver.target.tld.               86400 IN A                       10.44.0.4
     <p>The &REGISTRAR; includes 'jabber:server:dialback' in its registry of protocol namespaces (see &NAMESPACES;).</p>
   </section2>
   <section2 topic='Stream Features' anchor='registrar-stream'>
-    <p>The XMPP Registrar includes 'urn:xmpp:features:dialback:1' in its registry of stream features (see &STREAMFEATURES;).</p>
+    <p>The XMPP Registrar shall include 'urn:xmpp:features:dialback' in its registry of stream features (see &STREAMFEATURES;).</p>
     <p>The submission is as follows:</p>
     <code><![CDATA[
 <feature>
-  <ns>urn:xmpp:features:dialback:1</ns>
+  <ns>urn:xmpp:features:dialback</ns>
   <name>dialback</name>
   <element>dialback</element>
   <desc>Support for Server Dialback with dialback errors</desc>
@@ -603,17 +611,17 @@ receiver.target.tld.               86400 IN A                       10.44.0.4
 
 <xs:schema
     xmlns:xs='http://www.w3.org/2001/XMLSchema'
-    targetNamespace='urn:xmpp:features:dialback:1'
-    xmlns='urn:xmpp:features:dialback:1'
+    targetNamespace='urn:xmpp:features:dialback'
+    xmlns='urn:xmpp:features:dialback'
     elementFormDefault='qualified'>
 
-  <xs:element name='dialback' type='empty'/>
-
-  <xs:simpleType name='empty'>
-    <xs:restriction base='xs:string'>
-      <xs:enumeration value=''/>
-    </xs:restriction>
-  </xs:simpleType>
+  <xs:element name='dialback'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='errors' minOccurs='0' type='empty'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
 
 </xs:schema>
     ]]></code>