diff --git a/help/archive-a-stream.md b/help/archive-a-channel.md similarity index 60% rename from help/archive-a-stream.md rename to help/archive-a-channel.md index 2ac6c6dcd8..71e64b276b 100644 --- a/help/archive-a-stream.md +++ b/help/archive-a-channel.md @@ -1,19 +1,19 @@ -# Archive a stream +# Archive a channel {!admin-only.md!} -Archiving a stream will immediately unsubscribe all users from the stream, -remove the stream from search and other typeaheads, and remove the stream's +Archiving a channel will immediately unsubscribe all users from the channel, +remove the channel from search and other typeaheads, and remove the channel's messages from **Combined feed**. -Archiving a stream does not delete a stream's messages. Users will still be +Archiving a channel does not delete a channel's messages. Users will still be able to find any given message by searching for it. However, links to -messages and topics in the stream may or may not continue to work. +messages and topics in the channel may or may not continue to work. In most cases, we recommend [renaming channels](/help/rename-a-channel) rather than archiving them. -## Archive a stream +## Archive a channel {start_tabs} @@ -21,31 +21,31 @@ than archiving them. {relative|stream|all} -1. Select a stream. +1. Select a channel. 1. Click the **trash** icon near the top right - corner of the stream settings panel. + corner of the channel settings panel. 1. Approve by clicking **Confirm**. !!! tip "" - You can also hover over a stream in the left sidebar, click on the + You can also hover over a channel in the left sidebar, click on the **ellipsis** (), and - select **Stream settings** to access the **trash** + select **Channel settings** to access the **trash** icon. {end_tabs} !!! warn "" - Archiving a stream is currently irreversible via the UI. + Archiving a channel is currently irreversible via the UI. -## Unarchiving archived streams +## Unarchiving archived channels -If you are self-hosting, you can unarchive an archived stream using the +If you are self-hosting, you can unarchive an archived channel using the `unarchive_stream` [management command][management-command]. This will restore -it as a private stream with shared history, and subscribe all organization +it as a private channel with shared history, and subscribe all organization owners to it. If you are using Zulip Cloud, you can [contact us](/help/contact-support) for help. diff --git a/help/delete-a-message.md b/help/delete-a-message.md index 554b5c331d..86782f82bf 100644 --- a/help/delete-a-message.md +++ b/help/delete-a-message.md @@ -99,7 +99,7 @@ including [mentions and alerts](/help/dm-mention-alert-notifications). ## Related articles * [Delete a topic](/help/delete-a-topic) -* [Archive a stream](/help/archive-a-stream) +* [Archive a channel](/help/archive-a-channel) * [Message retention policy](/help/message-retention-policy) * [Edit a message](/help/edit-a-message) * [Restrict message editing and deletion](/help/restrict-message-editing-and-deletion) diff --git a/help/delete-a-topic.md b/help/delete-a-topic.md index 0fe72e4613..33c1481351 100644 --- a/help/delete-a-topic.md +++ b/help/delete-a-topic.md @@ -16,7 +16,7 @@ better idea, or just leaving the topic as is. Deleting a topic can confuse users who come to the topic later via an email notification. Note that deleting a topic also deletes every message with that topic, -whereas [archiving a stream](/help/archive-a-stream) does not. +whereas [archiving a channel](/help/archive-a-channel) does not. ### Delete a topic @@ -49,5 +49,5 @@ attribute of messages in Zulip. * [Edit a message](/help/edit-a-message) * [Delete a message](/help/delete-a-message) -* [Archive a stream](/help/archive-a-stream) +* [Archive a channel](/help/archive-a-channel) * [Message retention policy](/help/message-retention-policy) diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 6cd9c3a46d..3b035a100c 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -210,7 +210,7 @@ * [Rename a channel](/help/rename-a-channel) * [Change a channel's description](/help/change-the-channel-description) * [Change the privacy of a channel](/help/change-the-privacy-of-a-channel) -* [Delete or archive a stream](/help/archive-a-stream) +* [Delete or archive a channel](/help/archive-a-channel) ## Organization settings * [Custom emoji](/help/custom-emoji) diff --git a/help/message-retention-policy.md b/help/message-retention-policy.md index 19801be3d3..7b05ed2893 100644 --- a/help/message-retention-policy.md +++ b/help/message-retention-policy.md @@ -72,4 +72,4 @@ more details on precisely how message deletion works in Zulip. * [Edit a message](/help/edit-a-message) * [Delete a message](/help/delete-a-message) * [Delete a topic](/help/delete-a-topic) -* [Archive a stream](/help/archive-a-stream) +* [Archive a channel](/help/archive-a-channel) diff --git a/help/moderating-open-organizations.md b/help/moderating-open-organizations.md index 703fc6d4db..b2d9afdc04 100644 --- a/help/moderating-open-organizations.md +++ b/help/moderating-open-organizations.md @@ -71,7 +71,7 @@ organization's policy choices. their account is reactivated by an administrator. * Investigate behavior by [viewing messages sent by a user](/help/view-messages-sent-by-a-user). -* Delete messages, [archive streams](/help/archive-a-stream), and +* Delete messages, [archive channels](/help/archive-a-channel), and [unsubscribe users from channels](/help/add-or-remove-users-from-a-channel). * [Move topics](/help/rename-a-topic), including between streams, when users start conversations in the wrong place. diff --git a/web/src/stream_edit.js b/web/src/stream_edit.js index 0f57ed2306..eb60c1a374 100644 --- a/web/src/stream_edit.js +++ b/web/src/stream_edit.js @@ -640,7 +640,7 @@ export function initialize() { {"z-link": () => stream_name_with_privacy_symbol_html}, ), id: "archive-stream-modal", - help_link: "/help/archive-a-stream", + help_link: "/help/archive-a-channel", html_body, on_click: do_archive_stream, }); diff --git a/web/templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs b/web/templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs index 58ccfe2333..e480c9c584 100644 --- a/web/templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs +++ b/web/templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs @@ -6,12 +6,12 @@ {{#if unsubscribing_other_user}} {{#tr}} Because you are removing the last subscriber from a private channel, it will be automatically archived. - {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} + {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} {{/tr}} {{else}} {{#tr}} Because you are the only subscriber, this channel will be automatically archived. - {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} + {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} {{/tr}} {{/if}}

diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index 5520aee29e..d8632679a7 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -45,7 +45,8 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ "/help/change-the-default-language-for-your-organization", "/help/configure-organization-language", ), - URLRedirect("/help/delete-a-stream", "/help/archive-a-stream"), + URLRedirect("/help/delete-a-stream", "/help/archive-a-channel"), + URLRedirect("/help/archive-a-stream", "/help/archive-a-channel"), 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/dm-mention-alert-notifications#alert-words"), diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index c65b74e115..d1d75198c6 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -17840,7 +17840,7 @@ paths: summary: Archive a stream tags: ["streams"] description: | - [Archive the stream](/help/archive-a-stream) with the ID `stream_id`. + [Archive the stream](/help/archive-a-channel) with the ID `stream_id`. x-requires-administrator: true parameters: - $ref: "#/components/parameters/StreamIdInPath"