1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-27 19:52:18 -05:00

Merge branch 'feature/xep-0060'

This commit is contained in:
Jonas Wielicki 2017-11-29 12:49:32 +01:00
commit b8ed1ab384

View File

@ -50,6 +50,12 @@
&stpeter;
&ralphm;
<revision>
<version>1.14</version>
<date>2017-11-29</date>
<initials>jt</initials>
<remark><p>Add pubsub#multi-items to features.</p></remark>
</revision>
<revision>
<version>1.13.8</version>
<date>2017-10-10</date>
@ -984,6 +990,9 @@ And by opposing end them?
<field var='pubsub#contact' label='People to contact with questions' type='jid-multi'>
<value>bard@shakespeare.lit</value>
</field>
<field var='pubsub#max_items' label='Max # of items to persist' type='text-single'>
<value>120</value>
</field>
<field var='pubsub#owner' label='Node owners' type='jid-multi'>
<value>hamlet@denmark.lit</value>
</field>
@ -5091,6 +5100,12 @@ And by opposing end them?
<td>OPTIONAL</td>
<td>Refer to <cite>XEP-0248</cite></td>
</tr>
<tr>
<td>multi-items</td>
<td>The service supports the storage of multiple items per node. It requires the pubsub#max_items configuration item to be exposed to the user and allow sensible values (higher than one) to be set in <link url='#owner-configure'>Configure a Node</link>.</td>
<td>OPTIONAL</td>
<td>&#160;</td>
</tr>
<tr>
<td>multi-subscribe</td>
<td>A single entity may subscribe to a node multiple times.</td>
@ -5977,6 +5992,11 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
<desc>A single leaf node can be associated with multiple collections.</desc>
<doc>XEP-0060</doc>
</var>
<var>
<name>http://jabber.org/protocol/pubsub#multi-items</name>
<desc>The service supports the storage of multiple items per node.</desc>
<doc>XEP-0060</doc>
</var>
<var>
<name>http://jabber.org/protocol/pubsub#multi-subscribe</name>
<desc>A single entity may subscribe to a node multiple times.</desc>
@ -6216,6 +6236,9 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
<field var='pubsub#type'
type='text-single'
label='Payload type'/>
<field var='pubsub#max_items'
type='text-single'
label='Max # of items to persist'/>
</form_type>
]]></code>
</section3>
@ -6836,6 +6859,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
<xs:enumeration value='meta-data'/>
<xs:enumeration value='modify-affiliations'/>
<xs:enumeration value='multi-collection'/>
<xs:enumeration value='multi-items'/>
<xs:enumeration value='multi-subscribe'/>
<xs:enumeration value='outcast-affiliation'/>
<xs:enumeration value='persistent-items'/>