From 8f684ace2b01652d4fee93e6f267ca9dd98ba488 Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Wed, 23 Aug 2017 16:20:37 +0200
Subject: [PATCH 1/3] XEP-0045: Clarify wording for a client re-syncing to a
 MUC

TL;DR: whenever a client (re)sends a join, the MUC service should return
everything a newly joining client needs to know.

Discussion in
https://mail.jabber.org/pipermail/standards/2016-June/031180.html
---
 xep-0045.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xep-0045.xml b/xep-0045.xml
index 6a496107..b3a2710c 100644
--- a/xep-0045.xml
+++ b/xep-0045.xml
@@ -1385,6 +1385,7 @@
 </presence>
 ]]></example>
       <p>Before attempting to enter the room, a MUC-compliant client SHOULD first discover its reserved room nickname (if any) by following the protocol defined in the <link url='#reservednick'>Discovering Reserved Room Nickname</link> section of this document.</p>
+      <p>When a MUC service receives an &lt;x/&gt; tagged join stanza from an already-joined client (as identified by the client's full JID), the service SHOULD assume that the client lost its synchronization, and therefore it SHOULD send exactly the same stanzas to the client as if it would actually join the MUC. The server MAY also send a presence update to the other participants according to the received join presence.</p>
     </section3>
 
     <section3 topic='Presence Broadcast' anchor='enter-pres'>

From d960697c73b05a329ef8a3cd2c51ffb5aa26beec Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Thu, 31 Aug 2017 10:20:08 +0200
Subject: [PATCH 2/3] XEP-0045: improve wording of client re-sync

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

diff --git a/xep-0045.xml b/xep-0045.xml
index b3a2710c..5bf102ba 100644
--- a/xep-0045.xml
+++ b/xep-0045.xml
@@ -1385,7 +1385,7 @@
 </presence>
 ]]></example>
       <p>Before attempting to enter the room, a MUC-compliant client SHOULD first discover its reserved room nickname (if any) by following the protocol defined in the <link url='#reservednick'>Discovering Reserved Room Nickname</link> section of this document.</p>
-      <p>When a MUC service receives an &lt;x/&gt; tagged join stanza from an already-joined client (as identified by the client's full JID), the service SHOULD assume that the client lost its synchronization, and therefore it SHOULD send exactly the same stanzas to the client as if it would actually join the MUC. The server MAY also send a presence update to the other participants according to the received join presence.</p>
+      <p>When a MUC service receives an &lt;x/&gt; tagged join stanza from an already-joined client (as identified by the client's full JID), the service should assume that the client lost its synchronization, and therefore it SHOULD send exactly the same stanzas to the client as if it actually just joined the MUC. The server MAY also send a presence update to the other participants according to the received join presence.</p>
     </section3>
 
     <section3 topic='Presence Broadcast' anchor='enter-pres'>

From 867616ab0b401430f1cff2848773532b4a118fd2 Mon Sep 17 00:00:00 2001
From: Jonas Wielicki <j.wielicki@sotecware.net>
Date: Fri, 1 Sep 2017 16:42:57 +0200
Subject: [PATCH 3/3] XEP-0045: add revision block

---
 xep-0045.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xep-0045.xml b/xep-0045.xml
index 505f3f4f..86a4f1f3 100644
--- a/xep-0045.xml
+++ b/xep-0045.xml
@@ -45,6 +45,14 @@
   </schemaloc>
   <registry/>
   &stpeter;
+  <revision>
+    <version>1.29</version>
+    <date>2017-09-01</date>
+    <initials>gl</initials>
+    <remark>
+      <p>Clarify wording for a client re-syncing to a MUC</p>
+    </remark>
+  </revision>
   <revision>
     <version>1.28</version>
     <date>2017-05-31</date>