diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md index b6876146e4..0a9cbffa47 100755 --- a/templates/zerver/help/include/sidebar_index.md +++ b/templates/zerver/help/include/sidebar_index.md @@ -177,7 +177,6 @@ * [Restrict topic editing](/help/configure-who-can-edit-topics) * [Require topics in stream messages](/help/require-topics) * [Restrict private messages](/help/restrict-private-messages) -* [Restrict user group management](/help/restrict-user-group-management) * [Restrict wildcard mentions](/help/restrict-wildcard-mentions) * [Block image and link previews](/help/allow-image-link-previews) * [Disable message edit history](/help/disable-message-edit-history) diff --git a/templates/zerver/help/restrict-permissions-of-new-members.md b/templates/zerver/help/restrict-permissions-of-new-members.md index 5dcfa9d341..409a2a4ed3 100644 --- a/templates/zerver/help/restrict-permissions-of-new-members.md +++ b/templates/zerver/help/restrict-permissions-of-new-members.md @@ -19,6 +19,9 @@ Currently, the following actions support limiting access to full members. - [Restricting posting to a stream](/help/stream-sending-policy) - [Restricting inviting users to organization](/help/invite-new-users) - [Restricting adding custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji) +- [Restricting creating and modifying user groups][user-group-permissions] + +[user-group-permissions]: /help/user-groups#configure-who-can-create-and-manage-user-groups ### Set waiting period for new members diff --git a/templates/zerver/help/restrict-user-group-management.md b/templates/zerver/help/restrict-user-group-management.md deleted file mode 100644 index 6f49b6eacb..0000000000 --- a/templates/zerver/help/restrict-user-group-management.md +++ /dev/null @@ -1,21 +0,0 @@ -# Restrict user group management - -{!admin-only.md!} - -By default, all [Members](/help/roles-and-permissions) in a Zulip -organization can create [user groups](/help/user-groups) and manage -those they are a member of. However, you can change your -organization's settings to only allow administrators to create and -manage user groups. - -### Change who can create and manage user groups - -{start_tabs} - -{settings_tab|organization-permissions} - -2. Under **Other permissions**, configure **Who can create and manage user groups**. - -{!save-changes.md!} - -{end_tabs} diff --git a/templates/zerver/help/setting-up-zulip-for-a-class.md b/templates/zerver/help/setting-up-zulip-for-a-class.md index d0c7acb4e5..cadccdb49c 100644 --- a/templates/zerver/help/setting-up-zulip-for-a-class.md +++ b/templates/zerver/help/setting-up-zulip-for-a-class.md @@ -187,9 +187,10 @@ how to assign roles and permissions for a class. Admins and moderators for large classes) - Set [who can move messages between streams][move-between-streams]. (Recommended: Admins and moderators) -- Set [who can create and manage user groups](/help/restrict-user-group-management). +- Set [who can create and manage user groups][user-group-permissions]. (Recommended: Admins and moderators) +[user-group-permissions]: /help/user-groups#configure-who-can-create-and-manage-user-groups [move-between-streams]: /help/configure-message-editing-and-deletion#configure-who-can-move-topics-between-streams #### Recommended roles and permissions for a department @@ -216,7 +217,7 @@ how to assign roles and permissions for a class. (Recommended: Admins and moderators) - Set [who can move messages between streams][move-between-streams]. (Recommended: Admins and moderators) -- Set [who can create and manage user groups](/help/restrict-user-group-management). +- Set [who can create and manage user groups][user-group-permissions]. (Recommended: Admins and moderators) ## Create streams diff --git a/templates/zerver/help/user-groups.md b/templates/zerver/help/user-groups.md index 0f675d0e88..54912c1433 100644 --- a/templates/zerver/help/user-groups.md +++ b/templates/zerver/help/user-groups.md @@ -6,7 +6,7 @@ users at once. When you mention a user group, everyone in the group is individually mentioned. Note that user groups are not the same as group private messages. If you're -trying to send a group of people a message, you'll want to either +trying to send a message to a group of people, you'll want to either [create a stream](/help/create-a-stream), or send a [group private message](/help/private-messages). @@ -16,9 +16,6 @@ trying to send a group of people a message, you'll want to either ### Modify a user group -Organization administrators can modify any user group. Members can modify -any user group they are a part of. Guests cannot modify user groups. - {start_tabs} {settings_tab|user-groups-admin} @@ -32,7 +29,32 @@ any user group they are a part of. Guests cannot modify user groups. {end_tabs} +### Configure who can create and manage 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. + +{start_tabs} + +{settings_tab|organization-permissions} + +1. Under **Other permissions**, configure **Who can create and manage user groups**. + +{!save-changes.md!} + +{end_tabs} + ## Related articles -* [Restrict user group management](/help/restrict-user-group-management) +* [Mention a user or group](/help/mention-a-user-or-group) * [Create user groups](/help/create-user-groups) +* [Setting up your organization](/help/getting-your-organization-started-with-zulip) +* [Roles and permissions](/help/roles-and-permissions) diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 65c57a2131..b2b5459d7f 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -3791,12 +3791,14 @@ paths: type: integer description: | The organization's policy for [who can manage user groups - ](/help/restrict-user-group-management). + ][user-group-permissions]. - 1 = All members can create and edit user groups - 2 = Only organization administrators can create and edit user groups - 3 = Only full members can create and edit user groups - 4 = Only organization administrators and moderators can create and edit user groups + + [user-group-permissions]: /help/user-groups#configure-who-can-create-and-manage-user-groups video_chat_provider: type: integer description: | @@ -10918,12 +10920,14 @@ paths: Present if `realm` is present in `fetch_event_types`. The organization's policy for [who can manage user groups - ](/help/restrict-user-group-management). + ][user-group-permissions]. - 1 = All members can create and edit user groups - 2 = Only organization administrators can create and edit user groups - 3 = Only full members can create and edit user groups. - 4 = Only organization administrators and moderators can create and edit user groups. + + [user-group-permissions]: /help/user-groups#configure-who-can-create-and-manage-user-groups realm_default_code_block_language: type: string nullable: true