Merge branch 'xep-0447' into premerge

This commit is contained in:
Jonas Schäfer 2022-02-15 18:32:46 +01:00
commit 3555f31d9e
1 changed files with 9 additions and 7 deletions

View File

@ -1,9 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
Note to editor: Remove xep-file-metadata entity declared below and change all references from &xep-file-metadata; to respective &xepXXXX; to refeence file metadata element when moving to experimental.
-->
<!DOCTYPE xep SYSTEM 'xep.dtd' [
<!ENTITY xep-file-metadata "<span class='ref'><link url='./file-metadata.html'>File metadata element (XEP-xxxx)</link></span> <note>XEP-xxxx: File metadata element &lt;<link url='./file-metadata.html'>https://xmpp.org/extensions/inbox/file-metadata.html</link>&gt;.</note>" >
<!ENTITY % ents SYSTEM 'xep.ent'>
%ents;
]>
@ -27,6 +23,12 @@ Note to editor: Remove xep-file-metadata entity declared below and change all re
<supersededby/>
<shortname>sfs</shortname>
&larma;
<revision>
<version>0.1.2</version>
<date>2022-02-10</date>
<initials>egp</initials>
<remark>Replace the ProtoXEP reference with a reference to the published XEP.</remark>
</revision>
<revision>
<version>0.1.1</version>
<date>2020-12-30</date>
@ -53,7 +55,7 @@ Note to editor: Remove xep-file-metadata entity declared below and change all re
<ul>
<li>No focus on media, generic for every file type.</li>
<li>No mixed content, body is used for fallback only and not to transmit additional information.</li>
<li>Using &xep-file-metadata;.</li>
<li>Using &xep0446;.</li>
<li>Using XML for structured data instead of URIs when possible, adding further extensibility (like providing proper means of sharing encrypted files on http servers).</li>
<li>Not relying on underspecified usage of &xep0372;.</li>
</ul>
@ -75,7 +77,7 @@ Note to editor: Remove xep-file-metadata entity declared below and change all re
<section2 topic='Sharing a file' anchor='file-sharing'>
<p>
To share a file, a user sends a message stanza including <tt>&lt;file-sharing/&gt;</tt> to the inteded recipient contact or group.
The <tt>&lt;file-sharing/&gt;</tt> element includes a <tt>&lt;file/&gt;</tt> metadata element as described in &xep-file-metadata; as well as a <tt>&lt;sources/&gt;</tt> element.
The <tt>&lt;file-sharing/&gt;</tt> element includes a <tt>&lt;file/&gt;</tt> metadata element as described in &xep0446; as well as a <tt>&lt;sources/&gt;</tt> element.
The <tt>&lt;sources/&gt;</tt> element provides one or multiple sources that the receiving client may use to obtain the file.
</p>
<example caption='Sharing summit.jpg with juliet@shakespeare.lit'><![CDATA[
@ -194,7 +196,7 @@ Note to editor: Remove xep-file-metadata entity declared below and change all re
If the protocol that is used when obtaining the file is not secure (e.g. HTTP without TLS), this SHOULD be considered as if the protocol reveals private information.
</p>
<p>
The security considerations of &xep-file-metadata; apply.
The security considerations of &xep0446; apply.
</p>
</section1>
<section1 topic='IANA Considerations' anchor='iana'>