lucene-solr:master: SOLR-4646: Add the word "optionally" to refGuide: * optionally treats "and" and "or" as "AND" and "OR" in Lucene syntax mode.

[ja...@apache.org]

Repository: lucene-solr
Updated Branches:
  refs/heads/master 8648b005e -> 3bb8939af


SOLR-4646: Add the word "optionally" to refGuide:
* optionally treats "and" and "or" as "AND" and "OR" in Lucene syntax mode.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3bb8939a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3bb8939a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3bb8939a

Branch: refs/heads/master
Commit: 3bb8939afec6b6e26689de580ddc5311bd5f0680
Parents: 8648b00
Author: Jan Høydahl <ja...@apache.org>
Authored: Tue Jun 20 13:41:31 2017 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Tue Jun 20 13:41:31 2017 +0200

----------------------------------------------------------------------
 solr/solr-ref-guide/src/the-extended-dismax-query-parser.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3bb8939a/solr/solr-ref-guide/src/the-extended-dismax-query-parser.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/the-extended-dismax-query-parser.adoc b/solr/solr-ref-guide/src/the-extended-dismax-query-parser.adoc
index e949a61..c4e0fde 100644
--- a/solr/solr-ref-guide/src/the-extended-dismax-query-parser.adoc
+++ b/solr/solr-ref-guide/src/the-extended-dismax-query-parser.adoc
@@ -24,7 +24,7 @@ In addition to supporting all the DisMax query parser parameters, Extended Disma
 
 * supports the <<the-standard-query-parser.adoc#the-standard-query-parser,full Lucene query parser syntax>>.
 * supports queries such as AND, OR, NOT, -, and +.
-* treats "and" and "or" as "AND" and "OR" in Lucene syntax mode.
+* optionally treats "and" and "or" as "AND" and "OR" in Lucene syntax mode.
 * respects the 'magic field' names `\_val_` and `\_query_`. These are not a real fields in the Schema, but if used it helps do special things (like a function query in the case of `\_val_` or a nested query in the case of `\_query_`). If `\_val_` is used in a term or phrase query, the value is parsed as a function.
 * includes improved smart partial escaping in the case of syntax errors; fielded queries, +/-, and phrase queries are still supported in this mode.
 * improves proximity boosting by using word shingles; you do not need the query to match all words in the document before proximity boosting is applied.