templates/zerver/help/change-a-users-name.md

@@ -2,15 +2,17 @@
 
 {!admin-only.md!}
 
-Ordinary users can [change their own names](/help/change-your-name), but
-administrators can change users' names when users are
-unavailable. Follow the following steps to change the name of a user.
+By default, users can [change their name](/help/change-your-name), though
+organization administrators can
+[restrict name changes](/help/restrict-name-and-email-changes).
+
+Organization administrators can always change any user's name.
 
 {settings_tab|user-list-admin}
 
-2. Click on the pencil (<i class="icon-vector-pencil"></i>) icon next to
-the name of the user you want to change.
+1. Find the user you would like to manage. Click the **pencil**
+(<i class="icon-vector-pencil"></i>) to the right of their name.
+
+1. Under **Full name**, enter a new name.
 
-3. After clicking on the pencil icon, an input field labeled **Full name** will
-appear to allow you to change the user's name. Enter the user's new name in
-**Full name**.
+{!save-changes.md!}

templates/zerver/help/include/save-changes.md

@@ -1 +1 @@
-1. Click on **Save changes**.
+1. Click **Save changes**.

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

@@ -2,29 +2,18 @@
 
 {!admin-only.md!}
 
-By default, everyone in an organization is a user; this limits them from
-modifying organization-wide settings, such as changing the organization name,
-activating or deactivating users, deleting streams, etc. Follow the following steps to
-give any user in your organization administrative rights.
+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}
 
-4. Click on the **Make admin** button for the user that you wish to make an
-administrator.
+1. Find the user you would like to manage. Click the **pencil**
+(<i class="icon-vector-pencil"></i>) to the right of their name.
 
-    After clicking the **Make admin** button, the selected user's browser will
-reload and the user will gain administrative privileges immediately.
+1. Under **User role**, select **Member** or **Administrator**.
 
-## Revoke administrative rights from a user
-
-Administrators can also revoke the administrative rights given to a user.
-
-{settings_tab|user-list-admin}
-
-2. Click on the **Remove admin** button.
-
-    The selected user's browser will reload automatically, and the user will no
-longer have access to the **Organization** page.
+1. Click **Save changes**. The new rights will take effect immediately.
 
 !!! tip ""
     Users can revoke their own administrative privileges if there is at least