1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-24 10:12:19 -05:00

line spacing

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@749 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2007-04-13 15:16:09 +00:00
parent 84402ca56b
commit 075cd3627f

View File

@ -168,7 +168,10 @@
<section1 topic='Negotiating a Jingle Audio Session' anchor='negotiation'> <section1 topic='Negotiating a Jingle Audio Session' anchor='negotiation'>
<p>When the initiator sends a session-initiate stanza to the receiver, the &DESCRIPTION; element includes all of the payload types that the initiator can receive for Jingle audio (each one encapsulated in a separate &PAYLOADTYPE; element):</p> <p>When the initiator sends a session-initiate stanza to the receiver, the &DESCRIPTION; element includes all of the payload types that the initiator can receive for Jingle audio (each one encapsulated in a separate &PAYLOADTYPE; element):</p>
<example caption="Initiation Example"><![CDATA[ <example caption="Initiation Example"><![CDATA[
<iq from='romeo@montague.net/orchard' to='juliet@capulet.com/balcony' id='jingleaudio1' type='set'> <iq from='romeo@montague.net/orchard'
to='juliet@capulet.com/balcony'
id='jingleaudio1'
type='set'>
<jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'> <jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'>
action='session-initiate' action='session-initiate'
initiator='romeo@montague.net/orchard' initiator='romeo@montague.net/orchard'
@ -197,11 +200,17 @@
]]></example> ]]></example>
<p>If there is no error, the receiver provisionally accepts the session:</p> <p>If there is no error, the receiver provisionally accepts the session:</p>
<example caption="Receiver Provisionally Accepts Session"><![CDATA[ <example caption="Receiver Provisionally Accepts Session"><![CDATA[
<iq from='juliet@capulet.com/balcony' to='romeo@montague.net/orchard' id='jingleaudio1' type='result' /> <iq from='juliet@capulet.com/balcony'
to='romeo@montague.net/orchard'
id='jingleaudio1'
type='result'/>
]]></example> ]]></example>
<p>The receiver then should send a list of the payload types that it can receive via a Jingle "content-accept" (or "session-accept") action. The list that the receiver sends MAY include any payload types (not a subset of the payload types sent by the initiator) but SHOULD retain the ID numbers and order specified by the initiator.</p> <p>The receiver then should send a list of the payload types that it can receive via a Jingle "content-accept" (or "session-accept") action. The list that the receiver sends MAY include any payload types (not a subset of the payload types sent by the initiator) but SHOULD retain the ID numbers and order specified by the initiator.</p>
<example caption="Receiver Accepts Content Type"><![CDATA[ <example caption="Receiver Accepts Content Type"><![CDATA[
<iq from='juliet@capulet.com/balcony' to='romeo@montague.net/orchard' id='jingleaudio2' type='set'> <iq from='juliet@capulet.com/balcony'
to='romeo@montague.net/orchard'
id='jingleaudio2'
type='set'>
<jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'> <jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'>
action='content-accept' action='content-accept'
initiator='romeo@montague.net/orchard' initiator='romeo@montague.net/orchard'
@ -223,7 +232,10 @@
]]></example> ]]></example>
<p>The initiator acknowledges the 'content-accept' with an empty IQ result:</p> <p>The initiator acknowledges the 'content-accept' with an empty IQ result:</p>
<example caption="Initiator Acknowledges Modified Content Description"><![CDATA[ <example caption="Initiator Acknowledges Modified Content Description"><![CDATA[
<iq from='romeo@montegue.net/orchard' to='juliet@capulet.com/balcony' id='jingleaudio2' type='result' /> <iq from='romeo@montegue.net/orchard'
to='juliet@capulet.com/balcony'
id='jingleaudio2'
type='result'/>
]]></example> ]]></example>
<p>After successful transport negotiation (not shown here), the receiver then accepts the session:</p> <p>After successful transport negotiation (not shown here), the receiver then accepts the session:</p>
<example caption="Receiver Definitively Accepts the Session"><![CDATA[ <example caption="Receiver Definitively Accepts the Session"><![CDATA[
@ -254,7 +266,10 @@
]]></example> ]]></example>
<p>And the initiator acknowledges session acceptance:</p> <p>And the initiator acknowledges session acceptance:</p>
<example caption="Initiator Acknowledges Session Acceptance"><![CDATA[ <example caption="Initiator Acknowledges Session Acceptance"><![CDATA[
<iq from='romeo@montague.net/orchard' to='juliet@capulet.com/balcony' id='accept1' type='result' /> <iq from='romeo@montague.net/orchard'
to='juliet@capulet.com/balcony'
id='accept1'
type='result'/>
]]></example> ]]></example>
</section1> </section1>
<section1 topic='Mapping to Session Description Protocol' anchor='sdp'> <section1 topic='Mapping to Session Description Protocol' anchor='sdp'>