From e83e8e890e6ade4609a7a1730c6914a652d273a4 Mon Sep 17 00:00:00 2001 From: Clinton Gormley Date: Thu, 6 Oct 2016 21:40:17 +0200 Subject: [PATCH] Fixed released_state docs switch to build correctly and include missing links --- docs/reference/index.asciidoc | 6 +++++- docs/reference/setup/install/deb.asciidoc | 11 ++++++++++- docs/reference/setup/install/rpm.asciidoc | 11 ++++++++++- docs/reference/setup/install/windows.asciidoc | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc index 00df2651f61..26181a0fd80 100644 --- a/docs/reference/index.asciidoc +++ b/docs/reference/index.asciidoc @@ -3,7 +3,11 @@ :version: 6.0.0-alpha1 :major-version: 6.x -// release-state can be: released | prerelease | unreleased + +////////// +release-state can be: released | prerelease | unreleased +////////// + :release-state: unreleased :lucene_version: 6.2.0 :branch: master diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc index ebc1f16c0c1..f2e10176480 100644 --- a/docs/reference/setup/install/deb.asciidoc +++ b/docs/reference/setup/install/deb.asciidoc @@ -90,10 +90,20 @@ Duplicate sources.list entry https://artifacts.elastic.co/packages/{major-versio Examine +/etc/apt/sources.list.d/elasticsearch-{major-version}.list+ for the duplicate entry or locate the duplicate entry amongst the files in `/etc/apt/sources.list.d/` and the `/etc/apt/sources.list` file. ================================================== +endif::[] + [[install-deb]] ==== Download and install the Debian package manually +ifeval::["{release-state}"=="unreleased"] + +Version {version} of Elasticsearch has not yet been released. + +endif::[] + +ifeval::["{release-state}"!="unreleased"] + The Debian package for Elastisearch v{version} can be downloaded from the website and installed as follows: ["source","sh",subs="attributes"] @@ -106,7 +116,6 @@ sudo dpkg -i elasticsearch-{version}.deb https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.deb.sha1[published SHA]. endif::[] -// release-state!=unreleased include::init-systemd.asciidoc[] diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc index 49c885d1436..d6c9352aac0 100644 --- a/docs/reference/setup/install/rpm.asciidoc +++ b/docs/reference/setup/install/rpm.asciidoc @@ -82,9 +82,19 @@ sudo zypper install elasticsearch <3> <2> Use `dnf` on Fedora and other newer Red Hat distributions. <3> Use `zypper` on OpenSUSE based distributions +endif::[] + [[install-rpm]] ==== Download and install the RPM manually +ifeval::["{release-state}"=="unreleased"] + +Version {version} of Elasticsearch has not yet been released. + +endif::[] + +ifeval::["{release-state}"!="unreleased"] + The RPM for Elastisearch v{version} can be downloaded from the website and installed as follows: ["source","sh",subs="attributes"] @@ -97,7 +107,6 @@ sudo rpm --install elasticsearch-{version}.rpm https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.rpm.sha1[published SHA]. endif::[] -// release-state!=unreleased include::init-systemd.asciidoc[] diff --git a/docs/reference/setup/install/windows.asciidoc b/docs/reference/setup/install/windows.asciidoc index a7eab5db90d..320626a2021 100644 --- a/docs/reference/setup/install/windows.asciidoc +++ b/docs/reference/setup/install/windows.asciidoc @@ -32,7 +32,7 @@ window, `CD` to the `%ES_HOME%` directory, for instance: CD c:\elasticsearch-{version} ---------------------------- -endif:[] +endif::[] [[windows-running]] ==== Running Elasticsearch from the command line