From 28606e0e1d3dd25eba6aaa85a1cee4bb6517e39d Mon Sep 17 00:00:00 2001 From: "Carrie Warner (Mattermost)" <74422101+cwarnermm@users.noreply.github.com> Date: Wed, 18 Oct 2023 09:12:15 -0400 Subject: [PATCH] Clarified conditions based on MM-54482 (#6719) --- .../experimental-configuration-settings.rst | 2 +- .../preferences/manage-advanced-options.rst | 40 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/source/configure/experimental-configuration-settings.rst b/source/configure/experimental-configuration-settings.rst index 16599b03c36..b8429503e1d 100644 --- a/source/configure/experimental-configuration-settings.rst +++ b/source/configure/experimental-configuration-settings.rst @@ -203,7 +203,7 @@ Specify the color of the email login button text for white labeling purposes. Us Enable account deactivation ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -**True**: Ability for users to deactivate their own account from **Settings > Advanced**. If a user deactivates their own account, they will get an email notification confirming they were deactivated. +**True**: Ability for users to deactivate their own account from **Settings > Advanced > Deactivate Account**. If a user deactivates their own account, they will get an email notification confirming they were deactivated. Available only when authentication is set to use email/password. Not available when authentication uses SAML or AD/LDAP. **False**: Ability for users to deactivate their own account is disabled. diff --git a/source/preferences/manage-advanced-options.rst b/source/preferences/manage-advanced-options.rst index de2a8748207..379abf795a3 100644 --- a/source/preferences/manage-advanced-options.rst +++ b/source/preferences/manage-advanced-options.rst @@ -65,6 +65,26 @@ By default, Mattermost shows you system messages when users join or leave channe This option isn't something you can set using the mobile app. +Deactivate account +------------------ + +You can deactivate your account if you access Mattermost using an email address and password, and when your system admin has `enabled your ability to do so `__. Deactivating your account removes your ability to access Mattermost, and disables all email and mobile notifications. + +.. important:: + + - If you deactive your account, you must contact your system admin to have it reactivated. + - If you access Mattermost using another authentication method, such as AD/LDAP or SAML, or use accounts that don't have this setting available, contact your system admin to deactivate your account in the System Console. + +.. tabs:: + + .. tab:: Web/Desktop + + Select **Deactivate Account** to deactivate your Mattermost user account. + + .. tab:: Mobile + + This option isn't applicable to the mobile app. + Performance debugging --------------------- @@ -116,26 +136,6 @@ By default, `message drafts `__ are synchron This option isn't applicable to the mobile app. -Deactivate account -~~~~~~~~~~~~~~~~~~ - -You can deactivate your account if you access Mattermost using an email address, and when your system admin has `enabled your ability to do so `__. Deactivating your account removes your ability to access Mattermost, and disables all email and mobile notifications. - -.. important:: - - - If you deactive your account, you must contact your system admin to have it reactivated. - - If you access Mattermost using another authentication method, such as AD/LDAP or SAML, or use accounts that don't have this setting available, contact your system admin to deactivate your account in the System Console. - -.. tabs:: - - .. tab:: Web/Desktop - - Select **Deactivate Account** to deactivate your Mattermost user account. - - .. tab:: Mobile - - This option isn't applicable to the mobile app. - Delete local files ------------------