Merge branch 'master' into amyblais-patch-1

source/about/faq-product.rst

@@ -84,9 +84,9 @@ Teams
 +----------------------------------------------------------------------------------------------+-------------+-------------+-------------+
 | :ref:`Create a new team <collaborate/organize-using-teams:create a team>`                    | |checkmark| | |checkmark| |             |
 +----------------------------------------------------------------------------------------------+-------------+-------------+-------------+
-| :ref:`Get team invite link <collaborate/invite-people:send a team invite link>`              | |checkmark| | |checkmark| | |checkmark| |
+| :doc:`Share an invite link </collaborate/invite-people>`                                     | |checkmark| | |checkmark| | |checkmark| |
 +----------------------------------------------------------------------------------------------+-------------+-------------+-------------+
-| :ref:`Add members to team <collaborate/invite-people:add people to your workspace>`          | |checkmark| | |checkmark| | |checkmark| |
+| :doc:`Invite people </collaborate/invite-people>`                                            | |checkmark| | |checkmark| | |checkmark| |
 +----------------------------------------------------------------------------------------------+-------------+-------------+-------------+
 | :ref:`Manage team members <manage/team-channel-members:teams>`                               | |checkmark| | |checkmark| |             |
 +----------------------------------------------------------------------------------------------+-------------+-------------+-------------+

source/collaborate/archive-unarchive-channels.rst

@@ -7,16 +7,11 @@ Archive and unarchive channels
 Archive a channel
 -----------------
 
-You can delete a channel in Mattermost when it's no longer useful by archiving it. Anyone using Mattermost can archive the public channels or private channels they're a member of, unless the system admin has restricted the permissions to do so. 
+Delete :ref:`public channels <collaborate/channel-types:public channels>` and :ref:`private channels <collaborate/channel-types:private channels>` when they're no longer needed by archiving them. Archiving channels removes them from the channel sidebar and marks them as read-only. Anyone can archive a public or private channel they're a member of, unless your system admin has :doc:`disabled </onboard/advanced-permissions>` your ability to do so.
 
-When a channel is archived, it's deleted from the user interface, but a copy exists on the server in case it's needed for audit reasons in the future, or in case you decide to restore the channel by `unarchiving it <#unarchive-a-channel>`__. 
-
-.. note::
+.. tip::
 
-  - All users are added to the **Off-Topic** and **Town Square** channels automatically. Town Square can't be archived.
-  - System admins can archive channels in the System Console without needing to be a channel member.
-  - Because a copy of the channel exists on the server, you can't reuse the URL of an archived channel when :doc:`creating a new channel </collaborate/create-channels>`.
-  - Instead of archiving the channel, you can also leave it open and post a message in the channel saying it's considered archived, such as: ``# This channel is archived.``
+  You can continue to access archived channels, unless your system admin has :ref:`disabled <configure/site-configuration-settings:allow users to view archived channels>` your ability to do so.
 
 .. tab:: Web/Desktop
 
@@ -56,10 +51,18 @@ When a channel is archived, it's deleted from the user interface, but a copy exi
     :alt: Tap on Yes to confirm your choice.
     :scale: 30
 
+.. note::
+
+  - When a Mattermost user is deactivated in the system, your :ref:`direct message channel <collaborate/channel-types:direct message channels>` with that user are archived and marked as read-only. An **Archived** icon |file-box| displays next to archived channels.
+  - :ref:`Group message channels <collaborate/channel-types:group message channels>` can't be archived, but they can be closed to hide them from the channel sidebar.
+  - The default **Town Square** channel can't be archived.
+  - System admins can archive channels without needing to be a channel member by using the System Console.
+  - Because a copy of the channel exists on the server, you can't reuse the URL of an archived channel when :doc:`creating a new channel </collaborate/create-channels>`.
+
 Unarchive a channel
 -------------------
 
-System admins and Team admins can restore archived channels. When a channel is unarchived, channel membership and all its content is restored, unless messages and files have been deleted based on the :ref:`data retention policy <configure/compliance-configuration-settings:data retention policies>`.
+System admins and Team admins can restore archived channels. When a channel is unarchived, channel membership and all its content is restored, unless messages and files have been deleted based on a :ref:`data retention policy <configure/compliance-configuration-settings:data retention policies>`.
 
 .. tab:: Web/Desktop
 

source/collaborate/channel-types.rst

@@ -4,46 +4,67 @@ Channel types
 .. include:: ../_static/badges/allplans-cloud-selfhosted.rst
   :start-after: :nosearch:
 
-Channels are used to organize conversations across different topics. Find available channels in the left-hand panel. There are four types of channels: public channels, private channels, direct messages, and group messages. Enterprise system administrators can also configure channels as :ref:`read-only <onboard/advanced-permissions:read only channels>`.
+Channels are used to organize conversations across different topics. The channels you're a member of display in the left pane. Learn how to create channels by visiting the :doc:`create channels </collaborate/create-channels>` documentation.
 
-Sending messages, replying to messages, and participating in conversation threads are important ways to keep conversations active with your team. See the following topics to learn more about working with channels.
+There are 5 types of channels in Mattermost: 
+
+- `Public channels <#public-channels>`__
+- `Private channels <#private-channels>`__
+- `Direct message channels <#direct-message-channels>`__
+- `Group message channels <#group-message-channels>`__
+- `Archived channels <#archived-channels>`__
+
+.. tip::
+
+  Enterprise customers can additionally configure :ref:`read-only <onboard/advanced-permissions:read only channels>` broadcast channels.
 
 Public channels
 ---------------
 
 Public channels are open to everyone on a team and are identified with a **Globe** |globe| icon. New team members are automatically added to two public channels when they sign up: **Town Square** and **Off-Topic**.
 
-See the :doc:`Join and leave channels </collaborate/join-leave-channels>` documentation for details on discovering and joining other channels.
+See the :doc:`Join and leave channels </collaborate/join-leave-channels>` documentation for details on discovering, joining, and leaving other channels.
 
 Private channels
 ----------------
 
-Private channels are for sensitive topics and are only visible to selected team members. Private channels are identified with a **Lock** |lock| icon. In Team Edition, any member of a private channel can add or remove other members from private channels, but in other Mattermost versions these permissions can be restricted to the channel admins and system admins.
+Private channels are channels for sensitive topics and are only visible to selected team members. Private channels are identified with a **Lock** |lock| icon. Channel members can choose to leave private channels at any time.
 
-Channel members can choose to leave private channels at any time.
+.. note::
 
-Direct messages
----------------
+  - Mattermost Enterprise and Professional customers can restrict channel management to system and channel admins.
+  - In a Mattermost Team Edition instance, any member of a private channel can add or remove other members from private channels.
+
+Direct message channels
+-----------------------
 
-Direct messages conversations between 2 people. You can start a direct message with people on other teams :ref:`unless the system admin has disabled your ability to do so <configure/site-configuration-settings:enable users to open direct message channels with>`. Only members of the conversation can see direct messages and channel heading information, including the last active status of the other user. 
+Direct message channels are for conversations between 2 people. Only members of the conversation can see direct messages and channel heading information, including the last active status of the other user.
 
-Direct messages increment the numbered badge and trigger a notification unless the direct message is muted, or your notifications are disabled. See the :doc:`notification documentation </preferences/manage-your-notifications>` for details on customizing notifications based on your preferences.
+You can start a direct message with people on other teams :ref:`unless the system admin has disabled your ability to do so <configure/site-configuration-settings:enable users to open direct message channels with>`.  
+
+Direct messages update the numbered badge count and trigger a notification unless the direct message is muted, or your notifications are disabled. See the :doc:`notification documentation </preferences/manage-your-notifications>` for details on customizing notifications based on your preferences.
 
 .. note::
 
   - From Mattermost v10, when sending a direct message, Mattermost warns you that the recipient's availability is set to :ref:`Do Not Disturb <preferences/set-your-status-availability:set your availability>`, and when the recipient's local time is outside of regular business hours (between 10PM and 6AM). This warning displays directly above the message text field.
-
-  - Any message history you have with a deactivated user remains available :ref:`unless your system admin disables your ability to do so <configure/site-configuration-settings:allow users to view archived channels>`.
+  - When a Mattermost user is deactivated in the system, your :ref:`direct message channel <collaborate/channel-types:direct message channels>` with that user are `archived <#archived-channels>`__ and marked as read-only. An **Archived** icon |file-box| displays next to archived channels.
 
-Group messages
---------------
+Group message channels
+----------------------
 
-Group messages are conversations between 3 to 7 people. You can also start a group message with people on other teams when :ref:`unless the system admin has disabled your ability to do so <configure/site-configuration-settings:enable users to open direct message channels with>`. Only members of the conversation can see group messages. Group messages always display a new message badge.
+Group message channels are for conversations between 3 to 7 people. Only members of the conversation can see group messages. Group messages always display a new message badge.
 
-From Mattermost v9.1, group messages increment the numbered badge and trigger a notification unless the direct message is muted, or your notifications are disabled. You can control how you're notified about group message conversations by going to **Settings > Notifications**. See the :doc:`notification documentation </preferences/manage-your-notifications>` to learn more.
+Want to have a group conversation with more than 7 people? :doc:`Create a private channel </collaborate/create-channels>`. Alternatively, from Mattermost v9.1, you can :doc:`convert group messages to a private channel </collaborate/convert-group-messages>`.
 
 .. note::
 
-   - Want to have a group conversation with more than 7 people? You can :doc:`create a private channel </collaborate/create-channels>`. Alternatively, from Mattermost v9.1, you can :doc:`convert the group message to a private channel </collaborate/convert-group-messages>`.
-
-   - Any group message history you have with a deactivated user remains available :ref:`unless your system admin disables your ability to do so <configure/site-configuration-settings:allow users to view archived channels>`.
+  - You can start a group message with people on other teams when :ref:`unless the system admin has disabled your ability to do so <configure/site-configuration-settings:enable users to open direct message channels with>`.
+  - From Mattermost v9.1, group messages increase the numbered badge count and trigger a notification unless the direct message is muted, or your notifications are disabled. Control how you're notified about group message conversations by going to **Settings > Notifications**. See the :doc:`notification documentation </preferences/manage-your-notifications>` to learn more.
+  - Any group message history you have with a deactivated user remains available :ref:`unless your system admin disables your ability to do so <configure/site-configuration-settings:allow users to view archived channels>`.
+
+Archived channels
+-----------------
+
+Archived channels are deactivated public, private, direct message, or group message channels that are no longer used. Archived channels are identified with a **File Box** |file-box| icon. 
+
+:ref:`Archiving a channel <collaborate/archive-unarchive-channels:archive a channel>` marks it read-only to prevent new messages from being sent and preserve channel history. You can continue to access archived channels, unless your system admin has :ref:`disabled <configure/site-configuration-settings:allow users to view archived channels>` your ability to do so.

source/collaborate/collaborate-within-channels.rst

@@ -4,7 +4,7 @@ Collaborate within channels
 .. include:: ../_static/badges/allplans-cloud-selfhosted.rst
   :start-after: :nosearch:
 
-Channels are where you connect, collaborate, and communicate with your team about various topics or projects. Use channels to organize conversations across different topics. :doc:`Sending messages </collaborate/send-messages>`, :doc:`replying to messages </collaborate/reply-to-messages>`, and :ref:`participating in conversation threads <collaborate/organize-conversations:start or reply to threads>` are important ways to keep conversations active with your team.
+Channels are where you connect, collaborate, and communicate with your team about various topics or projects. Use channels to organize conversations across different topics. as you're :doc:`sending messages </collaborate/send-messages>`, :doc:`replying to messages </collaborate/reply-to-messages>`, and :ref:`participating in conversation threads <collaborate/organize-conversations:start or reply to threads>`.
 
 You're added to default channels automatically
 ----------------------------------------------
@@ -15,19 +15,14 @@ Everyone who joins a Mattermost :doc:`workspace </guides/use-mattermost>` is aut
 - **Off-Topic** is great for fun, social, non-work-related conversations.
 
 .. note::
-  All users are added to the **Off-Topic** and **Town Square** channels automatically. Town Square can't be :ref:`archived <collaborate/archive-unarchive-channels:archive a channel>` or :doc:`converted to a private channel </collaborate/convert-public-channels>`, and users can't :ref:`leave <collaborate/join-leave-channels:leave a channel>` the Town Square channel.
+  Town Square can't be :ref:`archived <collaborate/archive-unarchive-channels:archive a channel>` or :doc:`converted to a private channel </collaborate/convert-public-channels>`, and users can't :ref:`leave <collaborate/join-leave-channels:leave a channel>` this default channel.
 
 Channel sidebar
 ----------------
 
-In the channel sidebar on the left, you'll find all of the the channels you're a member of as well as useful channel management tools. As your channel sidebar fills up with channels you've joined, you can organize your channels into categories based on how you work. See the :doc:`customize your channel sidebar </preferences/customize-your-channel-sidebar>` documentation for details.
+In the channel sidebar on the left, you'll find all of the the channels you're a member of as well as useful channel management tools. See the :doc:`channel types <>` to learn about the types of channels available, how they work, and how to identify them in the channel sidebar. Learn how to create channels by visiting the :doc:`create channels </collaborate/create-channels>` documentation.
 
-Mattermost offers four types of channels: **public channels**, **private channels**, **direct messages**, and **group messages**. See the :doc:`Channel Types </collaborate/channel-types>` documentation for more information. :doc:`Create channels </collaborate/create-channels>`, or start a new direct or group message by selecting the **Plus** |plus| icon.
-
-- **Public** channels are identified with a **Globe** |globe| icon. Anyone on the team can join a public channel.
-- **Private** channels are typically used for sensitive topics, and are identified with a **Lock** |lock| icon. You must be invited to private channels by another channel member.
-- **Direct messages** are private conversations between two people.
-- **Group messages** are private conversations for small groups of up to seven people. For larger group conversations, use a private channel instead.
+As your channel sidebar fills up with channels you've joined, you can organize your channels into categories based on how you work. See the :doc:`customize your channel sidebar </preferences/customize-your-channel-sidebar>` documentation for details.
 
 Learn more
 ----------
@@ -55,7 +50,6 @@ Learn more about collaborating within Mattermost channels:
   Mark channels as unread </collaborate/mark-channels-unread>
   Archive and unarchive channels </collaborate/archive-unarchive-channels>
 
-* :doc:`Channel types </collaborate/channel-types>` - Learn more about the types of channels available in Mattermost.
 * :doc:`Channel naming conventions </collaborate/channel-naming-conventions>` - Learn why channel names are important.
 * :doc:`Communicate a channel's focus and scope </collaborate/channel-header-purpose>` - Learn how to communicate a channel's scope and focus.
 * :doc:`Browse channels </collaborate/browse-channels>` - Browse all available public channels you can join, and all channels you're a member of.