Merge branch 'master' into feature/query-refactoring

 Conflicts:
	src/main/java/org/elasticsearch/index/query/FilterBuilder.java
	src/main/java/org/elasticsearch/index/query/QueryParseContext.java

Author: Christoph Büscher

config/elasticsearch.yml

@@ -39,9 +39,6 @@ org.apache.lucene.index.IndexReader#decRef()
 org.apache.lucene.index.IndexReader#incRef()
 org.apache.lucene.index.IndexReader#tryIncRef()
 
-@defaultMessage QueryWrapperFilter is cacheable by default - use Queries#wrap instead
-org.apache.lucene.search.QueryWrapperFilter#<init>(org.apache.lucene.search.Query)
-
 @defaultMessage Pass the precision step from the mappings explicitly instead
 org.apache.lucene.search.NumericRangeQuery#newDoubleRange(java.lang.String,java.lang.Double,java.lang.Double,boolean,boolean)
 org.apache.lucene.search.NumericRangeQuery#newFloatRange(java.lang.String,java.lang.Float,java.lang.Float,boolean,boolean)

dev-tools/forbidden/core-signatures.txt

@@ -13,7 +13,7 @@ See the {client}/perl-api/current/index.html[official Elasticsearch Perl client]
 See the {client}/python-api/current/index.html[official Elasticsearch Python client].
 
 * http://github.com/elasticsearch/elasticsearch-dsl-py[elasticsearch-dsl-py]
-  chainable query and filter construction built on top of offical client.
+  chainable query and filter construction built on top of official client.
 
 * http://github.com/rhec/pyelasticsearch[pyelasticsearch]:
   Python client.
@@ -50,13 +50,13 @@ See the {client}/ruby-api/current/index.html[official Elasticsearch Ruby client]
 
 * https://github.com/ddnexus/flex[Flex]:
   Ruby Client.
-  
+
 * https://github.com/printercu/elastics-rb[elastics]:
   Tiny client with built-in zero-downtime migrations and ActiveRecord integration.
-  
+
 * https://github.com/toptal/chewy[chewy]:
-  Chewy is ODM and wrapper for official elasticsearch client 
-  
+  Chewy is ODM and wrapper for official elasticsearch client
+
 * https://github.com/ankane/searchkick[Searchkick]:
   Intelligent search made easy
 
@@ -82,7 +82,7 @@ See the {client}/php-api/current/index.html[official Elasticsearch PHP client].
 
 * https://github.com/searchbox-io/Jest[Jest]:
   Java Rest client.
-* There is of course the http://www.elasticsearch.org/guide/en/elasticsearch/client/java-api/current/index.html[native ES Java client]
+* There is of course the {client}/java-api/current/index.html[native ES Java client]
 
 [[community-javascript]]
 === JavaScript

docs/community/clients.asciidoc

@@ -1,6 +1,6 @@
 = Community Supported Clients
 
-:client: http://www.elasticsearch.org/guide/en/elasticsearch/client
+:client: http://www.elastic.co/guide/en/elasticsearch/client
 
 
 include::clients.asciidoc[]

docs/community/index.asciidoc

@@ -59,6 +59,9 @@
 
 * http://searchbox-io.github.com/wp-elasticsearch/[Wp-Elasticsearch]:
   Elasticsearch WordPress Plugin
+  
+* https://github.com/wallmanderco/elasticsearch-indexer[Elasticsearch Indexer]:
+  Elasticsearch WordPress Plugin
 
 * https://github.com/OlegKunitsyn/eslogd[eslogd]:
   Linux daemon that replicates events to a central Elasticsearch server in real-time

docs/community/integrations.asciidoc

@@ -1,6 +1,6 @@
 = Groovy API
-:ref:  http://www.elasticsearch.org/guide/en/elasticsearch/reference/current
-:java: http://www.elasticsearch.org/guide/en/elasticsearch/client/java-api/current
+:ref:  http://www.elastic.co/guide/en/elasticsearch/reference/current
+:java: http://www.elastic.co/guide/en/elasticsearch/client/java-api/current
 
 [preface]
 == Preface

docs/groovy-api/index.asciidoc

@@ -134,7 +134,7 @@ be "two hop" operations).
 --------------------------------------------------
 // on startup
 
-Client client = new TransportClient()
+Client client = TransportClient.builder().build()
         .addTransportAddress(new InetSocketTransportAddress("host1", 9300))
         .addTransportAddress(new InetSocketTransportAddress("host2", 9300));
 
@@ -150,7 +150,7 @@ Note that you have to set the cluster name if you use one different than
 --------------------------------------------------
 Settings settings = ImmutableSettings.settingsBuilder()
         .put("cluster.name", "myClusterName").build();
-Client client =    new TransportClient(settings);
+Client client = TransportClient.builder().settings(settings).build();
 //Add transport addresses and do something with the client...
 --------------------------------------------------
 
@@ -166,7 +166,7 @@ used will be the ones that the other nodes were started with (the
 --------------------------------------------------
 Settings settings = ImmutableSettings.settingsBuilder()
         .put("client.transport.sniff", true).build();
-TransportClient client = new TransportClient(settings);
+TransportClient client = TransportClient.builder().settings(settings).build();
 --------------------------------------------------
 
 Other transport client level settings include:

docs/java-api/client.asciidoc

@@ -1,6 +1,6 @@
 [[java-api]]
 = Java API
-:ref: http://www.elasticsearch.org/guide/en/elasticsearch/reference/current
+:ref: http://www.elastic.co/guide/en/elasticsearch/reference/current
 
 [preface]
 == Preface

docs/java-api/index.asciidoc

@@ -150,7 +150,7 @@ FilterBuilder filter = geoDistanceFilter("pin.location")    <1>
 <2> center point
 <3> distance from center point
 <4> optimize bounding box: `memory`, `indexed` or `none`
-<5> distance computation mode: `GeoDistance.SLOPPY_ARC` (default), `GeoDistance.ARC` (slighly more precise but
+<5> distance computation mode: `GeoDistance.SLOPPY_ARC` (default), `GeoDistance.ARC` (slightly more precise but
     significantly slower) or `GeoDistance.PLANE` (faster, but inaccurate on long distances and close to the poles)
 
 Note that you can cache the result using

docs/java-api/query-dsl-filters.asciidoc

@@ -234,7 +234,7 @@ QueryBuilder qb = matchAllQuery();
 
 
 [[mlt]]
-=== More Like This (Field) Query (mlt and mlt_field)
+=== More Like This Query (mlt)
 
 See:
  * {ref}/query-dsl-mlt-query.html[More Like This Query]