From 89f167a444f9778c14dbf4ac3549c3416a82ffb7 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Thu, 9 Aug 2007 02:50:35 +0000
Subject: [PATCH] copy edit

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1129 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0184.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/xep-0184.xml b/xep-0184.xml
index b0503d4a..4a94ed0e 100644
--- a/xep-0184.xml
+++ b/xep-0184.xml
@@ -78,7 +78,7 @@
   <p>There are two allowable elements in this namespace:</p>
   <ul>
     <li>&lt;request/&gt; -- included by a sending entity that wishes to know if the message has been received.</li>
-    <li>&lt;received/&gt; -- included by a receiving entity that wishes to inform the sending the entity that the message has been received.</li>
+    <li>&lt;received/&gt; -- included by a receiving entity that wishes to inform the sending entity that the message has been received.</li>
   </ul>
   <p>Specifically, the receiving entity shall return a &lt;received/&gt; notice if it has received and processed the message. The term "processed" is understood to include presentation to a human user if appropriate or any other application-specific client-side processing, including generation of an error response if the application determines that the message contents cannot be handled.</p>
   <p>The following is an example of a message that includes a request for return receipt.</p>
@@ -107,11 +107,12 @@
   <ol start='1'>
     <li><p>A sender SHOULD NOT include a request for message receipts when sending a message to the bare JID (&BAREJID;) of the recipient, only when sending to a full JID (&FULLJID;).</p></li>
     <li><p>A sender SHOULD NOT include a request for message receipts unless it knows (via &xep0030; or &xep0115;) that the intended recipient supports the protocol described herein or unless the use of message receipts is negotiated via &xep0155;.</p></li>
+    <li><p>A sender SHOULD include an 'id' attribute on the message so that the sender can properly track the receipt.</p></li>
   </ol>
   <p>Naturally, message receipts can be combined with the rules specified in <cite>Advanced Message Processing</cite> (e.g., the deliver rule) for more complete reporting.</p>
 </section1>
-<section1 topic='Service Discovery' anchor='disco'>
-  <p>If a sender wishes to request message receipts, it SHOULD first discover whether the intended recipient supports message receipts. Support can be discovered indirectly via <cite>Entity Capabilities</cite> or directly via <cite>Service Discovery</cite>.</p>
+<section1 topic='Determining Support' anchor='disco'>
+  <p>If a sender wishes to request message receipts, it SHOULD first determine whether the intended recipient supports message receipts. This can be done directly via <cite>Service Discovery</cite> or indirectly via <cite>Entity Capabilities</cite>.</p>
   <p>If an entity supports message receipts, it MUST report that by including a service discovery feature of "http://www.xmpp.org/extensions/xep-0184.html#ns" in response to disco#info requests &NSNOTE;:</p>
   <example caption="Initial Service Discovery information request"><![CDATA[
 <iq from='northumberland@shakespeare.lit/westminster'
@@ -133,7 +134,7 @@
   ]]></example>
 </section1>
 <section1 topic='Negotiation' anchor='neg'>
-  <p>Two entities MAY negotiate the use of message receipts for a given session using <cite>Stanza Session Negotiation</cite>. The parameter to be negotiated is named "http://www.xmpp.org/extensions/xep-0184.html#ns". Its use is illustrated in the following examples.</p>
+  <p>Two entities MAY negotiate the use of message receipts for a given session using <cite>Stanza Session Negotiation</cite>. The parameter to be negotiated is named "http://www.xmpp.org/extensions/xep-0184.html#ns" &NSNOTE;. Its use is illustrated in the following examples.</p>
   <example caption="User requests chat session"><![CDATA[
 <message type='normal'
          from='northumberland@shakespeare.lit/westminster'