diff --git a/api_docs/roles-and-permissions.md b/api_docs/roles-and-permissions.md index 1fd005f772..769cbde75c 100644 --- a/api_docs/roles-and-permissions.md +++ b/api_docs/roles-and-permissions.md @@ -74,8 +74,8 @@ event](/api/get-events#realm_user-add), and the ## Permission levels Many areas of Zulip are customizable by the roles -above, such as (but not limited to) [configuring message editing and -deletion](/help/configure-message-editing-and-deletion) and +above, such as (but not limited to) [restricting message editing and +deletion](/help/restrict-message-editing-and-deletion) and [streams permissions](/help/stream-permissions). The potential permission levels are: diff --git a/docs/production/security-model.md b/docs/production/security-model.md index c164dbd5c8..170da1e89b 100644 --- a/docs/production/security-model.md +++ b/docs/production/security-model.md @@ -133,7 +133,7 @@ strength allowed is controlled by two settings in be deleted at any time by that administrator. - See - [Configuring message editing and deletion](https://zulip.com/help/configure-message-editing-and-deletion) + [Restrict message editing and deletion](https://zulip.com/help/configure-message-editing-and-deletion) for more details. ## Users and bots diff --git a/help/disable-message-edit-history.md b/help/disable-message-edit-history.md index a683b9b064..84da239d37 100644 --- a/help/disable-message-edit-history.md +++ b/help/disable-message-edit-history.md @@ -22,4 +22,4 @@ also disable viewing of message edit history more generally. ## Related articles -* [Restrict message editing and deletion](/help/configure-message-editing-and-deletion) +* [Restrict message editing and deletion](/help/restrict-message-editing-and-deletion) diff --git a/help/edit-or-delete-a-message.md b/help/edit-or-delete-a-message.md index 384c624614..bfd30025ce 100644 --- a/help/edit-or-delete-a-message.md +++ b/help/edit-or-delete-a-message.md @@ -7,7 +7,7 @@ By default, Zulip allows you to edit the content of your messages within 10 minutes of when you send them. Organization administrators can -[change the time limit](/help/configure-message-editing-and-deletion), +[change the time limit](/help/restrict-message-editing-and-deletion), remove the time limit, or remove the ability to edit messages entirely. Administrators can delete other users' messages, but can never edit the @@ -52,7 +52,7 @@ For cases where someone accidentally shared secret information publicly message completely. By default, only administrators can delete messages, though this can be -[configured](/help/configure-message-editing-and-deletion) by an organization +[configured](/help/restrict-message-editing-and-deletion) by an organization administrator. {start_tabs} @@ -97,4 +97,4 @@ permissions to delete that message. * [Delete a topic](/help/delete-a-topic) * [Archive a stream](/help/archive-a-stream) * [Message retention policy](/help/message-retention-policy) -* [Restrict message editing and deletion](/help/configure-message-editing-and-deletion) +* [Restrict message editing and deletion](/help/restrict-message-editing-and-deletion) diff --git a/help/import-from-gitter.md b/help/import-from-gitter.md index db0b363207..cc8b5a9ad4 100644 --- a/help/import-from-gitter.md +++ b/help/import-from-gitter.md @@ -107,7 +107,7 @@ keep in mind about the import process: workspace settings, so you will need to [configure the settings for your Zulip organization](/help/customize-organization-settings). This includes settings like [email visibility](/help/restrict-visibility-of-email-addresses), - [message editing permissions](/help/configure-message-editing-and-deletion), + [message editing permissions](/help/restrict-message-editing-and-deletion), and [how users can join your organization](/help/restrict-account-creation). - Gitter's export tool does not export user settings, so users in your organization @@ -143,7 +143,7 @@ Once the import process is completed, you will need to: 1. [Configure the settings for your organization](/help/customize-organization-settings), which are not exported. This includes settings like [email visibility](/help/restrict-visibility-of-email-addresses), [message editing - permissions](/help/configure-message-editing-and-deletion), + permissions](/help/restrict-message-editing-and-deletion), and [how users can join your organization](/help/restrict-account-creation). 2. [Configure user roles](/help/change-a-users-role). Only organization owners diff --git a/help/import-from-mattermost.md b/help/import-from-mattermost.md index a2ccd694e7..acc16de1a4 100644 --- a/help/import-from-mattermost.md +++ b/help/import-from-mattermost.md @@ -255,7 +255,7 @@ keep in mind about the import process: the settings for your Zulip organization](/help/customize-organization-settings). This includes settings like [email visibility](/help/restrict-visibility-of-email-addresses), - [message editing permissions](/help/configure-message-editing-and-deletion), + [message editing permissions](/help/restrict-message-editing-and-deletion), and [how users can join your organization](/help/restrict-account-creation). - Mattermost's user roles are mapped to Zulip's [user diff --git a/help/import-from-rocketchat.md b/help/import-from-rocketchat.md index 8e8fac7ed7..c924a09649 100644 --- a/help/import-from-rocketchat.md +++ b/help/import-from-rocketchat.md @@ -104,7 +104,7 @@ keep in mind about the import process: the settings for your Zulip organization](/help/customize-organization-settings). This includes settings like [email visibility](/help/restrict-visibility-of-email-addresses), - [message editing permissions](/help/configure-message-editing-and-deletion), + [message editing permissions](/help/restrict-message-editing-and-deletion), and [how users can join your organization](/help/restrict-account-creation). - Rocket.Chat does not export user settings, so users in your organization may diff --git a/help/import-from-slack.md b/help/import-from-slack.md index e4ac793e58..1c19c621c6 100644 --- a/help/import-from-slack.md +++ b/help/import-from-slack.md @@ -135,7 +135,7 @@ in mind about the import process: the settings for your Zulip organization](/help/customize-organization-settings). This includes settings like [email visibility](/help/restrict-visibility-of-email-addresses), - [message editing permissions](/help/configure-message-editing-and-deletion), + [message editing permissions](/help/restrict-message-editing-and-deletion), and [how users can join your organization](/help/restrict-account-creation). - Slack does not export user settings, so users in your organization may want to diff --git a/help/include/customize-organization-settings.md b/help/include/customize-organization-settings.md index 9fdf2901cf..1233a2e6fe 100644 --- a/help/include/customize-organization-settings.md +++ b/help/include/customize-organization-settings.md @@ -22,7 +22,7 @@ For many other settings, e.g., [message][message-editing-permissions] and Zulip works for your organization before deciding what settings are best for you. -[message-editing-permissions]: /help/configure-message-editing-and-deletion +[message-editing-permissions]: /help/restrict-message-editing-and-deletion [topic-editing-permissions]: /help/configure-who-can-edit-topics [default-code-block-language]: /help/code-blocks#default-code-block-language [code-playgrounds]: /help/code-blocks#code-playgrounds diff --git a/help/include/import-get-your-organization-started.md b/help/include/import-get-your-organization-started.md index b805800f15..fdcc37acd6 100644 --- a/help/include/import-get-your-organization-started.md +++ b/help/include/import-get-your-organization-started.md @@ -5,7 +5,7 @@ Once the import process is completed, you will need to: 1. [Configure the settings for your organization](/help/customize-organization-settings), which are not exported. This includes settings like [email visibility](/help/restrict-visibility-of-email-addresses), [message editing - permissions](/help/configure-message-editing-and-deletion), + permissions](/help/restrict-message-editing-and-deletion), and [how users can join your organization](/help/restrict-account-creation). 2. All users from your previous workspace will have accounts in your new Zulip diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index f338dfbdd3..03cd9edc38 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -190,7 +190,7 @@ * [Restrict private messages](/help/restrict-private-messages) * [Restrict wildcard mentions](/help/restrict-wildcard-mentions) * [Restrict moving messages](/help/configure-who-can-edit-topics) -* [Restrict message editing](/help/configure-message-editing-and-deletion) +* [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) * [Hide message content in emails](/help/hide-message-content-in-emails) diff --git a/help/configure-message-editing-and-deletion.md b/help/restrict-message-editing-and-deletion.md similarity index 100% rename from help/configure-message-editing-and-deletion.md rename to help/restrict-message-editing-and-deletion.md diff --git a/help/view-a-messages-edit-history.md b/help/view-a-messages-edit-history.md index c07664c100..fdf4558139 100644 --- a/help/view-a-messages-edit-history.md +++ b/help/view-a-messages-edit-history.md @@ -38,5 +38,5 @@ Organization administrators can ## Related articles -* [Restrict message editing and deletion](/help/configure-message-editing-and-deletion) +* [Restrict message editing and deletion](/help/restrict-message-editing-and-deletion) * [Disable message edit history](/help/disable-message-edit-history) diff --git a/static/templates/settings/organization_permissions_admin.hbs b/static/templates/settings/organization_permissions_admin.hbs index 51d808da2d..8cc671f40a 100644 --- a/static/templates/settings/organization_permissions_admin.hbs +++ b/static/templates/settings/organization_permissions_admin.hbs @@ -143,7 +143,7 @@

{{t "Message editing" }} - {{> ../help_link_widget link="/help/configure-message-editing-and-deletion" }} + {{> ../help_link_widget link="/help/restrict-message-editing-and-deletion" }}

{{> settings_save_discard_widget section_name="msg-editing" }}
@@ -185,7 +185,7 @@

{{t "Moving messages" }} - {{> ../help_link_widget link="/help/configure-message-editing-and-deletion" }} + {{> ../help_link_widget link="/help/restrict-message-editing-and-deletion" }}

{{> settings_save_discard_widget section_name="moving-msgs" }}
diff --git a/templates/corporate/security.md b/templates/corporate/security.md index 6d21736b53..10777769ea 100644 --- a/templates/corporate/security.md +++ b/templates/corporate/security.md @@ -55,7 +55,7 @@ priority. [invite to streams](/help/configure-who-can-invite-to-streams), [add custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji), [add integrations and bots](/help/restrict-bot-creation), - [edit or delete messages](/help/configure-message-editing-and-deletion), + [edit or delete messages](/help/restrict-message-editing-and-deletion), and more. [waiting_period]: /help/restrict-permissions-of-new-members @@ -91,8 +91,8 @@ priority. ## Integrity and auditing -- Zulip owners and administrators can configure users’ - [ability to edit or delete messages](/help/configure-message-editing-and-deletion), +- Zulip owners and administrators can restrict users’ + [ability to edit or delete messages](/help/restrict-message-editing-and-deletion), and whether deleted messages are retained in the database or deleted permanently. Zulip by default stores the complete history of all message content on the platform, including edits and deletions, and all uploaded diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index c8cbbe35b8..513e6733be 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -21,6 +21,10 @@ POLICY_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ # Add URL redirects for help center documentation here: + URLRedirect( + "/help/configure-message-editing-and-deletion", + "/help/restrict-message-editing-and-deletion", + ), URLRedirect("/help/change-default-view", "/help/configure-default-view"), URLRedirect("/help/recent-topics", "/help/recent-conversations"), URLRedirect( diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 2b9ec32b5c..f674ee07c8 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -3803,7 +3803,7 @@ paths: allow_message_editing: type: boolean description: | - Whether this organizations [message edit policy](/help/configure-message-editing-and-deletion) + Whether this organizations [message edit policy](/help/restrict-message-editing-and-deletion) allows editing the content of messages. authentication_methods: type: object @@ -3826,7 +3826,7 @@ paths: description: | Messages sent more than this many seconds ago cannot have their topics edited by other users with this organization's - [message edit policy](/help/configure-message-editing-and-deletion). + [message edit policy](/help/restrict-message-editing-and-deletion). **Changes**: New in Zulip 3.0 (feature level 11). Previously this value was hardcoded to 86400 seconds (1 day). @@ -4016,7 +4016,7 @@ paths: description: | Messages sent more than this many seconds ago cannot be deleted with this organization's - [message deletion policy](/help/configure-message-editing-and-deletion). + [message deletion policy](/help/restrict-message-editing-and-deletion). Will not be 0. A 'null' value means no limit: messages can be deleted regardless of how long ago they were sent. @@ -4029,7 +4029,7 @@ paths: description: | Messages sent more than this many seconds ago cannot be edited with this organization's - [message edit policy](/help/configure-message-editing-and-deletion). + [message edit policy](/help/restrict-message-editing-and-deletion). **Changes**: No limit was represented using the special value `0` before Zulip 6.0 (feature level 138). @@ -6503,7 +6503,7 @@ paths: Before Zulip 7.0 (feature level 159), message senders were allowed to edit the topic indefinitely. - [config-message-editing]: /help/configure-message-editing-and-deletion + [config-message-editing]: /help/restrict-message-editing-and-deletion x-curl-examples-parameters: oneOf: - type: exclude @@ -12176,7 +12176,7 @@ paths: Messages sent more than this many seconds ago cannot be deleted with this organization's - [message deletion policy](/help/configure-message-editing-and-deletion). + [message deletion policy](/help/restrict-message-editing-and-deletion). Will not be 0. A 'null' value means no limit: messages can be deleted regardless of how long ago they were sent. @@ -12201,7 +12201,7 @@ paths: description: | Present if `realm` is present in `fetch_event_types`. - Whether this organizations [message edit policy](/help/configure-message-editing-and-deletion) + Whether this organizations [message edit policy](/help/restrict-message-editing-and-deletion) allows editing the content of messages. realm_edit_topic_policy: type: integer @@ -12231,7 +12231,7 @@ paths: Messages sent more than this many seconds ago cannot be edited with this organization's - [message edit policy](/help/configure-message-editing-and-deletion). + [message edit policy](/help/restrict-message-editing-and-deletion). Will not be 0. A 'null' value means no limit: messages can be edited regardless of how long ago they were sent. @@ -12277,7 +12277,7 @@ paths: Messages sent more than this many seconds ago cannot have their topics edited by other users with this organization's - [message edit policy](/help/configure-message-editing-and-deletion). + [message edit policy](/help/restrict-message-editing-and-deletion). **Changes**: New in Zulip 3.0 (feature level 11). Previously this value was hardcoded to 86400 seconds (1 day).