From c931966e1bfebbb584131572a61146e22befbd4f Mon Sep 17 00:00:00 2001 From: Lauryn Menard Date: Wed, 1 May 2024 20:45:04 +0200 Subject: [PATCH] help: Rename and redirect stream-sending-policy for channel. --- help/bots-overview.md | 14 +++++++------- help/channel-permissions.md | 6 +++--- ...sending-policy.md => channel-posting-policy.md} | 10 +++++----- help/configure-automated-notices.md | 2 +- help/include/sidebar_index.md | 2 +- help/moderating-open-organizations.md | 2 +- help/setting-up-zulip-for-a-class.md | 6 +++--- .../corporate/comparison_table_integrated.html | 2 +- web/templates/stream_settings/stream_types.hbs | 2 +- zerver/actions/streams.py | 2 +- zerver/data_import/rocketchat.py | 2 +- zerver/lib/url_redirects.py | 1 + zerver/openapi/zulip.yaml | 2 +- zerver/tests/test_subs.py | 4 ++-- 14 files changed, 29 insertions(+), 28 deletions(-) rename help/{stream-sending-policy.md => channel-posting-policy.md} (50%) diff --git a/help/bots-overview.md b/help/bots-overview.md index 72bd850aef..ae8451a64b 100644 --- a/help/bots-overview.md +++ b/help/bots-overview.md @@ -39,7 +39,7 @@ The **bot type** determines what the bot can do. Bot type | Permissions | Common uses ---|---|--- -Generic | Like a normal user account | Automating tasks, bots that listen to all messages on a stream +Generic | Like a normal user account | Automating tasks, bots that listen to all messages on a channel Incoming webhook | Limited to only sending messages into Zulip | Automated notifications into Zulip Outgoing webhook | Generic bot that also receives new messages via HTTP post requests | Third party integrations, most custom bots @@ -49,16 +49,16 @@ bot can. A few more details: -* Bots can send messages to any stream that their owner can, - inheriting their owner's [sending permissions](/help/stream-sending-policy). +* Bots can send messages to any channel that their owner can, + inheriting their owner's [sending permissions](/help/channel-posting-policy). -* Bots can be subscribed to streams, and their role can be modified if +* Bots can be subscribed to channels, and their role can be modified if they need to have permission to do administrative actions. * [Channel permissions](/help/channel-permissions) are the same for bots - as for other users. Therefore, for private streams with protected + as for other users. Therefore, for private channels with protected history, a bot can only access messages sent after it subscribed - to the stream. + to the channel. * **Generic**: A generic bot is like a normal Zulip user account that cannot log in via a browser. Note that if you truly want to @@ -66,7 +66,7 @@ A few more details: account), you'll need to use your **personal API key**. * **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 + participant, and channel messages where the bot is [mentioned](/help/mention-a-user-or-group). When the 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/channel-permissions.md b/help/channel-permissions.md index d9c45e9606..2e8c9aac46 100644 --- a/help/channel-permissions.md +++ b/help/channel-permissions.md @@ -81,7 +81,7 @@ administrator can access private channel messages: ◾If subscribed to the channel ✶ -Configurable. See [Stream posting policy](/help/stream-sending-policy), +Configurable. See [Channel posting policy](/help/channel-posting-policy), [Configure who can add users][add-users], and [Configure who can remove users][remove-users] for details. @@ -112,7 +112,7 @@ for details. ✶ Configurable, but at minimum must be subscribed to the channel. -See [Stream posting policy](/help/stream-sending-policy), +See [Channel posting policy](/help/channel-posting-policy), [Configure who can add users][add-users], and [Configure who can remove users][remove-users] for details. @@ -121,7 +121,7 @@ for details. ## Related articles * [Roles and permissions](/help/roles-and-permissions) -* [Stream sending policy](/help/stream-sending-policy) +* [Channel sending policy](/help/channel-posting-policy) * [Web-public channels](/help/public-access-option) [add-users]: /help/configure-who-can-invite-to-streams#configure-who-can-add-users diff --git a/help/stream-sending-policy.md b/help/channel-posting-policy.md similarity index 50% rename from help/stream-sending-policy.md rename to help/channel-posting-policy.md index 17e07c9b89..347b78318e 100644 --- a/help/stream-sending-policy.md +++ b/help/channel-posting-policy.md @@ -1,9 +1,9 @@ -# Stream posting policy +# Channel posting policy {!admin-only.md!} -By default, anyone who belongs to a stream can also send messages to -the stream. However, sometimes it's useful to have a stream (often a +By default, anyone who belongs to a channel can also send messages to +the channel. However, sometimes it's useful to have a channel (often a [default stream](/help/set-default-streams-for-new-users)) where only certain users can send messages. @@ -11,11 +11,11 @@ certain users can send messages. {relative|stream|all} -1. Select a stream. +1. Select a channel. {!select-channel-view-general.md!} -1. Under **Stream permissions**, configure **Who can post to the stream**. +1. Under **Channel permissions**, configure **Who can post to the channel**. {!save-changes.md!} diff --git a/help/configure-automated-notices.md b/help/configure-automated-notices.md index bfa5b8f1a0..33ade46348 100644 --- a/help/configure-automated-notices.md +++ b/help/configure-automated-notices.md @@ -15,7 +15,7 @@ language](/help/change-your-language). Notices about stream settings changes, such as [name](/help/rename-a-stream), [description](/help/change-the-stream-description), [permission](/help/channel-permissions) and -[policy](/help/stream-sending-policy) updates are sent to the +[policy](/help/channel-posting-policy) updates are sent to the “stream events” topic in the stream that was modified. ### New stream announcements diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index f744ea88fa..9c146afbcb 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -202,7 +202,7 @@ ## Stream management * [Channel permissions](/help/channel-permissions) * [Public access option](/help/public-access-option) -* [Stream posting policy](/help/stream-sending-policy) +* [Channel posting policy](/help/channel-posting-policy) * [Restrict stream creation](/help/configure-who-can-create-streams) * [Restrict stream membership management](/help/configure-who-can-invite-to-streams) * [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel) diff --git a/help/moderating-open-organizations.md b/help/moderating-open-organizations.md index 248941d53f..c2228a0167 100644 --- a/help/moderating-open-organizations.md +++ b/help/moderating-open-organizations.md @@ -53,7 +53,7 @@ problematic behavior. so only [moderators](/help/roles-and-permissions) can mention everyone in your organization. * Create a [default stream](/help/set-default-streams-for-new-users) for announcements where [only admins can - post](/help/stream-sending-policy). + post](/help/channel-posting-policy). * Restrict who can [send direct messages](/help/restrict-direct-messages). ## Response diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md index 15ccc1dbab..43ba7b6645 100644 --- a/help/setting-up-zulip-for-a-class.md +++ b/help/setting-up-zulip-for-a-class.md @@ -229,9 +229,9 @@ channel](/help/create-a-channel#channel-options). For most classes, the following streams are recommended: - **#announcements**: For general announcements about the class. When - creating this stream, [restrict posting - permissions](/help/stream-sending-policy) so that only course staff - ([Administrators and moderators](/help/roles-and-permissions) are + creating this channel, [restrict posting + permissions](/help/channel-posting-policy) so that only course staff + ([administrators and moderators](/help/roles-and-permissions)) are allowed to post. - **#staff (private)**: For discussions among course staff. - **#general**: For random topics, e.g. students forming study groups. diff --git a/templates/corporate/comparison_table_integrated.html b/templates/corporate/comparison_table_integrated.html index 816fa976aa..c75c9bb370 100644 --- a/templates/corporate/comparison_table_integrated.html +++ b/templates/corporate/comparison_table_integrated.html @@ -880,7 +880,7 @@ - Stream posting permissions + Stream posting permissions diff --git a/web/templates/stream_settings/stream_types.hbs b/web/templates/stream_settings/stream_types.hbs index e7ac8768f6..0094d0a687 100644 --- a/web/templates/stream_settings/stream_types.hbs +++ b/web/templates/stream_settings/stream_types.hbs @@ -28,7 +28,7 @@