Merge branch 'feature/xep-0313' into premerge

This commit is contained in:
Jonas Schäfer 2020-09-29 16:28:06 +02:00
commit 2f279ab867
2 changed files with 15 additions and 1 deletions

View File

@ -28,6 +28,14 @@
</schemaloc>
&mwild;
&ksmith;
<revision>
<version>0.7.2</version>
<date>2020-09-29</date>
<initials>mar-v-in</initials>
<remark>
<p>Clean up references after MAM split</p>
</remark>
</revision>
<revision>
<version>0.7.1</version>
<date>2020-08-04</date>
@ -852,7 +860,7 @@
return an iq with type error, and the error condition SHOULD be 'forbidden'.</p>
<p>A server SHOULD provide a mechanism for a user to disable archiving of
messages with all or specific contacts, such as via the configuration
protocol described in this document. This allows the user to prevent the
protocol described in &xep0441;. This allows the user to prevent the
archiving of potentially sensitive messages in the first place.</p>
<p>A server MAY automatically prevent certain sensitive messages from being
archived. How such messages are identified is beyond the scope of this

View File

@ -1574,6 +1574,7 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
<!ENTITY xep0417 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0417.html'>E2E Authentication in XMPP: Certificate Issuance and Revocation (XEP-0417)</link></span> <note>XEP-0417: E2E Authentication in XMPP: Certificate Issuance and Revocation &lt;<link url='https://xmpp.org/extensions/xep-0417.html'>https://xmpp.org/extensions/xep-0417.html</link>&gt;.</note>" >
<!ENTITY xep0418 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0418.html'>DNS Queries over XMPP (DoX) (XEP-0418)</link></span> <note>XEP-0418: DNS Queries over XMPP (DoX) &lt;<link url='https://xmpp.org/extensions/xep-0418.html'>https://xmpp.org/extensions/xep-0418.html</link>&gt;.</note>" >
<!ENTITY xep0419 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0419.html'>Improving Baseline Security in XMPP (XEP-0419)</link></span> <note>XEP-0419: Improving Baseline Security in XMPP &lt;<link url='https://xmpp.org/extensions/xep-0419.html'>https://xmpp.org/extensions/xep-0419.html</link>&gt;.</note>" >
<!ENTITY xep0420 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0420.html'>Stanza Content Encryption (XEP-0420)</link></span> <note>XEP-0420: Stanza Content Encryption &lt;<link url='https://xmpp.org/extensions/xep-0420.html'>https://xmpp.org/extensions/xep-0420.html</link>&gt;.</note>" >
<!ENTITY xep0421 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0421.html'>Anonymous unique occupant identifiers for MUCs (XEP-0421)</link></span> <note>XEP-0421: Anonymous unique occupant identifiers for MUCs &lt;<link url='https://xmpp.org/extensions/xep-0421.html'>https://xmpp.org/extensions/xep-0421.html</link>&gt;.</note>" >
<!ENTITY xep0422 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0422.html'>Message Fastening (XEP-0422)</link></span> <note>XEP-0422: Message Fastening &lt;<link url='https://xmpp.org/extensions/xep-0422.html'>https://xmpp.org/extensions/xep-0422.html</link>&gt;.</note>" >
@ -1584,6 +1585,7 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
<!ENTITY xep0427 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0427.html'>MAM Fastening Collation (XEP-0427)</link></span> <note>XEP-0427: MAM Fastening Collation &lt;<link url='https://xmpp.org/extensions/xep-0427.html'>https://xmpp.org/extensions/xep-0427.html</link>&gt;.</note>" >
<!ENTITY xep0428 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0428.html'>Fallback Indication (XEP-0428)</link></span> <note>XEP-0428: Fallback Indication &lt;<link url='https://xmpp.org/extensions/xep-0428.html'>https://xmpp.org/extensions/xep-0428.html</link>&gt;.</note>" >
<!ENTITY xep0429 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0429.html'>Special Interests Group End to End Encryption (XEP-0429)</link></span> <note>XEP-0429: Special Interests Group End to End Encryption &lt;<link url='https://xmpp.org/extensions/xep-0429.html'>https://xmpp.org/extensions/xep-0429.html</link>&gt;.</note>" >
<!ENTITY xep0430 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0430.html'>Inbox (XEP-0430)</link></span> <note>XEP-0430: Inbox &lt;<link url='https://xmpp.org/extensions/xep-0430.html'>https://xmpp.org/extensions/xep-0430.html</link>&gt;.</note>" >
<!ENTITY xep0431 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0431.html'>Full Text Search in MAM (XEP-0431)</link></span> <note>XEP-0431: Full Text Search in MAM &lt;<link url='https://xmpp.org/extensions/xep-0431.html'>https://xmpp.org/extensions/xep-0431.html</link>&gt;.</note>" >
<!ENTITY xep0432 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0432.html'>Simple JSON Messaging (XEP-0432)</link></span> <note>XEP-0432: Simple JSON Messaging &lt;<link url='https://xmpp.org/extensions/xep-0432.html'>https://xmpp.org/extensions/xep-0432.html</link>&gt;.</note>" >
@ -1593,3 +1595,7 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
<!ENTITY xep0437 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0437.html'>Room Activity Indicators (XEP-0437)</link></span> <note>XEP-0437: Room Activity Indicators &lt;<link url='https://xmpp.org/extensions/xep-0437.html'>https://xmpp.org/extensions/xep-0437.html</link>&gt;.</note>" >
<!ENTITY xep0438 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0438.html'>Best practices for password hashing and storage (XEP-0438)</link></span> <note>XEP-0438: Best practices for password hashing and storage &lt;<link url='https://xmpp.org/extensions/xep-0438.html'>https://xmpp.org/extensions/xep-0438.html</link>&gt;.</note>" >
<!ENTITY xep0439 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0439.html'>Quick Response (XEP-0439)</link></span> <note>XEP-0439: Quick Response &lt;<link url='https://xmpp.org/extensions/xep-0439.html'>https://xmpp.org/extensions/xep-0439.html</link>&gt;.</note>" >
<!ENTITY xep0440 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0440.html'>SASL Channel-Binding Type Capability (XEP-0440)</link></span> <note>XEP-0440: SASL Channel-Binding Type Capability &lt;<link url='https://xmpp.org/extensions/xep-0440.html'>https://xmpp.org/extensions/xep-0440.html</link>&gt;.</note>" >
<!ENTITY xep0441 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0441.html'>Message Archive Management Preferences (XEP-0441)</link></span> <note>XEP-0441: Message Archive Management Preferences &lt;<link url='https://xmpp.org/extensions/xep-0441.html'>https://xmpp.org/extensions/xep-0441.html</link>&gt;.</note>" >
<!ENTITY xep0442 "<span class='ref'><link url='https://xmpp.org/extensions/xep-0442.html'>Pubsub Message Archive Management (XEP-0442)</link></span> <note>XEP-0442: Pubsub Message Archive Management &lt;<link url='https://xmpp.org/extensions/xep-0442.html'>https://xmpp.org/extensions/xep-0442.html</link>&gt;.</note>" >