Merge branch 'feature/xep-0004' into premerge

xep-0004.xml

@@ -27,6 +27,17 @@
     &jer;
     &temas;
     &stpeter;
+    <revision>
+      <version>2.12.0</version>
+      <date>2021-11-27</date>
+      <initials>fs, jsc</initials>
+      <remark>
+        <p>
+          Clarify that the 'reported' element must appear before any
+          'item' element.
+        </p>
+      </remark>
+    </revision>
     <revision>
       <version>2.11.0</version>
       <date>2020-09-29</date>
@@ -295,6 +306,10 @@
       <li>One and only &lt;reported/&gt; element, which can be understood as a "table header" describing the data to follow.</li>
       <li>Zero or more &lt;item/&gt; elements, which can be understood as "table cells" containing data (if any) that matches the request.</li>
     </ol>
+	<p>The &lt;reported/&gt; element MUST appear before any &lt;item/&gt; element inside the &lt;x/&gt; element.</p>
+  <p class="box info">
+    Older revisions of this XEP (before 2.12.0) did not contain an explicit requirement for the ordering between &lt;reported&gt; and &lt;item&gt;. Implementations are therefore encouraged to be flexible when processing incoming data, as there might still be implementations which do not implement a strict ordering when generating reports.
+  </p>
     <p>The syntax is as follows:</p>
     <code><![CDATA[
 <x xmlns='jabber:x:data'
@@ -317,7 +332,7 @@
   .
 </x>
 ]]></code>
-    <p>Each of these elements MUST contain one or more &lt;field/&gt; children. The &lt;reported/&gt; element defines the data format for the result items by specifying the fields to be expected for each item; for this reason, the &lt;field/&gt; elements SHOULD possess a 'type' attribute and 'label' attribute in addition to the 'var' attribute, and SHOULD NOT contain a &lt;value/&gt; element. Each &lt;item/&gt; element defines one item in the result set, and MUST contain each field specified in the &lt;reported/&gt; element (although the XML character data of the &lt;value/&gt; element MAY be null).</p>
+    <p>Each of these &lt;item/&gt; elements and the &lt;reported/&gt; element MUST contain one or more &lt;field/&gt; children. The &lt;reported/&gt; element defines the data format for the result items by specifying the fields to be expected for each item; for this reason, its &lt;field/&gt; elements SHOULD possess a 'type' attribute and 'label' attribute in addition to the 'var' attribute, and SHOULD NOT contain a &lt;value/&gt; element. Each &lt;item/&gt; element defines one item in the result set, and MUST contain each field specified in the &lt;reported/&gt; element (although the XML character data of the &lt;value/&gt; element MAY be null).</p>
   </section2>
 </section1>
 <section1 topic='Data Validation' anchor='validation'>