From 3348277c17315146dab962030db1e629f7dcff58 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@stpeter.im>
Date: Fri, 22 Jun 2012 10:16:31 -0600
Subject: [PATCH] text tweak from Kev

---
 xep-0191.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xep-0191.xml b/xep-0191.xml
index 76a9f4e4..eba7a3c4 100644
--- a/xep-0191.xml
+++ b/xep-0191.xml
@@ -24,8 +24,8 @@
   <shortname>blocking</shortname>
   &stpeter;
   <revision>
-    <version>1.2rc1</version>
-    <date>in progress, last updated 2012-06-06</date>
+    <version>1.2rc2</version>
+    <date>in progress, last updated 2012-06-22</date>
     <initials>psa</initials>
     <remark><p>Changed the title and rearranged several sections.</p></remark>
   </revision>
@@ -257,7 +257,7 @@
 
 <section1 topic='Relationship to Privacy Lists' anchor='privacy'>
   <p>The communications blocking protocol specified herein is intended to be a user-friendly "front end" to a subset of the functionality defined by the privacy lists protocol (<cite>XEP-0016</cite>). If a service deploys both privacy lists and the blocking command, the service MUST use the same back-end data store for both protocols. (Note: Wherever possible, this document attempts to define a protocol that is fully consistent with <cite>XEP-0016</cite>; if a particular aspect of functionality is not specified herein, the relevant text in <cite>XEP-0016</cite> shall be taken to apply.)</p>
-  <p>A service SHOULD map the blocklist to the default privacy list, where each blocked JID is represented as a privacy list item of type "jid" and action "deny". <note>An implementation MUST NOT block communications from one of a user's resources to another, even if the user happens to define a rule that would otherwise result in that behavior.</note> If this is done and none of the user's clients ever use the privacy lists protocol, then the blocklist will always apply. This mapping has the following implications:</p>
+  <p>When implementing both XEP-0191 and XEP-0016, a service SHOULD map the blocklist to the default privacy list, where each blocked JID is represented as a privacy list item of type "jid" and action "deny". <note>An implementation MUST NOT block communications from one of a user's resources to another, even if the user happens to define a rule that would otherwise result in that behavior.</note> If this is done and none of the user's clients ever use the privacy lists protocol, then the blocklist will always apply. This mapping has the following implications:</p>
   <ol start='1'>
     <li><p>If all of a user's clients always use the blocking command, then the default privacy list will be equivalent to the blocklist and the default privacy list will be a kind of "virtual list" (in the sense that it is never modified directly by any of the clients).</p></li>
     <li><p>If one of a user's clients uses privacy lists instead of blocklists and modifies the default privacy list by removing a blocked JID or blocking a new JID, then that change will be reflected in the blocklist.</p></li>