1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-12-21 23:28:51 -05:00

Merge branch 'feature/xep-0450' into premerge

This commit is contained in:
Jonas Schäfer 2021-05-18 19:58:58 +02:00
commit d36cc64329

View File

@ -37,6 +37,19 @@
<email>melvo@olomono.de</email>
<jid>melvo@olomono.de</jid>
</author>
<revision>
<version>0.3.1</version>
<date>2021-05-14</date>
<initials>melvo</initials>
<remark>
<p>Improve examples and apply consistent formatting:</p>
<ul>
<li>Replace wrong recipient in example by 'alice@example.org'</li>
<li>Use recipient 'bob@example.com' in examples consistently</li>
<li>Apply consistent formatting for revision history</li>
</ul>
</remark>
</revision>
<revision>
<version>0.3.0</version>
<date>2021-04-16</date>
@ -75,7 +88,7 @@
<version>0.0.1</version>
<date>2020-11-05</date>
<initials>melvo</initials>
<remark><p>First draft</p></remark>
<remark>First draft</remark>
</revision>
</header>
<section1 topic='Introduction' anchor='introduction'>
@ -234,7 +247,7 @@
<rpad>Wvj25aDkNbAnSxMIDQo1pjIKRowIMGrF72hSJeXS</rpad>
<time stamp='2020-01-01T12:00:01'/>
<from jid='alice@example.org/A1'/>
<to jid='bob@example.org'/>
<to jid='bob@example.com'/>
<content>
<trust-message xmlns=']]>&ns-trust-messages;<![CDATA[' usage=']]>&ns;<![CDATA[' encryption=']]>&ns-omemo;<![CDATA['>
<key-owner jid='alice@example.org'>
@ -292,7 +305,7 @@
<rpad>O2vRKkmtsXsKSk2hPDkrpQQ4Og272qFGB1Srp64vaDrMTNhrV6</rpad>
<time stamp='2020-01-01T14:00:01'/>
<from jid='alice@example.org/A2'/>
<to jid='bob@example.org'/>
<to jid='bob@example.com'/>
<content>
<trust-message xmlns=']]>&ns-trust-messages;<![CDATA[' usage=']]>&ns;<![CDATA[' encryption=']]>&ns-omemo;<![CDATA['>
<key-owner jid='alice@example.org'>
@ -327,7 +340,7 @@
<rpad>98WA6U92twcVkAXM44UU</rpad>
<time stamp='2020-01-01T14:00:02'/>
<from jid='alice@example.org/A2'/>
<to jid='bob@example.org'/>
<to jid='alice@example.org'/>
<content>
<trust-message xmlns=']]>&ns-trust-messages;<![CDATA[' usage=']]>&ns;<![CDATA[' encryption=']]>&ns-omemo;<![CDATA['>
<key-owner jid='alice@example.org'>
@ -367,7 +380,7 @@
<rpad>NF5MOJdt8TBbItt4AHXOUKWncRmw5B</rpad>
<time stamp='2020-01-01T16:00:01'/>
<from jid='alice@example.org/A1'/>
<to jid='bob@example.org'/>
<to jid='bob@example.com'/>
<content>
<trust-message xmlns=']]>&ns-trust-messages;<![CDATA[' usage=']]>&ns;<![CDATA[' encryption=']]>&ns-omemo;<![CDATA['>
<key-owner jid='alice@example.org'>