From 82933773cbf8db30aa3d9bb266aa53063593c86f Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Fri, 29 Feb 2008 03:27:41 +0000
Subject: [PATCH] 0.11

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

diff --git a/xep-0180.xml b/xep-0180.xml
index 377277cf..198cce8a 100644
--- a/xep-0180.xml
+++ b/xep-0180.xml
@@ -27,6 +27,12 @@
     <surname>Chen</surname>
     <email>Milton.Chen@vseelab.com</email>
   </author>
+  <revision>
+    <version>0.11</version>
+    <date>2008-02-28</date>
+    <initials>psa</initials>
+    <remark><p>Moved profile attribute from XEP-0166 to this specification.</p></remark>
+  </revision>
   <revision>
     <version>0.10</version>
     <date>2007-11-27</date>
@@ -138,7 +144,7 @@
     </description>
   ]]></example>
   <p>The &DESCRIPTION; element is intended to be a child of a &CONTENT; element as specified in <cite>XEP-0166</cite>.</p>
-  <p>The &CONTENT; element SHOULD possess a 'profile' attribute that specifies the exact protocol in use as would be encapsulated in SDP (e.g., "RTP/AVP" or "UDP/TLS/RTP/SAVP").</p>
+  <p>The &DESCRIPTION; element SHOULD possess a 'profile' attribute that specifies the profile of RTP in use as would be encapsulated in SDP (e.g., "RTP/AVP" or "UDP/TLS/RTP/SAVP").</p>
   <p>The encodings SHOULD be provided in order of preference by placing the most-preferred &PAYLOADTYPE; element as the first child of the &DESCRIPTION; element (etc.).</p>
   <p>The allowable attributes of the &PAYLOADTYPE; element are as follows:</p>
   <table caption='Payload-Type Attributes'>
@@ -228,8 +234,8 @@
           action='session-initiate'
           initiator='romeo@montague.net/orchard'
           sid='v1d30k1ll3dth3r4d10st4r'>
-    <content content='initiator' name='this-is-the-video-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp'>
+    <content content='initiator' name='this-is-the-video-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp' profile='RTP/AVP'>
         <payload-type id='96' name='theora' clockrate='90000' height='720' width='1280'>
           <parameter name='delivery-method' value='inline'/>
           <parameter name='configuration' value='somebase16string'/>
@@ -273,8 +279,8 @@
           action='content-accept'
           initiator='romeo@montague.net/orchard'
           sid='v1d30k1ll3dth3r4d10st4r'>
-    <content content='initiator' name='this-is-the-video-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp'>
+    <content content='initiator' name='this-is-the-video-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp' profile='RTP/AVP'>
         <payload-type id='96' name='theora' height='720' width='1280'>
           <parameter name='delivery-method' value='inline'/>
           <parameter name='configuration' value='somebase16string'/>
@@ -306,8 +312,8 @@
           initiator='romeo@montague.net/orchard'
           responder='juliet@capulet.com/balcony'
           sid='v1d30k1ll3dth3r4d10st4r'>
-    <content creator='initiator' name='this-is-the-video-content' profile='RTP/AVP'>
-      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp'>
+    <content content='initiator' name='this-is-the-video-content'>
+      <description xmlns='urn:xmpp:tmp:jingle:apps:video-rtp' profile='RTP/AVP'>
         <payload-type id='96' name='theora' height='720' width='1280'>
           <parameter name='delivery-method' value='inline'/>
           <parameter name='configuration' value='somebase16string'/>
@@ -493,6 +499,7 @@ delivery-method=inline; configuration=somebase16string;
       <xs:sequence>
         <xs:element ref='payload-type' minOccurs='0' maxOccurs='unbounded'/>
       </xs:sequence>
+      <xs:attribute name='profile' use='optional' type='xs:string'/>
     </xs:complexType>
   </xs:element>