From cb2fc9a584c32e4b3cc80bab9e25cb82ed6fc1a7 Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Fri, 7 Feb 2025 14:21:19 -0500
Subject: [PATCH] Clarified private channel conversion requirements

---
 source/collaborate/convert-public-channels.rst      | 13 +++++++++----
 .../advanced-permissions-backend-infrastructure.rst |  3 ---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/source/collaborate/convert-public-channels.rst b/source/collaborate/convert-public-channels.rst
index 1a00cbe9a9f..187e7ac906e 100644
--- a/source/collaborate/convert-public-channels.rst
+++ b/source/collaborate/convert-public-channels.rst
@@ -53,13 +53,18 @@ You must be a system admin or team admin to convert public channels to private c
 Convert private channels to public channels
 -------------------------------------------
 
-Due to potential security concerns with sharing private channel history, only system admins can convert private channels to public channels.
+Due to potential security concerns with sharing private channel history, only system admins can convert private channels to public channels. 
+
+.. note::
+
+  Team admins may be granted permissions to convert private channels to public channels via the `API <https://api.mattermost.com/#tag/channels/operation/UpdateChannelPrivacy>`_ or :ref:`mmctl channel modify command <manage/mmctl-command-line-tool:mmctl channel modify>` when configured in the :ref:`permission scheme <onboard/advanced-permissions:permissions structure>`.
 
 1. Go to **System Console > Channels**.
 2. Select **Edit** for an existing private channel. You can also filter the list of channels to private channels only.
-3. Under **Channel Management > Public channel or private channel**, select **Private**. If :ref:`Sync Group channel management <manage/team-channel-members:channel management>` is enabled, private channels can't be converted to public channels.
+3. Under **Channel Management > Public channel or private channel**, select **Private**. 
 4. Select **Save**.
 
-.. tip::
+.. note::
 
-  Alternatively, system admins can convert private channels to public channels using the :ref:`mmctl channel modify command <manage/mmctl-command-line-tool:mmctl channel modify>`.
+  - If :ref:`Sync Group channel management <manage/team-channel-members:channel management>` is enabled, private channels can't be converted to public channels.
+  - System admins can also convert private channels to public channels using the `API <https://api.mattermost.com/#tag/channels/operation/UpdateChannelPrivacy>`_ or the :ref:`mmctl channel modify command <manage/mmctl-command-line-tool:mmctl channel modify>`.
\ No newline at end of file
diff --git a/source/onboard/advanced-permissions-backend-infrastructure.rst b/source/onboard/advanced-permissions-backend-infrastructure.rst
index 465af76ca4d..854edfdea01 100644
--- a/source/onboard/advanced-permissions-backend-infrastructure.rst
+++ b/source/onboard/advanced-permissions-backend-infrastructure.rst
@@ -498,7 +498,6 @@ The following built-in roles and associated permissions are available:
 - read_public_channel
 - manage_team
 - read_channel
-- convert_private_channel_to_public
 - sysconsole_read_integration
 - read_public_channel_groups
 - list_public_teams
@@ -596,7 +595,6 @@ The following built-in roles and associated permissions are available:
 - convert_public_channel_to_private
 - manage_channel_roles
 - sysconsole_read_user_management_teams
-- convert_private_channel_to_public
 - read_public_channel_groups
 - delete_public_channel
 - remove_user_from_team
@@ -618,7 +616,6 @@ The following built-in roles and associated permissions are available:
 - manage_others_incoming_webhooks
 - manage_channel_roles
 - read_public_channel_groups
-- convert_private_channel_to_public
 - remove_reaction
 - delete_post
 - manage_outgoing_webhooks