From 0ad87b25cf78f89c108dfb17510c2d86be394172 Mon Sep 17 00:00:00 2001 From: Isabel Drost-Fromm Date: Thu, 12 May 2016 12:58:22 +0200 Subject: [PATCH] Something messed with auto-indent. Fixed now. --- .../query-dsl/boosting-query.asciidoc | 12 +-- .../query-dsl/common-terms-query.asciidoc | 30 ++++---- .../query-dsl/geo-bounding-box-query.asciidoc | 76 +++++++++---------- .../geo-distance-range-query.asciidoc | 16 ++-- .../query-dsl/geo-polygon-query.asciidoc | 24 ++++-- .../query-dsl/geohash-cell-query.asciidoc | 18 ++--- .../query-dsl/has-child-query.asciidoc | 16 ++-- docs/reference/query-dsl/ids-query.asciidoc | 2 +- .../query-dsl/indices-query.asciidoc | 8 +- .../query-dsl/match-phrase-query.asciidoc | 2 +- docs/reference/query-dsl/match-query.asciidoc | 8 +- .../query-dsl/percolate-query.asciidoc | 10 +-- .../query-dsl/query-string-query.asciidoc | 8 +- .../reference/query-dsl/regexp-query.asciidoc | 4 +- docs/reference/query-dsl/terms-query.asciidoc | 6 +- 15 files changed, 124 insertions(+), 116 deletions(-) diff --git a/docs/reference/query-dsl/boosting-query.asciidoc b/docs/reference/query-dsl/boosting-query.asciidoc index fdeace68a49..5bb07392ab7 100644 --- a/docs/reference/query-dsl/boosting-query.asciidoc +++ b/docs/reference/query-dsl/boosting-query.asciidoc @@ -17,12 +17,12 @@ GET /_search "field1" : "value1" } }, - "negative" : { - "term" : { - "field2" : "value2" - } - }, - "negative_boost" : 0.2 + "negative" : { + "term" : { + "field2" : "value2" + } + }, + "negative_boost" : 0.2 } } } diff --git a/docs/reference/query-dsl/common-terms-query.asciidoc b/docs/reference/query-dsl/common-terms-query.asciidoc index 9c1dde02831..fcc4ace2ec6 100644 --- a/docs/reference/query-dsl/common-terms-query.asciidoc +++ b/docs/reference/query-dsl/common-terms-query.asciidoc @@ -173,11 +173,11 @@ GET /_search "minimum_should_match": 2 } }, - "should": [ - { "term": { "body": "the"}}, - { "term": { "body": "as"}}, - { "term": { "body": "a"}} - ] + "should": [ + { "term": { "body": "the"}}, + { "term": { "body": "as"}}, + { "term": { "body": "a"}} + ] } } } @@ -230,17 +230,17 @@ GET /_search "minimum_should_match": 2 } }, - "should": { - "bool": { - "should": [ - { "term": { "body": "the"}}, - { "term": { "body": "not"}}, - { "term": { "body": "as"}}, - { "term": { "body": "a"}} - ], - "minimum_should_match": 3 - } + "should": { + "bool": { + "should": [ + { "term": { "body": "the"}}, + { "term": { "body": "not"}}, + { "term": { "body": "as"}}, + { "term": { "body": "a"}} + ], + "minimum_should_match": 3 } + } } } } diff --git a/docs/reference/query-dsl/geo-bounding-box-query.asciidoc b/docs/reference/query-dsl/geo-bounding-box-query.asciidoc index dfe4ba25b39..40debb57105 100644 --- a/docs/reference/query-dsl/geo-bounding-box-query.asciidoc +++ b/docs/reference/query-dsl/geo-bounding-box-query.asciidoc @@ -48,20 +48,20 @@ GET /_search "must" : { "match_all" : {} }, - "filter" : { - "geo_bounding_box" : { - "pin.location" : { - "top_left" : { - "lat" : 40.73, - "lon" : -74.1 - }, - "bottom_right" : { - "lat" : 40.01, - "lon" : -71.12 - } + "filter" : { + "geo_bounding_box" : { + "pin.location" : { + "top_left" : { + "lat" : 40.73, + "lon" : -74.1 + }, + "bottom_right" : { + "lat" : 40.01, + "lon" : -71.12 } } } + } } } } @@ -141,14 +141,14 @@ GET /_search "must" : { "match_all" : {} }, - "filter" : { - "geo_bounding_box" : { - "pin.location" : { - "top_left" : [-74.1, 40.73], - "bottom_right" : [-71.12, 40.01] - } + "filter" : { + "geo_bounding_box" : { + "pin.location" : { + "top_left" : [-74.1, 40.73], + "bottom_right" : [-71.12, 40.01] } } + } } } } @@ -169,17 +169,17 @@ GET /_search "must" : { "match_all" : {} }, - "filter" : { - "geo_bounding_box" : { - "pin.location" : { - "top_left" : "40.73, -74.1", - "bottom_right" : "40.01, -71.12" - } + "filter" : { + "geo_bounding_box" : { + "pin.location" : { + "top_left" : "40.73, -74.1", + "bottom_right" : "40.01, -71.12" } } - } + } } } +} -------------------------------------------------- // CONSOLE @@ -195,14 +195,14 @@ GET /_search "must" : { "match_all" : {} }, - "filter" : { - "geo_bounding_box" : { - "pin.location" : { - "top_left" : "dr5r9ydj2y73", - "bottom_right" : "drj7teegpus6" - } + "filter" : { + "geo_bounding_box" : { + "pin.location" : { + "top_left" : "dr5r9ydj2y73", + "bottom_right" : "drj7teegpus6" } } + } } } } @@ -228,16 +228,16 @@ GET /_search "must" : { "match_all" : {} }, - "filter" : { - "geo_bounding_box" : { - "pin.location" : { - "top" : 40.73, - "left" : -74.1, - "bottom" : 40.01, - "right" : -71.12 - } + "filter" : { + "geo_bounding_box" : { + "pin.location" : { + "top" : 40.73, + "left" : -74.1, + "bottom" : 40.01, + "right" : -71.12 } } + } } } } diff --git a/docs/reference/query-dsl/geo-distance-range-query.asciidoc b/docs/reference/query-dsl/geo-distance-range-query.asciidoc index 4236e2b370c..c54c50638bc 100644 --- a/docs/reference/query-dsl/geo-distance-range-query.asciidoc +++ b/docs/reference/query-dsl/geo-distance-range-query.asciidoc @@ -12,16 +12,16 @@ GET /_search "must" : { "match_all" : {} }, - "filter" : { - "geo_distance_range" : { - "from" : "200km", - "to" : "400km", - "pin.location" : { - "lat" : 40, - "lon" : -70 - } + "filter" : { + "geo_distance_range" : { + "from" : "200km", + "to" : "400km", + "pin.location" : { + "lat" : 40, + "lon" : -70 } } + } } } } diff --git a/docs/reference/query-dsl/geo-polygon-query.asciidoc b/docs/reference/query-dsl/geo-polygon-query.asciidoc index 725abe91735..001ae63c11d 100644 --- a/docs/reference/query-dsl/geo-polygon-query.asciidoc +++ b/docs/reference/query-dsl/geo-polygon-query.asciidoc @@ -10,7 +10,10 @@ GET /_search { "query": { "bool" : { - "must": { + "query" : { + "match_all" : {} + }, + "filter" : { "geo_polygon" : { "person.location" : { "points" : [ @@ -58,7 +61,10 @@ GET /_search { "query": { "bool" : { - "must" : { + "query" : { + "match_all" : {} + }, + "filter" : { "geo_polygon" : { "person.location" : { "points" : [ @@ -86,8 +92,11 @@ GET /_search { "query": { "bool" : { - "must" : { - "geo_polygon" : { + "query" : { + "match_all" : {} + }, + "filter" : { + "geo_polygon" : { "person.location" : { "points" : [ "40, -70", @@ -112,8 +121,11 @@ GET /_search { "query": { "bool" : { - "must" : { - "geo_polygon" : { + "query" : { + "match_all" : {} + }, + "filter" : { + "geo_polygon" : { "person.location" : { "points" : [ "drn5x1g8cu2y", diff --git a/docs/reference/query-dsl/geohash-cell-query.asciidoc b/docs/reference/query-dsl/geohash-cell-query.asciidoc index 3728a36de5b..27e6319bc71 100644 --- a/docs/reference/query-dsl/geohash-cell-query.asciidoc +++ b/docs/reference/query-dsl/geohash-cell-query.asciidoc @@ -52,16 +52,16 @@ GET /_search "must" : { "match_all" : {} }, - "filter" : { - "geohash_cell": { - "pin": { - "lat": 13.4080, - "lon": 52.5186 - }, - "precision": 3, - "neighbors": true - } + "filter" : { + "geohash_cell": { + "pin": { + "lat": 13.4080, + "lon": 52.5186 + }, + "precision": 3, + "neighbors": true } + } } } } diff --git a/docs/reference/query-dsl/has-child-query.asciidoc b/docs/reference/query-dsl/has-child-query.asciidoc index b863a91074c..3b8352fd4e0 100644 --- a/docs/reference/query-dsl/has-child-query.asciidoc +++ b/docs/reference/query-dsl/has-child-query.asciidoc @@ -67,14 +67,14 @@ GET /_search "query": { "has_child" : { "type" : "blog_tag", - "score_mode" : "min", - "min_children": 2, <1> - "max_children": 10, <1> - "query" : { - "term" : { - "tag" : "something" - } - } + "score_mode" : "min", + "min_children": 2, <1> + "max_children": 10, <1> + "query" : { + "term" : { + "tag" : "something" + } + } } } } diff --git a/docs/reference/query-dsl/ids-query.asciidoc b/docs/reference/query-dsl/ids-query.asciidoc index acf5722fe72..09541ce51d3 100644 --- a/docs/reference/query-dsl/ids-query.asciidoc +++ b/docs/reference/query-dsl/ids-query.asciidoc @@ -11,7 +11,7 @@ GET /_search "query": { "ids" : { "type" : "my_type", - "values" : ["1", "4", "100"] + "values" : ["1", "4", "100"] } } } diff --git a/docs/reference/query-dsl/indices-query.asciidoc b/docs/reference/query-dsl/indices-query.asciidoc index 552f5927fe1..8f2f958086e 100644 --- a/docs/reference/query-dsl/indices-query.asciidoc +++ b/docs/reference/query-dsl/indices-query.asciidoc @@ -14,12 +14,8 @@ GET /_search "query": { "indices" : { "indices" : ["index1", "index2"], - "query" : { - "term" : { "tag" : "wow" } - }, - "no_match_query" : { - "term" : { "tag" : "kow" } - } + "query" : { "term" : { "tag" : "wow" } }, + "no_match_query" : { "term" : { "tag" : "kow" } } } } } diff --git a/docs/reference/query-dsl/match-phrase-query.asciidoc b/docs/reference/query-dsl/match-phrase-query.asciidoc index 717cb94312e..943d0e84d36 100644 --- a/docs/reference/query-dsl/match-phrase-query.asciidoc +++ b/docs/reference/query-dsl/match-phrase-query.asciidoc @@ -32,7 +32,7 @@ GET /_search "match_phrase" : { "message" : { "query" : "this is a test", - "analyzer" : "my_analyzer" + "analyzer" : "my_analyzer" } } } diff --git a/docs/reference/query-dsl/match-query.asciidoc b/docs/reference/query-dsl/match-query.asciidoc index 8a301081445..2a1b29ea297 100644 --- a/docs/reference/query-dsl/match-query.asciidoc +++ b/docs/reference/query-dsl/match-query.asciidoc @@ -64,7 +64,7 @@ GET /_search "match" : { "message" : { "query" : "this is a test", - "operator" : "and" + "operator" : "and" } } } @@ -87,8 +87,8 @@ GET /_search "match" : { "message" : { "query" : "to be or not to be", - "operator" : "and", - "zero_terms_query": "all" + "operator" : "and", + "zero_terms_query": "all" } } } @@ -128,7 +128,7 @@ GET /_search "match" : { "message" : { "query" : "to be or not to be", - "cutoff_frequency" : 0.001 + "cutoff_frequency" : 0.001 } } } diff --git a/docs/reference/query-dsl/percolate-query.asciidoc b/docs/reference/query-dsl/percolate-query.asciidoc index 8c0e4dc1feb..59d38f101ad 100644 --- a/docs/reference/query-dsl/percolate-query.asciidoc +++ b/docs/reference/query-dsl/percolate-query.asciidoc @@ -23,13 +23,13 @@ PUT /my-index } } }, - "queries": { - "properties": { - "query": { - "type": "percolator" - } + "queries": { + "properties": { + "query": { + "type": "percolator" } } + } } } -------------------------------------------------- diff --git a/docs/reference/query-dsl/query-string-query.asciidoc b/docs/reference/query-dsl/query-string-query.asciidoc index c1f5c06f65c..60477d6e28a 100644 --- a/docs/reference/query-dsl/query-string-query.asciidoc +++ b/docs/reference/query-dsl/query-string-query.asciidoc @@ -11,7 +11,7 @@ GET /_search "query": { "query_string" : { "default_field" : "content", - "query" : "this AND that OR thus" + "query" : "this AND that OR thus" } } } @@ -122,7 +122,7 @@ GET /_search "query": { "query_string" : { "fields" : ["content", "name"], - "query" : "this AND that" + "query" : "this AND that" } } } @@ -177,8 +177,8 @@ GET /_search "query": { "query_string" : { "fields" : ["city.*"], - "query" : "this AND that OR thus", - "use_dis_max" : true + "query" : "this AND that OR thus", + "use_dis_max" : true } } } diff --git a/docs/reference/query-dsl/regexp-query.asciidoc b/docs/reference/query-dsl/regexp-query.asciidoc index 55a1c3469c6..2d57f1d7dd0 100644 --- a/docs/reference/query-dsl/regexp-query.asciidoc +++ b/docs/reference/query-dsl/regexp-query.asciidoc @@ -36,7 +36,7 @@ GET /_search "regexp":{ "name.first":{ "value":"s.*y", - "boost":1.2 + "boost":1.2 } } } @@ -54,7 +54,7 @@ GET /_search "regexp":{ "name.first": { "value": "s.*y", - "flags" : "INTERSECTION|COMPLEMENT|EMPTY" + "flags" : "INTERSECTION|COMPLEMENT|EMPTY" } } } diff --git a/docs/reference/query-dsl/terms-query.asciidoc b/docs/reference/query-dsl/terms-query.asciidoc index a840292d242..e00c18bb56f 100644 --- a/docs/reference/query-dsl/terms-query.asciidoc +++ b/docs/reference/query-dsl/terms-query.asciidoc @@ -89,9 +89,9 @@ GET /tweets/_search "terms" : { "user" : { "index" : "users", - "type" : "user", - "id" : "2", - "path" : "followers" + "type" : "user", + "id" : "2", + "path" : "followers" } } }