From 59dc5d1f534affcc3d4fc0d2e96fac62b9203e5e Mon Sep 17 00:00:00 2001
From: Alya Abbott <alya@zulip.com>
Date: Mon, 11 Dec 2023 23:05:06 -0800
Subject: [PATCH] help: Document setting to automatically follow topics when
 mentioned.

---
 help/follow-a-topic.md                      |  3 ++-
 help/include/automatically-follow-topics.md | 26 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/help/follow-a-topic.md b/help/follow-a-topic.md
index 3696b3ee79..0d451a797c 100644
--- a/help/follow-a-topic.md
+++ b/help/follow-a-topic.md
@@ -4,7 +4,8 @@ Zulip lets you follow topics you are interested in. You can follow or unfollow
 any topic. You can also configure Zulip to automatically follow topics you start
 or participate in. Participating in a topic means sending a message,
 [reacting](/help/emoji-reactions) with an emoji, or participating in a
-[poll](/help/create-a-poll).
+[poll](/help/create-a-poll). You can also automatically follow topics where you
+are [mentioned](/help/mention-a-user-or-group).
 
 It's easy to prioritize catching up on followed topics. You can:
 
diff --git a/help/include/automatically-follow-topics.md b/help/include/automatically-follow-topics.md
index acc6e89b80..5c356b39dd 100644
--- a/help/include/automatically-follow-topics.md
+++ b/help/include/automatically-follow-topics.md
@@ -1,3 +1,5 @@
+### Follow topics you start or participate in
+
 {start_tabs}
 
 {tab|desktop-web}
@@ -8,3 +10,27 @@
    **Automatically follow topics** dropdown.
 
 {end_tabs}
+
+### Follow topics where you are mentioned
+
+You can automatically follow topics where you are personally
+[mentioned](/help/mention-a-user-or-group). If this setting is enabled:
+
+- You will automatically follow topics where you are personally mentioned, but
+  group mentions and wildcard mentions (**@all**, **@topic**, etc.) will not
+  affect topic status.
+- You will automatically follow topics in [muted streams](/help/mute-a-stream)
+  when you are mentioned.
+- Mentions will *not* cause you to automatically follow topics you have
+  explicitly [muted](/help/mute-a-topic).
+
+{start_tabs}
+
+{tab|desktop-web}
+
+{settings_tab|notifications}
+
+1. Under **Topic notifications**, toggle **Automatically follow topics where I'm
+   mentioned**.
+
+{end_tabs}