user docs: Update notification docs.

templates/zerver/help/about-streams-and-topics.md

@@ -34,7 +34,7 @@ also customize their stream settings; they can:
 
 * [pin a stream](/help/pin-a-stream)
 * [change the color of streams](/help/change-the-color-of-a-stream)
-* [enable desktop notifications for stream](/help/configure-desktop-notifications)
+* [enable notifications for stream](/help/stream-notifications)
 * [muting notification for streams](/help/mute-a-stream)
 
 If enabled by the organization administrators, users can

templates/zerver/help/configure-desktop-notifications.md

@@ -1,82 +0,0 @@
-# Configure desktop notifications
-
-You can receive desktop notifications in the corner of your main monitor for
-messages sent while Zulip is offscreen.
-
-## Stream messages
-
-To add desktop notifications for a single stream, follow the instructions
-[here](/help/set-notifications-for-a-single-stream).
-
-You can also add desktop notifications for all your current streams, or set
-a default configuration for streams you join in the future.
-
-{settings_tab|notifications}
-
-1. Under **Stream Messages**, select **Visual desktop notifications** and/or
-**Audible desktop notifications**.
-
-1. Under **Apply this change to all current stream subscriptions**, select
-"yes" to start receiving desktop notifications for streams that you are
-currently subscribed to. Note that this change will apply to all streams even if you
-previously set notification preferences for individual streams. Select "no"
-if you only want to apply your setting to streams that you subscribe to in
-the future.
-
-## Private Messages and @-Mentions
-
-{settings_tab|notifications}
-
-2. Under **Private messages and @-mentions**, select **Visual desktop notifications**
-and/or **Audible desktop notifications**.
-
-## Troubleshooting
-
-You may need to adjust your browser or system notification settings in order
-to allow Zulip to send you desktop notifications.
-
-### Zulip Desktop app on Mac OS
-
-1. From your desktop, open **System Preferences** and select **Notifications**.
-
-2. Select **Zulip** from the list of apps.
-
-3. Configure the notification style that you would like Zulip to use.
-
-### Zulip Desktop app on Windows
-
-1. Click the **Start** button and select **Settings**. Select **System**,
-   and then **Notifications & actions**.
-
-2. Select **Zulip** from the list of apps.
-
-3. Configure the notification style that you would like Zulip to use.
-
-### Firefox
-
-1. With the Firefox browser open, open the **Edit** menu. Select **Preferences**.
-
-2. On the left, select **Privacy & Security**. Scroll to the **Permissions**
-   section and select the **Settings** button next to **Notifications**.
-
-3. Find the URL for your Zulip organization, and adjust the **Status**
-   selector to **Allow**.
-
-### Chrome
-
-1. With the Chrome browser open, open the **Edit** menu. Select
-   **Preferences**.
-
-2. On the top left, select the menu icon (<i class="fa
-   fa-bars"></i>). Select **Advanced**, and then **Privacy & Security**.
-   Click on **Content settings** (partway down the page), and select
-   **Notifications**.
-
-3. If the Zulip URL for your organization is listed under **Blocked**,
-   select the menu icon (<i class="fa fa-ellipsis-v"></i>) to its right, and
-   click **Remove**.
-
-4. Next to **Allow**, click **Add**.
-
-5. Paste the Zulip URL for your organization into the site field, and click
-    **Add**.

templates/zerver/help/configure-email-notifications.md

@@ -1,9 +0,0 @@
-# Configure email notifications
-
-Follow the following steps to configure your settings to receive email notifications
-for private messages and @-mentions sent while you are offline.
-
-{settings_tab|notifications}
-
-2. Select the **Email notifications** option under the
-**Private messages and @-mentions** section.

templates/zerver/help/configure-mobile-notifications.md

@@ -1,12 +0,0 @@
-# Configure mobile push notifications
-
-Follow the following steps to change your mobile notification settings.
-
-{settings_tab|notifications}
-
-2. Under the **Private messages and @-mentions** section, check the
-box by **Mobile push notifications when offline** if you
-want mobile notifications only when you're offline.
-
-    Check the box by **Mobile push notifications always (even when online)** if
-you always want mobile notifications.

templates/zerver/help/include/sidebar.md

@@ -79,15 +79,14 @@
 * [Edit the topic of a message](/help/change-the-topic-of-a-message)
 
 ## Notifications
+* [Stream notifications](/help/stream-notifications)
+* [PMs, mentions, and alerts](/help/pm-mention-alert-notifications)
 * [Mute or unmute a stream](/help/mute-a-stream)
 * [Mute or unmute a topic](/help/mute-a-topic)
-* [Set notifications for a single stream](/help/set-notifications-for-a-single-stream)
-* [Desktop notifications](/help/configure-desktop-notifications)
-* [Email notifications](/help/configure-email-notifications)
-* [Mobile notifications](/help/configure-mobile-notifications)
 * [Digest emails](/help/configure-email-digest-notifications)
 * [Add an alert word](/help/add-an-alert-word)
 * [Notify everyone on a stream](/help/notify-everyone-on-a-stream)
+* [Troubleshoot desktop notifications](/help/troubleshooting-desktop-notifications)
 
 ## Tools & customization
 * [Bots and integrations](/help/add-a-bot-or-integration)

templates/zerver/help/pm-mention-alert-notifications.md

@@ -0,0 +1,21 @@
+# PMs, mentions, and alerts
+
+You can configure desktop, mobile, and email notifications for private
+messages, @-mentions, and alert words.
+
+{settings_tab|notifications}
+
+1. Toggle the notification settings under **Private messages and @-mentions**.
+
+These settings will affect notifications for private messages, group private
+messages, @-mentions, and alert words. The one exception is that we never
+send email notifications for `@all` or `@everyone` mentions.
+
+You can also hide the content of private messages (and group private
+messages) from desktop notifications.
+Under **Visual desktop notifications**, uncheck
+**Include content of private messages**.
+
+## Related articles
+
+* [Add an alert word](/help/add-an-alert-word)

templates/zerver/help/set-notifications-for-a-single-stream.md

@@ -1,20 +0,0 @@
-# Set notifications for a single stream
-
-On Zulip, you can set different notification settings for different streams.
-
-1. To set notifications for a single stream, find the **Streams**
- list located on the left sidebar.
-
-2. On the **Streams** list, hover over the stream that you want to set
- notifications for to reveal a down chevron
- (<i class="icon-vector-chevron-down"></i>) icon.
-
-3. Click on the {!down-chevron.md!} Select the **Stream settings**
- option from the dropdown.
-
-4. You will be taken to the [Streams](/#streams) page;
- {!stream-settings.md!}
-
-5. Under the **Stream settings** section you can now toggle
- **Receive audible notifications** and **Receive desktop notifications**
- for that stream.

templates/zerver/help/stream-notifications.md

@@ -0,0 +1,38 @@
+# Stream notifications
+
+You can configure desktop, mobile, and email notifications on a stream by
+stream basis. You can also set default notification preferences for streams
+you join in the future.
+
+## Set a default for new streams
+
+{settings_tab|notifications}
+
+1. Toggle the notification settings under **Stream messages**.
+
+1. Under **Apply this change to all current stream subscriptions**, click
+   **No**.
+
+## Change settings for current and future streams
+
+{settings_tab|notifications}
+
+1. Toggle the notification settings under **Stream messages**.
+
+1. Under **Apply this change to all current stream subscriptions**, click
+   **Yes**.
+
+## Set notifications for a single stream
+
+1. Hover over the stream in the left sidebar.
+
+2. Click the down chevron (<i class="icon-vector-chevron-down"></i>) to the
+   right of the stream.
+
+3. Click **Stream settings**.
+
+4. Toggle the notifications settings on the right.
+
+## Related articles
+
+* [Mute a stream](/help/mute-a-stream)

templates/zerver/help/troubleshooting-desktop-notifications.md

@@ -0,0 +1,67 @@
+# Troubleshooting desktop notifications
+
+First, make sure you are getting
+[desktop notifications for PMs](/help/pm-mention-alert-notifications) or for the
+[stream](/help/stream-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
+tab or in the Zulip desktop app to receive desktop notifications.
+
+**Visual desktop notifications** appear in the corner of your main monitor.
+**Audible desktop notifications** make a sound.
+
+The most common issue is that your browser or system settings are blocking
+notifications from Zulip.
+
+## Desktop app on macOS
+
+1. Open your Mac **System Preferences** and select **Notifications**.
+
+2. Select **Zulip** from the list of apps.
+
+3. Configure the notification style that you would like Zulip to use.
+
+## Desktop app on Windows
+
+1. Click the **Start** button and select **Settings**. Select **System**,
+   and then **Notifications & actions**.
+
+2. Select **Zulip** from the list of apps.
+
+3. Configure the notification style that you would like Zulip to use.
+
+## Firefox
+
+1. Open the Firefox **Edit** menu. Select **Preferences**.
+
+2. On the left, select **Privacy & Security**. Scroll to the **Permissions**
+   section and select the **Settings** button next to **Notifications**.
+
+3. Find the URL for your Zulip organization, and adjust the **Status**
+   selector to **Allow**.
+
+## Chrome
+
+1. Click on **Secure** to the left of the URL bar. It should be green and
+   have a lock icon next to it.
+
+1. Set **Notifications** and **Sound** to **Allow**.
+
+Alternate instructions:
+
+1. Open the Chrome **Edit** menu. Select **Preferences**.
+
+2. On the top left, select the menu icon (<i class="fa
+   fa-bars"></i>). Select **Advanced**, and then **Privacy & Security**.
+   Click on **Content settings** (partway down the page), and select
+   **Notifications**.
+
+3. If the Zulip URL for your organization is listed under **Blocked**,
+   select the menu icon (<i class="fa fa-ellipsis-v"></i>) to its right, and
+   click **Remove**.
+
+4. Next to **Allow**, click **Add**.
+
+5. Paste the Zulip URL for your organization into the site field, and click
+    **Add**.