From f83909f7ae105779067d048879e48573c0241d19 Mon Sep 17 00:00:00 2001 From: Clinton Gormley Date: Tue, 30 Dec 2014 19:53:15 +0100 Subject: [PATCH] Docs: The regexp query defaults to the `ALL` flag, and removed the `AUTOMATON` flag which is not used in Elasticsearch. Closes #6180 --- docs/reference/query-dsl/queries/regexp-query.asciidoc | 2 +- docs/reference/query-dsl/queries/regexp-syntax.asciidoc | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/reference/query-dsl/queries/regexp-query.asciidoc b/docs/reference/query-dsl/queries/regexp-query.asciidoc index 0e0df7f0bae..692caf43480 100644 --- a/docs/reference/query-dsl/queries/regexp-query.asciidoc +++ b/docs/reference/query-dsl/queries/regexp-query.asciidoc @@ -50,7 +50,7 @@ You can also use special flags } -------------------------------------------------- -Possible flags are `ALL`, `ANYSTRING`, `AUTOMATON`, `COMPLEMENT`, +Possible flags are `ALL` (default), `ANYSTRING`, `COMPLEMENT`, `EMPTY`, `INTERSECTION`, `INTERVAL`, or `NONE`. Please check the http://lucene.apache.org/core/4_9_0/core/org/apache/lucene/util/automaton/RegExp.html[Lucene documentation] for their meaning diff --git a/docs/reference/query-dsl/queries/regexp-syntax.asciidoc b/docs/reference/query-dsl/queries/regexp-syntax.asciidoc index 5563c52ba4f..328d171d363 100644 --- a/docs/reference/query-dsl/queries/regexp-syntax.asciidoc +++ b/docs/reference/query-dsl/queries/regexp-syntax.asciidoc @@ -202,11 +202,9 @@ For string `"abcd"`: ===== Optional operators -These operators are only available when they are explicitly enabled, by -passing `flags` to the query. - -Multiple flags can be enabled either using the `ALL` flag, or by -concatenating flags with a pipe `"|"`: +These operators are available by default as the `flags` parameter defaults to `ALL`. +Different flag combinations (concatened with `"\"`) can be used to enable/disable +specific operators: { "regexp": {