From 092dd6cb893210a10360fa19f527734f3b3e6c56 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Tue, 1 May 2018 16:05:23 -0700
Subject: [PATCH] [DOCS] Removes X-Pack Elasticsearch release notes (#30272)

---
 docs/CHANGELOG.asciidoc                       | 14 +++++++++++
 x-pack/docs/en/index.asciidoc                 |  3 ---
 .../en/release-notes/7.0.0-alpha1.asciidoc    | 25 -------------------
 .../docs/en/release-notes/xpack-xes.asciidoc  | 20 ---------------
 4 files changed, 14 insertions(+), 48 deletions(-)
 delete mode 100644 x-pack/docs/en/release-notes/7.0.0-alpha1.asciidoc
 delete mode 100644 x-pack/docs/en/release-notes/xpack-xes.asciidoc

diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
index 0fb3bae6a6de5..20a792d0f783e 100644
--- a/docs/CHANGELOG.asciidoc
+++ b/docs/CHANGELOG.asciidoc
@@ -30,6 +30,20 @@ This section summarizes the changes in each release.
 
 <<remove-field-caps-body, In field capabilities APIs, removed support for providing fields in the request body>> ({pull}30185[#30185])
 
+Machine Learning::
+* The `max_running_jobs` node property is removed in this release. Use the
+`xpack.ml.max_open_jobs` setting instead. For more information, see <<ml-settings>>.
+
+Monitoring::
+* The `xpack.monitoring.collection.interval` setting can no longer be set to `-1`
+to disable monitoring data collection. Use `xpack.monitoring.collection.enabled`
+and set it to `false` (its default), which was added in 6.3.0.
+
+Security::
+* The fields returned as part of the mappings section by get index, get
+mappings, get field mappings, and field capabilities API are now only the
+ones that the user is authorized to access in case field level security is enabled.
+
 //[float]
 //=== Breaking Java Changes
 
diff --git a/x-pack/docs/en/index.asciidoc b/x-pack/docs/en/index.asciidoc
index 595c78ddcf599..bf884cf3324e4 100644
--- a/x-pack/docs/en/index.asciidoc
+++ b/x-pack/docs/en/index.asciidoc
@@ -31,8 +31,5 @@ include::commands/index.asciidoc[]
 :edit_url:
 include::{es-repo-dir}/index-shared4.asciidoc[]
 
-:edit_url!:
-include::release-notes/xpack-xes.asciidoc[]
-
 :edit_url:
 include::{es-repo-dir}/index-shared5.asciidoc[]
diff --git a/x-pack/docs/en/release-notes/7.0.0-alpha1.asciidoc b/x-pack/docs/en/release-notes/7.0.0-alpha1.asciidoc
deleted file mode 100644
index 2c264f48e33fe..0000000000000
--- a/x-pack/docs/en/release-notes/7.0.0-alpha1.asciidoc
+++ /dev/null
@@ -1,25 +0,0 @@
-[[xes-7.0.0-alpha1]]
-== {es} {xpack} 7.0.0-alpha1 Release Notes
-
-[float]
-[[xes-breaking-7.0.0-alpha1]]
-=== Breaking Changes
-
-Machine Learning::
-* The `max_running_jobs` node property is removed in this release. Use the
-`xpack.ml.max_open_jobs` setting instead. For more information, see <<ml-settings>>.
-
-Monitoring::
-* The `xpack.monitoring.collection.interval` setting can no longer be set to `-1`
-to disable monitoring data collection. Use `xpack.monitoring.collection.enabled`
-and set it to `false` (its default), which was added in 6.3.0.
-
-Security::
-* The fields returned as part of the mappings section by get index, get
-mappings, get field mappings and field capabilities API are now only the
-ones that the user is authorized to access in case field level security is enabled.
-
-See also:
-
-* {kibana-ref}/xkb-7.0.0-alpha1.html[{kib} {xpack} 7.0.0-alpha1 Release Notes]
-* {logstash-ref}/xls-7.0.0-alpha1.html[Logstash {xpack} 7.0.0-alpha1 Release Notes]
diff --git a/x-pack/docs/en/release-notes/xpack-xes.asciidoc b/x-pack/docs/en/release-notes/xpack-xes.asciidoc
deleted file mode 100644
index e58ef209ecd47..0000000000000
--- a/x-pack/docs/en/release-notes/xpack-xes.asciidoc
+++ /dev/null
@@ -1,20 +0,0 @@
-[role="xpack"]
-[[release-notes-xes]]
-= {xpack} Release Notes
-
-[partintro]
---
-This section summarizes the changes in each release for all of the {xpack}
-components in {es}.
-
-* <<xes-7.0.0-alpha1>>
-
-See also:
-
-* <<es-release-notes,{es} Release Notes>>
-* {kibana-ref}/release-notes-xkb.html[{kib} {xpack} Release Notes]
-* {logstash-ref}/release-notes-xls.html[Logstash {xpack} Release Notes]
-
---
-
-include::7.0.0-alpha1.asciidoc[]