diff --git a/help/change-a-users-name.md b/help/change-a-users-name.md index eda782f59f..9cb9fb5261 100644 --- a/help/change-a-users-name.md +++ b/help/change-a-users-name.md @@ -20,11 +20,7 @@ Organization administrators can always change any user's name. {!save-changes.md!} -!!! tip "" - - You can also access the **Manage user** tab by clicking the **pencil and - paper** () icon at the top of the [user - profile](/help/view-someones-profile). +{!manage-user-tab-tip.md!} {tab|via-organization-settings} diff --git a/help/change-a-users-role.md b/help/change-a-users-role.md index 045a289326..22ec80dfd9 100644 --- a/help/change-a-users-role.md +++ b/help/change-a-users-role.md @@ -27,11 +27,7 @@ organization](/help/deactivate-your-organization) instead). 1. Click **Save changes**. The new permissions will take effect immediately. -!!! tip "" - - You can also access the **Manage user** tab by clicking the **pencil and - paper** () icon at the top of the [user - profile](/help/view-someones-profile). +{!manage-user-tab-tip.md!} {tab|via-organization-settings} diff --git a/help/deactivate-or-reactivate-a-user.md b/help/deactivate-or-reactivate-a-user.md index 2f24bda2c0..db372d975b 100644 --- a/help/deactivate-or-reactivate-a-user.md +++ b/help/deactivate-or-reactivate-a-user.md @@ -23,6 +23,7 @@ When you deactivate a user: this user will not be able to rejoin with the same email account. !!! warn "" + You must go through the deactivation process below to fully remove a user's access to your Zulip organization. Changing a user's password or removing their single sign-on account will not log them out of their open Zulip @@ -32,7 +33,7 @@ When you deactivate a user: {start_tabs} -{tab|via-user-card} +{tab|via-user-profile} {!manage-this-user.md!} @@ -43,16 +44,7 @@ When you deactivate a user: 1. Approve by clicking **Deactivate**. -{tab|via-user-profile} - -{!manage-this-user-via-user-profile.md!} - -1. Click **Deactivate user** at the bottom of the **Manage user** menu. - -1. *(optional)* Select **Notify this user by email?** if desired, and enter a - custom comment to include in the notification email. - -1. Approve by clicking **Deactivate**. +{!manage-user-tab-tip.md!} {tab|via-organization-settings} @@ -61,14 +53,15 @@ When you deactivate a user: 1. In the **Actions** column, click the **deactivate** () icon for the user you want to deactivate. -2. *(optional)* Select **Notify this user by email?** if desired, and enter a +1. *(optional)* Select **Notify this user by email?** if desired, and enter a custom comment to include in the notification email. -3. Approve by clicking **Deactivate**. +1. Approve by clicking **Deactivate**. {end_tabs} !!! tip "" + Organization administrators cannot deactivate organization owners. ## Reactivating a user diff --git a/help/include/manage-user-tab-tip.md b/help/include/manage-user-tab-tip.md new file mode 100644 index 0000000000..218a26221a --- /dev/null +++ b/help/include/manage-user-tab-tip.md @@ -0,0 +1,5 @@ +!!! tip "" + + You can also access the **Manage user** tab by clicking the **pencil and + paper** () icon at the top of the [user + profile](/help/view-someones-profile).