From ce9ba175fa3e3491a54f38a5b5bf8dae233218c8 Mon Sep 17 00:00:00 2001
From: Steve Kille <Steve Kille>
Date: Tue, 10 Jan 2017 11:57:04 +0000
Subject: [PATCH] Bump to 0.6.4

---
 xep-0369.xml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/xep-0369.xml b/xep-0369.xml
index dddfbd10..fde06490 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -37,6 +37,14 @@
   &skille;
   &stpeter;
 
+  <revision>
+    <version>0.6.4</version>
+    <date>2017-01-10</date>
+    <initials>sek</initials>
+    <remark><p>
+      Add node='mix' to channel disco to facilitate MIX and MUC co-existence on same node
+    </p></remark>
+  </revision>
   <revision>
     <version>0.6.3</version>
     <date>2016-12-22</date>
@@ -630,13 +638,13 @@
   <query xmlns='http://jabber.org/protocol/disco#info'/>
 </iq>
 ]]></example>
-    <p>Note that this query comes from the bare JID to the MIX channel, as it will always be sent to the MIX service by a MIX proxy.  The channel MUST return its identity and the features it supports.  Note that a MIX channel MUST support MAM and so the response will always include both MIX and MAM support.</p>
+    <p>Note that this query comes from the bare JID to the MIX channel, as it will always be sent to the MIX service by a MIX proxy.  The channel MUST return its identity and the features it supports.  Note that a MIX channel MUST support MAM and so the response will always include both MIX and MAM support.  All disco queries on a MIX channel rad results returned MUST include node='mix'.   The reason for this is to facilitate MIX channels and &xep0045; MUC rooms sharing the same JID.   This extra parameter will enable a server to return appropriate information.</p>
     <example caption='Channel Returns Disco Info Result'><![CDATA[
 <iq from='coven@mix.shakespeare.lit'
     id='ik3vs715'
     to='hag66@shakespeare.lit'
     type='result'>
-  <query xmlns='http://jabber.org/protocol/disco#info'>
+  <query xmlns='http://jabber.org/protocol/disco#info' node='mix'>
     <identity
         category='conference'
         name='A Dark Cave'
@@ -654,7 +662,7 @@
     id='kl2fax27'
     to='coven@mix.shakespeare.lit'
     type='get'>
-  <query xmlns='http://jabber.org/protocol/disco#items'/>
+  <query xmlns='http://jabber.org/protocol/disco#items'/ node='mix'>
 </iq>
 ]]></example>
     <example caption='Channel Returns Disco Items Result'><![CDATA[
@@ -662,7 +670,7 @@
     id='kl2fax27'
     to='hag66@shakespeare.lit'
     type='result'>
-  <query xmlns='http://jabber.org/protocol/disco#items'>
+  <query xmlns='http://jabber.org/protocol/disco#items' node='mix'>
     <item jid='coven@mix.shakespeare.example'
           node='urn:xmpp:mix:nodes:presence'/>
     <item jid='coven@mix.shakespeare.example'
@@ -684,7 +692,7 @@
     id='kl2fax27'
     to='coven@mix.shakespeare.lit'
     type='get'>
-  <query xmlns='urn:xmpp:mix:0#channel-info'/>
+  <query xmlns='urn:xmpp:mix:0#channel-info'/ node='mix'>
 </iq>
 ]]></example>
     <example caption='MIX Service Returns Channel Information'><![CDATA[
@@ -692,7 +700,7 @@
     id='kl2fax27'
     to='hag66@shakespeare.lit'
     type='result'>
-  <query xmlns='urn:xmpp:mix:0#channel-info'>
+  <query xmlns='urn:xmpp:mix:0#channel-info' node='mix'>
       <x xmlns='jabber:x:data' type='result'>
         <field var='FORM_TYPE' type='hidden'>
              <value>urn:xmpp:mix:0</value>
@@ -719,7 +727,7 @@
     id='kl2fax27'
     to='coven@mix.shakespeare.lit'
     type='get'>
-  <query xmlns='urn:xmpp:mix:0#get-participants'/>
+  <query xmlns='urn:xmpp:mix:0#get-participants'/ node='mix'>
 </iq>
 ]]></example>
     <example caption='MIX Service Returns Participant List for JID Visible Room'><![CDATA[
@@ -727,7 +735,7 @@
     id='kl2fax27'
     to='hag66@shakespeare.lit'
     type='result'>
-  <query xmlns='urn:xmpp:mix:0#get-participants'>
+  <query xmlns='urn:xmpp:mix:0#get-participants' node='mix'>
   <items>
       <item jid='hag66@shakespeare.lit' nick='thirdwitch'>
       <item jid='hag01@shakespeare.lit' nick='top witch'>