Merge branch 'xep-0060' into premerge

This commit is contained in:
Jonas Schäfer 2022-02-08 17:20:57 +01:00
commit daa54a661b
1 changed files with 16 additions and 10 deletions

View File

@ -49,6 +49,12 @@
&pgmillard; &pgmillard;
&stpeter; &stpeter;
&ralphm; &ralphm;
<revision>
<version>1.23.0</version>
<date>2022-01-14</date>
<initials>edhelas, pep</initials>
<remark><p>Clarify (redefine) pubsub#type field.</p></remark>
</revision>
<revision> <revision>
<version>1.22.1</version> <version>1.22.1</version>
<date>2021-12-26</date> <date>2021-12-26</date>
@ -1106,8 +1112,8 @@ And by opposing end them?
<field var='FORM_TYPE' type='hidden'> <field var='FORM_TYPE' type='hidden'>
<value>http://jabber.org/protocol/pubsub#meta-data</value> <value>http://jabber.org/protocol/pubsub#meta-data</value>
</field> </field>
<field var='pubsub#type' label='Payload type' type='text-single'> <field var='pubsub#type' label='Payload semantic type information' type='text-single'>
<value>http://www.w3.org/2005/Atom</value> <value>urn:example:e2ee:bundle</value>
</field> </field>
<field var='pubsub#creator' label='Node creator' type='jid-single'> <field var='pubsub#creator' label='Node creator' type='jid-single'>
<value>hamlet@denmark.lit</value> <value>hamlet@denmark.lit</value>
@ -3494,7 +3500,7 @@ And by opposing end them?
<field var='pubsub#notify_retract'><value>0</value></field> <field var='pubsub#notify_retract'><value>0</value></field>
<field var='pubsub#notify_sub'><value>0</value></field> <field var='pubsub#notify_sub'><value>0</value></field>
<field var='pubsub#max_payload_size'><value>1028</value></field> <field var='pubsub#max_payload_size'><value>1028</value></field>
<field var='pubsub#type'><value>http://www.w3.org/2005/Atom</value></field> <field var='pubsub#type'><value>urn:example:e2ee:bundle</value></field>
<field var='pubsub#body_xslt'> <field var='pubsub#body_xslt'>
<value>http://jabxslt.jabberstudio.org/atom_body.xslt</value> <value>http://jabxslt.jabberstudio.org/atom_body.xslt</value>
</field> </field>
@ -3633,8 +3639,8 @@ And by opposing end them?
<value>headline</value> <value>headline</value>
</field> </field>
<field var='pubsub#type' type='text-single' <field var='pubsub#type' type='text-single'
label='Specify the type of payload data to be provided at this node'> label='Specify the semantic type of payload data to be provided at this node.'>
<value>http://www.w3.org/2005/Atom</value> <value>urn:example:e2ee:bundle</value>
</field> </field>
<field var='pubsub#dataform_xslt' type='text-single' <field var='pubsub#dataform_xslt' type='text-single'
label='Payload XSLT'/> label='Payload XSLT'/>
@ -3758,7 +3764,7 @@ And by opposing end them?
<field var='pubsub#notify_retract'><value>0</value></field> <field var='pubsub#notify_retract'><value>0</value></field>
<field var='pubsub#notify_sub'><value>0</value></field> <field var='pubsub#notify_sub'><value>0</value></field>
<field var='pubsub#max_payload_size'><value>1028</value></field> <field var='pubsub#max_payload_size'><value>1028</value></field>
<field var='pubsub#type'><value>http://www.w3.org/2005/Atom</value></field> <field var='pubsub#type'><value>urn:example:e2ee:bundle</value></field>
<field var='pubsub#body_xslt'> <field var='pubsub#body_xslt'>
<value>http://jabxslt.jabberstudio.org/atom_body.xslt</value> <value>http://jabxslt.jabberstudio.org/atom_body.xslt</value>
</field> </field>
@ -3840,7 +3846,7 @@ And by opposing end them?
<field var='pubsub#send_last_published_item'><value>never</value></field> <field var='pubsub#send_last_published_item'><value>never</value></field>
<field var='pubsub#presence_based_delivery'><value>0</value></field> <field var='pubsub#presence_based_delivery'><value>0</value></field>
<field var='pubsub#notification_type'><value>headline</value></field> <field var='pubsub#notification_type'><value>headline</value></field>
<field var='pubsub#type'><value>http://www.w3.org/2005/Atom</value></field> <field var='pubsub#type'><value>urn:example:e2ee:bundle</value></field>
<field var='pubsub#body_xslt'> <field var='pubsub#body_xslt'>
<value>http://jabxslt.jabberstudio.org/atom_body.xslt</value> <value>http://jabxslt.jabberstudio.org/atom_body.xslt</value>
</field> </field>
@ -6429,7 +6435,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
label='The name of the node'/> label='The name of the node'/>
<field var='pubsub#type' <field var='pubsub#type'
type='text-single' type='text-single'
label='Payload type'/> label='Payload semantic type information'/>
<field var='pubsub#max_items' <field var='pubsub#max_items'
type='text-single' type='text-single'
label='Max # of items to persist'/> label='Max # of items to persist'/>
@ -6614,8 +6620,8 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
label='A friendly name for the node'/> label='A friendly name for the node'/>
<field var='pubsub#type' <field var='pubsub#type'
type='text-single' type='text-single'
label='The type of node data, usually specified by label='The semantic type information of data in the node, usually specified
the namespace of the payload (if any)'/> by the namespace of the payload (if any)'/>
</form_type> </form_type>
]]></code> ]]></code>
</section3> </section3>