From dbb4817128b08c9e9e2ad32a8f461630f848aa04 Mon Sep 17 00:00:00 2001
From: Rishi Gupta <rishig@zulipchat.com>
Date: Wed, 27 Feb 2019 20:10:48 -0800
Subject: [PATCH] help: Rename make-a-user-an-administrator to include guests.

---
 templates/zerver/help/change-a-users-role.md  | 26 +++++++++++++++++++
 .../zerver/help/deactivate-your-account.md    |  2 +-
 .../zerver/help/include/sidebar_index.md      |  2 +-
 .../help/make-a-user-an-administrator.md      | 20 --------------
 4 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 templates/zerver/help/change-a-users-role.md
 delete mode 100644 templates/zerver/help/make-a-user-an-administrator.md

diff --git a/templates/zerver/help/change-a-users-role.md b/templates/zerver/help/change-a-users-role.md
new file mode 100644
index 0000000000..399999f937
--- /dev/null
+++ b/templates/zerver/help/change-a-users-role.md
@@ -0,0 +1,26 @@
+# Change a user's role
+
+{!admin-only.md!}
+
+Users join as
+[administrators, members, or guests](/help/roles-and-permissions), depending
+on how they were invited.
+
+An organization administrator can change the role of any other user.
+An admin can revoke their own administrative privileges if there is at least one
+other administrator in the organization.
+
+### Change a user's role
+
+{start_tabs}
+
+{settings_tab|user-list-admin}
+
+1. Find the user you would like to manage. Click the **pencil**
+(<i class="fa fa-pencil"></i>) to the right of their name.
+
+1. Under **User role**, select **Administrator**, **Member** or **Guest**.
+
+1. Click **Save changes**. The new rights will take effect immediately.
+
+{end_tabs}
diff --git a/templates/zerver/help/deactivate-your-account.md b/templates/zerver/help/deactivate-your-account.md
index 58854ff345..2c8ca0be2f 100644
--- a/templates/zerver/help/deactivate-your-account.md
+++ b/templates/zerver/help/deactivate-your-account.md
@@ -27,7 +27,7 @@
 !!! warn ""
     If you are the only administrator in the organization, you cannot
     deactivate your account. You'll need to
-    [add another administrator](make-a-user-an-administrator) first.
+    [add another administrator](/help/change-a-users-role) first.
 
 ## Related articles
 
diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md
index f6a7c255a0..c5685a2681 100644
--- a/templates/zerver/help/include/sidebar_index.md
+++ b/templates/zerver/help/include/sidebar_index.md
@@ -136,7 +136,7 @@
 * [Deactivate or reactivate a user](/help/deactivate-or-reactivate-a-user)
 * [Deactivate or reactivate a bot](/help/deactivate-or-reactivate-a-bot)
 * [Restrict bot creation](/help/restrict-bot-creation)
-* [Make a user an administrator](/help/make-a-user-an-administrator)
+* [Change a user's role](/help/change-a-users-role)
 * [Change a user's name](/help/change-a-users-name)
 * [View all bots in your organization](/help/view-all-bots-in-your-organization)
 
diff --git a/templates/zerver/help/make-a-user-an-administrator.md b/templates/zerver/help/make-a-user-an-administrator.md
deleted file mode 100644
index b14d1f0b80..0000000000
--- a/templates/zerver/help/make-a-user-an-administrator.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Make a user an administrator
-
-{!admin-only.md!}
-
-By default, users join as **members**, which gives them limited access to
-organization-wide settings. An organization administrator can make any other
-member an administrator, or revoke admin access from any other administrator.
-
-{settings_tab|user-list-admin}
-
-1. Find the user you would like to manage. Click the **pencil**
-(<i class="fa fa-pencil"></i>) to the right of their name.
-
-1. Under **User role**, select **Administrator**, **Member** or **Guest**.
-
-1. Click **Save changes**. The new rights will take effect immediately.
-
-!!! tip ""
-    Users can revoke their own administrative privileges if there is at least
-    one other administrator in the organization.