Skip to content

Commit

Permalink
[DOCS] Update package description. (#68565) (#68567)
Browse files Browse the repository at this point in the history
* [DOCS] Update package description.

* Fixed xref
  • Loading branch information
debadair authored Feb 5, 2021
1 parent 2a41df7 commit b9f88e6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 19 deletions.
7 changes: 1 addition & 6 deletions docs/reference/setup/install/docker.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 2 additions & 6 deletions docs/reference/setup/install/license.asciidoc
Original file line number Diff line number Diff line change
@@ -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.
<<license-settings,Start a 30-day trial>> to try out all of the features.
8 changes: 1 addition & 7 deletions docs/reference/setup/install/windows.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit b9f88e6

Please sign in to comment.