copy edit

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1472 4b5297f7-1745-476d-ba37-a9c6900126ab

xep-0201.xml

@@ -70,13 +70,13 @@
     <li>Restart a conversation from message history.</li>
     <li>Enable clients to distinguish between different conversation threads when presenting a user's message, chat, and groupchat histories, thus providing a more coherent user interface (e.g. by collapsing threads to a single history entry).</li>
     <li>Separate logical sessions from physical interface objects such as windows.</li>
-    <li>Route XMPP stanzas internally (e.g., dispatching different content types to different windows), thus facilitating the creation of more robust plugin architectures.</li>
+    <li>Route XMPP stanzas within a client (e.g., dispatching different content types to different windows), thus facilitating the creation of more robust plugin architectures.</li>
   </ul>
 </section1>
 <section1 topic='Semantics' anchor='semantics'>
   <p>Section 2.1.2.3 of <cite>RFC 3921</cite> currently states the following regarding the semantics of the ThreadID:</p>
   <p class='indent'>The &lt;thread/&gt; element contains non-human-readable XML character data specifying an identifier that is used for tracking a conversation thread (sometimes referred to as an "instant messaging session") between two entities.</p>
-  <p>The description in <cite>RFC 3921</cite> is deemed to be too limiting, since it ignores the potential use of the ThreadID when exchanging message stanzas of types other than "chat". Therefore we proposal the following description:</p>
+  <p>The description in <cite>RFC 3921</cite> is deemed to be too limiting, since it ignores the potential use of the ThreadID when exchanging message stanzas of types other than "chat". Therefore we propose the following description:</p>
   <p class='indent'>The primary use of the XMPP &lt;thread/&gt; element is to uniquely identify a conversation thread or "chat session" between two entities instantiated by &lt;message/&gt; stanzas of type "chat".  However, the XMPP &lt;thread/&gt; element may also be used to uniquely identify an analogous thread between two entities instantiated by &lt;message/&gt; stanzas of type "headline" or "normal", or among multiple entities in the context of a multi-user chat room instantiated by &lt;message/&gt; stanzas of type "groupchat". It may also be used for &lt;message/&gt; stanzas not related to a conversation, such as a game session or between plugins.</p>
 </section1>
 <section1 topic='Uniqueness' anchor='unique'>
@@ -87,11 +87,11 @@
 </section1>
 <section1 topic='Handling' anchor='handling'>
   <section2 topic='Chat Messages' anchor='chat'>
-    <p>In the context of &lt;message/&gt; stanzas of type "chat" exchanged between two entities, the value of the &lt;thread/&gt; element shall be considered equivalent to a unique identifier for the chat session or conversation thread. If an entity receives such a message with a new or unknown ThreadID, it SHOULD treat the message as part of a session with unnegotiated parameters (i.e., as equivalent to the first message in a chat session that has been negotiated via <cite>XEP-0155</cite> with no parameters specified). An entity SHOULD destroy the thread when it sends or receives a <cite>XEP-0155</cite> "terminate" stanza (such a stanza SHOULD be sent even for sessions that were not negotitated with <cite>XEP-0155</cite>) and MAY destroy the thread when it goes offline, but SHOULD NOT destroy the thread if a human user merely closes a window in a client interface.</p>
+    <p>In the context of &lt;message/&gt; stanzas of type "chat" exchanged between two entities, the value of the &lt;thread/&gt; element shall be considered equivalent to a unique identifier for the chat session or conversation thread. If an entity receives such a message with a new or unknown ThreadID, it SHOULD treat the message as part of a session with unnegotiated parameters (i.e., as equivalent to the first message in a chat session that has been negotiated via <cite>XEP-0155</cite> with no parameters specified). An entity SHOULD destroy the thread when it sends or receives a <cite>XEP-0155</cite> "terminate" stanza (such a stanza SHOULD be sent even for sessions that were not negotitated with <cite>XEP-0155</cite>) and MAY destroy the thread when it goes offline, but SHOULD NOT destroy the thread if a human user merely disengages from the chat session (e.g., by closing a window in a client interface).</p>
     <p>If an entity receives an XMPP presence stanza of type "unavailable" from the other entity during a chat session, it SHOULD NOT destroy the thread; instead, it SHOULD assume that the other entity will still be able to continue the session (perhaps the other entity simply became "invisible", was temporarily disconnected by a network error, or is persisting the state of the session until it reconnects and receives "offline" messages).</p>
     <p>If an entity receives a message of type "chat" without a thread ID then:</p>
     <ul>
-      <li>If the receiving entity has no sessions open with the message sender (full JID), or if all the open sessions have already <em>received</em> a message that included the session's thread ID, then the receiver should create a new session with a new thread ID (and include that thread ID in all the messages it sends within the session).</li>
+      <li>If the receiver has no sessions open with the sender (full JID), or if all the open sessions have already <em>received</em> a message that included the session's thread ID, then the receiver should create a new session with a new thread ID (and include that thread ID in all the messages it sends within the session).</li>
       <li>If the receiver has a session open with the sender within which it has never received any message that included the session's thread ID, then it should consider the message to be part of that session. If more than one of such sessions exist, then the message should be considered part of the session in which the receiver last sent a message.</li>
     </ul>
   </section2>
@@ -103,7 +103,7 @@
     <p>There are no special handling requirements related to threads in the context of &lt;message/&gt; stanzas of type "headline".</p>
   </section2>
   <section2 topic='Normal Messages' anchor='normal'>
-    <p>When sending a &lt;message/&gt; stanza of type "normal", the value of the &lt;thread/&gt; element is used to uniquely identify a conversation thread which may not be progressing in real-time. A &lt;message/&gt; stanza of type "normal" SHOULD always use a new &lt;thread/&gt; element identifier unless it is written in direct reply to another &lt;message/&gt; stanza, in which case the &lt;thread/&gt; element of the original &lt;message/&gt; should be used. Determining what constitutes a &lt;message/&gt; stanza written in reply to another is a matter left to individual implementation, but it is envisaged that in most cases it would be the result of, e.g., the user clicking a 'reply' button when reading the contents of the previous stanza; alternatively, the entity that replies can include an "In-Reply-To" header as described in the <link url='#impl'>Implementation Notes</link> section of this document.</p>
+    <p>When sending a &lt;message/&gt; stanza of type "normal", the value of the &lt;thread/&gt; element is used to uniquely identify a conversation thread that may not be progressing in real-time. A &lt;message/&gt; stanza of type "normal" SHOULD always use a new &lt;thread/&gt; element identifier unless it is written in direct reply to another &lt;message/&gt; stanza, in which case the &lt;thread/&gt; element of the original &lt;message/&gt; should be used. Determining what constitutes a &lt;message/&gt; stanza written in reply to another is a matter left to individual implementation, but it is envisaged that in most cases it would be the result of, e.g., the user clicking a 'reply' button when reading the contents of the previous stanza; alternatively, the entity that replies can include an "In-Reply-To" header as described in the <link url='#impl'>Implementation Notes</link> section of this document.</p>
   </section2>
   <section2 topic='Messages That Have Been Archived' anchor='archived'>
     <p>When displaying historical conversations within a user interface, a client SHOULD provide a visual indication of the thread to which a message belongs. Methods for such indications include (non-exhaustively) the grouping together of all messages from the same thread, providing an index of threads, or formatting all messages within a thread in a cohesive manner, e.g. with uniform coloring.</p>
@@ -181,14 +181,14 @@
   ]]></example>
 </section1>
 <section1 topic='Security Considerations' anchor='security'>
-  <p>An entity that generates the UUID used as the ThreadID MUST ensure that the UUID does not reveal (identifying) information about the entity.</p>
+  <p>An entity that generates the UUID used as the ThreadID MUST ensure that the UUID does not reveal identifying information about the entity.</p>
 </section1>
 <section1 topic='IANA Considerations' anchor='iana'>
   <p>This document requires no interaction with &IANA;.</p>
 </section1>
 <section1 topic='XMPP Registrar Considerations' anchor='registrar'>
   <section2 topic='SHIM Headers Registry' anchor='registrar-shim'>
-    <p>The XMPP Registrar shall add "ThreadID" to its registry of SHIM headers. The submission is as follows:</p>
+    <p>The XMPP Registrar shall add "ThreadID" to its registry of SHIM headers (see &SHIMHEADERS;). The submission is as follows:</p>
     <code><![CDATA[
 <header>
   <name>ThreadID</name>