mattermost · cwarnermm · Apr 28, 2025 · Apr 29, 2025 · Apr 29, 2025 · Apr 29, 2025
diff --git a/source/about/editions-and-offerings.rst b/source/about/editions-and-offerings.rst
@@ -58,7 +58,7 @@ Mattermost Enterprise is an enterprise-grade collaboration system that supports
 
 This offering includes all the features of `Mattermost Professional <#mattermost-professional>`__, plus: 
 
-- :doc:`Enterprise-scale search with dedicated indexing and usage resourcing via cluster support </scale/elasticsearch>`.
+- :doc:`Enterprise-scale search with dedicated indexing and usage resourcing via cluster support </scale/enterprise-search>`.
 - :doc:`Sychronization of access controls, channels, and teams with AD/LDAP Groups </onboard/ad-ldap-groups-synchronization>`.
 - :doc:`eDiscovery and compliance export automation </comply/compliance-export>`.
 - :doc:`Enterprise mobile device management with custom EMM support via AppConfig </deploy/mobile/deploy-mobile-apps-using-emm-provider>`.

diff --git a/source/about/mattermost-v9-changelog.md b/source/about/mattermost-v9-changelog.md
@@ -83,16 +83,16 @@
 
 ### Important Upgrade Notes
 
- - Added support for Elasticsearch v8. Also added Beta support for [Opensearch v1.x and v2.x](https://opensearch.org/). A new config setting ``ElasticsearchSettings.Backend`` has been added to differentiate between Elasticsearch and Opensearch. The default value is `elasticsearch`, which breaks support for AWS Elasticsearch v7.10.x since the official v8 client only works from Elasticsearch v7.11 and higher versions. See the important note below for details.
+ - Added support for Elasticsearch v8. Also added Beta support for [OpenSearch v1.x and v2.x](https://opensearch.org/). A new config setting ``ElasticsearchSettings.Backend`` has been added to differentiate between Elasticsearch and OpenSearch. The default value is `elasticsearch`, which breaks support for AWS Elasticsearch v7.10.x since the official v8 client only works from Elasticsearch v7.11 and higher versions. See the important note below for details.
  - Mattermost supports Elasticsearch v7.17+. However, we recommend upgrading your Elasticsearch v7 instance to v8.x. See the [Elasticsearch upgrade](https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html) documentation for details.
  - When using Elasticsearch v8, ensure you set ``action.destructive_requires_name`` to ``false`` in ``elasticsearch.yml`` to allow for wildcard operations to work.
 
 ```{Important}
 **AWS Elasticsearch**
 
 If you're using AWS Elasticsearch, you must:
-1. Upgrade to AWS Opensearch. Refer to the [Opensearch upgrade](https://docs.aws.amazon.com/opensearch-service/latest/developerguide/version-migration.html) documentation for details.
-2. Disable "compatibility mode" in Opensearch.
+1. Upgrade to AWS OpenSearch. Refer to the [OpenSearch upgrade](https://docs.aws.amazon.com/opensearch-service/latest/developerguide/version-migration.html) documentation for details.
+2. Disable "compatibility mode" in OpenSearch.
 3. Upgrade Mattermost server.
 4. Update the Mattermost `ElasticsearchSettings.Backend` configuration setting value from `elasticsearch` to `opensearch` manually or using [mmctl](https://docs.mattermost.com/manage/mmctl-command-line-tool.html#mmctl-config-set). This value cannot be changed using the System Console. See the Mattermost [Elasticsearch backend type](https://docs.mattermost.com/configure/environment-configuration-settings.html#elastic-backendtype) documentation for additional details.
 5. Restart the Mattermost server.
@@ -163,7 +163,7 @@ New setting options were added to ``config.json``. Below is a list of the additi
 
 #### Changes to the Enterprise plan:
  - Under ``ElasticsearchSettings`` in ``config.json``:
-    - Added ``Backend`` to differentiate between Elasticsearch and Opensearch. The default value is Elasticsearch.
+    - Added ``Backend`` to differentiate between Elasticsearch and OpenSearch. The default value is ``elasticsearch``.
 
 ### API Changes
  - Added new API endpoints to manage remote clusters.

diff --git a/source/comply/data-retention-policy.rst b/source/comply/data-retention-policy.rst
@@ -47,7 +47,7 @@ You can also run the deletion job manually at any time by selecting **Run Deleti
 
 .. note::
 
-  If using data retention and :doc:`ElasticSearch </scale/elasticsearch>`, ensure the :ref:`ElasticSearch aggregate search indexes <configure/environment-configuration-settings:aggregate search indexes>` setting is set to a value that is greater than your data retention policy in days.
+  If using data retention with :doc:`ElasticSearch </scale/elasticsearch-setup>`, ensure the :ref:`ElasticSearch aggregate search indexes <configure/environment-configuration-settings:aggregate search indexes>` setting is set to a value that is greater than your data retention policy in days.
 
 Frequently Asked Questions (FAQs)
 ---------------------------------

diff --git a/source/conf.py b/source/conf.py
@@ -1947,7 +1947,8 @@ def setup(_: Sphinx):
         "https://docs.mattermost.com/deploy/server/server-deployment-planning.html",
 "configure/using-outbound-proxy.html":
         "https://docs.mattermost.com/deploy/server/server-deployment-planning.html",
-
+"configure/environment-configuration-settings.html#elasticsearch":
+        "https://docs.mattermost.com/configure/environment-configuration-settings.html#enterprise-search",
 
 # Deploy redirects
 "deploy/mobile-apps-faq.html":
@@ -3792,6 +3793,8 @@ def setup(_: Sphinx):
         "https://docs.mattermost.com/scale/scale-to-80000-users.html",
 "scale/scale-to-88000-users.html":
         "https://docs.mattermost.com/scale/scale-to-90000-users.html",
+"scale/elasticsearch.html":
+        "https://docs.mattermost.com/scale/enterprise-search.html",
 
 # Upgrade redirects
 "upgrade/upgrading-mattermost-server.html#prepare-to-upgrade-to-the-latest-version":

diff --git a/source/configure/bleve-search.rst b/source/configure/bleve-search.rst
@@ -42,4 +42,4 @@ The following conditions are applied when using Bleve search:
 How does search work with Bleve disabled?
 -------------------------------------------
 
-Mattermost performs full text searches against the database unless you have an :ref:`Enterprise license <about/editions-and-offerings:mattermost enterprise edition>` and :doc:`Elasticsearch </scale/elasticsearch>` configured.
+Mattermost performs full text searches against the database unless you have an :ref:`Enterprise license <about/editions-and-offerings:mattermost enterprise edition>` and :doc:`enterprise search </scale/enterprise-search>` configured.