moparisthebest/xeps
1
0
Fork 0
mirror of https://github.com/moparisthebest/xeps synced 2024-12-22 07:38:52 -05:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonas Wielicki 2018-05-21 12:53:00 +02:00
commit 9dee27b3eb
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
xep-0060.xml
View File

@ -50,6 +50,19 @@
&stpeter; &stpeter;
&ralphm; &ralphm;
<revision>
<version>1.15.2</version>
<date>2018-05-14</date>
<initials>egp</initials>
<remark>
<p>Fix a few things in the schema:</p>
<ul>
<li>Remove duplicated &lt;publish/&gt; element.</li>
<li>Make &lt;affiliations/&gt;’s node attribute optional.</li>
<li>Add a missing optional dataform in &lt;default/&gt;.</li>
</ul>
</remark>
</revision>
<revision> <revision>
<version>1.15.1</version> <version>1.15.1</version>
<date>2018-02-02</date> <date>2018-02-02</date>
@ -6541,6 +6554,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
<xs:schema <xs:schema
xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:xs='http://www.w3.org/2001/XMLSchema'
xmlns:xdata='jabber:x:data'
targetNamespace='http://jabber.org/protocol/pubsub' targetNamespace='http://jabber.org/protocol/pubsub'
xmlns='http://jabber.org/protocol/pubsub' xmlns='http://jabber.org/protocol/pubsub'
elementFormDefault='qualified'> elementFormDefault='qualified'>
@ -6575,7 +6589,6 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
<xs:element ref='affiliations'/> <xs:element ref='affiliations'/>
<xs:element ref='default'/> <xs:element ref='default'/>
<xs:element ref='items'/> <xs:element ref='items'/>
<xs:element ref='publish'/>
<xs:element ref='retract'/> <xs:element ref='retract'/>
<xs:element ref='subscription'/> <xs:element ref='subscription'/>
<xs:element ref='subscriptions'/> <xs:element ref='subscriptions'/>
@ -6590,7 +6603,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
<xs:sequence> <xs:sequence>
<xs:element ref='affiliation' minOccurs='0' maxOccurs='unbounded'/> <xs:element ref='affiliation' minOccurs='0' maxOccurs='unbounded'/>
</xs:sequence> </xs:sequence>
<xs:attribute name='node' type='xs:string' use='required'/> <xs:attribute name='node' type='xs:string' use='optional'/>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
@ -6636,21 +6649,20 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
<xs:element name='default'> <xs:element name='default'>
<xs:complexType> <xs:complexType>
<xs:simpleContent> <xs:choice minOccurs='0'>
<xs:extension base='empty'> <xs:element ref='xdata:x'/>
<xs:attribute name='node' type='xs:string' use='optional'/> </xs:choice>
<xs:attribute name='type' <xs:attribute name='node' type='xs:string' use='optional'/>
use='optional' <xs:attribute name='type'
default='leaf'> use='optional'
<xs:simpleType> default='leaf'>
<xs:restriction base='xs:NCName'> <xs:simpleType>
<xs:enumeration value='collection'/> <xs:restriction base='xs:NCName'>
<xs:enumeration value='leaf'/> <xs:enumeration value='collection'/>
</xs:restriction> <xs:enumeration value='leaf'/>
</xs:simpleType> </xs:restriction>
</xs:attribute> </xs:simpleType>
</xs:extension> </xs:attribute>
</xs:simpleContent>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>