Skip to content

Commit c3811bb

Browse files
committed
Merge branch 'master' into cn
2 parents 3764c8d + 64bd25c commit c3811bb

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Thanks for the Pull Request! We really appreciate your help and contribution!
2+
3+
Before you submit the PR, have you signed Contributor License Agreement: https://www.elastic.co/contributor-agreement/ ?
4+
5+
PR's (no matter how small) cannot be merged until the CLA has been signed.
6+
It only needs to be signed once, however. Thanks!

010_Intro/30_Tutorial_Search.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ GET /megacorp/employee/_search
279279
// SENSE: 010_Intro/30_Query_DSL.json
280280

281281
You can see that we use the same `match` query as before to search the `about`
282-
field for ``rock climbing.'' We get back two matching documents:
282+
field for ``rock climbing''. We get back two matching documents:
283283

284284
[source,js]
285285
--------------------------------------------------

054_Query_DSL/60_Query_DSL.asciidoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ and not marked as spam:
127127
--------------------------------------------------
128128
{
129129
"bool": {
130-
"must": { "match": { "email": "business opportunity" }},
130+
"must": { "match": { "email": "business opportunity" }},
131131
"should": [
132-
{ "match": { "starred": true }},
133-
{ "bool": {
134-
"must": { "folder": "inbox" }},
135-
"must_not": { "spam": true }}
136-
}}
132+
{ "match": { "starred": true }},
133+
{ "bool": {
134+
"must": { "match": { "folder": "inbox" }},
135+
"must_not": { "match": { "spam": true }}
136+
}}
137137
],
138138
"minimum_should_match": 1
139139
}

100_Full_Text_Search/05_Match_query.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ the query string should be analyzed too.
6565
2. _Analyze the query string_.
6666
+
6767
The query string `QUICK!` is passed through the standard analyzer, which
68-
results in the single term `quick`. Because we have a just a single term,
68+
results in the single term `quick`. Because we have just a single term,
6969
the `match` query can be executed as a single low-level `term` query.
7070

7171
3. _Find matching docs_.

170_Relevance/20_Query_time_boosting.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ GET /docs_2014_*/_search <1>
8282

8383
These boost values are represented in the <<practical-scoring-function>> by
8484
the `t.getBoost()` element.((("practical scoring function", "t.getBoost() method")))((("boosting", "query-time", "t.getBoost()")))((("t.getBoost() method"))) Boosts are not applied at the level that they
85-
appear in the query DSL. Instead, any boost values are combined and passsed
85+
appear in the query DSL. Instead, any boost values are combined and passed
8686
down to the individual terms. The `t.getBoost()` method returns any `boost`
8787
value applied to the term itself or to any of the queries higher up the chain.
8888

400_Relationships/26_Concurrency_solutions.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ One of two things will happen:
1212

1313
* You have decided to use `version` numbers, in which case your mass rename
1414
will fail with a version conflict when it hits the renamed
15-
`README.asciidoc` file.
15+
`README.txt` file.
1616

1717
* You didn't use versioning, and your changes will overwrite the changes from
1818
the other user.

0 commit comments

Comments
 (0)