From 0349152f0f490936b250f5b831f0c6cf55aa8b01 Mon Sep 17 00:00:00 2001 From: David Rosa Date: Tue, 18 Jul 2023 18:39:18 -0500 Subject: [PATCH] help: Rename edit-or-delete-a-message.md and update links. --- help/archive-a-stream.md | 3 ++- help/{edit-or-delete-a-message.md => delete-a-message.md} | 0 help/delete-a-topic.md | 3 ++- help/disable-message-edit-history.md | 5 +++-- help/edit-a-message.md | 2 +- help/getting-your-organization-started-with-zulip.md | 2 +- help/include/sidebar_index.md | 2 +- help/invite-users-to-join.md | 2 +- help/message-retention-policy.md | 5 +++-- help/restrict-message-editing-and-deletion.md | 3 ++- help/schedule-a-message.md | 3 ++- help/setting-up-zulip-for-a-class.md | 2 +- help/view-and-edit-your-message-drafts.md | 3 ++- help/view-the-markdown-source-of-a-message.md | 3 ++- zerver/lib/url_redirects.py | 1 + 15 files changed, 24 insertions(+), 15 deletions(-) rename help/{edit-or-delete-a-message.md => delete-a-message.md} (100%) diff --git a/help/archive-a-stream.md b/help/archive-a-stream.md index 540a2c9faf..cf38278ab8 100644 --- a/help/archive-a-stream.md +++ b/help/archive-a-stream.md @@ -34,6 +34,7 @@ than archiving them. ## Related articles -* [Edit or delete a message](/help/edit-or-delete-a-message) +* [Edit a message](/help/edit-a-message) +* [Delete a message](/help/delete-a-message) * [Delete a topic](/help/delete-a-topic) * [Message retention policy](/help/message-retention-policy) diff --git a/help/edit-or-delete-a-message.md b/help/delete-a-message.md similarity index 100% rename from help/edit-or-delete-a-message.md rename to help/delete-a-message.md diff --git a/help/delete-a-topic.md b/help/delete-a-topic.md index a58ea951e2..0fe72e4613 100644 --- a/help/delete-a-topic.md +++ b/help/delete-a-topic.md @@ -47,6 +47,7 @@ attribute of messages in Zulip. ## Related articles -* [Edit or delete a message](/help/edit-or-delete-a-message) +* [Edit a message](/help/edit-a-message) +* [Delete a message](/help/delete-a-message) * [Archive a stream](/help/archive-a-stream) * [Message retention policy](/help/message-retention-policy) diff --git a/help/disable-message-edit-history.md b/help/disable-message-edit-history.md index 84da239d37..bec07075cb 100644 --- a/help/disable-message-edit-history.md +++ b/help/disable-message-edit-history.md @@ -5,8 +5,9 @@ In Zulip, users can [view the edit history of a message](/help/view-a-messages-edit-history). To remove the edit history of a single message, it is usually best to -[delete the message](edit-or-delete-a-message) entirely. However, you can -also disable viewing of message edit history more generally. +[delete the message](/help/delete-a-message#delete-a-message-completely) +entirely. However, you can also disable viewing of message edit history more +generally. ### Disable message edit history diff --git a/help/edit-a-message.md b/help/edit-a-message.md index 0b54cdc723..591972794d 100644 --- a/help/edit-a-message.md +++ b/help/edit-a-message.md @@ -52,4 +52,4 @@ edit the content of a message sent by another user. * [View the Markdown source of a message](/help/view-the-markdown-source-of-a-message) * [Restrict message editing and deletion](/help/restrict-message-editing-and-deletion) -* [Delete a message](/help/edit-or-delete-a-message) +* [Delete a message](/help/delete-a-message) diff --git a/help/getting-your-organization-started-with-zulip.md b/help/getting-your-organization-started-with-zulip.md index 6efbd06e90..3317911424 100644 --- a/help/getting-your-organization-started-with-zulip.md +++ b/help/getting-your-organization-started-with-zulip.md @@ -91,7 +91,7 @@ stream](/help/create-a-stream#stream-options). Before inviting users, you may want to [delete any test messages][delete-message] or [topics](/help/delete-a-topic). -[delete-message]: /help/edit-or-delete-a-message#delete-a-message-completely +[delete-message]: /help/delete-a-message#delete-a-message-completely ### How to invite users to join diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 5ccd23abbe..2f37d20bc0 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -86,7 +86,7 @@ * [Preview messages before sending](/help/preview-your-message-before-sending) * [Verify a message was sent](/help/verify-your-message-was-successfully-sent) * [Edit a message](/help/edit-a-message) -* [Delete a message](/help/edit-or-delete-a-message) +* [Delete a message](/help/delete-a-message) * [Draft messages](/help/view-and-edit-your-message-drafts) * [Schedule a message](/help/schedule-a-message) * [Message a stream by email](/help/message-a-stream-by-email) diff --git a/help/invite-users-to-join.md b/help/invite-users-to-join.md index 9a3de612f8..517c81f6ca 100644 --- a/help/invite-users-to-join.md +++ b/help/invite-users-to-join.md @@ -4,7 +4,7 @@ Before inviting users, you may want to [delete any test messages][delete-message] or [topics](/help/delete-a-topic). -[delete-message]: /help/edit-or-delete-a-message#delete-a-message-completely +[delete-message]: /help/delete-a-message#delete-a-message-completely ## How to invite users to join diff --git a/help/message-retention-policy.md b/help/message-retention-policy.md index c28990003b..5d5655ee40 100644 --- a/help/message-retention-policy.md +++ b/help/message-retention-policy.md @@ -64,11 +64,12 @@ Standard hosting. if you discover a misconfiguration accidentally deleted content you meant to preserve, contact Zulip support promptly for assistance with restoration. See the [deletion -documentation](/help/edit-or-delete-a-message#delete-a-message-completely) for +documentation](/help/delete-a-message#delete-a-message-completely) for more details on precisely how message deletion works in Zulip. ## Related articles -* [Edit or delete a message](/help/edit-or-delete-a-message) +* [Edit a message](/help/edit-a-message) +* [Delete a message](/help/delete-a-message) * [Delete a topic](/help/delete-a-topic) * [Archive a stream](/help/archive-a-stream) diff --git a/help/restrict-message-editing-and-deletion.md b/help/restrict-message-editing-and-deletion.md index 766e9b9731..75d30d7941 100644 --- a/help/restrict-message-editing-and-deletion.md +++ b/help/restrict-message-editing-and-deletion.md @@ -54,7 +54,8 @@ irretrievably) removes the message from Zulip. ## Related articles -* [Edit or delete a message](/help/edit-or-delete-a-message) +* [Edit a message](/help/edit-a-message) +* [Delete a message](/help/delete-a-message) * [Delete a topic](/help/delete-a-topic) * [Disable message edit history](/help/disable-message-edit-history) * [Configure message retention policy](/help/message-retention-policy) diff --git a/help/schedule-a-message.md b/help/schedule-a-message.md index 20082a0135..73467e2d81 100644 --- a/help/schedule-a-message.md +++ b/help/schedule-a-message.md @@ -115,4 +115,5 @@ can schedule a message for next morning to avoid disturbing others. * [Message drafts](/help/view-and-edit-your-message-drafts) * [Preview messages before sending](/help/preview-your-message-before-sending) * [Verify a message was sent](/help/verify-your-message-was-successfully-sent) -* [Edit or delete a message](/help/edit-or-delete-a-message) +* [Edit a message](/help/edit-a-message) +* [Delete a message](/help/delete-a-message) diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md index 26e1fc1bb7..c542f438c7 100644 --- a/help/setting-up-zulip-for-a-class.md +++ b/help/setting-up-zulip-for-a-class.md @@ -272,7 +272,7 @@ A few notes: Before inviting users, you may want to [delete any test messages][delete-message] or [topics](/help/delete-a-topic). -[delete-message]: /help/edit-or-delete-a-message#delete-a-message-completely +[delete-message]: /help/delete-a-message#delete-a-message-completely ### How to invite users to join diff --git a/help/view-and-edit-your-message-drafts.md b/help/view-and-edit-your-message-drafts.md index 18395fdca3..eaaf4e9e3a 100644 --- a/help/view-and-edit-your-message-drafts.md +++ b/help/view-and-edit-your-message-drafts.md @@ -88,4 +88,5 @@ saved for 30 days. * [Schedule a message](/help/schedule-a-message) * [Preview messages before sending](/help/preview-your-message-before-sending) * [Verify a message was sent](/help/verify-your-message-was-successfully-sent) -* [Edit or delete a message](/help/edit-or-delete-a-message) +* [Edit a message](/help/edit-a-message) +* [Delete a message](/help/delete-a-message) diff --git a/help/view-the-markdown-source-of-a-message.md b/help/view-the-markdown-source-of-a-message.md index e209633e6f..657581783d 100644 --- a/help/view-the-markdown-source-of-a-message.md +++ b/help/view-the-markdown-source-of-a-message.md @@ -52,4 +52,5 @@ formatted, or to copy the Markdown source for a reply. ## Related articles * [Message formatting](/help/format-your-message-using-markdown) -* [Edit or delete a message](/help/edit-or-delete-a-message) +* [Edit a message](/help/edit-a-message) +* [Delete a message](/help/delete-a-message) diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index 80285a41e9..c04f94c98e 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -75,6 +75,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ URLRedirect("/help/enable-emoticon-translations", "/help/configure-emoticon-translations"), URLRedirect("/help/web-public-streams", "/help/public-access-option"), URLRedirect("/help/starting-a-new-private-thread", "/help/starting-a-new-direct-message"), + URLRedirect("/help/edit-or-delete-a-message", "/help/delete-a-message"), ] LANDING_PAGE_REDIRECTS = [