schema/text tweaks

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

xep-0167.xml

@@ -473,7 +473,7 @@ delivery-method=inline; configuration=somebase16string;
   <p>The term "early media" refers to media that is exchanged before a responder has definitively accepted a session request generated by an initiator. Early media is typically used to send ringing tones and announcements, using either audio streams or Dual Tone Multi-Frequency (DTMF) events.</p>
   <p>In Jingle, the exchange of early media is established through use of the "content-add" action. In order to match the usage specified in &rfc3959; and &rfc3960;, when adding a content definition for early media the value of the &CONTENT; element's 'disposition' attribute MUST be "early-session" for mapping to a SIP Content-Disposition header value of "early-session" (if necessary). This enables endpoints or intermediate gateways to apply the application server model described in <cite>RFC3960</cite>.</p>
   <p>An entity that generates a content-add for early media SHOULD specify the same codecs for both session media and early media (however, it is possible that the entity generating early media does not generate session media, for example in the case of an intermediate gateway or application server; in this case the entity MUST use one of the codecs advertised by the initiator).</p>
-  <p>Upon receiving a content-add action specifying the use of early media, the initiator's client SHOULD acknowledge the content-add and then send a content-accept to the sender. When the responder subsequently sends a session-accept action, the acceptance MUST NOT be construued to include the content definition whose disposition is "early-session".</p>
+  <p>Upon receiving a content-add action specifying the use of early media, the initiator's client SHOULD acknowledge the content-add and then send a content-accept (or content-reject) to the sender. When the responder subsequently sends a session-accept action, the acceptance MUST NOT be construued to include the content definition whose disposition is "early-session".</p>
   <p>In handling early media and deciding whether to generate local ringing or play early media received from the responder or an intermediate gateway, the initiator's client SHOULD proceed as follows:</p>
   <ol>
     <li>If no ringing notification is received via a session-info event containing a &lt;ringing/&gt; condition, do not generate local ringing.</li>
@@ -1677,6 +1677,17 @@ Romeo                         Juliet
     </xs:complexType>
   </xs:element>
 
+  <xs:complexType name='cryptoElementType'>
+    <xs:simpleContent>
+      <xs:extension base='empty'>
+        <xs:attribute name='crypto-suite' type='xs:NCName' use='required'/>
+        <xs:attribute name='key-params' type='xs:string' use='required'/>
+        <xs:attribute name='session-params' type='xs:string' use='optional'/>
+        <xs:attribute name='tag' type='xs:string' use='required'/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
   <xs:complexType name='payloadElementType'>
     <xs:sequence>
       <xs:element name='parameter'

xep-0176.xml

@@ -691,7 +691,7 @@ INITIATOR                  NAT                  RESPONDER
     to='[email protected]/orchard'
     type='result'/>
     ]]></example>
-    <p>If the transport-replace is acceptable, the recipient then sends a transport-accept action.</p>
+    <p>If the transport-replace is acceptable, the recipient then sends a transport-accept action (if not, the recipient sends a transport-reject action).</p>
     <example caption="Responder definitively accepts the replaced candidate"><![CDATA[
 <iq from='[email protected]/balcony'
     id='accept2'

xep-0181.xml

@@ -196,7 +196,7 @@
   ]]></example>
 </section1>
 
-<section1 topic='Determining Support' anchor='disco'>
+<section1 topic='Determining Support' anchor='support'>
   <p>If an entity supports Jingle DTMF (i.e., sending of DTMF in the XMPP signalling channel as specified herein), it MUST return a &xep0030; feature of "urn:xmpp:jingle:dtmf:0" in response to service discovery information requests.</p>
   <p>In order for an application to determine whether an entity supports this protocol, where possible it SHOULD use the dynamic, presence-based profile of service discovery defined in &xep0115;. However, if an application has not received entity capabilities information from an entity, it SHOULD use explicit service discovery instead.</p>
 </section1>

xep-0234.xml

@@ -555,7 +555,7 @@ Claudius                      Laertes
     to='[email protected]/castle'
     type='result'/>
     ]]></example>
-    <p>If the transport replacement is acceptable, the responder then sends a transport-accept action to the initiator.</p>
+    <p>If the transport replacement is acceptable, the responder then sends a transport-accept action to the initiator (if not, the responder sends a transport-reject action).</p>
     <example caption="Responder sends transport-accept"><![CDATA[
 <iq from='[email protected]/castle'
     id='accept2'