summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjavanna <cavannaluca@gmail.com>2014-05-30 10:45:22 +0200
committerLuca Cavanna <cavannaluca@gmail.com>2014-05-30 10:45:22 +0200
commit74eff87dd64eb73fee1e57d096649f20337a36a1 (patch)
tree68d8bf6909e133ad289df0f8551b86683ac4d4bd
parent8c903f47873549ba40761bb3b5ba0d245a026306 (diff)
[DOCS] Java 7 is required since 1.2.0
-rwxr-xr-xdocs/reference/getting-started.asciidoc2
-rw-r--r--docs/reference/setup.asciidoc3
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/reference/getting-started.asciidoc b/docs/reference/getting-started.asciidoc
index e29a2f2441..35692cce75 100755
--- a/docs/reference/getting-started.asciidoc
+++ b/docs/reference/getting-started.asciidoc
@@ -93,7 +93,7 @@ With that out of the way, let's get started with the fun part...
== Installation
-Elasticsearch requires Java. Specifically as of this writing, it is recommended that you use the Oracle JDK version 1.7.0_55. Java installation varies from platform to platform so we won't go into those details here. Suffice to say, before you install Elasticsearch, please check your Java version first by running (and then install/upgrade accordingly if needed):
+Elasticsearch requires Java 7. Specifically as of this writing, it is recommended that you use the Oracle JDK version 1.7.0_55. Java installation varies from platform to platform so we won't go into those details here. Suffice to say, before you install Elasticsearch, please check your Java version first by running (and then install/upgrade accordingly if needed):
[source,sh]
--------------------------------------------------
diff --git a/docs/reference/setup.asciidoc b/docs/reference/setup.asciidoc
index 12324483f8..b957f9f677 100644
--- a/docs/reference/setup.asciidoc
+++ b/docs/reference/setup.asciidoc
@@ -31,7 +31,8 @@ $ bin/elasticsearch -d
--------------------------------------------------
Elasticsearch is built using Java, and requires at least
-http://java.sun.com/javase/downloads/index.jsp[Java 6] in order to run.
+http://java.sun.com/javase/downloads/index.jsp[Java 7] in order to run
+added[1.2.0,Was at least Java 6 before].
The version of Java that will be used can be set by setting the
`JAVA_HOME` environment variable.