Merge remote-tracking branch 'elastic/master' into default-copy-setti…

…ngs-to-true

* elastic/master:
  [DOCS] Restores 7.0.0 release notes and highlights
  Remove assert statements from field caps documentation. (elastic#30601)
  Repository GCS plugin new client library (elastic#30168)
  HLRestClient: Follow-up for put index template api (elastic#30592)
  Unmute IndexUpgradeIT tests
  [DOCS] Remove references to changelog and to highlights
  Side-step pending deletes check (elastic#30571)
  [DOCS] Remove references to removed changelog
  Revert "Mute ML upgrade test (elastic#30458)"
  [ML] Adjust BWC version following backport of elastic#30125
  [Docs] Improve section detailing translog usage (elastic#30573)
  [Tests] Relax allowed delta in extended_stats aggregation (elastic#30569)
  [ML] Reverse engineer Grok patterns from categorization results (elastic#30125)
  Update build file due to doc file rename
  Remove the changelog (elastic#30593)
  Fix issue with finishing handshake in ssl driver (elastic#30580)
  Fail if reading from closed KeyStoreWrapper (elastic#30394)
  Silence IndexUpgradeIT test failures. (elastic#30430)

client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java

@@ -98,7 +98,6 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -725,22 +724,26 @@ public void testFieldCaps() throws Exception {
         // end::field-caps-execute
 
         // tag::field-caps-response
-        assertThat(response.get().keySet(), contains("user"));
-        Map<String, FieldCapabilities> userResponse = response.getField("user");
-
-        assertThat(userResponse.keySet(), containsInAnyOrder("keyword", "text")); // <1>
+        Map<String, FieldCapabilities> userResponse = response.getField("user");  // <1>
         FieldCapabilities textCapabilities = userResponse.get("keyword");
 
-        assertTrue(textCapabilities.isSearchable());
-        assertFalse(textCapabilities.isAggregatable());
+        boolean isSearchable = textCapabilities.isSearchable();
+        boolean isAggregatable = textCapabilities.isAggregatable();
 
-        assertArrayEquals(textCapabilities.indices(), // <2>
-                          new String[]{"authors", "contributors"});
-        assertNull(textCapabilities.nonSearchableIndices()); // <3>
-        assertArrayEquals(textCapabilities.nonAggregatableIndices(), // <4>
-                          new String[]{"authors"});
+        String[] indices = textCapabilities.indices(); // <2>
+        String[] nonSearchableIndices = textCapabilities.nonSearchableIndices(); // <3>
+        String[] nonAggregatableIndices = textCapabilities.nonAggregatableIndices();//<4>
         // end::field-caps-response
 
+        assertThat(userResponse.keySet(), containsInAnyOrder("keyword", "text"));
+
+        assertTrue(isSearchable);
+        assertFalse(isAggregatable);
+
+        assertArrayEquals(indices, new String[]{"authors", "contributors"});
+        assertNull(nonSearchableIndices);
+        assertArrayEquals(nonAggregatableIndices, new String[]{"authors"});
+
         // tag::field-caps-execute-listener
         ActionListener<FieldCapabilitiesResponse> listener = new ActionListener<FieldCapabilitiesResponse>() {
             @Override

docs/java-rest/high-level/search/field-caps.asciidoc

@@ -76,7 +76,7 @@ information about how each index contributes to the field's capabilities.
 --------------------------------------------------
 include-tagged::{doc-tests}/SearchDocumentationIT.java[field-caps-response]
 --------------------------------------------------
-<1> The `user` field has two possible types, `keyword` and `text`.
-<2> This field only has type `keyword` in the `authors` and `contributors` indices.
-<3> Null, since the field is searchable in all indices for which it has the `keyword` type.
-<4> The `user` field is not aggregatable in the `authors` index.
+<1> A map with entries for the field's possible types, in this case `keyword` and `text`.
+<2> All indices where the `user` field has type `keyword`.
+<3> The subset of these indices where the `user` field isn't searchable, or null if it's always searchable.
+<4> Another subset of these indices where the `user` field isn't aggregatable, or null if it's always aggregatable.

docs/plugins/repository-gcs.asciidoc

@@ -84,11 +84,7 @@ A service account file looks like this:
   "private_key_id": "...",
   "private_key": "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----\n",
   "client_email": "service-account-for-your-repository@your-project-id.iam.gserviceaccount.com",
-  "client_id": "...",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://accounts.google.com/o/oauth2/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "..."
+  "client_id": "..."
 }
 ----
 // NOTCONSOLE
@@ -178,6 +174,12 @@ are marked as `Secure`.
     a custom name can be useful to authenticate your cluster when requests
     statistics are logged in the Google Cloud Platform. Default to `repository-gcs`
 
+`project_id`::
+
+    The Google Cloud project id. This will be automatically infered from the credentials file but
+    can be specified explicitly. For example, it can be used to switch between projects when the
+    same credentials are usable for both the production and the development projects.
+
 [[repository-gcs-repository]]
 ==== Repository Settings
 

docs/reference/index-modules/translog.asciidoc

@@ -108,8 +108,8 @@ provide a command-line tool for this, `elasticsearch-translog`.
 
 [WARNING]
 The `elasticsearch-translog` tool should *not* be run while Elasticsearch is
-running, and you will permanently lose the documents that were contained only in
-the translog!
+running. If you attempt to run this tool while Elasticsearch is running, you 
+will permanently lose the documents that were contained only in the translog!
 
 In order to run the `elasticsearch-translog` tool, specify the `truncate`
 subcommand as well as the directory for the corrupted translog with the `-d`

docs/reference/index-shared4.asciidoc

@@ -7,4 +7,4 @@ include::glossary.asciidoc[]
 
 include::release-notes/highlights.asciidoc[]
 
-include::{docdir}/../CHANGELOG.asciidoc[]
+include::release-notes.asciidoc[]

docs/reference/release-notes/highlights-7.0.0.asciidoc

@@ -6,4 +6,4 @@
 
 coming[7.0.0]
 
-See also <<breaking-changes-7.0>> and <<release-notes-7.0.0>>. 
+See also <<breaking-changes-7.0>> and <<release-notes-7.0.0-alpha1>>.

docs/reference/release-notes/highlights.asciidoc

@@ -1,5 +1,8 @@
 [[release-highlights]]
 = {es} Release Highlights
+++++
+<titleabbrev>Release Highlights</titleabbrev>
+++++
 
 [partintro]
 --