1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-28 04:02:20 -05:00

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

This commit is contained in:
Jonas Wielicki 2018-07-30 13:07:23 +02:00
commit ede6cff1ef

View File

@ -15,7 +15,9 @@
<type>Standards Track</type> <type>Standards Track</type>
<sig>Standards</sig> <sig>Standards</sig>
<approver>Council</approver> <approver>Council</approver>
<dependencies/> <dependencies>
<spec>XEP-0223</spec>
</dependencies>
<supersedes/> <supersedes/>
<supersededby/> <supersededby/>
<shortname>bookmarks2</shortname> <shortname>bookmarks2</shortname>
@ -33,6 +35,15 @@
<email>jc@opkode.com</email> <email>jc@opkode.com</email>
<jid>jc@opkode.com</jid> <jid>jc@opkode.com</jid>
</author> </author>
<revision>
<version>0.2.1</version>
<date>2018-07-22</date>
<initials>egp</initials>
<remark><ul>
<li>Add missing dependency on XEP-0223.</li>
<li>Remove extra whitespace at the end of examples.</li>
</ul></remark>
</revision>
<revision> <revision>
<version>0.2.0</version> <version>0.2.0</version>
<date>2018-03-28</date> <date>2018-03-28</date>
@ -121,7 +132,7 @@
<items node='urn:xmpp:bookmarks:0'/> <items node='urn:xmpp:bookmarks:0'/>
</pubsub> </pubsub>
</iq> </iq>
]]></example> ]]></example>
<example caption='Server returns the bookmarks'><![CDATA[ <example caption='Server returns the bookmarks'><![CDATA[
<iq type='result' <iq type='result'
to='juliet@capulet.lit/balcony' to='juliet@capulet.lit/balcony'
@ -143,7 +154,7 @@
</items> </items>
</pubsub> </pubsub>
</iq> </iq>
]]></example> ]]></example>
</section2> </section2>
<section2 topic='Adding a bookmark' anchor='adding-a-bookmark'> <section2 topic='Adding a bookmark' anchor='adding-a-bookmark'>
@ -175,10 +186,10 @@
</publish-options> </publish-options>
</pubsub> </pubsub>
</iq> </iq>
]]></example> ]]></example>
<example caption='Server acknowledges successful storage'><![CDATA[ <example caption='Server acknowledges successful storage'><![CDATA[
<iq to='juliet@capulet.lit/balcony' type='result' id='pip1'/> <iq to='juliet@capulet.lit/balcony' type='result' id='pip1'/>
]]></example> ]]></example>
</section2> </section2>
<section2 topic='Removing a bookmark' anchor='removing-a-bookmark'> <section2 topic='Removing a bookmark' anchor='removing-a-bookmark'>
@ -193,10 +204,10 @@
</retract> </retract>
</pubsub> </pubsub>
</iq> </iq>
]]></example> ]]></example>
<example caption='Server acknowledges successful retraction'><![CDATA[ <example caption='Server acknowledges successful retraction'><![CDATA[
<iq to='juliet@capulet.lit/balcony' type='result' id='remove-bookmark1'/> <iq to='juliet@capulet.lit/balcony' type='result' id='remove-bookmark1'/>
]]></example> ]]></example>
</section2> </section2>
</section1> </section1>