help: Rename make-a-user-an-administrator to include guests.

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}

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
 

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)
 

templates/zerver/help/make-a-user-an-administrator.md

@@ -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.