diff --git a/docs/en/index.asciidoc b/docs/en/index.asciidoc
index 98aced206c9..6f46a13eb2d 100644
--- a/docs/en/index.asciidoc
+++ b/docs/en/index.asciidoc
@@ -1,8 +1,6 @@
 [[elasticsearch-reference]]
 = Elasticsearch Reference
 
-:include-xpack:         true
-
 :xes-repo-dir:          {docdir}
 :es-repo-dir:           {docdir}/../../../../elasticsearch/docs
 :es-test-dir:           {docdir}/../../../../elasticsearch/docs/src/test
@@ -22,20 +20,17 @@
 :dfeeds-cap:            Datafeeds
 
 include::{es-repo-dir}/Versions.asciidoc[]
+
 include::{es-repo-dir}/reference/index-shared1.asciidoc[]
 
-ifdef::include-xpack[]
 :edit_url!:
 include::setup-xes.asciidoc[]
-endif::include-xpack[]
 
 :edit_url:
 include::{es-repo-dir}/reference/index-shared2.asciidoc[]
 
-ifdef::include-xpack[]
 :edit_url!:
 include::rest-api/index.asciidoc[]
-endif::include-xpack[]
 
 :edit_url:
 include::{es-repo-dir}/reference/index-shared3.asciidoc[]
diff --git a/docs/en/settings/index.asciidoc b/docs/en/settings/index.asciidoc
index a6af82e2bcc..e8fe7910d13 100644
--- a/docs/en/settings/index.asciidoc
+++ b/docs/en/settings/index.asciidoc
@@ -3,28 +3,10 @@
 
 [partintro]
 --
-You configure settings for X-Pack features in the `elasticsearch.yml`,
-`kibana.yml`, and `logstash.yml` configuration files.
-
-[options="header,footer"]
-|=======================
-|{xpack} Feature  |{es} Settings                  |{kib} Settings                                |Logstash Settings
-|Graph            |No                             |{kibana-ref}/graph-settings-kb.html[Yes]      |No
-|Machine learning |{ref}/ml-settings.html[Yes]    |{kibana-ref}/ml-settings-kb.html[Yes]         |No
-|Monitoring       |<<monitoring-settings,Yes>>    |{kibana-ref}/monitoring-settings-kb.html[Yes] |<<monitoring-settings,Yes>>
-//{ref}/settings-xpack.html[Yes]
-|Reporting        |No                             |{kibana-ref}/reporting-settings-kb.html[Yes]  |No
-|Security         |<<security-settings,Yes>>      |{kibana-ref}/security-settings-kb.html[Yes]   |No
-//{ref}/settings-xpack.html[Yes]
-|Watcher          |<<notification-settings,Yes>>  |No                          |No
-//{ref}/settings-xpack.html[Yes] No
-|=======================
-
+include::x-pack-settings.asciidoc
 --
 
-include::security-settings.asciidoc[]
+include::ml-settings.asciidoc[]
 include::monitoring-settings.asciidoc[]
-//include::graph-settings.asciidoc[]
+include::security-settings.asciidoc[]
 include::notification-settings.asciidoc[]
-//include::reporting-settings.asciidoc[]
-//include::ml-settings.asciidoc[]
diff --git a/docs/en/setup-xes.asciidoc b/docs/en/setup-xes.asciidoc
index 058dde0f91c..a6c9090d118 100644
--- a/docs/en/setup-xes.asciidoc
+++ b/docs/en/setup-xes.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[setup-xpack]]
-= Set up X-Pack
+= Set up {xpack}
 
 [partintro]
 --