Merge remote-tracking branch 'upstream/7.x' into enrich-7.x

Author: hub-cap

distribution/packages/build.gradle

@@ -81,7 +81,6 @@ void addProcessFilesTask(String type, boolean oss, boolean jdk) {
 
     doLast {
       // create empty dirs, we set the permissions when configuring the packages
-      mkdir "${packagingFiles}/var/run/elasticsearch"
       mkdir "${packagingFiles}/var/log/elasticsearch"
       mkdir "${packagingFiles}/var/lib/elasticsearch"
       mkdir "${packagingFiles}/usr/share/elasticsearch/plugins"
@@ -253,7 +252,6 @@ Closure commonPackageConfig(String type, boolean oss, boolean jdk) {
         dirMode mode
       }
     }
-    copyEmptyDir('/var/run/elasticsearch', 'elasticsearch', 'elasticsearch', 0755)
     copyEmptyDir('/var/log/elasticsearch', 'elasticsearch', 'elasticsearch', 02750)
     copyEmptyDir('/var/lib/elasticsearch', 'elasticsearch', 'elasticsearch', 02750)
     copyEmptyDir('/usr/share/elasticsearch/plugins', 'root', 'root', 0755)

docs/Versions.asciidoc

@@ -30,8 +30,7 @@ release-state can be: released | prerelease | unreleased
 ///////
 Javadoc roots used to generate links from Painless's API reference
 ///////
-:java8-javadoc: https://docs.oracle.com/javase/8/docs/api
-:java9-javadoc: https://docs.oracle.com/javase/9/docs/api
+:java11-javadoc: https://docs.oracle.com/en/java/javase/11/docs/api
 :joda-time-javadoc: http://www.joda.org/joda-time/apidocs
 :lucene-core-javadoc: http://lucene.apache.org/core/{lucene_version_path}/core
 

docs/painless/painless-api-reference.asciidoc

@@ -1,13 +1,11 @@
 [[painless-api-reference]]
 == Painless API Reference
 
-Painless has a strict whitelist for methods and classes to ensure all
-painless scripts are secure. Most of these methods are exposed directly
-from the Java Runtime Environment (JRE) while others are part of
-Elasticsearch or Painless itself. Below is a list of all available
-classes grouped with their respected methods. Clicking on the method
-name takes you to the documentation for that specific method.  Methods
-defined in the JRE also have a `(java 9)` link which can be used to see
-the method's documentation in Java 9.
+Painless has a strict whitelist for methods and classes per context to
+ensure all painless scripts are secure. Most of these methods are
+exposed directly from the Java Runtime Environment (JRE) while others
+are part of Elasticsearch or Painless itself. Below is a list of the available
+APIs per context. The shared API is available to all contexts, while the
+specialized API available differs between contexts.
 
 include::painless-api-reference/index.asciidoc[]