Merge branch 'master' into MM-1137

source/_static/badges/academy-calls.rst

@@ -3,7 +3,7 @@
 
 .. raw:: html
 
-  <a href="https://mattermost.com/pl/mattermost-academy-calls-training" class="mm-badge mm-badge--academy" target="_blank">
+  <a href="https://academy.mattermost.com/p/new-mattermost-copilot-multi-llm-setup-usage" class="mm-badge mm-badge--academy" target="_blank">
     <img src="../_static/images/badges/academy-callout-image.jpg" alt="" />
     <div class="mm-badge__copy">
       <span class="mm-badge__accent-text">Mattermost Academy</span>

source/_static/badges/academy-playbooks.rst

@@ -3,7 +3,7 @@
 
 .. raw:: html
 
-  <a href="https://mattermost.com/pl/mattermost-academy-playbooks-training" class="mm-badge mm-badge--academy" target="_blank">
+  <a href="https://academy.mattermost.com/p/mattermost-playbooks-onboarding-training" class="mm-badge mm-badge--academy" target="_blank">
     <img src="../_static/images/badges/academy-callout-image.jpg" alt="" />
     <div class="mm-badge__copy">
       <span class="mm-badge__accent-text">Mattermost Academy</span>

source/_static/badges/academy-teams.rst

@@ -3,7 +3,7 @@
 
 .. raw:: html
 
-  <a href="https://mattermost.com/pl/mattermost-academy-teams-training" class="mm-badge mm-badge--academy" target="_blank">
+  <a href="https://academy.mattermost.com/p/new-mattermost-for-microsoft-teams-integration" class="mm-badge mm-badge--academy" target="_blank">
     <img src="../_static/images/badges/academy-callout-image.jpg" alt="" />
     <div class="mm-badge__copy">
       <span class="mm-badge__accent-text">Mattermost Academy</span>

source/_static/badges/allplans-cloud-selfhosted.md

@@ -4,7 +4,7 @@
 
 ![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/download/) deployments
 
 ```{raw} html
 </div>

source/_static/badges/allplans-cloud-selfhosted.rst

@@ -7,7 +7,7 @@
 
 |plans-img| Available on `all plans <https://mattermost.com/pricing/>`__
 
-|deployment-img| `Cloud <https://mattermost.com/sign-up/>`__ and `self-hosted <https://mattermost.com/deploy/>`__ deployments
+|deployment-img| `Cloud <https://mattermost.com/sign-up/>`__ and `self-hosted <https://mattermost.com/download/>`__ deployments
 
 .. raw:: html
 

source/_static/badges/allplans-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) [self-hosted](https://mattermost.com/deploy/) deployments
+![deployment-img](/_static/images/badges/deployment_icon.svg) [self-hosted](https://mattermost.com/download/) deployments
 
 ```{raw} html
 </div>

source/_static/badges/allplans-selfhosted.rst

@@ -7,7 +7,7 @@
 
 |plans-img| Available on `all plans <https://mattermost.com/pricing/>`__
 
-|deployment-img| `self-hosted <https://mattermost.com/deploy/>`__ deployments
+|deployment-img| `self-hosted <https://mattermost.com/download/>`__ deployments
 
 .. raw:: html
 

source/_static/badges/cloud-selfhosted.rst

@@ -5,7 +5,7 @@
 
   <div class="mm-plans-badge">
 
-|deployment-img| `Cloud <https://mattermost.com/sign-up/>`__ and `self-hosted <https://mattermost.com/deploy/>`__ deployments
+|deployment-img| `Cloud <https://mattermost.com/sign-up/>`__ and `self-hosted <https://mattermost.com/download/>`__ deployments
 
 .. raw:: html
 

source/_static/badges/ent-cloud-selfhosted.rst

@@ -7,7 +7,7 @@
 
 |plans-img| Available on `Enterprise plans <https://mattermost.com/pricing/>`__
 
-|deployment-img| `Cloud <https://mattermost.com/sign-up/>`__ and `self-hosted <https://mattermost.com/deploy/>`__ deployments
+|deployment-img| `Cloud <https://mattermost.com/sign-up/>`__ and `self-hosted <https://mattermost.com/download/>`__ deployments
 
 .. raw:: html
 

source/_static/badges/ent-pro-cloud-selfhosted.rst

@@ -7,7 +7,7 @@
 
 |plans-img| Available on `Enterprise and Professional plans <https://mattermost.com/pricing/>`__
 
-|deployment-img| `Cloud <https://mattermost.com/sign-up/>`__ and `self-hosted <https://mattermost.com/deploy/>`__ deployments
+|deployment-img| `Cloud <https://mattermost.com/sign-up/>`__ and `self-hosted <https://mattermost.com/download/>`__ deployments
 
 .. raw:: html
 

source/_static/badges/ent-pro-selfhosted.rst

@@ -7,7 +7,7 @@
 
 |plans-img| Available on `Enterprise and Professional plans <https://mattermost.com/pricing/>`__
 
-|deployment-img| `self-hosted <https://mattermost.com/deploy/>`__ deployments
+|deployment-img| `self-hosted <https://mattermost.com/download/>`__ deployments
 
 .. raw:: html
 

source/_static/badges/ent-selfhosted-only.rst

@@ -9,7 +9,7 @@ Note
 
 |plans-img-yellow| Available only on `Enterprise <https://mattermost.com/pricing/>`__ plans
 
-|deployment-img-yellow| Available only for `self-hosted <https://mattermost.com/deploy/>`__ deployments
+|deployment-img-yellow| Available only for `self-hosted <https://mattermost.com/download/>`__ deployments
 
 .. raw:: html
 

source/_static/badges/ent-selfhosted.rst

@@ -7,7 +7,7 @@
 
 |plans-img| Available on `Enterprise plans <https://mattermost.com/pricing/>`__
 
-|deployment-img| `self-hosted <https://mattermost.com/deploy/>`__ deployments
+|deployment-img| `self-hosted <https://mattermost.com/download/>`__ deployments
 
 .. raw:: html
 

source/_static/badges/entpro-cloud-free.rst

@@ -9,4 +9,4 @@
 
 |plans-img| Available on `Enterprise and Professional <https://mattermost.com/pricing/>`__ plans
 
-|deployment-img| `Cloud <https://mattermost.com/sign-up/>`__ and `self-hosted <https://mattermost.com/deploy/>`__ deployments
+|deployment-img| `Cloud <https://mattermost.com/sign-up/>`__ and `self-hosted <https://mattermost.com/download/>`__ deployments

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/download/>`_ deployments
 
 ```{raw} html
 </div>

source/_static/badges/selfhosted-only.rst

@@ -7,7 +7,7 @@
 
 Note
 
-|deployment-img-yellow| Available only for `self-hosted <https://mattermost.com/deploy/>`__ deployments
+|deployment-img-yellow| Available only for `self-hosted <https://mattermost.com/download/>`__ deployments
 
 .. raw:: html
 

source/about/certifications-and-compliance.rst

@@ -17,7 +17,7 @@ Continual commitment to the principles of GDPR
 Mattermost is a collaboration hub for highly-trusted organizations and is committed to supporting the principles of GDPR to protect the data of people in the European Union. Mattermost adheres to this mission through the use of:
 
 - **Security Infrastructure:** Continual investment in security, privacy and compliance capabilities.
-- **Contractual Obligations:** Appropriate contractual obligations through our terms of service, including the `Data Processing Addendum <https://mattermost.com/data-processing-addendum/>`_ in our standard `Terms of Service <https://mattermost.com/terms-of-service/>`_.
+- **Contractual Obligations:** Appropriate contractual obligations through our terms of service, including the `Data Processing Addendum <https://mattermost.com/data-processing-addendum/>`_ in our standard `Terms of Service <https://mattermost.com/terms-of-use/>`_.
 - **Privacy Measures:** Privacy measures are outlined in our `Privacy Policy <https://mattermost.com/privacy-policy/>`_.
 - **Product Features:** To ensure data management and data portability.
 

source/about/deprecated-features.rst

@@ -10,7 +10,7 @@ Mattermost Server v10.5.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 - 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 will stop providing official Mattermost server builds for the Microsoft Windows operating system. Administrators should migrate existing Mattermost server installations to use the official Linux builds. See more details in `this forum post <https://forum.mattermost.com/t/deprecation-notice-builds-for-microsoft-windows/21498>`__.
+- Mattermost will stop providing official Mattermost server builds for the Microsoft Windows operating system. Administrators should migrate existing Mattermost server installations to use the official Linux builds. See more details in `this forum post <https://forum.mattermost.com/t/deprecation-notice-server-builds-for-microsoft-windows/21498>`__.
 
 Mattermost Server v10.3.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -71,7 +71,7 @@ Mattermost Server v6.0.0
 - Slack Import via the web app. The Slack import tool accessible via the Team Setting menu is being replaced by the mmetl tool that is much more comprehensive for the types of data it can assist in uploading.
 - MySQL versions below 5.7.12. Minimum support will now be for 5.7.12. This version introduced a native JSON data type that lets us improve performance and scalability of several database fields (most notably Users and Posts props). Additionally, version 5.6 (our current minimum version) reached `EOL in February 2021 <https://www.mysql.com/support/eol-notice.html>`_.
 - Elasticsearch 5 and 6. `Versions 5.x reached EOL in March of 2019, and versions 6.x reached EOL in November 2020 <https://www.elastic.co/support/eol>`_. Our minimal supported version with Mattermost v6.0 will be Elasticsearch version 7.0.
-- Windows 7 reached `EOL in January 2020 <https://support.microsoft.com/en-us/windows/windows-7-support-ended-on-january-14-2020-b75d4580-2cc7-895a-2c9c-1466d9a53962>`_. We will no longer provide support for the desktop app issues on Windows 7.
+- Windows 7 reached `EOL in January 2020 <https://support.microsoft.com/en-us/windows/what-does-it-mean-if-windows-isn-t-supported-08f3b92d-7539-671e-1452-2e71cdad18b5>`_. We will no longer provide support for the desktop app issues on Windows 7.
 - :ref:`DisableLegacyMFAEndpoint <configure/deprecated-configuration-settings:disable legacy mfa api endpoint>` configuration setting.
 - :ref:`Experimental Timezone <configure/deprecated-configuration-settings:timezone>` configuration setting.
 - All legacy channel sidebar experimental configuration settings. We encourage customers using these settings to upgrade to v5.32 or later to access custom, collapsible channel categories among many other channel organization features. The settings being deprecated include:
@@ -110,7 +110,7 @@ Mattermost Server v5.30.0
 Mattermost Server v5.16.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- Removed support for Internet Explorer (IE11) in Mattermost v5.16.0. Learn more in our `forum post <https://forum.mattermost.org/t/mattermost-is-dropping-support-for-internet-explorer-ie11-in-v5-16/7575>`__.
+- Removed support for Internet Explorer (IE11) in Mattermost v5.16.0. Learn more in our `forum post <https://forum.mattermost.com/t/mattermost-is-dropping-support-for-internet-explorer-ie11-in-v5-16/7575>`__.
 
 Mattermost Server v5.12.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

source/about/devops-collaboration.rst

@@ -1,7 +1,11 @@
 DevOps collaboration
 ====================
 
-In DevOps, teams work together to accelerate software development and deployment processes, reduce costs, and ensure their organization remains competitive in the fast-paced digital marketplace. 
+In DevOps, teams work together to accelerate software development and deployment processes, reduce costs, and ensure their organization remains competitive in the fast-paced digital marketplace.
+
+.. tip::
+
+  Watch `this on-demand webinar on driving security and business value through DevOps <https://mattermost.com/driving-security-with-devops/>`_ to learn why developer experience is still critical to driving value inside and from the organization. Then download our `release management guide <https://mattermost.com/level-up-release-management-guide/>`_ to learn how to create strong release management processes to delivery software quickly and predictably, and our `technical and operational team productivty datasheet <https://mattermost.com/technical-and-operational-team-productivity-datasheet/>`_ to learn how technical and operational teams can benefit from using Mattermost for collaboration.
 
 DevOp practitioners include a variety of disciplines including product managers, designers, developers, operations, quality assurance, security, and project managers. 
 

source/about/editions-and-offerings.rst

@@ -115,7 +115,7 @@ Mattermost Free
 
 Mattermost Free is a set of collaboration features for accelerating your technical team’s productivity, shipping software faster with higher quality, and improving alignment among team members.
 
-Mattermost Free is available to our self-hosted community through both our open source Mattermost Team Edition offering, and in our commercial Mattermost Enterprise Edition offering (when no subscription license key is active). It is best suited for teams of up to 50 members. See deployment options at: https://mattermost.com/deploy/.
+Mattermost Free is available to our self-hosted community through both our open source Mattermost Team Edition offering, and in our commercial Mattermost Enterprise Edition offering (when no subscription license key is active). It is best suited for teams of up to 50 members. See deployment options at: https://mattermost.com/download/.
 
 .. important::
 
@@ -163,4 +163,4 @@ As the platform matures and new features are added, they're evaluated to be incl
 
 We recognize there aren't any features that are only useful to managers, directors, and executives. Individual practitioners may want certain features; however, we think that other buyers are relatively more likely to care about it. We also recognize that there may be some features that are put into an edition to find later there is much demand for it by individuals or a singular team; we will not hesitate to move that feature. We value feedback from our community and iterate based on that feedback. Simultaneously, we also need to offer commercial products that hold value and do our best to find the right balance. We believe the more of Mattermost that you use, the more likely it is that you benefit from the advanced editions we offer.
 
-You can provide us with feedback via `our idea portal <https://mattermost.com/suggestions/>`, where ideas and input influences the future of the platform.
+You can provide us with feedback via `our idea portal <https://portal.productboard.com/mattermost/33-what-matters-to-you>`_, where ideas and input influences the future of the platform.

source/about/faq-license.rst

@@ -49,7 +49,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/>`__                                           |
+| Mattermost Websites:       | Open source under                                                                                                                                                | `Mattermost Terms of Use <https://mattermost.com/terms-of-use/>`_                     | `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>`__.    |                                                                                       |                                                                                                                           |
 |  - about.mattermost.com    |                                                                                                                                                                  |                                                                                       |                                                                                                                           |
 |  - mattermost.com          |                                                                                                                                                                  |                                                                                       |                                                                                                                           |

source/about/faq-use-cases.rst

@@ -18,4 +18,4 @@ If you'd like to create an open source derivative version of Mattermost using th
 Does Mattermost have an official website-based plugin to offer anonymous chat to visitors?
 ------------------------------------------------------------------------------------------
 
-Not yet. You can `upvote the feature proposal online <https://mattermost.com/suggestions/>`__ to add your support. If you create such a plugin, we would love to see it open sourced and made available to the community.
+Not yet. You can `upvote the feature proposal online <https://portal.productboard.com/mattermost/33-what-matters-to-you>`_ to add your support. If you create such a plugin, we would love to see it open sourced and made available to the community.

source/about/incident-response-collaboration.rst

@@ -1,7 +1,11 @@
 Incident response collaboration
 ===============================
 
-Teams require collaboration to respond to incidents and outages quickly and effectively. This involves coordinating efforts between developers, operations, and customer support teams to identify and resolve issues, communicate with stakeholders, and implement preventive measures to avoid similar incidents in the future. 
+Teams require collaboration to respond to incidents and outages quickly and effectively. This involves coordinating efforts between developers, operations, and customer support teams to identify and resolve issues, communicate with stakeholders, and implement preventive measures to avoid similar incidents in the future.
+
+.. tip::
+
+  Watch `this on-demand webinar on securing mission-critical work <https://mattermost.com/webinar/cybersecurity-incident-response/>`_ to learn how to overcome key challenges to effective incident response. Then download our `best practices for incident response workflows guide <https://mattermost.com/best-practices-for-improving-incident-response-guide/>`_ to learn how to develop and customize a comprehensive incident response plan.
 
 In an incident response situation, various stakeholders can be involved, each with their own roles and responsibilities.