Merge commit 'refs/pull/569/head' of https://github.com/xsf/xeps into feature/xep-0387

xep-0387.xml

@@ -2,10 +2,12 @@
 <!DOCTYPE xep SYSTEM 'xep.dtd' [
 <!ENTITY % ents SYSTEM 'xep.ent'>
 %ents;
-<!ENTITY component "<note>Support can be enabled via an external component or an internal server module/plugin.</note>">
+<!ENTITY component "<note>Support can be enabled via an external component or an internal server module/plugin. If claiming compliance using such an addition, the necessary components/modules/plugins MUST be detailed.</note>">
 <!ENTITY usecases "<note>Support for the Entity Use Cases and Occupant Use Cases is REQUIRED; support for the remaining use cases is RECOMMENDED.</note>">
 <!ENTITY onlyone "<note>Only one of the recommended providers must be implemented for compliance.</note>">
 <!ENTITY nocli "<note>Not required for command line or terminal based interfaces.</note>">
+<!ENTITY avatar "<note>While 'User Avatars' is more modern, 'vCard-Based Avatars' is more widely deployed. Although it is suggested that to maximise interoperability with existing software a client fully supports both it is sufficient to claim compliance with this suite if the support for 'vCard-Based Avatars' is read-only.</note>">
+<!ENTITY pubsubjid "<note>While 'Personal Eventing Protocol' does not require all the features of 'Publish-Subscribe' to be available on the users' JIDs, and nor does this suite, it is desirable for this to be the case and it is expected that this will a requirement of future Compliance Suites.</note>">
 ]>
 <?xml-stylesheet type='text/xsl' href='xep.xsl'?>
 <xep>
@@ -29,6 +31,8 @@
       <spec>RFC 7622</spec>
       <spec>XEP-0030</spec>
       <spec>XEP-0045</spec>
+      <spec>XEP-0048</spec>
+      <spec>XEP-0049</spec>
       <spec>XEP-0084</spec>
       <spec>XEP-0085</spec>
       <spec>XEP-0114</spec>
@@ -38,6 +42,7 @@
       <spec>XEP-0191</spec>
       <spec>XEP-0198</spec>
       <spec>XEP-0206</spec>
+      <spec>XEP-0223</spec>
       <spec>XEP-0249</spec>
       <spec>XEP-0280</spec>
       <spec>XEP-0313</spec>
@@ -63,6 +68,12 @@
       <initials>XEP Editor (ssw, revision added by jwi)</initials>
       <remark><p>Rejected by council</p></remark>
     </revision>
+    <revision>
+      <version>0.4</version>
+      <date>2018-01-10</date>
+      <initials>kis</initials>
+      <remark><p>Address recent feedback</p></remark>
+    </revision>
     <revision>
       <version>0.3.1</version>
       <date>2017-11-04</date>
@@ -165,7 +176,7 @@
           <td><strong>Event publishing</strong></td>
           <td align='center'>&#10005;</td>
           <td align='center'>&#10005;</td>
-          <td align='center'>&#10003;</td>
+          <td align='center'>&#10003;&pubsubjid;</td>
           <td align='center'>&#10003;</td>
           <td>&xep0163;</td>
         </tr>
@@ -220,10 +231,18 @@
         <tr>
           <td><strong>User Avatars</strong></td>
           <td align='center'>N/A</td>
-          <td align='center'>&#10003;&nocli;</td>
+          <td align='center'>&#10003;&nocli;&avatar;</td>
           <td align='center'>N/A</td>
+          <td align='center'>&#10003;&nocli;&avatar;</td>
+          <td>&xep0084;&xep0153;</td>
+        </tr>
+        <tr>
+          <td><strong>vcard-temp</strong></td>
+          <td align='center'>&#10003;</td>
           <td align='center'>&#10003;&nocli;</td>
-          <td>&xep0084;</td>
+          <td align='center'>&#10003;</td>
+          <td align='center'>&#10003;&nocli;</td>
+          <td>&xep0054;</td>
         </tr>
         <tr>
           <td><strong>Outbound Message Synchronization</strong></td>
@@ -257,6 +276,22 @@
           <td align='center'>&#10003;</td>
           <td>&xep0048;</td>
         </tr>
+        <tr>
+          <td><strong>Persistent Storage of Private Data via PubSub</strong></td>
+          <td align='center'>&#10005;</td>
+          <td align='center'>&#10005;</td>
+          <td align='center'>&#10003;&component;</td>
+          <td align='center'>&#10003;</td>
+          <td>&xep0223;</td>
+        </tr>
+        <tr>
+          <td><strong>Private XML Storage</strong></td>
+          <td align='center'>&#10005;</td>
+          <td align='center'>&#10005;</td>
+          <td align='center'>&#10003;&component;</td>
+          <td align='center'>&#10003;</td>
+          <td>&xep0049;</td>
+        </tr>
         <tr>
           <td><strong>Session Resumption</strong></td>
           <td align='center'>&#10005;</td>