From 95bca7c3900bdde648e9524c763e9a68945ccc54 Mon Sep 17 00:00:00 2001 From: Clinton Gormley Date: Tue, 20 Sep 2016 08:11:02 +0200 Subject: [PATCH] Remove redundant .x from apt/rpm repo docs Relates to #20574 --- docs/reference/setup/install/deb.asciidoc | 4 ++-- docs/reference/setup/install/rpm.asciidoc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc index bba9fe80225..2b71c2d8e95 100644 --- a/docs/reference/setup/install/deb.asciidoc +++ b/docs/reference/setup/install/deb.asciidoc @@ -33,7 +33,7 @@ Save the repository definition to +/etc/apt/sources.list.d/elastic-{major-versi ["source","sh",subs="attributes,callouts"] -------------------------------------------------- -echo "deb https://artifacts.elastic.co/packages/{major-version}.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{major-version}.list +echo "deb https://artifacts.elastic.co/packages/{major-version}/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{major-version}.list -------------------------------------------------- [WARNING] @@ -63,7 +63,7 @@ If two entries exist for the same Elasticsearch repository, you will see an erro ["literal",subs="attributes,callouts"] -Duplicate sources.list entry https://artifacts.elastic.co/packages/{major-version}.x/apt/ ...` +Duplicate sources.list entry https://artifacts.elastic.co/packages/{major-version}/apt/ ...` 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. ================================================== diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc index 49d9c725f5a..ce1d0f3e918 100644 --- a/docs/reference/setup/install/rpm.asciidoc +++ b/docs/reference/setup/install/rpm.asciidoc @@ -34,7 +34,7 @@ OpenSuSE based distributions, containing: -------------------------------------------------- [elasticsearch-{major-version}] name=Elasticsearch repository for {major-version} packages -baseurl=https://artifacts.elastic.co/packages/{major-version}.x/yum +baseurl=https://artifacts.elastic.co/packages/{major-version}/yum gpgcheck=1 gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch enabled=1