diff --git a/docs/management/index-patterns.asciidoc b/docs/management/index-patterns.asciidoc
index 6663b7cb4a849..ee3c696f0a460 100644
--- a/docs/management/index-patterns.asciidoc
+++ b/docs/management/index-patterns.asciidoc
@@ -35,9 +35,6 @@ list.
 contains time-based events* option and select the index field that contains the timestamp. Kibana reads the index
 mapping to list all of the fields that contain a timestamp.
 
-. By default, Kibana restricts wildcard expansion of time-based index patterns to indices with data within the currently
-selected time range. Click *Do not expand index pattern when search* to disable this behavior.
-
 . Click *Create* to add the index pattern.
 
 . To designate the new pattern as the default pattern to load when you view the Discover tab, click the *favorite*
diff --git a/docs/migration/migrate_6_0.asciidoc b/docs/migration/migrate_6_0.asciidoc
index cf786a1ce2fe2..15666cda1b8c7 100644
--- a/docs/migration/migrate_6_0.asciidoc
+++ b/docs/migration/migrate_6_0.asciidoc
@@ -65,3 +65,10 @@ This is no longer the case. Now, only commas are a valid query separator: e.g. `
 *Details:* Kibana 5.x redirected requests from http to https on the same port if TLS was configured. Starting in Kibana 6.0.0, Kibana no longer redirects basic http traffic to https.
 
 *Impact:* With the new configuration setting `server.ssl.redirectHttpFromPort` you can specify a port that will redirect from http to https. This cannot be the same port as the https port.
+
+
+[float]
+=== Removed "expand index pattern when searching" setting for index patterns
+*Details:* Since 4.3, index patterns could be configured to do a pre-flight field_stats request before a search in order to determine exact indices that could contain matching documents. Elasticsearch now optimizes searches internally in a similar way and has also removed the field_stats API, so this option was removed from Kibana entirely.
+
+*Impact:* No change is required for existing Kibana index patterns. Those previously configured with this option will gracefully use the new Elasticsearch optimizations instead, as will all new index patterns.