Merge branches 'feature/xep-0363' and 'feature/xep-0300'

xep-0300.xml

@@ -24,6 +24,12 @@
   &mwild;
   &ksmith;
   &tobias;
+  <revision>
+    <version>0.5.3</version>
+    <date>2018-02-14</date>
+    <initials>fs</initials>
+    <remark><p>Clarify textual content of the &lt;hash/&gt; element.</p></remark>
+  </revision>
   <revision>
     <version>0.5.2</version>
     <date>2017-08-21</date>
@@ -125,7 +131,7 @@
       <td>&rfc7693;</td>
     </tr>
   </table>
-  <p>The CDATA of the &lt;hash/&gt; element MUST conform to the base64Binary datatype <note>See &lt;<link url='http://www.w3.org/TR/xmlschema-2/#base64Binary'>http://www.w3.org/TR/xmlschema-2/#base64Binary</link>&gt;.</note> and thus be encoded in accordance with Section 6.8 of &rfc2045;, which recommends that base64 data should have lines limited to at most 76 characters in length. However, any whitespace characters (e.g., '\r' and '\n') MUST be ignored.</p>
+  <p>The digest produced by the used hash algorithm is included as the XML character data of the &lt;hash/&gt; element after being encoded using Base64 as specified in Section 4 of &rfc4648;. Thus the character data MUST conform to the base64Binary datatype <note>See &lt;<link url='http://www.w3.org/TR/xmlschema-2/#base64Binary'>http://www.w3.org/TR/xmlschema-2/#base64Binary</link>&gt;.</note> as defined in &w3xmlschema2;. The Base64 output MUST NOT include whitespace and MUST set padding bits to zero.</p>
 </section1>
 
 <section1 topic='Hash Functions' anchor='hashes'>
@@ -415,7 +421,7 @@
 
 <section1 topic='Acknowledgements' anchor='ack'>
   <p>Thanks to Dave Cridland, Waqas Hussain, Glenn Maynard, Remko
-  Tronçon, Paul Schaub and Christian Schudt for their input.</p>
+  Tronçon, Paul Schaub, Christian Schudt, and Florian Schmaus for their input.</p>
 </section1>
 
 </xep>