Merge branch 'master' into mattermost-supported-integrations

mattermost · Apr 12, 2024 · 272c695 · 272c695
2 parents 7f717c8 + b959330
commit 272c695
Show file tree

Hide file tree

Showing 42 changed files with 370 additions and 321 deletions.
diff --git a/source/_templates/custom-index.html b/source/_templates/custom-index.html
@@ -316,7 +316,7 @@ <h4>Integrate and extend</h4>
                                         </div>
                                     </a>
                                     <a
-                                        href='/guides/get-help.html'
+                                        href='guides/get-help.html'
                                         class="masthead-card"
                                     >
                                         <div class="masthead-card__icon">

diff --git a/source/about/certifications-and-compliance.rst b/source/about/certifications-and-compliance.rst
diff --git a/source/about/faq-business.rst b/source/about/faq-business.rst
@@ -15,26 +15,26 @@ In contrast, Mattermost, as the copyright holder to the collection of the Matter
 How can I create an open source derivative work of Mattermost?
 --------------------------------------------------------------
 
-If you're looking to customize the look and feel of Mattermost, see `documentation on customization <https://github.com/mattermost/docs/issues/1006>`__. For advanced customization, the system's user experience is available in different repositories for web, mobile apps, and desktop apps and custom experiences can be developed and integrated with either Mattermost Team Edition or Mattermost Enterprise Edition via the system APIs and drivers.
+If you're looking to customize the look and feel of Mattermost, see `documentation on customization <https://github.com/mattermost/docs/issues/1006>`_. For advanced customization, the system's user experience is available in different repositories for web, mobile apps, and desktop apps and custom experiences can be developed and integrated with either Mattermost Team Edition or Mattermost Enterprise Edition via the system APIs and drivers.
 
 If, instead of using Mattermost Team Edition or Mattermost Enterprise Edition, you choose to compile your own version of the system using the open source code from ``/mattermost-server``, there are a number of factors to consider:
 
 Security
 ~~~~~~~~
 
-- If you run a fork of the Mattermost server, we highly recommend you only deploy the system securely behind a firewall and to pay close attention to `Mattermost security updates <https://mattermost.com/security-updates/>`__. Mattermost Team Edition and Mattermost Enterprise Edition release security update patches when reports of new attacks are received and verified. Mattermost waits until 14 days after a security patch is released before publicly detailing its nature so that users and customers can upgrade before the security vulnerability is widely known. A malicious user can potentially make use of Mattermost security disclosures to exploit a fork of Mattermost if the security upgrade is not promptly incorporated into the forked version.
+- If you run a fork of the Mattermost server, we highly recommend you only deploy the system securely behind a firewall and to pay close attention to `Mattermost security updates <https://mattermost.com/security-updates/>`_. Mattermost Team Edition and Mattermost Enterprise Edition release security update patches when reports of new attacks are received and verified. Mattermost waits until 14 days after a security patch is released before publicly detailing its nature so that users and customers can upgrade before the security vulnerability is widely known. A malicious user can potentially make use of Mattermost security disclosures to exploit a fork of Mattermost if the security upgrade is not promptly incorporated into the forked version.
 
 Rebranding
 ~~~~~~~~~~
 
-- When you create a derivative version of Mattermost and share it with others as a product, you need to replace the Mattermost name and logo from the system, among other requirements, per the `Mattermost trademark policy <https://mattermost.com/trademark-standards-of-use/>`__.
+- When you create a derivative version of Mattermost and share it with others as a product, you need to replace the Mattermost name and logo from the system, among other requirements, per the `Mattermost trademark policy <https://mattermost.com/trademark-standards-of-use/>`_.
 - You can rebrand your system using :doc:`custom branding tools </configure/custom-branding-tools>`.
-- For advanced whitelabelling, and to whitelabel in Team Edition under MIT license without Enterprise Edition branding tools, you can manually update files on the Mattermost server `per product documentation. <https://github.com/mattermost/docs/issues/1006>`__ This can also be done without forking.
+- For advanced whitelabelling, and to whitelabel in Team Edition under MIT license without Enterprise Edition branding tools, you can manually update files on the Mattermost server `per product documentation. <https://github.com/mattermost/docs/issues/1006>`_ This can also be done without forking.
 
 Copyright and Licensing of ``/mattermost-server`` open source code
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- Compiling and distributing your own version of the open source Mattermost ``/mattermost-server`` repo requires a) compliance with licenses in the repo, including `NOTICE.txt <https://github.com/mattermost/mattermost/blob/master/NOTICE.txt>`__, and b) the compiled version of the ``/mattermost-server`` source code should have the same open source license as the source code, `per our licensing policy </about/subscription.html/>`__.
+- Compiling and distributing your own version of the open source Mattermost ``/mattermost-server`` repo requires a) compliance with licenses in the repo, including `NOTICE.txt <https://github.com/mattermost/mattermost/blob/master/NOTICE.txt>`_, and b) the compiled version of the ``/mattermost-server`` source code should have the same open source license as the source code, :doc:`per our licensing policy </about/faq-license>`.
 
 Other considerations
 ~~~~~~~~~~~~~~~~~~~~
@@ -47,7 +47,7 @@ Other considerations
 Will Mattermost complete questionnaires requiring confidential data without an NDA?
 -----------------------------------------------------------------------------------
 
-No, Mattermost will not complete questionnaires requiring confidential data without a non-disclosure agreement. You can find `Mattermost's standard mutual non-disclosure agreement online <https://docs.google.com/document/d/10Qc2kxxZGYNzp9b19oEhItRM01OPyrWRISJ2rbm1gvc/edit>`__.
+No, Mattermost will not complete questionnaires requiring confidential data without a non-disclosure agreement. You can find `Mattermost's standard mutual non-disclosure agreement online <https://docs.google.com/document/d/10Qc2kxxZGYNzp9b19oEhItRM01OPyrWRISJ2rbm1gvc/edit>`_.
 
 Why does Mattermost have a discount for certain kinds of non-profits but not for others?
 ----------------------------------------------------------------------------------------
@@ -59,7 +59,7 @@ See our :ref:`License and Subscription <about/subscription:mattermost nonprofit
 Can I create a derivative work of the Mattermost /mattermost-server repository that is not open source?
 -------------------------------------------------------------------------------------------------------
 
-The Mattermost open source project was created by `a group of developers who had their data paywalled by a proprietary online messaging service <https://mattermost.com/about-us/>`__ and felt it was unfair.
+The Mattermost open source project was created by `a group of developers who had their data paywalled by a proprietary online messaging service <https://mattermost.com/about-us/>`_ and felt it was unfair.
 
 Because of this, the Mattermost /mattermost-server repository uses an open source license that requires derivative works to use the same open source license. This prevents the creation of derivative works that are not open source, and the situation where end users would not have access to the source code of the systems they use, and hence be at risk of "lock in".
 

diff --git a/source/about/faq-integrations.rst b/source/about/faq-integrations.rst
@@ -8,7 +8,7 @@ Mattermost is an open source, self-hosted alternative to proprietary SaaS servic
 
 While you're welcome to use the Mattermost source code under its open source license, Mattermost, Inc. does not offer support or technical advice for proprietary SaaS projects that result in customers potentially being paywalled from their data should they stop paying SaaS fees.
 
-To learn more about why we strongly believe that users and customers should always have access to their data, please read `why we created Mattermost <https://mattermost.com/about-us/>`__.
+To learn more about why we strongly believe that users and customers should always have access to their data, please read `why we created Mattermost <https://mattermost.com/about-us/>`_.
 
 What's the difference between incoming and outgoing webhooks?
 -------------------------------------------------------------
@@ -46,7 +46,7 @@ Mattermost doesn't currently support the ability to attach files to a post made
 Where can I find existing integrations?
 ---------------------------------------
 
-[Visit the Mattermost Marketplace](https://mattermost.com/marketplace) to access open source integrations to common tools like Jira, Jenkins, and GitLab, along with interactive bot applications, and other communication tools that are freely available for use and customization. 
+Visit the `Mattermost Marketplace <https://mattermost.com/marketplace>`_ to access open source integrations to common tools like Jira, Jenkins, and GitLab, along with interactive bot applications, and other communication tools that are freely available for use and customization. 
 
 Alternatively, within Mattermost, when logged in as an Administrator, you can click on the "Marketplace" option in the main menu and easily install plugins or apps from there. 
 
@@ -58,6 +58,6 @@ For self-hosted deployments in small setups, you might host integrations on the
 Where can I get more information about integrations?
 ----------------------------------------------------
 
-Come `join our Contributors community channel <https://community.mattermost.com/core/channels/tickets>`__ on our daily build server, where you can discuss questions with community members and the Mattermost core team. 
+Come `join our Contributors community channel <https://community.mattermost.com/core/channels/tickets>`_ on our daily build server, where you can discuss questions with community members and the Mattermost core team. 
 
-Join our `Developers channel <https://community.mattermost.com/core/channels/developers>`__ for technical discussions, and visit our `Integrations channel <https://community.mattermost.com/core/channels/integrations>`__ for all integrations and plugins discussions.
+Join our `Developers channel <https://community.mattermost.com/core/channels/developers>`_ for technical discussions, and visit our `Integrations channel <https://community.mattermost.com/core/channels/integrations>`_ for all integrations and plugins discussions.
diff --git a/source/about/faq-license.rst b/source/about/faq-license.rst
@@ -64,7 +64,7 @@ Mattermost Partnership Agreements
 +-----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
 | Partnership Agreement                                                       | Agreement                                                                                                         |
 +=============================================================================+===================================================================================================================+
-| Mattermost Authorized Reseller Agreement                                    | `Mattermost Authorized Reseller Agreement <https://mattermost.com/partners/>`__                                   |
+| Mattermost Authorized Reseller Agreement                                    | `Mattermost Authorized Reseller Agreement <https://mattermost.com/partners/>`_                                    |
 +-----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
 
 Mattermost Confidentiality Agreements
@@ -73,7 +73,7 @@ Mattermost Confidentiality Agreements
 +-----------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------+
 | Confidentiality Agreement                                                   | Agreement                                                                                                                             |
 +=============================================================================+=======================================================================================================================================+
-| Mattermost Mutual Non-Disclosure Agreement                                  | `Mattermost Mutual Non-Disclosure Agreement <https://docs.google.com/document/d/1Ev3VFjiJBKSf1D5Kmf2BScbHBgSQbMzTzOhY3Of28vY/edit>`__ |
+| Mattermost Mutual Non-Disclosure Agreement                                  | `Mattermost Mutual Non-Disclosure Agreement <https://docs.google.com/document/d/1Ev3VFjiJBKSf1D5Kmf2BScbHBgSQbMzTzOhY3Of28vY/edit>`_  |
 +-----------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------+
 
 Working for Mattermost
@@ -82,9 +82,9 @@ Working for Mattermost
 +-----------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
 | Service                                                                     | Terms and Conditions                                                                                                                             |
 +=============================================================================+==================================================================================================================================================+
-| Mattermost Professional Consulting Services                                 | `Mattermost Professional Consulting Services Agreement <https://docs.google.com/document/d/1tgEkO5Q-xqAgVEcx5Y-z28OC36HptpltKORpivQGLoY/edit>`__ |
+| Mattermost Professional Consulting Services                                 | `Mattermost Professional Consulting Services Agreement <https://docs.google.com/document/d/1tgEkO5Q-xqAgVEcx5Y-z28OC36HptpltKORpivQGLoY/edit>`_  |
 +-----------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
-| Mattermost Consulting                                                       | `Mattermost Consulting Terms <https://handbook.mattermost.com/operations/sales/partner-programs>`__                                              |
+| Mattermost Consulting                                                       | `Mattermost Consulting Terms <https://handbook.mattermost.com/operations/sales/partner-programs>`_                                               |
 +-----------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------+
 
 Source available licensing

diff --git a/source/about/install-mattermost-for-microsoft-teams-plugin.rst b/source/about/install-mattermost-for-microsoft-teams-plugin.rst
@@ -156,7 +156,7 @@ Trobleshooting FAQ
 
 No. Currently, only accounts with the same email addresses are allowed to be connected. Specify the email address that matches your Mattermost account. 
 
-If connecting a Mattermost account to a Microsoft Teams account with a different email address is something your workspace requires, there is an open `Github issue <https://github.com/mattermost/mattermost-plugin-msteams/issues/519>`__ for you to share your feedback.
+If connecting a Mattermost account to a Microsoft Teams account with a different email address is something your workspace requires, there is an open `GitHub issue <https://github.com/mattermost/mattermost-plugin-msteams/issues/519>`__ for you to share your feedback.
 
 Get help
 --------

diff --git a/source/conf.py b/source/conf.py
@@ -358,6 +358,8 @@ def setup(_: Sphinx):
         "https://docs.mattermost.com/configure/site-configuration-settings.html#file-sharing-and-downloads",
 "administration/config-settings.html#allow-untrusted-internal-connections-to":
 	"https://docs.mattermost.com/configure/environment-configuration-settings.html#allow-untrusted-internal-connections",
+"administration/version-archive.html":
+	"https://docs.mattermost.com/upgrade/version-archive.html",
 
 # Boards redirects
 "boards/navigating-mattermost-boards.html":

diff --git a/source/configure/customizing-mattermost.rst b/source/configure/customizing-mattermost.rst
@@ -6,7 +6,7 @@ Customizing Mattermost
 
 There are several ways to customize your Mattermost server. 
 
-If customizing Mattermost, please avoid branding that could be confused with the Mattermost brand. For example, it's okay to brand as "Healthcare Central" because it's a completely different brand. "Mattermost Healthcare Central" is not okay, because it can potentially be confused with the Mattermost brand. Please see the `Mattermost trademark guidelines <https://mattermost.com/trademark-standards-of-use/>`__ for details.
+If customizing Mattermost, please avoid branding that could be confused with the Mattermost brand. For example, it's okay to brand as "Healthcare Central" because it's a completely different brand. "Mattermost Healthcare Central" is not okay, because it can potentially be confused with the Mattermost brand. Please see the `Mattermost trademark guidelines <https://mattermost.com/trademark-standards-of-use/>`_ for details.
 
 While you're welcome to add your own copyright notice in the user interface if you feel it is warranted by your changes, we ask that you do not remove the Mattermost, Inc. copyright notice from the login footer or from the About dialog.
 
@@ -16,7 +16,7 @@ Mattermost Web App
 The Mattermost webapp is licensed under the Apache 2.0 license. To modify and use with the Mattermost server, you can:
 
 1. Install the Mattermost server by following one of our installation guides
-2. Fork the `mattermost <https://github.com/mattermost/mattermost>`__ repository
+2. Fork the `mattermost <https://github.com/mattermost/mattermost>`_ repository
 3. Go to the web app code located in the ``webapp`` directory and make your changes
 4. Run ``make package`` to create ``mattermost-webapp.tar.gz``
 5. Copy ``mattermost-webapp-tar.gz`` to the location Mattermost was installed in Step 1
@@ -45,7 +45,7 @@ The Mattermost mobile apps can be customized if you choose to build the apps you
 
 To brand the mobile apps: 
 
-1. Fork the `mattermost-mobile <https://github.com/mattermost/mattermost-mobile>`__ repository
+1. Fork the `mattermost-mobile <https://github.com/mattermost/mattermost-mobile>`_ repository
 2. Replace the name, images, and any key text strings
 3. :doc:`Compile the apps <../deploy/build-custom-mobile-apps>`
 4. Deploy the apps to an app store
@@ -59,7 +59,7 @@ The Mattermost desktop apps can be customized if you choose to build the apps yo
 
 To brand the desktop apps: 
 
-1. Fork the `mattermost/desktop <https://github.com/mattermost/desktop>`__ repository
+1. Fork the `mattermost/desktop <https://github.com/mattermost/desktop>`_ repository
 2. Replace the name, images, and any key text strings
-3. Refer to `this documentation <https://github.com/mattermost/desktop/blob/master/docs/development.md>`__ for help with compiling the apps
+3. Refer to `the Mattermost Developer documentation <https://developers.mattermost.com/contribute/more-info/desktop/>`_ for help with compiling the apps
 4. Share the desktop application with your users