Merge commit 'refs/pull/646/head' of https://github.com/xsf/xeps

xep-0369.xml

@@ -35,12 +35,20 @@
   <shortname>MIX-CORE</shortname>
   &ksmithisode;
   &skille;
+  <revision>
+    <version>0.11.2</version>
+    <date>2018-05-24</date>
+    <initials>sek</initials>
+    <remark><p>
+      Add mandatory/optional table.
+    </p></remark>
+  </revision>
   <revision>
     <version>0.11.1</version>
     <date>2018-05-22</date>
     <initials>sek</initials>
     <remark><p>
-     Editorial;
+      Editorial;
     </p></remark>
   </revision>
   <revision>
@@ -417,13 +425,30 @@
   <ol>
     <li>MIX-CORE.  &xep0369;.  This specification, which is the central mandatory MIX specification.  This sets out requirements addressed by MIX and general MIX concepts and framework.   It defines joining channels and associated participant management.  It defines discovery and sharing of MIX channels and information about them.   It defines use of MIX to share messages with channel participants. </li>
     <li>MIX-PRESENCE. &xep0403;. This optional specification adds the ability for MIX online clients to share presence, so that this can be seen by other MIX clients.</li>
-    <li>MIX-PAM.  &xep0405;. This mandatory specification defines how a server supporting MIX clients behaves, to support servers implementing MIX-CORE and MIX-PRESENCE.</li>
+    <li>MIX-PAM.  &xep0405;. This  specification defines how a server supporting MIX clients behaves, to support servers implementing MIX-CORE and MIX-PRESENCE.</li>
     <li>MIX-ADMIN. &xep0406;.  This specifies MIX configuration and administration of MIX.</li>
     <li>MIX-ANON.  &xep0404;. This specifies a mechanism to hide real JIDs from MIX clients and related privacy controls. </li>
     <li>MIX-MISC.  &xep0407;. This specifies a number of small MIX capabilities which are useful but do not need to be a part of MIX-CORE. </li>
     <li>MIX-MUC. &xep0408;. This defines how MIX and MUC can be used together. </li>
     <li>RELIABLE-DELIVERY.  MIX-CORE needs messages to be distributed without loss.   This specification is important for MIX, but may be useful in other places.</li>
   </ol>
+  <p>
+    The following table shows which of these specification is mandatory or optional for a MIX server, a server supporting MIX users, a general purpose end user client, and a client providing MIX channel administration.
+  </p>
+  <table caption="Optional/Mandatory Status of the MIX Specifications">
+    <tr><th>Specification</th><th>MIX Server</th><th>Server supporting MIX Clients</th><th>End User MIX Client</th><th>Administrative MIX Client</th></tr>
+    
+    <tr><td>MIX-CORE</td><td>Mandatory</td><td>n/a</td><td>Mandatory</td><td>Mandatory</td></tr>
+    <tr><td>MIX-PRESENCE</td><td>Optional</td><td>n/a</td><td>Optional</td><td>Optional</td></tr>
+    <tr><td>MIX-PAM</td><td>n/a</td><td>Mandatory</td><td>Mandatory</td><td>Mandatory</td></tr>
+    <tr><td>MIX-ADMIN</td><td>Optional</td><td>n/a</td><td>n/a</td><td>Mandatory</td></tr>
+    <tr><td>MIX-ANON</td><td>Optional</td><td>n/a</td><td>n/a</td><td>Optional</td></tr>
+    <tr><td>MIX-MISC</td><td>Optional</td><td>n/a</td><td>Optional</td><td>Optional</td></tr>
+    <tr><td>MIX-MUC</td><td>Optional</td><td>n/a</td><td>Optional</td><td>n/a</td></tr>
+    <tr><td>RELIABLE-DELIVERY</td><td>Optional</td><td>Optional</td><td>n/a</td><td>n/a</td></tr>
+    
+    
+  </table>
 </section1>
 
 <section1 topic='Concepts' anchor='concepts'>