From d8cb070cd5218dbb827e978a9fb9d6f33272e990 Mon Sep 17 00:00:00 2001 From: lcawl Date: Tue, 10 Jul 2018 08:44:45 -0700 Subject: [PATCH 1/4] [DOCS] Removes alternative docker pull example --- docs/reference/setup/install/docker.asciidoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/reference/setup/install/docker.asciidoc b/docs/reference/setup/install/docker.asciidoc index b18f7c57a1668..3940414963c8b 100644 --- a/docs/reference/setup/install/docker.asciidoc +++ b/docs/reference/setup/install/docker.asciidoc @@ -34,12 +34,11 @@ endif::[] ifeval::["{release-state}"!="unreleased"] -Docker images can be retrieved with the following commands: +For example, Docker images can be retrieved with the following command: ["source","sh",subs="attributes"] -------------------------------------------- docker pull {docker-repo}:{version} -docker pull {docker-repo}-oss:{version} -------------------------------------------- endif::[] From 5874c5d55195576da63ccaf79a2699e9a1d1ecf1 Mon Sep 17 00:00:00 2001 From: lcawl Date: Tue, 10 Jul 2018 10:27:30 -0700 Subject: [PATCH 2/4] [DOCS] Moves info about oss images --- docs/reference/setup/install/docker.asciidoc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/reference/setup/install/docker.asciidoc b/docs/reference/setup/install/docker.asciidoc index 3940414963c8b..99ddec866da47 100644 --- a/docs/reference/setup/install/docker.asciidoc +++ b/docs/reference/setup/install/docker.asciidoc @@ -8,8 +8,6 @@ A list of all published Docker images and tags can be found in https://www.docker.elastic.co[www.docker.elastic.co]. The source code can be found on https://github.com/elastic/elasticsearch-docker/tree/{branch}[GitHub]. -==== Image types - These images 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 @@ -17,9 +15,6 @@ paid commercial features. See the https://www.elastic.co/subscriptions[Subscriptions] page for information about Elastic license levels. -Alternatively, you can download `-oss` images, which contain only features that -are available under the Apache 2.0 license. - ==== Pulling the image Obtaining {es} for Docker is as simple as issuing a +docker pull+ command @@ -41,6 +36,10 @@ For example, Docker images can be retrieved with the following command: docker pull {docker-repo}:{version} -------------------------------------------- +Alternatively, you can download other Docker images that contain only features +that are available under the Apache 2.0 license. See +https://www.docker.elastic.co[www.docker.elastic.co]. + endif::[] [[docker-cli-run]] From faf4adcaba65aa46be0112b6940eefc2d25cb65d Mon Sep 17 00:00:00 2001 From: lcawl Date: Tue, 10 Jul 2018 15:04:57 -0700 Subject: [PATCH 3/4] [DOCS] Merging two sentences about oss images --- docs/reference/setup/install/docker.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/setup/install/docker.asciidoc b/docs/reference/setup/install/docker.asciidoc index 99ddec866da47..33a073bf5b3fb 100644 --- a/docs/reference/setup/install/docker.asciidoc +++ b/docs/reference/setup/install/docker.asciidoc @@ -37,7 +37,7 @@ docker pull {docker-repo}:{version} -------------------------------------------- Alternatively, you can download other Docker images that contain only features -that are available under the Apache 2.0 license. See +that are available under the Apache 2.0 license from https://www.docker.elastic.co[www.docker.elastic.co]. endif::[] From 1dbc5e5017a0077db7e45a44e565e051ae91da5e Mon Sep 17 00:00:00 2001 From: lcawl Date: Wed, 11 Jul 2018 08:53:59 -0700 Subject: [PATCH 4/4] [DOCS] Changed images to singular --- docs/reference/setup/install/docker.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/setup/install/docker.asciidoc b/docs/reference/setup/install/docker.asciidoc index 33a073bf5b3fb..523217b921a43 100644 --- a/docs/reference/setup/install/docker.asciidoc +++ b/docs/reference/setup/install/docker.asciidoc @@ -29,7 +29,7 @@ endif::[] ifeval::["{release-state}"!="unreleased"] -For example, Docker images can be retrieved with the following command: +For example, the Docker image can be retrieved with the following command: ["source","sh",subs="attributes"] --------------------------------------------