1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-12-21 23:28:51 -05:00

Merge commit 'refs/pull/705/head' of https://github.com/xsf/xeps

This commit is contained in:
Jonas Schäfer 2018-09-26 17:14:23 +02:00
commit db8450c36d

View File

@ -36,6 +36,12 @@
&robmcqueen; &robmcqueen;
&seanegan; &seanegan;
&hildjj; &hildjj;
<revision>
<version>1.1.2</version>
<date>2018-09-19</date>
<initials>egp</initials>
<remark><p>Add missing security-info in section 5.1, forgotten in version 0.35.</p></remark>
</revision>
<revision> <revision>
<version>1.1.1</version> <version>1.1.1</version>
<date>2016-05-17</date> <date>2016-05-17</date>
@ -716,6 +722,7 @@ PENDING o-----------------------+ |
<di><dt>content-reject</dt><dd>Reject a content-add action received from another party.</dd></di> <di><dt>content-reject</dt><dd>Reject a content-add action received from another party.</dd></di>
<di><dt>content-remove</dt><dd>Remove one or more content definitions from the session.</dd></di> <di><dt>content-remove</dt><dd>Remove one or more content definitions from the session.</dd></di>
<di><dt>description-info</dt><dd>Exchange information about parameters for an application type.</dd></di> <di><dt>description-info</dt><dd>Exchange information about parameters for an application type.</dd></di>
<di><dt>security-info</dt><dd>Exchange information about security preconditions.</dd></di>
<di><dt>session-accept</dt><dd>Definitively accept a session negotiation.</dd></di> <di><dt>session-accept</dt><dd>Definitively accept a session negotiation.</dd></di>
<di><dt>session-info</dt><dd>Send session-level information, such as a ping or a ringing message.</dd></di> <di><dt>session-info</dt><dd>Send session-level information, such as a ping or a ringing message.</dd></di>
<di><dt>session-initiate</dt><dd>Request negotiation of a new Jingle session.</dd></di> <di><dt>session-initiate</dt><dd>Request negotiation of a new Jingle session.</dd></di>