From ba196cfd6bc7f081a6add5741c83e49cf96aaf5d Mon Sep 17 00:00:00 2001 From: nimishmedatwal Date: Wed, 24 Apr 2024 00:29:38 +0530 Subject: [PATCH] help: Change URL from all-messages to combined-feed. Changes url from /help/all-messages to /help/combined-feed. Also renames files "all-messages.md" and "go-to-all-messages.md" to "combined-feed.md" and "go-to-combined-feed.md" respectively. Fixes #27802. --- help/{all-messages.md => combined-feed.md} | 2 +- help/configure-home-view.md | 6 +++--- help/inbox.md | 2 +- help/include/{all-messages.md => combined-feed.md} | 2 +- .../{go-to-all-messages.md => go-to-combined-feed.md} | 0 help/include/mute-unmute-intro.md | 2 +- help/include/sidebar_index.md | 2 +- help/marking-messages-as-read.md | 4 ++-- help/reading-strategies.md | 2 +- help/recent-conversations.md | 2 +- zerver/lib/markdown/help_relative_links.py | 2 +- zerver/lib/url_redirects.py | 1 + 12 files changed, 14 insertions(+), 13 deletions(-) rename help/{all-messages.md => combined-feed.md} (95%) rename help/include/{all-messages.md => combined-feed.md} (95%) rename help/include/{go-to-all-messages.md => go-to-combined-feed.md} (100%) diff --git a/help/all-messages.md b/help/combined-feed.md similarity index 95% rename from help/all-messages.md rename to help/combined-feed.md index 9d1fb9f088..13f458d75b 100644 --- a/help/all-messages.md +++ b/help/combined-feed.md @@ -1,6 +1,6 @@ # Combined feed -{!all-messages.md!} +{!combined-feed.md!} !!! keyboard_tip "" diff --git a/help/configure-home-view.md b/help/configure-home-view.md index 03ba76d8a5..b651d2db8e 100644 --- a/help/configure-home-view.md +++ b/help/configure-home-view.md @@ -7,7 +7,7 @@ keyboard shortcuts. The home views available in Zulip are [**Inbox**](/help/inbox), [Recent conversations](/help/recent-conversations), and -[Combined feed](/help/all-messages). See +[Combined feed](/help/combined-feed). See [Reading strategies](/help/reading-strategies) for recommendations on how to use these views. @@ -22,7 +22,7 @@ Organization administrators can [configure the home view for their organization](/help/configure-default-new-user-settings) to [**Inbox**](/help/inbox), [**Recent conversations**](/help/recent-conversations), or -[**Combined feed**](/help/all-messages). +[**Combined feed**](/help/combined-feed). - The **Inbox** view works best if you regularly clear all unread messages in streams you follow. @@ -80,5 +80,5 @@ shortcut. * [Reading strategies](/help/reading-strategies) * [Recent conversations](/help/recent-conversations) -* [Combined feed](/help/all-messages) +* [Combined feed](/help/combined-feed) * [Keyboard shortcuts](/help/keyboard-shortcuts) diff --git a/help/inbox.md b/help/inbox.md index 0cd778437f..d6709ada6b 100644 --- a/help/inbox.md +++ b/help/inbox.md @@ -51,7 +51,7 @@ In the web app, you can control whether the **Inbox** includes all topics, just * [Reading strategies](/help/reading-strategies) * [Recent conversations](/help/recent-conversations) -* [Combined feed](/help/all-messages) +* [Combined feed](/help/combined-feed) * [Mute or unmute a stream](/help/mute-a-stream) * [Mute or unmute a topic](/help/mute-a-topic) * [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams) diff --git a/help/include/all-messages.md b/help/include/combined-feed.md similarity index 95% rename from help/include/all-messages.md rename to help/include/combined-feed.md index 364a80974d..f4bc58c8aa 100644 --- a/help/include/all-messages.md +++ b/help/include/combined-feed.md @@ -9,7 +9,7 @@ view](/help/configure-home-view#configure-home-view) for the Zulip web app. {tab|desktop-web} -{!go-to-all-messages.md!} +{!go-to-combined-feed.md!} {tab|mobile} diff --git a/help/include/go-to-all-messages.md b/help/include/go-to-combined-feed.md similarity index 100% rename from help/include/go-to-all-messages.md rename to help/include/go-to-combined-feed.md diff --git a/help/include/mute-unmute-intro.md b/help/include/mute-unmute-intro.md index ec48c36b39..fe022aba4f 100644 --- a/help/include/mute-unmute-intro.md +++ b/help/include/mute-unmute-intro.md @@ -9,7 +9,7 @@ Muting has the following effects: word](/help/dm-mention-alert-notifications#alert-words) notifications), unless you are [mentioned](/help/mention-a-user-or-group). - Messages in muted topics do not appear in the [**Combined feed** - view](/help/all-messages) or the mobile **Inbox** view. + view](/help/combined-feed) or the mobile **Inbox** view. - Muted topics appear in the [**Recent conversations** view](/help/recent-conversations) only if the **Include muted** filter is enabled. diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 279b1d26f0..b891cfadc7 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -96,7 +96,7 @@ * [Reading strategies](/help/reading-strategies) * [Inbox](/help/inbox) * [Recent conversations](/help/recent-conversations) -* [Combined feed](/help/all-messages) +* [Combined feed](/help/combined-feed) * [Message actions](/help/message-actions) * [Marking messages as read](/help/marking-messages-as-read) * [Marking messages as unread](/help/marking-messages-as-unread) diff --git a/help/marking-messages-as-read.md b/help/marking-messages-as-read.md index 9696f0b102..21106554a8 100644 --- a/help/marking-messages-as-read.md +++ b/help/marking-messages-as-read.md @@ -22,8 +22,8 @@ web/desktop app. - **Only in conversation views**: In Zulip, a **conversation** is a [direct message](/help/direct-messages) thread (one-on-one or with a group), or a [topic in a stream](/help/streams-and-topics). This option makes it convenient - to preview new messages in a stream, or skim [All - messages](/help/all-messages), and later read each topic in detail. + to preview new messages in a stream, or skim [Combined + feed](/help/combined-feed), and later read each topic in detail. {start_tabs} diff --git a/help/reading-strategies.md b/help/reading-strategies.md index 28e426b005..88175c2e4b 100644 --- a/help/reading-strategies.md +++ b/help/reading-strategies.md @@ -47,7 +47,7 @@ workflows: ### Combined feed -{!all-messages.md!} +{!combined-feed.md!} ### Direct message feed diff --git a/help/recent-conversations.md b/help/recent-conversations.md index 2a60bc9e4f..1bd98a8a75 100644 --- a/help/recent-conversations.md +++ b/help/recent-conversations.md @@ -37,5 +37,5 @@ containing the most recent messages. * [Reading conversations](/help/reading-conversations) * [Reading strategies](/help/reading-strategies) * [Inbox](/help/inbox) -* [Combined feed](/help/all-messages) +* [Combined feed](/help/combined-feed) * [Configure home view](/help/configure-home-view) diff --git a/zerver/lib/markdown/help_relative_links.py b/zerver/lib/markdown/help_relative_links.py index 8ec63ab526..b31f760ddf 100644 --- a/zerver/lib/markdown/help_relative_links.py +++ b/zerver/lib/markdown/help_relative_links.py @@ -181,7 +181,7 @@ message_info = { "drafts": ["Drafts", "/#drafts", draft_instructions], "scheduled": ["Scheduled messages", "/#scheduled", scheduled_instructions], "recent": ["Recent conversations", "/#recent", recent_instructions], - "all": ["Combined feed", "/#all_messages", all_instructions], + "all": ["Combined feed", "/#feed", all_instructions], "starred": ["Starred messages", "/#narrow/is/starred", starred_instructions], "direct": ["Direct message feed", "/#narrow/is/dm", direct_instructions], "inbox": ["Inbox", "/#inbox", inbox_instructions], diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index 38041435a5..8690c540fe 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -83,6 +83,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ URLRedirect("/help/view-and-browse-images", "/help/view-images-and-videos"), URLRedirect("/help/bots-and-integrations", "/help/bots-overview"), URLRedirect("/help/configure-notification-bot", "/help/configure-automated-notices"), + URLRedirect("/help/all-messages", "/help/combined-feed"), ] LANDING_PAGE_REDIRECTS = [