V10.2 Docs (#7494)

* Update conf.py * Re-adding missing image * Removed Cloud deploy badge (#7513) * Removed full screen mode on Linux (#7514) * Replaced Calls plugin prefs with general page (#7516) * Updated End Call for All to server v10.2 (#7517) * Updated list of exported data (#7518) * Pinned icon hidden when no messages pinned in channel (#7519) * Pinned icon hidden when no messages pinned in channel * Update source/collaborate/save-pin-messages.rst * Added release details for MobileExternalBrowser (#7520) * Clarified AllowOtherServers functionality (#7556) * Clarified that LDAP users can't be deactivated via MM (#7561) * Added menu option to access logs (#7521) * Added EnableAPIPostDeletion config setting & mmctl command (#7563) * Added PG FAQs based on customer input (#7586) * Added env var developer mode setting (#7515) * Added env var developer mode setting * Update source/configure/environment-configuration-settings.rst * Update source/configure/environment-configuration-settings.rst * Editing pass updates * Added upgrade & maintenance guidance for plugins (#7554) * Added upgrade & maintenance guidance for plugins * Update source/integrate/github-interoperability.rst Co-authored-by: Maria A Nunez <[email protected]> * Update source/guides/integrate-and-extend.rst * Incorporated reviewer feedback --------- Co-authored-by: Maria A Nunez <[email protected]> * Config in database corrections (#7559) * Reordered process * Elevated HA guidance * Incorporated reviewer feedback * Updated language & added docs link (#7582) * Docs listening: Clarified the path config for the ES certificate (#7583) * Clarified the path config for the ES certificate * Update source/configure/environment-configuration-settings.rst * Added mobile workflow (#7584) * Added Playbooks FAQs based on customer feedback (#7585) * Docs listening: Added custom emoji screenshot (#7587) * Added custom emoji screenshot * Update source/collaborate/react-with-emojis-gifs.rst * v10.2 Changelog (#7497) * Update mattermost-server-releases.md * Update download-latest-tarball.rst * Update deprecated-features.rst * Update mattermost-server-releases.md * Update release-policy.md * Update mattermost-mobile-releases.md * Update mattermost-desktop-releases.md * Update mattermost-v10-changelog.md * Update mattermost-v9-changelog.md * Update version-archive.rst * Update important-upgrade-notes.rst * Update prepare-to-upgrade-mattermost.rst * Update open-source-components.rst * Update mattermost-v10-changelog.md * Update important-upgrade-notes.rst * Update deprecated-features.rst * Update mattermost-server-releases.md * Update release-policy.md * Update mattermost-v10-changelog.md * Update mattermost-v10-changelog.md * Update mattermost-v10-changelog.md * Update mattermost-v10-changelog.md * Update mattermost-v10-changelog.md * Apply suggestions from code review Co-authored-by: Doug Lauder <[email protected]> * Update source/about/mattermost-v10-changelog.md Co-authored-by: Doug Lauder <[email protected]> * Apply suggestions from code review Co-authored-by: Doug Lauder <[email protected]> * Update source/about/mattermost-v10-changelog.md Co-authored-by: Carrie Warner (Mattermost) <[email protected]> * Update source/about/mattermost-v10-changelog.md Co-authored-by: Christopher Poile <[email protected]> * Update mattermost-v10-changelog.md * Update mattermost-v10-changelog.md * Update mattermost-v10-changelog.md * Update mattermost-v10-changelog.md * Update mattermost-v10-changelog.md --------- Co-authored-by: Doug Lauder <[email protected]> Co-authored-by: Carrie Warner (Mattermost) <[email protected]> Co-authored-by: Christopher Poile <[email protected]> * Added guidance on using team-URL over display name (#7588) * Replaced YES with standard green checkmarks (#7589) * Docs listening: Elevate comply and secure topics to align with scale (#7592) * Elevated secure & comply to align with scale * Added breadcrumb links to related topics * Clarified that admins can perform any actions on a system (#7596) * Fixed build warning * Connected workspaces rewrites & updates for Beta release (#7575) * Connected workspaces rewrites & updates for Beta release * Added config settings, page redirects * Update source/conf.py * Update source/configure/reporting-configuration-settings.rst Co-authored-by: Miguel de la Cruz <[email protected]> * Update source/configure/reporting-configuration-settings.rst Co-authored-by: Miguel de la Cruz <[email protected]> * Update source/configure/site-configuration-settings.rst Co-authored-by: Miguel de la Cruz <[email protected]> * Update source/configure/site-configuration-settings.rst Co-authored-by: Miguel de la Cruz <[email protected]> * Update source/onboard/connected-workspaces.rst Co-authored-by: Miguel de la Cruz <[email protected]> * Update source/configure/site-configuration-settings.rst Co-authored-by: Miguel de la Cruz <[email protected]> * Added telemetry and deprecated remote cluster config * Updated default value --------- Co-authored-by: Miguel de la Cruz <[email protected]> * Link check fixes * Added best practice recommendations re: attributes & identifiers (#7562) --------- Co-authored-by: Carrie Warner (Mattermost) <[email protected]> Co-authored-by: Maria A Nunez <[email protected]> Co-authored-by: Doug Lauder <[email protected]> Co-authored-by: Christopher Poile <[email protected]> Co-authored-by: Miguel de la Cruz <[email protected]>
mattermost · Nov 15, 2024 · 555f7d3 · 555f7d3
1 parent 6894ecd
commit 555f7d3
Show file tree

Hide file tree

Showing 96 changed files with 1,277 additions and 800 deletions.
diff --git a/source/_static/badges/allplans-cloud-selfhosted.md b/source/_static/badges/allplans-cloud-selfhosted.md
@@ -2,9 +2,9 @@
 <div class="mm-plans-badge">
 ```
 
-![plans-img](../_static/images/badges/flag_icon.svg) Available on [all plans](https://mattermost.com/pricing/)
+![plans-img](/_static/images/badges/flag_icon.svg) Available on [all plans](https://mattermost.com/pricing/)
 
-![deployment-img](../_static/images/badges/deployment_icon.svg) [Cloud](https://mattermost.com/sign-up/) and [self-hosted](https://mattermost.com/deploy/) deployments
+![deployment-img](/_static/images/badges/deployment_icon.svg) [Cloud](https://mattermost.com/sign-up/) and [self-hosted](https://mattermost.com/deploy/) deployments
 
 ```{raw} html
 </div>

diff --git a/source/_static/badges/ent-only.md b/source/_static/badges/ent-only.md
@@ -2,7 +2,7 @@
 <div class="mm-plans-badge">
 ```
 
-![plans-img](../_static/images/badges/flag_icon.svg) Available only on [Enterprise](https://mattermost.com/pricing/) plans
+![plans-img](/_static/images/badges/flag_icon.svg) Available only on [Enterprise](https://mattermost.com/pricing/) plans
 
 ```{raw} html
 </div>

diff --git a/source/_static/badges/selfhosted-only.md b/source/_static/badges/selfhosted-only.md
@@ -4,7 +4,7 @@
 
 Note
 
-![deployment-img-yellow](../_static/images/badges/deployment_icon_yellow.svg) Available only for `self-hosted <https://mattermost.com/deploy/>`_ deployments
+![deployment-img-yellow](_static/images/badges/deployment_icon_yellow.svg) Available only for `self-hosted <https://mattermost.com/deploy/>`_ deployments
 
 ```{raw} html
 </div>

diff --git a/source/about/certifications-and-compliance.rst b/source/about/certifications-and-compliance.rst
@@ -156,7 +156,7 @@ Mattermost Enterprise Edition (includes Mattermost Professional & Enterprise) is
 The other key areas to be aware of for an export of Mattermost software or technology are:
 
 **Sanctions**: There are comprehensive sanctions to Cuba, Iran, North Korea, Syria, and other countries/territories with specific prohibitions, such as Crimea, Donetsk, and Luhansk regions of Ukraine, Belarus, Russia, Venezuela, Myanmar/Burma, and Cambodia. Details can be
-located at `BIS <https://www.bis.doc.gov/index.php/forms-documents/regulations-docs/federal-register-notices/federal-register-2014/1063-746-1/file>`_ and `OFAC <https://www.treasury.gov/resource-center/sanctions/Pages/default.aspx>`_. The countries and their sanctions are subject to change.
+located at `BIS <https://www.bis.doc.gov/index.php/forms-documents/regulations-docs/federal-register-notices/federal-register-2014/1063-746-1/file>`_ and `OFAC <https://ofac.treasury.gov/>`_. The countries and their sanctions are subject to change.
 
 **WMD (Weapons of Mass Destruction)**: Mattermost, its customers and its business partners may not export to parties involved
 in `proliferation <https://www.bis.doc.gov/index.php/documents/regulation-docs/413-part-736-general-prohibitions/file>`_ of weapons of mass destruction, along with other prohibited end-uses under the U.S. Export Administration Regulations (“EAR”).

diff --git a/source/about/cloud-subscriptions.rst b/source/about/cloud-subscriptions.rst
@@ -24,32 +24,32 @@ Enterprises can choose between dedicated and shared infrastructure based on your
 Compare offerings
 -----------------
 
-+-------------------------------+---------------+------------+
-| **Resource**                  | **Dedicated** | **Shared** |
-+===============================+===============+============+
-| Mattermost High Availability  |      YES      |     YES    |
-| cluster-based deployment      |               |            |
-+-------------------------------+---------------+------------+
-| Network policy                |      YES      |     YES    |
-+-------------------------------+---------------+------------+
-| Namespace                     |      YES      |     YES    |
-+-------------------------------+---------------+------------+
-| Network                       |      YES      |     NO     |
-+-------------------------------+---------------+------------+
-| Kubernetes High Availability  |      YES      |     NO     |
-+-------------------------------+---------------+------------+
-| Database High Availability    |      YES      |     NO     |
-+-------------------------------+---------------+------------+
-| Object storage                |      YES      |     NO     |
-+-------------------------------+---------------+------------+
-| Encryption keys               |      YES      |     NO     |
-+-------------------------------+---------------+------------+
-| Custom backup schedule        |      YES      |     NO     |
-+-------------------------------+---------------+------------+
-| IP Filtering                  |      YES      |     YES    |
-+-------------------------------+---------------+------------+
-| Bring your own key            |      YES      |     NO     |
-+-------------------------------+---------------+------------+
++-------------------------------+---------------+-------------+
+| **Resource**                  | **Dedicated** | **Shared**  |
++===============================+===============+=============+
+| Mattermost High Availability  | |checkmark|   | |checkmark| |
+| cluster-based deployment      |               |             |
++-------------------------------+---------------+-------------+
+| Network policy                | |checkmark|   | |checkmark| |
++-------------------------------+---------------+-------------+
+| Namespace                     | |checkmark|   | |checkmark| |
++-------------------------------+---------------+-------------+
+| Network                       | |checkmark|   |             |
++-------------------------------+---------------+-------------+
+| Kubernetes High Availability  | |checkmark|   |             |
++-------------------------------+---------------+-------------+
+| Database High Availability    | |checkmark|   |             |
++-------------------------------+---------------+-------------+
+| Object storage                | |checkmark|   |             |
++-------------------------------+---------------+-------------+
+| Encryption keys               | |checkmark|   |             |
++-------------------------------+---------------+-------------+
+| Custom backup schedule        | |checkmark|   |             |
++-------------------------------+---------------+-------------+
+| IP Filtering                  | |checkmark|   | |checkmark| |
++-------------------------------+---------------+-------------+
+| Bring your own key            | |checkmark|   |             |
++-------------------------------+---------------+-------------+
 
 Frequently asked questions about Mattermost Cloud
 -------------------------------------------------

diff --git a/source/about/deprecated-features.rst b/source/about/deprecated-features.rst
@@ -9,20 +9,20 @@ Removed features in upcoming versions
 Mattermost Server v10.5.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- In the February 2025 Mattermost release (and next ESR), the Mattermost server will stop supporting manual plugin deployment. Plugins are deployed manually when an administrator or some deployment automation copies the contents of a plugin bundle into the server's working directory. If a manual or automated deployment workflow is still required, administrators can instead prepackage the plugin bundles. See more details in `this forum post <https://forum.mattermost.com/t/deprecation-notice-manual-plugin-deployment/21192>`_.
+- In the February 2025 Mattermost release (and next ESR), the Mattermost server will stop supporting manual plugin deployment. Plugins are deployed manually when an administrator or some deployment automation copies the contents of a plugin bundle into the server's working directory. If a manual or automated deployment workflow is still required, administrators can instead prepackage the plugin bundles. See more details in `this forum post <https://forum.mattermost.com/t/deprecation-notice-manual-plugin-deployment/21192>`__.
 
 Mattermost Server v10.3.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 - As part of our continuous efforts to enhance your user experience, we will be phasing out the Classic Mobile App. Please download the new v2 Mobile App from the `Apple App Store <https://apps.apple.com/us/app/mattermost/id1257222717>`_ or `Google Play Store <https://play.google.com/store/apps/details?id=com.mattermost.rn>`_ to continue enjoying our services without interruption. See more details in the `classic mobile app deprecation <https://forum.mattermost.com/t/classic-mobile-app-deprecation/18703>`_ Mattermost forum post.
 
+Removed features by Mattermost version
+----------------------------------------
+
 Mattermost Server v10.2.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- Docker Content Trust (DCT) for signing Docker image artifacts will be replaced by Sigstore Cosign in our upcoming release, v10.2 (November, 2024). If you rely on artifact verification using DCT, please `transition to using Cosign <https://edu.chainguard.dev/open-source/sigstore/cosign/how-to-install-cosign/>`_. See `this forum post <https://forum.mattermost.com/t/upcoming-dct-deprecation/19275>`_ for more details.
-
-Removed features by Mattermost version
-----------------------------------------
+- Docker Content Trust (DCT) for signing Docker image artifacts has been replaced by Sigstore Cosign in v10.2 (November, 2024). If you rely on artifact verification using DCT, please `transition to using Cosign <https://edu.chainguard.dev/open-source/sigstore/cosign/how-to-install-cosign/>`_. See `this forum post <https://forum.mattermost.com/t/upcoming-dct-deprecation/19275>`__ for more details.
 
 Mattermost Server v10.0.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/source/about/desktop-app-changelog.md b/source/about/desktop-app-changelog.md
@@ -197,7 +197,7 @@ Mattermost v5.8.0 contains low to medium severity level security fixes. Upgradin
 
 **Release Date: December 15, 2023**
 
-**Download Binaries:** [Mattermost Desktop on GitHub](https://github.com/mattermost/desktop/releases/tag/v5.6.0>)
+**Download Binaries:** [Mattermost Desktop on GitHub](https://github.com/mattermost/desktop/releases/tag/v5.6.0)
 
 ### Compatibility
 
@@ -557,7 +557,7 @@ Mattermost v5.1.0 contains a low severity level security fix. Upgrading is highl
 
 #### macOS
 
-- Mattermost can now be installed on the [Mac App Store](https://apps.apple.com/app/mattermost-desktop/id1614666244). Even if you’re already using Mattermost desktop on Mac, you can download and install it via the Mac App Store to access future automatic updates.
+- Mattermost can now be installed on the [Mac App Store](https://apps.apple.com/us/app/mattermost-desktop/id1614666244?mt=12). Even if you’re already using Mattermost desktop on Mac, you can download and install it via the Mac App Store to access future automatic updates.
 
 #### Linux
 
@@ -1324,7 +1324,7 @@ Release date: May 16, 2018
 
 - Updated design for loading animation icon.
 - Improved appearance of server tabs.
-- Enabled [Certificate Transparency](https://www.certificate-transparency.org/what-is-ct) verification in HTTPS.
+- Enabled [Certificate Transparency](https://certificate.transparency.dev/) verification in HTTPS.
 
 #### Windows
 
@@ -1807,7 +1807,7 @@ Version number updated to 3.4 to make numbering consistent with Mattermost serve
 
 - Added an option to flash taskbar icon when a new message is received
 - Added a badge to count mentions on the taskbar icon (for Unity)
-- Added a script, `create_desktop_file.sh` to create `Mattermost.desktop` desktop entry to help [integrate the application into a desktop environment](https://wiki.archlinux.org/index.php/Desktop_entries) more easily
+- Added a script, `create_desktop_file.sh` to create `Mattermost.desktop` desktop entry to help [integrate the application into a desktop environment](https://wiki.archlinux.org/title/Desktop_entries) more easily
 - Added access to the settings menu from the system tray icon
 - Only one instance of the desktop application will now load at a time
 

diff --git a/source/about/editions-and-offerings.rst b/source/about/editions-and-offerings.rst
@@ -70,7 +70,7 @@ This offering includes all the features of `Mattermost Professional <#mattermost
 - :doc:`Advanced configuration of playbook permissions, and analytics dashboards </repeatable-processes/share-and-collaborate>`
 - :doc:`Channel export </comply/export-mattermost-channel-data>`
 - :ref:`Enhanced compliance controls and granular audit logs with data export <manage/logging:audit logging (beta)>`.
-- :doc:`Advanced collaboration with shared channels across Mattermost instances </onboard/shared-channels>`.
+- :doc:`Advanced collaboration with connected workspaces across Mattermost instances </onboard/connected-workspaces>`.
 - :doc:`High availability support with multi-node database deployment </scale/high-availability-cluster-based-deployment>`.
 - :doc:`Horizontal scaling through cluster-based deployment </scale/scaling-for-enterprise>`.
 - :doc:`Advanced performance monitoring </scale/deploy-prometheus-grafana-for-performance-monitoring>`.

diff --git a/source/about/faq-integrations.rst b/source/about/faq-integrations.rst
@@ -1,6 +1,11 @@
 Integration questions
 =====================
 
+What integrations come pre-packaged with Mattermost Server?
+------------------------------------------------------------
+
+See the :doc:`integrate and extend </guides/integrate-and-extend>` documentation for details on pre-packaged integrations available with Mattermost Server.
+
 Can I use Mattermost to add messaging functionality to my proprietary SaaS service?
 ------------------------------------------------------------------------------------
 

diff --git a/source/about/faq-license.rst b/source/about/faq-license.rst
@@ -50,7 +50,7 @@ Mattermost Websites
 | Website                    | License                                                                                                                                                          | Terms and Conditions                                                                  | Privacy Policy                                                                                                            |
 +============================+==================================================================================================================================================================+=======================================================================================+===========================================================================================================================+
 | Mattermost Websites:       | Open source under                                                                                                                                                | `Mattermost Terms of Use <https://mattermost.com/terms-of-service/>`__                | `Mattermost Websites Privacy Policy <https://mattermost.com/privacy-policy/>`__                                           |
-|                            | `Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License (CC BY-NC-SA 3.0) <https://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US>`__. |                                                                                       |                                                                                                                           |
+|                            | `Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License (CC BY-NC-SA 3.0) <https://creativecommons.org/licenses/by-nc-sa/3.0/deed.en>`__.    |                                                                                       |                                                                                                                           |
 |  - about.mattermost.com    |                                                                                                                                                                  |                                                                                       |                                                                                                                           |
 |  - mattermost.com          |                                                                                                                                                                  |                                                                                       |                                                                                                                           |
 |  - mattermost.org          |                                                                                                                                                                  |                                                                                       |                                                                                                                           |

diff --git a/source/about/faq-video-audio-screensharing.rst b/source/about/faq-video-audio-screensharing.rst
@@ -6,4 +6,4 @@ What support is available for video and audio calling and screen sharing?
 
 Start secure audio calls with screen sharing support directly within Mattermost with :doc:`Mattermost Calls </collaborate/make-calls>`.
 
-Visit the `Mattermost Marketplace <https://mattermost.com/marketplace/>`_ to learn more about more popular options available, including self-hosted, self-hosted private cloud solutions, and vendor-hosted SaaS solutions.
+See the :doc:`collaborate with audio and video </collaborate/collaborate-with-audio-video>` documentation for details on additional video conferencing integrations available for Mattermost.
diff --git a/source/about/mattermost-desktop-releases.md b/source/about/mattermost-desktop-releases.md
@@ -4,7 +4,7 @@
 ```
 
 ```{Important}
- Support for Mattermost Server v9.5 [Extended Support Release](https://docs.mattermost.com/about/release-policy.html#extended-support-releases) is coming to the end of its life cycle in November 15, 2024. Upgrading to Mattermost Server v9.11 or later is recommended.
+ Support for Mattermost Server v9.5 [Extended Support Release](https://docs.mattermost.com/about/release-policy.html#extended-support-releases) has come to the end of its life cycle on November 15, 2024. Upgrading to Mattermost Server v9.11 or later is required.
 ```
 
 ## Frequency

diff --git a/source/about/mattermost-mobile-releases.md b/source/about/mattermost-mobile-releases.md
@@ -4,7 +4,7 @@
 ```
 
 ```{Important}
-- Support for Mattermost Server v9.5 [Extended Support Release](https://docs.mattermost.com/about/release-policy.html#extended-support-releases) is coming to the end of its life cycle on November 15, 2024. Upgrading to Mattermost Server v9.11 or later is recommended.
+- Support for Mattermost Server v9.5 [Extended Support Release](https://docs.mattermost.com/about/release-policy.html#extended-support-releases) has come to the end of its life cycle on November 15, 2024. Upgrading to Mattermost Server v9.11 or later is required.
 - We strongly recommend using the latest mobile app release available that contains the latest security fixes and user experience enhancements. Mobile app releases are tested against all generally available Mattermost server and extended support releases.
 ```
 
@@ -30,7 +30,7 @@ See the [Mobile app changelog](/about/mobile-app-changelog) for release details,
 | v2.12 {ref}`FEATURE <release-types>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.12.2) \| {ref}`Changelog <release-v2-12-2>` | 2024-01-16 | 2024-02-15 | {ref}`v9.4 <release-v9-4-feature-release>` |
 | v2.11 {ref}`FEATURE <release-types>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.11.0) \| {ref}`Changelog <release-v2-11-0>` | 2023-12-16 | 2024-01-15 | {ref}`v9.3 <release-v9-3-feature-release>` |
 | v2.10 {ref}`FEATURE <release-types>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.10.1) \| {ref}`Changelog <release-v2-10-1>` | 2023-11-16 | 2023-12-15 | {ref}`v9.2 <release-v9-2-feature-release>` |
-| v2.9 {ref}`FEATURE <release-types>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.9.1) \| {ref}`Changelog <release-v2-9-1>` | 2023-10-16 | 2023-11-15 | {ref}`v9.1 <release-v9-1-feature-release>` |
+| v2.9 {ref}`FEATURE <release-types>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.9.0) \| {ref}`Changelog <release-v2-9-1>` | 2023-10-16 | 2023-11-15 | {ref}`v9.1 <release-v9-1-feature-release>` |
 | v2.8 {ref}`FEATURE <release-types>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.8.2) \| {ref}`Changelog <release-v2-8-2>` | 2023-09-15 | 2023-10-15 | {ref}`v9.0 <release-v9-0-major-release>` |
 | v2.7 {ref}`FEATURE <release-types>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.7.0) \| {ref}`Changelog <release-v2-7-0>` | 2023-08-16 | 2023-09-14 | {ref}`v8.1 <release-v8-1-extended-support-release>` |
 | v2.6 {ref}`FEATURE <release-types>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.6.0) \| {ref}`Changelog <release-v2-6-0>` | 2023-07-16 | 2023-08-15 | {ref}`v8.0 <release-v8-0-major-release>` |
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     Note
-    ![deployment-img-yellow](../_static/images/badges/deployment_icon_yellow.svg) Available only for `self-hosted <https://mattermost.com/deploy/>`_ deployments
+    ![deployment-img-yellow](_static/images/badges/deployment_icon_yellow.svg) Available only for `self-hosted <https://mattermost.com/deploy/>`_ deployments
     ```{raw} html
     </div>
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ What support is available for video and audio calling and screen sharing?

		Start secure audio calls with screen sharing support directly within Mattermost with :doc:`Mattermost Calls </collaborate/make-calls>`.

		Visit the `Mattermost Marketplace <https://mattermost.com/marketplace/>`_ to learn more about more popular options available, including self-hosted, self-hosted private cloud solutions, and vendor-hosted SaaS solutions.
		See the :doc:`collaborate with audio and video </collaborate/collaborate-with-audio-video>` documentation for details on additional video conferencing integrations available for Mattermost.