0.6

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

xep-0221.xml

@@ -22,6 +22,12 @@
   <shortname>NOT_YET_ASSIGNED</shortname>
   &ianpaterson;
   &stpeter;
+  <revision>
+    <version>0.6</version>
+    <date>2008-08-06</date>
+    <initials>psa</initials>
+    <remark><p>Further modified examples to track changes to XEP-0231.</p></remark>
+  </revision>
   <revision>
     <version>0.5</version>
     <date>2008-08-06</date>
@@ -61,9 +67,8 @@
 <section1 topic='Media Element' anchor='media'>
   <p>The root element for media data is &lt;media/&gt;. This element MUST be qualified by the "urn:xmpp:tmp:media-element' namespace &NSNOTE;. The &lt;media/&gt; element MUST be contained within a &lt;field/&gt; element qualified by the 'jabber:x:data' namespace.</p>
   <p>If the media is an image or video then the &lt;media/&gt; element SHOULD include 'height' and 'width' attributes specifying the recommended display size of the media in pixels.</p>
-  <p>The &lt;media/&gt; element SHOULD contain at least one &lt;uri/&gt; element to specify the out-of-band location of the media data. <note>Constrained execution environments prevent some clients (e.g., Web clients) from rendering media unless it has been received out-of-band.</note> If included, the &lt;uri/&gt; element MUST contain a URI that indicates the location and MUST include a 'type' attribute that specifies the MIME type of the media.</p>
+  <p>The &lt;media/&gt; element SHOULD contain at least one &lt;uri/&gt; element to specify the out-of-band location of the media data. <note>Constrained execution environments prevent some clients (e.g., Web clients) from rendering media unless it has been received out-of-band.</note> If included, the &lt;uri/&gt; element MUST contain a URI that indicates the location and MUST include a 'type' attribute that specifies the MIME type of the media. If the URI scheme is cid: then the identifier MUST refer to a bit of binary data as described in &xep0231;.</p>
   <p>The 'type' attribute of the &lt;uri/&gt; element is REQUIRED. The value of the 'type' attribute MUST match the syntax specified in &rfc2045;. That is, the value MUST include a top-level media type, the "/" character, and a subtype; in addition, it MAY include one or more optional parameters (e.g., the "audio/ogg" MIME type in the example shown below includes a "codecs" parameter as specified in &rfc4281;). The "type/subtype" string SHOULD be registered in the &ianamedia;, but MAY be an unregistered or yet-to-be-registered value.</p>
-  <p>The &lt;media/&gt; element MAY also contain one or more &lt;data/&gt; elements for distributing the media in-band. The &lt;data/&gt; element MUST be qualified by the 'urn:xmpp:tmp:data-element' as defined in &xep0231;. The <em>encoded</em> data SHOULD NOT be larger than 8 kilobytes. <note>If a stanza contains more than one &lt;data/&gt; element, the sending entity MUST take care not to trigger server-defined bandwidth limits.</note></p>
   <example caption='Audio Media Element'><![CDATA[
 <media xmlns='urn:xmpp:tmp:media-element'>
   <uri type='audio/x-wav'>
@@ -123,14 +128,10 @@
     xmlns='urn:xmpp:tmp:media-element'
     elementFormDefault='qualified'>
 
-  <xs:import 
-      namespace='urn:xmpp:tmp:data-element'/>
-
   <xs:element name='media'>
     <xs:complexType>
-      <xs:sequence xmlns:data='urn:xmpp:tmp:data-element'>
+      <xs:sequence>
         <xs:element ref='uri' minOccurs='0' maxOccurs='unbounded'/>
-        <xs:element ref='data:data' minOccurs='0' maxOccurs='unbounded'/>
       </xs:sequence>
       <xs:attribute name='height' type='xs:unsignedShort' use='optional'/>
       <xs:attribute name='width' type='xs:unsignedShort' use='optional'/>