Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

help: Rename and redirect stream-permissions for channel.

This commit is contained in:
Lauryn Menard 2024-05-01 20:36:10 +02:00 committed by Tim Abbott
parent 95b03ce6e1
commit 5342d4ecfb
31 changed files with 104 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api_docs/roles-and-permissions.md
View File

@ -76,7 +76,7 @@ event](/api/get-events#realm_user-add), and the
Many areas of Zulip are customizable by the roles
above, such as (but not limited to) [restricting message editing and
deletion](/help/restrict-message-editing-and-deletion) and
[streams permissions](/help/stream-permissions). The potential
[streams permissions](/help/channel-permissions). The potential
permission levels are:
* Everyone / Any user including Guests (least restrictive)

2
help/archive-a-stream.md
View File

@ -58,5 +58,5 @@ https://zulip.readthedocs.io/en/latest/production/management-commands.html#other
* [Delete a message](/help/delete-a-message)
* [Delete a topic](/help/delete-a-topic)
* [Message retention policy](/help/message-retention-policy)
* [Stream permissions](/help/stream-permissions)
* [Channel permissions](/help/channel-permissions)
* [Zulip Cloud or self-hosting?](/help/zulip-cloud-or-self-hosting)

2
help/bots-overview.md
View File

@ -55,7 +55,7 @@ A few more details:
* Bots can be subscribed to streams, and their role can be modified if
they need to have permission to do administrative actions.
* [Stream permissions](/help/stream-permissions) are the same for bots
* [Channel permissions](/help/channel-permissions) are the same for bots
as for other users. Therefore, for private streams with protected
history, a bot can only access messages sent after it subscribed
to the stream.

2
help/change-the-privacy-of-a-stream.md
View File

@ -4,7 +4,7 @@
Streams can be [web-public](/help/public-access-option), public or private,
and private streams can have shared or protected history.
See [stream permissions](/help/stream-permissions) for
See [channel permissions](/help/channel-permissions) for
details on stream privacy settings.
As an organization administrator, you can always make a public stream

62
help/stream-permissions.md → help/channel-permissions.md
View File

@ -1,21 +1,21 @@
# Stream privacy settings
# Channel privacy settings
Streams are similar to chat rooms, IRC channels, or email lists in that they
determine who receives a message. Zulip supports a few types of streams:
Channels are similar to chat rooms, IRC channels, or email lists in that they
determine who receives a message. Zulip supports a few types of channels:
* **Public** (<i class="zulip-icon zulip-icon-hashtag"></i>):
Members can join and view the complete message history.
Public streams are visible to [guest users](/help/guest-users)
only if they are subscribed (exactly like private streams with
Public channels are visible to [guest users](/help/guest-users)
only if they are subscribed (exactly like private channels with
shared history).
* **Private** (<i class="zulip-icon zulip-icon-lock"></i>):
New subscribers must be added by an existing subscriber. Only subscribers
and organization administrators can see the stream's name and description,
and only subscribers can view topics and messages with the stream:
* In **private streams with shared history**, new subscribers can
access the stream's full message history.
* In **private streams with protected history**, new subscribers
and organization administrators can see the channel's name and description,
and only subscribers can view topics and messages with the channel:
* In **private channels with shared history**, new subscribers can
access the channel's full message history.
* In **private channels with protected history**, new subscribers
can only see messages sent after they join.
* [**Web-public**](/help/public-access-option) (<i class="zulip-icon
@ -23,46 +23,46 @@ determine who receives a message. Zulip supports a few types of streams:
subscriber). Anyone on the Internet can view complete message history without
creating an account.
## Privacy model for private streams
## Privacy model for private channels
At a high level:
* Organization owners and administrators can see and modify most
aspects of a private stream, including the membership and estimated
aspects of a private channel, including the membership and estimated
traffic. Owners and administrators generally cannot see private
stream messages or do things that would give them access to private
stream messages, like adding new subscribers or changing the stream
channel messages or do things that would give them access to private
channel messages, like adding new subscribers or changing the channel
privacy settings.
* [Organization members and moderators](/help/roles-and-permissions)
cannot easily see which private streams exist, or interact with them
in any way until they are added. Given a stream name, they can
figure out whether a stream with that name exists, but cannot see
any other details about the stream.
cannot easily see which private channels exist, or interact with them
in any way until they are added. Given a channel name, they can
figure out whether a channel with that name exists, but cannot see
any other details about the channel.
* From the perspective of a guest, all streams are private streams,
and they additionally can't add other members to the streams they
* From the perspective of a guest, all channels are private channels,
and they additionally can't add other members to the channels they
are subscribed to.
There are two situations in which an organization owner or
administrator can access private stream messages:
administrator can access private channel messages:
* Via some types of [data export](/help/export-your-organization).
* Owners and administrators can change the ownership of a bot. If a
bot is subscribed to a private stream, then an administrator can get
access to that stream by taking control of the bot, though the
bot is subscribed to a private channel, then an administrator can get
access to that channel by taking control of the bot, though the
access will be limited to what the bot can do. (E.g. incoming
webhook bots cannot read messages.)
## Detailed permissions
### Public streams
### Public channels
<div class="centered_table"></div>
| | Owners and admins | Moderators | Members | Guests
|--- |--- | |--- |---
| View stream name | &#10004; | &#10004; | &#10004; | &#9726;
| View channel name | &#10004; | &#10004; | &#10004; | &#9726;
| Join | &#10004; | &#10004; | &#10004; |
| Unsubscribe | &#9726; | &#9726; | &#9726; | &#9726;
| Add others | &#10004; | &#10038; | &#10038; |
@ -78,7 +78,7 @@ administrator can access private stream messages:
<span class="legend_symbol">&#10004;</span><span class="legend_label">Always</span>
<span class="legend_symbol">&#9726;</span><span class="legend_label">If subscribed to the stream</span>
<span class="legend_symbol">&#9726;</span><span class="legend_label">If subscribed to the channel</span>
<span class="legend_symbol">&#10038;</span><span class="legend_label">
Configurable. See [Stream posting policy](/help/stream-sending-policy),
@ -87,12 +87,12 @@ Configurable. See [Stream posting policy](/help/stream-sending-policy),
for details.
</span>
### Private streams
### Private channels
<div class="centered_table"></div>
| | Owners and admins | Moderators | Members | Guests
|--- |--- | |--- |---
| View stream name | &#10004; | &#9726; | &#9726; | &#9726;
| View channel name | &#10004; | &#9726; | &#9726; | &#9726;
| Join | | | |
| Unsubscribe | &#9726; | &#9726; | &#9726; | &#9726;
| Add others | &#9726; | &#10038; | &#10038; |
@ -108,10 +108,10 @@ for details.
<span class="legend_symbol">&#10004;</span><span class="legend_label">Always</span>
<span class="legend_symbol">&#9726;</span><span class="legend_label">If subscribed to the stream</span>
<span class="legend_symbol">&#9726;</span><span class="legend_label">If subscribed to the channel</span>
<span class="legend_symbol">&#10038;</span><span class="legend_label">
Configurable, but at minimum must be subscribed to the stream.
Configurable, but at minimum must be subscribed to the channel.
See [Stream posting policy](/help/stream-sending-policy),
[Configure who can add users][add-users], and
[Configure who can remove users][remove-users]
@ -122,7 +122,7 @@ for details.
* [Roles and permissions](/help/roles-and-permissions)
* [Stream sending policy](/help/stream-sending-policy)
* [Web-public streams](/help/public-access-option)
* [Web-public channels](/help/public-access-option)
[add-users]: /help/configure-who-can-invite-to-streams#configure-who-can-add-users
[remove-users]: /help/configure-who-can-invite-to-streams#configure-who-can-remove-users

2
help/channels-and-topics.md
View File

@ -11,6 +11,6 @@
* [Starting a new topic](/help/starting-a-new-topic)
* [Replying to messages](/help/replying-to-messages)
* [Creating channels for your organization](/help/getting-your-organization-started-with-zulip#create-channels)
* [Stream permissions](/help/stream-permissions)
* [Channel permissions](/help/channel-permissions)
* Browse the articles under **Channels & topics** and
**Channel management** on the left sidebar.

6
help/configure-automated-notices.md
View File

@ -14,7 +14,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/stream-permissions) and
[permission](/help/channel-permissions) and
[policy](/help/stream-sending-policy) updates are sent to the
“stream events” topic in the stream that was modified.
@ -22,13 +22,13 @@ Notices about stream settings changes, such as [name](/help/rename-a-stream),
{!admin-only.md!}
When creating a new [public stream](/help/stream-permissions), the
When creating a new [public channel](/help/channel-permissions), the
stream creator can choose to advertise the new stream via an automated
notice. You can configure what stream Zulip uses for these notices, or
disable these notices entirely. The topic for these messages is “new
streams”.
New [private](/help/stream-permissions) streams are never announced.
New [private](/help/channel-permissions) channels are never announced.
{start_tabs}

6
help/create-a-channel.md
View File

@ -26,12 +26,12 @@ There are several parameters you can set while creating a channel. All but
* **Announce new stream in the [stream configured by your organization](/help/configure-automated-notices#new-stream-announcements)**:
Posts a message in the "new streams" topic advertising the new stream.
* **Who can access the stream?**: See [Stream permissions](/help/stream-permissions).
* **Who can access the stream?**: See [Channel permissions](/help/channel-permissions).
* **Default stream for new users**: Whether new users will be [automatically
subscribed](/help/set-default-streams-for-new-users) to the new stream.
* **Who can post to the stream?**: See [Stream permissions](/help/stream-permissions).
* **Who can post to the stream?**: See [Channel permissions](/help/channel-permissions).
* **Who can unsubscribe others from this stream?**: See
[Restrict stream membership management](/help/configure-who-can-invite-to-streams#configure-who-can-remove-users).
@ -45,6 +45,6 @@ There are several parameters you can set while creating a channel. All but
## Related articles
* [Create channels for a new organization](/help/create-channels)
* [Stream permissions](/help/stream-permissions)
* [Channel permissions](/help/channel-permissions)
* [Set default streams for new users](/help/set-default-streams-for-new-users)
* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels)

2
help/create-channels.md
View File

@ -16,6 +16,6 @@ For more details about channel settings, see [Create a channel](/help/create-a-c
* [Setting up your organization](/help/getting-your-organization-started-with-zulip)
* [Create a channel](/help/create-a-channel#channel-options)
* [Stream permissions](/help/stream-permissions)
* [Channel permissions](/help/channel-permissions)
* [Set default streams for new users](/help/set-default-streams-for-new-users)
* [Getting started with Zulip](/help/getting-started-with-zulip)

8
help/export-your-organization.md
View File

@ -12,12 +12,12 @@ Zulip Cloud service to your own servers. Two types of data exports are available
to all Zulip Cloud organizations:
* [**Export of public data**](#export-of-public-data): Complete data for your
organization *other than* [private stream](/help/stream-permissions) messages
organization *other than* [private channel](/help/channel-permissions) messages
and [direct messages](/help/direct-messages).
* [**Full export with member consent**](#full-export-with-member-consent):
Everything in the export of public data, plus all the [private
stream](/help/stream-permissions) messages and [direct
channel](/help/channel-permissions) messages and [direct
messages](/help/direct-messages) of members who opt in to have their data
exported.
@ -66,7 +66,7 @@ file from that page.
In addition to your organization's public data, this export includes all the
messages received by any user in the organization who consents to the data
export. In particular, it includes any [private
stream](/help/stream-permissions) messages and [direct
channel](/help/channel-permissions) messages and [direct
messages](/help/direct-messages) where *at least one of the recipients* has
given consent.
@ -88,7 +88,7 @@ subscriptions exported, but will have no personalized message history.
1. You will receive an archive in the `.tar.gz` format containing all public
information for your organization, plus [private
stream](/help/stream-permissions) messages and [direct
channel](/help/channel-permissions) messages and [direct
messages](/help/direct-messages) for users who gave consent.
1. Import the tarball using [Zulip's logical data import tool][import-only].

2
help/include/sidebar_index.md
View File

@ -200,7 +200,7 @@
* [Restrict permissions of new members](/help/restrict-permissions-of-new-members)
## Stream management
* [Stream permissions](/help/stream-permissions)
* [Channel permissions](/help/channel-permissions)
* [Public access option](/help/public-access-option)
* [Stream posting policy](/help/stream-sending-policy)
* [Restrict stream creation](/help/configure-who-can-create-streams)

4
help/manage-user-channel-subscriptions.md
View File

@ -5,7 +5,7 @@
!!! warn ""
**Note**: The list of a user's **Subscribed channels** will be limited to
channels for which [you can see all subscribers](/help/stream-permissions).
channels for which [you can see all subscribers](/help/channel-permissions).
{start_tabs}
@ -87,7 +87,7 @@ channel](/help/unsubscribe-from-a-channel).
## Related articles
* [Stream permissions](/help/stream-permissions)
* [Channel permissions](/help/channel-permissions)
* [Roles and permissions](/help/roles-and-permissions)
* [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)
* [Unsubscribe from a channel](/help/unsubscribe-from-a-channel)

4
help/move-content-to-another-channel.md
View File

@ -78,7 +78,7 @@ Access to messages moved to another channel will immediately be controlled by th
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 channel with protected history](/help/stream-permissions)
Content moved to a [private channel with protected history](/help/channel-permissions)
will only be accessible to users who both:
* Were subscribed to the *original* channel when the content was *sent*.
@ -86,7 +86,7 @@ will only be accessible to users who both:
## Moving content out of private channels
In [private channels with protected history](/help/stream-permissions),
In [private channels with protected history](/help/channel-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

2
help/public-access-option.md
View File

@ -173,5 +173,5 @@ with [Zulip's Rules of Use](https://zulip.com/policies/rules).
## Related articles
* [Moderating open organizations](/help/moderating-open-organizations)
* [Stream permissions](/help/stream-permissions)
* [Channel permissions](/help/channel-permissions)
* [Restrict stream creation](/help/configure-who-can-create-streams)

18
help/roles-and-permissions.md
View File

@ -9,14 +9,14 @@ role](/help/roles-and-permissions#change-a-users-role) if needed.
!!! tip ""
Learn about [stream permissions](/help/stream-permissions), including
**public** and **private** streams.
Learn about [channel permissions](/help/channel-permissions), including
**public** and **private** channels.
* **Organization owner**: Can manage users, public streams, organization
* **Organization owner**: Can manage users, public channels, organization
settings, and billing. Organization owners can do anything that an
organization administrator can do.
* **Organization administrator**: Can manage users, public streams, and
* **Organization administrator**: Can manage users, public channels, and
organization settings. Cannot make someone an owner, or change an existing
owner's role.
@ -25,15 +25,15 @@ role](/help/roles-and-permissions#change-a-users-role) if needed.
your organization.
* **Member**: This is the default role for most users. Members have access to
all public streams. You can [configure different
all public channels. You can [configure different
permissions](/help/restrict-permissions-of-new-members) for **new members**
and **full members**, which is especially useful for [moderating open
organizations](/help/moderating-open-organizations). New members automatically
become full members after a configurable waiting period.
* **Guest**: Can view and send messages in streams they have been added to.
Guests cannot see other streams, unless they have been specifically added to
the stream. See [guest users documentation](/help/guest-users) for additional
* **Guest**: Can view and send messages in channels they have been added to.
Guests cannot see other channels, unless they have been specifically added to
the channel. See [guest users documentation](/help/guest-users) for additional
details and configuration options.
* **Billing administrator**: The user who upgrades the organization to
@ -65,7 +65,7 @@ role](/help/roles-and-permissions#change-a-users-role) if needed.
## Related articles
* [Change a user's role](/help/change-a-users-role)
* [Stream permissions](/help/stream-permissions)
* [Channel permissions](/help/channel-permissions)
* [Inviting new users](/help/invite-new-users)
* [Zulip Cloud billing](/help/zulip-cloud-billing)
* [Guest users](/help/guest-users)

2
help/search-for-messages.md
View File

@ -140,7 +140,7 @@ the specified rule. For example:
## Searching shared history
Zulip's [stream permissions](/help/stream-permissions) model allows access to
Zulip's [channel permissions](/help/channel-permissions) model allows access to
the full history of public streams and private streams with shared history,
including messages sent before you joined the stream (or organization), or those
sent to public streams you are not subscribed to.

6
help/view-someones-profile.md
View File

@ -20,9 +20,9 @@ A user's profile displays key information about the user.
Additional tabs showing:
- The streams that the user is subscribed to. Note that the list is limited to
streams for which you have [permission to see all
subscribers](/help/stream-permissions).
- The channel that the user is subscribed to. Note that the list is limited to
channel for which you have [permission to see all
subscribers](/help/channel-permissions).
- The [user groups](/help/user-groups) to which they belong.
{tab|mobile}

4
templates/corporate/comparison_table_integrated.html
View File

@ -854,7 +854,7 @@
</tr>
<tr>
<td class="comparison-table-feature">
<a href="/help/stream-permissions">Private streams with shared history</a>
<a href="/help/channel-permissions">Private streams with shared history</a>
</td>
<td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td>
<td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td>
@ -867,7 +867,7 @@
</tr>
<tr>
<td class="comparison-table-feature">
<a href="/help/stream-permissions">Private streams with private history</a>
<a href="/help/channel-permissions">Private streams with private history</a>
</td>
<td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td>
<td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td>

2
templates/corporate/for/business.html
View File

@ -425,7 +425,7 @@
</div>
</li>
<li><div class="list-content">Automatically subscribe users to streams <a href="/help/set-default-streams-for-new-users">when they join</a>, subscribe a <a href="/help/user-groups">group of users</a>, or copy membership from another stream. Add users to the right streams for their team and role with <a href="/help/invite-new-users#create-a-reusable-invitation-link">custom invitation links</a>.</div></li>
<li><div class="list-content">Manage your organization with <a href="/help/stream-permissions#detailed-permissions">fine-grained permission settings</a> for <a href="/help/roles-and-permissions">administrators and moderators</a>, and custom <a href="/help/stream-permissions">viewing</a> and <a href="/help/stream-permissions#public-streams">posting</a> permissions for streams.</div></li>
<li><div class="list-content">Manage your organization with <a href="/help/channel-permissions#detailed-permissions">fine-grained permission settings</a> for <a href="/help/roles-and-permissions">administrators and moderators</a>, and custom <a href="/help/channel-permissions">viewing</a> and <a href="/help/channel-permissions#public-channels">posting</a> permissions for streams.</div></li>
<li>
<div class="list-content">
Add partners, vendors and temporary contractors as <a href="/help/roles-and-permissions">guest users</a> in your organization.

6
templates/corporate/for/education.html
View File

@ -167,8 +167,8 @@
</h1>
<ul>
<li><div class="list-content">Zulip offers dozens of features for <a href="/help/moderating-open-organizations">moderating discussions.</a></div></li>
<li><div class="list-content">Assign permissions to course staff with <a href="/help/stream-permissions#detailed-permissions">fine-grained settings</a> for <a href="/help/roles-and-permissions">administrators and moderators.</a></div></li>
<li><div class="list-content">Make an announcement stream where only course staff <a href="/help/stream-permissions#public-streams">can post messages</a>.</div></li>
<li><div class="list-content">Assign permissions to course staff with <a href="/help/channel-permissions#detailed-permissions">fine-grained settings</a> for <a href="/help/roles-and-permissions">administrators and moderators.</a></div></li>
<li><div class="list-content">Make an announcement stream where only course staff <a href="/help/channel-permissions#public-channels">can post messages</a>.</div></li>
<li><div class="list-content">Quickly add staff and students to the right streams. Automatically subscribe users <a href="/help/set-default-streams-for-new-users">when they join</a>, subscribe a <a href="/help/user-groups">group of users</a>, or copy membership from another stream.</div></li>
</ul>
</div>
@ -279,7 +279,7 @@
<li>File storage up to 5 GB total</li>
<li><a href="/features/">Complete</a> team chat solution</li>
<li><a href="/integrations/">Hundreds of integrations</a></li>
<li>Advanced <a href="/help/roles-and-permissions">roles</a> and <a href="/help/stream-permissions">permissions</a></li>
<li>Advanced <a href="/help/roles-and-permissions">roles</a> and <a href="/help/channel-permissions">permissions</a></li>
<li><a href="/help/guest-users">Guest</a> accounts</li>
</ul>
</div>

2
templates/corporate/for/events.html
View File

@ -228,7 +228,7 @@
</li>
<li><div class="list-content">Signing up for Zulip is quick and easy. Participants can make an account, or <a href="/help/logging-in">log in</a> with Google, Apple, etc.</div></li>
<li><div class="list-content">Automatically subscribe members to streams <a href="/help/set-default-streams-for-new-users">when they join</a>, subscribe a <a href="/help/user-groups">group of users</a>, or copy membership from another stream.</div></li>
<li><div class="list-content">Make an announcement stream where only organizers <a href="/help/stream-permissions#public-streams">can post messages</a>. Use <a href="/help/stream-permissions">private streams</a> to plan the event.</div></li>
<li><div class="list-content">Make an announcement stream where only organizers <a href="/help/channel-permissions#public-channels">can post messages</a>. Use <a href="/help/channel-permissions">private streams</a> to plan the event.</div></li>
</ul>
</div>
</div>

2
templates/corporate/for/open-source.html
View File

@ -566,7 +566,7 @@
</li>
<li>
<div class="list-content">Manage your community with
<a href="/help/stream-permissions#detailed-permissions">
<a href="/help/channel-permissions#detailed-permissions">
fine-grained permission settings</a> for
<a href="/help/roles-and-permissions">
administrators and moderators</a>.

2
templates/corporate/for/research.html
View File

@ -308,7 +308,7 @@
they join.</a>
</div>
</li>
<li><div class="list-content">Manage your community with <a href="/help/stream-permissions#detailed-permissions">fine-grained permission settings</a> for <a href="/help/roles-and-permissions">administrators and moderators</a>.</div></li>
<li><div class="list-content">Manage your community with <a href="/help/channel-permissions#detailed-permissions">fine-grained permission settings</a> for <a href="/help/roles-and-permissions">administrators and moderators</a>.</div></li>
<li>
<div class="list-content">
Zulip offers dozens of features

2
templates/corporate/policies/privacy.md
View File

@ -195,7 +195,7 @@ parties listed in this section. We do not sell Personal Data.
otherwise provide data to Zulip, it may be shared with some or all other
users in that Zulip Organization. Please note that some Zulip streams [may
be accessible to the general
public](/help/stream-permissions), in addition to the
public](/help/channel-permissions), in addition to the
stream’s current subscribers. For more information, please review our
[Terms of Service](/policies/terms).
- Zulip Organization Administrators may export all Zulip data for a Zulip

2
templates/corporate/pricing_model.html
View File

@ -40,7 +40,7 @@
<li><span>File storage up to 5 GB total</span></li>
<li><span><a href="{{ billing_base_url }}/plans/#cloud-plan-comparison">Complete</a> team chat solution</span></li>
<li><span><a href="/integrations/">Hundreds of integrations</a></span></li>
<li><span>Advanced <a href="/help/roles-and-permissions">roles</a> and <a href="/help/stream-permissions">permissions</a></span></li>
<li><span>Advanced <a href="/help/roles-and-permissions">roles</a> and <a href="/help/channel-permissions">permissions</a></span></li>
<li><span><a href="/help/guest-users">Guest</a>
accounts</span></li>
<li><span>Many organizations are eligible for a <a href="{{ billing_base_url }}/plans/#cloud-sponsorships">free Standard plan</a></span></li>

2
templates/corporate/self-hosting.html
View File

@ -50,7 +50,7 @@
Unlike the competition, you don't pay for
<a href="https://zulip.readthedocs.io/en/stable/production/authentication-methods.html">SAML
authentication</a>, <a href="https://zulip.readthedocs.io/en/stable/production/authentication-methods.html#synchronizing-data">LDAP
sync</a>, or advanced <a href="/help/roles-and-permissions">roles</a> and <a href="/help/stream-permissions">permissions</a>. There
sync</a>, or advanced <a href="/help/roles-and-permissions">roles</a> and <a href="/help/channel-permissions">permissions</a>. There
is no “open core” catch — just freely available world-class software.
</p>
</div>

2
web/templates/stream_settings/stream_types.hbs
View File

@ -1,7 +1,7 @@
<div class="input-group stream-privacy-values">
<div class="alert stream-privacy-status"></div>
<label>{{t 'Who can access the channel?'}}
{{> ../help_link_widget link="/help/stream-permissions" }}
{{> ../help_link_widget link="/help/channel-permissions" }}
</label>
<div class="stream-privacy_choices prop-element" id="id_stream_privacy" data-setting-widget-type="radio-group" data-setting-choice-type="string">

2
zerver/actions/streams.py
View File

@ -1181,7 +1181,7 @@ def send_change_stream_permission_notification(
)
notification_string = notification_string.format(
user=user_mention,
help_link="/help/stream-permissions",
help_link="/help/channel-permissions",
old_policy=old_policy_name,
new_policy=new_policy_name,
)

1
zerver/lib/url_redirects.py
View File

@ -103,6 +103,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
URLRedirect(
"/help/manage-user-stream-subscriptions", "/help/manage-user-channel-subscriptions"
),
URLRedirect("/help/stream-permissions", "/help/channel-permissions"),
]
LANDING_PAGE_REDIRECTS = [

30
zerver/openapi/zulip.yaml
View File

@ -813,7 +813,7 @@ paths:
When a user subscribes to a stream, the current user will receive this
event only if they [have permission to see the stream's subscriber
list](/help/stream-permissions). When the current user gains permission
list](/help/channel-permissions). When the current user gains permission
to see a given stream's subscriber list, they will receive this event
for the existing subscriptions to the stream.
@ -1274,7 +1274,7 @@ paths:
organization administrators will receive this event).
This event is also sent when a user gains access to a stream they
previously [could not access](/help/stream-permissions), such as
previously [could not access](/help/channel-permissions), such as
when their [role](/help/roles-and-permissions) changes, a
private stream is made public, or a guest user is subscribed
to a public (or private) stream.
@ -1345,7 +1345,7 @@ paths:
Event sent to all users who can see a stream when it is deactivated.
This event is also sent when a user loses access to a stream they
previously [could access](/help/stream-permissions) because they
previously [could access](/help/channel-permissions) because they
are unsubscribed from a private stream or their [role](/help/roles-and-permissions)
has changed.
@ -2068,7 +2068,7 @@ paths:
`recipient_id` fields.
[message-move-stream]: /help/move-content-to-another-channel
[stream-access]: /help/stream-permissions
[stream-access]: /help/channel-permissions
properties:
id:
$ref: "#/components/schemas/EventIdSchema"
@ -7996,7 +7996,7 @@ paths:
a target message ID of `first_message_id_allowed_to_move`, if the user
desires to move only the portion of the topic that they can.
Note that in a stream with [protected history](/help/stream-permissions),
Note that in a stream with [protected history](/help/channel-permissions),
the Zulip security model requires that the above calculations only include
messages the acting user has access to. So in the rare case of a user
attempting to move a topic that started before the user joined a private
@ -9084,7 +9084,7 @@ paths:
Get all topics the user has access to in a specific stream.
Note that for private streams with [protected
history](/help/stream-permissions), the user will only have access to
history](/help/channel-permissions), the user will only have access to
topics of messages sent after they [subscribed to](/api/subscribe) the
stream. Similarly, a user's [bot](/help/bots-overview#bot-type)
will only have access to messages sent after the bot was subscribed to
@ -9242,7 +9242,7 @@ paths:
by the optional parameters, like `invite_only`, detailed below.
Note that the ability to subscribe oneself and/or other users to a specified
stream depends on the [stream's privacy settings](/help/stream-permissions).
stream depends on the [stream's privacy settings](/help/channel-permissions).
**Changes**: Before Zulip 8.0 (feature level 208), if a user
specified by the [`principals`][principals-param] parameter was
@ -9609,9 +9609,9 @@ paths:
- Organization administrators can remove any user from any
stream.
- Users can remove a bot that they own from any stream that
the user [can access](/help/stream-permissions).
the user [can access](/help/channel-permissions).
- Users can unsubscribe any user from a stream if they [have
access](/help/stream-permissions) to the stream and are a
access](/help/channel-permissions) to the stream and are a
member of the [user group](/api/get-user-groups) specified
by the [`can_remove_subscribers_group`][can-remove-parameter]
for the stream.
@ -17571,7 +17571,7 @@ paths:
summary: Get all streams
tags: ["streams"]
description: |
Get all streams that the user [has access to](/help/stream-permissions).
Get all streams that the user [has access to](/help/channel-permissions).
x-curl-examples-parameters:
oneOf:
- type: include
@ -17866,12 +17866,12 @@ paths:
including:
- Stream [name](/help/rename-a-stream) and [description](/help/change-the-stream-description)
- Stream [permissions](/help/stream-permissions), including
- Stream [permissions](/help/channel-permissions), including
[privacy](/help/change-the-privacy-of-a-stream) and [who can
send](/help/stream-sending-policy).
Note that an organization administrator's ability to change a
[private stream's permissions](/help/stream-permissions#private-streams)
[private stream's permissions](/help/channel-permissions#private-channels)
depends on them being subscribed to the stream.
x-curl-examples-parameters:
oneOf:
@ -17951,7 +17951,7 @@ paths:
newly subscribed members, or users can only access messages
they actually received while subscribed to the stream.
Corresponds to the [shared history](/help/stream-permissions)
Corresponds to the [shared history](/help/channel-permissions)
option in documentation.
It's an error for this parameter to be false for a public or
@ -21658,7 +21658,7 @@ components:
newly subscribed members, or users can only access messages
they actually received while subscribed to the stream.
Corresponds to the [shared history](/help/stream-permissions)
Corresponds to the [shared history](/help/channel-permissions)
option in documentation.
type: boolean
example: false
@ -21746,7 +21746,7 @@ components:
ID of the [user group](/api/get-user-groups) whose members are
allowed to unsubscribe others from the stream. Note that a user
who is a member of the specified user group must also [have
access](/help/stream-permissions) to the stream in order to
access](/help/channel-permissions) to the stream in order to
unsubscribe others.
This setting can currently only be set to user groups that are

16
zerver/tests/test_subs.py
View File

@ -679,7 +679,7 @@ class StreamAdminTest(ZulipTestCase):
messages = get_topic_messages(user_profile, stream, "channel events")
self.assert_length(messages, 1)
expected_notification = (
f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/stream-permissions) "
f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/channel-permissions) "
"for this channel from **Private, protected history** to **Public**."
)
self.assertEqual(messages[0].content, expected_notification)
@ -740,7 +740,7 @@ class StreamAdminTest(ZulipTestCase):
messages = get_topic_messages(user_profile, stream, "channel events")
self.assert_length(messages, 1)
expected_notification = (
f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/stream-permissions) "
f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/channel-permissions) "
"for this channel from **Public** to **Private, protected history**."
)
self.assertEqual(messages[0].content, expected_notification)
@ -857,7 +857,7 @@ class StreamAdminTest(ZulipTestCase):
messages = get_topic_messages(user_profile, stream, "channel events")
self.assert_length(messages, 1)
expected_notification = (
f"@_**{user_profile.full_name}|{user_profile.id}** changed the [access permissions](/help/stream-permissions) "
f"@_**{user_profile.full_name}|{user_profile.id}** changed the [access permissions](/help/channel-permissions) "
"for this channel from **Private, protected history** to **Public, protected history**."
)
self.assertEqual(messages[0].content, expected_notification)
@ -896,7 +896,7 @@ class StreamAdminTest(ZulipTestCase):
messages = get_topic_messages(user_profile, stream, "channel events")
self.assert_length(messages, 1)
expected_notification = (
f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/stream-permissions) "
f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/channel-permissions) "
"for this channel from **Public** to **Private, shared history**."
)
self.assertEqual(messages[0].content, expected_notification)
@ -935,7 +935,7 @@ class StreamAdminTest(ZulipTestCase):
messages = get_topic_messages(user_profile, stream, "channel events")
self.assert_length(messages, 1)
expected_notification = (
f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/stream-permissions) "
f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/channel-permissions) "
"for this channel from **Private, protected history** to **Private, shared history**."
)
self.assertEqual(messages[0].content, expected_notification)
@ -1018,7 +1018,7 @@ class StreamAdminTest(ZulipTestCase):
messages = get_topic_messages(user_profile, stream, "channel events")
self.assert_length(messages, 1)
expected_notification = (
f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/stream-permissions) "
f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/channel-permissions) "
"for this channel from **Public** to **Web-public**."
)
self.assertEqual(messages[0].content, expected_notification)
@ -1055,7 +1055,7 @@ class StreamAdminTest(ZulipTestCase):
messages = get_topic_messages(user_profile, stream, "channel events")
self.assert_length(messages, 1)
expected_notification = (
f"@_**Iago|{user_profile.id}** changed the [access permissions](/help/stream-permissions) "
f"@_**Iago|{user_profile.id}** changed the [access permissions](/help/channel-permissions) "
"for this channel from **Private, protected history** to **Private, shared history**."
)
self.assertEqual(messages[0].content, expected_notification)
@ -1085,7 +1085,7 @@ class StreamAdminTest(ZulipTestCase):
messages = get_topic_messages(user_profile, stream, "channel events")
self.assert_length(messages, 2)
expected_notification = (
f"@_**Iago|{user_profile.id}** changed the [access permissions](/help/stream-permissions) "
f"@_**Iago|{user_profile.id}** changed the [access permissions](/help/channel-permissions) "
"for this channel from **Private, shared history** to **Private, protected history**."
)
self.assertEqual(messages[1].content, expected_notification)