From e83b0ff39e97ab63357926fa5d25639499071a8b Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Tue, 25 Jun 2019 16:50:02 +0200
Subject: [PATCH] Update wording to clarify what /revoke means

---
 spec/muc.js               | 8 ++++----
 src/converse-muc-views.js | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/muc.js b/spec/muc.js
index 486d6772c..c7f9affcd 100644
--- a/spec/muc.js
+++ b/spec/muc.js
@@ -2745,7 +2745,7 @@
                 expect(info_messages.pop().textContent).toBe('/voice: Allow muted user to post messages');
                 expect(info_messages.pop().textContent).toBe('/topic: Set groupchat subject (alias for /subject)');
                 expect(info_messages.pop().textContent).toBe('/subject: Set groupchat subject');
-                expect(info_messages.pop().textContent).toBe('/revoke: Revoke user\'s membership');
+                expect(info_messages.pop().textContent).toBe('/revoke: Revoke the user\'s current affiliation');
                 expect(info_messages.pop().textContent).toBe('/register: Register your nickname');
                 expect(info_messages.pop().textContent).toBe('/owner: Grant ownership of this groupchat');
                 expect(info_messages.pop().textContent).toBe('/op: Grant moderator role to user');
@@ -2758,7 +2758,7 @@
                 expect(info_messages.pop().textContent).toBe('/destroy: Remove this groupchat');
                 expect(info_messages.pop().textContent).toBe('/deop: Change user role to participant');
                 expect(info_messages.pop().textContent).toBe('/clear: Clear the chat area');
-                expect(info_messages.pop().textContent).toBe('/ban: Ban user from groupchat');
+                expect(info_messages.pop().textContent).toBe('/ban: Ban user by changing their affiliation to outcast');
                 expect(info_messages.pop().textContent).toBe('/admin: Change user\'s affiliation to admin');
                 expect(info_messages.pop().textContent).toBe('You can run the following commands');
 
@@ -2817,7 +2817,7 @@
                 expect(info_messages.length).toBe(17);
                 expect(info_messages.pop().textContent).toBe('/topic: Set groupchat subject (alias for /subject)');
                 expect(info_messages.pop().textContent).toBe('/subject: Set groupchat subject');
-                expect(info_messages.pop().textContent).toBe('/revoke: Revoke user\'s membership');
+                expect(info_messages.pop().textContent).toBe('/revoke: Revoke the user\'s current affiliation');
                 expect(info_messages.pop().textContent).toBe('/register: Register your nickname');
                 expect(info_messages.pop().textContent).toBe('/owner: Grant ownership of this groupchat');
                 expect(info_messages.pop().textContent).toBe('/op: Grant moderator role to user');
@@ -2829,7 +2829,7 @@
                 expect(info_messages.pop().textContent).toBe('/destroy: Remove this groupchat');
                 expect(info_messages.pop().textContent).toBe('/deop: Change user role to participant');
                 expect(info_messages.pop().textContent).toBe('/clear: Clear the chat area');
-                expect(info_messages.pop().textContent).toBe('/ban: Ban user from groupchat');
+                expect(info_messages.pop().textContent).toBe('/ban: Ban user by changing their affiliation to outcast');
                 expect(info_messages.pop().textContent).toBe('/admin: Change user\'s affiliation to admin');
                 expect(info_messages.pop().textContent).toBe('You can run the following commands');
                 done();
diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js
index 0e2ad1dec..5ac932efc 100644
--- a/src/converse-muc-views.js
+++ b/src/converse-muc-views.js
@@ -1009,7 +1009,7 @@ converse.plugins.add('converse-muc-views', {
                         this.showHelpMessages([`<strong>${__("You can run the following commands")}</strong>`]);
                         this.showHelpMessages([
                             `<strong>/admin</strong>: ${__("Change user's affiliation to admin")}`,
-                            `<strong>/ban</strong>: ${__('Ban user from groupchat')}`,
+                            `<strong>/ban</strong>: ${__('Ban user by changing their affiliation to outcast')}`,
                             `<strong>/clear</strong>: ${__('Clear the chat area')}`,
                             `<strong>/deop</strong>: ${__('Change user role to participant')}`,
                             `<strong>/destroy</strong>: ${__('Remove this groupchat')}`,
@@ -1022,7 +1022,7 @@ converse.plugins.add('converse-muc-views', {
                             `<strong>/op</strong>: ${__('Grant moderator role to user')}`,
                             `<strong>/owner</strong>: ${__('Grant ownership of this groupchat')}`,
                             `<strong>/register</strong>: ${__("Register your nickname")}`,
-                            `<strong>/revoke</strong>: ${__("Revoke user's membership")}`,
+                            `<strong>/revoke</strong>: ${__("Revoke the user's current affiliation")}`,
                             `<strong>/subject</strong>: ${__('Set groupchat subject')}`,
                             `<strong>/topic</strong>: ${__('Set groupchat subject (alias for /subject)')}`,
                             `<strong>/voice</strong>: ${__('Allow muted user to post messages')}`