diff --git a/help/configure-automated-notices.md b/help/configure-automated-notices.md index 48c37aa06a..78e483b328 100644 --- a/help/configure-automated-notices.md +++ b/help/configure-automated-notices.md @@ -48,7 +48,7 @@ unresolved](/help/resolve-a-topic). These notices will be marked as unread only for users who had participated in the topic. Additionally, when moving messages to another -[stream](/help/move-content-to-another-stream) or +[channel](/help/move-content-to-another-channel) or [topic](/help/move-content-to-another-topic), users can decide whether to send automated notices to help others understand how content was moved. diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index e158e0b507..c3adede1ba 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -137,7 +137,7 @@ * [Rename a topic](/help/rename-a-topic) * [Resolve a topic](/help/resolve-a-topic) * [Move content to another topic](/help/move-content-to-another-topic) -* [Move content to another stream](/help/move-content-to-another-stream) +* [Move content to another channel](/help/move-content-to-another-channel) * [Delete a topic](/help/delete-a-topic) * [Manage inactive streams](/help/manage-inactive-streams) diff --git a/help/link-to-a-message-or-conversation.md b/help/link-to-a-message-or-conversation.md index 702120c3ad..01150f886f 100644 --- a/help/link-to-a-message-or-conversation.md +++ b/help/link-to-a-message-or-conversation.md @@ -46,7 +46,7 @@ Viewing a topic via a message link will never mark messages as read. These links will still work even when the message is [moved to another topic](/help/move-content-to-another-topic) -or [stream](/help/move-content-to-another-stream) or +or [channel](/help/move-content-to-another-channel) or if its [topic is resolved](/help/resolve-a-topic). Zulip uses the same permanent link syntax when [quoting a diff --git a/help/move-content-to-another-stream.md b/help/move-content-to-another-channel.md similarity index 65% rename from help/move-content-to-another-stream.md rename to help/move-content-to-another-channel.md index ea0057d49c..f79154e106 100644 --- a/help/move-content-to-another-stream.md +++ b/help/move-content-to-another-channel.md @@ -1,9 +1,9 @@ -# Move content to another stream +# Move content to another channel -Zulip makes it possible to move messages, or an entire topic, to another stream. +Zulip makes it possible to move messages, or an entire topic, to another channel. Organizations can [configure][configure-moving-permissions] which [roles](/help/roles-and-permissions) have permission to move messages between -streams. +channels. [configure-moving-permissions]: /help/restrict-moving-messages#configure-who-can-move-messages-to-another-stream @@ -15,10 +15,10 @@ destination topic, or both. These notices include: * How many messages were moved, or whether the whole topic was moved. * Who moved the content. -## Move a topic to another stream +## Move a topic to another channel To move a topic, you must have access to both the source and -destination streams. +destination channels. {start_tabs} @@ -27,24 +27,24 @@ destination streams. 1. Select **Move topic**. If you do not see this option, you do not have permission to move this topic. -1. Select the destination stream for the topic from the streams dropdown list. +1. Select the destination channel for the topic from the channels dropdown list. 1. _(optional)_ Change the topic name. 1. Toggle whether automated notices should be sent. -1. Click **Confirm** to move the topic to another stream. +1. Click **Confirm** to move the topic to another channel. !!! warn "" - **Note**: When a topic is moved to a private stream with protected history, + **Note**: When a topic is moved to a private channel with protected history, messages in the topic will be visible to all the subscribers. {end_tabs} -## Move messages to another stream +## Move messages to another channel {start_tabs} @@ -53,9 +53,9 @@ destination streams. 1. Select **Move messages**. If you do not see this option, you do not have permission to move this message. -1. Select the destination stream from the streams dropdown list. If - the stream input is disabled, you do not have permission to move - this message to a different stream. +1. Select the destination channel from the channels dropdown list. If + the channel input is disabled, you do not have permission to move + this message to a different channel. 1. _(optional)_ Change the topic name. @@ -63,30 +63,30 @@ destination streams. 1. Toggle whether automated notices should be sent. -1. Click **Confirm** to move the selected content to another stream. +1. Click **Confirm** to move the selected content to another channel. !!! warn "" - **Note**: You cannot edit content of a message while changing its stream. + **Note**: You cannot edit content of a message while changing its channel. {end_tabs} -## Moving content to private streams +## Moving content to private channels -Access to messages moved to another stream will immediately be controlled by the -access policies for the destination stream. Content moved to a private stream will -thus appear to be deleted to users who are not subscribers of the destination stream. +Access to messages moved to another channel will immediately be controlled by the +access policies for the destination channel. Content moved to a private channel will +thus appear to be deleted to users who are not subscribers of the destination channel. -Content moved to a [private stream with protected history](/help/stream-permissions) +Content moved to a [private channel with protected history](/help/stream-permissions) will only be accessible to users who both: -* Were subscribed to the *original* stream when the content was *sent*. -* Are subscribed to the *destination* stream when the content is *moved*. +* Were subscribed to the *original* channel when the content was *sent*. +* Are subscribed to the *destination* channel when the content is *moved*. -## Moving content out of private streams +## Moving content out of private channels -In [private streams with protected history](/help/stream-permissions), +In [private channels with protected history](/help/stream-permissions), Zulip determines whether to treat the entire topic as moved using the access permissions of the user requesting the topic move. This means that the automated notices sent by the notification bot will report @@ -95,7 +95,7 @@ message in the topic that they can access, regardless of whether older messages exist that they cannot access. Similarly, [muted topics](/help/mute-a-topic) will be migrated to the -new stream and topic if the requesting user moved every message in the +new channel and topic if the requesting user moved every message in the topic that they can access. This model ensures that the topic editing feature cannot be abused to diff --git a/help/move-content-to-another-topic.md b/help/move-content-to-another-topic.md index 4e22cc325b..508d203e70 100644 --- a/help/move-content-to-another-topic.md +++ b/help/move-content-to-another-topic.md @@ -36,5 +36,5 @@ Organizations can [configure](/help/restrict-moving-messages) which ## Related articles * [Rename a topic](/help/rename-a-topic) -* [Move content to another stream](/help/move-content-to-another-stream) +* [Move content to another channel](/help/move-content-to-another-channel) * [Restrict moving messages](/help/restrict-moving-messages) diff --git a/help/rename-a-topic.md b/help/rename-a-topic.md index 991a6620d9..70d2483ef7 100644 --- a/help/rename-a-topic.md +++ b/help/rename-a-topic.md @@ -52,6 +52,6 @@ Organizations can [configure](/help/restrict-moving-messages) which ## Related articles * [Move content to another topic](/help/move-content-to-another-topic) -* [Move content to another stream](/help/move-content-to-another-stream) +* [Move content to another channel](/help/move-content-to-another-channel) * [Resolve a topic](/help/resolve-a-topic) * [Restrict moving messages](/help/restrict-moving-messages) diff --git a/help/restrict-moving-messages.md b/help/restrict-moving-messages.md index bad3f4554e..4e03ab8857 100644 --- a/help/restrict-moving-messages.md +++ b/help/restrict-moving-messages.md @@ -82,7 +82,7 @@ Permissions for moving messages between streams can be configured separately. * [Rename a topic](/help/rename-a-topic) * [Resolve a topic](/help/resolve-a-topic) * [Move content to another topic](/help/move-content-to-another-topic) -* [Move content to another stream](/help/move-content-to-another-stream) +* [Move content to another channel](/help/move-content-to-another-channel) * [Restrict message editing and deletion](/help/restrict-message-editing-and-deletion) * [Roles and permissions](/help/roles-and-permissions) diff --git a/help/view-a-messages-edit-history.md b/help/view-a-messages-edit-history.md index 7f71570b4f..e2381041bb 100644 --- a/help/view-a-messages-edit-history.md +++ b/help/view-a-messages-edit-history.md @@ -5,7 +5,7 @@ administrators can [disable message edit history](/help/disable-message-edit-history). Messages with any content edits are labeled **EDITED**, while messages that have -only been [moved to a new stream](/help/move-content-to-another-stream) or +only been [moved to a new channel](/help/move-content-to-another-channel) or [topic](/help/move-content-to-another-topic) are labeled **MOVED**. In organizations where message edit history is [disabled](/help/disable-message-edit-history), moved messages are simply marked diff --git a/templates/corporate/case-studies/asciidoctor-case-study.md b/templates/corporate/case-studies/asciidoctor-case-study.md index 3e6bb8133f..0475adb723 100644 --- a/templates/corporate/case-studies/asciidoctor-case-study.md +++ b/templates/corporate/case-studies/asciidoctor-case-study.md @@ -91,7 +91,7 @@ tools](/help/moderating-open-organizations) make it easy to fix. Community moderators can keep the dialogue organized by reclassifying topics and posts without disrupting the ongoing conversation. “If someone accidentally posts to the wrong stream or topic, Zulip allows me to [move those messages -around](/help/move-content-to-another-stream) so they land in the right spot,” +around](/help/move-content-to-another-channel) so they land in the right spot,” Dan says. “Moving messages also sends a subtle hint to the person posting about where to post the next time. And I can use [topic references](/help/link-to-a-message-or-conversation#link-to-a-stream-or-topic-within-zulip) diff --git a/templates/corporate/comparison_table_integrated.html b/templates/corporate/comparison_table_integrated.html index 22da5bb488..958aaf65e7 100644 --- a/templates/corporate/comparison_table_integrated.html +++ b/templates/corporate/comparison_table_integrated.html @@ -333,7 +333,7 @@ Move messages between - streams and + channels and topics diff --git a/templates/corporate/development-community.md b/templates/corporate/development-community.md index 5bc4d2d091..a23464a2eb 100644 --- a/templates/corporate/development-community.md +++ b/templates/corporate/development-community.md @@ -86,7 +86,7 @@ off the discussion by [starting a new topic](/help/starting-a-new-topic) in the appropriate stream! Don’t stress too much about picking the right place if you’re not sure; anyone in the community can edit a topic name, and [moderators](/help/roles-and-permissions) can [move a -topic to a different stream](/help/move-content-to-another-stream). +topic to a different stream](/help/move-content-to-another-channel). ## Streams for everyone diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index 7063529192..a24a17c004 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -334,7 +334,7 @@ can edit your message, or move it to a different topic - or stream. + or stream. diff --git a/templates/corporate/for/events.html b/templates/corporate/for/events.html index 829fb6f191..e0a4af5887 100644 --- a/templates/corporate/for/events.html +++ b/templates/corporate/for/events.html @@ -203,7 +203,7 @@
  • Type LaTeX directly into your Zulip message, and see it beautifully rendered.
  • Zulip code blocks come with syntax highlighting for over 250 languages, and integrated code playgrounds.
  • Structure your ideas with bulleted and numbered lists.
    • -
  • If you made a mistake, no worries! You can edit your message, or move it to a different topic or stream.
    • +
  • If you made a mistake, no worries! You can edit your message, or move it to a different topic or stream.
    • diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index b52cbbee4f..a151c9adf1 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -367,7 +367,7 @@ can edit your message, or move it to a different topic - or stream. + or stream. diff --git a/templates/corporate/for/research.html b/templates/corporate/for/research.html index 65b8e5b914..9d20da8dfd 100644 --- a/templates/corporate/for/research.html +++ b/templates/corporate/for/research.html @@ -207,7 +207,7 @@ can edit your message, or move it to a different topic - or stream. + or stream. diff --git a/templates/corporate/why-zulip.md b/templates/corporate/why-zulip.md index 36d2a4a36f..9b84ae2f6f 100644 --- a/templates/corporate/why-zulip.md +++ b/templates/corporate/why-zulip.md @@ -162,7 +162,7 @@ With conversations organized by topic, you can review prior discussions to understand past work, explanations, and decisions — your chat history becomes a knowledge base. If a conversation shifts to a new topic, it’s easy to reorganize by moving messages to a different [topic](/help/move-content-to-another-topic) -or [stream](/help/move-content-to-another-stream). There is no more rifling +or [stream](/help/move-content-to-another-channel). There is no more rifling through unrelated chatter to find the context you need. You can even [link to a Zulip conversation](/help/link-to-a-message-or-conversation#link-to-zulip-from-anywhere) diff --git a/zerver/lib/email_notifications.py b/zerver/lib/email_notifications.py index b3ea4f584a..4394bb8951 100644 --- a/zerver/lib/email_notifications.py +++ b/zerver/lib/email_notifications.py @@ -858,7 +858,7 @@ def enqueue_welcome_emails(user: UserProfile, realm_creation: bool = False) -> N unsubscribe_link=unsubscribe_link, move_messages_link=realm_url + "/help/move-content-to-another-topic", rename_topics_link=realm_url + "/help/rename-a-topic", - move_channels_link=realm_url + "/help/move-content-to-another-stream", + move_channels_link=realm_url + "/help/move-content-to-another-channel", ) send_future_email( diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index a3581c0711..c1ab8666cb 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -96,6 +96,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ ), URLRedirect("/help/pin-a-stream", "/help/pin-a-channel"), 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"), ] LANDING_PAGE_REDIRECTS = [ diff --git a/zerver/lib/zulip_update_announcements.py b/zerver/lib/zulip_update_announcements.py index 696da57376..8867f536f8 100644 --- a/zerver/lib/zulip_update_announcements.py +++ b/zerver/lib/zulip_update_announcements.py @@ -133,7 +133,7 @@ configuration change), or [turn this feature off]({organization_settings_url}) a zulip_update_announcements_stream=realm.zulip_update_announcements_stream.name, topic_name=topic_name, organization_settings_url="/#organization/organization-settings", - move_content_another_stream_help_url="/help/move-content-to-another-stream", + move_content_another_stream_help_url="/help/move-content-to-another-channel", ) return internal_prep_huddle_message( realm, sender, remove_single_newlines(content), recipient_users=administrators diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 6abbc77cdf..6dabf23aa3 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -2067,7 +2067,7 @@ paths: for direct messages contained additional `sender_id` and `recipient_id` fields. - [message-move-stream]: /help/move-content-to-another-stream + [message-move-stream]: /help/move-content-to-another-channel [stream-access]: /help/stream-permissions properties: id: