From c15b3fea7c75a88268e2756c75498d85e719e9e7 Mon Sep 17 00:00:00 2001
From: Steve Kille <Steve Kille>
Date: Wed, 8 Feb 2017 14:15:17 +0000
Subject: [PATCH] Password, Voice, and Name clarification

---
 xep-0369.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/xep-0369.xml b/xep-0369.xml
index 50185b47..27177dda 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -466,7 +466,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
       </p>
       <table caption="Information Node Attributes">
         <tr><th>Name</th><th>Description</th><th>Field Type</th><th>Values</th><th>Default</th></tr>
-        <tr><td>'Name'</td><td>A short string providing a name for the channel.  For example "The Coven".  Typical uses of this value will be to present a user with the name of this channel in a list of channels to select from or as the header of UI display of the channel.</td><td>text-single</td><td>-</td><td>-</td></tr>
+        <tr><td>'Name'</td><td>A short string providing a name for the channel.  For example "The Coven".  Typical uses of this value will be to present a user with the name of this channel in a list of channels to select from or as the header of UI display of the channel.  It is intended for use where a short string is needed to represent the channel.</td><td>text-single</td><td>-</td><td>-</td></tr>
         <tr><td>'Description'</td><td>A longer description of the channel. For example "The Place where the Macbeth Witches Meet up".   A typical use would be to provide a user with more information about the channel, for example in tool tip.</td><td>text-single</td><td>-</td><td>-</td></tr>
         <tr><td>'Contact'</td><td>The JID or JIDs of the person or role responsible for the channel.</td><td>jid-multi</td><td>-</td><td>-</td></tr>
       </table>
@@ -2415,15 +2415,16 @@ the participant is not be subscribed to all nodes associated with the channel (i
 </section1>
 
 <section1  topic="Capabilities not provided in MIX" anchor="not-included-from45">
-  <p>This section lists a number of capabilities not specified in this version of MIX which were provided in &xep0045;.   </p>
+  <p>This section lists a number of capabilities not specified in the core MIX which are provided in &xep0045;.   These capabilities will not be added to core MIX but they could in the future be specified as independent XEPs.</p>
   <section2 topic="Password Controlled Channels" anchor="password-control">
     <p>
-      &xep0045; provides a mechanism to control access to MUC rooms using passwords.  An equivalent mechanism is not included in MIX, as it has a number of security issues.  Control of access to channels is better achieved using an explicit list of participants.
+      &xep0045; provides a mechanism to control access to MUC rooms using passwords.  An equivalent mechanism is not included in core MIX, as it has a number of security issues.  Control of access to channels is better achieved using an explicit list of participants.
     </p>
   </section2>
   <section2 topic="Voice Control" anchor="voice-control">
     <p>
-      &xep0045; defines a mechanism so that MUC moderators can control who is able to send messages to a MUC room using a "voice" mechanism.  The current version of MIX does not include this.   This might be added to a future version of this XEP or as a separate XEP if this capability becomes an agreed requirement.
+      &xep0045; defines a mechanism so that MUC moderators can control who is able to send messages to a MUC room using a "voice" mechanism.  MIX does not provide an exact functional equivalent, although access control to channels enables some of the goals of voice control to be achieved in a different manner.
+      
     </p>
   </section2>