From 49e2a2c64a2fab4ec91e614c9781014ab50347d1 Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Thu, 16 Feb 2017 10:40:08 +0100
Subject: [PATCH] XEP-0379: minor editing, improved language

---
 xep-0379.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/xep-0379.xml b/xep-0379.xml
index 0c24637b..977739d6 100644
--- a/xep-0379.xml
+++ b/xep-0379.xml
@@ -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>