elastic · lcawl · Jun 1, 2018 · May 31, 2018
diff --git a/docs/en/stack/InstallationFlow.jpg b/docs/en/stack/InstallationFlow.jpg
diff --git a/docs/en/stack/gs-index.asciidoc b/docs/en/stack/gs-index.asciidoc
diff --git a/docs/en/stack/index.asciidoc b/docs/en/stack/index.asciidoc
@@ -17,13 +17,7 @@
 include::{asciidoc-dir}/../../shared/versions.asciidoc[]
 include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
 
-include::xpack-introduction.asciidoc[]
-
-include::xpack-setup.asciidoc[]
-
-include::xpack-breaking-changes.asciidoc[]
-
-include::xpack-apis.asciidoc[]
+include::introduction.asciidoc[]
 
 include::xpack-features.asciidoc[]
 
@@ -40,12 +34,10 @@ include::{xes-repo-dir}/watcher/index.asciidoc[]
 include::{xes-repo-dir}/ml/index.asciidoc[]
 
 :edit_url:
-include::xpack-troubleshooting.asciidoc[]
+include::troubleshooting.asciidoc[]
 
 :edit_url:
-include::xpack-limitations.asciidoc[]
+include::limitations.asciidoc[]
 
 :edit_url:
-include::xpack-license.asciidoc[]
-
-include::xpack-release-notes.asciidoc[]
+include::license.asciidoc[]
diff --git a/docs/en/stack/introduction.asciidoc b/docs/en/stack/introduction.asciidoc
@@ -0,0 +1,24 @@
+[[introduction]]
+== Introduction
+
+The {stack} enables you to reliably and securely take data from any source in 
+any format and search, analyze, and visualize it in real time. 
+
+For a quick overview, see: https://www.elastic.co/products
+
+
+[float]
+=== Where to Go Next
+
+* <<security-getting-started, Getting Started with Security>>
+* <<xpack-monitoring, Getting Started with Monitoring>>
+* <<watcher-getting-started, Getting Started with Alerting and Notification>>
+* {kibana-ref}/reporting-getting-started.html[Getting Started with Reporting]
+* {kibana-ref}/graph-getting-started.html[Getting Started with Graph]
+
+[float]
+=== Have Comments, Questions, or Feedback?
+
+Head over to our discussion forums to share your experience, questions, and
+suggestions: https://discuss.elastic.co/
+
diff --git a/docs/en/stack/xpack-license.asciidoc → docs/en/stack/license.asciidoc b/docs/en/stack/xpack-license.asciidoc → docs/en/stack/license.asciidoc
@@ -3,8 +3,8 @@
 
 [partintro]
 --
-If a license is not already registered for the cluster, when you install {xpack}
-and start the cluster, it generates a basic license.
+If a license is not already registered for the cluster, when you install a 
+product that contains {xpack} and you start the cluster, it generates a basic license.
 
 If you want to try all of the {xpack} features, you can start a 30-day
 trial. At the end of the trial period, you can

diff --git a/docs/en/stack/xpack-limitations.asciidoc → docs/en/stack/limitations.asciidoc b/docs/en/stack/xpack-limitations.asciidoc → docs/en/stack/limitations.asciidoc
@@ -1,4 +1,4 @@
-[[xpack-limitations]]
+[[limitations]]
 = Limitations
 
 [partintro]
@@ -8,8 +8,10 @@ __________________________
 Once we accept our limits, we go beyond them.
 __________________________
 
+////
 For a list of known issues in the 6.0.0 alpha release, see
 https://www.elastic.co/blog/elastic-stack-6-0-0-alpha1-released[Elastic Stack 6.0.0-alpha1 Released].
+////
 
 * <<security-limitations, {security}>>
 

diff --git a/docs/en/stack/monitoring/how-monitoring-works.asciidoc b/docs/en/stack/monitoring/how-monitoring-works.asciidoc
@@ -1,3 +1,4 @@
+[role="xpack"]
 [[how-monitoring-works]]
 == How monitoring works
 

diff --git a/docs/en/stack/monitoring/intro.asciidoc b/docs/en/stack/monitoring/intro.asciidoc
@@ -1,3 +1,4 @@
+[role="xpack"]
 [[xpack-monitoring]]
 = Monitoring the {stack}
 

diff --git a/docs/en/stack/release-notes/7.0.0-alpha1.asciidoc b/docs/en/stack/release-notes/7.0.0-alpha1.asciidoc
diff --git a/docs/en/stack/xpack-troubleshooting.asciidoc → docs/en/stack/troubleshooting.asciidoc b/docs/en/stack/xpack-troubleshooting.asciidoc → docs/en/stack/troubleshooting.asciidoc
@@ -1,12 +1,11 @@
-[[xpack-troubleshooting]]
+[[troubleshooting]]
 = Troubleshooting
 
 [partintro]
 --
-Having trouble? Here are solutions to common problems you might encounter
-while using X-Pack.
+Having trouble? Here are solutions to common problems you might encounter.
 
-* <<xpack-help,Getting Help>>
+* <<help,Getting Help>>
 
 * <<security-troubleshooting, {security}>>
 
@@ -22,14 +21,14 @@ while using X-Pack.
 
 --
 
-[[xpack-help]]
+[[help]]
 == Getting Help
 
-For issues with {xpack} that you cannot fix yourself … we’re here to help.
+For issues that you cannot fix yourself … we’re here to help.
 If you are an existing Elastic customer with a support contract, please create
 a ticket in the
 https://support.elastic.co/customers/s/login/[Elastic Support portal].
-Or post in the https://discuss.elastic.co/c/x-pack[Elastic X-Pack forum].
+Or post in the https://discuss.elastic.co/[Elastic forum].
 
 It might also be helpful to collect the following information, since it contains
 build information and indicates which {xpack} features are enabled:

diff --git a/docs/en/stack/xpack-apis.asciidoc b/docs/en/stack/xpack-apis.asciidoc
diff --git a/docs/en/stack/xpack-breaking-changes.asciidoc b/docs/en/stack/xpack-breaking-changes.asciidoc
diff --git a/docs/en/stack/xpack-installing.asciidoc → docs/en/stack/xpack-enabling.asciidoc b/docs/en/stack/xpack-installing.asciidoc → docs/en/stack/xpack-enabling.asciidoc
@@ -1,16 +1,6 @@
-[[installing-xpack]]
-=== Installing {xpack}
-
-By default, when you install {es}, {kib}, and Logstash, {xpack} is installed.
-For more information, see:
-
-* {ref}/install-elasticsearch.html[Installing {es}]
-* {kibana-ref}/install.html[Installing {kib}]
-* {logstash-ref}/installing-logstash.html[Installing Logstash]
-
-[float]
+[role="xpack"]
 [[xpack-enabling]]
-==== Enabling and Disabling {xpack} Features
+==== Enabling and disabling {xpack} features
 
 By default, all basic {xpack} features are enabled. You can enable or disable
 specific {xpack} features in the `elasticsearch.yml`, `kibana.yml`, and
@@ -27,5 +17,5 @@ specific {xpack} features in the `elasticsearch.yml`, `kibana.yml`, and
 | `xpack.watcher.enabled`           | Set to `false` to disable {watcher}.
 |======
 
-For more information about which settings exist in each configuration file, see
-{xpack-ref}/xpack-settings.html[X-Pack Settings].
+//For more information about which settings exist in each configuration file, see
+//{xpack-ref}/xpack-settings.html[X-Pack Settings].
diff --git a/docs/en/stack/xpack-features.asciidoc b/docs/en/stack/xpack-features.asciidoc
@@ -1,3 +1,4 @@
+[role="xpack"]
 [[xpack-graph]]
 == Graphing Connections in Your Data
 

diff --git a/docs/en/stack/xpack-introduction.asciidoc b/docs/en/stack/xpack-introduction.asciidoc
diff --git a/docs/en/stack/xpack-release-notes.asciidoc b/docs/en/stack/xpack-release-notes.asciidoc
diff --git a/docs/en/stack/xpack-settings.asciidoc b/docs/en/stack/xpack-settings.asciidoc
@@ -1,3 +1,4 @@
+[role="xpack"]
 [[xpack-settings]]
 === {xpack} Settings
 

diff --git a/docs/en/stack/xpack-setup.asciidoc b/docs/en/stack/xpack-setup.asciidoc
diff --git a/docs/en/stack/xpack-uninstalling.asciidoc b/docs/en/stack/xpack-uninstalling.asciidoc
diff --git a/docs/en/stack/xpack-upgrading.asciidoc b/docs/en/stack/xpack-upgrading.asciidoc