From d1581eaff3d4c153bc9389c75552dcc375017fcf Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Tue, 17 Sep 2019 12:47:19 -0400 Subject: [PATCH] [DOCS] Use shared attributes (#1355) --- docs/src/reference/asciidoc/core/intro/download.adoc | 12 ++++++------ .../reference/asciidoc/core/intro/requirements.adoc | 6 +++--- docs/src/reference/asciidoc/index.adoc | 4 +--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/docs/src/reference/asciidoc/core/intro/download.adoc b/docs/src/reference/asciidoc/core/intro/download.adoc index 3ea11269b..89df7e353 100644 --- a/docs/src/reference/asciidoc/core/intro/download.adoc +++ b/docs/src/reference/asciidoc/core/intro/download.adoc @@ -8,7 +8,7 @@ org.elasticsearch elasticsearch-hadoop - {ver} + {version} ---- @@ -29,7 +29,7 @@ These are available under the same `groupId`, using an `artifactId` with the pat org.elasticsearch elasticsearch-hadoop-mr <1> - {ver} + {version} ---- @@ -41,7 +41,7 @@ These are available under the same `groupId`, using an `artifactId` with the pat org.elasticsearch elasticsearch-hadoop-hive <1> - {ver} + {version} ---- @@ -53,7 +53,7 @@ These are available under the same `groupId`, using an `artifactId` with the pat org.elasticsearch elasticsearch-hadoop-pig <1> - {ver} + {version} ---- @@ -65,7 +65,7 @@ These are available under the same `groupId`, using an `artifactId` with the pat org.elasticsearch elasticsearch-spark-20_2.10 <1> - {ver} + {version} ---- @@ -93,7 +93,7 @@ The Spark connector framework is the most sensitive to version incompatibilities org.elasticsearch elasticsearch-storm <1> - {ver} + {version} ---- diff --git a/docs/src/reference/asciidoc/core/intro/requirements.adoc b/docs/src/reference/asciidoc/core/intro/requirements.adoc index 932a4f94c..a89bead64 100644 --- a/docs/src/reference/asciidoc/core/intro/requirements.adoc +++ b/docs/src/reference/asciidoc/core/intro/requirements.adoc @@ -23,7 +23,7 @@ java version "1.8.0_45" [[requirements-es]] === {es} -We *highly* recommend using the latest Elasticsearch (currently {es-v}). While {eh} maintains backwards compatibility +We *highly* recommend using the latest Elasticsearch (currently {elasticsearch_version}). While {eh} maintains backwards compatibility with previous versions of {es}, we strongly recommend using the latest, stable version of Elasticsearch. You can find a matrix of supported versions https://www.elastic.co/support/matrix#matrix_compatibility[here]. @@ -32,7 +32,7 @@ The {es} version is shown in its folder name: ["source","bash",subs="attributes"] ---- $ ls -elasticsearch-{es-v} +elasticsearch-{elasticsearch_version} ---- If {es} is running (locally or remotely), one can find out its version through REST: @@ -44,7 +44,7 @@ $ curl -XGET http://localhost:9200 "status" : 200, "name" : "Dazzler", "version" : { - "number" : "{es-v}", + "number" : "{elasticsearch_version}", ... }, "tagline" : "You Know, for Search" diff --git a/docs/src/reference/asciidoc/index.adoc b/docs/src/reference/asciidoc/index.adoc index b219aebcf..86ce875a2 100644 --- a/docs/src/reference/asciidoc/index.adoc +++ b/docs/src/reference/asciidoc/index.adoc @@ -9,9 +9,7 @@ :krb: Kerberos :ey: Elasticsearch on YARN :description: Reference documentation of {eh} -:ver: 7.1.1 -:ver-d: 7.1.2-SNAPSHOT -:es-v: 7.1.1 +:ver-d: {version}-SNAPSHOT :sp-v: 2.2.0 :st-v: 1.0.1 :pg-v: 0.15.0