Merge branch 'feature/xep-369'

xep-0369.xml

@@ -36,6 +36,14 @@
   &ksmithisode;
   &skille;
   &stpeter;
+  <revision>
+    <version>0.9.6</version>
+    <date>2018-03-18</date>
+    <initials>Editor (jwi)</initials>
+    <remark><p>
+      Fix typo errors with single quotes (marj). Editorial fixes (ralph)
+    </p></remark>
+  </revision>
   <revision>
     <version>0.9.5</version>
     <date>2018-01-08</date>
@@ -1314,7 +1322,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
     to='hag66@shakespeare.example'
     id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
   <leave xmlns='urn:xmpp:mix:1'
-          channel=`coven@mix.shakespeare.example`/>
+          channel='coven@mix.shakespeare.example'/>
 </iq>
 ]]></example>
 
@@ -1514,7 +1522,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
       <p>
         A user setting status is now used as an example.   Unlike in &xep0045; where coming online is a special action, coming online in MIX is implicit when presence status is set.  Going offline is a achieved by setting presence status to unavailable, which removes the client full JID entry from the presence node.  When a user sets a presence status, the user's server sends updated presence to the MIX channel, and the MIX service then publishes the user's  availability to the "urn:xmpp:mix:nodes:presence" node. If there is not an item named by the full JID of the client with updated presence status, this item is created.   The sequence is shown in the following examples, starting with a client setting presences status on the connected server.</p>
       <example caption="Client Sets Presence Status on Server">
-        <![CDATA[<presence xmlns='jabber:client' from=‘hag66@shakespeare.example/UUID-a1j/7533’>
+        <![CDATA[<presence xmlns='jabber:client' from='hag66@shakespeare.example/UUID-a1j/7533'>
   <show>dnd</show>
   <status>Making a Brew</status>
 </presence>]]></example>
@@ -1523,7 +1531,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
         The server then sends the presence information to roster entries.  The following example then shows the presence message from the client's server to the MIX channel.
       </p>
       <example caption="Server sends Presence Status to MIX Channel">
-<![CDATA[<presence  from=‘hag66@shakespeare.example/UUID-a1j/7533’
+<![CDATA[<presence  from='hag66@shakespeare.example/UUID-a1j/7533'
               to='coven@mix.shakespeare.example'>
   <show>dnd</show>
   <status>Making a Brew</status>
@@ -2252,7 +2260,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
         <field type='text-multi'
                label='Channel Description'
                var='Description'/>
-         <field type=jid-single'
+         <field type='jid-single'
                 label='Channel Administrative Contact'
                 var='Contact'/>
       </x>
@@ -2323,7 +2331,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
              <value>urn:xmpp:mix:1</value>
         </field>
         <title>Configuration Node Modification</title>
-         <field type=jid-multi'
+         <field type='jid-multi'
                 label='Channel Administrator'
                 var='Administrator'/>
       </x>
@@ -2373,7 +2381,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
 </iq>
 ]]></example>
     </section3>
-    <section3 topic='Controlling Channel Partipcipants' anchor='usecase-admin-participants'>
+    <section3 topic='Controlling Channel Participants' anchor='usecase-admin-participants'>
       <p>
        Owners and Administrators are allowed to  control which users can participate in a channel by use of Allowed and Banned lists using PubSub.  These operations follow &xep0060; which sets out detailed protocol use and error handling.
        Allowed and Banned lists MAY be read by PubSub get of the Banned and Allowed Nodes.  This operation MAY be used by users as controlled by 'Allowed Node Subscription' and 'Banned Node Subscription' configuration node options (default Administrators).
@@ -2411,7 +2419,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
     <pubsub xmlns='http://jabber.org/protocol/pubsub'>
         <publish node='urn:xmpp:mix:nodes:allowed'>
             <item id='marlow.example'/>
-         </items>
+         </publish>
     </pubsub>
 </iq>
 
@@ -2425,7 +2433,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
       <p>
         JIDs can be removed from the Allowed and Banned nodes by pubsub retract command.
       </p>
-    <example caption="Client Removes a JID to the Banned Node" ><![CDATA[
+    <example caption="Client Removes a JID from the Banned Node" ><![CDATA[
 <iq from='hag66@shakespeare.example/UUID-a1j/7533'
     id='lx09df27'
     to='mix.shakespeare.example'
@@ -2433,7 +2441,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
     <pubsub xmlns='http://jabber.org/protocol/pubsub'>
         <retract node='urn:xmpp:mix:nodes:banned'>
             <item id='lear@shakespeare.example'/>
-         </items>
+        </retract>
     </pubsub>
 </iq>
 
@@ -2617,7 +2625,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
           id='bv1bs71f'
           type='get'>
        <query xmlns='jabber:iq:roster'>
-              <annotate xmlns=‘urn:xmpp:mix:roster:0'/>
+              <annotate xmlns='urn:xmpp:mix:roster:0'/>
        <query/>
      </iq>
 ]]></example>
@@ -2633,7 +2641,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
 
     <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'/>
   </item>
 ]]></example>