From 435af9aea24e190c241bd3a02e7ffacd54aba142 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Wed, 12 Dec 2007 21:03:13 +0000
Subject: [PATCH] 1.23pre5

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1466 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0045.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/xep-0045.xml b/xep-0045.xml
index 25f99c27..7d84dc54 100644
--- a/xep-0045.xml
+++ b/xep-0045.xml
@@ -50,10 +50,10 @@
   <registry/>
   &stpeter;
   <revision>
-    <version>1.23pre4</version>
-    <date>in progress, updated 2007-12-5</date>
+    <version>1.23pre5</version>
+    <date>in progress, updated 2007-12-12</date>
     <initials>psa</initials>
-    <remark><p>Defined getmemberlist room configuration option; added direct invitation protoocol; corrected logic regarding admission of room owner/admin when room is full; defined service discovery extension field for associated LDAP group; specified that room config fields can be listed in extended room information; specified message format for affiliation change notifications if user is not in the room; added example showing use of Result Set Management.</p></remark>
+    <remark><p>Defined getmemberlist room configuration option; added direct invitation protoocol; corrected logic regarding admission of room owner/admin when room is full; defined service discovery extension field for associated LDAP group; specified that room config fields can be listed in extended room information; specified message format for affiliation change notifications if user is not in the room; added example showing use of Result Set Management; recommended inclusion of MUC child element in presence errors.</p></remark>
   </revision>
   <revision>
     <version>1.22</version>
@@ -1358,6 +1358,7 @@
   <x xmlns='http://jabber.org/protocol/muc'/>
 </presence>
       ]]></example>
+      <p>Note: If an error occurs in relation to joining a room, the service SHOULD include the MUC child element (i.e., &lt;x xmlns='http://jabber.org/protocol/muc'/&gt;) in the &PRESENCE; stanza of type "error".</p>
       <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>
     </section3>
     <section3 topic='Presence Broadcast' anchor='enter-pres'>
@@ -1517,6 +1518,7 @@
     from='darkcave@macbeth.shakespeare.lit'
     to='hag66@shakespeare.lit/pda'
     type='error'>
+  <x xmlns='http://jabber.org/protocol/muc'/>
   <error code='401' type='auth'>
     <not-authorized xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -1540,6 +1542,7 @@
     from='darkcave@macbeth.shakespeare.lit'
     to='hag66@shakespeare.lit/pda'
     type='error'>
+  <x xmlns='http://jabber.org/protocol/muc'/>
   <error code='407' type='auth'>
     <registration-required xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -1553,6 +1556,7 @@
     from='darkcave@macbeth.shakespeare.lit'
     to='hag66@shakespeare.lit/pda'
     type='error'>
+  <x xmlns='http://jabber.org/protocol/muc'/>
   <error code='403' type='auth'>
     <forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -1566,6 +1570,7 @@
     from='darkcave@macbeth.shakespeare.lit'
     to='hag66@shakespeare.lit/pda'
     type='error'>
+  <x xmlns='http://jabber.org/protocol/muc'/>
   <error code='409' type='cancel'>
     <conflict xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -1581,6 +1586,7 @@
     from='darkcave@macbeth.shakespeare.lit'
     to='hag66@shakespeare.lit/pda'
     type='error'>
+  <x xmlns='http://jabber.org/protocol/muc'/>
   <error code='503' type='wait'>
     <service-unavailable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -1596,6 +1602,7 @@
     from='darkcave@macbeth.shakespeare.lit'
     to='hag66@shakespeare.lit/pda'
     type='error'>
+  <x xmlns='http://jabber.org/protocol/muc'/>
   <error code='404' type='cancel'>
     <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -1864,6 +1871,7 @@
     from='darkcave@macbeth.shakespeare.lit'
     to='hag66@shakespeare.lit/pda'
     type='error'>
+  <x xmlns='http://jabber.org/protocol/muc'/>
   <error code='409' type='cancel'>
     <conflict xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -1876,6 +1884,7 @@
     from='darkcave@macbeth.shakespeare.lit'
     to='hag66@shakespeare.lit/pda'
     type='error'>
+  <x xmlns='http://jabber.org/protocol/muc'/>
   <error code='406' type='cancel'>
     <not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -3435,6 +3444,7 @@
     from='darkcave@macbeth.shakespeare.lit/thirdwitch'
     to='hag66@shakespeare.lit/pda'
     type='error'>
+  <x xmlns='http://jabber.org/protocol/muc'/>
   <error code='405' type='cancel'>
     <not-allowed xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>