aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Wielicki <j.wielicki@sotecware.net>2017-10-04 15:29:02 +0200
committerJonas Wielicki <j.wielicki@sotecware.net>2017-10-04 15:29:02 +0200
commitf8d73feaf536ba4807ae31a1f11f5079cbfebd57 (patch)
tree7d7d2ab000f2cf9cc38ff5ee7d011cdbfb77da0a
parentb9a410551eb6e33c829ab7435d258c7e0ed58954 (diff)
parentdd95f28fa4a74e30c7a73e5e2ad99bf38f6bd047 (diff)
Merge branch 'master' of https://github.com/Syndace/xeps into feature/xep-0030
-rw-r--r--xep-0030.xml16
1 files changed, 14 insertions, 2 deletions
diff --git a/xep-0030.xml b/xep-0030.xml
index ad6bab5..082c81c 100644
--- a/xep-0030.xml
+++ b/xep-0030.xml
@@ -874,8 +874,20 @@ xmpp:romeo@montague.net?disco;type=get;request=items
<xs:element name='query'>
<xs:complexType>
<xs:sequence minOccurs='0'>
- <xs:element ref='identity' maxOccurs='unbounded'/>
- <xs:element ref='feature' maxOccurs='unbounded'/>
+ <xs:choice>
+ <xs:sequence>
+ <xs:element ref='feature' maxOccurs='unbounded'/>
+ <xs:element ref='identity'/>
+ </xs:sequence>
+ <xs:sequence>
+ <xs:element ref='identity' maxOccurs='unbounded'/>
+ <xs:element ref='feature'/>
+ </xs:sequence>
+ </xs:choice>
+ <xs:choice minOccurs='0' maxOccurs='unbounded'>
+ <xs:element ref='identity'/>
+ <xs:element ref='feature'/>
+ </xs:choice>
</xs:sequence>
<xs:attribute name='node' type='xs:string' use='optional'/>
</xs:complexType>