From cdb6c5720623462a11f813abfb27e2c89a1fe764 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Tue, 17 Nov 2009 19:22:58 +0000
Subject: [PATCH] 1.1rc1

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

diff --git a/xep-0167.xml b/xep-0167.xml
index dd719d61..2b261480 100644
--- a/xep-0167.xml
+++ b/xep-0167.xml
@@ -11,6 +11,7 @@
   &LEGALNOTICE;
   <number>0167</number>
   <status>Draft</status>
+  <interim/>
   <type>Standards Track</type>
   <sig>Standards</sig>
   <approver>Council</approver>
@@ -40,6 +41,12 @@
   &seanegan;
   &robmcqueen;
   &diana;
+  <revision>
+    <version>1.1rc1</version>
+    <date>in progress, last updated 2009-11-08</date>
+    <initials>psa</initials>
+    <remark><p>Added creator attribute to mute and unmute elements so that these events can be correlated with a particular content type; clarified use of the reason element in cases other than termination.</p></remark>
+  </revision>
   <revision>
     <version>1.0</version>
     <date>2009-06-10</date>
@@ -489,7 +496,7 @@ Initiator                    Responder
   </jingle>
 </iq>
   ]]></example>
-  <p>Note: If the responder supports none of the payload-types offered by the initiator, the responder SHOULD terminate the session and include a Jingle reason of &lt;failed-application/&gt;.</p>
+  <p>Note: If the responder supports none of the payload-types offered by the initiator, the responder SHOULD terminate the session and include a Jingle reason of &lt;failed-application/&gt;. This reason can also be included in non-termination events, such as content-reject when the other party has tried to add a content-type for which the recipient supports none of the payload types.</p>
   <p>If the responder accepts the session, the initiator acknowledges the session-accept message:</p>
   <example caption="Initiator acknowledges session acceptance"><![CDATA[
 <iq from='romeo@montague.lit/orchard'
@@ -724,6 +731,7 @@ delivery-method=inline; configuration=somebase16string;
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
     <mute xmlns='urn:xmpp:jingle:apps:rtp:info:1'
+          creator='responder'
           name='voice'/>
   </jingle>
 </iq>
@@ -739,6 +747,7 @@ delivery-method=inline; configuration=somebase16string;
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
     <unmute xmlns='urn:xmpp:jingle:apps:rtp:info:1'
+            creator='responder'
             name='voice'/>
   </jingle>
 </iq>
@@ -1853,9 +1862,18 @@ Romeo                         Juliet
   <xs:complexType name='mutingElementType'>
     <xs:simpleContent>
       <xs:extension base='empty'>
+        <xs:attribute name='creator'
+                      use='required'>
+          <xs:simpleType>
+            <xs:restriction base='xs:NCName'>
+              <xs:enumeration value='initiator'/>
+              <xs:enumeration value='responder'/>
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:attribute>
         <xs:attribute name='name'
                       type='xs:string'
-                      use='optional'/>
+                      use='required'/>
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>