From 373f1b137eeaf6d86c765ac5d0580e658a8858e7 Mon Sep 17 00:00:00 2001
From: Steve Kille <steve.kille@isode.com>
Date: Tue, 11 Dec 2018 08:44:06 +0000
Subject: [PATCH 1/2] Discovery on Account rather than Server;

---
 xep-0405.xml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/xep-0405.xml b/xep-0405.xml
index 4c689f43..8293d5e3 100644
--- a/xep-0405.xml
+++ b/xep-0405.xml
@@ -38,6 +38,14 @@
   <shortname>MIX-PAM</shortname>
   &ksmithisode;
   &skille;
+  <revision>
+    <version>0.3.0</version>
+    <date>2018-12-11</date>
+    <initials>sek</initials>
+    <remark>
+      Discovery on Account rather than Server;
+    </remark>
+  </revision>
   <revision>
     <version>0.2.1</version>
     <date>2018-11-03</date>
@@ -179,19 +187,18 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
   </section2>
 
 
-  <section2 topic="Client Determines MIX Capability of Local Server" anchor="user-server-client-capability">
+  <section2 topic="Client Determines MIX Capability of Client's Server" anchor="user-server-client-capability">
     <p>
-      Servers supporting this specification MUST advertise this to clients.   A client wishing to use MIX MUST check for this capability in the local server before using MIX.  The capability is represented by the 'urn:xmpp:mix:pam:0' feature.
+      Servers supporting this specification MUST advertise this to clients for which they wish to support this specification.     A client wishing to use MIX MUST check for this capability in the local server before using MIX, by verifying support for the client's account.  The capability is represented by the 'urn:xmpp:mix:pam:0' feature.
     </p>
-    <example caption="Client Determines MIX Capability of Local Server"><![CDATA[
+    <example caption="Client Determines MIX Capability for Server Account"><![CDATA[
 <iq from='hag66@shakespeare.example/UUID-c8y/1573'
     id='lx09df27'
     type='get'>
   <query xmlns='http://jabber.org/protocol/disco#info'/>
 </iq>
 
-<iq from='shakespeare.example'
-    id='lx09df27'
+<iq id='lx09df27'
     to='hag66@shakespeare.example/UUID-c8y/1573'
     type='result'>
   <query xmlns='http://jabber.org/protocol/disco#info'>

From 33dd5386b17eea2be3cdfa6a39459579382139bb Mon Sep 17 00:00:00 2001
From: Steve Kille <steve.kille@isode.com>
Date: Tue, 11 Dec 2018 08:52:13 +0000
Subject: [PATCH 2/2] Add participant ID to roster;

---
 xep-0405.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xep-0405.xml b/xep-0405.xml
index 8293d5e3..acd89ff6 100644
--- a/xep-0405.xml
+++ b/xep-0405.xml
@@ -44,6 +44,7 @@
     <initials>sek</initials>
     <remark>
       Discovery on Account rather than Server;
+      Add participant ID to roster;
     </remark>
   </revision>
   <revision>
@@ -541,12 +542,12 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
 ]]></example>
 
     <p>
-      MIX channels in the roster information returned in response to a request for this additional MIX information MUST have an element &lt;channel/&gt; qualified by the ‘urn:xmpp:mix:roster:0' namespace  included in the roster item, as shown inf the following example.
+      MIX channels in the roster information returned in response to a request for this additional MIX information MUST have an element &lt;channel/&gt; qualified by the ‘urn:xmpp:mix:roster:0' namespace  included in the roster item.  The &lt;channel/&gt; element MUST also include a 'participant-id' attribute that is the stable ID of the client.   This facilitates the client to match messages that reference this stable ID.   A MIX extended roster item is shown in the following example.
     </p>
 
     <example caption="Roster Item Encoding of a MIX Channel"><![CDATA[
   <item jid='balcony@example.net'>
-      <channel xmlns='urn:xmpp:mix:roster:0'/>
+      <channel xmlns='urn:xmpp:mix:roster:0' participant-id='123456'/>
   </item>
 ]]></example>