Fixed released_state docs switch to build correctly and include missing links

This commit is contained in:
Clinton Gormley 2016-10-06 21:40:17 +02:00
parent d822a642b0
commit e83e8e890e
4 changed files with 26 additions and 4 deletions

View File

@ -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

View File

@ -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[]

View File

@ -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[]

View File

@ -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