From e0e63a2793723e4bb61f540c02562e9be2ca594a Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Thu, 13 Oct 2016 23:06:46 +0100
Subject: [PATCH 1/3] XEP-0030: Add the disco#info feature in every example.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Section 3.1 says “Every entity MUST […] support at least the
'http://jabber.org/protocol/disco#info' feature”, so it makes sense to
show that in examples.

Thanks to George Kiagiadakis for having pointed that out, at
https://bugs.freedesktop.org/show_bug.cgi?id=98127#c5
---
 xep-0030.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xep-0030.xml b/xep-0030.xml
index 7afe148b..c37b992d 100644
--- a/xep-0030.xml
+++ b/xep-0030.xml
@@ -337,6 +337,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 +359,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 +387,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 +416,7 @@
     <identity
         category='automation'
         type='command-list'/>
+    <feature var='http://jabber.org/protocol/disco#info'/>
   </query>
 </iq>
       ]]></example>

From a197ca1baa668a66db846e8adc9eb8a77b9c9fa2 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Thu, 13 Oct 2016 23:13:55 +0100
Subject: [PATCH 2/3] XEP-0030: List the proper namespace in the schemaloc ns
 element.

---
 xep-0030.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xep-0030.xml b/xep-0030.xml
index c37b992d..b3b0ae3b 100644
--- a/xep-0030.xml
+++ b/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/>

From 942814d9df6588c7577ca4da1cec3de53b150046 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Thu, 13 Oct 2016 23:15:14 +0100
Subject: [PATCH 3/3] XEP-0030: Release version 2.5rc2.

---
 xep-0030.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/xep-0030.xml b/xep-0030.xml
index b3b0ae3b..59fcb9da 100644
--- a/xep-0030.xml
+++ b/xep-0030.xml
@@ -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>