From de51496d0939bf9cbba260ef1411966981f0239d Mon Sep 17 00:00:00 2001
From: Ian Paterson <ian.paterson@clientside.co.uk>
Date: Tue, 29 May 2007 18:07:10 +0000
Subject: [PATCH] fixed two typos and added a reference to XEP-0201

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

diff --git a/xep-0155.xml b/xep-0155.xml
index 1ecac1e2..de23a31b 100644
--- a/xep-0155.xml
+++ b/xep-0155.xml
@@ -129,7 +129,7 @@
   </revision>
 </header>
 <section1 topic='Introduction' anchor='intro'>
-  <p>The traditional model for one-to-one chat "sessions" in Jabber/XMPP is for a user to simply send a message to a contact without any formal negotiation of session parameters (e.g., see &xmppim;). This informal approach to initiation of a session is perfectly acceptable in many contexts, environments, and cultures. However, it may be desirable to formally request a chat session (or any other type of XMPP stanza session) and negotiate its parameters before beginning the session in some circumstances, such as:</p>
+  <p>The traditional model for one-to-one chat "sessions" in Jabber/XMPP is for a user to simply send a message to a contact with a thread ID but without any formal negotiation of session parameters (see &xep0201;). This informal approach to initiation of a session is perfectly acceptable in many contexts, environments, and cultures. However, it may be desirable to formally request a chat session (or any other type of XMPP stanza session) and negotiate its parameters before beginning the session in some circumstances, such as:</p>
   <ul>
     <li>Whenever parameters specific to a stanza session must be agreed. e.g., security and privacy parameters (see &xep0116; and &xep0136;).</li>
     <li>The parties are unknown to each other, have not exchanged presence, or have not discovered their respective capabilities via &xep0030; or &xep0115;.</li>
@@ -180,8 +180,8 @@ PENDING  o---------------+
   <p>[1] A stanza session negotiation is initiated when the user sends a message containing a data form of type "form" with an "accept" field.</p>
   <p>[2] A stanza session negotiation is accepted when the contact sends a message containing a data form of type "submit" with an "accept" field whose value is "1" or "true".</p>
   <p>[3] A stanza session negotiation is rejected when the contact sends a message containing a data form of type "submit" with an "accept" field whose value is "0" or "false".</p>
-  <p>[4] A stanza session negotiation is confirmed when the user sends a message containing a data form of type "result" with an "accept" field whose value is "1" or "true".</p>
-  <p>[5] A stanza session negotiation is confirmed when the user sends a message containing a data form of type "result" with an "accept" field whose value is "0" or "false".</p>
+  <p>[4] A stanza session negotiation is completed when the user sends a message containing a data form of type "result" with an "accept" field whose value is "1" or "true".</p>
+  <p>[5] A stanza session negotiation is canceled when the user sends a message containing a data form of type "result" with an "accept" field whose value is "0" or "false".</p>
   <p>[6] An existing session is re-negotiated when either party sends a message containing a data form of type "form" with a "renegotiate" field whose value is "1" or "true".</p>
   <p>[7] A session re-negotiation is accepted when the other party sends a message containing a data form of type "submit" with a "renegotiate" field whose value is "1" or "true".</p>
   <p>[8] A session re-negotiation is rejected when the other party sends a message containing a data form of type "submit" with a "renegotiate" field whose value is "0" or "false"; however, the session remains in the active state with the previously-negotiated parameters in force.</p>
@@ -491,7 +491,7 @@ PENDING  o---------------+
 </message>
   ]]></example>
   <p>The requesting party MAY continue to send stanzas within the session while it is waiting for the other party to either accept the parameters or report an error.</p>
-  <p>In order to reject the renegotiation, the other party shall send a message containing a data form of type "submit" with the 'renegotiate' field set to a value of "1" or "true".</p>
+  <p>In order to accept the renegotiation, the other party shall send a message containing a data form of type "submit" with the 'renegotiate' field set to a value of "1" or "true".</p>
   <example caption="Other party accepts renegotiation and specifies parameters"><![CDATA[
 <message type='normal'
          from='romeo@montague.net/orchard'