Merge branch 'master' of athena.jabber.org:xmpp

xep-0258.xml

@@ -36,6 +36,12 @@
     <email>Kurt.Zeilenga@Isode.COM</email>
     <jid>Kurt.Zeilenga@Isode.COM</jid>
   </author>
+  <revision>
+        <version>0.9</version>
+        <date>2011-08-11</date>
+        <initials>kdz</initials>
+        <remark><p>Correct catalog schema.</p></remark>
+  </revision>
   <revision>
         <version>0.7</version>
         <date>2011-03-08</date>
@@ -245,7 +251,7 @@
     <p>One and only one of the items may have a default attribute with
 	   value of true.  The client should default the label selection to
 	   this item in cases where the user has not selected an item.</p>
-	<p>An item may have no label.  Such an item offers a choice of
+	<p>An item may have no security label.  Such an item offers a choice of
 	   sending a stanza without a label.</p>
     <p>Each catalog provided should only contain labels for which the client
        is allowed to use (based upon the user's authorization) in a particular
@@ -824,7 +830,7 @@ And by opposing end them?
             <xs:sequence>
                 <xs:element name="item" minOccurs="0" maxOccurs="unbounded">
                     <xs:complexType>
-                        <xs:sequence>
+                        <xs:sequence minOccurs="0">
                             <xs:element ref="sl:securitylabel"/>
                         </xs:sequence>
                         <xs:attribute ref="selector" use="optional"/>