Merge pull request #260 from linkmauve/xep-0030

XEP-0030 fixes

xep-0030.xml

@@ -24,11 +24,11 @@
     <supersededby/>
     <shortname>disco</shortname>
     <schemaloc>
-      <ns>disco#info</ns>
+      <ns>http://jabber.org/protocol/disco#info</ns>
       <url>http://www.xmpp.org/schemas/disco-info.xsd</url>
     </schemaloc>
     <schemaloc>
-      <ns>disco#items</ns>
+      <ns>http://jabber.org/protocol/disco#items</ns>
       <url>http://www.xmpp.org/schemas/disco-items.xsd</url>
     </schemaloc>
     <registry/>
@@ -36,6 +36,15 @@
     &pgmillard;
     &reatmon;
     &stpeter;
+    <revision>
+      <version>2.5rc2</version>
+      <date>2016-10-13</date>
+      <initials>egp</initials>
+      <remark>
+        <p>Fixed the examples to always include a disco#info feature.</p>
+        <p>Listed the proper namespace in the schemaloc ns element.</p>
+      </remark>
+    </revision>
     <revision>
       <version>2.5rc1</version>
       <date>2015-09-22</date>
@@ -337,6 +346,7 @@
     id='info2'>
   <query xmlns='http://jabber.org/protocol/disco#info'>
     <identity category='account' type='registered'/>
+    <feature var='http://jabber.org/protocol/disco#info'/>
   </query>
 </iq>
       ]]></example>
@@ -358,6 +368,7 @@
         category='conference'
         name='A Dark Cave'
         type='text'/>
+    <feature var='http://jabber.org/protocol/disco#info'/>
     <feature var='http://jabber.org/protocol/muc'/>
     <feature var='muc_passwordprotected'/>
     <feature var='muc_hidden'/>
@@ -385,6 +396,7 @@
         category='client'
         type='pc'
         name='Gabber'/>
+    <feature var='http://jabber.org/protocol/disco#info'/>
     <feature var='jabber:iq:time'/>
     <feature var='jabber:iq:version'/>
   </query>
@@ -413,6 +425,7 @@
     <identity
         category='automation'
         type='command-list'/>
+    <feature var='http://jabber.org/protocol/disco#info'/>
   </query>
 </iq>
       ]]></example>