elastic · lcawl · Jun 6, 2018 · Jun 6, 2018
diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc
@@ -14,17 +14,17 @@ include::getting-started.asciidoc[]
 
 include::setup.asciidoc[]
 
-include::{xes-repo-dir}/setup/setup-xes.asciidoc[]
+include::setup/setup-xes.asciidoc[]
 
 include::{xes-repo-dir}/monitoring/configuring-monitoring.asciidoc[]
 
 include::{xes-repo-dir}/security/configuring-es.asciidoc[]
 
-include::{xes-repo-dir}/setup/setup-xclient.asciidoc[]
+include::setup/setup-xclient.asciidoc[]
 
 include::{xes-repo-dir}/settings/configuring-xes.asciidoc[]
 
-include::{xes-repo-dir}/setup/bootstrap-checks-xes.asciidoc[]
+include::setup/bootstrap-checks-xes.asciidoc[]
 
 :edit_url:
 include::upgrade.asciidoc[]

diff --git a/...cs/en/setup/bootstrap-checks-xes.asciidoc → ...rence/setup/bootstrap-checks-xes.asciidoc b/...cs/en/setup/bootstrap-checks-xes.asciidoc → ...rence/setup/bootstrap-checks-xes.asciidoc
diff --git a/docs/reference/setup/install.asciidoc b/docs/reference/setup/install.asciidoc
@@ -65,6 +65,5 @@ include::install/rpm.asciidoc[]
 
 include::install/windows.asciidoc[]
 
-ifdef::include-xpack[]
-include::{xes-repo-dir}/setup/docker.asciidoc[]
-endif::include-xpack[]
+include::install/docker.asciidoc[]
+
diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc
@@ -139,7 +139,7 @@ ifdef::include-xpack[]
 ==== Enable automatic creation of {xpack} indices
 
 {xpack} will try to automatically create a number of indices within Elasticsearch.
-include::{xes-repo-dir}/setup/xpack-indices.asciidoc[]
+include::xpack-indices.asciidoc[]
 
 endif::include-xpack[]
 

diff --git a/x-pack/docs/en/setup/docker.asciidoc → docs/reference/setup/install/docker.asciidoc b/x-pack/docs/en/setup/docker.asciidoc → docs/reference/setup/install/docker.asciidoc
@@ -1,4 +1,3 @@
-[role="xpack"]
 [[docker]]
 === Install {es} with Docker
 

diff --git a/docs/reference/setup/install/next-steps.asciidoc b/docs/reference/setup/install/next-steps.asciidoc
@@ -1,11 +1,10 @@
 [role="exclude"]
 ==== Next steps
 
-You now have a test Elasticsearch environment set up.  Before you start
-serious development or go into production with Elasticsearch, you will need to
-do some additional setup:
+You now have a test {es} environment set up.  Before you start
+serious development or go into production with {es}, you must do some additional
+setup:
 
 * Learn how to <<settings,configure Elasticsearch>>.
 * Configure <<important-settings,important Elasticsearch settings>>.
 * Configure <<system-config,important system settings>>.
-
diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc
@@ -126,7 +126,7 @@ ifdef::include-xpack[]
 ==== Enable automatic creation of {xpack} indices
 
 {xpack} will try to automatically create a number of indices within {es}.
-include::{xes-repo-dir}/setup/xpack-indices.asciidoc[]
+include::xpack-indices.asciidoc[]
 
 endif::include-xpack[]
 

diff --git a/docs/reference/setup/install/windows.asciidoc b/docs/reference/setup/install/windows.asciidoc
@@ -337,7 +337,7 @@ ifdef::include-xpack[]
 ==== Enable automatic creation of {xpack} indices
 
 {xpack} will try to automatically create a number of indices within {es}.
-include::{xes-repo-dir}/setup/xpack-indices.asciidoc[]
+include::xpack-indices.asciidoc[]
 
 endif::include-xpack[]
 

diff --git a/x-pack/docs/en/setup/xpack-indices.asciidoc → ...ence/setup/install/xpack-indices.asciidoc b/x-pack/docs/en/setup/xpack-indices.asciidoc → ...ence/setup/install/xpack-indices.asciidoc
diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc
@@ -85,7 +85,7 @@ ifdef::include-xpack[]
 ==== Enable automatic creation of {xpack} indices
 
 {xpack} will try to automatically create a number of indices within {es}.
-include::{xes-repo-dir}/setup/xpack-indices.asciidoc[]
+include::xpack-indices.asciidoc[]
 
 endif::include-xpack[]
 

diff --git a/docs/reference/setup/install/zip-windows.asciidoc b/docs/reference/setup/install/zip-windows.asciidoc
@@ -53,7 +53,7 @@ ifdef::include-xpack[]
 ==== Enable automatic creation of {xpack} indices
 
 {xpack} will try to automatically create a number of indices within {es}.
-include::{xes-repo-dir}/setup/xpack-indices.asciidoc[]
+include::xpack-indices.asciidoc[]
 
 endif::include-xpack[]
 

diff --git a/x-pack/docs/en/setup/setup-xclient.asciidoc → docs/reference/setup/setup-xclient.asciidoc b/x-pack/docs/en/setup/setup-xclient.asciidoc → docs/reference/setup/setup-xclient.asciidoc
@@ -1,4 +1,5 @@
 [role="xpack"]
+[testenv="basic"]
 [[setup-xpack-client]]
 == Configuring {xpack} Java Clients
 

diff --git a/x-pack/docs/en/setup/setup-xes.asciidoc → docs/reference/setup/setup-xes.asciidoc b/x-pack/docs/en/setup/setup-xes.asciidoc → docs/reference/setup/setup-xes.asciidoc
diff --git a/x-pack/docs/en/setup/images/ElasticsearchFlow.jpg b/x-pack/docs/en/setup/images/ElasticsearchFlow.jpg
diff --git a/x-pack/docs/en/setup/next-steps.asciidoc b/x-pack/docs/en/setup/next-steps.asciidoc
diff --git a/x-pack/docs/en/setup/xpack-passwords.asciidoc b/x-pack/docs/en/setup/xpack-passwords.asciidoc
diff --git a/x-pack/docs/en/setup/xpack-tls.asciidoc b/x-pack/docs/en/setup/xpack-tls.asciidoc