mattermost · cwarnermm · Jun 12, 2024 · Jun 11, 2024 · wiersgallak · Jun 12, 2024
diff --git a/source/about/editions-and-offerings.rst b/source/about/editions-and-offerings.rst
diff --git a/source/about/self-hosted-subscriptions.rst b/source/about/self-hosted-subscriptions.rst
@@ -4,7 +4,7 @@ Self-hosted subscriptions
 Buy a subscription
 ------------------
 
-To purchase a commercial subscription for Mattermost Professional or Mattermost Enterprise, please visit our pricing page online: https://mattermost.com/pricing/
+To purchase a commercial subscription for Mattermost Enterprise or Mattermost Professional, please visit our pricing page online: https://mattermost.com/pricing/
 
 Apply your license
 ------------------
@@ -106,7 +106,7 @@ What happens to my subscription if I don't renew in time?
 
 If you don't renew within the 60-day renewal period, a 10-day grace period is provided. During this period your Mattermost installation runs as normal, with full access to commercial features. During the grace period, the notification banner is not dismissable.
 
-When the grace period expires, your Professional or Enterprise plan is downgraded to the Free plan and other plan features are disabled.
+When the grace period expires, your Mattermost Enterprise or Professional plan is downgraded to the Free plan and other plan features are disabled.
 
 What happens when my subscription expires?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -127,4 +127,4 @@ If you don't plan to renew your subscription, revoke the expired license in **Sy
 Where can I find the license agreement for Mattermost Enterprise Edition?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Mattermost Enterprise Edition is the name for the binary of the Mattermost self-hosted Professional and Enterprise editions. This edition can be used for free without a license key as commercial software functionally equivalent to the open source Mattermost Team Edition licensed under MIT. When a license key is purchased and applied to Mattermost Enterprise Edition, additional features unlock. The license agreement for Mattermost Enterprise Edition is included in the software and also available `here <https://mattermost.com/enterprise-edition-license/>`_.
+Mattermost Enterprise Edition is the name for the binary of the Mattermost self-hosted Enterprise and Professional editions. This edition can be used for free without a license key as commercial software functionally equivalent to the open source Mattermost Team Edition licensed under MIT. When a license key is purchased and applied to Mattermost Enterprise Edition, additional features unlock. The license agreement for Mattermost Enterprise Edition is included in the software and also available `here <https://mattermost.com/enterprise-edition-license/>`_.
diff --git a/source/about/subscription.rst b/source/about/subscription.rst
@@ -10,7 +10,7 @@ Purchase Mattermost Licenses
 
 Mattermost offers capabilities through **Mattermost Enterprise** and **Mattermost Professional** subscription plans. Your plan subscription determines what features you have access to. When choosing a subscription:
 
-- Mattermost self-hosted deployments require a license subscription key to be applied to access features in the Professional or Enterprise plans via purchase options at https://mattermost.com/pricing/. 
+- Mattermost self-hosted deployments require a license subscription key to be applied to access features in the Mattermost Enterprise or Professional plans via purchase options at https://mattermost.com/pricing/. 
 
 
 Mattermost Nonprofit License program

diff --git a/source/collaborate/message-priority.rst b/source/collaborate/message-priority.rst
@@ -36,7 +36,7 @@ Send persistent notifications
 .. include:: ../_static/badges/ent-pro-only.rst
   :start-after: :nosearch:
 
-From Mattermost v8.0, when you add an urgent priority label, and your message @mentions at least one other user, `Mattermost Professional or Enterprise <https://mattermost.com/pricing>`__ customers can enable persistent notifications which notify recipients at regular intervals and for a set amount of time until the recipient acknowledges, reacts, or replies to the message.
+From Mattermost v8.0, when you add an urgent priority label, and your message @mentions at least one other user, `Mattermost Enterprise or Professional <https://mattermost.com/pricing>`__ customers can enable persistent notifications which notify recipients at regular intervals and for a set amount of time until the recipient acknowledges, reacts, or replies to the message.
 
 To enable persistent notifications for a message:
 
@@ -69,7 +69,7 @@ Request acknowledgements
 .. include:: ../_static/badges/ent-pro-only.rst
   :start-after: :nosearch:
 
-`Mattermost Professional or Enterprise <https://mattermost.com/pricing>`__ customers can additionally request that recipients actively acknowledge the message to track that messages have been seen and actioned. By default, marking a message as Urgent priority automatically requests an acknowledgement. 
+`Mattermost Enterprise or Professional <https://mattermost.com/pricing>`__ customers can additionally request that recipients actively acknowledge the message to track that messages have been seen and actioned. By default, marking a message as Urgent priority automatically requests an acknowledgement. 
 
 When you request acknowlegement of a message, an **Acknowledge** |acknowledge-button| button is added below the sent message. You can mark message as acknowledged by selecting the button, and you can hover over the **Acknowledged** |acknowledged-icon| icon to review who has acknowledged the message.
 

diff --git a/source/collaborate/send-messages.rst b/source/collaborate/send-messages.rst
@@ -51,7 +51,7 @@ Compose a message by typing into the text box at the bottom of the Mattermost sc
 
   - When you send messages in a channel, depending on the :doc:`channel actions configured </collaborate/create-channels>`, specific words in the post can trigger a prompt to run a playbook. Access **Channel Actions** from the channel name drop-down menu in the center pane to see what automatic actions have been configured for the current channel.
   - Using a RTL plugin, Mattermost can automatically detect and display messages written using right-to-left scripts, such as Arabic, Hebrew, or Persian. Your system admin must install the `RTL Plugin <https://github.com/QueraTeam/mattermost-rtl>`__ to enable this functionality.
-  - `Mattermost Professional or Enterprise <https://mattermost.com/pricing>`__ customers can `edit or delete messages <#edit-or-delete-messages>`__ after sending them if the system admin hasn't restricted the ability to do so using :doc:`advanced permissions </onboard/advanced-permissions>`.
+  - `Mattermost Enterprise or Professional <https://mattermost.com/pricing>`__ customers can `edit or delete messages <#edit-or-delete-messages>`__ after sending them if the system admin hasn't restricted the ability to do so using :doc:`advanced permissions </onboard/advanced-permissions>`.
 
 Draft messages
 --------------

diff --git a/source/configure/site-configuration-settings.rst b/source/configure/site-configuration-settings.rst
@@ -1176,7 +1176,7 @@ Message priority
 | - **false**: Disables the ability to set message priority and request       |                                                                        |
 |   acknowledgements.                                                         |                                                                        |
 +-----------------------------------------------------------------------------+------------------------------------------------------------------------+
-| **Note**: `Mattermost Professional or Enterprise <https://mattermost.com/pricing>`__ customers can additionally request message acknowledgements to  |
+| **Note**: `Mattermost Enterprise or Professional <https://mattermost.com/pricing>`__ customers can additionally request message acknowledgements to  |
 | track that specific, time-sensitive messages have been seen and actioned. See the                                                                    |
 | :doc:`message priority </collaborate/message-priority>` documentation to learn more.                                                                 |
 +-----------------------------------------------------------------------------+------------------------------------------------------------------------+

diff --git a/source/deploy/build-custom-mobile-apps.rst b/source/deploy/build-custom-mobile-apps.rst
@@ -9,7 +9,7 @@ You can build and distribute custom versions of the Mattermost mobile app. Choos
 This approach is recommended for:
 
 - Organizations that want to customize their Mattermost mobile Apps.
-- Customers using self-hosted Mattermost Team Edition, Professional or Enterprise Edition that prefer to host their own push proxy server instead of using one of Mattermost’s hosted versions.
+- Customers using self-hosted Mattermost Enterprise or Professional Edition, or Mattermost Team Edition, that prefer to host their own push proxy server instead of using one of Mattermost’s hosted versions.
 
 .. note::
 

diff --git a/source/deploy/legacy-cloud-changelog.md b/source/deploy/legacy-cloud-changelog.md
@@ -1152,7 +1152,7 @@ From Mattermost v9.2, see the [Mattermost Changelog](https://docs.mattermost.com
  - View the runs you're participating in or following in the **Runs** sidebar category, and view the playbooks you're a member of in the **Playbooks** sidebar category.
  - Favorite runs or playbooks to prioritize them in the **Favorites** category.
  - Participants now have access to every run feature on the new run details page.
- - In Cloud Professional and Enterprise plans, stakeholders can request status updates from runs.
+ - In Cloud Enterprise and Professional plans, stakeholders can request status updates from runs.
 
 ### Boards
  - All the boards you’re currently a member of from your current team will appear on the sidebar without needing to switch workspaces.
@@ -2028,7 +2028,7 @@ From Mattermost v9.2, see the [Mattermost Changelog](https://docs.mattermost.com
  - Added a global header for product navigation for Channels, Playbooks, and Boards. This is disabled on the mobile web view and mobile apps.
 
 #### Packaging Changes
- - Introducing [updated packaging](https://mattermost.com/pricing) with new Starter, Professional and Enterprise plans to better serve our customers.
+ - Introducing [updated packaging](https://mattermost.com/pricing) with new Starter, Enterprise and Professional plans to better serve our customers.
  - Existing paying Cloud Professional customers will automatically be upgraded to Cloud Enterprise with no change to pricing or feature set for the next 12 months. More information will be shared to the workspace owner's email address shortly after the release.
  - Existing free Cloud customers will be asked to enter their credit card by January 15th, 2022 to continue using Mattermost Cloud. More information will be shared to the workspace owner's email address shortly after the release.
 

diff --git a/source/deploy/legacy-self-hosted-changelog.md b/source/deploy/legacy-self-hosted-changelog.md
@@ -392,7 +392,7 @@ Multiple setting options were added to ``config.json``. Below is a list of the a
  - Under ``FileSettings`` 
     - Added various export store settings to add support for a new Export storage.
 
-#### Changes to Professional and Enterprise plans:
+#### Changes to Enterprise and Professional plans:
  - Under ``GuestAccountsSettings`` in ``config.json``:
     - Added ``HideTags`` to add the ability to remove the **Guest** badges from within the product.
 
@@ -500,7 +500,7 @@ If you upgrade from a release earlier than v7.10, please read the other [Importa
 ### Improvements
 
 #### User Interface (UI)
- - Persistent notifications (Professional and Enterprise Plans) allow users to notify recipients repeatedly until action is taken on an urgent message. Check out [our documentation](https://docs.mattermost.com/channels/message-priority.html#send-persistent-notifications) for more details.
+ - Persistent notifications (Enterprise and Professional lans) allow users to notify recipients repeatedly until action is taken on an urgent message. Check out [our documentation](https://docs.mattermost.com/channels/message-priority.html#send-persistent-notifications) for more details.
  - The apps bar is now enabled by default for on-prem servers. ``ExperimentalSettings.EnableAppBar`` was also renamed to ``ExperimentalSettings.DisableAppBar``. See more details at:
    - https://docs.mattermost.com/configure/experimental-configuration-settings.html#disable-app-bar 
    - https://forum.mattermost.com/t/channel-header-plugin-changes/13551
@@ -608,7 +608,7 @@ Multiple setting options were added to ``config.json``. Below is a list of the a
    - Added ``DisableAppBar`` to enable apps bar by default.
  - Three configuration fields have been added, ``LogSettings.AdvancedLoggingJSON``, ``ExperimentalAuditSettings.AdvancedLoggingJSON``, and ``NotificationLogSettings.AdvancedLoggingJSON`` which support multi-line JSON, escaped JSON as a string, or a filename that points to a file containing JSON.  The ``AdvancedLoggingConfig`` fields have been deprecated.
 
-#### Changes to Professional and Enterprise plans:
+#### Changes to Enterprise and Professional plans:
  - Under ``ServiceSettings`` in ``config.json``:
    - Added new configuration settings ``AllowPersistentNotifications``, ``PersistentNotificationIntervalMinutes``, ``PersistentNotificationMaxCount``, ``PersistentNotificationMaxRecipients``, to add a persistent notification option when sending urgent priority posts.
 
@@ -2065,7 +2065,7 @@ If you upgrade from a release earlier than v6.6, please read the other [Importan
 ### Highlights
 
 #### Playbooks Updates
- - To keep procedures on track while reducing noise, task due dates can now be added to playbook runs (Professional and Enterprise subscriptions).
+ - To keep procedures on track while reducing noise, task due dates can now be added to playbook runs (Enterprise and Professional subscriptions).
 
 ### Improvements
 
@@ -2332,7 +2332,7 @@ If you upgrade from a release earlier than v6.4, please read the other [Importan
 
 ### Highlights
 
-#### Custom User Groups (Beta; Professional and Enterprise Plans)
+#### Custom User Groups (Beta; Enterprise and Professional Plans)
  - Added the ability to mention a group of members at a time in a workspace. Users can create groups, edit group details, join groups, archive groups, and add group members.
 
 #### Cross-team Channel Navigation

diff --git a/source/deploy/mattermost-changelog.md b/source/deploy/mattermost-changelog.md
@@ -104,7 +104,7 @@ New setting option were added to ``config.json``. Below is a list of the additio
  - Under ``ClusterSettings`` in ``config.json``:
    - Removed unused settings ``StreamingPort``, ``MaxIdleConns``, ``MaxIdleConnsPerHost`` and ``IdleConnTimeoutMilliseconds``.
 
- #### Changes to Professional and Enterprise plans:
+ #### Changes to Enterprise and Professional plans:
  - Under ``ExperimentalSettings`` in ``config.json``:
    - Removed the ``UseNewSAMLLibrary`` experimental setting.
 
@@ -254,7 +254,7 @@ See [this walkthrough video](https://mattermost.com/video/changelog-v9-6/) on so
  - Pre-packaged Calls version [v0.24.0](https://github.com/mattermost/mattermost-plugin-calls/releases/tag/v0.24.0).
  - Pre-packaged GitLab plugin version [v1.8.0](https://github.com/mattermost/mattermost-plugin-gitlab/releases/tag/v1.8.0).
  - Added the [Outgoing OAuth Connections](https://mattermost.com/pl/outgoing-oauth-connections) integration type.
- - Re-designed the **System Console > User Management** screen, and added the ability to batch export users in CSV format (Professional and Enterprise plans). On MySQL, users cannot view live results of the batch export in the user interface.
+ - Re-designed the **System Console > User Management** screen, and added the ability to batch export users in CSV format (Enterprise and Professional plans). On MySQL, users cannot view live results of the batch export in the user interface.
  - Improved the appearance of profile/account menus.
  - Added support for checkbox types in the **System Console** settings.
  - Added support for WebP image previews in the web app similar to PNG and other image formats.
@@ -395,7 +395,7 @@ See [this walkthrough video](https://www.youtube.com/watch?v=b1M2BGGF578&feature
      - Added ``MaximumPayloadSizeBytes`` to add a limit to the payload size of API endpoints passing in arrays.
  - Added a configuration setting ``OutgoingIntegrationRequestsDefaultTimeout`` for integration requests.
 
-#### Changes to the Professional and Enterprise plans:
+#### Changes to the Enterprise and Professional plans:
  - Under ``WranglerSettings`` in ``config.json``:
     - Added ``AllowedEmailDomain`` - a CSV list of strings, where each is an email domain that is allowed to use the feature (e.g. - on community.mattermost.com, ``mattermost.com`` would allow staff to move a thread, while non-staff cannot).
     - ``MoveThreadMaxCount`` - a number representing the maximum number of posts that can be in a thread for it to be moveable.
@@ -561,7 +561,7 @@ See [this walkthrough video](https://www.youtube.com/watch?v=eXA8emM97Bo) on som
  - Updated pre-packaged Calls version to [v0.21.1](https://github.com/mattermost/mattermost-plugin-calls/releases/tag/v0.21.1).
  - Updated pre-packaged Jira plugin version to [v4.0.1](https://github.com/mattermost/mattermost-plugin-jira/releases/tag/v4.0.1). Also see [v4.0.0](https://github.com/mattermost/mattermost-plugin-jira/releases/tag/v4.0.0) for recent breaking changes.
  - Added Vietnamese (Beta) as a new language.
- - Added the ability to passively track keywords with highlights without triggering a notification (Professional and Enterprise plans).
+ - Added the ability to passively track keywords with highlights without triggering a notification (Enterprise and Professional plans).
  - Updated the **Settings** modal with an improved user interface.
  - Added a new **Jump to recents** banner when a channel is scrolled up.
  - Modified the behavior of the code button (Ctrl+Alt+C) to create inline codes or code blocks.

diff --git a/source/deploy/mobile-faq.rst b/source/deploy/mobile-faq.rst
@@ -163,7 +163,7 @@ The following options are available for securing your push notification service:
 
 4. Securing the Mattermost Apple App Store and Google Play apps:
 
-  - When using Mattermost mobile apps from the App Store and Google Play, purchase an annual subscription to Mattermost Professional or Enterprise to use Mattermost's :ref:`Hosted Push Notification Service (HPNS) <deploy/mobile-hpns:hosted push notifications service (hpns)>`.
+  - When using Mattermost mobile apps from the App Store and Google Play, purchase an annual subscription to Mattermost Enterprise or Professional to use Mattermost's :ref:`Hosted Push Notification Service (HPNS) <deploy/mobile-hpns:hosted push notifications service (hpns)>`.
 
 .. note:: 
 

diff --git a/source/getting-started/admin-onboarding-tasks.rst b/source/getting-started/admin-onboarding-tasks.rst
@@ -51,7 +51,7 @@ Common tasks
 
 **Migrating to AD/LDAP or SAML from email-based authentication**
 
-- If you have Professional or Enterprise plans, you can migrate from email authentication to Active Directory/LDAP or to SAML Single Sign-on. To set up Active Directory/LDAP, see :doc:`Active Directory/LDAP Setup </onboard/ad-ldap>`. To set up SAML Single Sign-on, see :doc:`SAML Single-Sign-On </onboard/sso-saml>`.
+- If you have a Mattermost Enterprise or Professional plan, you can migrate from email authentication to Active Directory/LDAP or to SAML Single Sign-on. To set up Active Directory/LDAP, see :doc:`Active Directory/LDAP Setup </onboard/ad-ldap>`. To set up SAML Single Sign-on, see :doc:`SAML Single-Sign-On </onboard/sso-saml>`.
 - After the new authentication method is enabled, existing users cannot use the new method until they go to **Settings > Security > Sign-in method** and select **Switch to using AD/LDAP** or **Switch to using SAML Single Sign-on**. After they have switched, they can no longer use their email and password to log in.  
 
 **Deactivating a user**