XEP-0379: minor editing, improved language

This commit is contained in:
Georg Lukas 2017-02-16 10:40:08 +01:00
parent ba62cd2e34
commit 49e2a2c64a
1 changed files with 7 additions and 6 deletions

View File

@ -118,7 +118,7 @@ Romeo mongatague.net capulet.net Juliet
optionally a "name" parameter with the suggested display name.
</p>
<example caption='Invitation Link with Roster Action and Authentication Token'><![CDATA[
xmpp:romeo@montague.net?roster;preauth=1tMFqYDdKhfe2pwp;name=Romeo%20Montague
xmpp:romeo@montague.net?roster;preauth=1tMFqYDdKhfe2pwp;name=Romeo+Montague
]]></example>
<p>
If the "preauth" parameter is present, the processing client is supposed
@ -141,7 +141,7 @@ xmpp:romeo@montague.net?roster;preauth=1tMFqYDdKhfe2pwp;name=Romeo%20Montague
<p>One way to solve this problem is to present Juliet with a web-based landing page that contains the following elements:</p>
<ul>
<li>A short text that this is an XMPP invitation from Romeo.</li>
<li>A client recommendation (based on the detected web browser) with download links.</li>
<li>A client recommendation (based on the detected web browser/OS) with download links.</li>
<li>A prominent button that activates the actual <strong>xmpp:</strong> link.</li>
</ul>
<p>There are multiple options where such a landing page could be hosted:</p>
@ -237,15 +237,16 @@ https://yax.im/i/romeo/montague.net/1tMFqYDdKhfe2pwp/Romeo+Montague
</section2>
<section2 topic='Approval by the New Contact' anchor='sub_mutual_approval'>
<p>If Juliet's server support pre-approval, it will automatically handle the
<p>If Juliet's server supports pre-approval, it will automatically handle the
incoming subscription request and issue a roster push. Otherwise, Juliet's
client will receive the subscription request:</p>
<example caption='Mutual Subscription Request'><![CDATA[
<presence from='romeo@montague.net' to='juliet@capulet.net' type='subscribe' />
]]></example>
<p>Juliet's client SHOULD check the subscription request sender JID against
the whitelist, and either automatically approve the request or display an
according notification to Juliet.</p>
<p>Juliet's client MUST ensure that the sender JID is contained in the
auto-approval whitelist before automatically approving the request.
Otherwise, it has to fallback to the normal subscription approval
process.</p>
</section2>
</section1>