help: Document new "who can subscribe" channel setting.

Also clean up link labels for "who can subscribe other users".

help/channel-permissions.md

@@ -22,6 +22,7 @@ regardless of its type:
 
 * [Who can send messages](/help/channel-posting-policy)
 * [Who can administer the channel](/help/configure-who-can-administer-a-channel)
+* [Who can subscribe themselves](/help/configure-who-can-subscribe)
 * [Who can subscribe anyone](/help/configure-who-can-invite-to-channels#configure-who-can-subscribe-anyone-to-a-specific-channel)
 * [Who can unsubscribe anyone](/help/configure-who-can-unsubscribe-others)
 
@@ -102,5 +103,6 @@ zulip-icon-globe"></i>) icon.
 * [Channel posting policy](/help/channel-posting-policy)
 * [Restrict channel creation](/help/configure-who-can-create-channels)
 * [Configure who can administer a channel](/help/configure-who-can-administer-a-channel)
-* [Restrict who can subscribe anyone](/help/configure-who-can-invite-to-channels)
+* [Configure who can subscribe to a channel](/help/configure-who-can-subscribe)
+* [Configure who can subscribe other users to channels](/help/configure-who-can-invite-to-channels)
 * [Configure who can unsubscribe anyone](/help/configure-who-can-unsubscribe-others)

help/configure-who-can-invite-to-channels.md

@@ -50,6 +50,7 @@ have content access in order to change this configuration.
 * [Channel permissions](/help/channel-permissions)
 * [User roles](/help/user-roles)
 * [User groups](/help/user-groups)
+* [Configure who can subscribe to a channel](/help/configure-who-can-subscribe)
 * [Configure who can unsubscribe anyone from a channel](/help/configure-who-can-unsubscribe-others)
 * [Subscribe users to a channel](/help/subscribe-users-to-a-channel)
 * [Unsubscribe users from a channel](/help/unsubscribe-users-from-a-channel)

help/configure-who-can-subscribe.md

@@ -0,0 +1,55 @@
+# Configure who can subscribe to a channel
+
+You can give users permission to subscribe to a channel. Everyone other than
+[guests](/help/guest-users) can subscribe to any
+[public](/help/channel-permissions#public-channels) or
+[web-public](/help/channel-permissions#web-public-channels) channel, so this
+feature is intended for use with [private
+channels](/help/channel-permissions#private-channels). Guests can never
+subscribe themselves to a channel.
+
+This permission grants access to channel content: users who are allowed to
+subscribe to a channel will also be able to read messages in it without
+subscribing.
+
+!!! tip ""
+
+    For example, you can give your team's [user group](/help/user-groups) permission
+    to subscribe to each of your team's channels. A designer on the team could then
+    follow a [link to a
+    conversation](/help/link-to-a-message-or-conversation#link-to-a-topic-within-zulip)
+    in the private engineering channel, and read it without subscribing. They could
+    subscribe if they need to send a message there, without asking for help.
+
+If you have permission to administer a public channel, you can configure who can
+subscribe to it. For [private
+channels](/help/channel-permissions#private-channels), you additionally need to
+have content access in order to change this configuration.
+
+{start_tabs}
+
+{tab|desktop-web}
+
+{relative|channel|all}
+
+1. Select a channel.
+
+{!select-channel-view-general.md!}
+
+1. Under **Channel permissions**, configure **Who can subscribe to this
+   channel**.
+
+{!save-changes.md!}
+
+{end_tabs}
+
+## Related articles
+
+* [Subscribe to a channel](/help/introduction-to-channels#browse-and-subscribe-to-channels)
+* [Channel permissions](/help/channel-permissions)
+* [User roles](/help/user-roles)
+* [User groups](/help/user-groups)
+* [Configure who can subscribe other users to channels](/help/configure-who-can-invite-to-channels)
+* [Configure who can unsubscribe anyone from a channel](/help/configure-who-can-unsubscribe-others)
+* [Subscribe users to a channel](/help/subscribe-users-to-a-channel)
+* [Unsubscribe users from a channel](/help/unsubscribe-users-from-a-channel)

help/include/channel-admin-permissions.md

@@ -20,7 +20,7 @@ However, the following actions require specific permissions.
 
 - **Seeing messages and topics**: Restricted to channel subscribers, and user
   who are allowed to subscribe themselves or any user.
-- Subscribing yourself or [other
+- Subscribing [yourself](/help/configure-who-can-subscribe) or [other
   users](/help/configure-who-can-invite-to-channels)
 - Modifying settings that affect content access (e.g., making a channel
   public, or changing who can add subscribers).

help/include/content-access-definition.md

@@ -1,3 +1,5 @@
 - They are subscribed to the channel, or
-- They have the [permission to add subscribers](/help/configure-who-can-invite-to-channels#configure-who-can-subscribe-anyone-to-a-specific-channel) (themselves or
+- They have the permission to add subscribers
-  others) to the channel.
+  ([themselves](/help/configure-who-can-subscribe) or
+  [others](/help/configure-who-can-invite-to-channels#configure-who-can-subscribe-anyone-to-a-specific-channel))
+  to the channel.

help/include/sidebar_index.md

@@ -214,6 +214,7 @@
 * [Channel posting policy](/help/channel-posting-policy)
 * [Configure who can administer a channel](/help/configure-who-can-administer-a-channel)
 * [Restrict channel creation](/help/configure-who-can-create-channels)
+* [Configure who can subscribe](/help/configure-who-can-subscribe)
 * [Configure who can subscribe others](/help/configure-who-can-invite-to-channels)
 * [Configure who can unsubscribe anyone](/help/configure-who-can-unsubscribe-others)
 * [Subscribe users to a channel](/help/subscribe-users-to-a-channel)

help/setting-up-zulip-for-a-class.md

@@ -162,7 +162,7 @@ how to assign roles and permissions for a class.
   (Recommended: Admins only)
 - Set [who can create channels](/help/configure-who-can-create-channels).
   (Recommended: Admins for public channels; Admins, moderators and members for private channels)
-- Set [who can subscribe users to channels](/help/configure-who-can-invite-to-channels).
+- Set [who can subscribe other users to channels](/help/configure-who-can-invite-to-channels).
   (Recommended: Admins and moderators)
 - Set [who can edit the topic of any message](/help/restrict-moving-messages).
   (Recommended: (default) Members for small classes;
@@ -193,7 +193,7 @@ how to assign roles and permissions for a class.
 - Set [who can create channels](/help/configure-who-can-create-channels).
   (Recommended: Admins and moderators for public channels;
    Admins, moderators and members for private channels)
-- Set [who can subscribe users to channels](/help/configure-who-can-invite-to-channels).
+- Set [who can subscribe other users to channels](/help/configure-who-can-invite-to-channels).
   (Recommended: Admins and moderators)
 - Set [who can edit the topic of any message](/help/restrict-moving-messages).
   (Recommended: Admins and moderators)

help/subscribe-users-to-a-channel.md

@@ -112,7 +112,7 @@ subscribe the user.
 * [Introduction to channels](/help/introduction-to-channels)
 * [Unsubscribe users from a channel](/help/unsubscribe-users-from-a-channel)
 * [Manage a user's channel subscriptions](/help/manage-user-channel-subscriptions)
-* [Restrict channel invitations](/help/configure-who-can-invite-to-channels)
+* [Configure who can subscribe other users to channels](/help/configure-who-can-invite-to-channels)
 * [Set default channels for new users](/help/set-default-channels-for-new-users)
 * [User roles](/help/user-roles)
 * [Mention a user or group](/help/mention-a-user-or-group)

templates/corporate/security.md

@@ -57,7 +57,7 @@ priority.
   accounts are older than a [configurable waiting period][waiting_period].
 - Zulip also supports customizing whether non-admins can
   [create channels](/help/configure-who-can-create-channels),
-  [invite to channels](/help/configure-who-can-invite-to-channels),
+  [subscribe other users to channels](/help/configure-who-can-invite-to-channels),
   [add custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji),
   [add integrations and bots](/help/restrict-bot-creation),
   [edit or delete messages](/help/restrict-message-editing-and-deletion),