From 1abbcd2abedf78b44ba03f95ae7ec98c7d4e2328 Mon Sep 17 00:00:00 2001
From: James Rodewig <40268737+jrodewig@users.noreply.github.com>
Date: Thu, 23 Sep 2021 12:56:30 -0400
Subject: [PATCH 1/3] [DOCS] Remove support for `unmapped_type:string` sort

Adds an 8.0 breaking change for PR #45675.
---
 .../migration/migrate_8_0/search.asciidoc          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/reference/migration/migrate_8_0/search.asciidoc b/docs/reference/migration/migrate_8_0/search.asciidoc
index 6ddffbb566eb5..689045db74b46 100644
--- a/docs/reference/migration/migrate_8_0/search.asciidoc
+++ b/docs/reference/migration/migrate_8_0/search.asciidoc
@@ -6,6 +6,20 @@
 //Installation and Upgrade Guide
 
 //tag::notable-breaking-changes[]
+[[remove-unmapped-type-string]]
+.The `unmapped_type: string` sort option has been removed.
+[%collapsible]
+====
+*Details* +
+Search requests no longer support the `unmapped_type: string` sort option.
+Instead, use `unmapped_type: keyword` to handle an unmapped field as if it had
+the `keyword` field type but ignore its values for sorting.
+
+*Impact* +
+Discontinue use of `unmapped_type: string`. Requests that include the
+`unmapped_type: string` sort option will return an error.
+====
+
 [[id-field-data]]
 .Aggregating and sorting on `_id` is disallowed by default.
 [%collapsible]

From a4ffb54e03d49c3c4a179583968f13c8ab0f28f6 Mon Sep 17 00:00:00 2001
From: James Rodewig <40268737+jrodewig@users.noreply.github.com>
Date: Thu, 23 Sep 2021 13:25:04 -0400
Subject: [PATCH 2/3] Clarify error

---
 .../migration/migrate_8_0/mappings.asciidoc         | 13 +++++++++++++
 .../reference/migration/migrate_8_0/search.asciidoc |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/reference/migration/migrate_8_0/mappings.asciidoc b/docs/reference/migration/migrate_8_0/mappings.asciidoc
index 3e88cc6f65c72..3cdd218306588 100644
--- a/docs/reference/migration/migrate_8_0/mappings.asciidoc
+++ b/docs/reference/migration/migrate_8_0/mappings.asciidoc
@@ -6,6 +6,19 @@
 //Installation and Upgrade Guide
 
 //tag::notable-breaking-changes[]
+.Updating `include_in_parent` or `include_in_root` for a `nested` field now returns an error.
+[%collapsible]
+====
+*Details* +
+Attempts to update the `include_in_parent` or `include_in_root` mapping
+parameter for an existing `nested` field now returns an error. Previously, {es}
+would silently ignore attempts to update these parameters.
+
+*Impact* +
+To avoid errors, do not attempt to update `include_in_parent` or
+`include_in_root` for an existing `nested` field.
+====
+
 .The maximum number of completion contexts per field is now 10.
 [%collapsible]
 ====
diff --git a/docs/reference/migration/migrate_8_0/search.asciidoc b/docs/reference/migration/migrate_8_0/search.asciidoc
index 689045db74b46..f8be8708ab983 100644
--- a/docs/reference/migration/migrate_8_0/search.asciidoc
+++ b/docs/reference/migration/migrate_8_0/search.asciidoc
@@ -16,8 +16,8 @@ Instead, use `unmapped_type: keyword` to handle an unmapped field as if it had
 the `keyword` field type but ignore its values for sorting.
 
 *Impact* +
-Discontinue use of `unmapped_type: string`. Requests that include the
-`unmapped_type: string` sort option will return an error.
+Discontinue use of `unmapped_type: string`. Search requests that include the
+`unmapped_type: string` sort option will return shard failures.
 ====
 
 [[id-field-data]]

From 0fbe89cb5bd18f1ce8ddd81d52dd58deef44b01e Mon Sep 17 00:00:00 2001
From: James Rodewig <40268737+jrodewig@users.noreply.github.com>
Date: Thu, 23 Sep 2021 13:26:51 -0400
Subject: [PATCH 3/3] Reset mapping changes

---
 .../migration/migrate_8_0/mappings.asciidoc         | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/docs/reference/migration/migrate_8_0/mappings.asciidoc b/docs/reference/migration/migrate_8_0/mappings.asciidoc
index 3cdd218306588..3e88cc6f65c72 100644
--- a/docs/reference/migration/migrate_8_0/mappings.asciidoc
+++ b/docs/reference/migration/migrate_8_0/mappings.asciidoc
@@ -6,19 +6,6 @@
 //Installation and Upgrade Guide
 
 //tag::notable-breaking-changes[]
-.Updating `include_in_parent` or `include_in_root` for a `nested` field now returns an error.
-[%collapsible]
-====
-*Details* +
-Attempts to update the `include_in_parent` or `include_in_root` mapping
-parameter for an existing `nested` field now returns an error. Previously, {es}
-would silently ignore attempts to update these parameters.
-
-*Impact* +
-To avoid errors, do not attempt to update `include_in_parent` or
-`include_in_root` for an existing `nested` field.
-====
-
 .The maximum number of completion contexts per field is now 10.
 [%collapsible]
 ====