Merge branch 'master' into enhancement/remove_node_client_setting

docs/plugins/authors.asciidoc

@@ -26,9 +26,7 @@ https://github.com/elastic/elasticsearch/blob/master/buildSrc/src/main/resources
 Either fill in this template yourself (see
 https://github.com/lmenezes/elasticsearch-kopf/blob/master/plugin-descriptor.properties[elasticsearch-kopf]
 as an example) or, if you are using Elasticsearch's Gradle build system, you
-can fill in the necessary values in the `build.gradle` file for your plugin. For
-instance, see
-https://github.com/elastic/elasticsearch/blob/master/plugins/site-example/build.gradle[`/plugins/site-example/build.gradle`].
+can fill in the necessary values in the `build.gradle` file for your plugin.
 
 [float]
 ==== Mandatory elements for plugins

docs/plugins/index.asciidoc

@@ -67,3 +67,6 @@ include::integrations.asciidoc[]
 
 include::authors.asciidoc[]
 
+include::redirects.asciidoc[]
+
+

docs/plugins/mapper-attachments.asciidoc

@@ -176,7 +176,7 @@ need to specify the `type` (like `string` or `date`) since it is already known.
 [[mapper-attachments-copy-to]]
 ==== Copy To feature
 
-If you want to use http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-core-types.html#copy-to[copy_to]
+If you want to use https://www.elastic.co/guide/en/elasticsearch/reference/current/copy-to.html[copy_to]
 feature, you need to define it on each sub-field you want to copy to another field:
 
 [source,js]
@@ -405,41 +405,3 @@ It gives back:
    }
 }
 --------------------------
-
-[[mapper-attachments-standalone]]
-==== Stand alone runner
-
-If you want to run some tests within your IDE, you can use `StandaloneRunner` class.
-It accepts arguments:
-
-* `-u file://URL/TO/YOUR/DOC`
-* `--size` set extracted size (default to mapper attachment size)
-* `BASE64` encoded binary
-
-Example:
-
-[source,sh]
---------------------------
-StandaloneRunner BASE64Text
-StandaloneRunner -u /tmp/mydoc.pdf
-StandaloneRunner -u /tmp/mydoc.pdf --size 1000000
---------------------------
-
-It produces something like:
-
-[source,text]
---------------------------
-## Extracted text
---------------------- BEGIN -----------------------
-This is the extracted text
----------------------- END ------------------------
-## Metadata
-- author: null
-- content_length: null
-- content_type: application/pdf
-- date: null
-- keywords: null
-- language: null
-- name: null
-- title: null
---------------------------

docs/plugins/plugin-script.asciidoc

@@ -167,7 +167,7 @@ can do this as follows:
 
 [source,sh]
 ---------------------
-sudo bin/elasticsearch-plugin -Des.path.conf=/path/to/custom/config/dir install <plugin name>
+sudo bin/elasticsearch-plugin -Ees.path.conf=/path/to/custom/config/dir install <plugin name>
 ---------------------
 
 You can also set the `CONF_DIR` environment variable to the custom config

docs/plugins/redirects.asciidoc

@@ -0,0 +1,40 @@
+["appendix",role="exclude",id="redirects"]
+= Deleted pages
+
+The following pages have moved or been deleted.
+
+[role="exclude",id="discovery-multicast"]
+=== Multicast Discovery Plugin
+
+The `multicast-discovery` plugin has been removed.  Instead, configure networking
+using unicast (see {ref}/modules-network.html[Network settings]) or using
+one of the <<discovery,cloud discovery plugins>>.
+
+[role="exclude",id="cloud-aws"]
+=== AWS Cloud Plugin
+
+The `cloud-aws` plugin has been split into two separate plugins:
+
+*  <<discovery-ec2>> (`discovery-ec2`)
+*  <<repository-s3>> (`repository-s3`)
+
+
+[role="exclude",id="cloud-azure"]
+=== Azure Cloud Plugin
+
+The `cloud-azure` plugin has been split into two separate plugins:
+
+*  <<discovery-azure>> (`discovery-azure`)
+*  <<repository-azure>> (`repository-azure`)
+
+
+[role="exclude",id="cloud-gce"]
+=== GCE Cloud Plugin
+
+The `cloud-gce` plugin has been renamed to <<discovery-gce>> (`discovery-gce`).
+
+
+
+
+
+