1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-22 01:02:17 -05:00

Merge branch 'feature/xep-0390'

This commit is contained in:
Jonas Schäfer 2020-04-28 19:33:45 +02:00
commit aa7ed19cfb

View File

@ -48,6 +48,12 @@
<supersededby/> <supersededby/>
<shortname>ecaps2</shortname> <shortname>ecaps2</shortname>
&jonaswielicki; &jonaswielicki;
<revision>
<version>0.3.1</version>
<date>2020-04-28</date>
<initials>fs</initials>
<remark>Add another xml:lang example</remark>
</revision>
<revision> <revision>
<version>0.3.0</version> <version>0.3.0</version>
<date>2018-10-01</date> <date>2018-10-01</date>
@ -130,7 +136,7 @@
<div class="box"><p>General remarks:</p> <div class="box"><p>General remarks:</p>
<ul> <ul>
<li><p>The algorithm strongly distinguishes between character data (sequences of Unicode code points) and octet strings (sequences of 8-bit bytes). Whenever character data is encoded to octet strings in the following algorithm, the UTF-8 as specified in &rfc3629; encoding is used. Whenever octet strings are sorted in the following algorithm, the i;octet collation as specified in &rfc4790; is used.</p></li> <li><p>The algorithm strongly distinguishes between character data (sequences of Unicode code points) and octet strings (sequences of 8-bit bytes). Whenever character data is encoded to octet strings in the following algorithm, the UTF-8 as specified in &rfc3629; encoding is used. Whenever octet strings are sorted in the following algorithm, the i;octet collation as specified in &rfc4790; is used.</p></li>
<li><p>The algorithm uses the <tt>xml:lang</tt> attribute. Implementations must take implicit values for the <tt>xml:lang</tt> attribute into account, for example those inherited from the disco#info or the IQ element.</p></li> <li><p>The algorithm uses the <tt>xml:lang</tt> attribute. Implementations must take implicit values for the <tt>xml:lang</tt> attribute into account, for example those inherited from the disco#info, the IQ element, or from the root &lt;stream&gt; tag.</p></li>
</ul></div> </ul></div>
<ol> <ol>
<li>If the &lt;query/&gt; element contains any elements except &lt;identity/&gt;, &lt;feature/&gt; (both from the &xep0030; disco#info namespace) or &xep0128; data forms, abort with an error.</li> <li>If the &lt;query/&gt; element contains any elements except &lt;identity/&gt;, &lt;feature/&gt; (both from the &xep0030; disco#info namespace) or &xep0128; data forms, abort with an error.</li>