1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-12-12 19:02:16 -05:00

Merge branch 'xep-0060' into premerge

This commit is contained in:
Jonas Schäfer 2022-01-18 15:54:09 +01:00
commit b45af6d21b

View File

@ -49,6 +49,12 @@
&pgmillard;
&stpeter;
&ralphm;
<revision>
<version>1.22.1</version>
<date>2021-12-26</date>
<initials>egp</initials>
<remark><p>Fix indentation to be consistent.</p></remark>
</revision>
<revision>
<version>1.22.0</version>
<date>2021-09-07</date>
@ -1690,9 +1696,9 @@ And by opposing end them?
to='pubsub.shakespeare.lit'
id='unsub1'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
<unsubscribe
node='princely_musings'
jid='francisco@denmark.lit'/>
<unsubscribe
node='princely_musings'
jid='francisco@denmark.lit'/>
</pubsub>
</iq>
]]></example>
@ -1990,20 +1996,20 @@ And by opposing end them?
id='options2'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
<options node='princely_musings' jid='francisco@denmark.lit'>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#subscribe_options</value>
</field>
<field var='pubsub#deliver'><value>1</value></field>
<field var='pubsub#digest'><value>0</value></field>
<field var='pubsub#include_body'><value>false</value></field>
<field var='pubsub#show-values'>
<value>chat</value>
<value>online</value>
<value>away</value>
</field>
</x>
</options>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#subscribe_options</value>
</field>
<field var='pubsub#deliver'><value>1</value></field>
<field var='pubsub#digest'><value>0</value></field>
<field var='pubsub#include_body'><value>false</value></field>
<field var='pubsub#show-values'>
<value>chat</value>
<value>online</value>
<value>away</value>
</field>
</x>
</options>
</pubsub>
</iq>
]]></example>
@ -3872,7 +3878,7 @@ And by opposing end them?
<default>
<x xmlns='jabber:x:data' type='form'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#node_config</value>
<value>http://jabber.org/protocol/pubsub#node_config</value>
</field>
<field var='pubsub#title' type='text-single'
label='A friendly name for the node'/>
@ -4251,7 +4257,7 @@ And by opposing end them?
<value>horatio@denmark.lit</value>
</field>
<field var='pubsub#allow'>
<value>true</value>
<value>true</value>
</field>
</x>
</message>
@ -4272,7 +4278,7 @@ And by opposing end them?
<message from='hamlet@denmark.lit/elsinore' to='pubsub.shakespeare.lit' id='approve1'>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#subscribe_authorization</value>
<value>http://jabber.org/protocol/pubsub#subscribe_authorization</value>
</field>
<field var='pubsub#subid'>
<value>123-abc</value>
@ -4281,7 +4287,7 @@ And by opposing end them?
<value>princely_musings</value>
</field>
<field var='pubsub#subscriber_jid'>
<value>horatio@denmark.lit</value>
<value>horatio@denmark.lit</value>
</field>
<field var='pubsub#allow'>
<value>false</value>
@ -5450,15 +5456,15 @@ And by opposing end them?
id='lease3'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
<options node='princely_musings' jid='francisco@denmark.lit'>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#subscribe_options</value>
</field>
...
<field var='pubsub#expire'><value>presence</value></field>
...
</x>
</options>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#subscribe_options</value>
</field>
...
<field var='pubsub#expire'><value>presence</value></field>
...
</x>
</options>
</pubsub>
</iq>
]]></example>
@ -5691,15 +5697,15 @@ And by opposing end them?
id='lease3'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
<options node='princely_musings' jid='francisco@denmark.lit'>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#subscribe_options</value>
</field>
...
<field var='pubsub#expire'><value>2006-02-28T11:59:59Z</value></field>
...
</x>
</options>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#subscribe_options</value>
</field>
...
<field var='pubsub#expire'><value>2006-02-28T11:59:59Z</value></field>
...
</x>
</options>
</pubsub>
</iq>
@ -5757,15 +5763,15 @@ And by opposing end them?
id='renew2'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
<options node='princely_musings' jid='francisco@denmark.lit'>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#subscribe_options</value>
</field>
...
<field var='pubsub#expire'><value>2006-03-31T23:59:59Z</value></field>
...
</x>
</options>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#subscribe_options</value>
</field>
...
<field var='pubsub#expire'><value>2006-03-31T23:59:59Z</value></field>
...
</x>
</options>
</pubsub>
</iq>
@ -5850,15 +5856,15 @@ And by opposing end them?
<options node='princely_musings'
jid='bard@shakespeare.lit'
subid='991d7fd1616fd041015064133cd097a10030819e'>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#subscribe_options</value>
</field>
...
<field var='x-http://shakespeare.lit/search#keyword'><value>peasant</value></field>
...
</x>
</options>
<x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#subscribe_options</value>
</field>
...
<field var='x-http://shakespeare.lit/search#keyword'><value>peasant</value></field>
...
</x>
</options>
</pubsub>
</iq>