Merge branch 'master' into sphinx-8.2.3

Author: cwarnermm

source/_static/images/check-circle-green.svg

@@ -6,7 +6,7 @@ Cloud Dedicated
 
 Mattermost Cloud Dedicated is designed for larger organizations with higher demands for performance, scalability, customizability, and compliance looking to offload operational overhead and focus on more business-critical tasks.
 
-Your own private Mattermost instance running :ref:`Mattermost Enterprise <about/editions-and-offerings:mattermost enterprise>` is a Kubernetes cluster hosted and managed by Mattermost that runs on dedicated cloud infrastructure, where resources are exclusively available for your organization.
+Your own private Mattermost instance running :doc:`Mattermost Enterprise </about/editions-and-offerings>` is a Kubernetes cluster hosted and managed by Mattermost that runs on dedicated cloud infrastructure, where resources are exclusively available for your organization.
 
 Reference architecture
 ----------------------

source/about/cloud-dedicated.rst

@@ -6,7 +6,7 @@ Cloud Shared
 
 Mattermost Cloud Shared is designed as a cost-effective solution for companies who don't have strict security and compliance requirements that need a straightforward, managed communication platform without the necessity for extensive customization or dedicated resources.
 
-Your Mattermost deployment is isolated, is fully hosted and managed by Mattermost, and runs :ref:`Mattermost Enterprise <about/editions-and-offerings:mattermost enterprise>` on shared infrastructure where resources are shared among multiple Mattermost customers, which might affect performance during peak times. 
+Your Mattermost deployment is isolated, is fully hosted and managed by Mattermost, and runs :doc:`Mattermost Enterprise </about/editions-and-offerings>` on shared infrastructure where resources are shared among multiple Mattermost customers, which might affect performance during peak times. 
 
 Reference architecture
 ----------------------

source/about/cloud-shared.rst

@@ -35,15 +35,9 @@ Because of the benefits of Mattermost Enterprise Edition, we recommend installin
 Mattermost plans
 ----------------
 
-Mattermost plans consist of features and entitlements available either a paid subscription service or free. 
+Mattermost plans consist of features and entitlements available either a paid subscription service or free. :doc:`Learn more </about/plans>` about the features available across all plans.
 
-We have three primary plans available: 
-
-* `Mattermost Enterprise <#mattermost-enterprise>`__: This is a paid subscription service for large and sophisticated enterprise-scale deployments of the Mattermost platform.
-* `Mattermost Professional <#mattermost-professional>`__: This is a paid subscription service providing advance access controls and user management for managers leading teams of teams.
-* `Mattermost Free <#mattermost-free>`__: This a free version of our collaboration platform designed for single teams (self-hosted only).
-
-The Mattermost Professional and Mattermost Enterprise editions are only available after deploying our Mattermost Enterprise Edition code base, 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/.
+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 
 ~~~~~~~~~~~~~~~~~~~~~
@@ -137,8 +131,6 @@ Features include:
 - Multiple languages including English (Australian, US), Bulgarian, Chinese (Simplified and Traditional), Dutch, French, German, Hungarian, Italian, Japanese, Korean, Persian, Polish, Portuguese (Brazil), Romanian, Russian, Spanish, Swedish, Turkish, Ukrainian, and Vietnamese.
 - `Community support <https://mattermost.com/support/>`_.
 
-See a complete list of features `here <https://mattermost.com/pricing>`_.
-
 Product decisions
 -----------------
 

source/about/editions-and-offerings.rst

@@ -49,7 +49,7 @@ Yes, Enterprises can inquire about `Mattermost Cloud Enterprise <https://matterm
 
 For more information, contact the Mattermost Sales organization at https://mattermost.com/contact-sales/
 
-For small businesses, :ref:`Mattermost Professional <about/editions-and-offerings:mattermost professional>` is available as a self-serve, multi-tenant, software-as-a-service offering.
+For small businesses, :doc:`Mattermost Professional </about/editions-and-offerings>` is available as a self-serve, multi-tenant, software-as-a-service offering.
 
 Do you offer special programs for non-profit organizations, open source projects, or educational institutions?
 ----------------------------------------------------------------------------------------------------------------

source/about/faq-enterprise.rst

@@ -1,7 +1,7 @@
 Non-Profit Subscriptions
 ========================
 
-The Mattermost Nonprofit License enables nonprofit and open-source organizations who are unable to afford our commercial licenses to apply the benefits of the self-hosted :ref:`Mattermost Professional offering <about/editions-and-offerings:mattermost professional>` towards advancing their missions with special nonprofit pricing.
+The Mattermost Nonprofit License enables nonprofit and open-source organizations who are unable to afford our commercial licenses to apply the benefits of the self-hosted :doc:`Mattermost Professional offering </about/editions-and-offerings>` towards advancing their missions with special nonprofit pricing.
 
 .. tip::