From f30b9ef5fbc03ab2ae102f34396d9d5a4a40d4c3 Mon Sep 17 00:00:00 2001 From: lcawley Date: Fri, 13 Apr 2018 08:31:02 -0700 Subject: [PATCH 01/11] [DOCS] Clarified packaging --- docs/reference/setup/install/zip-targz.asciidoc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index 18cf0a6506fe4..9adb3212e5617 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -5,6 +5,11 @@ Elasticsearch is provided as a `.zip` and as a `.tar.gz` package. These packages can be used to install Elasticsearch on any system and are the easiest package format to use when trying out Elasticsearch. +NOTE: These packages contain both {es} and {xpack}. All free features are +included and enabled by default and will never expire. Commercial features are +available to opt in by using a trial license. For more information, see +{xpack-ref}/xpack-introduction.html[Introduction to {xpack}]. + The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can be found on the @@ -40,6 +45,9 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.zip: OK`. <2> This directory is known as `$ES_HOME`. +To obtain an Apache 2.0-only distribution, use the following link: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip + endif::[] @@ -68,6 +76,9 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.tar.gz: OK`. <2> This directory is known as `$ES_HOME`. +To obtain an Apache 2.0-only distribution, use the following link: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.tar.gz + endif::[] ifdef::include-xpack[] From 5f4a9a587e8ede9c7e3c89cc3e33a03671164a8e Mon Sep 17 00:00:00 2001 From: lcawley Date: Fri, 13 Apr 2018 08:40:37 -0700 Subject: [PATCH 02/11] [DOCS] Clarified open source packages --- docs/reference/setup/install/zip-targz.asciidoc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index 9adb3212e5617..27aa7b5b14fd8 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -5,10 +5,9 @@ Elasticsearch is provided as a `.zip` and as a `.tar.gz` package. These packages can be used to install Elasticsearch on any system and are the easiest package format to use when trying out Elasticsearch. -NOTE: These packages contain both {es} and {xpack}. All free features are -included and enabled by default and will never expire. Commercial features are -available to opt in by using a trial license. For more information, see -{xpack-ref}/xpack-introduction.html[Introduction to {xpack}]. +NOTE: These packages contain both open source and commercial features. All free +features are included and enabled by default and do not expire. You can try +additional commercial features with a trial license. For more information, see {xpack-ref}/xpack-introduction.html[Introduction to {xpack}]. The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. @@ -45,7 +44,7 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.zip: OK`. <2> This directory is known as `$ES_HOME`. -To obtain an Apache 2.0-only distribution, use the following link: +To obtain only open source {es} features, use the following link: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip endif::[] @@ -76,7 +75,7 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.tar.gz: OK`. <2> This directory is known as `$ES_HOME`. -To obtain an Apache 2.0-only distribution, use the following link: +To obtain only open source {es} features, use the following link: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.tar.gz endif::[] From 4d7dc494c3562172345d0983aaa255648fba43ff Mon Sep 17 00:00:00 2001 From: lcawley Date: Fri, 13 Apr 2018 08:45:27 -0700 Subject: [PATCH 03/11] [DOCS] Added link to license management --- docs/reference/setup/install/zip-targz.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index 27aa7b5b14fd8..461aed2021891 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -7,7 +7,7 @@ easiest package format to use when trying out Elasticsearch. NOTE: These packages contain both open source and commercial features. All free features are included and enabled by default and do not expire. You can try -additional commercial features with a trial license. For more information, see {xpack-ref}/xpack-introduction.html[Introduction to {xpack}]. +additional commercial features with a trial license. For more information, see {xpack-ref}/license-management.html[License Management]. The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. From b223b25b06923e7237603ef7a85705da1620d384 Mon Sep 17 00:00:00 2001 From: lcawley Date: Fri, 13 Apr 2018 08:51:26 -0700 Subject: [PATCH 04/11] [DOCS] Removed note --- docs/reference/setup/install/zip-targz.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index 461aed2021891..44db1e66bf450 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -5,7 +5,7 @@ Elasticsearch is provided as a `.zip` and as a `.tar.gz` package. These packages can be used to install Elasticsearch on any system and are the easiest package format to use when trying out Elasticsearch. -NOTE: These packages contain both open source and commercial features. All free +These packages contain both open source and commercial features. All free features are included and enabled by default and do not expire. You can try additional commercial features with a trial license. For more information, see {xpack-ref}/license-management.html[License Management]. From c53acc013830567d79a5ba1464f0aef9c38e45d6 Mon Sep 17 00:00:00 2001 From: lcawley Date: Wed, 18 Apr 2018 10:20:10 -0700 Subject: [PATCH 05/11] [DOCS] Addressed installation feedback --- docs/reference/setup/install/zip-targz.asciidoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index 44db1e66bf450..02b348e6a3889 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -5,9 +5,11 @@ Elasticsearch is provided as a `.zip` and as a `.tar.gz` package. These packages can be used to install Elasticsearch on any system and are the easiest package format to use when trying out Elasticsearch. -These packages contain both open source and commercial features. All free -features are included and enabled by default and do not expire. You can try -additional commercial features with a trial license. For more information, see {xpack-ref}/license-management.html[License Management]. +These packages contain both open source and commercial features. +{xpack-ref}/license-management.html[Start a 30-day trial license] to enable all +of the available commercial features. See the +https://www.elastic.co/subscriptions[Subscriptions] page for information about +Elastic license levels. The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. @@ -44,8 +46,7 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.zip: OK`. <2> This directory is known as `$ES_HOME`. -To obtain only open source {es} features, use the following link: -https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip +You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip endif::[] @@ -75,8 +76,7 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.tar.gz: OK`. <2> This directory is known as `$ES_HOME`. -To obtain only open source {es} features, use the following link: -https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.tar.gz +You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip endif::[] From 63ea9c97bd9c524dd68d8902c800e00fa1822943 Mon Sep 17 00:00:00 2001 From: lcawley Date: Wed, 18 Apr 2018 11:11:39 -0700 Subject: [PATCH 06/11] [DOCS] Added OSS info to all installation pages --- docs/reference/setup/install/deb.asciidoc | 10 +++++++++- docs/reference/setup/install/rpm.asciidoc | 8 ++++++++ docs/reference/setup/install/windows.asciidoc | 8 ++++++++ docs/reference/setup/install/zip-targz.asciidoc | 2 +- docs/reference/setup/install/zip-windows.asciidoc | 6 ++++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc index d055f1251e19d..8ecc4e046da6c 100644 --- a/docs/reference/setup/install/deb.asciidoc +++ b/docs/reference/setup/install/deb.asciidoc @@ -2,9 +2,15 @@ === Install Elasticsearch with Debian Package The Debian package for Elasticsearch can be <> -or from our <>. It can be used to install +or from our <>. It can be used to install Elasticsearch on any Debian-based system such as Debian and Ubuntu. +This package contains both open source and commercial features. +{xpack-ref}/license-management.html[Start a 30-day trial license] to enable all +of the available commercial features. See the +https://www.elastic.co/subscriptions[Subscriptions] page for information about +Elastic license levels. + The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can be found on the link:/downloads/past-releases[Past Releases page]. @@ -125,6 +131,8 @@ sudo dpkg -i elasticsearch-{version}.deb -------------------------------------------- <1> Compares the SHA of the downloaded Debian package and the published checksum, which should output `elasticsearch-{version}.deb: OK`. + +You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.deb endif::[] diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc index 730f043341773..09920dd6ed650 100644 --- a/docs/reference/setup/install/rpm.asciidoc +++ b/docs/reference/setup/install/rpm.asciidoc @@ -9,6 +9,12 @@ and Oracle Enterprise. NOTE: RPM install is not supported on distributions with old versions of RPM, such as SLES 11 and CentOS 5. Please see <> instead. +This package contains both open source and commercial features. +{xpack-ref}/license-management.html[Start a 30-day trial license] to enable all +of the available commercial features. See the +https://www.elastic.co/subscriptions[Subscriptions] page for information about +Elastic license levels. + The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can be found on the link:/downloads/past-releases[Past Releases page]. @@ -110,6 +116,8 @@ sudo rpm --install elasticsearch-{version}.rpm -------------------------------------------- <1> Compares the SHA of the downloaded RPM and the published checksum, which should output `elasticsearch-{version}.rpm: OK`. + +You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.rpm endif::[] diff --git a/docs/reference/setup/install/windows.asciidoc b/docs/reference/setup/install/windows.asciidoc index 5d79e9669f9f0..d350711701749 100644 --- a/docs/reference/setup/install/windows.asciidoc +++ b/docs/reference/setup/install/windows.asciidoc @@ -10,6 +10,12 @@ the included `elasticsearch.exe` executable. TIP: Elasticsearch has historically been installed on Windows using the <> archive. You can continue using the `.zip` approach if you prefer. +This package contains both open source and commercial features. +{xpack-ref}/license-management.html[Start a 30-day trial license] to enable all +of the available commercial features. See the +https://www.elastic.co/subscriptions[Subscriptions] page for information about +Elastic license levels. + The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can be found on the @@ -32,6 +38,8 @@ ifeval::["{release-state}"!="unreleased"] Download the `.msi` package for Elasticsearch v{version} from https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.msi +You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.msi + endif::[] [[install-msi-gui]] diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index 02b348e6a3889..e1eaa51b147e3 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -76,7 +76,7 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.tar.gz: OK`. <2> This directory is known as `$ES_HOME`. -You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip +You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.tar.gz endif::[] diff --git a/docs/reference/setup/install/zip-windows.asciidoc b/docs/reference/setup/install/zip-windows.asciidoc index 3ebf4f3d77dc3..8aa2f9b5e8db5 100644 --- a/docs/reference/setup/install/zip-windows.asciidoc +++ b/docs/reference/setup/install/zip-windows.asciidoc @@ -9,6 +9,12 @@ TIP: Elasticsearch has historically been installed on Windows using the `.zip` a An <> is available that provides the easiest getting started experience for Windows. You can continue using the `.zip` approach if you prefer. +This package contains both open source and commercial features. +{xpack-ref}/license-management.html[Start a 30-day trial license] to enable all +of the available commercial features. See the +https://www.elastic.co/subscriptions[Subscriptions] page for information about +Elastic license levels. + The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can be found on the From 066c95b6c43b26b19a3f02c31ac2d740eb35a29f Mon Sep 17 00:00:00 2001 From: lcawley Date: Wed, 18 Apr 2018 11:16:40 -0700 Subject: [PATCH 07/11] [DOCS] Clarify alternatives --- docs/reference/setup/install/deb.asciidoc | 2 +- docs/reference/setup/install/rpm.asciidoc | 2 +- docs/reference/setup/install/windows.asciidoc | 2 +- docs/reference/setup/install/zip-targz.asciidoc | 4 ++-- docs/reference/setup/install/zip-windows.asciidoc | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc index 8ecc4e046da6c..c7ad1aaf241cc 100644 --- a/docs/reference/setup/install/deb.asciidoc +++ b/docs/reference/setup/install/deb.asciidoc @@ -132,7 +132,7 @@ sudo dpkg -i elasticsearch-{version}.deb <1> Compares the SHA of the downloaded Debian package and the published checksum, which should output `elasticsearch-{version}.deb: OK`. -You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.deb +You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.deb endif::[] diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc index 09920dd6ed650..d44562c810770 100644 --- a/docs/reference/setup/install/rpm.asciidoc +++ b/docs/reference/setup/install/rpm.asciidoc @@ -117,7 +117,7 @@ sudo rpm --install elasticsearch-{version}.rpm <1> Compares the SHA of the downloaded RPM and the published checksum, which should output `elasticsearch-{version}.rpm: OK`. -You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.rpm +You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.rpm endif::[] diff --git a/docs/reference/setup/install/windows.asciidoc b/docs/reference/setup/install/windows.asciidoc index d350711701749..30b2ae1b64be7 100644 --- a/docs/reference/setup/install/windows.asciidoc +++ b/docs/reference/setup/install/windows.asciidoc @@ -38,7 +38,7 @@ ifeval::["{release-state}"!="unreleased"] Download the `.msi` package for Elasticsearch v{version} from https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.msi -You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.msi +You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.msi endif::[] diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index e1eaa51b147e3..fd7a09df5432a 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -46,7 +46,7 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.zip: OK`. <2> This directory is known as `$ES_HOME`. -You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip +You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip endif::[] @@ -76,7 +76,7 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.tar.gz: OK`. <2> This directory is known as `$ES_HOME`. -You can download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.tar.gz +You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.tar.gz endif::[] diff --git a/docs/reference/setup/install/zip-windows.asciidoc b/docs/reference/setup/install/zip-windows.asciidoc index 8aa2f9b5e8db5..f9950edff25f3 100644 --- a/docs/reference/setup/install/zip-windows.asciidoc +++ b/docs/reference/setup/install/zip-windows.asciidoc @@ -37,6 +37,8 @@ ifeval::["{release-state}"!="unreleased"] Download the `.zip` archive for Elasticsearch v{version} from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.zip +You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip + Unzip it with your favourite unzip tool. This will create a folder called +elasticsearch-{version}+, which we will refer to as `%ES_HOME%`. In a terminal window, `cd` to the `%ES_HOME%` directory, for instance: From ceba322fa4228da581318782e4ddb57329c22d96 Mon Sep 17 00:00:00 2001 From: lcawley Date: Thu, 19 Apr 2018 12:12:59 -0700 Subject: [PATCH 08/11] [DOCS] Clarified features --- docs/reference/setup/install.asciidoc | 3 +-- docs/reference/setup/install/deb.asciidoc | 11 +++++++---- docs/reference/setup/install/rpm.asciidoc | 11 +++++++---- docs/reference/setup/install/windows.asciidoc | 11 +++++++---- docs/reference/setup/install/zip-targz.asciidoc | 15 ++++++++++----- docs/reference/setup/install/zip-windows.asciidoc | 11 +++++++---- 6 files changed, 39 insertions(+), 23 deletions(-) diff --git a/docs/reference/setup/install.asciidoc b/docs/reference/setup/install.asciidoc index 49709ba1d6dc1..44c806be1951b 100644 --- a/docs/reference/setup/install.asciidoc +++ b/docs/reference/setup/install.asciidoc @@ -38,8 +38,7 @@ Elasticsearch on Windows. MSIs may be downloaded from the Elasticsearch website. `docker`:: Images are available for running Elasticsearch as Docker containers. They may be -downloaded from the Elastic Docker Registry. The default image ships with -{xpack-ref}/index.html[X-Pack] pre-installed. +downloaded from the Elastic Docker Registry. + {ref}/docker.html[Install {es} with Docker] diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc index c7ad1aaf241cc..3de09f096a6a5 100644 --- a/docs/reference/setup/install/deb.asciidoc +++ b/docs/reference/setup/install/deb.asciidoc @@ -5,9 +5,10 @@ The Debian package for Elasticsearch can be <>. It can be used to install Elasticsearch on any Debian-based system such as Debian and Ubuntu. -This package contains both open source and commercial features. -{xpack-ref}/license-management.html[Start a 30-day trial license] to enable all -of the available commercial features. See the +This package is free to use under the Elastic license. It contains open source, +free commercial, and paid commercial features. +{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the +paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about Elastic license levels. @@ -132,7 +133,9 @@ sudo dpkg -i elasticsearch-{version}.deb <1> Compares the SHA of the downloaded Debian package and the published checksum, which should output `elasticsearch-{version}.deb: OK`. -You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.deb +Alternatively, you can download the following package, which includes only +Apache 2.0 licensed code: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.deb endif::[] diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc index d44562c810770..8793f6e2b1a17 100644 --- a/docs/reference/setup/install/rpm.asciidoc +++ b/docs/reference/setup/install/rpm.asciidoc @@ -9,9 +9,10 @@ and Oracle Enterprise. NOTE: RPM install is not supported on distributions with old versions of RPM, such as SLES 11 and CentOS 5. Please see <> instead. -This package contains both open source and commercial features. -{xpack-ref}/license-management.html[Start a 30-day trial license] to enable all -of the available commercial features. See the +This package is free to use under the Elastic license. It contains open source, +free commercial, and paid commercial features. +{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the +paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about Elastic license levels. @@ -117,7 +118,9 @@ sudo rpm --install elasticsearch-{version}.rpm <1> Compares the SHA of the downloaded RPM and the published checksum, which should output `elasticsearch-{version}.rpm: OK`. -You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.rpm +Alternatively, you can download the following package, which includes only +Apache 2.0 licensed code: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.rpm endif::[] diff --git a/docs/reference/setup/install/windows.asciidoc b/docs/reference/setup/install/windows.asciidoc index 30b2ae1b64be7..fc98a90290a08 100644 --- a/docs/reference/setup/install/windows.asciidoc +++ b/docs/reference/setup/install/windows.asciidoc @@ -10,9 +10,10 @@ the included `elasticsearch.exe` executable. TIP: Elasticsearch has historically been installed on Windows using the <> archive. You can continue using the `.zip` approach if you prefer. -This package contains both open source and commercial features. -{xpack-ref}/license-management.html[Start a 30-day trial license] to enable all -of the available commercial features. See the +This package is free to use under the Elastic license. It contains open source, +free commercial, and paid commercial features. +{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the +paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about Elastic license levels. @@ -38,7 +39,9 @@ ifeval::["{release-state}"!="unreleased"] Download the `.msi` package for Elasticsearch v{version} from https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.msi -You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.msi +Alternatively, you can download the following package, which includes only +Apache 2.0 licensed code: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.msi endif::[] diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index fd7a09df5432a..e5c032734a2b0 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -5,9 +5,10 @@ Elasticsearch is provided as a `.zip` and as a `.tar.gz` package. These packages can be used to install Elasticsearch on any system and are the easiest package format to use when trying out Elasticsearch. -These packages contain both open source and commercial features. -{xpack-ref}/license-management.html[Start a 30-day trial license] to enable all -of the available commercial features. See the +These packages are free to use under the Elastic license. They contain open +source, free commercial, and paid commercial features. +{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the +paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about Elastic license levels. @@ -46,7 +47,9 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.zip: OK`. <2> This directory is known as `$ES_HOME`. -You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip +Alternatively, you can download the following package, which includes only +Apache 2.0 licensed code: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip endif::[] @@ -76,7 +79,9 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.tar.gz: OK`. <2> This directory is known as `$ES_HOME`. -You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.tar.gz +Alternatively, you can download the following package, which includes only +Apache 2.0 licensed code: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.tar.gz endif::[] diff --git a/docs/reference/setup/install/zip-windows.asciidoc b/docs/reference/setup/install/zip-windows.asciidoc index f9950edff25f3..dc64f2cfc2c38 100644 --- a/docs/reference/setup/install/zip-windows.asciidoc +++ b/docs/reference/setup/install/zip-windows.asciidoc @@ -9,9 +9,10 @@ TIP: Elasticsearch has historically been installed on Windows using the `.zip` a An <> is available that provides the easiest getting started experience for Windows. You can continue using the `.zip` approach if you prefer. -This package contains both open source and commercial features. -{xpack-ref}/license-management.html[Start a 30-day trial license] to enable all -of the available commercial features. See the +This package is free to use under the Elastic license. It contains open source, +free commercial, and paid commercial features. +{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the +paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about Elastic license levels. @@ -37,7 +38,9 @@ ifeval::["{release-state}"!="unreleased"] Download the `.zip` archive for Elasticsearch v{version} from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.zip -You can alternatively download the open source distribution of Elasticsearch from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip +Alternatively, you can download the following package, which includes only +Apache 2.0 licensed code: +https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip Unzip it with your favourite unzip tool. This will create a folder called +elasticsearch-{version}+, which we will refer to as `%ES_HOME%`. In a terminal From 109a342ec1fdf43588797954e6ce05d39740a60f Mon Sep 17 00:00:00 2001 From: lcawley Date: Fri, 20 Apr 2018 17:15:54 -0700 Subject: [PATCH 09/11] [DOCS] Clarifies access to commercial features --- docs/reference/setup/install/deb.asciidoc | 8 ++++---- docs/reference/setup/install/rpm.asciidoc | 8 ++++---- docs/reference/setup/install/windows.asciidoc | 8 ++++---- docs/reference/setup/install/zip-targz.asciidoc | 6 +++--- docs/reference/setup/install/zip-windows.asciidoc | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc index 3de09f096a6a5..f268b725eccde 100644 --- a/docs/reference/setup/install/deb.asciidoc +++ b/docs/reference/setup/install/deb.asciidoc @@ -5,8 +5,8 @@ The Debian package for Elasticsearch can be <>. It can be used to install Elasticsearch on any Debian-based system such as Debian and Ubuntu. -This package is free to use under the Elastic license. It contains open source, -free commercial, and paid commercial features. +This package is free to use under the Elastic license. It contains open source +and free commercial features and access to paid commercial features. {xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about @@ -133,8 +133,8 @@ sudo dpkg -i elasticsearch-{version}.deb <1> Compares the SHA of the downloaded Debian package and the published checksum, which should output `elasticsearch-{version}.deb: OK`. -Alternatively, you can download the following package, which includes only -Apache 2.0 licensed code: +Alternatively, you can download the following package, which contains only +features that are available under the Apache 2.0 license: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.deb endif::[] diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc index 8793f6e2b1a17..fa59666e58007 100644 --- a/docs/reference/setup/install/rpm.asciidoc +++ b/docs/reference/setup/install/rpm.asciidoc @@ -9,8 +9,8 @@ and Oracle Enterprise. NOTE: RPM install is not supported on distributions with old versions of RPM, such as SLES 11 and CentOS 5. Please see <> instead. -This package is free to use under the Elastic license. It contains open source, -free commercial, and paid commercial features. +This package is free to use under the Elastic license. It contains open source +and free commercial features and access to paid commercial features. {xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about @@ -118,8 +118,8 @@ sudo rpm --install elasticsearch-{version}.rpm <1> Compares the SHA of the downloaded RPM and the published checksum, which should output `elasticsearch-{version}.rpm: OK`. -Alternatively, you can download the following package, which includes only -Apache 2.0 licensed code: +Alternatively, you can download the following package, which contains only +features that are available under the Apache 2.0 license: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.rpm endif::[] diff --git a/docs/reference/setup/install/windows.asciidoc b/docs/reference/setup/install/windows.asciidoc index fc98a90290a08..14018c55a1f2e 100644 --- a/docs/reference/setup/install/windows.asciidoc +++ b/docs/reference/setup/install/windows.asciidoc @@ -10,8 +10,8 @@ the included `elasticsearch.exe` executable. TIP: Elasticsearch has historically been installed on Windows using the <> archive. You can continue using the `.zip` approach if you prefer. -This package is free to use under the Elastic license. It contains open source, -free commercial, and paid commercial features. +This package is free to use under the Elastic license. It contains open source +and free commercial features and access to paid commercial features. {xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about @@ -39,8 +39,8 @@ ifeval::["{release-state}"!="unreleased"] Download the `.msi` package for Elasticsearch v{version} from https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.msi -Alternatively, you can download the following package, which includes only -Apache 2.0 licensed code: +Alternatively, you can download the following package, which contains only +features that are available under the Apache 2.0 license: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.msi endif::[] diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index e5c032734a2b0..0726f9d52b576 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -6,7 +6,7 @@ packages can be used to install Elasticsearch on any system and are the easiest package format to use when trying out Elasticsearch. These packages are free to use under the Elastic license. They contain open -source, free commercial, and paid commercial features. +source and free commercial features and access to paid commercial features. {xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about @@ -47,8 +47,8 @@ cd elasticsearch-{version}/ <2> `elasticsearch-{version}.zip: OK`. <2> This directory is known as `$ES_HOME`. -Alternatively, you can download the following package, which includes only -Apache 2.0 licensed code: +Alternatively, you can download the following package, which contains only +features that are available under the Apache 2.0 license: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip endif::[] diff --git a/docs/reference/setup/install/zip-windows.asciidoc b/docs/reference/setup/install/zip-windows.asciidoc index dc64f2cfc2c38..89c1d0a9c8482 100644 --- a/docs/reference/setup/install/zip-windows.asciidoc +++ b/docs/reference/setup/install/zip-windows.asciidoc @@ -9,8 +9,8 @@ TIP: Elasticsearch has historically been installed on Windows using the `.zip` a An <> is available that provides the easiest getting started experience for Windows. You can continue using the `.zip` approach if you prefer. -This package is free to use under the Elastic license. It contains open source, -free commercial, and paid commercial features. +This package is free to use under the Elastic license. It contains open source +and free commercial features and access to paid commercial features. {xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about @@ -38,8 +38,8 @@ ifeval::["{release-state}"!="unreleased"] Download the `.zip` archive for Elasticsearch v{version} from: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{version}.zip -Alternatively, you can download the following package, which includes only -Apache 2.0 licensed code: +Alternatively, you can download the following package, which contains only +features that are available under the Apache 2.0 license: https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-{version}.zip Unzip it with your favourite unzip tool. This will create a folder called From 05874a86d667a88aad10d5c46b12751ca37c7457 Mon Sep 17 00:00:00 2001 From: lcawley Date: Mon, 30 Apr 2018 14:09:47 -0700 Subject: [PATCH 10/11] [DOCS] Added shared license.asciidoc --- docs/reference/setup/install/deb.asciidoc | 7 +------ docs/reference/setup/install/license.asciidoc | 6 ++++++ docs/reference/setup/install/rpm.asciidoc | 7 +------ docs/reference/setup/install/windows.asciidoc | 7 +------ docs/reference/setup/install/zip-targz.asciidoc | 7 +------ docs/reference/setup/install/zip-windows.asciidoc | 7 +------ 6 files changed, 11 insertions(+), 30 deletions(-) create mode 100644 docs/reference/setup/install/license.asciidoc diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc index f268b725eccde..af9d35f3f169d 100644 --- a/docs/reference/setup/install/deb.asciidoc +++ b/docs/reference/setup/install/deb.asciidoc @@ -5,12 +5,7 @@ The Debian package for Elasticsearch can be <>. It can be used to install Elasticsearch on any Debian-based system such as Debian and Ubuntu. -This package is free to use under the Elastic license. It contains open source -and free commercial features and access to paid commercial features. -{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the -paid commercial features. See the -https://www.elastic.co/subscriptions[Subscriptions] page for information about -Elastic license levels. +include::license.asciidoc[] The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can diff --git a/docs/reference/setup/install/license.asciidoc b/docs/reference/setup/install/license.asciidoc new file mode 100644 index 0000000000000..7e9bcbeb61d9c --- /dev/null +++ b/docs/reference/setup/install/license.asciidoc @@ -0,0 +1,6 @@ +This package is free to use under the Elastic license. It contains open source +and free commercial features and access to paid commercial features. +{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the +paid commercial features. See the +https://www.elastic.co/subscriptions[Subscriptions] page for information about +Elastic license levels. diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc index fa59666e58007..a44b0b37d31ec 100644 --- a/docs/reference/setup/install/rpm.asciidoc +++ b/docs/reference/setup/install/rpm.asciidoc @@ -9,12 +9,7 @@ and Oracle Enterprise. NOTE: RPM install is not supported on distributions with old versions of RPM, such as SLES 11 and CentOS 5. Please see <> instead. -This package is free to use under the Elastic license. It contains open source -and free commercial features and access to paid commercial features. -{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the -paid commercial features. See the -https://www.elastic.co/subscriptions[Subscriptions] page for information about -Elastic license levels. +include::license.asciidoc[] The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. Other versions can diff --git a/docs/reference/setup/install/windows.asciidoc b/docs/reference/setup/install/windows.asciidoc index 14018c55a1f2e..c48ec5de22d2c 100644 --- a/docs/reference/setup/install/windows.asciidoc +++ b/docs/reference/setup/install/windows.asciidoc @@ -10,12 +10,7 @@ the included `elasticsearch.exe` executable. TIP: Elasticsearch has historically been installed on Windows using the <> archive. You can continue using the `.zip` approach if you prefer. -This package is free to use under the Elastic license. It contains open source -and free commercial features and access to paid commercial features. -{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the -paid commercial features. See the -https://www.elastic.co/subscriptions[Subscriptions] page for information about -Elastic license levels. +include::license.asciidoc[] The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index 0726f9d52b576..94de390656b1e 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -5,12 +5,7 @@ Elasticsearch is provided as a `.zip` and as a `.tar.gz` package. These packages can be used to install Elasticsearch on any system and are the easiest package format to use when trying out Elasticsearch. -These packages are free to use under the Elastic license. They contain open -source and free commercial features and access to paid commercial features. -{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the -paid commercial features. See the -https://www.elastic.co/subscriptions[Subscriptions] page for information about -Elastic license levels. +include::license.asciidoc[] The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. diff --git a/docs/reference/setup/install/zip-windows.asciidoc b/docs/reference/setup/install/zip-windows.asciidoc index 89c1d0a9c8482..18c1272d25db5 100644 --- a/docs/reference/setup/install/zip-windows.asciidoc +++ b/docs/reference/setup/install/zip-windows.asciidoc @@ -9,12 +9,7 @@ TIP: Elasticsearch has historically been installed on Windows using the `.zip` a An <> is available that provides the easiest getting started experience for Windows. You can continue using the `.zip` approach if you prefer. -This package is free to use under the Elastic license. It contains open source -and free commercial features and access to paid commercial features. -{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the -paid commercial features. See the -https://www.elastic.co/subscriptions[Subscriptions] page for information about -Elastic license levels. +include::license.asciidoc[] The latest stable version of Elasticsearch can be found on the link:/downloads/elasticsearch[Download Elasticsearch] page. From b3b504daec2f5e8fa0d8528303bf55fde836ce75 Mon Sep 17 00:00:00 2001 From: lcawley Date: Mon, 30 Apr 2018 14:16:31 -0700 Subject: [PATCH 11/11] [DOCS] Fixes link to Stack Overview --- docs/reference/setup/install/license.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/setup/install/license.asciidoc b/docs/reference/setup/install/license.asciidoc index 7e9bcbeb61d9c..0e2701a65a401 100644 --- a/docs/reference/setup/install/license.asciidoc +++ b/docs/reference/setup/install/license.asciidoc @@ -1,6 +1,6 @@ This package is free to use under the Elastic license. It contains open source and free commercial features and access to paid commercial features. -{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the +{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about Elastic license levels.