Merge link name conflict

changes.txt

@@ -149,7 +149,7 @@ CHANGES
 - Prepare Elastica Release v1.3.0.0
 
 2014-07-25
-- Update to elasticsearch version 1.3.0 http://www.elasticsearch.org/downloads/1-3-0/
+- Update to elasticsearch version 1.3.0 https://www.elastic.co/downloads/past-releases/1-3-0
 
 2014-07-14
  - Add setQuery() method to Elastica\Query\ConstantScore #653
@@ -161,14 +161,14 @@ CHANGES
  - Fix FunstionScore Query random_score without seed bug. #647
 
 2014-07-02
-- Add setPostFilter method to Elastica\Query (http://www.elasticsearch.org/guide/en/elasticsearch/guide/current/_filtering_queries_and_aggregations.html#_post_filter) #645
+- Add setPostFilter method to Elastica\Query (http://www.elastic.co/guide/en/elasticsearch/guide/current/_post_filter.html) #645
 
 2014-06-30
-- Add Reverse Nested aggregation (http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-bucket-reverse-nested-aggregation.html). #642
+- Add Reverse Nested aggregation (http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-reverse-nested-aggregation.html). #642
 
 2014-06-14
 - Release v1.2.1.0
-- Removed the requirement to set arguments filter and/or query in Filtered, according to the documentation: http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-filtered-query.html #616
+- Removed the requirement to set arguments filter and/or query in Filtered, according to the documentation: http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-filtered-query.html #616
 
 2014-06-13
 - Stop ClientTest->testDeleteIdsIdxStringTypeString from failing 1/3 of the time #634
@@ -182,7 +182,7 @@ CHANGES
 - Update travis to elasticsearch 1.2.1, disable Thrift plugin as not compatible and fix incompatible tests
 
 2014-06-04
-- Implement Boosting Query (http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-boosting-query.html) #625
+- Implement Boosting Query (http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-boosting-query.html) #625
 
 2014-06-02
 - add retry_on_conflict support to bulk #623
@@ -195,7 +195,7 @@ CHANGES
 
 2014-05-25
 - Added Guzzle transport as an alternative to the default Http transport #618
-- Added Elastica\ScanAndScroll Iterator (http://www.elasticsearch.org/guide/en/elasticsearch/guide/current/scan-scroll.html) #617
+- Added Elastica\ScanAndScroll Iterator (http://www.elastic.co/guide/en/elasticsearch/guide/current/scan-scroll.html) #617
 
 2014-05-13
 - Add JSON compat library; Elasticsearch JSON flags and nicer error handling #614
@@ -237,7 +237,7 @@ CHANGES
 
 2014-04-19
 - Release v1.1.1.0
-- Update to elasticsearch 1.1.1 http://www.elasticsearch.org/downloads/1-1-1/
+- Update to elasticsearch 1.1.1 https://www.elastic.co/downloads/past-releases/1-1-1
 - Remove CustomFiltersScore and CustomScore query as removed in elasticsearch 1.1.0 https://github.com/elasticsearch/elasticsearch/pull/5076/files
 - Update Node Info to use plugins instead of plugin (https://github.com/elasticsearch/elasticsearch/pull/5072)
 - Fix mapping issue for aliases #588
@@ -252,7 +252,7 @@ CHANGES
 - Support for Terms filter lookup options #579
 
 2014-03-29
-- Update to elasticsearch 1.1.0 http://www.elasticsearch.org/downloads/1-1-0/
+- Update to elasticsearch 1.1.0 https://www.elastic.co/downloads/past-releases/1-1-0
 
 2014-03-26
 - Fixed Query\Match Fuzziness parameter type #576
@@ -324,7 +324,7 @@ CHANGES
 
 2014-02-12
 - Release v1.0.0.0
-- Updated to elasticsearch 1.0: http://www.elasticsearch.org/blog/1-0-0-released/
+- Updated to elasticsearch 1.0: https://www.elastic.co/blog/1-0-0-released/
 
 2014-02-11
 - Add aggregations
@@ -412,7 +412,7 @@ CHANGES
 - \Elastica\Search::addSuggest() has been renamed to \Elastica\Search::setSuggest()
 - \Elastica\Query::addSuggest() has been renamed to \Elastica\Query::setSuggest()
 - Add \Elastica\Suggest\Phrase, \Elastica\Suggest\CandidateGenerator\AbstractCandidateGenerator, and \Elastica\Suggest\CandidateGenerator\DirectGenerator
-  (see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-suggesters-phrase.html)
+  (see http://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-phrase.html)
 
 2013-12-04
 - Remove boost from FunctionScore::addFunction because this is not supported by elasticsearch
@@ -447,10 +447,10 @@ CHANGES
 
 2013-10-29
 - Elastica_Type::exists() added
-  See http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-types-exists.html#indices-types-exists
+  See http://www.elastic.co/guide/en/elasticsearch/reference/current/indices-types-exists.html#indices-types-exists
 
 2013-10-27
-- Adapted possible values (not only in) for minimum_should_match param based on elasticsearch documetnation  http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html
+- Adapted possible values (not only in) for minimum_should_match param based on elasticsearch documetnation http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html
 
 2013-10-27
 - Release v0.90.5.0
@@ -467,7 +467,7 @@ CHANGES
 2013-09-20
 - Update to geocluster-facet 0.0.8
 - Add support for term suggest API
-  See http://www.elasticsearch.org/guide/reference/api/search/term-suggest/
+  See http://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-term.html
 
 2013-09-18
 - Fix \Elastica\Filter\HasChild usage of \Elastica\Query as to not collide with \Elastica\Filter\Query namespace
@@ -715,7 +715,7 @@ CHANGES
 
 2012-03-04
 - Node info call update. The receive os info and more, param is needed. By default, only basics are returned
-- Release v0.19.0.0 which is compatible with ES 0.19.0 http://www.elasticsearch.org/blog/2012/03/01/0.19.0-released.html
+- Release v0.19.0.0 which is compatible with ES 0.19.0 https://www.elastic.co/downloads/past-releases/0-19-0
 
 2012-02-21
 - Allow percolate queries in bulk requests
@@ -889,7 +889,7 @@ CHANGES
 
 2011-04-29
 - Added getParam to Elastica_Result that more values can be retrieved from the hit array
-- Elastica_Filter_Ids added http://www.elasticsearch.org/guide/reference/query-dsl/ids-filter.html
+- Elastica_Filter_Ids added http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-filter.html
 - getMergePolicyMergeFactor and getRefreshInterval to Elastica_Type_Settings added. If no value is set, default values are returned
 
 2011-04-28
@@ -927,7 +927,7 @@ CHANGES
 
 2011-03-24
 - Renaming of Elastica_Status_Index to Elastica_Index_Status => API Change!
-- IndexSettings added for improved bulk updating http://www.elasticsearch.org/blog/2011/03/23/update-settings.html
+- IndexSettings added for improved bulk updating http://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
 
 2011-03-21
 - Node object added

lib/Elastica/AbstractUpdateAction.php

@@ -133,7 +133,7 @@ public function getIndex()
      *
      * @param  int   $version Document version
      * @return $this
-     * @link http://www.elasticsearch.org/blog/2011/02/08/versioning.html
+     * @link https://www.elastic.co/blog/versioning
      */
     public function setVersion($version)
     {
@@ -164,7 +164,6 @@ public function hasVersion()
      *
      * @param  int   $versionType Document version type
      * @return $this
-     * @link http://www.elasticsearch.org/guide/reference/api/index_.html
      */
     public function setVersionType($versionType)
     {
@@ -194,7 +193,7 @@ public function hasVersionType()
      *
      * @param  string|int $parent Parent document id
      * @return $this
-     * @link http://www.elasticsearch.org/guide/reference/mapping/parent-field.html
+     * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-parent-field.html
      */
     public function setParent($parent)
     {

lib/Elastica/Aggregation/Avg.php

@@ -5,7 +5,7 @@
 /**
  * Class Avg
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-metrics-avg-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-avg-aggregation.html
  */
 class Avg extends AbstractSimpleAggregation
 {

lib/Elastica/Aggregation/Cardinality.php

@@ -5,7 +5,7 @@
 /**
  * Class Cardinality
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-metrics-cardinality-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-cardinality-aggregation.html
  */
 class Cardinality extends AbstractSimpleAggregation
 {

lib/Elastica/Aggregation/DateHistogram.php

@@ -5,7 +5,7 @@
 /**
  * Class DateHistogram
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-datehistogram-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-datehistogram-aggregation.html
  */
 class DateHistogram extends Histogram
 {
@@ -71,7 +71,7 @@ public function setPostOffset($offset)
 
     /**
      * Set the format for returned bucket key_as_string values
-     * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-daterange-aggregation.html#date-format-pattern
+     * @link http://www.elastic.co/guide/en/elasticsearch/reference/master/search-aggregations-bucket-daterange-aggregation.html#date-format-pattern
      * @param  string $format see link for formatting options
      * @return $this
      */

lib/Elastica/Aggregation/DateRange.php

@@ -5,7 +5,7 @@
 /**
  * Class DateRange
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-daterange-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-daterange-aggregation.html
  */
 class DateRange extends Range
 {

lib/Elastica/Aggregation/ExtendedStats.php

@@ -5,7 +5,7 @@
 /**
  * Class ExtendedStats
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-metrics-extendedstats-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-extendedstats-aggregation.html
  */
 class ExtendedStats extends AbstractSimpleAggregation
 {

lib/Elastica/Aggregation/Filter.php

@@ -7,7 +7,7 @@
 /**
  * Class Filter
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-filter-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-filter-aggregation.html
  */
 class Filter extends AbstractAggregation
 {

lib/Elastica/Aggregation/Filters.php

@@ -7,7 +7,7 @@
 /**
  * Class Filters
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-bucket-filters-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-filters-aggregation.html
  */
 class Filters extends AbstractAggregation
 {

lib/Elastica/Aggregation/GeoDistance.php

@@ -7,7 +7,7 @@
 /**
  * Class GeoDistance
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-geodistance-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geodistance-aggregation.html
  */
 class GeoDistance extends AbstractAggregation
 {

lib/Elastica/Aggregation/GeohashGrid.php

@@ -5,7 +5,7 @@
 /**
  * Class GeohashGrid
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-geohashgrid-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geohashgrid-aggregation.html
  */
 class GeohashGrid extends AbstractAggregation
 {

lib/Elastica/Aggregation/GlobalAggregation.php

@@ -5,7 +5,7 @@
 /**
  * Class GlobalAggregation
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-global-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-global-aggregation.html
  */
 class GlobalAggregation extends AbstractAggregation
 {

lib/Elastica/Aggregation/Histogram.php

@@ -5,7 +5,7 @@
 /**
  * Class Histogram
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-histogram-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-histogram-aggregation.html
  */
 class Histogram extends AbstractSimpleAggregation
 {

lib/Elastica/Aggregation/IpRange.php

@@ -7,7 +7,7 @@
 /**
  * Class IpRange
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-iprange-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-iprange-aggregation.html
  */
 class IpRange extends AbstractAggregation
 {

lib/Elastica/Aggregation/Max.php

@@ -5,7 +5,7 @@
 /**
  * Class Max
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-metrics-max-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-max-aggregation.html
  */
 class Max extends AbstractSimpleAggregation
 {

lib/Elastica/Aggregation/Min.php

@@ -5,7 +5,7 @@
 /**
  * Class Min
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-metrics-min-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-min-aggregation.html
  */
 class Min extends AbstractSimpleAggregation
 {

lib/Elastica/Aggregation/Missing.php

@@ -5,7 +5,7 @@
 /**
  * Class Missing
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-missing-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-missing-aggregation.html
  */
 class Missing extends AbstractAggregation
 {

lib/Elastica/Aggregation/Nested.php

@@ -5,7 +5,7 @@
 /**
  * Class Nested
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-nested-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-nested-aggregation.html
  */
 class Nested extends AbstractAggregation
 {

lib/Elastica/Aggregation/Percentiles.php

@@ -4,7 +4,7 @@
 /**
  * Class Percentiles
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-metrics-percentile-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-percentile-aggregation.html
  */
 class Percentiles extends AbstractSimpleAggregation
 {

lib/Elastica/Aggregation/Range.php

@@ -6,7 +6,7 @@
 /**
  * Class Range
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-range-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-range-aggregation.html
  */
 class Range extends AbstractSimpleAggregation
 {

lib/Elastica/Aggregation/ReverseNested.php

@@ -6,7 +6,7 @@
  * Reversed Nested Aggregation
  *
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-bucket-reverse-nested-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-reverse-nested-aggregation.html
  */
 class ReverseNested extends AbstractAggregation
 {

lib/Elastica/Aggregation/ScriptedMetric.php

@@ -5,7 +5,7 @@
 /**
  * Class ScriptedMetric
  * @package Elastica\Aggregation
- * @link    http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-metrics-scripted-metric-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-scripted-metric-aggregation.html
  */
 class ScriptedMetric extends AbstractAggregation
 {

lib/Elastica/Aggregation/Stats.php

@@ -5,7 +5,7 @@
 /**
  * Class Stats
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-metrics-stats-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-stats-aggregation.html
  */
 class Stats extends AbstractSimpleAggregation
 {

lib/Elastica/Aggregation/Sum.php

@@ -5,7 +5,7 @@
 /**
  * Class Sum
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-metrics-sum-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-sum-aggregation.html
  */
 class Sum extends AbstractSimpleAggregation
 {

lib/Elastica/Aggregation/Terms.php

@@ -5,7 +5,7 @@
 /**
  * Class Terms
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-bucket-terms-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-terms-aggregation.html
  */
 class Terms extends AbstractSimpleAggregation
 {

lib/Elastica/Aggregation/TopHits.php

@@ -7,7 +7,7 @@
 /**
  * Class TopHits
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-metrics-top-hits-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-top-hits-aggregation.html
  */
 class TopHits extends AbstractAggregation
 {

lib/Elastica/Aggregation/ValueCount.php

@@ -5,7 +5,7 @@
 /**
  * Class ValueCount
  * @package Elastica\Aggregation
- * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-aggregations-metrics-valuecount-aggregation.html
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-valuecount-aggregation.html
  */
 class ValueCount extends AbstractAggregation
 {