mattermost · cwarnermm · Jun 16, 2025 · Jun 16, 2025 · Jun 16, 2025 · Jun 16, 2025
diff --git a/source/_static/badges/ent-adv-selfhosted.rst b/source/_static/badges/ent-adv-selfhosted.rst
@@ -0,0 +1,14 @@
+:orphan:
+:nosearch:
+
+.. raw:: html
+
+  <div class="mm-plans-badge">
+
+|plans-img| Available on `Enterprise Advanced plans <https://mattermost.com/pricing/>`__
+
+|deployment-img| `self-hosted <https://mattermost.com/download/>`__ deployments
+
+.. raw:: html
+
+  </div>
diff --git a/source/about/editions-and-offerings.rst b/source/about/editions-and-offerings.rst
@@ -19,7 +19,7 @@ For customers using our service in a self-hosted deployment, the `Mattermost Fre
 Mattermost Enterprise Edition 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Our commercial, self-hosted software is called Mattermost Enterprise Edition, and it's available as a Linux binary that deploys identically to our open source version - including upgrading in an identical fashion - with two key differences: It contains code for advanced commercial features and it's offered under a commercial license (https://mattermost.com/enterprise-edition-license/). The commercial license prohibits reverse engineering and tampering with our license key mechanism unlocking paid features so that we can run a compliant and fair commercial business.
+Our commercial, self-hosted software is called Mattermost Enterprise Edition, and it's available as a Linux binary that deploys identically to our open source version - including upgrading in an identical fashion - with 2 key differences: It contains code for advanced commercial features and it's offered under a commercial license (https://mattermost.com/enterprise-edition-license/). The commercial license prohibits reverse engineering and tampering with our license key mechanism unlocking paid features so that we can run a compliant and fair commercial business.
 
 Once you’ve downloaded and installed Mattermost Enterprise Edition within your preferred environment, you have the option to use it as-is in a "free" mode, or you can access Mattermost's commercial features by starting a trial or by purchasing a subscription. You can start a 30-day free Enterprise trial via **System Console > Edition and License > Start trial**, or request a trial online at https://mattermost.com/trial/.
 
@@ -39,6 +39,23 @@ Mattermost plans consist of features and entitlements available either a paid su
 
 The Mattermost Professional, Enterprise, or Enterprise Advanced editions are only available after deploying our Mattermost Enterprise Edition binary, and then applying a valid license key that comes with a subscription purchase. Alternatively, you can start a 30-day free trial that can be activated either in-product (**System Console > Edition and License > Start trial**) or online at https://mattermost.com/trial/.
 
+Mattermost Enterprise Advanced
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: ../_static/badges/cloud-selfhosted.rst
+  :start-after: :nosearch:
+
+Mattermost Enterprise Advanced is the :doc:`Intelligent Mission Environment </about/product>` for Cyber Defense and Mission Operations that features:
+
+- :doc:`Classified and Sensitive Information Controls </collaborate/display-channel-banners>`
+- :doc:`Zero Trust Security </manage/admin/zero-trust-security>` with dynamic attribute-based policy controls, environmental atributes, and User Authoritative Source integration
+- :doc:`Mobile security </about/security/mobile-security>` controls
+- :doc:`Air-gapped deployment workflows </deploy/server/air-gapped-deployment>`
+
+Visit the :doc:`Mattermost Plans </about/plans>` page to learn more about the capabilities and features available in Enterprise Advanced. 
+
+A 30-day free trial to preview the features in this subscription can be activated either in-product (**System Console > Edition and License > Start trial**) or via an online request at https://mattermost.com/trial/.
+
 Mattermost Enterprise 
 ~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/source/about/plans.md b/source/about/plans.md
@@ -66,11 +66,11 @@
     <tr class="section"><td colspan="7"><strong>Channel-based messaging</strong></td></tr>
     <tr class="subsection"><td colspan="7"><strong>1-1, group messaging, public and private channels, file sharing, link and media previews across web, PC, Mac, iOS and Android devices, with 1-1 audio calls and screen share, threaded discussions, search, custom branding themes and emojis, and availability in 20 languages.</strong></td></tr>
     <tr>
-      <td><strong>Messaging, file sharing, and link and file previews across device platforms</strong>: Channels-based messaging including 1-1, group messaging, public and private channels, file sharing, link and media previews across web, PC, Mac, iOS, and Android devices.</td>
+      <td><strong>Messaging, file sharing, and link and file previews across device platforms</strong>: :doc:`Channels-based messaging <collaborate/collaborate-within-channels>` including 1-1, group messaging, public and private channels, :doc:`file sharing <collaborate/share-files-in-messages>`, link and media :ref:`previews <collaborate/share-files-in-messages:preview file attachments>` across web, PC, Mac, iOS, and Android devices.</td>
       <td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td>v9.11+</td>
     </tr>
     <tr>
-      <td><strong>1:1 audio calls and screen sharing</strong>: Call another user to start a 1-1 audio discussion in web, desktop, and mobile experiences with optional screen sharing.</td>
+      <td><strong>1:1 audio calls and screen sharing</strong>: :doc:`Call another user <collaborate/make-calls>` to start a 1-1 audio discussion in web, desktop, and mobile experiences with optional :ref:`screen sharing <collaborate/make-calls:share your screen>`.</td>
       <td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td><img src="../_static/images/check-circle-green.svg"></td><td>v9.11+</td>
     </tr>
     <tr>
@@ -310,4 +310,9 @@
   </tbody>
 </table>
 
-See a [complete list of features](https://mattermost.com/pricing) on the Mattermost website.
+See a [complete list of features](https://mattermost.com/pricing) on the Mattermost website.
+
+.. note::
+
+  - Mattermost Enterprise Advanced requires a Mattermost Server running v10.9 or later and a PostgreSQL database.
+  - Enterprise plugins must be updated to support the new license (most of which are pre-packaged from v10.9)
diff --git a/source/about/product.rst b/source/about/product.rst
@@ -35,7 +35,7 @@ See the :doc:`Use Case Guide </about/use-cases>` to learn how operational teams
 Secure collaborative workflow
 -----------------------------
 
-Built on an extensible open-core architecture, Mattermost offers an array of collaborative tools across :doc:`managed Windows, Mac, or Linux desktop applications </deploy/desktop/desktop-app-deployment>`, secure web browsers with or without internet access, :doc:`Bring your own device (BYOD) or mobile device management (MDM)-managed mobile </about/security/mobile-security>`, and :doc:`embedded Microsoft 365 </integrate/mattermost-mission-collaboration-for-m365>` user experiences.
+Built on an extensible open-core architecture, Mattermost offers an array of collaborative tools across :doc:`managed Windows, Mac, or Linux desktop applications </deploy/desktop/desktop-app-deployment>`, secure web browsers with or without internet access, bring your own device (BYOD) or :doc:`mobile device management (MDM)-managed mobile </about/security/mobile-security>`, and :doc:`embedded Microsoft 365 </integrate/mattermost-mission-collaboration-for-m365>` user experiences.
 
 Messaging collaboration
 ~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/source/configure/environment-configuration-settings.rst b/source/configure/environment-configuration-settings.rst
@@ -3665,9 +3665,6 @@ Allow untrusted internal connections
 Mobile security
 ---------------
 
-.. include:: ../_static/badges/ent-only.rst
-  :start-after: :nosearch:
-
 From Mattermost v10.7 and mobile app v2.27, you can configure biometric authentication, prevent Mattermost use on jailbroken or rooted devices, and can block screen captures without relying on an EMM Provider. Configure these options by going to **System Console > Environment > Mobile Security**, or by editing the ``config.json`` file as described in the following tables. Changes to configuration settings in this section require a server restart before taking effect.
 
 .. config:setting:: enable-biometric-authentication
@@ -3683,6 +3680,9 @@ From Mattermost v10.7 and mobile app v2.27, you can configure biometric authenti
 Enable biometric authentication
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. include:: ../_static/badges/ent-adv-only.rst
+  :start-after: :nosearch:
+
 +-----------------------------------------------+-------------------------------------------------------------------------------------+
 | Enforce biometric authentication, with        | - System Config path: **Environment > Mobile Security**                             |
 | PIN/passcode fallback, before accessing       | - ``config.json setting``: ``".NativeAppSettings.MobileEnableBiometrics": false",`` |
@@ -3717,6 +3717,9 @@ Enable biometric authentication
 Enable jailbreak/root protection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. include:: ../_static/badges/ent-adv-only.rst
+  :start-after: :nosearch:
+
 +-----------------------------------------------+----------------------------------------------------------------------------------------+
 | Prevent access to the app on devices          | - System Config path: **Environment > Mobile Security**                                |
 | detected as jailbroken or rooted. If a        | - ``config.json setting``: ``".NativeAppSettings.MobileJailbreakProtection": false",`` |
@@ -3747,6 +3750,9 @@ Enable jailbreak/root protection
 Prevent screen capture
 ~~~~~~~~~~~~~~~~~~~~~~~
 
+.. include:: ../_static/badges/ent-adv-only.rst
+  :start-after: :nosearch:
+
 +-----------------------------------------------+-----------------------------------------------------------------------------------------+
 | Block screenshots and screen recordings when  | - System Config path: **Environment > Mobile Security**                                 |
 | using the mobile app. Screenshots will        | - ``config.json setting``: ``".NativeAppSettings.MobilePreventScreenCapture": false",`` |
@@ -3880,7 +3886,7 @@ This setting isn't available in the System Console and can only be enabled in ``
 Redis cache backend
 ~~~~~~~~~~~~~~~~~~~
 
-.. include:: ../_static/badges/ent-selfhosted.rst
+.. include:: ../_static/badges/ent-adv-selfhosted.rst
   :start-after: :nosearch:
 
 From Mattermost v10.4, Mattermost Enterprise customers can configure `Redis <https://redis.io/>`_ (Remote Dictionary Server) as an alternative cache backend. Redis is an open-source, in-memory data structure store that can be used as a database, cache, and message broker. It supports various data structures and is a top choice for its performance because its able to store data in memory and provide very quick data access.

diff --git a/source/configure/site-configuration-settings.rst b/source/configure/site-configuration-settings.rst
@@ -1779,9 +1779,6 @@ Allow file sharing
 Allow file uploads on mobile
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. include:: ../_static/badges/ent-only.rst
-  :start-after: :nosearch:
-
 +---------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------+
 | - **true**: **(Default)** Allows users to attach files to messages from mobile apps.              | - System Config path: **Site Configuration > File Sharing and Downloads**            |
 | - **false**: Prevents users from attaching files (including images) to messages from mobile apps. | - ``config.json`` setting: ``FileSettings`` > ``EnableMobileUpload`` > ``true``      |
@@ -1800,9 +1797,6 @@ Allow file uploads on mobile
 Allow file downloads on mobile
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. include:: ../_static/badges/ent-only.rst
-  :start-after: :nosearch:
-
 +----------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------+
 | - **true**: **(Default)** Enables file downloads on mobile apps.                                               | - System Config path: **Site Configuration > File sharing and downloads**           |
 | - **false**: Disables file downloads on mobile apps. Users can still download files from a mobile web browser. | - ``config.json`` setting: ``FileSettings`` > ``EnableMobileDownload`` > ``true``   |
@@ -1905,7 +1899,7 @@ Enable end user notices
 Connected workspaces
 ---------------------------
 
-.. include:: ../_static/badges/ent-cloud-selfhosted.rst
+.. include:: ../_static/badges/ent-adv-cloud-selfhosted.rst
   :start-after: :nosearch:
 
 The following settings aren't available in the System Console and can only be set in ``config.json``. 

diff --git a/source/deploy/mobile/mobile-security-features.rst b/source/deploy/mobile/mobile-security-features.rst
@@ -1,7 +1,7 @@
 Mobile security features
 ========================
 
-.. include:: ../../_static/badges/ent-cloud-selfhosted.rst
+.. include:: ../../_static/badges/ent-adv-cloud-selfhosted.rst
   :start-after: :nosearch:
 
 This document outlines the key security features implemented in the mobile application, explains the significance of each control, and details our continuous security practices to maintain an up-to-date security posture.

diff --git a/source/integrate/mattermost-mission-collaboration-for-m365.rst b/source/integrate/mattermost-mission-collaboration-for-m365.rst
@@ -1,7 +1,7 @@
 Connect Microsoft 365, Teams, and Outlook with Mattermost
 ==========================================================
 
-.. include:: ../_static/badges/ent-cloud-selfhosted.rst
+.. include:: ../_static/badges/ent-adv-cloud-selfhosted.rst
   :start-after: :nosearch:
 
 Mattermost Mission Collaboration for Microsoft extends Microsoft for mission-critical coordination, command and control, incident response, and DevSecOps workflows in demanding environments, including air-gapped and classified networks. Use data-sovereign tools like secure chat, Playbooks, and Calls directly within M365, Teams, and Outlook.

diff --git a/source/onboard/connected-workspaces.rst b/source/onboard/connected-workspaces.rst
@@ -1,7 +1,7 @@
 Connected workspaces
 ====================
 
-.. include:: ../_static/badges/ent-cloud-selfhosted.rst
+.. include:: ../_static/badges/ent-adv-cloud-selfhosted.rst
   :start-after: :nosearch:
 
 Communicate across organizations, as well as external partners and vendors using Mattermost by synchronizing messages, emoji reactions, and file sharing in real-time through secured, connected Mattermost workspaces.

diff --git a/source/scale/redis.rst b/source/scale/redis.rst
@@ -1,7 +1,7 @@
 Redis
 =====
 
-.. include:: ../_static/badges/ent-cloud-selfhosted.rst
+.. include:: ../_static/badges/ent-adv-cloud-selfhosted.rst
   :start-after: :nosearch:
 
 Redis is an open-source, in-memory data structure store used as a database, cache, message broker, and streaming engine. Mattermost uses Redis as an external cache to improve performance at scale. When properly configured, Redis can help support Mattermost installations with more than 100,000 users by providing improved performance through efficient caching.

diff --git a/source/scale/scale-to-200000-users.rst b/source/scale/scale-to-200000-users.rst
@@ -1,7 +1,7 @@
 Scale Mattermost up to 200000 users
 ====================================
 
-.. include:: ../_static/badges/ent-selfhosted.rst
+.. include:: ../_static/badges/ent-adv-selfhosted.rst
   :start-after: :nosearch:
 
 This page describes the Mattermost reference architecture designed for the load of up to 200000 concurrent users. Unsure which reference architecture to use? See the :doc:`scaling for enterprise </scale/scaling-for-enterprise>` documentation for details.