diff --git a/help/include/customize-organization-settings.md b/help/include/customize-organization-settings.md index 1233a2e6fe..71c308c620 100644 --- a/help/include/customize-organization-settings.md +++ b/help/include/customize-organization-settings.md @@ -23,7 +23,7 @@ Zulip works for your organization before deciding what settings are best for you. [message-editing-permissions]: /help/restrict-message-editing-and-deletion -[topic-editing-permissions]: /help/configure-who-can-edit-topics +[topic-editing-permissions]: /help/restrict-moving-messages [default-code-block-language]: /help/code-blocks#default-code-block-language [code-playgrounds]: /help/code-blocks#code-playgrounds [email-address-visibility]: /help/restrict-visibility-of-email-addresses diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 03cd9edc38..485ed75bf4 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -189,7 +189,7 @@ * [Require topics in stream messages](/help/require-topics) * [Restrict private messages](/help/restrict-private-messages) * [Restrict wildcard mentions](/help/restrict-wildcard-mentions) -* [Restrict moving messages](/help/configure-who-can-edit-topics) +* [Restrict moving messages](/help/restrict-moving-messages) * [Restrict message editing](/help/restrict-message-editing-and-deletion) * [Disable message edit history](/help/disable-message-edit-history) * [Block image and link previews](/help/allow-image-link-previews) diff --git a/help/move-content-to-another-stream.md b/help/move-content-to-another-stream.md index 62e5af9afb..caf648a72a 100644 --- a/help/move-content-to-another-stream.md +++ b/help/move-content-to-another-stream.md @@ -5,7 +5,7 @@ Organizations can [configure][configure-moving-permissions] which [roles](/help/roles-and-permissions) have permission to move messages between streams. -[configure-moving-permissions]: /help/configure-who-can-edit-topics#configure-who-can-move-messages-to-another-stream +[configure-moving-permissions]: /help/restrict-moving-messages#configure-who-can-move-messages-to-another-stream To help others find moved content, you can have the [notification bot][notification-bot] send automated notices to the source topic, the @@ -106,6 +106,6 @@ that one does not have permission to access. * [Rename a topic](/help/rename-a-topic) * [Move content to another topic](/help/move-content-to-another-topic) -* [Restrict moving messages](/help/configure-who-can-edit-topics) +* [Restrict moving messages](/help/restrict-moving-messages) [notification-bot]: /help/configure-notification-bot diff --git a/help/move-content-to-another-topic.md b/help/move-content-to-another-topic.md index d321921b15..4e22cc325b 100644 --- a/help/move-content-to-another-topic.md +++ b/help/move-content-to-another-topic.md @@ -11,7 +11,7 @@ will automatically redirect to the new location of the message. [Muted topics](/help/mute-a-topic) are automatically migrated when an entire topic is moved. -Organizations can [configure](/help/configure-who-can-edit-topics) which +Organizations can [configure](/help/restrict-moving-messages) which [roles](/help/roles-and-permissions) have permission to modify topics. ## Move messages to another topic @@ -37,4 +37,4 @@ Organizations can [configure](/help/configure-who-can-edit-topics) which * [Rename a topic](/help/rename-a-topic) * [Move content to another stream](/help/move-content-to-another-stream) -* [Restrict moving messages](/help/configure-who-can-edit-topics) +* [Restrict moving messages](/help/restrict-moving-messages) diff --git a/help/rename-a-topic.md b/help/rename-a-topic.md index ed42a394a9..d27e591c93 100644 --- a/help/rename-a-topic.md +++ b/help/rename-a-topic.md @@ -10,7 +10,7 @@ context](/help/link-to-a-message-or-conversation#get-a-link-to-a-specific-messag will automatically redirect to the new location of the message. [Muted topics](/help/mute-a-topic) are automatically migrated when a topic is renamed. -Organizations can [configure](/help/configure-who-can-edit-topics) which +Organizations can [configure](/help/restrict-moving-messages) which [roles](/help/roles-and-permissions) have permission to rename topics. ## Rename a topic @@ -51,5 +51,4 @@ Organizations can [configure](/help/configure-who-can-edit-topics) which * [Move content to another topic](/help/move-content-to-another-topic) * [Move content to another stream](/help/move-content-to-another-stream) * [Resolve a topic](/help/resolve-a-topic) -* [Restrict moving messages](/help/configure-who-can-edit-topics) - +* [Restrict moving messages](/help/restrict-moving-messages) diff --git a/help/require-topics.md b/help/require-topics.md index dcf28184dd..80ca4136fd 100644 --- a/help/require-topics.md +++ b/help/require-topics.md @@ -25,4 +25,4 @@ displayed as **(no topic)**. Any user can [add a topic](/help/rename-a-topic) to messages without a topic. They can do so regardless of whether they can [edit topics in -general](/help/configure-who-can-edit-topics). +general](/help/restrict-moving-messages). diff --git a/help/resolve-a-topic.md b/help/resolve-a-topic.md index a51f96035a..5722a4b0de 100644 --- a/help/resolve-a-topic.md +++ b/help/resolve-a-topic.md @@ -37,7 +37,7 @@ approaches for deciding when to mark a topic as resolved: Users can resolve and unresolve a topic if they have permission to edit topics. Organization administrators can [configure who can edit -topics](/help/configure-who-can-edit-topics). +topics](/help/restrict-moving-messages). ## Mark a topic as resolved @@ -107,5 +107,5 @@ topics](/help/configure-who-can-edit-topics). * [Rename a topic](/help/rename-a-topic) * [Move content to another topic](/help/move-content-to-another-topic) -* [Restrict topic editing](/help/configure-who-can-edit-topics) +* [Restrict topic editing](/help/restrict-moving-messages) * [API documentation for resolving topics](/api/update-message) diff --git a/help/restrict-message-editing-and-deletion.md b/help/restrict-message-editing-and-deletion.md index d67c2e3046..766e9b9731 100644 --- a/help/restrict-message-editing-and-deletion.md +++ b/help/restrict-message-editing-and-deletion.md @@ -58,4 +58,4 @@ irretrievably) removes the message from Zulip. * [Delete a topic](/help/delete-a-topic) * [Disable message edit history](/help/disable-message-edit-history) * [Configure message retention policy](/help/message-retention-policy) -* [Restrict moving messages](/help/configure-who-can-edit-topics) +* [Restrict moving messages](/help/restrict-moving-messages) diff --git a/help/configure-who-can-edit-topics.md b/help/restrict-moving-messages.md similarity index 97% rename from help/configure-who-can-edit-topics.md rename to help/restrict-moving-messages.md index 50c5bf2e92..bad3f4554e 100644 --- a/help/configure-who-can-edit-topics.md +++ b/help/restrict-moving-messages.md @@ -84,5 +84,5 @@ Permissions for moving messages between streams can be configured separately. * [Move content to another topic](/help/move-content-to-another-topic) * [Move content to another stream](/help/move-content-to-another-stream) * [Restrict message editing and - deletion](/help/configure-message-editing-and-deletion) + deletion](/help/restrict-message-editing-and-deletion) * [Roles and permissions](/help/roles-and-permissions) diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md index fdcf0d849d..cc6cd3532d 100644 --- a/help/setting-up-zulip-for-a-class.md +++ b/help/setting-up-zulip-for-a-class.md @@ -167,7 +167,7 @@ how to assign roles and permissions for a class. (Recommended: Admins for public streams; Admins, moderators and members for private streams) - Set [who can add users to streams](/help/configure-who-can-invite-to-streams). (Recommended: Admins and moderators) -- Set [who can edit the topic of any message](/help/configure-who-can-edit-topics). +- Set [who can edit the topic of any message](/help/restrict-moving-messages). (Recommended: (default) Members for small classes; Admins and moderators for large classes) - Set [who can move messages between streams][move-between-streams]. @@ -176,7 +176,7 @@ how to assign roles and permissions for a class. (Recommended: Admins and moderators) [user-group-permissions]: /help/user-groups#configure-who-can-create-and-manage-user-groups -[move-between-streams]: /help/configure-who-can-edit-topics#configure-who-can-move-messages-to-another-stream +[move-between-streams]: /help/restrict-moving-messages#configure-who-can-move-messages-to-another-stream #### Recommended roles and permissions for a department @@ -198,7 +198,7 @@ how to assign roles and permissions for a class. Admins, moderators and members for private streams) - Set [who can add users to streams](/help/configure-who-can-invite-to-streams). (Recommended: Admins and moderators) -- Set [who can edit the topic of any message](/help/configure-who-can-edit-topics). +- Set [who can edit the topic of any message](/help/restrict-moving-messages). (Recommended: Admins and moderators) - Set [who can move messages between streams][move-between-streams]. (Recommended: Admins and moderators) diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index 513e6733be..2a96c51459 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -21,6 +21,7 @@ POLICY_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ # Add URL redirects for help center documentation here: + URLRedirect("/help/configure-who-can-edit-topics", "/help/restrict-moving-messages"), URLRedirect( "/help/configure-message-editing-and-deletion", "/help/restrict-message-editing-and-deletion", @@ -56,7 +57,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ # The `help/about-streams-and-topics` redirect is particularly important, # because the old URL appears in links from Welcome Bot messages. URLRedirect("/help/about-streams-and-topics", "/help/streams-and-topics"), - URLRedirect("/help/community-topic-edits", "/help/configure-who-can-edit-topics"), + URLRedirect("/help/community-topic-edits", "/help/restrict-moving-messages"), URLRedirect( "/help/only-allow-admins-to-add-emoji", "/help/custom-emoji#change-who-can-add-custom-emoji" ), diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index f674ee07c8..bdd32299c5 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -4039,7 +4039,7 @@ paths: description: | Messages sent more than this many seconds ago cannot be moved within a stream by members with this organization's [message move - policy](/help/configure-who-can-edit-topics). This setting does not + policy](/help/restrict-moving-messages). This setting does not affect moderators and administrators. Will not be 0. A 'null' value means no limit: messages can be moved @@ -4053,7 +4053,7 @@ paths: description: | Messages sent more than this many seconds ago cannot be moved between streams by members with this organization's [message move - policy](/help/configure-who-can-edit-topics). This setting does not + policy](/help/restrict-moving-messages). This setting does not affect moderators and administrators. Will not be 0. A 'null' value means no limit: messages can be moved @@ -12246,7 +12246,7 @@ paths: Messages sent more than this many seconds ago cannot be moved within a stream by members with this organization's [message move - policy](/help/configure-who-can-edit-topics). This setting does not + policy](/help/restrict-moving-messages). This setting does not affect moderators and administrators. Will not be 0. A 'null' value means no limit: messages can be moved @@ -12262,7 +12262,7 @@ paths: Messages sent more than this many seconds ago cannot be moved between streams by members with this organization's [message move - policy](/help/configure-who-can-edit-topics). This setting does not + policy](/help/restrict-moving-messages). This setting does not affect moderators and administrators. Will not be 0. A 'null' value means no limit: messages can be moved