From e9b031c003c0d88266260e3224e48f4bf5985b15 Mon Sep 17 00:00:00 2001
From: Shubham Padia <shubham@zulip.com>
Date: Thu, 3 Oct 2024 05:51:21 +0000
Subject: [PATCH] help: Refer to group settings for create/manage group at org
 level.

Right now, we are referring to the roles instead of groups since we have
not enabled that UI for these settings.
---
 help/manage-user-groups.md           | 41 ++++++++++++++++++++++------
 help/setting-up-zulip-for-a-class.md |  2 +-
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/help/manage-user-groups.md b/help/manage-user-groups.md
index 2ec3a26333..a1a62f9248 100644
--- a/help/manage-user-groups.md
+++ b/help/manage-user-groups.md
@@ -113,18 +113,14 @@
 
 {end_tabs}
 
-## Configure who can create and manage user groups
+## Configure who can create user groups
 
 {!admin-only.md!}
 
 By default, [all members](/help/roles-and-permissions) in a Zulip
-organization can create user groups and manage user groups that they
-are a member of. However, you can restrict that ability to specific
-[roles](/help/roles-and-permissions).
-
-Note that administrators and moderators can modify any user group,
-while other organization members can only modify user groups to which
-they belong. Guests cannot modify or create user groups.
+organization can create user groups. However, you can restrict that
+ability to specific [roles](/help/roles-and-permissions). Note that
+guests cannot create user groups.
 
 {start_tabs}
 
@@ -132,7 +128,34 @@ they belong. Guests cannot modify or create user groups.
 
 {settings_tab|organization-permissions}
 
-1. Under **Other permissions**, configure **Who can create and manage user groups**.
+1. Under **Other permissions**, configure **Who can create user groups**.
+
+{!save-changes.md!}
+
+{end_tabs}
+
+## Configure who can manage user groups
+
+{!admin-only.md!}
+
+By default, [owners](/help/roles-and-permissions) in a Zulip
+organization can manage user groups. However, you can expand that
+ability to specific [roles](/help/roles-and-permissions).
+
+<!-- TODO: Remove this after #25942 is resolved and we've removed
+the condition that only members can manage the group if they are
+not admins or moderators. -->
+Note that administrators and moderators can modify any user group,
+while other organization members can only modify user groups to which
+they belong. Guests cannot modify user groups.
+
+{start_tabs}
+
+{tab|desktop-web}
+
+{settings_tab|organization-permissions}
+
+1. Under **Other permissions**, configure **Who can manage user groups**.
 
 {!save-changes.md!}
 
diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md
index 14030605e2..897b1bf661 100644
--- a/help/setting-up-zulip-for-a-class.md
+++ b/help/setting-up-zulip-for-a-class.md
@@ -172,7 +172,7 @@ how to assign roles and permissions for a class.
 - Set [who can create and manage user groups][user-group-permissions].
   (Recommended: Admins and moderators)
 
-[user-group-permissions]: /help/manage-user-groups#configure-who-can-create-and-manage-user-groups
+[user-group-permissions]: /help/manage-user-groups#configure-who-can-create-user-groups
 [move-between-channels]: /help/restrict-moving-messages#configure-who-can-move-messages-to-another-channel
 
 #### Recommended roles and permissions for a department