From 4675f44a13b971dd885dea26b707af3f785d9e25 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Sun, 16 Aug 2020 19:57:23 +0200
Subject: [PATCH 1/5] XEP-0060: Fix minor typo in form example

---
 xep-0060.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xep-0060.xml b/xep-0060.xml
index d7217566..0eef8f3f 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -4188,7 +4188,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'

From f33f609b1b0e6a44d35e84a1e5ff13a95368f74c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= <j.wielicki@sotecware.net>
Date: Tue, 25 Aug 2020 17:32:39 +0200
Subject: [PATCH 2/5] XEP-0060: re-add revision block

---
 xep-0060.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xep-0060.xml b/xep-0060.xml
index 0eef8f3f..7be403a2 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -49,6 +49,12 @@
   &pgmillard;
   &stpeter;
   &ralphm;
+  <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>

From 387cc1e151fff03909079d75cd41fcac68e0b529 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Sun, 16 Aug 2020 12:15:26 +0200
Subject: [PATCH 3/5] XEP-0060: Add missing querytype 'retrieve' action and
 'item' key to registry submission

---
 xep-0060.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/xep-0060.xml b/xep-0060.xml
index 7be403a2..097e9688 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -49,6 +49,12 @@
   &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>
@@ -6630,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>

From 96df927111b42aab80d3e5ec8f99ebd600542cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= <j.wielicki@sotecware.net>
Date: Tue, 25 Aug 2020 17:48:24 +0200
Subject: [PATCH 4/5] Accept inbox/xep-mam-prefs.xml as XEP-0441

---
 inbox/xep-mam-prefs.xml => xep-0441.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 rename inbox/xep-mam-prefs.xml => xep-0441.xml (97%)

diff --git a/inbox/xep-mam-prefs.xml b/xep-0441.xml
similarity index 97%
rename from inbox/xep-mam-prefs.xml
rename to xep-0441.xml
index c89a9b17..5a14cb82 100644
--- a/inbox/xep-mam-prefs.xml
+++ b/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>

From fc8526d02b14d6d9b704410de50f5f84f4d27fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= <j.wielicki@sotecware.net>
Date: Tue, 25 Aug 2020 17:48:42 +0200
Subject: [PATCH 5/5] Accept inbox/xep-pubsub-mam.xml as XEP-0442

---
 inbox/xep-pubsub-mam.xml => xep-0442.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 rename inbox/xep-pubsub-mam.xml => xep-0442.xml (93%)

diff --git a/inbox/xep-pubsub-mam.xml b/xep-0442.xml
similarity index 93%
rename from inbox/xep-pubsub-mam.xml
rename to xep-0442.xml
index 1fcdda8c..12704cab 100644
--- a/inbox/xep-pubsub-mam.xml
+++ b/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>