From 4908f1c5dc556a5ea2c114d05d58e8d5505082d5 Mon Sep 17 00:00:00 2001 From: Lauryn Menard Date: Wed, 1 May 2024 19:47:14 +0200 Subject: [PATCH] help: Rename and redirect stream-notifications for channel. --- docs/overview/changelog.md | 2 +- ...ifications.md => channel-notifications.md} | 28 +++++++++---------- help/configure-default-new-user-settings.md | 2 +- help/desktop-notifications.md | 6 ++-- help/dm-mention-alert-notifications.md | 4 +-- help/do-not-disturb.md | 2 +- help/email-notifications.md | 4 +-- help/follow-a-topic.md | 2 +- ...igure-notifications-for-followed-topics.md | 3 +- help/include/sidebar_index.md | 2 +- help/mention-a-user-or-group.md | 4 +-- help/mobile-notifications.md | 4 +-- help/topic-notifications.md | 2 +- help/using-zulip-for-a-class.md | 2 +- templates/corporate/for/business.html | 2 +- templates/corporate/for/education.html | 2 +- templates/corporate/for/events.html | 2 +- templates/corporate/for/open-source.html | 2 +- templates/corporate/for/research.html | 2 +- templates/corporate/why-zulip.md | 2 +- zerver/lib/url_redirects.py | 1 + 21 files changed, 41 insertions(+), 39 deletions(-) rename help/{stream-notifications.md => channel-notifications.md} (62%) diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md index 664c4b85f5..d3ebcc0253 100644 --- a/docs/overview/changelog.md +++ b/docs/overview/changelog.md @@ -734,7 +734,7 @@ _Released 2023-01-23_ “[delay before sending message notification emails](https://zulip.com/help/email-notifications#delay-before-sending-emails)” setting. - Fixed an error which prevented users from changing - [stream-specific notification settings](https://zulip.com/help/stream-notifications#set-notifications-for-a-single-stream). + [stream-specific notification settings](https://zulip.com/help/stream-notifications#configure-notifications-for-a-single-stream). - Fixed the redirect from `/apps` to https://zulip.com/apps/. - Started preserving timezone information in [Rocket.Chat imports](https://zulip.com/help/import-from-rocketchat). diff --git a/help/stream-notifications.md b/help/channel-notifications.md similarity index 62% rename from help/stream-notifications.md rename to help/channel-notifications.md index e6953f77e9..d90fe7521b 100644 --- a/help/stream-notifications.md +++ b/help/channel-notifications.md @@ -1,12 +1,12 @@ -# Stream notifications +# Channel notifications -You can configure desktop, mobile, and email notifications on a stream by -stream basis. +You can configure desktop, mobile, and email notifications on a channel by +channel basis. -## Configure notifications for a single stream +## Configure notifications for a single channel -These settings will override any default stream notification settings. In [muted -streams](/help/mute-a-stream), stream notification settings apply only to +These settings will override any default channel notification settings. In [muted +channels](/help/mute-a-stream), channel notification settings apply only to [unmuted topics](/help/mute-a-topic). {start_tabs} @@ -15,18 +15,18 @@ streams](/help/mute-a-stream), stream notification settings apply only to {!stream-actions.md!} -1. Click **Stream settings**. +1. Click **Channel settings**. {!select-channel-view-personal.md!} 1. Under **Notification settings**, toggle your preferred - notifications settings for the stream. + notifications settings for the channel. {tab|mobile} {!stream-long-press-menu.md!} -1. Tap **Stream settings**. +1. Tap **Channel settings**. 1. Toggle **Notifications**. @@ -34,9 +34,9 @@ streams](/help/mute-a-stream), stream notification settings apply only to {end_tabs} -## Configure default notifications for all streams +## Configure default notifications for all channels -These settings only apply to streams where you have not +These settings only apply to channels where you have not explicitly set a notification preference. {start_tabs} @@ -46,7 +46,7 @@ explicitly set a notification preference. {settings_tab|notifications} 1. In the **Notification triggers** table, - toggle the settings for **Streams**. + toggle the settings for **Channels**. {tab|mobile} @@ -56,8 +56,8 @@ explicitly set a notification preference. 1. Tap **Notifications**. -1. Toggle **Stream notifications** to configure mobile push notifications for - stream messages. +1. Toggle **Channel notifications** to configure mobile push notifications for + channel messages. {end_tabs} diff --git a/help/configure-default-new-user-settings.md b/help/configure-default-new-user-settings.md index 0990d6f210..74064be04d 100644 --- a/help/configure-default-new-user-settings.md +++ b/help/configure-default-new-user-settings.md @@ -35,7 +35,7 @@ preference settings, including the following: minimizes the need to [mention](/help/mention-a-user-or-group) other users to get their attention. -[default-notifications]: /help/stream-notifications#configure-default-notifications-for-all-streams +[default-notifications]: /help/channel-notifications#configure-default-notifications-for-all-channels ## Configure default settings for new users diff --git a/help/desktop-notifications.md b/help/desktop-notifications.md index 1736b148cc..4b158bb36d 100644 --- a/help/desktop-notifications.md +++ b/help/desktop-notifications.md @@ -1,7 +1,7 @@ # Desktop notifications Zulip offers visual and audible desktop notifications. You can -customize whether [stream messages](/help/stream-notifications), +customize whether [channel messages](/help/channel-notifications), [direct messages](/help/dm-mention-alert-notifications) and [mentions](/help/dm-mention-alert-notifications#wildcard-mentions) trigger desktop notifications. @@ -69,7 +69,7 @@ and [mentions](/help/mention-a-user-or-group), or to include messages in First, make sure you have enabled [desktop notifications for DMs](/help/dm-mention-alert-notifications) or for the -[stream](/help/stream-notifications) you are testing with. +[channel](/help/channel-notifications) you are testing with. Desktop notifications are triggered when a message arrives, and Zulip is not in focus or the message is offscreen. You must have Zulip open in a browser @@ -143,7 +143,7 @@ Alternate instructions: ## Related articles -* [Stream notifications](/help/stream-notifications) +* [Channel notifications](/help/channel-notifications) * [DMs, mentions, and alerts](/help/dm-mention-alert-notifications) * [Email notifications](/help/email-notifications) * [Mobile notifications](/help/mobile-notifications) diff --git a/help/dm-mention-alert-notifications.md b/help/dm-mention-alert-notifications.md index e51a91de41..ec0dc0eda3 100644 --- a/help/dm-mention-alert-notifications.md +++ b/help/dm-mention-alert-notifications.md @@ -50,7 +50,7 @@ for wildcard mentions. {end_tabs} Additionally, you can override this configuration for individual -streams in your [Stream settings](/help/stream-notifications), and +streams in your [Channel settings](/help/channel-notifications), and administrators can [restrict use of wildcard mentions](/help/restrict-wildcard-mentions) in large streams. @@ -82,6 +82,6 @@ case-insensitive. * [Email notifications](/help/email-notifications) * [Mobile notifications](/help/mobile-notifications) * [Restrict wildcard mentions](/help/restrict-wildcard-mentions) -* [Stream notifications](/help/stream-notifications) +* [Channel notifications](/help/channel-notifications) * [View your mentions](/help/view-your-mentions) * [Do not disturb](/help/do-not-disturb) diff --git a/help/do-not-disturb.md b/help/do-not-disturb.md index 8e01669eef..be075e3ede 100644 --- a/help/do-not-disturb.md +++ b/help/do-not-disturb.md @@ -51,6 +51,6 @@ time to focus on your work. * [Desktop notifications](/help/desktop-notifications) * [DMs, mentions, and alerts](/help/dm-mention-alert-notifications) -* [Stream notifications](/help/stream-notifications) +* [Channel notifications](/help/channel-notifications) * [Email notifications](/help/email-notifications) * [Mobile notifications](/help/mobile-notifications) diff --git a/help/email-notifications.md b/help/email-notifications.md index 1f91468dfe..d735ef4470 100644 --- a/help/email-notifications.md +++ b/help/email-notifications.md @@ -4,7 +4,7 @@ Zulip can be configured to send message notification emails for [DMs and mentions](/help/dm-mention-alert-notifications), as well as -[stream messages](/help/stream-notifications). +[channel messages](/help/channel-notifications). {start_tabs} @@ -135,5 +135,5 @@ to Zulip Cloud users announcing major changes in Zulip. * [Using Zulip via email](/help/using-zulip-via-email) * [Message a channel by email](/help/message-a-channel-by-email) -* [Stream notifications](/help/stream-notifications) +* [Channel notifications](/help/channel-notifications) * [Hide message content in emails (for organizations)](/help/hide-message-content-in-emails) diff --git a/help/follow-a-topic.md b/help/follow-a-topic.md index 0d451a797c..8d593f8f89 100644 --- a/help/follow-a-topic.md +++ b/help/follow-a-topic.md @@ -88,6 +88,6 @@ messages just in followed topics, without counting other stream messages. * [Reading strategies](/help/reading-strategies) * [Topic notifications](/help/topic-notifications) -* [Stream notifications](/help/stream-notifications) +* [Channel notifications](/help/channel-notifications) * [Mute or unmute a topic](/help/mute-a-topic) * [Mute or unmute a stream](/help/mute-a-stream) diff --git a/help/include/configure-notifications-for-followed-topics.md b/help/include/configure-notifications-for-followed-topics.md index 5169f0d559..1f03b70565 100644 --- a/help/include/configure-notifications-for-followed-topics.md +++ b/help/include/configure-notifications-for-followed-topics.md @@ -12,4 +12,5 @@ !!! tip "" You will receive both followed topics notifications and - [stream notifications](/help/stream-notifications) in topics you follow. + [channel notifications](/help/channel-notifications) in + topics you follow. diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index d3b46a23ba..9ecb8204dd 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -142,7 +142,7 @@ * [Manage inactive channels](/help/manage-inactive-channels) ## Notifications -* [Stream notifications](/help/stream-notifications) +* [Channel notifications](/help/channel-notifications) * [Topic notifications](/help/topic-notifications) * [Follow a topic](/help/follow-a-topic) * [DMs, mentions, and alerts](/help/dm-mention-alert-notifications) diff --git a/help/mention-a-user-or-group.md b/help/mention-a-user-or-group.md index dcb9306f2c..b483bee0f9 100644 --- a/help/mention-a-user-or-group.md +++ b/help/mention-a-user-or-group.md @@ -66,7 +66,7 @@ Users can disable notifications for `@**topic**` mentions by: - Disabling notifications for wildcard mentions [globally](/help/dm-mention-alert-notifications) or for [individual -streams](/help/stream-notifications). +channels](/help/channel-notifications). - Muting the [topic](/help/mute-a-topic) or [stream](/help/mute-a-stream). @@ -83,7 +83,7 @@ Users can disable notifications for `@**all**`, `@**everyone**`, and - Disabling notifications for wildcard mentions [globally](/help/dm-mention-alert-notifications) or for [individual -streams](/help/stream-notifications). +channels](/help/channel-notifications). - Muting the [topic](/help/mute-a-topic) or [stream](/help/mute-a-stream). diff --git a/help/mobile-notifications.md b/help/mobile-notifications.md index 3f8d56265b..b9d8db437b 100644 --- a/help/mobile-notifications.md +++ b/help/mobile-notifications.md @@ -1,6 +1,6 @@ # Mobile notifications -You can customize whether [stream messages](/help/stream-notifications), +You can customize whether [channel messages](/help/channel-notifications), [direct messages](/help/dm-mention-alert-notifications) and [mentions][notifications-wildcard-mentions] trigger notifications in Zulip's [Android](https://zulip.com/apps/ios) and [iOS](https://zulip.com/apps/ios) @@ -237,7 +237,7 @@ troubleshooting data provided by the mobile app. ## Related articles -* [Stream notifications](/help/stream-notifications) +* [Channel notifications](/help/channel-notifications) * [DMs, mentions, and alerts](/help/dm-mention-alert-notifications) * [Email notifications](/help/email-notifications) * [Desktop notifications](/help/desktop-notifications) diff --git a/help/topic-notifications.md b/help/topic-notifications.md index 5c9bf6f951..9f64b3c2fa 100644 --- a/help/topic-notifications.md +++ b/help/topic-notifications.md @@ -22,6 +22,6 @@ unmute topics. ## Related articles * [Follow a topic](/help/follow-a-topic) -* [Stream notifications](/help/stream-notifications) +* [Channel notifications](/help/channel-notifications) * [Mute or unmute a topic](/help/mute-a-topic) * [Mute or unmute a stream](/help/mute-a-stream) diff --git a/help/using-zulip-for-a-class.md b/help/using-zulip-for-a-class.md index 65491249e8..ab42c65d6a 100644 --- a/help/using-zulip-for-a-class.md +++ b/help/using-zulip-for-a-class.md @@ -17,7 +17,7 @@ single place for: ## Posting lecture notes and announcements !!! tip "" - [Subscribe to email notifications](/help/stream-notifications) for + [Subscribe to email notifications](/help/channel-notifications) for streams such as **#announcements** to make sure you never miss an important message. Many classes use a dedicated stream to post general announcements, e.g.: diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index a24a17c004..70cee45395 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -511,7 +511,7 @@ required. -
  • Zulip alerts you about timely messages with fully customizable mobile, email and desktop notifications.
    • +
  • Zulip alerts you about timely messages with fully customizable mobile, email and desktop notifications.
  • Mention users, groups diff --git a/templates/corporate/for/education.html b/templates/corporate/for/education.html index 4bcd724f77..cfc0beee64 100644 --- a/templates/corporate/for/education.html +++ b/templates/corporate/for/education.html @@ -227,7 +227,7 @@
  • Zulip alerts you about timely messages with - fully customizable mobile, email and desktop notifications. + fully customizable mobile, email and desktop notifications.
  • diff --git a/templates/corporate/for/events.html b/templates/corporate/for/events.html index e0a4af5887..6faf5d5382 100644 --- a/templates/corporate/for/events.html +++ b/templates/corporate/for/events.html @@ -259,7 +259,7 @@ required.
    • -
  • Zulip alerts participants about timely messages with fully customizable mobile, email and desktop notifications.
    • +
  • Zulip alerts participants about timely messages with fully customizable mobile, email and desktop notifications.
  • Mention users, groups of users or everyone when you need their attention.
  • diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index a151c9adf1..e5af85b629 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -597,7 +597,7 @@ required.
    • -
  • Zulip alerts you about timely messages with fully customizable mobile, email and desktop notifications.
    • +
  • Zulip alerts you about timely messages with fully customizable mobile, email and desktop notifications.
  • Mention users, groups diff --git a/templates/corporate/for/research.html b/templates/corporate/for/research.html index 9d20da8dfd..bc9580f8d3 100644 --- a/templates/corporate/for/research.html +++ b/templates/corporate/for/research.html @@ -348,7 +348,7 @@ required.
    • -
  • Zulip alerts you about timely messages with fully customizable mobile, email and desktop notifications.
    • +
  • Zulip alerts you about timely messages with fully customizable mobile, email and desktop notifications.
  • Mention users, groups diff --git a/templates/corporate/why-zulip.md b/templates/corporate/why-zulip.md index 9b84ae2f6f..8523acacd8 100644 --- a/templates/corporate/why-zulip.md +++ b/templates/corporate/why-zulip.md @@ -76,7 +76,7 @@ New messages will pop a long-running thread to the top, rather than languishing in a forgotten sidebar. You’ll never create a new channel (and later forget to check it) because your team’s main channel is busy — a busy stream works just fine in Zulip! For timely messages, Zulip alerts you with [fully -customizable](/help/stream-notifications) mobile, email and desktop +customizable](/help/channel-notifications) mobile, email and desktop notifications. > “With Zulip, I can manage hundreds of participants across two communities diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index 59c7cb3b94..7a33e223eb 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -98,6 +98,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ URLRedirect("/help/change-the-color-of-a-stream", "/help/change-the-color-of-a-channel"), URLRedirect("/help/move-content-to-another-stream", "/help/move-content-to-another-channel"), URLRedirect("/help/manage-inactive-streams", "/help/manage-inactive-channels"), + URLRedirect("/help/stream-notifications", "/help/channel-notifications"), ] LANDING_PAGE_REDIRECTS = [