Merge branch 'master' into cn

Author: medcl

.github/PULL_REQUEST_TEMPLATE.md

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

010_Intro/30_Tutorial_Search.asciidoc

@@ -279,7 +279,7 @@ GET /megacorp/employee/_search
 // SENSE: 010_Intro/30_Query_DSL.json
 
 You can see that we use the same `match` query as before to search the `about`
-field for ``rock climbing.'' We get back two matching documents:
+field for ``rock climbing''. We get back two matching documents:
 
 [source,js]
 --------------------------------------------------

054_Query_DSL/60_Query_DSL.asciidoc

@@ -127,13 +127,13 @@ and not marked as spam:
 --------------------------------------------------
 {
     "bool": {
-        "must": { "match":      { "email": "business opportunity" }},
+        "must": { "match":   { "email": "business opportunity" }},
         "should": [
-             { "match":         { "starred": true }},
-             { "bool": {
-                   "must":      { "folder": "inbox" }},
-                   "must_not":  { "spam": true }}
-             }}
+            { "match":       { "starred": true }},
+            { "bool": {
+                "must":      { "match": { "folder": "inbox" }},
+                "must_not":  { "match": { "spam": true }}
+            }}
         ],
         "minimum_should_match": 1
     }

100_Full_Text_Search/05_Match_query.asciidoc

@@ -65,7 +65,7 @@ the query string should be analyzed too.
 2. _Analyze the query string_.
 +
 The query string `QUICK!` is passed through the standard analyzer, which
-results in the single term `quick`. Because we have a just a single term,
+results in the single term `quick`. Because we have just a single term,
 the `match` query can be executed as a single low-level `term` query.
 
 3. _Find matching docs_.

170_Relevance/20_Query_time_boosting.asciidoc

@@ -82,7 +82,7 @@ GET /docs_2014_*/_search <1>
 
 These boost values are represented in the <<practical-scoring-function>> by
 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
-appear in the query DSL.  Instead, any boost values are combined and passsed
+appear in the query DSL.  Instead, any boost values are combined and passed
 down to the individual terms.  The `t.getBoost()` method returns any `boost`
 value applied to the term itself or to any of the queries higher up the chain.
 

400_Relationships/26_Concurrency_solutions.asciidoc

@@ -12,7 +12,7 @@ One of two things will happen:
 
 *   You have decided to use `version` numbers, in which case your mass rename
     will fail with a version conflict when it hits the renamed
-    `README.asciidoc` file.
+    `README.txt` file.
 
 *   You didn't use versioning, and your changes will overwrite the changes from
     the other user.