From 66026c7b0ebb5fa54d50642a44eb2c45c5d52b2c Mon Sep 17 00:00:00 2001 From: Wayne Wollesen <50209602+ewwollesen@users.noreply.github.com> Date: Thu, 12 Dec 2024 15:00:23 -0600 Subject: [PATCH 1/5] Update site-configuration-settings.rst Updated note for false setting as it did not appropriately describe the setting. --- source/configure/site-configuration-settings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/configure/site-configuration-settings.rst b/source/configure/site-configuration-settings.rst index 231151b724e..1ef79a8d606 100644 --- a/source/configure/site-configuration-settings.rst +++ b/source/configure/site-configuration-settings.rst @@ -748,7 +748,7 @@ Enable custom user groups +---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+ | - **true**: **(Default)** Users with appropriate permissions can create custom user groups, | - System Config path: **Site Configuration > Users and Teams** | | and users can @mention custom user groups in Mattermost conversations. | - ``config.json`` setting: N/A | -| - **false**: Users cannot set custom statuses. | - Environment variable: N/A | +| - **false**: Custom user groups cannot be created. | - Environment variable: N/A | +---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+ .. config:setting:: users-userstatsupdatetime From d8e2a657d626a91bdccec2b11d2d67cf430e9e0b Mon Sep 17 00:00:00 2001 From: "Carrie Warner (Mattermost)" <74422101+cwarnermm@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:22:09 -0500 Subject: [PATCH 2/5] Update source/configure/site-configuration-settings.rst --- source/configure/site-configuration-settings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/configure/site-configuration-settings.rst b/source/configure/site-configuration-settings.rst index 1ef79a8d606..3a6d4da1f5a 100644 --- a/source/configure/site-configuration-settings.rst +++ b/source/configure/site-configuration-settings.rst @@ -746,7 +746,7 @@ Enable custom user groups :start-after: :nosearch: +---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+ -| - **true**: **(Default)** Users with appropriate permissions can create custom user groups, | - System Config path: **Site Configuration > Users and Teams** | +| - **true**: **(Default)** Users with appropriate permissions can create custom user groups, | - System Config path: type it here **Site Configuration > Users and Teams** | | and users can @mention custom user groups in Mattermost conversations. | - ``config.json`` setting: N/A | | - **false**: Custom user groups cannot be created. | - Environment variable: N/A | +---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+ From 26c740b78ab2c7929f09b257623cce05fcf00b77 Mon Sep 17 00:00:00 2001 From: "Carrie Warner (Mattermost)" <74422101+cwarnermm@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:23:12 -0500 Subject: [PATCH 3/5] Update source/configure/site-configuration-settings.rst --- source/configure/site-configuration-settings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/configure/site-configuration-settings.rst b/source/configure/site-configuration-settings.rst index 3a6d4da1f5a..1ef79a8d606 100644 --- a/source/configure/site-configuration-settings.rst +++ b/source/configure/site-configuration-settings.rst @@ -746,7 +746,7 @@ Enable custom user groups :start-after: :nosearch: +---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+ -| - **true**: **(Default)** Users with appropriate permissions can create custom user groups, | - System Config path: type it here **Site Configuration > Users and Teams** | +| - **true**: **(Default)** Users with appropriate permissions can create custom user groups, | - System Config path: **Site Configuration > Users and Teams** | | and users can @mention custom user groups in Mattermost conversations. | - ``config.json`` setting: N/A | | - **false**: Custom user groups cannot be created. | - Environment variable: N/A | +---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+ From 68934678af056682ed16b2de9a3a89ea0cb7a095 Mon Sep 17 00:00:00 2001 From: "Carrie Warner (Mattermost)" <74422101+cwarnermm@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:25:06 -0500 Subject: [PATCH 4/5] Update source/configure/site-configuration-settings.rst --- source/configure/site-configuration-settings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/configure/site-configuration-settings.rst b/source/configure/site-configuration-settings.rst index 1ef79a8d606..27ef5f4cde3 100644 --- a/source/configure/site-configuration-settings.rst +++ b/source/configure/site-configuration-settings.rst @@ -747,7 +747,7 @@ Enable custom user groups +---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+ | - **true**: **(Default)** Users with appropriate permissions can create custom user groups, | - System Config path: **Site Configuration > Users and Teams** | -| and users can @mention custom user groups in Mattermost conversations. | - ``config.json`` setting: N/A | +| and users can @mention custom user groups in Mattermost conversations. | - ``config.json`` setting: actual setting name | | - **false**: Custom user groups cannot be created. | - Environment variable: N/A | +---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+ From eeedc50038e06161d00a72bc22a424f81969202c Mon Sep 17 00:00:00 2001 From: "Carrie Warner (Mattermost)" <74422101+cwarnermm@users.noreply.github.com> Date: Fri, 13 Dec 2024 08:44:20 -0500 Subject: [PATCH 5/5] Update source/configure/site-configuration-settings.rst Co-authored-by: Wayne Wollesen <50209602+ewwollesen@users.noreply.github.com> --- source/configure/site-configuration-settings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/configure/site-configuration-settings.rst b/source/configure/site-configuration-settings.rst index 27ef5f4cde3..b7d1a800263 100644 --- a/source/configure/site-configuration-settings.rst +++ b/source/configure/site-configuration-settings.rst @@ -747,7 +747,7 @@ Enable custom user groups +---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+ | - **true**: **(Default)** Users with appropriate permissions can create custom user groups, | - System Config path: **Site Configuration > Users and Teams** | -| and users can @mention custom user groups in Mattermost conversations. | - ``config.json`` setting: actual setting name | +| and users can @mention custom user groups in Mattermost conversations. | - ``config.json`` setting: ``ServiceSettings`` > ``EnableCustomGroups`` > ``true`` | | - **false**: Custom user groups cannot be created. | - Environment variable: N/A | +---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+