From 15e3436679c40534bab57191614b9b06f550da80 Mon Sep 17 00:00:00 2001 From: debadair Date: Thu, 4 Feb 2021 16:47:12 -0800 Subject: [PATCH] [DOCS] Update package description. (#68565) * [DOCS] Update package description. * Fixed xref --- docs/reference/setup/install/docker.asciidoc | 7 +------ docs/reference/setup/install/license.asciidoc | 8 ++------ docs/reference/setup/install/windows.asciidoc | 8 +------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/docs/reference/setup/install/docker.asciidoc b/docs/reference/setup/install/docker.asciidoc index 7b960c5afaf8c..706c41c132cb3 100644 --- a/docs/reference/setup/install/docker.asciidoc +++ b/docs/reference/setup/install/docker.asciidoc @@ -9,12 +9,7 @@ https://www.docker.elastic.co[www.docker.elastic.co]. The source files are in https://github.com/elastic/elasticsearch/blob/{branch}/distribution/docker[Github]. -These images are free to use under the Elastic license. They contain open source -and free commercial features and access to paid commercial features. -{kibana-ref}/managing-licenses.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[] ==== Pulling the image diff --git a/docs/reference/setup/install/license.asciidoc b/docs/reference/setup/install/license.asciidoc index 48ee097cdb08a..61d9b41fb8452 100644 --- a/docs/reference/setup/install/license.asciidoc +++ b/docs/reference/setup/install/license.asciidoc @@ -1,6 +1,2 @@ -This package is free to use under the Elastic license. It contains open source -and free commercial features and access to paid commercial features. -{kibana-ref}/managing-licenses.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. +This package contains both free and subscription features. +<> to try out all of the features. diff --git a/docs/reference/setup/install/windows.asciidoc b/docs/reference/setup/install/windows.asciidoc index 27cd8fcf9f1f6..31b00bcf5bdc7 100644 --- a/docs/reference/setup/install/windows.asciidoc +++ b/docs/reference/setup/install/windows.asciidoc @@ -91,12 +91,6 @@ security configuration and built-in user configuration: [[msi-installer-xpack]] image::images/msi_installer/msi_installer_xpack.png[] -NOTE: {xpack} includes a choice of a Trial or Basic license. A Trial license is -valid for 30 days, after which you can obtain one of the available subscriptions. -The Basic license is free and perpetual. Consult the -https://www.elastic.co/subscriptions[available subscriptions] for further -details on which features are available under which license. - After clicking the install button, the installation will begin: [[msi-installer-installing]] @@ -335,7 +329,7 @@ different installation directory to the default one: ["source","sh",subs="attributes,callouts"] -------------------------------------------- -start /wait msiexec.exe /i elasticsearch-{version}.msi /qn INSTALLDIR="C:\Custom Install Directory\{version}" +start /wait msiexec.exe /i elasticsearch-{version}.msi /qn INSTALLDIR="C:\Custom Install Directory\{version}" -------------------------------------------- Consult the https://msdn.microsoft.com/en-us/library/windows/desktop/aa367988(v=vs.85).aspx[Windows Installer SDK Command-Line Options]