From 9133ca2f0ad3f4dd6315a97a1508a5512bae955b Mon Sep 17 00:00:00 2001
From: Steve Kille <steve.kille@isode.com>
Date: Tue, 13 Jun 2017 14:15:17 +0100
Subject: [PATCH] Roster Update Clarifications

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

diff --git a/xep-0369.xml b/xep-0369.xml
index 893d6e68..a00f0056 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -43,6 +43,7 @@
     <remark><p>
       Remove Legacy MIX Namespace;
       Add mix element in message to hold MIX additional information;
+      Roster Update Clarifications;
     </p></remark>
   </revision>
   <revision>
@@ -2519,22 +2520,23 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
   </section2>
 
   <section2 topic="MIX Roster Item Capability Sharing" anchor="mix-roster-capability-sharing">
-    <p>It will be useful for a MIX client to know which roster members are MIX channels, as this will facilitate convenient presentation of subscribed MIX channels to the user. A standard roster item is encoded as follows.</p>
+    <p>It is useful for a MIX client to know which roster members are MIX channels, as this will facilitate convenient presentation of subscribed MIX channels to the user. A standard roster item is encoded as follows.</p>
     <example caption="Standard Roster Item Encoding"><![CDATA[
 <item jid='romeo@example.net'/>
 ]]></example>
 
     <p>
-      MIX channels in the roster have an attribute 'channel' set to true.
+      MIX channels in the roster have an empty element 'channel' included in the roster item.
     </p>
 
     <example caption="Roster Item Encoding of a MIX Channel"><![CDATA[
-  <item jid='romeo@example.net'>
+  <item jid='balcony@example.net'>
       <channel xmlns=‘urn:xmpp:mix:0'/>
   </item>
 ]]></example>
 
     <p>
+      A server following the MIX specification MUST determine whether or not a client supports MIX.   The server will often have this information prior to the roster request, due to &xep0115; Entity Capabilities.   If the server does not have this information it MUST use service discovery to determine it before providing roster information.
       When sending roster information to a client that advertises MIX capability, the server MUST return all MIX channels and MUST use this encoding.  Presence  of MIX roster items MUST be set to offline (unavailable).
     </p>
 
@@ -2542,6 +2544,9 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
       Where a client does not advertise MIX capability, the server MAY choose to not return MIX channels as roster items.   If this is done care needs to be taken, in particular around support of roster versioning  &xep0237;.
     </p>
 
+    <p>
+      When a server determines that a client has added or removed MIX capability, the entire roster MUST be sent and roster version reset.   This is not a particularly efficient approach, but this is expected to be a rare event and so a simple approach is preferred.
+    </p>
   </section2>
 
   <section2 topic="MAM Archive Support" anchor="proxy-mam">