From abc7de96ae80cf9dbacb565fb71e79383b3029ef Mon Sep 17 00:00:00 2001
From: Clinton Gormley <clint@traveljury.com>
Date: Thu, 9 Apr 2015 14:50:11 +0200
Subject: [PATCH] Docs: Updated version annotations in master

---
 docs/reference/cluster/health.asciidoc                        | 2 --
 docs/reference/index.asciidoc                                 | 2 +-
 docs/reference/indices/recovery.asciidoc                      | 2 --
 docs/reference/mapping/fields/timestamp-field.asciidoc        | 2 --
 docs/reference/modules/scripting.asciidoc                     | 2 +-
 docs/reference/modules/transport.asciidoc                     | 1 -
 .../reference/query-dsl/queries/function-score-query.asciidoc | 2 --
 .../aggregations/bucket/significantterms-aggregation.asciidoc | 2 --
 .../aggregations/metrics/extendedstats-aggregation.asciidoc   | 4 +---
 docs/reference/search/search-template.asciidoc                | 2 +-
 docs/reference/setup/configuration.asciidoc                   | 2 +-
 11 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/docs/reference/cluster/health.asciidoc b/docs/reference/cluster/health.asciidoc
index d11a2385f24..a58a0924fce 100644
--- a/docs/reference/cluster/health.asciidoc
+++ b/docs/reference/cluster/health.asciidoc
@@ -22,8 +22,6 @@ $ curl -XGET 'http://localhost:9200/_cluster/health?pretty=true'
 }
 --------------------------------------------------
 
-coming[1.5.0, number of pending tasks was added in 1.5.0]
-
 The API can also be executed against one or more indices to get just the
 specified indices health:
 
diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc
index 3a5945d9931..3288cad5855 100644
--- a/docs/reference/index.asciidoc
+++ b/docs/reference/index.asciidoc
@@ -1,7 +1,7 @@
 [[elasticsearch-reference]]
 = Reference
 
-:version:   1.5.0
+:version:   1.5.1
 :branch:    1.5
 :jdk:       1.8.0_25
 :defguide:  https://www.elastic.co/guide/en/elasticsearch/guide/current
diff --git a/docs/reference/indices/recovery.asciidoc b/docs/reference/indices/recovery.asciidoc
index b50b5c4dce9..defc86d25c1 100644
--- a/docs/reference/indices/recovery.asciidoc
+++ b/docs/reference/indices/recovery.asciidoc
@@ -19,7 +19,6 @@ curl -XGET http://localhost:9200/_recovery?pretty&human
 --------------------------------------------------
 
 Response:
-coming[1.5.0, this syntax was change to fix inconsistencies with other API]
 [source,js]
 --------------------------------------------------
 {
@@ -94,7 +93,6 @@ In some cases a higher level of detail may be preferable. Setting "detailed=true
 curl -XGET http://localhost:9200/_recovery?pretty&human&detailed=true
 --------------------------------------------------
 
-coming[1.5.0, this syntax was change to fix inconsistencies with other API]
 Response:
 
 [source,js]
diff --git a/docs/reference/mapping/fields/timestamp-field.asciidoc b/docs/reference/mapping/fields/timestamp-field.asciidoc
index 0af1e749716..ce7520708f8 100644
--- a/docs/reference/mapping/fields/timestamp-field.asciidoc
+++ b/docs/reference/mapping/fields/timestamp-field.asciidoc
@@ -122,8 +122,6 @@ You can also set the default value to any date respecting <<mapping-timestamp-fi
 
 If you don't provide any timestamp value, _timestamp will be set to this default value.
 
-coming[1.5.0]
-
 In elasticsearch 1.4, we allowed setting explicitly `"default":null` which is not possible anymore
 as we added a new `ignore_missing` setting.
 When reading an index created with elasticsearch 1.4 and using this, we automatically update it by
diff --git a/docs/reference/modules/scripting.asciidoc b/docs/reference/modules/scripting.asciidoc
index d30b8b09869..c0ea9368c23 100644
--- a/docs/reference/modules/scripting.asciidoc
+++ b/docs/reference/modules/scripting.asciidoc
@@ -378,7 +378,7 @@ that can be used for configuring this sandbox:
 
 `script.groovy.sandbox.enabled`::
 
-    Flag to enable the sandbox (defaults to `false` added[v1.4.3] meaning the sandbox is
+    Flag to enable the sandbox (defaults to `false` meaning the sandbox is
     disabled).
 
 When specifying whitelist or blacklist settings for the groovy sandbox, all
diff --git a/docs/reference/modules/transport.asciidoc b/docs/reference/modules/transport.asciidoc
index c83886e1566..f836f66bcfe 100644
--- a/docs/reference/modules/transport.asciidoc
+++ b/docs/reference/modules/transport.asciidoc
@@ -85,7 +85,6 @@ the JVM. It is automatically enabled when using
 `NodeBuilder#local(true)`.
 
 [float]
-coming[1.5.0]
 === Transport Tracer
 
 The transport module has a dedicated tracer logger which, when activated, logs incoming and out going requests. The log can be dynamically activated
diff --git a/docs/reference/query-dsl/queries/function-score-query.asciidoc b/docs/reference/query-dsl/queries/function-score-query.asciidoc
index e96c1660e5a..32b7c0c386c 100644
--- a/docs/reference/query-dsl/queries/function-score-query.asciidoc
+++ b/docs/reference/query-dsl/queries/function-score-query.asciidoc
@@ -86,8 +86,6 @@ query. The parameter `boost_mode` defines how:
 `max`::         max of query score and function score
 `min`::         min of query score and function score
 
-coming[1.5.0]
-
 By default, modifying the score does not change which documents match. To exclude
 documents that do not meet a certain score threshold the `min_score` parameter can be set to the desired score threshold.  
 
diff --git a/docs/reference/search/aggregations/bucket/significantterms-aggregation.asciidoc b/docs/reference/search/aggregations/bucket/significantterms-aggregation.asciidoc
index 1d17c4ad5ac..9cf729765f9 100644
--- a/docs/reference/search/aggregations/bucket/significantterms-aggregation.asciidoc
+++ b/docs/reference/search/aggregations/bucket/significantterms-aggregation.asciidoc
@@ -347,8 +347,6 @@ It is hard to say which one of the different heuristics will be the best choice
 If none of the above measures suits your usecase than another option is to implement a custom significance measure:
 
 ===== scripted
-coming[1.5.0]
-
 Customized scores can be implemented via a script:
 	
 [source,js]
diff --git a/docs/reference/search/aggregations/metrics/extendedstats-aggregation.asciidoc b/docs/reference/search/aggregations/metrics/extendedstats-aggregation.asciidoc
index ca0fad0a732..73340af8e67 100644
--- a/docs/reference/search/aggregations/metrics/extendedstats-aggregation.asciidoc
+++ b/docs/reference/search/aggregations/metrics/extendedstats-aggregation.asciidoc
@@ -46,8 +46,6 @@ The above aggregation computes the grades statistics over all documents. The agg
 The name of the aggregation (`grades_stats` above) also serves as the key by which the aggregation result can be retrieved from the returned response.
 
 ==== Standard Deviation Bounds
-added[1.4.3]
-
 By default, the `extended_stats` metric will return an object called `std_deviation_bounds`, which provides an interval of plus/minus two standard
 deviations from the mean.  This can be a useful way to visualize variance of your data.  If you want a different boundary, for example
 three standard deviations, you can set `sigma` in the request:
@@ -65,7 +63,7 @@ three standard deviations, you can set `sigma` in the request:
     }
 }
 --------------------------------------------------
-<1> `sigma` controls how many standard deviations +/- from the mean should be displayed added[1.4.3]
+<1> `sigma` controls how many standard deviations +/- from the mean should be displayed
 
 `sigma` can be any non-negative double, meaning you can request non-integer values such as `1.5`.  A value of `0` is valid, but will simply
 return the average for both `upper` and `lower` bounds.
diff --git a/docs/reference/search/search-template.asciidoc b/docs/reference/search/search-template.asciidoc
index 2b2fd2550fd..bb33628ba3b 100644
--- a/docs/reference/search/search-template.asciidoc
+++ b/docs/reference/search/search-template.asciidoc
@@ -28,7 +28,7 @@ documentation of the mustache project].
 NOTE: The mustache language is implemented in elasticsearch as a sandboxed
 scripting language, hence it obeys settings that may be used to enable or
 disable scripts per language, source and operation as described in
-<<enable-dynamic-scripting, scripting docs>> coming[1.6.0, `mustache` scripts were always on before and it wasn't possible to disable them].
+<<enable-dynamic-scripting, scripting docs>>
 
 [float]
 ==== More template examples
diff --git a/docs/reference/setup/configuration.asciidoc b/docs/reference/setup/configuration.asciidoc
index 0795c8a3b3f..c768a490f53 100644
--- a/docs/reference/setup/configuration.asciidoc
+++ b/docs/reference/setup/configuration.asciidoc
@@ -323,6 +323,6 @@ appender section contains the destinations for the logs. Extensive information
 on how to customize logging and all the supported appenders can be found on
 the http://logging.apache.org/log4j/1.2/manual.html[log4j documentation].
 
-coming[1.5.0] Additional Appenders and other logging classes provided by 
+Additional Appenders and other logging classes provided by 
 http://logging.apache.org/log4j/extras/[log4j-extras] are also available, 
 out of the box.