Editorial

xep-0403.xml

@@ -44,6 +44,7 @@
     <initials>sek</initials>
     <remark><p>
      Allow mapped resource in presence;
+     Remove extraneous vCard checks;
     </p></remark>
   </revision> 
   <revision>
@@ -179,7 +180,7 @@
         The presence node contains the presence value for clients belonging to participants that choose to publish presence to the channel. A MIX channel MAY require that all participants publish presence, so that active channel participants are visible.  It is not possible to enforce this in the server, so participants in a channel with this option MUST publish presence.  Each item in the presence node is identified by an encoded JID. The presence is encoded as a standard a presence stanza using a &lt;presence/&gt; element qualified by the 'jabber:client' namespace.
       </p>
     <p>
-      MIX extends the &lt;presence&gt; stanza using a &lt;mix&gt; element qualified by the 'urn:xmpp:mix:presence:0' namespace.  This enables any receiver of presence  to see identify the client to which presence refers and to have a nick to display.  This element contains two child elements:
+      MIX extends the &lt;presence&gt; stanza using a &lt;mix&gt; element qualified by the 'urn:xmpp:mix:presence:0' namespace.  This enables any receiver of presence  to identify the JID of the client to which the  presence presence refers and to have a nick to display.  This element contains two child elements:
     </p>
     <ol>
       <li>A &lt;nick&gt; element that contains the Nick of the message sender, taken from the Participants Node.  This MUST be present if a Nick is defined for the user.</li>
@@ -341,14 +342,14 @@ A user MAY share presence information with the channel, for one or more online c
 
 <section2 topic="Relaying IQ Stanzas" anchor="usecase-iq-relay">
   <p>
-    MIX channels MAY relay IQ stanzas between participants.   This is often useful to obtain client information where a direct request to the client would be blocked.   When a client sends an IQ stanza through a MIX channel, it will set the 'from' to its own JID and set the 'to' to the encoded JID of the recipient.    The MIX channel will modify the JIDs in the outgoing message, so that the 'to' is the full JID of the recipient and the 'from' is the encoded JID of the sender.   This is illustrated in the vCard section below.
+    MIX channels MAY relay IQ stanzas between participants.  This is often useful to obtain client information where a direct request to the client would be blocked.   When a client sends an IQ stanza through a MIX channel, it will set the 'from' to its own JID and set the 'to' to the encoded JID of the recipient.   Participants may be addressed by full JID or bare JID.   The MIX channel will modify the JIDs in the outgoing message, so that the 'to' is the full JID of the recipient and the 'from' is the encoded JID of the sender.   This is illustrated in the vCard section below.
   </p>
 </section2>
   
   
   
   <section2 topic="Requesting a vCard through a Channel" anchor="usecase-vcard">
-    <p>A client  MAY request the vCard of a channel participant through a MIX channel, for example to get an avatar.  The MIX channel MAY pass this request on or MAY block it.  vCard requests MAY use &xep0054; (vcard-temp) or &xep0292; (vCard4 over XMPP).  The MIX channel does not process the vCard requests, but simply relays them on to real bare JID of the target.  A MIX service MAY choose to relay one or both protocols.   Where a MIX service relays  one or both of these protocols, each protocol relayed MUST be advertised as a feature of the MIX service.   In the following example, using vcard-temp, the requesting client sends a message to the  encoded JID of the channel participant for which the vCard is desired.</p>
+    <p>A client  MAY request the vCard of a channel participant through a MIX channel, for example to get an avatar.  The MIX channel MAY pass this request on or MAY block it.  vCard requests MAY use &xep0054; (vcard-temp) or &xep0292; (vCard4 over XMPP).  The MIX channel does not process the vCard requests, but simply relays them on to real bare JID of the target.  A MIX service MAY choose to relay one or both protocols.   In the following example, using vcard-temp, the requesting client sends a message to the  encoded JID of the channel participant for which the vCard is desired.</p>
     <example caption="Client directly requests vCard through channel" ><![CDATA[
 <iq from='hag66@shakespeare.example/UUID-c8y/1573'
     id='lx09df27'
@@ -367,7 +368,7 @@ A user MAY share presence information with the channel, for one or more online c
 </iq>
 ]]></example>
     <p>
-      The user's server, on behalf of the user, MAY send a response or reject with an error.   The user's server will send the vCard back to the channel.
+      The user's server, on behalf of the user, MUST send a response or reject with an error.   The user's server will send the vCard back to the channel.
     </p>
     <example caption="User's Server sends vCard Response via MIX channel" ><![CDATA[
 <iq from='peter@shakespeare.example'