From fff42db564c8296eccd3f45bc04f2a6d6140e824 Mon Sep 17 00:00:00 2001
From: alicejw <alicejw@amazon.com>
Date: Thu, 5 May 2022 13:52:35 -0700
Subject: [PATCH 1/8] remove instances of setting that is no longer available
 in OS2.0

Signed-off-by: alicejw <alicejw@amazon.com>
---
 _clients/agents-and-ingestion-tools/index.md | 4 ++--
 _opensearch/configuration.md                 | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/_clients/agents-and-ingestion-tools/index.md b/_clients/agents-and-ingestion-tools/index.md
index dfcac5b67e..4417160cd3 100644
--- a/_clients/agents-and-ingestion-tools/index.md
+++ b/_clients/agents-and-ingestion-tools/index.md
@@ -26,13 +26,13 @@ PUT _cluster/settings
   }
 }
 ```
-
+<!-- This setting is deprecated in 1.0 and removed from 2.0
 [Just like any other setting]({{site.url}}{{site.baseurl}}/opensearch/configuration/), the alternative is to add the following line to `opensearch.yml` on each node and then restart the node:
 
 ```yml
 compatibility.override_main_response_version: true
 ```
-
+-->
 Logstash OSS 8.0 introduces a breaking change where all plugins run in ECS compatibility mode by default. If you use a compatible [OSS client](#compatibility-matrices) you must override the default value to maintain legacy behavior:
 
 ```yml
diff --git a/_opensearch/configuration.md b/_opensearch/configuration.md
index 53090806d9..a5f059c3c4 100755
--- a/_opensearch/configuration.md
+++ b/_opensearch/configuration.md
@@ -74,7 +74,6 @@ You don't mark settings in `opensearch.yml` as persistent or transient, and sett
 ```yml
 cluster.name: my-application
 action.auto_create_index: true
-compatibility.override_main_response_version: true
 ```
 
 The demo configuration includes a number of settings for the security plugin that you should modify before using OpenSearch for a production workload. To learn more, see [Security]({{site.url}}{{site.baseurl}}/security-plugin/).

From 31decfa7e43ad8b052335323687af3b31437989e Mon Sep 17 00:00:00 2001
From: alicejw <alicejw@amazon.com>
Date: Thu, 5 May 2022 14:28:37 -0700
Subject: [PATCH 2/8] add note to legacy clients matrix

Signed-off-by: alicejw <alicejw@amazon.com>
---
 _clients/index.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/_clients/index.md b/_clients/index.md
index a744883988..dc85c8cf63 100644
--- a/_clients/index.md
+++ b/_clients/index.md
@@ -26,6 +26,10 @@ For example, a 1.0.0 client works with an OpenSearch 1.1.0 cluster, but might no
 
 Most clients that work with Elasticsearch OSS 7.10.2 *should* work with OpenSearch, but the latest versions of those clients might include license or version checks that artificially break compatibility. This page includes recommendations around which versions of those clients to use for best compatibility with OpenSearch.
 
+{: .note}
+OpenSearch 2.0.0 no longer supports HLRC compatibility with legacy clients.
+
+
 Client | Recommended version
 :--- | :---
 [Java low-level REST client](https://search.maven.org/artifact/org.elasticsearch.client/elasticsearch-rest-client/7.13.4/jar) | 7.13.4

From 776c6fe1d3ea7d0e8a931b2e867f9c329b79c4cc Mon Sep 17 00:00:00 2001
From: alicejw <alicejw@amazon.com>
Date: Thu, 5 May 2022 14:32:03 -0700
Subject: [PATCH 3/8] update note for 2.0 incompatible with legacy clients

Signed-off-by: alicejw <alicejw@amazon.com>
---
 _clients/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_clients/index.md b/_clients/index.md
index dc85c8cf63..e1b2ec6b28 100644
--- a/_clients/index.md
+++ b/_clients/index.md
@@ -27,7 +27,7 @@ For example, a 1.0.0 client works with an OpenSearch 1.1.0 cluster, but might no
 Most clients that work with Elasticsearch OSS 7.10.2 *should* work with OpenSearch, but the latest versions of those clients might include license or version checks that artificially break compatibility. This page includes recommendations around which versions of those clients to use for best compatibility with OpenSearch.
 
 {: .note}
-OpenSearch 2.0.0 no longer supports HLRC compatibility with legacy clients.
+OpenSearch 2.0.0 no longer supports compatibility with legacy clients. Due to breaking changes with REST APIs, clients using older OpenSearch 1.x versions can't connect with OpenSearch 2.0.
 
 
 Client | Recommended version

From da027fb960b9079a77cfdd6773691b4e584a58aa Mon Sep 17 00:00:00 2001
From: alicejw <alicejw@amazon.com>
Date: Mon, 16 May 2022 10:27:41 -0700
Subject: [PATCH 4/8] for issue 517 override setting not supported for legacy
 clients in OpenSearch version 2.0

Signed-off-by: alicejw <alicejw@amazon.com>
---
 _clients/agents-and-ingestion-tools/index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/_clients/agents-and-ingestion-tools/index.md b/_clients/agents-and-ingestion-tools/index.md
index 4417160cd3..2571738d01 100644
--- a/_clients/agents-and-ingestion-tools/index.md
+++ b/_clients/agents-and-ingestion-tools/index.md
@@ -26,6 +26,8 @@ PUT _cluster/settings
   }
 }
 ```
+{: .note}
+The Override main response setting `compatibility.override_main_response_version` is removed from OpenSearch 2.0.0. This setting is no longer supported for compatibility with legacy clients.
 <!-- This setting is deprecated in 1.0 and removed from 2.0
 [Just like any other setting]({{site.url}}{{site.baseurl}}/opensearch/configuration/), the alternative is to add the following line to `opensearch.yml` on each node and then restart the node:
 

From 7dbe65fd18422c998a5cabb240f3ac48cb913234 Mon Sep 17 00:00:00 2001
From: alicejw <alicejw@amazon.com>
Date: Mon, 16 May 2022 11:16:16 -0700
Subject: [PATCH 5/8] for clarity about setting deprecated in 1.x and removed
 in 2.0.

Signed-off-by: alicejw <alicejw@amazon.com>
---
 _clients/agents-and-ingestion-tools/index.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/_clients/agents-and-ingestion-tools/index.md b/_clients/agents-and-ingestion-tools/index.md
index 2571738d01..e112b30917 100644
--- a/_clients/agents-and-ingestion-tools/index.md
+++ b/_clients/agents-and-ingestion-tools/index.md
@@ -12,8 +12,14 @@ redirect_from:
 
 Historically, many multiple popular agents and ingestion tools have worked with Elasticsearch OSS, such as Beats, Logstash, Fluentd, FluentBit, and OpenTelemetry. OpenSearch aims to continue to support a broad set of agents and ingestion tools, but not all have been tested or have explicitly added OpenSearch compatibility.
 
-As an intermediate compatibility solution, OpenSearch has a setting that instructs the cluster to return version 7.10.2 rather than its actual version.
+Previously, an intermediate compatibility solution was available. OpenSearch had a setting that instructs the cluster to return version 7.10.2 rather than its actual version.
 
+The Override main response setting `compatibility.override_main_response_version` is deprecated from OpenSearch version 1.x and removed from OpenSearch 2.0.0. This setting is no longer supported for compatibility with legacy clients.
+{: .note}
+
+{: .note}
+
+<!--
 If you use clients that include a version check, such as versions of Logstash OSS or Filebeat OSS between 7.x - 7.12.x, enable the setting:
 
 ```json
@@ -26,9 +32,7 @@ PUT _cluster/settings
   }
 }
 ```
-{: .note}
-The Override main response setting `compatibility.override_main_response_version` is removed from OpenSearch 2.0.0. This setting is no longer supported for compatibility with legacy clients.
-<!-- This setting is deprecated in 1.0 and removed from 2.0
+
 [Just like any other setting]({{site.url}}{{site.baseurl}}/opensearch/configuration/), the alternative is to add the following line to `opensearch.yml` on each node and then restart the node:
 
 ```yml

From 997bd489d294beb8b1c82e2757f9b9f946568e7d Mon Sep 17 00:00:00 2001
From: alicejw <alicejw@amazon.com>
Date: Tue, 17 May 2022 17:30:46 -0700
Subject: [PATCH 6/8] for requester's PR review and updates for accuracy

Signed-off-by: alicejw <alicejw@amazon.com>
---
 _clients/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_clients/index.md b/_clients/index.md
index e1b2ec6b28..52d9a29c00 100644
--- a/_clients/index.md
+++ b/_clients/index.md
@@ -27,7 +27,7 @@ For example, a 1.0.0 client works with an OpenSearch 1.1.0 cluster, but might no
 Most clients that work with Elasticsearch OSS 7.10.2 *should* work with OpenSearch, but the latest versions of those clients might include license or version checks that artificially break compatibility. This page includes recommendations around which versions of those clients to use for best compatibility with OpenSearch.
 
 {: .note}
-OpenSearch 2.0.0 no longer supports compatibility with legacy clients. Due to breaking changes with REST APIs, clients using older OpenSearch 1.x versions can't connect with OpenSearch 2.0.
+OpenSearch 2.0.0 no longer supports compatibility with legacy clients. Due to breaking changes with REST APIs, some features are not supported when using OpenSearch 1.x clients to connect with OpenSearch 2.0.
 
 
 Client | Recommended version

From bd5e27ab683d660bb16de62f7118a01884bb47f3 Mon Sep 17 00:00:00 2001
From: alicejw <alicejw@amazon.com>
Date: Tue, 17 May 2022 17:36:29 -0700
Subject: [PATCH 7/8] for small fix to move note syntax into commented-out
 section

Signed-off-by: alicejw <alicejw@amazon.com>
---
 _clients/agents-and-ingestion-tools/index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/_clients/agents-and-ingestion-tools/index.md b/_clients/agents-and-ingestion-tools/index.md
index e112b30917..97d09fed43 100644
--- a/_clients/agents-and-ingestion-tools/index.md
+++ b/_clients/agents-and-ingestion-tools/index.md
@@ -17,9 +17,10 @@ Previously, an intermediate compatibility solution was available. OpenSearch had
 The Override main response setting `compatibility.override_main_response_version` is deprecated from OpenSearch version 1.x and removed from OpenSearch 2.0.0. This setting is no longer supported for compatibility with legacy clients.
 {: .note}
 
+<!--
 {: .note}
 
-<!--
+
 If you use clients that include a version check, such as versions of Logstash OSS or Filebeat OSS between 7.x - 7.12.x, enable the setting:
 
 ```json

From 90a5a6145280ba60e52207f5ae291aa7048881fc Mon Sep 17 00:00:00 2001
From: alicejw <alicejw@amazon.com>
Date: Mon, 23 May 2022 11:52:14 -0700
Subject: [PATCH 8/8] for editor's feedback updates

Signed-off-by: alicejw <alicejw@amazon.com>
---
 _clients/agents-and-ingestion-tools/index.md | 4 ++--
 _clients/index.md                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/_clients/agents-and-ingestion-tools/index.md b/_clients/agents-and-ingestion-tools/index.md
index 97d09fed43..4eab146acf 100644
--- a/_clients/agents-and-ingestion-tools/index.md
+++ b/_clients/agents-and-ingestion-tools/index.md
@@ -12,9 +12,9 @@ redirect_from:
 
 Historically, many multiple popular agents and ingestion tools have worked with Elasticsearch OSS, such as Beats, Logstash, Fluentd, FluentBit, and OpenTelemetry. OpenSearch aims to continue to support a broad set of agents and ingestion tools, but not all have been tested or have explicitly added OpenSearch compatibility.
 
-Previously, an intermediate compatibility solution was available. OpenSearch had a setting that instructs the cluster to return version 7.10.2 rather than its actual version.
+Previously, an intermediate compatibility solution was available. OpenSearch had a setting that instructed the cluster to return version 7.10.2 rather than its actual version.
 
-The Override main response setting `compatibility.override_main_response_version` is deprecated from OpenSearch version 1.x and removed from OpenSearch 2.0.0. This setting is no longer supported for compatibility with legacy clients.
+The override main response setting `compatibility.override_main_response_version` is deprecated from OpenSearch version 1.x and removed from OpenSearch 2.0.0. This setting is no longer supported for compatibility with legacy clients.
 {: .note}
 
 <!--
diff --git a/_clients/index.md b/_clients/index.md
index 52d9a29c00..89792d8ee0 100644
--- a/_clients/index.md
+++ b/_clients/index.md
@@ -27,7 +27,7 @@ For example, a 1.0.0 client works with an OpenSearch 1.1.0 cluster, but might no
 Most clients that work with Elasticsearch OSS 7.10.2 *should* work with OpenSearch, but the latest versions of those clients might include license or version checks that artificially break compatibility. This page includes recommendations around which versions of those clients to use for best compatibility with OpenSearch.
 
 {: .note}
-OpenSearch 2.0.0 no longer supports compatibility with legacy clients. Due to breaking changes with REST APIs, some features are not supported when using OpenSearch 1.x clients to connect with OpenSearch 2.0.
+OpenSearch 2.0.0 no longer supports compatibility with legacy clients. Due to breaking changes with REST APIs, some features are not supported when using OpenSearch 1.x clients to connect to OpenSearch 2.0.
 
 
 Client | Recommended version