From aa94ced0ae54959315e76aa64cc8ea46bcb20c2c Mon Sep 17 00:00:00 2001 From: Clinton Gormley Date: Thu, 19 Mar 2015 20:49:58 +0100 Subject: [PATCH] Remove references to the thrift and memcached transport plugins as they are no longer supported Closes #10166 --- docs/reference/api-conventions.asciidoc | 6 +----- docs/reference/migration/migrate_2_0.asciidoc | 10 ++++++++-- docs/reference/modules.asciidoc | 4 ---- docs/reference/modules/plugins.asciidoc | 2 -- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/docs/reference/api-conventions.asciidoc b/docs/reference/api-conventions.asciidoc index 5076bd23b26..7cb86f93a90 100644 --- a/docs/reference/api-conventions.asciidoc +++ b/docs/reference/api-conventions.asciidoc @@ -3,11 +3,7 @@ [partintro] -- -The *elasticsearch* REST APIs are exposed using: - -* <>, -* <>, -* <>. +The *elasticsearch* REST APIs are exposed using <>. The conventions listed in this chapter can be applied throughout the REST API, unless otherwise specified. diff --git a/docs/reference/migration/migrate_2_0.asciidoc b/docs/reference/migration/migrate_2_0.asciidoc index 70a08adda11..f51f3bac34b 100644 --- a/docs/reference/migration/migrate_2_0.asciidoc +++ b/docs/reference/migration/migrate_2_0.asciidoc @@ -281,6 +281,12 @@ index. === Scripts -Deprecated script parameters `id`, `file`, and `scriptField` have been removed -from all scriptable APIs. `script_id`, `script_file` and `script` should be used +Deprecated script parameters `id`, `file`, and `scriptField` have been removed +from all scriptable APIs. `script_id`, `script_file` and `script` should be used in their place. + +=== Thrift and memcached transport + +The thrift and memcached transport plugins are no longer supported. Instead, use +either the HTTP transport (enabled by default) or the node or transport Java client. + diff --git a/docs/reference/modules.asciidoc b/docs/reference/modules.asciidoc index 79150367c1d..3fa55cf364d 100644 --- a/docs/reference/modules.asciidoc +++ b/docs/reference/modules.asciidoc @@ -11,8 +11,6 @@ include::modules/http.asciidoc[] include::modules/indices.asciidoc[] -include::modules/memcached.asciidoc[] - include::modules/network.asciidoc[] include::modules/node.asciidoc[] @@ -27,8 +25,6 @@ include::modules/advanced-scripting.asciidoc[] include::modules/threadpool.asciidoc[] -include::modules/thrift.asciidoc[] - include::modules/transport.asciidoc[] include::modules/snapshots.asciidoc[] diff --git a/docs/reference/modules/plugins.asciidoc b/docs/reference/modules/plugins.asciidoc index b2dee0525e2..2b226f54e12 100644 --- a/docs/reference/modules/plugins.asciidoc +++ b/docs/reference/modules/plugins.asciidoc @@ -259,8 +259,6 @@ You can disable that check using `plugins.check_lucene: false`. ==== Transport Plugins .Supported by Elasticsearch -* https://github.com/elasticsearch/elasticsearch-transport-memcached[Memcached transport plugin] -* https://github.com/elasticsearch/elasticsearch-transport-thrift[Thrift Transport] * https://github.com/elasticsearch/elasticsearch-transport-wares[Servlet transport] .Supported by the community