From 19551c0cf38b5885727929e8816be75ec21362c0 Mon Sep 17 00:00:00 2001
From: Alya Abbott <alya@zulip.com>
Date: Mon, 8 Jul 2024 15:11:44 -0700
Subject: [PATCH] help: Document channel feed and left sidebar channel links
 setting.

---
 help/channel-feed.md                    | 34 +++++++++++++++++++++++++
 help/combined-feed.md                   |  3 +++
 help/include/configure-channel-links.md | 14 ++++++++++
 help/include/sidebar_index.md           |  1 +
 4 files changed, 52 insertions(+)
 create mode 100644 help/channel-feed.md
 create mode 100644 help/include/configure-channel-links.md

diff --git a/help/channel-feed.md b/help/channel-feed.md
new file mode 100644
index 0000000000..96b4bc555a
--- /dev/null
+++ b/help/channel-feed.md
@@ -0,0 +1,34 @@
+# Channel feed
+
+The **Channel feed** is a feed of all the topics that you have not
+[muted](/help/mute-a-topic) in a particular channel. It's a great way to get a
+quick overview of recent messages in a channel.
+
+## Go to channel feed
+
+{start_tabs}
+
+{tab|desktop-web}
+
+{!channel-actions.md!}
+
+1. Click **Go to channel feed**. If you do not see this option, Zulip is
+   [configured](#configure-where-channel-links-in-the-left-sidebar-go) so that
+   clicking on the channel name in the left sidebar will take you directly to
+   the channel feed.
+
+!!! keyboard_tip ""
+
+    Use <kbd>S</kbd> to go from a topic view to the channel feed.
+
+{end_tabs}
+
+## Configure where channel links in the left sidebar go
+
+{!configure-channel-links.md!}
+
+## Related articles
+
+* [Combined feed](/help/combined-feed)
+* [Reading strategies](/help/reading-strategies)
+* [Reading conversations](/help/reading-conversations)
diff --git a/help/combined-feed.md b/help/combined-feed.md
index 630b4aaa97..6dce50640f 100644
--- a/help/combined-feed.md
+++ b/help/combined-feed.md
@@ -10,8 +10,11 @@
 
 
 ## Related articles
+
 * [Reading strategies](/help/reading-strategies)
 * [Inbox](/help/inbox)
 * [Recent conversations](/help/recent-conversations)
 * [Configure home view](/help/configure-home-view)
 * [Reading conversations](/help/reading-conversations)
+* [Channel feed](/help/channel-feed)
+
diff --git a/help/include/configure-channel-links.md b/help/include/configure-channel-links.md
new file mode 100644
index 0000000000..ffc48f9505
--- /dev/null
+++ b/help/include/configure-channel-links.md
@@ -0,0 +1,14 @@
+You can configure whether channel links in the [left
+sidebar](/help/left-sidebar) go to the channel feed, or to the top topic in the
+channel.
+
+{start_tabs}
+
+{tab|desktop-web}
+
+{settings_tab|preferences}
+
+1. Under **Advanced**, select your preferred option from the
+   **Channel links in the left sidebar go to** dropdown.
+
+{end_tabs}
diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md
index cf437f4e08..5657127f95 100644
--- a/help/include/sidebar_index.md
+++ b/help/include/sidebar_index.md
@@ -97,6 +97,7 @@
 * [Inbox](/help/inbox)
 * [Recent conversations](/help/recent-conversations)
 * [Combined feed](/help/combined-feed)
+* [Channel feed](/help/channel-feed)
 * [Left sidebar](/help/left-sidebar)
 * [Message actions](/help/message-actions)
 * [Marking messages as read](/help/marking-messages-as-read)