mirror of https://github.com/zulip/zulip.git
help: Update filenames "private message" -> "direct message".
Renames files, updates references, and adds URL redirects.
This commit is contained in:
David Rosa
Tim Abbott
parent
738667b39e
commit
15fd5299af
|
|
@ -1,7 +1,7 @@
|
|||
# Create user groups
|
||||
|
||||
User groups allow you to [mention](/help/mention-a-user-or-group) multiple
|
||||
users at once, [notifying](/help/pm-mention-alert-notifications) them about a message. For example, you may choose to create user groups for teams in your organization.
|
||||
users at once, [notifying](/help/dm-mention-alert-notifications) them about a message. For example, you may choose to create user groups for teams in your organization.
|
||||
|
||||
## How to create a user group
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
Zulip offers visual and audible desktop notifications. You can
|
||||
customize whether [stream messages](/help/stream-notifications),
|
||||
[private messages](/help/pm-mention-alert-notifications) and
|
||||
[mentions](/help/pm-mention-alert-notifications#wildcard-mentions)
|
||||
[direct messages](/help/dm-mention-alert-notifications) and
|
||||
[mentions](/help/dm-mention-alert-notifications#wildcard-mentions)
|
||||
trigger desktop notifications.
|
||||
|
||||
{start_tabs}
|
||||
|
|
@ -56,7 +56,7 @@ count badges.
|
|||
## Troubleshooting desktop notifications
|
||||
|
||||
First, make sure you have enabled
|
||||
[desktop notifications for PMs](/help/pm-mention-alert-notifications) or for the
|
||||
[desktop notifications for DMs](/help/dm-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
|
||||
|
|
@ -132,7 +132,7 @@ Alternate instructions:
|
|||
## Related articles
|
||||
|
||||
* [Stream notifications](/help/stream-notifications)
|
||||
* [PMs, mentions, and alerts](/help/pm-mention-alert-notifications)
|
||||
* [DMs, mentions, and alerts](/help/dm-mention-alert-notifications)
|
||||
* [Email notifications](/help/email-notifications)
|
||||
* [Mobile notifications](/help/mobile-notifications)
|
||||
* [Do not disturb](/help/do-not-disturb)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# PMs, mentions, and alerts
|
||||
|
||||
You can configure desktop, mobile, and email notifications for
|
||||
[private messages (PMs)](/help/private-messages),
|
||||
[direct messages (DMs)](/help/direct-messages),
|
||||
[mentions](/help/mention-a-user-or-group), and [alert
|
||||
words](#alert-words).
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ time to focus on your work.
|
|||
## Related articles
|
||||
|
||||
* [Desktop notifications](/help/desktop-notifications)
|
||||
* [PMs, mentions, and alerts](/help/pm-mention-alert-notifications)
|
||||
* [DMs, mentions, and alerts](/help/dm-mention-alert-notifications)
|
||||
* [Stream notifications](/help/stream-notifications)
|
||||
* [Email notifications](/help/email-notifications)
|
||||
* [Mobile notifications](/help/mobile-notifications)
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
## Message notification emails
|
||||
|
||||
Zulip can be configured to send message notification emails for [PMs
|
||||
and mentions](/help/pm-mention-alert-notifications), as well as
|
||||
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).
|
||||
|
||||
{start_tabs}
|
||||
|
|
|
|||
|
|
@ -15,4 +15,4 @@ Like your email inbox, Zulip works best if you read it topic-by-topic.
|
|||
* [Getting started with Zulip](/help/getting-started-with-zulip)
|
||||
* [Reading strategies](/help/reading-strategies)
|
||||
* [Reading topics](/help/reading-topics)
|
||||
* [Reading private messages (PMs)](/help/reading-pms)
|
||||
* [Reading direct messages (DMs)](/help/reading-dms)
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ to [Getting started with Zulip](/help/getting-started-with-zulip).
|
|||
## Create user groups
|
||||
|
||||
User groups allow you to [mention](/help/mention-a-user-or-group) multiple
|
||||
users at once, [notifying](/help/pm-mention-alert-notifications) them about a message. For example, you may choose to create user groups for teams in your organization.
|
||||
users at once, [notifying](/help/dm-mention-alert-notifications) them about a message. For example, you may choose to create user groups for teams in your organization.
|
||||
|
||||
### How to create a user group
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* [Streams and topics](/help/streams-and-topics)
|
||||
* [Finding a topic to read](/help/finding-a-topic-to-read)
|
||||
* [Reading topics](/help/reading-topics)
|
||||
* [Reading private messages (PMs)](/help/reading-pms)
|
||||
* [Reading direct messages (DMs)](/help/reading-dms)
|
||||
* [Starting a new topic](/help/starting-a-new-topic)
|
||||
* [Starting a new private thread](/help/starting-a-new-private-thread)
|
||||
* [Replying to messages](/help/replying-to-messages)
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
* [Status and availability](/help/status-and-availability)
|
||||
* [User cards](/help/user-cards)
|
||||
* [View someone's profile](/help/view-someones-profile)
|
||||
* [Private messages](/help/private-messages)
|
||||
* [Direct messages](/help/direct-messages)
|
||||
|
||||
## Streams & topics
|
||||
* [Streams and topics](/help/streams-and-topics)
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
|
||||
## Notifications
|
||||
* [Stream notifications](/help/stream-notifications)
|
||||
* [PMs, mentions, and alerts](/help/pm-mention-alert-notifications)
|
||||
* [DMs, mentions, and alerts](/help/dm-mention-alert-notifications)
|
||||
* [Mute a stream](/help/mute-a-stream)
|
||||
* [Mute a topic](/help/mute-a-topic)
|
||||
* [Mute a user](/help/mute-a-user)
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
* [Custom emoji](/help/custom-emoji)
|
||||
* [Add a custom linkifier](/help/add-a-custom-linkifier)
|
||||
* [Require topics in stream messages](/help/require-topics)
|
||||
* [Restrict private messages](/help/restrict-private-messages)
|
||||
* [Restrict direct messages](/help/restrict-direct-messages)
|
||||
* [Restrict wildcard mentions](/help/restrict-wildcard-mentions)
|
||||
* [Restrict moving messages](/help/restrict-moving-messages)
|
||||
* [Restrict message editing](/help/restrict-message-editing-and-deletion)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
You can mention a team member or [user group](/help/user-groups) to call their attention to a
|
||||
message. Mentions follow the same
|
||||
[notification settings](/help/pm-mention-alert-notifications) as private
|
||||
[notification settings](/help/dm-mention-alert-notifications) as direct
|
||||
messages and alert words.
|
||||
|
||||
## Mention a user or group
|
||||
|
|
@ -67,7 +67,7 @@ wildcard mentions can be annoying.
|
|||
Note that this will not notify anyone who has muted the stream, and
|
||||
users can disable receiving email/push notifications for these
|
||||
wildcard mentions, either
|
||||
[globally](/help/pm-mention-alert-notifications) or for [individual
|
||||
[globally](/help/dm-mention-alert-notifications) or for [individual
|
||||
streams](/help/stream-notifications).
|
||||
|
||||
## Related articles
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Mobile notifications
|
||||
|
||||
You can customize whether [stream messages](/help/stream-notifications),
|
||||
[private messages](/help/pm-mention-alert-notifications) and
|
||||
[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)
|
||||
apps.
|
||||
|
|
@ -15,7 +15,7 @@ apps.
|
|||
|
||||
{end_tabs}
|
||||
|
||||
[notifications-wildcard-mentions]: /help/pm-mention-alert-notifications#wildcard-mentions
|
||||
[notifications-wildcard-mentions]: /help/dm-mention-alert-notifications#wildcard-mentions
|
||||
|
||||
## Mobile notifications while online
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ notifications while you are actively using one of the Zulip apps.
|
|||
## Related articles
|
||||
|
||||
* [Stream notifications](/help/stream-notifications)
|
||||
* [PMs, mentions, and alerts](/help/pm-mention-alert-notifications)
|
||||
* [DMs, mentions, and alerts](/help/dm-mention-alert-notifications)
|
||||
* [Email notifications](/help/email-notifications)
|
||||
* [Desktop notifications](/help/desktop-notifications)
|
||||
* [Do not disturb](/help/do-not-disturb)
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ problematic behavior:
|
|||
* [Disallow disposable email addresses](/help/restrict-account-creation#dont-allow-disposable-domains)
|
||||
or [require users to log in via GitHub or GitLab](/help/configure-authentication-methods).
|
||||
* Restrict who can [create streams](/help/configure-who-can-create-streams),
|
||||
[create bots](/help/restrict-bot-creation), [send private
|
||||
messages](/help/restrict-private-messages), or
|
||||
[create bots](/help/restrict-bot-creation), [send direct
|
||||
messages](/help/restrict-direct-messages), or
|
||||
[add custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji).
|
||||
* Link to a code of conduct in your
|
||||
[organization description](/help/create-your-organization-profile)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
Messages from muted streams do not show up in **All messages** or generate
|
||||
notifications, unless you are
|
||||
[mentioned](/help/mention-a-user-or-group). Messages from muted streams
|
||||
do not generate [alert word](/help/pm-mention-alert-notifications#alert-words) notifications.
|
||||
do not generate [alert word](/help/dm-mention-alert-notifications#alert-words) notifications.
|
||||
|
||||
Muted streams still appear in the left sidebar, but they are grayed out and
|
||||
sorted to the bottom of their section.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
Messages from muted topics do not show up in either **All messages**
|
||||
or **Recent conversations**, nor do they generate notifications (including
|
||||
[alert word](/help/pm-mention-alert-notifications#alert-words)
|
||||
[alert word](/help/dm-mention-alert-notifications#alert-words)
|
||||
notifications), unless you are [mentioned](/help/mention-a-user-or-group).
|
||||
They also do not contribute to stream unread counts.
|
||||
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ have the following effects:
|
|||
picture, and message content, are hidden behind a **Click here to
|
||||
reveal** banner. A revealed message can later be [re-hidden](/help/mute-a-user#re-hide-a-message-that-has-been-revealed).
|
||||
|
||||
* Muted users are hidden from [**Private
|
||||
messages**](/help/private-messages) in the left sidebar and the list
|
||||
* Muted users are hidden from [**Direct
|
||||
messages**](/help/direct-messages) in the left sidebar and the list
|
||||
of users in the right sidebar. Private messages between you and a
|
||||
muted user are excluded from all views, including search, unless you
|
||||
[explicitly search](/help/search-for-messages) for `pm-with:<that
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
Read receipts let you check who has read a message. You can see read receipts
|
||||
for any message, including both [stream messages](/help/streams-and-topics) and
|
||||
[private messages](/help/private-messages).
|
||||
[direct messages](/help/direct-messages).
|
||||
|
||||
With privacy in mind, Zulip lets you [control][configure-personal-read-recipts]
|
||||
whether your read receipts are shared, and administrators can
|
||||
|
|
|
|||
|
|
@ -8,5 +8,5 @@ Like your email inbox, Zulip works best if you read it topic-by-topic.
|
|||
|
||||
* [Getting started with Zulip](/help/getting-started-with-zulip)
|
||||
* [Finding a topic to read](/help/finding-a-topic-to-read)
|
||||
* [Reading private messages (PMs)](/help/reading-pms)
|
||||
* [Reading direct messages (DMs)](/help/reading-dms)
|
||||
* [Reading strategies](/help/reading-strategies)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
Organization administrators can set a policy for which users are
|
||||
allowed to use [wildcard
|
||||
mentions](/help/pm-mention-alert-notifications#wildcard-mentions) in
|
||||
mentions](/help/dm-mention-alert-notifications#wildcard-mentions) in
|
||||
large streams (defined for this purpose as streams with more than 15
|
||||
subscribers).
|
||||
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ Zulip offers the following filters based on the location of the message.
|
|||
### Search your important messages
|
||||
|
||||
* `is:alerted`: Search messages that contain your [alert
|
||||
words](/help/pm-mention-alert-notifications#alert-words).
|
||||
words](/help/dm-mention-alert-notifications#alert-words).
|
||||
* `is:mentioned`: Search messages where you were
|
||||
[mentioned](/help/mention-a-user-or-group).
|
||||
* `is:starred`: Search your [starred messages](/help/star-a-message).
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@ to [Getting started with Zulip][getting-started] and the guide to
|
|||
|
||||
User groups allow you to [mention](/help/mention-a-user-or-group)
|
||||
multiple users at once,
|
||||
[notifying](/help/pm-mention-alert-notifications) them about a
|
||||
[notifying](/help/dm-mention-alert-notifications) them about a
|
||||
message. For example, you may find it useful to set up the following
|
||||
user groups:
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ start a new topic whenever you're not replying to an existing message.
|
|||
Don't worry about picking the perfect topic. The first 2-4 words that come
|
||||
to mind are great.
|
||||
|
||||
Note that topics are not available for [private messages](/help/private-messages).
|
||||
Note that topics are not available for [direct messages](/help/direct-messages).
|
||||
If you find yourself wanting topics in a PM, we recommend
|
||||
[creating a private stream](/help/create-a-stream).
|
||||
|
||||
|
|
|
|||
|
|
@ -66,5 +66,5 @@ explicitly set a notification preference.
|
|||
* [Mobile notifications](/help/mobile-notifications)
|
||||
* [Mute a stream](/help/mute-a-stream)
|
||||
* [Mute a topic](/help/mute-a-topic)
|
||||
* [PMs, mentions, and alerts](/help/pm-mention-alert-notifications)
|
||||
* [DMs, mentions, and alerts](/help/dm-mention-alert-notifications)
|
||||
* [Do not disturb](/help/do-not-disturb)
|
||||
|
|
|
|||
|
|
@ -25,6 +25,6 @@ configure Zulip to not send typing notifications.
|
|||
|
||||
## Related articles
|
||||
|
||||
* [Private messages](/help/private-messages)
|
||||
* [Direct messages](/help/direct-messages)
|
||||
* [Status and availability](/help/status-and-availability)
|
||||
* [Read receipts](/help/read-receipts)
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
User groups allow you to [mention](/help/mention-a-user-or-group) multiple
|
||||
users at once. When you mention a user group, everyone in the group is
|
||||
[notified](/help/pm-mention-alert-notifications) as if they were
|
||||
[notified](/help/dm-mention-alert-notifications) as if they were
|
||||
individually mentioned.
|
||||
|
||||
Note that user groups are not the same as group private messages. If you're
|
||||
trying to send a message to a group of people, you'll want to either
|
||||
[create a stream](/help/create-a-stream), or send a
|
||||
[group private message](/help/private-messages).
|
||||
[group direct message](/help/direct-messages).
|
||||
|
||||
### Create a user group
|
||||
|
||||
|
|
|
|||
|
|
@ -41,5 +41,5 @@ of unread messages.
|
|||
## Related articles
|
||||
|
||||
* [Mention a user or group](/help/mention-a-user-or-group)
|
||||
* [PMs, mentions, and alerts](/help/pm-mention-alert-notifications#pms-mentions-and-alerts)
|
||||
* [DMs, mentions, and alerts](/help/dm-mention-alert-notifications)
|
||||
* [Reading strategies](/help/reading-strategies)
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ export function show_add_alert_word_modal() {
|
|||
html_heading: $t_html({defaultMessage: "Add a new alert word"}),
|
||||
html_body,
|
||||
html_submit_button: $t_html({defaultMessage: "Add"}),
|
||||
help_link: "/help/pm-mention-alert-notifications#alert-words",
|
||||
help_link: "/help/dm-mention-alert-notifications#alert-words",
|
||||
form_id: "add-alert-word-form",
|
||||
id: "add-alert-word",
|
||||
loading_spinner: true,
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@
|
|||
|
||||
<div class="input-group">
|
||||
<label for="realm_private_message_policy">{{t "Who can use direct messages" }} ({{t "beta" }})
|
||||
{{> ../help_link_widget link="/help/restrict-private-messages" }}
|
||||
{{> ../help_link_widget link="/help/restrict-direct-messages" }}
|
||||
</label>
|
||||
<select name="realm_private_message_policy" class="setting-widget prop-element settings_select bootstrap-focus-style" id="id_realm_private_message_policy" data-setting-widget-type="number">
|
||||
{{> dropdown_options_widget option_values=private_message_policy_values}}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,10 @@ POLICY_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
|
|||
|
||||
HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
|
||||
# Add URL redirects for help center documentation here:
|
||||
URLRedirect("/help/pm-mention-alert-notifications", "/help/dm-mention-alert-notifications"),
|
||||
URLRedirect("/help/restrict-private-messages", "/help/restrict-direct-messages"),
|
||||
URLRedirect("/help/reading-pms", "/help/reading-dms"),
|
||||
URLRedirect("/help/private-messages", "/help/direct-messages"),
|
||||
URLRedirect("/help/configure-who-can-edit-topics", "/help/restrict-moving-messages"),
|
||||
URLRedirect(
|
||||
"/help/configure-message-editing-and-deletion",
|
||||
|
|
@ -44,7 +48,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
|
|||
URLRedirect("/help/delete-a-stream", "/help/archive-a-stream"),
|
||||
URLRedirect("/help/change-the-topic-of-a-message", "/help/rename-a-topic"),
|
||||
URLRedirect("/help/configure-missed-message-emails", "/help/email-notifications"),
|
||||
URLRedirect("/help/add-an-alert-word", "/help/pm-mention-alert-notifications#alert-words"),
|
||||
URLRedirect("/help/add-an-alert-word", "/help/dm-mention-alert-notifications#alert-words"),
|
||||
URLRedirect("/help/test-mobile-notifications", "/help/mobile-notifications"),
|
||||
URLRedirect(
|
||||
"/help/troubleshooting-desktop-notifications",
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ paths:
|
|||
- type: object
|
||||
description: |
|
||||
Event sent to a user's clients when that user's set of configured
|
||||
[alert words](/help/pm-mention-alert-notifications#alert-words) have changed.
|
||||
[alert words](/help/dm-mention-alert-notifications#alert-words) have changed.
|
||||
properties:
|
||||
id:
|
||||
$ref: "#/components/schemas/EventIdSchema"
|
||||
|
|
@ -4160,7 +4160,7 @@ paths:
|
|||
type: integer
|
||||
description: |
|
||||
[Policy](/api/roles-and-permissions#permission-levels)
|
||||
for [who can send private messages](/help/restrict-private-messages)
|
||||
for [who can send direct messages](/help/restrict-direct-messages)
|
||||
in this organization.
|
||||
|
||||
- 1 = Everyone
|
||||
|
|
@ -5755,7 +5755,7 @@ paths:
|
|||
<td><code>has_alert_word</code></td>
|
||||
<td>
|
||||
Whether the message contains any of the current user's
|
||||
<a href="/help/pm-mention-alert-notifications#alert-words">configured alert words</a>.
|
||||
<a href="/help/dm-mention-alert-notifications#alert-words">configured alert words</a>.
|
||||
Cannot be changed by the user directly, but
|
||||
can change if the message is edited to add/remove
|
||||
one of the current user's alert words.
|
||||
|
|
@ -7326,7 +7326,7 @@ paths:
|
|||
description: |
|
||||
Get all of the user's configured [alert words][alert-words].
|
||||
|
||||
[alert-words]: /help/pm-mention-alert-notifications#alert-words
|
||||
[alert-words]: /help/dm-mention-alert-notifications#alert-words
|
||||
responses:
|
||||
"200":
|
||||
description: Success.
|
||||
|
|
@ -7360,7 +7360,7 @@ paths:
|
|||
description: |
|
||||
Add words (or phrases) to the user's set of configured [alert words][alert-words].
|
||||
|
||||
[alert-words]: /help/pm-mention-alert-notifications#alert-words
|
||||
[alert-words]: /help/dm-mention-alert-notifications#alert-words
|
||||
parameters:
|
||||
- name: alert_words
|
||||
in: query
|
||||
|
|
@ -7429,7 +7429,7 @@ paths:
|
|||
|
||||
Alert words are case insensitive.
|
||||
|
||||
[alert-words]: /help/pm-mention-alert-notifications#alert-words
|
||||
[alert-words]: /help/dm-mention-alert-notifications#alert-words
|
||||
parameters:
|
||||
- name: alert_words
|
||||
in: query
|
||||
|
|
@ -10118,7 +10118,7 @@ paths:
|
|||
description: |
|
||||
Present if `alert_words` is present in `fetch_event_types`.
|
||||
|
||||
An array of strings, each an [alert word](/help/pm-mention-alert-notifications#alert-words)
|
||||
An array of strings, each an [alert word](/help/dm-mention-alert-notifications#alert-words)
|
||||
that the current user has configured.
|
||||
items:
|
||||
type: string
|
||||
|
|
@ -12191,7 +12191,7 @@ paths:
|
|||
Present if `realm` is present in `fetch_event_types`.
|
||||
|
||||
[Policy](/api/roles-and-permissions#permission-levels)
|
||||
for [who can send private messages](/help/restrict-private-messages)
|
||||
for [who can send direct messages](/help/restrict-direct-messages)
|
||||
in this organization.
|
||||
|
||||
- 1 = Everyone
|
||||
|
|
|
|||
Loading…
Reference in New Issue