git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2261 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2008-09-25 16:21:42 +00:00
parent 61071431c6
commit 5deb147140
1 changed files with 25 additions and 3 deletions

View File

@ -26,6 +26,12 @@
&robmcqueen;
&seanegan;
&hildjj;
<revision>
<version>0.31</version>
<date>2008-09-25</date>
<initials>psa</initials>
<remark><p>Added disposition attribute to content element for mapping to SIP Content-Disposition header.</p></remark>
</revision>
<revision>
<version>0.30</version>
<date>2008-09-23</date>
@ -36,6 +42,7 @@
<li>Clarified that session-accept action accepts only the content definition(s) in the session-initiate.</li>
<li>Added optional thread element.</li>
<li>Clarified tie breaks for transport-replace.</li>
<li>Modified namespaces to incorporate namespace versioning.</li>
<li>Cleaned up XML schemas.</li>
</ul>
</remark>
@ -955,6 +962,11 @@ PENDING o----------------------+ |
<td>Which party originally generated the content type (used to prevent race conditions regarding modifications); the defined values are "initiator" and "responder" (where the default is "initiator").</td>
<td>REQUIRED</td>
</tr>
<tr>
<td>disposition</td>
<td>How the content definition is to be interpreted by the recipient. The meaning of this attribute matches the "Content-Disposition" header as defined in &rfc2183; and applied to SIP by <cite>RFC 3261</cite>. The value of this attribute SHOULD be one of the values registered in the &ianadispositions;. The default value of this attribute is "session".</td>
<td>OPTIONAL</td>
</tr>
<tr>
<td>name</td>
<td>A unique name or identifier for the content type according to the creator, which MAY have meaning to a human user in order to differentiate this content type from other content types (e.g., two content types containing video media could differentiate between "room-pan" and "slides").</td>
@ -1220,7 +1232,9 @@ PENDING o----------------------+ |
<xs:sequence>
<xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
</xs:sequence>
<xs:attribute name='creator' use='required' default='initiator'>
<xs:attribute name='creator'
use='required'
default='initiator'>
<xs:simpleType>
<xs:restriction base='xs:NCName'>
<xs:enumeration value='initiator'>
@ -1228,8 +1242,16 @@ PENDING o----------------------+ |
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name='name' use='required' type='xs:string'/>
<xs:attribute name='senders' use='optional' default='both'>
<xs:attribute name='disposition'
use='optional'
type='xs:NCName'
default='session'/>
<xs:attribute name='name'
use='required'
type='xs:string'/>
<xs:attribute name='senders'
use='optional'
default='both'>
<xs:simpleType>
<xs:restriction base='xs:NCName'>
<xs:enumeration value='both'>