Refactor geo_point validate_* and normalize_* for 1.7

docs/reference/mapping/types/geo-point-type.asciidoc

@@ -138,25 +138,12 @@ but also all its parent cells (true prefixes) will be indexed as well. The
 number of terms that will be indexed depends on the `geohash_precision`.
 Defaults to `false`. *Note*: This option implicitly enables `geohash`.
 
-|`validate` |Set to `false` to accept geo points with invalid latitude or
-longitude (default is `true`). *Note*: Validation only works when
-normalization has been disabled. This option will be deprecated and removed
-in upcoming releases.
+|`ignore_malformed` |Formerly `validate`. Set to `true` to
+accept geo points with invalid latitude or longitude (default is `false`).
 
-|`validate_lat` |Set to `false` to accept geo points with an invalid
-latitude (default is `true`). This option will be deprecated and removed
-in upcoming releases.
-
-|`validate_lon` |Set to `false` to accept geo points with an invalid
-longitude (default is `true`). This option will be deprecated and removed
-in upcoming releases.
-
-|`normalize` |Set to `true` to normalize latitude and longitude (default
-is `true`).
-
-|`normalize_lat` |Set to `true` to normalize latitude.
-
-|`normalize_lon` |Set to `true` to normalize longitude.
+|`coerce` |Formerly `normalize`. Set to `true` to normalize longitude and
+latitude values to a standard -180:180 / -90:90 coordinate system. (default
+is `false`).
 
 |`precision_step` |The precision step (influences the number of terms 
 generated for each number value) for `.lat` and `.lon` fields 

docs/reference/query-dsl/filters/geo-bounding-box-filter.asciidoc

@@ -44,6 +44,31 @@ Then the following simple query can be executed with a
 }
 --------------------------------------------------
 
+[float]
+==== Filter Options
+
+[cols="<,<",options="header",]
+|=======================================================================
+|Option |Description
+|`_name` |Optional name field to identify the filter
+
+|`_cache` |Set to `true` to cache the *result* of the filter.
+Defaults to `false`. See <<Caching,Caching>> below for further details.
+
+|`_cache_key` |Associate a unique custom cache key to use instead of
+the actual filter.
+
+|`ignore_malformed` |Set to `true` to
+accept geo points with invalid latitude or longitude (default is `false`).
+
+|`coerce` |Set to `true` to normalize longitude and latitude values to a
+standard -180:180 / -90:90 coordinate system. (default is `false`).
+
+|`type` |Set to one of `indexed` or `memory` to defines whether this filter will
+be executed in memory or indexed. See <<Type,Type>> below for further details
+Default is `memory`.
+|=======================================================================
+
 [float]
 ==== Accepted Formats
 

docs/reference/query-dsl/filters/geo-distance-filter.asciidoc

@@ -158,6 +158,28 @@ The following are options allowed on the filter:
     sure the `geo_point` type index lat lon in this case), or `none` which
     disables bounding box optimization.
 
+`_name`::
+
+    Optional name field to identify the filter
+
+`_cache`::
+
+    Set to `true` to cache the *result* of the filter.
+    Defaults to `false`. See <<Caching,Caching>> below for further details.
+
+`_cache_key`::
+
+    Associate a unique custom cache key to use instead of the actual filter.
+
+`ignore_malformed`::
+
+    Set to `true` to accept geo points with invalid latitude or
+    longitude (default is `false`).
+
+`coerce`::
+
+    Set to `true` to normalize longitude and latitude values to a standard -180:180 / -90:90
+    coordinate system. (default is `false`).
 
 [float]
 ==== geo_point Type

docs/reference/query-dsl/filters/geo-distance-range-filter.asciidoc

@@ -24,7 +24,7 @@ Filters documents that exists within a range from a specific point:
 }
 --------------------------------------------------
 
-Supports the same point location parameter as the
+Supports the same point location parameter and filter options as the
 <<query-dsl-geo-distance-filter,geo_distance>>
 filter. And also support the common parameters for range (lt, lte, gt,
 gte, from, to, include_upper and include_lower).

docs/reference/query-dsl/filters/geo-polygon-filter.asciidoc

@@ -26,6 +26,27 @@ points. Here is an example:
 }
 --------------------------------------------------
 
+[float]
+==== Filter Options
+
+[cols="<,<",options="header",]
+|=======================================================================
+|Option |Description
+|`_name` |Optional name field to identify the filter
+
+|`_cache` |Set to `true` to cache the *result* of the filter.
+Defaults to `false`. See <<Caching,Caching>> below.
+
+|`_cache_key` |Associate a unique custom cache key to use instead of
+the actual filter.
+
+|`ignore_malformed` |Set to `true` to accept geo points with invalid latitude or
+longitude (default is `false`).
+
+|`coerce` |Set to `true` to normalize longitude and latitude values to a
+standard -180:180 / -90:90 coordinate system. (default is `false`).
+|=======================================================================
+
 [float]
 ==== Allowed Formats