From ccf1dbfacd2b9c46ae54e75ebb9939c2ca1afcfc Mon Sep 17 00:00:00 2001
From: David Rosa <rosatamsen@gmail.com>
Date: Sat, 21 Oct 2023 15:49:37 -0700
Subject: [PATCH] help: Document settings to automatically unmute/follow
 topics.

- Adds a "Topic notifications" page, just under "Stream notifications"
  in the left sidebar, using Markdown include blocks for reusability
  in `follow-a-topic.md` and `mute-a-topic.md`.
- Adds a tip block to clarify that disabling followed topic global
  settings will not stop notifications if you already have stream
  level settings enabled.

Fixes part of #27297.
---
 help/follow-a-topic.md                        | 10 +++----
 help/include/automatically-follow-topics.md   | 10 +++++++
 ...atically-unmute-topics-in-muted-streams.md | 10 +++++++
 ...igure-notifications-for-followed-topics.md | 15 +++++++++++
 help/include/sidebar_index.md                 |  1 +
 help/mute-a-topic.md                          |  5 ++++
 help/topic-notifications.md                   | 27 +++++++++++++++++++
 7 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 help/include/automatically-follow-topics.md
 create mode 100644 help/include/automatically-unmute-topics-in-muted-streams.md
 create mode 100644 help/include/configure-notifications-for-followed-topics.md
 create mode 100644 help/topic-notifications.md

diff --git a/help/follow-a-topic.md b/help/follow-a-topic.md
index f7f90f0da3..2dbd72b535 100644
--- a/help/follow-a-topic.md
+++ b/help/follow-a-topic.md
@@ -18,14 +18,11 @@ In muted streams, topics you follow are automatically treated as
 
 ## Configure notifications for followed topics
 
-{start_tabs}
+{!configure-notifications-for-followed-topics.md!}
 
-{settings_tab|notifications}
+## Automatically follow topics
 
-1. In the **Notification triggers** table,
-   toggle the settings for **Followed topics**.
-
-{end_tabs}
+{!automatically-follow-topics.md!}
 
 ## Manage configured topics
 
@@ -39,6 +36,7 @@ In muted streams, topics you follow are automatically treated as
 
 ## Related articles
 
+* [Topic notifications](/help/topic-notifications)
 * [Stream notifications](/help/stream-notifications)
 * [Mute or unmute a topic](/help/mute-a-topic)
 * [Mute or unmute a stream](/help/mute-a-stream)
diff --git a/help/include/automatically-follow-topics.md b/help/include/automatically-follow-topics.md
new file mode 100644
index 0000000000..acc6e89b80
--- /dev/null
+++ b/help/include/automatically-follow-topics.md
@@ -0,0 +1,10 @@
+{start_tabs}
+
+{tab|desktop-web}
+
+{settings_tab|notifications}
+
+1. Under **Topic notifications**, select the desired option from the
+   **Automatically follow topics** dropdown.
+
+{end_tabs}
diff --git a/help/include/automatically-unmute-topics-in-muted-streams.md b/help/include/automatically-unmute-topics-in-muted-streams.md
new file mode 100644
index 0000000000..6b3f6ffe7b
--- /dev/null
+++ b/help/include/automatically-unmute-topics-in-muted-streams.md
@@ -0,0 +1,10 @@
+{start_tabs}
+
+{tab|desktop-web}
+
+{settings_tab|notifications}
+
+1. Under **Topic notifications**, select the desired option from the
+   **Automatically unmute topics in muted streams** dropdown.
+
+{end_tabs}
diff --git a/help/include/configure-notifications-for-followed-topics.md b/help/include/configure-notifications-for-followed-topics.md
new file mode 100644
index 0000000000..5169f0d559
--- /dev/null
+++ b/help/include/configure-notifications-for-followed-topics.md
@@ -0,0 +1,15 @@
+{start_tabs}
+
+{tab|desktop-web}
+
+{settings_tab|notifications}
+
+1. In the **Notification triggers** table,
+   toggle the settings for **Followed topics**.
+
+{end_tabs}
+
+!!! tip ""
+
+    You will receive both followed topics notifications and
+    [stream notifications](/help/stream-notifications) in topics you follow.
diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md
index eddaca2006..3f4d120891 100644
--- a/help/include/sidebar_index.md
+++ b/help/include/sidebar_index.md
@@ -137,6 +137,7 @@
 
 ## Notifications
 * [Stream notifications](/help/stream-notifications)
+* [Topic notifications](/help/topic-notifications)
 * [Follow a topic](/help/follow-a-topic)
 * [DMs, mentions, and alerts](/help/dm-mention-alert-notifications)
 * [Mute or unmute a stream](/help/mute-a-stream)
diff --git a/help/mute-a-topic.md b/help/mute-a-topic.md
index 84cf955265..100aa4d5ac 100644
--- a/help/mute-a-topic.md
+++ b/help/mute-a-topic.md
@@ -6,6 +6,10 @@
 
 {!configure-topic-notifications.md!}
 
+## Automatically unmute topics in muted streams
+
+{!automatically-unmute-topics-in-muted-streams.md!}
+
 ## Manage configured topics
 
 {!manage-configured-topics.md!}
@@ -14,4 +18,5 @@
 
 * [Mute or unmute a stream](/help/mute-a-stream)
 * [Follow a topic](/help/follow-a-topic)
+* [Topic notifications](/help/topic-notifications)
 * [Mute a user](/help/mute-a-user)
diff --git a/help/topic-notifications.md b/help/topic-notifications.md
new file mode 100644
index 0000000000..5c9bf6f951
--- /dev/null
+++ b/help/topic-notifications.md
@@ -0,0 +1,27 @@
+# Topic notifications
+
+In Zulip, you can configure how you get notified about new messages for topics
+you follow.
+
+In muted streams, topics you follow are automatically treated as
+[unmuted](/help/mute-a-topic), and you can configure when to automatically
+unmute topics.
+
+## Configure notifications for followed topics
+
+{!configure-notifications-for-followed-topics.md!}
+
+## Automatically follow topics
+
+{!automatically-follow-topics.md!}
+
+## Automatically unmute topics in muted streams
+
+{!automatically-unmute-topics-in-muted-streams.md!}
+
+## Related articles
+
+* [Follow a topic](/help/follow-a-topic)
+* [Stream notifications](/help/stream-notifications)
+* [Mute or unmute a topic](/help/mute-a-topic)
+* [Mute or unmute a stream](/help/mute-a-stream)