Merge branch 'premerge' into 'main'

Premerge

See merge request xsf/xeps!16

xep-0060.xml

@@ -49,6 +49,18 @@
   &pgmillard;
   &stpeter;
   &ralphm;
+  <revision>
+    <version>1.19.0</version>
+    <date>2020-08-16</date>
+    <initials>ps</initials>
+    <remark><p>Add missing 'item' key and 'retrieve' action to query type registry.</p></remark>
+  </revision>
+  <revision>
+    <version>1.18.1</version>
+    <date>2020-08-25</date>
+    <initials>lnjx</initials>
+    <remark><p>Fix trivial typo</p></remark>
+  </revision>
   <revision>
     <version>1.18.0</version>
     <date>2020-02-27</date>
@@ -4188,7 +4200,7 @@ And by opposing end them?
     <field var='pubsub#node' type='text-single' label='Node ID'>
       <value>princely_musings</value>
     </field>
-    <field var='pusub#subscriber_jid' type='jid-single' label='Subscriber Address'>
+    <field var='pubsub#subscriber_jid' type='jid-single' label='Subscriber Address'>
       <value>horatio@denmark.lit</value>
     </field>
     <field var='pubsub#allow' type='boolean'
@@ -6624,12 +6636,20 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
 	  <name>unsubscribe</name>
           <desc>enables unsubscribing from a pubsub node</desc>
         </value>
+        <value>
+          <name>retrieve</name>
+          <desc>enables retrieving a specific item from a pubsub node</desc>
+        </value>
       </values>
     </key>
     <key>
       <name>node</name>
       <desc>the pubsub node</desc>
     </key>
+    <key>
+      <name>item</name>
+      <desc>the pubsub item</desc>
+    </key>
   </keys>
 </querytype>
 ]]></code>

xep-0441.xml

@@ -9,8 +9,8 @@
   <title>Message Archive Management Preferences</title>
   <abstract>This document defines a protocol to control a user's archiving preferences.</abstract>
   &LEGALNOTICE;
-  <number>xxxx</number>
-  <status>ProtoXEP</status>
+  <number>0441</number>
+  <status>Experimental</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
   <dependencies>
@@ -23,6 +23,12 @@
   <shortname>mamprefs</shortname>
   &mwild;
   &ksmith;
+  <revision>
+    <version>0.2.0</version>
+    <date>2020-08-25</date>
+    <initials>XEP Editor (jsc)</initials>
+    <remark>Accepted by vote of Council on 2020-08-19.</remark>
+  </revision>
   <revision>
     <version>0.1</version>
     <date>2020-04-03</date>

xep-0442.xml

@@ -9,8 +9,8 @@
   <title>Pubsub Message Archive Management</title>
   <abstract>This document defines a protocol to query and control a pubsub node's message archive.</abstract>
   &LEGALNOTICE;
-  <number>xxxx</number>
-  <status>ProtoXEP</status>
+  <number>0442</number>
+  <status>Experimental</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
   <dependencies>
@@ -26,6 +26,12 @@
   <shortname>pubsub-mam</shortname>
   &mwild;
   &ksmith;
+  <revision>
+    <version>0.2.0</version>
+    <date>2020-08-25</date>
+    <initials>XEP Editor (jsc)</initials>
+    <remark>Accepted by vote of Council on 2020-08-19.</remark>
+  </revision>
   <revision>
     <version>0.1.0</version>
     <date>2020-03-30</date>