From bf0f65da1165177ca50b9606012b429be28d6794 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Tue, 31 Jul 2018 17:05:55 +0200
Subject: [PATCH 1/2] XEP-0384: Make examples use item id='current'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes it respect XEP-0060 §12.20 on singleton nodes.
---
 xep-0384.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/xep-0384.xml b/xep-0384.xml
index 43a3b317..1b678915 100644
--- a/xep-0384.xml
+++ b/xep-0384.xml
@@ -27,6 +27,12 @@
     <email>andy@strb.org</email>
     <jid>andy@strb.org</jid>
   </author>
+  <revision>
+    <version>0.2.2</version>
+    <date>2018-07-31</date>
+    <initials>egp</initials>
+    <remark><p>Make examples show items published to the id "current", as per <cite>XEP-0060</cite> §12.20.</p></remark>
+  </revision>
   <revision>
     <version>0.2.1</version>
     <date>2018-05-21</date>
@@ -166,7 +172,7 @@
          id='update_01'>
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
     <items node='eu.siacs.conversations.axolotl.devicelist'>
-      <item>
+      <item id='current'>
         <list xmlns='eu.siacs.conversations.axolotl'>
           <device id='12345' />
           <device id='4223' />
@@ -182,7 +188,7 @@
 <iq from='juliet@capulet.lit' type='set' id='announce1'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <publish node='eu.siacs.conversations.axolotl.devicelist'>
-      <item>
+      <item id='current'>
         <list xmlns='eu.siacs.conversations.axolotl'>
           <device id='12345' />
           <device id='4223' />
@@ -192,13 +198,14 @@
     </publish>
   </pubsub>
 </iq>]]></example>
+    <p>NOTE: as per <link url='https://xmpp.org/extensions/xep-0060.html#impl-singleton'><cite>XEP-0060</cite> §12.20</link>, it is RECOMMENDED for the publisher to specify an ItemID of "current" to ensure that the publication of a new item will overwrite the existing item.</p>
     <p>This step presents the risk of introducing a race condition: Two devices might simultaneously try to announce themselves, unaware of the other's existence. The second device would overwrite the first one. To mitigate this, devices MUST check that their own device ID is contained in the list whenever they receive a PEP update from their own account. If they have been removed, they MUST reannounce themselves.</p>
     <p>Furthermore, a device MUST announce it's IdentityKey, a signed PreKey, and a list of PreKeys in a separate, per-device PEP node. The list SHOULD contain 100 PreKeys, but MUST contain no less than 20.</p>
     <example caption='Announcing bundle information'><![CDATA[
 <iq from='juliet@capulet.lit' type='set' id='announce2'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <publish node='eu.siacs.conversations.axolotl.bundles:31415'>
-      <item>
+      <item id='current'>
         <bundle xmlns='eu.siacs.conversations.axolotl'>
           <signedPreKeyPublic signedPreKeyId='1'>
             BASE64ENCODED...

From 387cf768f15f32e0bf612efd7613f5ddd622b8c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= <j.wielicki@sotecware.net>
Date: Sun, 13 Jan 2019 14:51:09 +0100
Subject: [PATCH 2/2] XEP-0384: use minor version number increment for addition
 of normative language

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

diff --git a/xep-0384.xml b/xep-0384.xml
index 1b678915..20f25ab0 100644
--- a/xep-0384.xml
+++ b/xep-0384.xml
@@ -28,7 +28,7 @@
     <jid>andy@strb.org</jid>
   </author>
   <revision>
-    <version>0.2.2</version>
+    <version>0.3.0</version>
     <date>2018-07-31</date>
     <initials>egp</initials>
     <remark><p>Make examples show items published to the id "current", as per <cite>XEP-0060</cite> §12.20.</p></remark>