0.10 RC3 minor clarifications

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

xep-0155.xml

@@ -29,7 +29,7 @@
     <version>0.10</version>
     <date>2006-10-20</date>
     <initials>ip</initials>
-    <remark><p>Specified handling of offline requests.</p></remark>
+    <remark><p>Specified handling of offline requests; minor clarifications.</p></remark>
   </revision>
   <revision>
     <version>0.9</version>
@@ -105,7 +105,7 @@
 <section1 topic='Use Cases' anchor='usecases'>
   <section2 topic='Initiating a Chat' anchor='initiate'>
     <p>In order to initiate a negotiated chat session, the initiating party ("user") sends a &MESSAGE; <note>The &MESSAGE; stanza is used because the user does not necessarily know which of the contact's resources is most available (or indeed if the contact is online).</note> stanza to the receiving party ("contact") containing a &lt;feature/&gt; child qualified by the 'http://jabber.org/protocol/feature-neg' namespace. The &MESSAGE; stanza MUST NOT contain a &BODY; child element (as specified in &rfc3921;). The &MESSAGE; stanza type SHOULD be "normal" (either explicitly or by non-inclusion of the 'type' attribute). The stanza MAY include an 'id' attribute and MUST contain a &THREAD; element for tracking purposes (where the newly-generated ThreadID is unique to the proposed session). The data form MUST contain a hidden FORM_TYPE field whose value is "http://jabber.org/protocol/chatneg" and MUST contain a boolean field named "accept". &BOOLEANNOTE; The inclusion of "otr" and "security" fields is also RECOMMENDED. Note: The options within any 'list-single' fields SHOULD appear in order of preference.</p>
-    <p>Note: If the user is interested only in an immediate chat session then the user SHOULD instruct the contact's server not to store the message for later delivery using the &xep0079; protocol.</p>
+    <p>Note: Chat sessions may be conducted between entities who are never online at the same time. However, if the user is interested only in an <em>immediate</em> chat session then the user SHOULD instruct the contact's server not to store the message for later delivery using the &xep0079; protocol.</p>
     <p>In the following example of a negotiation request, Romeo requests a chat with Juliet and also queries her regarding whether she wants to enable all message logging (see &xep0136;) <note>A client MUST NOT set the 'otr' field to 'true' unless it has confirmed that its server will allow it to switch off Automated Archiving (see <cite>Message Archiving</cite>).</note> and support the &xep0071; and &xep0085; extensions during this chat session. He also requires that they are both connected securely to their servers, and asks which language she prefers amoungst those he can write. (Note: These fields are examples only; a full set of chat session negotiation parameters will be registered as described in the <link url='#registrar'>XMPP Registrar Considerations</link> section of this document.)</p>
     <example caption="User requests chat session"><![CDATA[
 <message type='normal'
@@ -170,7 +170,7 @@
   </amp>
 </message>
     ]]></example>
-    <p>The contact's server delivers the request to the contact's most available resource (which in the examples below happens to be "balcony"). If no resource is available (and no <cite>Advanced Message Processing</cite> rule included in the request specifies otherwise) then the server MAY store the request for later delivery. In this case, if the contact is interested only in an immediate chat session when it eventually receives the request, it SHOULD initiate a new chat session negotiation (including a newly-generated ThreadID) instead of responding to the user's request. Note: Sending any response to the user's original request would leak presence information since it would divulge the fact that the contact had been offline rather than just ignoring the user.</p>
+    <p>The contact's server delivers the request to the contact's most available resource (which in the examples below happens to be "balcony"). If no resource is available (and no <cite>Advanced Message Processing</cite> rule included in the request specifies otherwise) then the server MAY store the request for later delivery. In this case, if the contact is interested only in an <em>immediate</em> chat session when it eventually receives the request, it SHOULD initiate a new chat session negotiation (including a newly-generated ThreadID) instead of responding to the user's request. Note: Sending any response to the user's original request would leak presence information since it would divulge the fact that the contact had been offline rather than just ignoring the user.</p>
     <p>In any response to the user's request, the contact's client MUST mirror any 'id' attribute and &THREAD; value so that the user's client can correctly track the response.</p>
     <p>If the contact's client does not support one of the default values or if the contact has disabled its support (as for Chat State Notifications and XHTML formatting in the example below), and the client can still accept the request, then it MUST set that field to a value that it can support.</p>
     <p>In the example below we assume that Juliet accepts the chat and specifies that she prefers to speak Italian with Romeo:</p>
@@ -230,6 +230,17 @@
          to='romeo@montague.net/orchard'
          id='init1'>
   <thread>ffd7076498744578d10edabfe7f4a866</thread>
+  <feature xmlns='http://jabber.org/protocol/feature-neg'>
+    <x xmlns='jabber:x:data' type='form'>
+      <field var='FORM_TYPE' type='hidden'>
+        <value>http://jabber.org/protocol/chatneg</value>
+      </field>
+      ...
+    </x>
+  </feature>
+  <amp xmlns='http://jabber.org/protocol/amp'>
+    <rule action='drop' condition='deliver' value='stored'/>
+  </amp>
   <error code='503' type='cancel'>
     <service-unavailable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -242,6 +253,17 @@
          to='romeo@montague.net/orchard'
          id='init1'>
   <thread>ffd7076498744578d10edabfe7f4a866</thread>
+  <feature xmlns='http://jabber.org/protocol/feature-neg'>
+    <x xmlns='jabber:x:data' type='form'>
+      <field var='FORM_TYPE' type='hidden'>
+        <value>http://jabber.org/protocol/chatneg</value>
+      </field>
+      ...
+    </x>
+  </feature>
+  <amp xmlns='http://jabber.org/protocol/amp'>
+    <rule action='drop' condition='deliver' value='stored'/>
+  </amp>
   <error code='501' type='cancel'>
     <feature-not-implemented xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
     <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>otr</text>
@@ -255,7 +277,18 @@
          to='romeo@montague.net/orchard'
          id='init1'>
   <thread>ffd7076498744578d10edabfe7f4a866</thread>
-  <error code='501' type='cancel'>
+  <feature xmlns='http://jabber.org/protocol/feature-neg'>
+    <x xmlns='jabber:x:data' type='form'>
+      <field var='FORM_TYPE' type='hidden'>
+        <value>http://jabber.org/protocol/chatneg</value>
+      </field>
+      ...
+    </x>
+  </feature>
+  <amp xmlns='http://jabber.org/protocol/amp'>
+    <rule action='drop' condition='deliver' value='stored'/>
+  </amp>
+  <error code='406' type='modify'>
     <not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
     <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>security</text>
   </error>