Document channel category sorting GA and default category behavior (v11.8)

source/administration-guide/configure/experimental-configuration-settings.rst

@@ -1520,6 +1520,9 @@ From Mattermost v10.10, when this :ref:`experimental <administration-guide/manag
 | This feature's ``config.json`` setting is ``"ExperimentalEnableChannelCategorySorting": false`` with options ``true`` and ``false``.     |
 +------------------------------------------------------------------------------------------------------------------------------------------+
 
+.. note::
+  From Mattermost v11.8, channel category sorting is generally available and enabled by default. Configure it from **System Console > Site Configuration > Users and Teams** using the :ref:`Channel category sorting <administration-guide/configure/site-configuration-settings:channel category sorting>` setting (``TeamSettings.EnableChannelCategorySorting``).
+
 .. config:setting:: strict-csrf-token-enforcement
   :displayname: Strict CSRF token enforcement (Experimental)
   :systemconsole: N/A

source/administration-guide/configure/site-configuration-settings.rst

@@ -1098,6 +1098,31 @@ User statistics update time
 | Default is **00:00**.                                                                      |                                                                                          |
 +--------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------+
 
+.. config:setting:: channel-category-sorting
+  :displayname: Channel category sorting (Users and Teams)
+  :systemconsole: Site Configuration > Users and Teams
+  :configjson: .TeamSettings.EnableChannelCategorySorting
+  :environment: MM_TEAMSETTINGS_ENABLECHANNELCATEGORYSORTING
+  :description: This setting controls whether channel admins can choose a default sidebar category when creating or editing a channel. Default is **true**.
+
+  - **true**: **(Default)** When creating or editing supported channels, channel admins see a **Default category (optional)** field. Members who join the channel see it under that category in their sidebar.
+  - **false**: The default category selector is hidden.
+
+Channel category sorting
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+From Mattermost v11.8, channel category sorting is enabled by default. When enabled, channel admins can choose a default sidebar category when creating or editing a channel. Channel admins can select an existing category, type a new category name, or clear the default category from channel settings. Members who join the channel see it under that category in their sidebar. When disabled, the default category selector is hidden.
+
+.. list-table::
+  :widths: 55 45
+  :header-rows: 0
+
+  * - - **true**: **(Default)** When creating or editing supported channels, channel admins see a **Default category (optional)** field. They can select an existing category, enter a new category name, or clear the default category from channel settings. Members who join the channel see it under that category in their sidebar.
+      - **false**: The default category selector is hidden when creating or editing channels.
+    - - System Config path: **Site Configuration > Users and Teams**
+      - ``config.json`` setting: ``TeamSettings`` > ``EnableChannelCategorySorting`` > ``true``
+      - Environment variable: ``MM_TEAMSETTINGS_ENABLECHANNELCATEGORYSORTING``
+
 ----
 
 Notifications

source/end-user-guide/collaborate/create-channels.rst

@@ -21,7 +21,7 @@ Anyone can create public channels, private channels, direct messages, and group
   2. Enter a channel name.
   3. Choose whether this is a public or private channel. See the :doc:`channel types </end-user-guide/collaborate/channel-types>` documentation to learn more about public and private channels.
   4. (Optional) Describe the channel's focus or purpose. This text is visible to all channel members in the channel header.
-  5. (Optional) Assign the channel to a category. If your system admin has enabled :ref:`channel category sorting <administration-guide/configure/experimental-configuration-settings:enable channel category sorting>`, you can assign the new channel to a new or existing channel category. If this option isn't available, you can `customize your channel sidebar </end-user-guide/preferences/customize-your-channel-sidebar>`.
+  5. (Optional) Assign the channel to a category. When :ref:`channel category sorting <administration-guide/configure/site-configuration-settings:channel category sorting>` is enabled (the default from Mattermost v11.8), channel admins see a **Default category (optional)** field when creating or editing a channel. You can select an existing category, type a new category name, or clear the default category from channel settings. Members who join the channel see it under that category in their sidebar. If this option isn't available, you can `customize your channel sidebar </end-user-guide/preferences/customize-your-channel-sidebar>`.
 
   Start a direct or group message
   --------------------------------

source/end-user-guide/collaborate/rename-channels.rst

@@ -13,7 +13,7 @@ Anyone can rename the channels they belong to, unless the system admin has :doc:
   - **Channel name:** The channel name that displays in the Mattermost user interface for all users. Enter a different channel name if needed or preferred.
   - **Channel URL:** The web URL used to access the channel in a web browser. Select **Edit** to change the URL, and select **Done** to save your changes. If your system admin has enabled anonymous team and channel URLs (available in Mattermost Enterprise Advanced from v11.6.0), channel URLs are assigned automatically and do not reflect the channel name.
 
-  If your system admin has enabled :ref:`channel category sorting <administration-guide/configure/experimental-configuration-settings:enable channel category sorting>`, you can assign the renamed channel to a new or existing channel category.
+  When :ref:`channel category sorting <administration-guide/configure/site-configuration-settings:channel category sorting>` is enabled (the default from Mattermost v11.8), channel admins can set a **Default category (optional)** for the channel. You can select an existing category, type a new category name, or clear the default category. Members who join the channel see it under that category in their sidebar.
 
   For example, a channel could be named ``UX Design`` and have a URL of ``https://community.mattermost.com/core/channels/ux-design`` (or an anonymous URL if enabled by your system admin).