Merge pull request elastic#4 from dedemorton/fix_intro

dedemorton · web-flow · commit 644b29081679 · 2016-10-26T11:38:39.000-07:00
Fix intro and add hadoop link
diff --git a/docs/index.asciidoc b/docs/index.asciidoc
@@ -12,9 +12,7 @@
 :logstashref:   https://www.elastic.co/guide/en/logstash/5.0
 :xpackref:      https://www.elastic.co/guide/en/x-pack/5.0
 
-include::installing-stack.asciidoc[]
-
-include::upgrading-stack.asciidoc[]
+== Overview
 
 The Elastic Stack is made up of multiple components developed by Elastic. In no particular
 order, these are:
@@ -26,3 +24,11 @@ order, these are:
 * {logstashref}/index.html[Logstash {branch}]
 * {xpackref}/index.html[X-Pack {branch}]
 
+In this guide, you learn how to install and upgrade products in the Elastic Stack.
+
+include::installing-stack.asciidoc[]
+
+include::upgrading-stack.asciidoc[]
+
+
+
diff --git a/docs/upgrading-stack.asciidoc b/docs/upgrading-stack.asciidoc
@@ -6,9 +6,9 @@ that you upgrade in the right order and in the right way. When upgrading any com
 Elastic Stack, such as Beats, you should refer to the instructions for that component, including
 the breaking changes section.
 
-Each component serves a particular role in the Elastic Stack. For some use cases, it is normal to
-not use every component in the Elastic Stack, for instance only using Elasticsearch, Logstash, and
-Kibana; Elasticsearch and Kibana; Elasticsearch and Beats; or just Elasticsearch.
+Each component serves a particular role in the Elastic Stack. For some use cases, it's normal to
+use a subset of components in the Elastic Stack. For example, you might use Elasticsearch,
+Logstash, and Kibana; Elasticsearch and Kibana; Elasticsearch and Beats; or just Elasticsearch.
 
 [[upgrading-elastic-stack-audience]]
 === Intended Audience
@@ -27,7 +27,7 @@ each component:
 |4.2 or later
 |Logstash
 |2.0 or later
-|Hadoop
+|Elasticsearch Hadoop
 |2.2 or later
 |Marvel, Shield, Watcher, Graph, Reporting <1>
 |2.0 or later
@@ -120,7 +120,7 @@ that you are upgrading.
 |{beatsref}/breaking-changes.html[Breaking Changes from 1.x]
 |{beatsref}/upgrading.html[Upgrading to Beats 5.0]
 |Elasticsearch Hadoop
-|TBD
+|{hadoopref}/breaking-changes.html
 |{hadoopref}/install.html[Upgrading to Elasticsearch Hadoop 5.0]
 |===
 
