diff --git a/help/add-or-remove-users-from-a-stream.md b/help/add-or-remove-users-from-a-stream.md index 225abe09e9..383d88e588 100644 --- a/help/add-or-remove-users-from-a-stream.md +++ b/help/add-or-remove-users-from-a-stream.md @@ -31,7 +31,7 @@ to a stream][configure-invites]. To add users in bulk, you can copy members from an existing stream or [user group](/help/user-groups). -{!automated-pm-stream-subscription.md!} +{!automated-dm-stream-subscription.md!} ### Mentioning a user in the compose box (alternate method) diff --git a/help/bots-and-integrations.md b/help/bots-and-integrations.md index 21247ece7c..93e10ac29a 100644 --- a/help/bots-and-integrations.md +++ b/help/bots-and-integrations.md @@ -60,9 +60,9 @@ A few more details: impersonate yourself (e.g. write messages that come from your Zulip account), you'll need to use your **personal API key**. -* **Outgoing webhook**: The bot can read private messages where the bot is a +* **Outgoing webhook**: The bot can read direct messages where the bot is a participant, and stream messages where the bot is [mentioned](/help/mention-a-user-or-group). When the - bot is PM'd or mentioned, it POSTs the message content to a URL of your + bot is DM'd or mentioned, it POSTs the message content to a URL of your choice. The POST request format can be in a Zulip format or a Slack-compatible format. diff --git a/help/configure-notification-bot.md b/help/configure-notification-bot.md index ad1bcc32c3..67a22c1a2a 100644 --- a/help/configure-notification-bot.md +++ b/help/configure-notification-bot.md @@ -12,7 +12,7 @@ various organization level events, including: * New public stream announcements (private streams are not announced) * New user announcements -The notification bot also generates automated private messages to +The notification bot also generates automated direct messages to individual users for some user specific events, such as [being subscribed to a stream][add-users-to-stream] by another user. @@ -27,7 +27,7 @@ Organization administrators can configure where (and whether) Stream messages sent by the notification bot (including the topic) are translated into the language that the organization has configured as the [organization language for automated messages and invitation -emails][org-lang]. Private messages sent by the notification bot to +emails][org-lang]. Direct messages sent by the notification bot to a user will use [their preferred language](/help/change-your-language). ## Configure notification bot diff --git a/help/desktop-notifications.md b/help/desktop-notifications.md index 628db46d85..482244b358 100644 --- a/help/desktop-notifications.md +++ b/help/desktop-notifications.md @@ -10,7 +10,7 @@ trigger desktop notifications. {settings_tab|notifications} -1. Toggle the checkboxes for **Streams** and **PMs, mentions, and alerts** +1. Toggle the checkboxes for **Streams** and **DMs, mentions, and alerts** in the **Desktop** column of the **Notification triggers** table. {end_tabs} diff --git a/help/email-notifications.md b/help/email-notifications.md index 91d8dd1156..400cd61bd3 100644 --- a/help/email-notifications.md +++ b/help/email-notifications.md @@ -10,7 +10,7 @@ and mentions](/help/dm-mention-alert-notifications), as well as {settings_tab|notifications} -1. Toggle the checkboxes for **Streams** and **PMs, mentions, and alerts** +1. Toggle the checkboxes for **Streams** and **DMs, mentions, and alerts** in the **Email** column of the **Notification triggers** table. {end_tabs} diff --git a/help/export-your-organization.md b/help/export-your-organization.md index d2404fa717..8605d3b085 100644 --- a/help/export-your-organization.md +++ b/help/export-your-organization.md @@ -55,7 +55,7 @@ with lots of messages or uploaded files. 1. The end result of that process with be an archive in the same format as the exports of public data discussed above, including extra - private stream and private message data for users who gave consent. + private stream and direct message data for users who gave consent. 1. Import the tarball using [Zulip's logical data import tool][import-only]. @@ -63,7 +63,7 @@ with lots of messages or uploaded files. Note that such an export will include all the messages received by any user in the organization that consents to the data export. In particular, it -will include all public stream content and any private stream or private +will include all public stream content and any private stream or direct message content where at least one of the participants gives consent. Users who do not provide consent will have their settings and stream @@ -81,7 +81,7 @@ To start this export, email support@zulip.com with your zulip.com URL, asking for a full export without member consent. You'll also need to email us evidence that you have authority to read -members' private messages. Typically, this will be because the zulip.com +members' direct messages. Typically, this will be because the zulip.com URL is administered by a corporation, and you are an official representative of that corporation. By requesting and approving this export, you will also assume full legal responsibility that the appropriate employment diff --git a/help/getting-started-with-zulip.md b/help/getting-started-with-zulip.md index 2a2bac4acb..4c5db4860c 100644 --- a/help/getting-started-with-zulip.md +++ b/help/getting-started-with-zulip.md @@ -34,7 +34,7 @@ Like your email inbox, Zulip works best if you read it topic-by-topic. {!reading-topics.md!} -### Reading private messages +### Reading direct messages {!reading-dms.md!} diff --git a/help/import-from-mattermost.md b/help/import-from-mattermost.md index 0c91c751a0..fdbeeadb1a 100644 --- a/help/import-from-mattermost.md +++ b/help/import-from-mattermost.md @@ -269,9 +269,9 @@ keep in mind about the import process: - Mattermost's export tool does not support exporting user avatars or message edit history. -- Private messages will only be imported from Mattermost workspaces containing +- Direct messages will only be imported from Mattermost workspaces containing a single team. This is because Mattermost's data exports do not associate - private messages with a specific Mattermost team. + direct messages with a specific Mattermost team. - Messages in threads are imported, but they are not explicitly marked as being in a thread. diff --git a/help/import-from-rocketchat.md b/help/import-from-rocketchat.md index abc6339fe9..3179976484 100644 --- a/help/import-from-rocketchat.md +++ b/help/import-from-rocketchat.md @@ -133,14 +133,14 @@ keep in mind about the import process: Rocket.Chat Discussion. - Messages from Rocket.Chat Discussions having direct channels - (i.e. private messages) as their parent are imported as normal - private messages in Zulip. + (i.e. direct messages) as their parent are imported as normal + direct messages in Zulip. - While Rocket.Chat Threads are in general imported as separate topics, Rocket.Chat Threads within Rocket.Chat Discussions are imported as normal messages within the topic containing that Discussion, and Threads in Direct Messages are imported as normal - Zulip private messages. + Zulip direct messages. Additionally, because Rocket.Chat does not provide a documented or stable data export API, the import tool may require small changes from diff --git a/help/import-from-slack.md b/help/import-from-slack.md index 4022f70daa..40580df609 100644 --- a/help/import-from-slack.md +++ b/help/import-from-slack.md @@ -37,7 +37,7 @@ confirmed this policy as of August 2022. Owners of **Business+** or **Enterprise Grid** workspaces can [request special access](https://slack.com/help/articles/204897248-Guide-to-Slack-import-and-export-tools#options-by-plan) -in order to export private message data. +in order to export direct message data. {start_tabs} diff --git a/help/include/all-messages.md b/help/include/all-messages.md index d7ad6b2dfb..ababe1c60c 100644 --- a/help/include/all-messages.md +++ b/help/include/all-messages.md @@ -1,5 +1,5 @@ The **All messages** view is a feed of all the unmuted messages you have -received, which combines stream messages and private messages. It's a great way +received, which combines stream messages and direct messages. It's a great way to see new messages as they come in. You can configure **All messages** to be the [default diff --git a/help/keyboard-shortcuts.md b/help/keyboard-shortcuts.md index 8fc8fd5cd6..4530f8c87e 100644 --- a/help/keyboard-shortcuts.md +++ b/help/keyboard-shortcuts.md @@ -22,7 +22,7 @@ in the Zulip app to add more to your repertoire as needed. * **New stream message**: C — Start a new topic in the current stream. -* **New private message**: X +* **New direct message**: X * **Cancel compose and save draft**: Esc or Ctrl + [ — Close the compose box and save the unsent message as a @@ -38,7 +38,7 @@ in the Zulip app to add more to your repertoire as needed. * **Next unread topic**: N -* **Next unread private message**: P +* **Next unread direct message**: P * **Search messages**: / @@ -81,13 +81,13 @@ in the Zulip app to add more to your repertoire as needed. * **Narrow to next unread topic**: N -* **Narrow to next unread private message**: P +* **Narrow to next unread direct message**: P * **Narrow to stream**: S -* **Narrow to topic or PM conversation**: Shift + S +* **Narrow to topic or DM conversation**: Shift + S -* **Narrow to all private messages**: Shift + P +* **Narrow to all direct messages**: Shift + P * **Zoom to message in conversation context**: Z — This view does not mark messages as read. @@ -113,7 +113,7 @@ in the Zulip app to add more to your repertoire as needed. * **New stream message**: C — For starting a new topic in a stream. -* **New private message**: X +* **New direct message**: X ### In the compose box diff --git a/help/manage-user-stream-subscriptions.md b/help/manage-user-stream-subscriptions.md index b9e9e561c7..8db901b1da 100644 --- a/help/manage-user-stream-subscriptions.md +++ b/help/manage-user-stream-subscriptions.md @@ -35,7 +35,7 @@ other users to a stream][configure-invites]. {end_tabs} -{!automated-pm-stream-subscription.md!} +{!automated-dm-stream-subscription.md!} ## Unsubscribe a user from stream(s) diff --git a/help/mastering-the-compose-box.md b/help/mastering-the-compose-box.md index 18294b29cf..131ffab981 100644 --- a/help/mastering-the-compose-box.md +++ b/help/mastering-the-compose-box.md @@ -2,7 +2,7 @@ When composing a message, Zulip lets you view a different conversation from the one you are composing to. For example, you can start a new topic without -changing your narrow, send a private message about the topic you're viewing, or +changing your narrow, send a direct message about the topic you're viewing, or look up a related discussion. In this context, the parts of the message view that are outside of the @@ -23,7 +23,7 @@ composing to. !!! keyboard_tip "" - For both stream and private messages, use Ctrl + . to + For both stream and direct messages, use Ctrl + . to go to the conversation you are composing to. {end_tabs} diff --git a/help/message-retention-policy.md b/help/message-retention-policy.md index a14996bc95..9a5ca6b0f8 100644 --- a/help/message-retention-policy.md +++ b/help/message-retention-policy.md @@ -12,7 +12,7 @@ before being automatically deleted (the default being forever). Zulip's system supports: * Setting an organization-level retention policy, which applies to - all private messages and all streams without a specific policy. + all direct messages and all streams without a specific policy. * Setting a retention policy for individual streams, which overrides the organization-level policy for that stream. This can be used to just delete messages on specific streams, to only retain messages diff --git a/help/mobile-notifications.md b/help/mobile-notifications.md index 109994340b..3d4b9f7c3b 100644 --- a/help/mobile-notifications.md +++ b/help/mobile-notifications.md @@ -10,7 +10,7 @@ apps. {settings_tab|notifications} -1. Toggle the checkboxes for **Streams** and **PMs, mentions, and alerts** +1. Toggle the checkboxes for **Streams** and **DMs, mentions, and alerts** in the **Mobile** column of the **Notification triggers** table. {end_tabs} diff --git a/help/moderating-open-organizations.md b/help/moderating-open-organizations.md index 8983a9f8b9..50ae74403b 100644 --- a/help/moderating-open-organizations.md +++ b/help/moderating-open-organizations.md @@ -49,7 +49,7 @@ organization's policy choices. * [Move topics](/help/rename-a-topic), including between streams, when users start conversations in the wrong place. * [Change users' names](/help/change-a-users-name) (e.g. to "Name (Spammer)") - for users who sent spam private messages to many community members. + for users who sent spam direct messages to many community members. * [Deactivate bots](/help/deactivate-or-reactivate-a-bot) or [deactivate custom emoji](/help/custom-emoji#deactivate-custom-emoji). diff --git a/help/mute-a-user.md b/help/mute-a-user.md index 958a9cf975..a009e8d381 100644 --- a/help/mute-a-user.md +++ b/help/mute-a-user.md @@ -18,17 +18,17 @@ have the following effects: * 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 + of users in the right sidebar. Direct 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:`. * Muted users have their name displayed as "Muted user" for [emoji reactions][view-emoji-reactions], [polls](/help/create-a-poll), and - when displaying the recipients of group private messages. + when displaying the recipients of group direct messages. * Muted users are excluded from the autocomplete for composing a - private message or [mentioning a user](/help/mention-a-user-or-group). + direct message or [mentioning a user](/help/mention-a-user-or-group). * Muted users are excluded from [read receipts](/help/read-receipts) for all messages. Zulip never shares whether or not you have read diff --git a/help/open-the-compose-box.md b/help/open-the-compose-box.md index d2529de2f3..e6ccaf2f0c 100644 --- a/help/open-the-compose-box.md +++ b/help/open-the-compose-box.md @@ -7,7 +7,7 @@ space for the message feed. There are a number of ways to open the compose box. * Click on any message. -* Click on **Message...**, **New topic**, or **New private message** at the +* Click on **Message...**, **New topic**, or **New direct message** at the bottom of the app. ## Using the keyboard @@ -18,7 +18,7 @@ All replies are to the message in the **blue box**. * **New topic**: C -* **New private message**: X +* **New direct message**: X You can move the blue box around using the **arrow keys**, J, or K. You can close the compose box using Esc, or up/down diff --git a/help/search-for-messages.md b/help/search-for-messages.md index 70f23a56fb..416a6d0bcc 100644 --- a/help/search-for-messages.md +++ b/help/search-for-messages.md @@ -51,11 +51,11 @@ Zulip offers the following filters based on the location of the message. * `stream:design`: Search within the stream **#design**. * `stream:design topic:new+logo`: Search within the topic "new logo" in **#design**. -* `is:private`: Search all your private messages. -* `pm-with:Bo Lin`: Search 1-on-1 private messages between you and Bo. -* `pm-with:Bo Lin, Elena García`: Search group private messages +* `is:private`: Search all your direct messages. +* `dm-with:Bo Lin`: Search 1-on-1 direct messages between you and Bo. +* `dm-with:Bo Lin, Elena García`: Search group direct messages between you, Bo, and Elena. -* `group-pm-with:Bo Lin`: Search all group private message +* `group-dm-with:Bo Lin`: Search all group direct message conversations that include you and Bo, as well as any other users. * `streams:public`: Search the history of all [public streams](/help/change-the-privacy-of-a-stream) in the organization, including diff --git a/help/start-a-new-topic.md b/help/start-a-new-topic.md index f8fa070482..8da93c5137 100644 --- a/help/start-a-new-topic.md +++ b/help/start-a-new-topic.md @@ -17,7 +17,7 @@ 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 [direct messages](/help/direct-messages). -If you find yourself wanting topics in a PM, we recommend +If you find yourself wanting topics in a DM, we recommend [creating a private stream](/help/create-a-stream). ## Related articles diff --git a/help/typing-notifications.md b/help/typing-notifications.md index d0a1579199..1d0e940faf 100644 --- a/help/typing-notifications.md +++ b/help/typing-notifications.md @@ -1,7 +1,7 @@ # Typing notifications -Zulip displays typing notifications when viewing a private message or -group private message conversation to which one of the other +Zulip displays typing notifications when viewing a direct message or +group direct message conversation to which one of the other participants is currently composing a message. Typing notifications are only sent while one is actively editing text @@ -19,7 +19,7 @@ configure Zulip to not send typing notifications. {settings_tab|account-and-privacy} 1. Under **Privacy**, toggle **Let recipients see when I'm typing - private messages**. + direct messages**. {end_tabs} diff --git a/help/user-groups.md b/help/user-groups.md index e3ee9ab87f..4b2a3dda79 100644 --- a/help/user-groups.md +++ b/help/user-groups.md @@ -5,7 +5,7 @@ users at once. When you mention a user group, everyone in the group is [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 +Note that user groups are not the same as group direct 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 direct message](/help/direct-messages). diff --git a/help/using-zulip-via-email.md b/help/using-zulip-via-email.md index d4c8b9f083..5b20534e1a 100644 --- a/help/using-zulip-via-email.md +++ b/help/using-zulip-via-email.md @@ -46,7 +46,7 @@ interested in. New Zulip messages will now be delivered to your email account. You can reply directly to the emails coming from Zulip, and your replies -will be posted in the appropriate topic or private message +will be posted in the appropriate topic or direct message conversation on Zulip. ## Related articles diff --git a/help/view-messages-sent-by-a-user.md b/help/view-messages-sent-by-a-user.md index 172e9deb14..025970e918 100644 --- a/help/view-messages-sent-by-a-user.md +++ b/help/view-messages-sent-by-a-user.md @@ -29,7 +29,7 @@ including yourself. {end_tabs} -## View private messages with yourself +## View direct messages with yourself {start_tabs} diff --git a/help/view-someones-profile.md b/help/view-someones-profile.md index 0c2a1d6b0b..099e53a43d 100644 --- a/help/view-someones-profile.md +++ b/help/view-someones-profile.md @@ -56,7 +56,7 @@ Additional tabs showing: !!! tip "" - If you are viewing a private message conversation, you can also tap the + If you are viewing a direct message conversation, you can also tap the **information** (information) button in the top right corner of the app.