From 0566f46716deb43b09765f8e772d9cce54158077 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Wed, 13 Dec 2006 21:30:56 +0000
Subject: [PATCH] nick change clarification

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

diff --git a/xep-0045.xml b/xep-0045.xml
index 43bd6fa7..904981df 100644
--- a/xep-0045.xml
+++ b/xep-0045.xml
@@ -1525,7 +1525,13 @@
     from='hag66@shakespeare.lit/pda'
     to='darkcave@macbeth.shakespeare.lit/oldhag'/>
     ]]></example>
-    <p>The service then sends two presence stanzas to the full JID of each occupant (including the occupant who is changing his or her room nickname), one of type "unavailable" for the old nickname and one indicating availability for the new nickname. The unavailable presence MUST contain the new nickname and an appropriate status code (namely 303) as extended presence information in an &lt;x/&gt; element qualified by the 'http://jabber.org/protocol/muc#user' namespace so that Jabber clients are able to provide relevant hints to occupants regarding the nickname change if desired.</p>
+    <p>The service then sends two presence stanzas to the full JID of each occupant (including the occupant who is changing his or her room nickname), one of type "unavailable" for the old nickname and one indicating availability for the new nickname.</p>
+   <p>The unavailable presence MUST contain the following as extended presence information in an &lt;x/&gt; element qualified by the 'http://jabber.org/protocol/muc#user' namespace:</p>
+    <ul>
+      <li>The new nickname (in this case, nick='oldhag')</li>
+      <li>A status code of 303</li>
+    </ul>
+    <p>This enables the recipients to correlate the old roomnick with the new roomnick.</p>
     <example caption='Service Updates Nick'><![CDATA[
 <presence
     from='darkcave@macbeth.shakespeare.lit/thirdwitch'
@@ -4259,7 +4265,7 @@
   </section2>
   <section2 topic='Well-Known Service Discovery Nodes' anchor='registrar-nodes'>
     <p>The well-known Service Discovery node 'http://jabber.org/protocol/muc#rooms' enables discovery of the rooms in which a user is an occupant.</p>
-    <p>The well-known Service Discovery node 'x-roomuser-item' enables a user to discover his or registered roomnick from outside the room.</p>
+    <p>The well-known Service Discovery node 'x-roomuser-item' enables a user to discover his or her registered roomnick from outside the room.</p>
     <p>The well-known Service Discovery node 'http://jabber.org/protocol/muc#traffic' enables discovery of the namespaces that are allowed in traffic sent through a room (see the <link url='#impl-service-traffic'>Allowable Traffic</link> section of this document).</p>
   </section2>
   <section2 topic='Field Standardization' anchor='registrar-formtype'>