From 18838920561beca9d8ade8bd5c7eb9512595a72e Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Wed, 14 Nov 2007 01:52:36 +0000
Subject: [PATCH] 0.10

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

diff --git a/xep-0167.xml b/xep-0167.xml
index 6ddbdc8f..73c91376 100644
--- a/xep-0167.xml
+++ b/xep-0167.xml
@@ -25,6 +25,12 @@
   &stpeter;
   &seanegan;
   &robmcqueen;
+  <revision>
+    <version>0.10</version>
+    <date>2007-11-13</date>
+    <initials>psa</initials>
+    <remark><p>Removed info message for busy since it is now a Jingle-specific error condition defined in XEP-0166; defined info message for active.</p></remark>
+  </revision>
   <revision>
     <version>0.9</version>
     <date>2007-04-17</date>
@@ -349,8 +355,8 @@ a=fmtp:96 vbr=on;cng=on
         <th>Meaning</th>
       </tr>
       <tr>
-        <td>&lt;busy/&gt;</td>
-        <td>The principal or device is currently unavailable for a session because busy with another (audio or other) session.</td>
+        <td>&lt;active/&gt;</td>
+        <td>The principal or device is again actively participating in the session after having been on hold or on mute.</td>
       </tr>
       <tr>
         <td>&lt;hold/&gt;</td>
@@ -362,22 +368,22 @@ a=fmtp:96 vbr=on;cng=on
       </tr>
       <tr>
         <td>&lt;ringing/&gt;</td>
-        <td>The device is ringing but the principal has not yet interacted with it to answer (maps to the SIP 180 response code).</td>
+        <td>The device is ringing but the principal has not yet interacted with it to answer (this maps to the SIP 180 response code).</td>
       </tr>
     </table>
     <p>Note: Because the informational message is sent in an IQ-set, the receiving party MUST return either an IQ-result or an IQ-error (normally only an IQ-result to acknowledge receipt; no error flows are defined or envisioned at this time).</p>
   </section2>
   <section2 topic='Examples' anchor='info-examples'>
-    <example caption="Receiver Sends Busy Message"><![CDATA[
+    <example caption="Receiver Sends Active Message"><![CDATA[
 <iq from='juliet@capulet.com/balcony'
     to='romeo@montague.net/orchard'
-    id='busy1'
+    id='active1'
     type='set'>
   <jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'>
           action='session-info'
           initiator='romeo@montague.net/orchard'
           sid='a73sjjvkla37jfea'>
-    <busy xmlns='http://www.xmpp.org/extensions/xep-0167.html#ns-info'/>
+    <active xmlns='http://www.xmpp.org/extensions/xep-0167.html#ns-info'/>
   </jingle>
 </iq>
     ]]></example>
@@ -584,7 +590,7 @@ a=fmtp:96 vbr=on;cng=on
     xmlns='http://www.xmpp.org/extensions/xep-0167.html#ns-info'
     elementFormDefault='qualified'>
 
-  <xs:element name='busy' type='empty'/>
+  <xs:element name='active' type='empty'/>
   <xs:element name='hold' type='empty'/>
   <xs:element name='mute' type='empty'/>
   <xs:element name='ringing' type='empty'/>