Merge branches 'feature/xep-0414', 'feature/xep-0405' and 'feature/xep-0260'

xep-0260.xml

@@ -36,6 +36,12 @@
     <email>klaus.hartke@googlemail.com</email>
     <jid>nx@jabber.org</jid>
   </author>
+  <revision>
+    <version>1.0.3</version>
+    <date>2018-05-15</date>
+    <initials>fs</initials>
+    <remark><p>Replace broken link using archive.org</p></remark>
+  </revision>
   <revision>
     <version>1.0.2</version>
     <date>2018-05-04</date>
@@ -170,7 +176,7 @@ Initiator                        Responder
       <li>Opening the TCP port on all available interfaces the user wants to use (e.g., maybe not an expensive UMTS link), including the IPv4 and IPv6 addresses of that interface (if available).</li>
       <li>Using the client's external IP address as discovered through an assisting NAT protocol or other means.</li>
     </ul>
-    <p>If the client knows it is behind a NAT and the router announces UPnP IGD or NAT-PMP support, the client SHOULD map the open port to the external interface of the router and include the public IP address and port information in the &lt;candidate/&gt; offers. To increase the chance of success without using a proxy, this specification encourages the responder to also send offers, effectively equivalent to the "fast-mode" for SOCKS5 Bytestreams as previously described at &lt;<link url='http://delta.affinix.com/specs/stream.html'>http://delta.affinix.com/specs/stream.html</link>&gt;.</p>
+    <p>If the client knows it is behind a NAT and the router announces UPnP IGD or NAT-PMP support, the client SHOULD map the open port to the external interface of the router and include the public IP address and port information in the &lt;candidate/&gt; offers. To increase the chance of success without using a proxy, this specification encourages the responder to also send offers, effectively equivalent to the "fast-mode" for SOCKS5 Bytestreams as previously described at &lt;<link url='https://web.archive.org/web/20161019171450/http://delta.affinix.com/specs/stream.html'>http://delta.affinix.com/specs/stream.html</link>&gt;.</p>
   </section2>
   <section2 topic='Exchanging Candidates' anchor='exchange'>
     <p>Once the initiator has a set of candidates, it sends a Jingle session-initiate request that contains one or more transport candidates which are a mixture of <cite>XEP-0065</cite> streamhosts and ICE candidates used in <cite>XEP-0176</cite>.</p>

xep-0405.xml

@@ -38,6 +38,12 @@
   <shortname>MIX-PAM</shortname>
   &ksmithisode;
   &skille;
+  <revision>
+    <version>0.4.1</version>
+    <date>2019-04-30</date>
+    <initials>lnj</initials>
+    <remark>Fix typo in the #archive namespace</remark>
+  </revision>
   <revision>
     <version>0.4.0</version>
     <date>2019-03-19</date>
@@ -209,7 +215,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
     type='result'>
   <query xmlns='http://jabber.org/protocol/disco#info'>
     <feature var='urn:xmpp:mix:pam:1'/>
-    <feature var='urn:xmpp:mix:pam:1:archive'/>
+    <feature var='urn:xmpp:mix:pam:1#archive'/>
   </query>
 </iq>
 ]]></example>

xep-0414.xml

@@ -20,6 +20,12 @@
   <supersededby/>
   <shortname>hashrecs</shortname>
   &jonaswielicki;
+  <revision>
+    <version>0.2.0</version>
+    <date>2019-04-28</date>
+    <initials>jsc</initials>
+    <remark>Fix references to hashes namespace.</remark>
+  </revision>
   <revision>
     <version>0.1.0</version>
     <date>2019-02-04</date>
@@ -90,7 +96,7 @@
 </section1>
 
 <section1 topic='Algorithm Recommendations' anchor='recommendations'>
-  <p>Support for version 1 of the 'urn:xmpp:hashes' namespace implies the following:</p>
+  <p>The current recommendations are as follows:</p>
   <table caption='Algorithm Recommendations'>
     <tr>
       <th>Algorithm</th>